X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=806e58c2d440ee41d61f49181fd74ec56c835c87;hb=b1989556265dbfb1fa7deda20bcccff4e419fc90;hp=97f86e8e457acdb07294311ec8b5b607a057ac39;hpb=069d87d3332abd98517663a89b4ae672e8ebfba1;p=pkgsrc-firefox3.git

diff --git a/Makefile b/Makefile
index 97f86e8..806e58c 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.cpp!nsWildCard_filepicker.cpp!g' -i .orig \
+		${WRKSRC}/xpfe/components/filepicker/src/Makefile.in
+
 .if !empty(PKG_OPTIONS:Mmozilla-jemalloc)
 PLIST_SUBST+=		JEMALLOC=
 SCRIPTS_ENV+=		JEMALLOC=