Makefile fix

diff --git a/Makefile b/Makefile
index 9d33d4656a004f56ab0568598faf36c08c05db9c..aeb8b1e5b47cde0c2e40c2d2ee14a40c28066972 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -25,11 +25,15 @@ MAINTAINER=         tnn@NetBSD.org
 MOZ_VER=               3.0.5
 PKGREVISION=           2
 
+XPTCFILES+=            xptcinvoke_asm_ppc_rhapsody.s
+
 XPTCFILES:=            ${XPTCFILES:C,^,../../firefox3/files/,}
 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 +61,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

diff --git a/distinfo b/distinfo
index 8ce630ac8a8adde7bdd8daf5aef83fb87565cfb7..6bc7c66dc765e0091b02cd6a888a8c0160c33987 100644 (file)
--- a/distinfo
+++ b/distinfo
@@ -4,16 +4,27 @@ SHA1 (firefox-3.0.5-source.tar.bz2) = f934e073efaad3d4dde847c8491fa9529564d5d2
 RMD160 (firefox-3.0.5-source.tar.bz2) = ec6e7eab65649c5c79587a5a8ffb9b6b386b5a18
 Size (firefox-3.0.5-source.tar.bz2) = 36948252 bytes
 SHA1 (patch-aa) = f995b5e53fa11ecb659ab2dd10551db1c71cc5f3
-SHA1 (patch-ab) = dd388a040f99f71a79cf03a328de810e8d623374
+SHA1 (patch-ab) = a5756a6bb2928f2f214e969fe65a77b5b435a26e
 SHA1 (patch-ac) = c814530c1a8574739b7557d007563232b6070c51
 SHA1 (patch-ad) = 20f2184a7e5e98b065e884c67e4c17fc52019a79
 SHA1 (patch-ae) = fea251aabc772c3d4ad3044c8295af45cc9cab2d
+SHA1 (patch-af) = 74ebf2c0f079b37b1e9023235a56027d4f395ea4
+SHA1 (patch-ag) = f23dd38f6cfc4d2287ebeac57307c005521acb39
+SHA1 (patch-ah) = dc79aa2d7f5ddc93ecf2a63e2d38e497c5a156cc
+SHA1 (patch-ai) = 74ebf2c0f079b37b1e9023235a56027d4f395ea4
+SHA1 (patch-aj) = f23dd38f6cfc4d2287ebeac57307c005521acb39
+SHA1 (patch-ak) = dc79aa2d7f5ddc93ecf2a63e2d38e497c5a156cc
+SHA1 (patch-al) = 74ebf2c0f079b37b1e9023235a56027d4f395ea4
+SHA1 (patch-am) = f23dd38f6cfc4d2287ebeac57307c005521acb39
+SHA1 (patch-an) = dc79aa2d7f5ddc93ecf2a63e2d38e497c5a156cc
+SHA1 (patch-ao) = 3b283b2cbb13464c788d11b3c7297dfb90b2d755
 SHA1 (patch-ap) = 552694ac2d6ca713aec98ec394f1215c048c2392
+SHA1 (patch-aq) = fcd28831cf5fc012afba386ceeee95945bf82606
 SHA1 (patch-ax) = cbfe7a6392d5d2fefff123679ba1c056b1cc0aa9
 SHA1 (patch-ba) = 3bd713cf2edcc61f489cea8269ca60e27c26f1d9
 SHA1 (patch-bb) = c7286542a9fe97ac9819a00c345272efb7e90e9c
 SHA1 (patch-bm) = a0a69ca516e8a569d5e61293d5610b236192bf85
-SHA1 (patch-bo) = 6e06648e1ea9320349f3b2a524055b513ca74358
+SHA1 (patch-bo) = dfb949bb2dd6706040d22b3941888da7489e7ff4
 SHA1 (patch-bq) = 2b29436d138fea4e1941d537be1a636969db9a77
 SHA1 (patch-br) = 943b38fef5e7070de7af8a055f05e576039ad8bb
 SHA1 (patch-bs) = 79cb84a5ed67780e124e7c595ee4ae6ffc7617a6
@@ -28,9 +39,9 @@ SHA1 (patch-dj) = 70360dffb20dd1029866d2e81899d003c9e17473
 SHA1 (patch-dk) = 0d676fbaf581fe3f513481010745278df6bf77ae
 SHA1 (patch-dl) = cba07cba5717a75c89f007aba36295dccc1c25ab
 SHA1 (patch-do) = bdb018e157dcb5ef706b69184d8b739cfd32d8c3
-SHA1 (patch-dr) = 377b1d83079ada4d819b6702c1010cdd900575fc
+SHA1 (patch-dr) = cd6f0551d0377ab61c7a789a6fbcc927329bbb9b
 SHA1 (patch-ds) = 1e2e371b9ff7ab9049a947d8e0a63483a1fd244e
-SHA1 (patch-du) = c6e66bb420ce9ea988f89b57d1c20a247704cfcf
+SHA1 (patch-du) = 5a42762e2dc6cc20fb573b0af4f563bf54e4a88e
 SHA1 (patch-dv) = a380d261d4c2771a672d2b0f4f1f23821e3e5266
 SHA1 (patch-ea) = a4c586b2a3aa6e1c4c7cdaf83a37bd894e235bec
 SHA1 (patch-eb) = 176f71af302b1067c301e9cffa2d13a5837e45fe