--enable-debug didn't work...

[pkgsrc-firefox3.git] / Makefile

diff --git a/Makefile b/Makefile
index 9d33d4656a004f56ab0568598faf36c08c05db9c..806e58c2d440ee41d61f49181fd74ec56c835c87 100644 (file)
--- 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
@@ -57,12 +62,6 @@ create-rm-wrapper:
          ${WRAPPER_DIR}/bin/rm
        chmod +x ${WRAPPER_DIR}/bin/rm
 
-# FIXME: remove this after
-.PHONY: copy-xptcinvoke_asm_ppc_rhapsody
-pre-configure: copy-xptcinvoke_asm_ppc_rhapsody
-copy-xptcinvoke_asm_ppc_rhapsody:
-       cp ${.CURDIR}/files/xptcinvoke_asm_ppc_rhapsody.s ${WRKSRC:Q}/xpcom/reflect/xptcall/src/md/unix
-
 # Link browser.xpt
 .PHONY: stage-package
 post-build: stage-package
@@ -72,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=