From: PHO <pho@cielonegro.org>
Date: Tue, 3 Feb 2009 16:35:34 +0000 (+0900)
Subject: Added new pre-configure hook: rename-nsWildCard
X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=ff587cdf22206cf33a70ab95aed6f32ff7976863;p=pkgsrc-firefox3.git

Added new pre-configure hook: rename-nsWildCard
---

diff --git a/Makefile b/Makefile
index 97f86e8..963d1cc 100644
--- a/Makefile
+++ b/Makefile
@@ -71,6 +71,16 @@ stage-package:
 	cp ${WRKSRC}/dist/firefox/components/browser.xpt \
 	   ${WRKSRC}/dist/bin/components/browser.xpt
 
+# Both libjar and filepicker has nsWildCard.cpp. This leads to a
+# linkage error on Darwin.
+.PHONY: rename-nsWildCard
+pre-configure: rename-nsWildCard
+rename-nsWildCard:
+	cp -f ${WRKSRC}/xpfe/components/filepicker/src/nsWildCard.cpp \
+		${WRKSRC}/xpfe/components/filepicker/src/nsWildCard_filepicker.cpp
+	${SED} -e 's!nsWildCard!nsWildCard_filepicker!g' -i .orig \
+		${WRKSRC}/xpfe/components/filepicker/src/Makefile.in
+
 .if !empty(PKG_OPTIONS:Mmozilla-jemalloc)
 PLIST_SUBST+=		JEMALLOC=
 SCRIPTS_ENV+=		JEMALLOC=