X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=806e58c2d440ee41d61f49181fd74ec56c835c87;hb=d58f8e3631bcfb5363024e1fcfa6f249b2e530f4;hp=a4de132bd13d36b80133a6d0e7be6885ae254493;hpb=79dc9e440d417a506ad51d0e90f5c2c0865cf22a;p=pkgsrc-firefox3.git

diff --git a/Makefile b/Makefile
index a4de132..806e58c 100644
--- a/Makefile
+++ b/Makefile
@@ -25,11 +25,16 @@ MAINTAINER=		tnn@NetBSD.org
 MOZ_VER=		3.0.5
 PKGREVISION=		2
 
-XPTCFILES:=		${XPTCFILES:C,^,../../firefox3/files/,}
+XPTCFILES+=		xptcinvoke_asm_ppc_rhapsody.s
+
+#XPTCFILES:=		${XPTCFILES:C,^,../../../www/firefox3/files/,}
+XPTCFILES:=		${XPTCFILES:C,^,../../../local/firefox3/files/,} # FIXME
 DESCR_SRC=		${.CURDIR}/../../www/firefox/DESCR
 
-DISTINFO_FILE=		${.CURDIR}/../../www/firefox3/distinfo
-PATCHDIR=		${.CURDIR}/../../www/firefox3/patches
+#DISTINFO_FILE=		${.CURDIR}/../../www/firefox3/distinfo
+#PATCHDIR=		${.CURDIR}/../../www/firefox3/patches
+DISTINFO_FILE=		${.CURDIR}/../../local/firefox3/distinfo # FIXME
+PATCHDIR=		${.CURDIR}/../../local/firefox3/patches # FIXME
 
 .PHONY: copy-pkgconfig
 post-extract: copy-pkgconfig
@@ -66,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=