Mon May 19 10:43:02 2008 UTC ()
Fix assorted pkglint complaints and warns.


(tnn)
diff -r1.33 -r1.34 pkgsrc/mail/thunderbird/Makefile-thunderbird.common
diff -r1.43 -r1.44 pkgsrc/mail/thunderbird/distinfo
diff -r1.4 -r1.5 pkgsrc/mail/thunderbird/patches/patch-ba
diff -r1.56 -r1.57 pkgsrc/www/firefox/Makefile-firefox.common
diff -r1.24 -r1.25 pkgsrc/www/firefox/Makefile.common
diff -r1.15 -r1.16 pkgsrc/www/firefox/buildlink3.mk
diff -r1.76 -r1.77 pkgsrc/www/firefox/distinfo
diff -r1.14 -r1.15 pkgsrc/www/firefox-gtk1/buildlink3.mk
diff -r1.6 -r1.7 pkgsrc/www/firefox/patches/patch-ba
diff -r1.29 -r1.30 pkgsrc/www/seamonkey/Makefile.common
diff -r1.29 -r1.30 pkgsrc/www/seamonkey/distinfo
diff -r1.7 -r1.8 pkgsrc/www/seamonkey/buildlink3.mk
diff -r1.10 -r1.11 pkgsrc/www/seamonkey/options.mk
diff -r1.1.1.1 -r1.2 pkgsrc/www/seamonkey/patches/patch-ba
cvs diff -r1.33 -r1.34 pkgsrc/mail/thunderbird/Attic/Makefile-thunderbird.common (expand / switch to unified diff)

--- pkgsrc/mail/thunderbird/Attic/Makefile-thunderbird.common 2008/02/27 10:00:47 1.33
+++ pkgsrc/mail/thunderbird/Attic/Makefile-thunderbird.common 2008/05/19 10:43:02 1.34
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1# $NetBSD: Makefile-thunderbird.common,v 1.33 2008/02/27 10:00:47 ghen Exp $ 1# $NetBSD: Makefile-thunderbird.common,v 1.34 2008/05/19 10:43:02 tnn Exp $
 2# used by mail/thunderbird/Makefile
 3# used by mail/thunderbird-gtk1/Makefile
2 4
3MOZILLA_BIN= thunderbird-bin 5MOZILLA_BIN= thunderbird-bin
4MOZ_VER= 2.0.0.12 6MOZ_VER= 2.0.0.12
5EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
6DISTNAME= thunderbird-${MOZ_VER}-source 8DISTNAME= thunderbird-${MOZ_VER}-source
7CATEGORIES= mail 9CATEGORIES= mail
8MASTER_SITES= ${MASTER_SITE_MOZILLA:=thunderbird/releases/${MOZ_VER}/source/} 10MASTER_SITES= ${MASTER_SITE_MOZILLA:=thunderbird/releases/${MOZ_VER}/source/}
9 11
10HOMEPAGE= http://www.mozilla.com/en-US/thunderbird/ 12HOMEPAGE= http://www.mozilla.com/en-US/thunderbird/
11 13
12CONFIGURE_ENV+= MOZ_THUNDERBIRD=1 14CONFIGURE_ENV+= MOZ_THUNDERBIRD=1
13MAKE_ENV+= MOZ_THUNDERBIRD=1 15MAKE_ENV+= MOZ_THUNDERBIRD=1
14 16
cvs diff -r1.43 -r1.44 pkgsrc/mail/thunderbird/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/thunderbird/distinfo 2008/02/27 10:00:47 1.43
+++ pkgsrc/mail/thunderbird/distinfo 2008/05/19 10:43:02 1.44
@@ -1,39 +1,39 @@ @@ -1,39 +1,39 @@
1$NetBSD: distinfo,v 1.43 2008/02/27 10:00:47 ghen Exp $ 1$NetBSD: distinfo,v 1.44 2008/05/19 10:43:02 tnn Exp $
2 2
3SHA1 (thunderbird-2.0.0.12-source.tar.bz2) = 36ea64353d32a9f138ef658250cfdcf8f9e862f2 3SHA1 (thunderbird-2.0.0.12-source.tar.bz2) = 36ea64353d32a9f138ef658250cfdcf8f9e862f2
4RMD160 (thunderbird-2.0.0.12-source.tar.bz2) = 80d6fdb4b8e085a82234825cfbfc6cd05d015f6f 4RMD160 (thunderbird-2.0.0.12-source.tar.bz2) = 80d6fdb4b8e085a82234825cfbfc6cd05d015f6f
5Size (thunderbird-2.0.0.12-source.tar.bz2) = 37485204 bytes 5Size (thunderbird-2.0.0.12-source.tar.bz2) = 37485204 bytes
6SHA1 (patch-aa) = ff3586c00ff8d3fa6a1bda639116778169ad4466 6SHA1 (patch-aa) = ff3586c00ff8d3fa6a1bda639116778169ad4466
7SHA1 (patch-ab) = 1dda9cc5822761da53133e987e30c133894baad7 7SHA1 (patch-ab) = 1dda9cc5822761da53133e987e30c133894baad7
8SHA1 (patch-ac) = 24da4ecce48d22a3752276cae132845b4b474c2a 8SHA1 (patch-ac) = 24da4ecce48d22a3752276cae132845b4b474c2a
9SHA1 (patch-ad) = 19afc8dfaf9f14439d747e42ee2f64a9c1a9dc3d 9SHA1 (patch-ad) = 19afc8dfaf9f14439d747e42ee2f64a9c1a9dc3d
10SHA1 (patch-ae) = 364b91f0bf51e49bb140e13dfb775a89ea38bb28 10SHA1 (patch-ae) = 364b91f0bf51e49bb140e13dfb775a89ea38bb28
11SHA1 (patch-af) = 1306065f359a4acc2c2c4a0865d8401baacb7a15 11SHA1 (patch-af) = 1306065f359a4acc2c2c4a0865d8401baacb7a15
12SHA1 (patch-ag) = bc08dcb0f7acc4eace112c28241a31b0b6a492e3 12SHA1 (patch-ag) = bc08dcb0f7acc4eace112c28241a31b0b6a492e3
13SHA1 (patch-ah) = 4cd8e37475af19bcfe4530f910990f86c89ed916 13SHA1 (patch-ah) = 4cd8e37475af19bcfe4530f910990f86c89ed916
14SHA1 (patch-ai) = 189aa46f116e424c23368e1c7fbc6c56dd389954 14SHA1 (patch-ai) = 189aa46f116e424c23368e1c7fbc6c56dd389954
15SHA1 (patch-aj) = 36e80c573457bb38f0bd0cb87d9aa7aed4506a0b 15SHA1 (patch-aj) = 36e80c573457bb38f0bd0cb87d9aa7aed4506a0b
16SHA1 (patch-ak) = 6fb6ed901990efbb1a25ca5666470f8f2467fa8a 16SHA1 (patch-ak) = 6fb6ed901990efbb1a25ca5666470f8f2467fa8a
17SHA1 (patch-al) = 46e7986f0c803701ce9eec38620cf22a2a96ba86 17SHA1 (patch-al) = 46e7986f0c803701ce9eec38620cf22a2a96ba86
18SHA1 (patch-an) = 47bb24afbb0def95d30d466700c1983f18a14641 18SHA1 (patch-an) = 47bb24afbb0def95d30d466700c1983f18a14641
19SHA1 (patch-ao) = 4162763cc7af61deb1795f85fdbd96e3ef930d4d 19SHA1 (patch-ao) = 4162763cc7af61deb1795f85fdbd96e3ef930d4d
20SHA1 (patch-ap) = 791b30d5b2468a94b356205b22f1dcef0e51fc68 20SHA1 (patch-ap) = 791b30d5b2468a94b356205b22f1dcef0e51fc68
21SHA1 (patch-aq) = e8389d53e0d490b3cc1078f646749abfe54225ff 21SHA1 (patch-aq) = e8389d53e0d490b3cc1078f646749abfe54225ff
22SHA1 (patch-ar) = ce81dd6b747ba882434cb23343c5e89aac70ea81 22SHA1 (patch-ar) = ce81dd6b747ba882434cb23343c5e89aac70ea81
23SHA1 (patch-as) = 56effdf9aa488fa2b3c8abcb4b7273841a4b59c1 23SHA1 (patch-as) = 56effdf9aa488fa2b3c8abcb4b7273841a4b59c1
24SHA1 (patch-aw) = 0df1163297eb1ea48ae8b98d146f715462c0a2e7 24SHA1 (patch-aw) = 0df1163297eb1ea48ae8b98d146f715462c0a2e7
25SHA1 (patch-ax) = 320b29cb9b6addc21c82480c400746deed8522cb 25SHA1 (patch-ax) = 320b29cb9b6addc21c82480c400746deed8522cb
26SHA1 (patch-ba) = 5e64f23ec426f9baef29f397084dba7158279071 26SHA1 (patch-ba) = f0f3e17b4e2d383d5c45462fa2e3e69b22495932
27SHA1 (patch-bb) = 3f53a7358e881528cf8bec6933af7cbfcffb08ed 27SHA1 (patch-bb) = 3f53a7358e881528cf8bec6933af7cbfcffb08ed
28SHA1 (patch-bm) = 6bd7bf1262cec43b0324693d43929497c3fb3991 28SHA1 (patch-bm) = 6bd7bf1262cec43b0324693d43929497c3fb3991
29SHA1 (patch-bo) = 7ed3756e2eb4ff9967d126452506429c2346ae84 29SHA1 (patch-bo) = 7ed3756e2eb4ff9967d126452506429c2346ae84
30SHA1 (patch-bq) = 8818e9cbcc2c0a48c1488a5b8e92dd1350e76bb1 30SHA1 (patch-bq) = 8818e9cbcc2c0a48c1488a5b8e92dd1350e76bb1
31SHA1 (patch-br) = ba2eadaef2fda9bd38832e43c265bab9224bdae3 31SHA1 (patch-br) = ba2eadaef2fda9bd38832e43c265bab9224bdae3
32SHA1 (patch-bs) = 79cb84a5ed67780e124e7c595ee4ae6ffc7617a6 32SHA1 (patch-bs) = 79cb84a5ed67780e124e7c595ee4ae6ffc7617a6
33SHA1 (patch-bu) = db33b8651e3cb1fbf9a18dbe78e1e8288cfda0ee 33SHA1 (patch-bu) = db33b8651e3cb1fbf9a18dbe78e1e8288cfda0ee
34SHA1 (patch-bv) = 4f23dfd885131ea866f31370f1421e7c19706860 34SHA1 (patch-bv) = 4f23dfd885131ea866f31370f1421e7c19706860
35SHA1 (patch-bx) = 046e19c9c4b431369411658373b14c1822841d85 35SHA1 (patch-bx) = 046e19c9c4b431369411658373b14c1822841d85
36SHA1 (patch-by) = 643185af7a0df7030b2b96447ee4031dc9c82f88 36SHA1 (patch-by) = 643185af7a0df7030b2b96447ee4031dc9c82f88
37SHA1 (patch-bz) = 6f854d74a9d1d1174ce8eff7d65f8024a7da4711 37SHA1 (patch-bz) = 6f854d74a9d1d1174ce8eff7d65f8024a7da4711
38SHA1 (patch-ca) = 479ef14631ae019ae5ca1c08a2f786294f3e972b 38SHA1 (patch-ca) = 479ef14631ae019ae5ca1c08a2f786294f3e972b
39SHA1 (patch-cb) = fd0f033d63be066ce5c47057d72c48a085718908 39SHA1 (patch-cb) = fd0f033d63be066ce5c47057d72c48a085718908
cvs diff -r1.4 -r1.5 pkgsrc/mail/thunderbird/patches/Attic/patch-ba (expand / switch to unified diff)

--- pkgsrc/mail/thunderbird/patches/Attic/patch-ba 2005/12/30 21:35:58 1.4
+++ pkgsrc/mail/thunderbird/patches/Attic/patch-ba 2008/05/19 10:43:02 1.5
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1$NetBSD: patch-ba,v 1.4 2005/12/30 21:35:58 joerg Exp $ 1$NetBSD: patch-ba,v 1.5 2008/05/19 10:43:02 tnn Exp $
2 2
3diff -ruN ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg ./nsprpub/pr/include/md/_netbsd.cfg 3diff -ruN ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg ./nsprpub/pr/include/md/_netbsd.cfg
4--- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg 2004-04-28 09:33:44.000000000 +0900 4--- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg 2004-04-28 09:33:44.000000000 +0900
5+++ ./nsprpub/pr/include/md/_netbsd.cfg 2005-12-04 19:09:16.000000000 +0900 5+++ ./nsprpub/pr/include/md/_netbsd.cfg 2005-12-04 19:09:16.000000000 +0900
6@@ -48,7 +48,8 @@ 6@@ -48,7 +48,8 @@
7  7
8 #define PR_AF_INET6 24 /* same as AF_INET6 */ 8 #define PR_AF_INET6 24 /* same as AF_INET6 */
9  9
10-#if defined(__i386__) || defined(__arm32__) || defined(__MIPSEL__) 10-#if defined(__i386__) || defined(__arm32__) || defined(__MIPSEL__)
11+#if defined(__i386__) || defined(__arm32__) || defined(__ARMEL__) || \ 11+#if defined(__i386__) || defined(__arm32__) || defined(__ARMEL__) || \
12+ defined(__MIPSEL__) 12+ defined(__MIPSEL__)
13  13
14 #define IS_LITTLE_ENDIAN 1 14 #define IS_LITTLE_ENDIAN 1
15 #undef IS_BIG_ENDIAN 15 #undef IS_BIG_ENDIAN
16@@ -94,7 +95,53 @@ 16@@ -94,7 +95,53 @@
17 #define PR_ALIGN_OF_DOUBLE 4 17 #define PR_ALIGN_OF_DOUBLE 4
18 #define PR_ALIGN_OF_POINTER 4 18 #define PR_ALIGN_OF_POINTER 4
19  19
20-#elif defined(__sparc__) || defined(__MIPSEB__) 20-#elif defined(__sparc__) || defined(__MIPSEB__)
21+#elif defined(__sparc_v9__) 21+#elif defined(__sparcv9)
22+ 22+
23+#undef IS_LITTLE_ENDIAN 23+#undef IS_LITTLE_ENDIAN
24+#define IS_BIG_ENDIAN 1 24+#define IS_BIG_ENDIAN 1
25+#define HAVE_LONG_LONG 25+#define HAVE_LONG_LONG
26+#define HAVE_ALIGNED_DOUBLES 26+#define HAVE_ALIGNED_DOUBLES
27+#define HAVE_ALIGNED_LONGLONGS 27+#define HAVE_ALIGNED_LONGLONGS
28+ 28+
29+#define PR_BYTES_PER_BYTE 1 29+#define PR_BYTES_PER_BYTE 1
30+#define PR_BYTES_PER_SHORT 2 30+#define PR_BYTES_PER_SHORT 2
31+#define PR_BYTES_PER_INT 4 31+#define PR_BYTES_PER_INT 4
32+#define PR_BYTES_PER_INT64 8 32+#define PR_BYTES_PER_INT64 8
33+#define PR_BYTES_PER_LONG 8 33+#define PR_BYTES_PER_LONG 8
34+#define PR_BYTES_PER_FLOAT 4 34+#define PR_BYTES_PER_FLOAT 4
@@ -54,27 +54,27 @@ diff -ruN ../Orig/mozilla/nsprpub/pr/inc @@ -54,27 +54,27 @@ diff -ruN ../Orig/mozilla/nsprpub/pr/inc
54+#define PR_BITS_PER_LONG_LOG2 6 54+#define PR_BITS_PER_LONG_LOG2 6
55+#define PR_BITS_PER_FLOAT_LOG2 5 55+#define PR_BITS_PER_FLOAT_LOG2 5
56+#define PR_BITS_PER_DOUBLE_LOG2 6 56+#define PR_BITS_PER_DOUBLE_LOG2 6
57+#define PR_BITS_PER_WORD_LOG2 6 57+#define PR_BITS_PER_WORD_LOG2 6
58+ 58+
59+#define PR_ALIGN_OF_SHORT 2 59+#define PR_ALIGN_OF_SHORT 2
60+#define PR_ALIGN_OF_INT 4 60+#define PR_ALIGN_OF_INT 4
61+#define PR_ALIGN_OF_LONG 8 61+#define PR_ALIGN_OF_LONG 8
62+#define PR_ALIGN_OF_INT64 8  62+#define PR_ALIGN_OF_INT64 8
63+#define PR_ALIGN_OF_FLOAT 4  63+#define PR_ALIGN_OF_FLOAT 4
64+#define PR_ALIGN_OF_DOUBLE 8  64+#define PR_ALIGN_OF_DOUBLE 8
65+#define PR_ALIGN_OF_POINTER 8  65+#define PR_ALIGN_OF_POINTER 8
66+ 66+
67+#elif defined(__sparc__) || defined(__MIPSEB__) || defined(__ARMEB__) 67+#elif defined(__sparc) || defined(__MIPSEB__) || defined(__ARMEB__)
68  68
69 #undef IS_LITTLE_ENDIAN 69 #undef IS_LITTLE_ENDIAN
70 #define IS_BIG_ENDIAN 1 70 #define IS_BIG_ENDIAN 1
71@@ -187,6 +234,55 @@ 71@@ -187,6 +234,55 @@
72 #define PR_BYTES_PER_WORD_LOG2 3 72 #define PR_BYTES_PER_WORD_LOG2 3
73 #define PR_BYTES_PER_DWORD_LOG2 3 73 #define PR_BYTES_PER_DWORD_LOG2 3
74  74
75+#elif defined(__amd64__) 75+#elif defined(__amd64__)
76+#define IS_LITTLE_ENDIAN 1 76+#define IS_LITTLE_ENDIAN 1
77+#undef IS_BIG_ENDIAN 77+#undef IS_BIG_ENDIAN
78+#define IS_64 78+#define IS_64
79+ 79+
80+#define PR_BYTES_PER_BYTE 1 80+#define PR_BYTES_PER_BYTE 1
cvs diff -r1.56 -r1.57 pkgsrc/www/firefox/Attic/Makefile-firefox.common (expand / switch to unified diff)

--- pkgsrc/www/firefox/Attic/Makefile-firefox.common 2008/04/17 07:39:20 1.56
+++ pkgsrc/www/firefox/Attic/Makefile-firefox.common 2008/05/19 10:43:02 1.57
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1# $NetBSD: Makefile-firefox.common,v 1.56 2008/04/17 07:39:20 ghen Exp $ 1# $NetBSD: Makefile-firefox.common,v 1.57 2008/05/19 10:43:02 tnn Exp $
 2# used by www/firefox/Makefile
2 3
3MOZILLA_BIN= firefox-bin 4MOZILLA_BIN= firefox-bin
4MOZ_VER= 2.0.0.14 5MOZ_VER= 2.0.0.14
5EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
6 7
7DISTNAME= firefox-${MOZ_VER}-source 8DISTNAME= firefox-${MOZ_VER}-source
8 9
9MASTER_SITES= ${MASTER_SITE_MOZILLA:=firefox/releases/${MOZ_VER}/source/} 10MASTER_SITES= ${MASTER_SITE_MOZILLA:=firefox/releases/${MOZ_VER}/source/}
10 11
11HOMEPAGE= http://www.mozilla.com/en-US/firefox/ 12HOMEPAGE= http://www.mozilla.com/en-US/firefox/
12 13
13PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
14 15
cvs diff -r1.24 -r1.25 pkgsrc/www/firefox/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/www/firefox/Attic/Makefile.common 2008/02/08 10:34:19 1.24
+++ pkgsrc/www/firefox/Attic/Makefile.common 2008/05/19 10:43:02 1.25
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1# $NetBSD: Makefile.common,v 1.24 2008/02/08 10:34:19 tnn Exp $ 1# $NetBSD: Makefile.common,v 1.25 2008/05/19 10:43:02 tnn Exp $
 2# used by www/firefox/Makefile-firefox.common
2 3
3MOZ_DIST_VER?= ${MOZ_VER} 4MOZ_DIST_VER?= ${MOZ_VER}
4DISTNAME?= mozilla-${MOZ_DIST_VER}-source 5DISTNAME?= mozilla-${MOZ_DIST_VER}-source
5PKGNAME= ${MOZILLA}-${MOZ_VER} 6PKGNAME= ${MOZILLA}-${MOZ_VER}
6MASTER_SITES?= ${MASTER_SITE_MOZILLA:=mozilla${MOZ_DIST_VER}/source/} 7MASTER_SITES?= ${MASTER_SITE_MOZILLA:=mozilla${MOZ_DIST_VER}/source/}
7CATEGORIES= www 8CATEGORIES= www
8 9
9MAINTAINER= taya@NetBSD.org 10MAINTAINER= taya@NetBSD.org
10HOMEPAGE?= http://www.mozilla.org/ 11HOMEPAGE?= http://www.mozilla.org/
11 12
12FILESDIR= ${.CURDIR}/../../www/seamonkey/files 13FILESDIR= ${.CURDIR}/../../www/seamonkey/files
13 14
14BUILD_DEPENDS+= zip>=2.3:../../archivers/zip 15BUILD_DEPENDS+= zip>=2.3:../../archivers/zip
@@ -173,52 +174,52 @@ post-build: @@ -173,52 +174,52 @@ post-build:
173 174
174# The exact set of libfreebl* libs built and installed depends on the 175# The exact set of libfreebl* libs built and installed depends on the
175# operating system and platform. For example, on solaris/sparc you might 176# operating system and platform. For example, on solaris/sparc you might
176# get 177# get
177# libfreebl_32fpu_3.so 178# libfreebl_32fpu_3.so
178# libfreebl_32int_3.so 179# libfreebl_32int_3.so
179# libfreebl_32int64_3.so 180# libfreebl_32int64_3.so
180# and on others 181# and on others
181# libfreebl3.so 182# libfreebl3.so
182# Since this has been a continual problem in many mozilla packages, just 183# Since this has been a continual problem in many mozilla packages, just
183# do that part dynamically rather than trying to always keep our conditionals 184# do that part dynamically rather than trying to always keep our conditionals
184# up to date. Note that the exact set of libfreebl libs has had a history 185# up to date. Note that the exact set of libfreebl libs has had a history
185# of changing even on minor releases. 186# of changing even on minor releases.
186PLIST_SRC= ${WRKDIR}/PLIST 187PLIST_SRC= ${WRKDIR}/PLIST
187pre-install: 188pre-install:
188 cd ${WRKSRC:Q}/dist/bin && ls libfreebl*.${SO_SUFFIX} | ${SORT} | \ 189 cd ${WRKSRC:Q}/dist/bin && ls libfreebl*.${SO_SUFFIX} | ${SORT} | \
189 ${AWK} '{print "lib/$${MOZILLA}/" $$0}' > ${WRKSRC}/PLIST.libfreebl 190 ${AWK} '{print "lib/$${MOZILLA}/" $$0}' > ${WRKSRC}/PLIST.libfreebl
190 cd ${WRKSRC:Q}/dist/bin && ls libfreebl*.chk | ${SORT} | \ 191 cd ${WRKSRC:Q}/dist/bin && ls libfreebl*.chk | ${SORT} | \
191 ${AWK} '{print "lib/$${MOZILLA}/" $$0}' > ${WRKSRC}/PLIST.libfreebl.chk 192 ${AWK} '{print "lib/$${MOZILLA}/" $$0}' > ${WRKSRC}/PLIST.libfreebl.chk
192 ${AWK} '/@comment libfreebl$$/ {exit} {print}' ${.CURDIR}/PLIST > ${PLIST_SRC} 193 ${AWK} '/@comment libfreebl$$/ {exit} {print}' ${.CURDIR}/PLIST > ${PLIST_SRC}
193 ${CAT} ${WRKSRC}/PLIST.libfreebl >> ${PLIST_SRC} 194 ${CAT} ${WRKSRC}/PLIST.libfreebl >> ${PLIST_SRC}
194 ${AWK} '/@comment libfreebl.chk/ {exit} ok == 1 {print} /@comment libfreebl$$/ {ok=1}' \ 195 ${AWK} '/@comment libfreebl.chk/ {exit} ok == 1 {print} /@comment libfreebl$$/ {ok=1}' \
195 ${.CURDIR}/PLIST >> ${PLIST_SRC} 196 ${.CURDIR}/PLIST >> ${PLIST_SRC}
196 ${CAT} ${WRKSRC}/PLIST.libfreebl.chk >> ${PLIST_SRC} 197 ${CAT} ${WRKSRC}/PLIST.libfreebl.chk >> ${PLIST_SRC}
197 ${AWK} 'ok == 1 {print} /@comment libfreebl.chk/ {ok=1}' \ 198 ${AWK} 'ok == 1 {print} /@comment libfreebl.chk/ {ok=1}' \
198 ${.CURDIR}/PLIST >> ${PLIST_SRC} 199 ${.CURDIR}/PLIST >> ${PLIST_SRC}
199 200
200do-install: 201do-install:
201 ${SETENV} ${SCRIPTS_ENV} DESTDIR=${DESTDIR} ${SH} ${FILESDIR:Q}/moz-install 202 ${SETENV} ${SCRIPTS_ENV} DESTDIR=${DESTDIR} ${SH} ${FILESDIR:Q}/moz-install
202 203
203post-install: 204post-install:
204 ${FIND} ${DESTDIR:Q}${PREFIX:Q}/lib/${MOZILLA}/defaults -type f -exec ${CHMOD} u+w {} \; 205 ${FIND} ${DESTDIR:Q}${PREFIX:Q}/lib/${MOZILLA}/defaults -type f -exec ${CHMOD} u+w {} \;
205 206
206.include "../../mk/pthread.buildlink3.mk" 207.include "../../mk/pthread.buildlink3.mk"
207 208
208.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none") 209.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none")
209CONFIGURE_ARGS+= --without-pthreads 210CONFIGURE_ARGS+= --without-pthreads
210.else 211.else
211CONFIGURE_ARGS+= --with-pthreads 212CONFIGURE_ARGS+= --with-pthreads
212.endif 213.endif
213 214
214.if ${MOZILLA_USE_XFT} == "YES" 215.if ${MOZILLA_USE_XFT} == "YES"
215CONFIGURE_ARGS+= --enable-xft 216CONFIGURE_ARGS+= --enable-xft
216# pkgconfig defaults to a "build" dependency, which is what we want. 217# pkgconfig defaults to a "build" dependency, which is what we want.
217.include "../../x11/libXft/buildlink3.mk" 218.include "../../x11/libXft/buildlink3.mk"
218.endif 219.endif
219 220
220# Fix for firefox* packages. 221# Fix for firefox* packages.
221SUBST_CLASSES+= pc 222SUBST_CLASSES+= pc
222SUBST_STAGE.pc= post-extract 223SUBST_STAGE.pc= post-extract
223SUBST_FILES.pc= build/unix/*.pc.in 224SUBST_FILES.pc= build/unix/*.pc.in
224SUBST_SED.pc= -e 's|%includedir%|${PREFIX}/include/${MOZILLA}|g' 225SUBST_SED.pc= -e 's|%includedir%|${PREFIX}/include/${MOZILLA}|g'
cvs diff -r1.15 -r1.16 pkgsrc/www/firefox/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox/Attic/buildlink3.mk 2007/05/12 13:53:07 1.15
+++ pkgsrc/www/firefox/Attic/buildlink3.mk 2008/05/19 10:43:02 1.16
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: buildlink3.mk,v 1.15 2007/05/12 13:53:07 ghen Exp $ 1# $NetBSD: buildlink3.mk,v 1.16 2008/05/19 10:43:02 tnn Exp $
2 2
3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ 3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
4FIREFOX_BUILDLINK3_MK:= ${FIREFOX_BUILDLINK3_MK}+ 4FIREFOX_BUILDLINK3_MK:= ${FIREFOX_BUILDLINK3_MK}+
5 5
6.if !empty(BUILDLINK_DEPTH:M+) 6.if !empty(BUILDLINK_DEPTH:M+)
7BUILDLINK_DEPENDS+= firefox 7BUILDLINK_DEPENDS+= firefox
8.endif 8.endif
9 9
10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfirefox} 10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfirefox}
11BUILDLINK_PACKAGES+= firefox 11BUILDLINK_PACKAGES+= firefox
12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}firefox 12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}firefox
13 13
14.if !empty(FIREFOX_BUILDLINK3_MK:M+) 14.if !empty(FIREFOX_BUILDLINK3_MK:M+)
15BUILDLINK_API_DEPENDS.firefox+= firefox>=2.0 15BUILDLINK_API_DEPENDS.firefox+= firefox>=2.0
16BUILDLINK_ABI_DEPENDS.firefox+= firefox>=2.0.0.3nb1 16BUILDLINK_ABI_DEPENDS.firefox+= firefox>=2.0.0.3nb1
17BUILDLINK_PKGSRCDIR.firefox?= ../../www/firefox 17BUILDLINK_PKGSRCDIR.firefox?= ../../www/firefox
18.endif # FIREFOX_BUILDLINK3_MK 18.endif # FIREFOX_BUILDLINK3_MK
19 19
20BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} 20BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
cvs diff -r1.76 -r1.77 pkgsrc/www/firefox/distinfo (expand / switch to unified diff)

--- pkgsrc/www/firefox/distinfo 2008/04/17 07:39:20 1.76
+++ pkgsrc/www/firefox/distinfo 2008/05/19 10:43:02 1.77
@@ -1,37 +1,37 @@ @@ -1,37 +1,37 @@
1$NetBSD: distinfo,v 1.76 2008/04/17 07:39:20 ghen Exp $ 1$NetBSD: distinfo,v 1.77 2008/05/19 10:43:02 tnn Exp $
2 2
3SHA1 (firefox-2.0.0.14-source.tar.bz2) = de263675a137a8e2b25757c4d292e7a3e2434f74 3SHA1 (firefox-2.0.0.14-source.tar.bz2) = de263675a137a8e2b25757c4d292e7a3e2434f74
4RMD160 (firefox-2.0.0.14-source.tar.bz2) = 31eec3454946cfb1c57bd71f32c2a41982276006 4RMD160 (firefox-2.0.0.14-source.tar.bz2) = 31eec3454946cfb1c57bd71f32c2a41982276006
5Size (firefox-2.0.0.14-source.tar.bz2) = 37510819 bytes 5Size (firefox-2.0.0.14-source.tar.bz2) = 37510819 bytes
6SHA1 (patch-aa) = 5095449d4e979085fc5791b9d0251076b9c969c3 6SHA1 (patch-aa) = 5095449d4e979085fc5791b9d0251076b9c969c3
7SHA1 (patch-ab) = 19069a4e572744eccb04e9906e16dad28d2dac01 7SHA1 (patch-ab) = 19069a4e572744eccb04e9906e16dad28d2dac01
8SHA1 (patch-ac) = 96bee96d365d6a95d14031f4f1df9584b94d570b 8SHA1 (patch-ac) = 96bee96d365d6a95d14031f4f1df9584b94d570b
9SHA1 (patch-ad) = 20f2184a7e5e98b065e884c67e4c17fc52019a79 9SHA1 (patch-ad) = 20f2184a7e5e98b065e884c67e4c17fc52019a79
10SHA1 (patch-ae) = fea251aabc772c3d4ad3044c8295af45cc9cab2d 10SHA1 (patch-ae) = fea251aabc772c3d4ad3044c8295af45cc9cab2d
11SHA1 (patch-af) = 01e10664fbf20dffa53ecb94be24a421c39b838b 11SHA1 (patch-af) = 01e10664fbf20dffa53ecb94be24a421c39b838b
12SHA1 (patch-ag) = 1266333a482483f786d5f00e92e641e282266442 12SHA1 (patch-ag) = 1266333a482483f786d5f00e92e641e282266442
13SHA1 (patch-ah) = c737519c8ab8a66993d4892a6efac73e2da979f5 13SHA1 (patch-ah) = c737519c8ab8a66993d4892a6efac73e2da979f5
14SHA1 (patch-ai) = 58d7d87295cfbcaeba3e6a27457e15533d4b8e78 14SHA1 (patch-ai) = 58d7d87295cfbcaeba3e6a27457e15533d4b8e78
15SHA1 (patch-aj) = 84a5e3630c7dd9532bbb20e7444ff9582631ea24 15SHA1 (patch-aj) = 84a5e3630c7dd9532bbb20e7444ff9582631ea24
16SHA1 (patch-ak) = aa54e2c4d2f1c0d40bbbfcd6e3e55b44c3c549ff 16SHA1 (patch-ak) = aa54e2c4d2f1c0d40bbbfcd6e3e55b44c3c549ff
17SHA1 (patch-al) = e5fc425630a5363807bf1cc2c648d5eb31d0e40e 17SHA1 (patch-al) = e5fc425630a5363807bf1cc2c648d5eb31d0e40e
18SHA1 (patch-an) = 8b855be2d22422fcbf9293717ee45a8115e15bff 18SHA1 (patch-an) = 8b855be2d22422fcbf9293717ee45a8115e15bff
19SHA1 (patch-ao) = f7221f4135c8bb5adc154f523cef7ff0ef42e602 19SHA1 (patch-ao) = f7221f4135c8bb5adc154f523cef7ff0ef42e602
20SHA1 (patch-ap) = 58b4867336c73c3908e508501025bdbd8e2e8b30 20SHA1 (patch-ap) = 58b4867336c73c3908e508501025bdbd8e2e8b30
21SHA1 (patch-aq) = 59c1c9922413fd50e1b0573158ad56439a79debf 21SHA1 (patch-aq) = 59c1c9922413fd50e1b0573158ad56439a79debf
22SHA1 (patch-aw) = 9d4388a7bd89b7ca884b9e7eb4855e3afb8e8c3a 22SHA1 (patch-aw) = 9d4388a7bd89b7ca884b9e7eb4855e3afb8e8c3a
23SHA1 (patch-ax) = 1518e5bb0ee162d7c4135a6cfb8112da83a38855 23SHA1 (patch-ax) = 1518e5bb0ee162d7c4135a6cfb8112da83a38855
24SHA1 (patch-ba) = 5e64f23ec426f9baef29f397084dba7158279071 24SHA1 (patch-ba) = f0f3e17b4e2d383d5c45462fa2e3e69b22495932
25SHA1 (patch-bb) = 4ade97ffe2c8b16262dfa992e47ad7c9a666d037 25SHA1 (patch-bb) = 4ade97ffe2c8b16262dfa992e47ad7c9a666d037
26SHA1 (patch-bm) = a0a69ca516e8a569d5e61293d5610b236192bf85 26SHA1 (patch-bm) = a0a69ca516e8a569d5e61293d5610b236192bf85
27SHA1 (patch-bo) = 6e06648e1ea9320349f3b2a524055b513ca74358 27SHA1 (patch-bo) = 6e06648e1ea9320349f3b2a524055b513ca74358
28SHA1 (patch-bq) = 2b29436d138fea4e1941d537be1a636969db9a77 28SHA1 (patch-bq) = 2b29436d138fea4e1941d537be1a636969db9a77
29SHA1 (patch-br) = 943b38fef5e7070de7af8a055f05e576039ad8bb 29SHA1 (patch-br) = 943b38fef5e7070de7af8a055f05e576039ad8bb
30SHA1 (patch-bs) = 79cb84a5ed67780e124e7c595ee4ae6ffc7617a6 30SHA1 (patch-bs) = 79cb84a5ed67780e124e7c595ee4ae6ffc7617a6
31SHA1 (patch-bu) = 0714f658001c363f4abbfb248ac77c4862e3ccf9 31SHA1 (patch-bu) = 0714f658001c363f4abbfb248ac77c4862e3ccf9
32SHA1 (patch-bv) = ef06a6a774c9d4da7b3fbf6f4e274ab042926e49 32SHA1 (patch-bv) = ef06a6a774c9d4da7b3fbf6f4e274ab042926e49
33SHA1 (patch-bx) = 7d524d6d46593ba54f12a75c57822518feee84d0 33SHA1 (patch-bx) = 7d524d6d46593ba54f12a75c57822518feee84d0
34SHA1 (patch-by) = a6eeccfee4e7e3620be41b315c357575c8bd0635 34SHA1 (patch-by) = a6eeccfee4e7e3620be41b315c357575c8bd0635
35SHA1 (patch-bz) = 7f939c1717b2df473217da9cf703a37e459731c7 35SHA1 (patch-bz) = 7f939c1717b2df473217da9cf703a37e459731c7
36SHA1 (patch-ca) = 264d83ff1fc38d5f754b62507615aff6c353dd26 36SHA1 (patch-ca) = 264d83ff1fc38d5f754b62507615aff6c353dd26
37SHA1 (patch-cb) = 0929baadba9271ee8960a01997c2ded445fe39a2 37SHA1 (patch-cb) = 0929baadba9271ee8960a01997c2ded445fe39a2
cvs diff -r1.14 -r1.15 pkgsrc/www/firefox-gtk1/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox-gtk1/Attic/buildlink3.mk 2007/05/12 13:53:11 1.14
+++ pkgsrc/www/firefox-gtk1/Attic/buildlink3.mk 2008/05/19 10:43:02 1.15
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: buildlink3.mk,v 1.14 2007/05/12 13:53:11 ghen Exp $ 1# $NetBSD: buildlink3.mk,v 1.15 2008/05/19 10:43:02 tnn Exp $
2 2
3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ 3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
4FIREFOX_GTK2_BUILDLINK3_MK:= ${FIREFOX_GTK2_BUILDLINK3_MK}+ 4FIREFOX_GTK1_BUILDLINK3_MK:= ${FIREFOX_GTK1_BUILDLINK3_MK}+
5 5
6.if !empty(BUILDLINK_DEPTH:M+) 6.if !empty(BUILDLINK_DEPTH:M+)
7BUILDLINK_DEPENDS+= firefox-gtk1 7BUILDLINK_DEPENDS+= firefox-gtk1
8.endif 8.endif
9 9
10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfirefox-gtk1} 10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfirefox-gtk1}
11BUILDLINK_PACKAGES+= firefox-gtk1 11BUILDLINK_PACKAGES+= firefox-gtk1
12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}firefox-gtk1 12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}firefox-gtk1
13 13
14.if !empty(FIREFOX_GTK2_BUILDLINK3_MK:M+) 14.if !empty(FIREFOX_GTK1_BUILDLINK3_MK:M+)
15BUILDLINK_API_DEPENDS.firefox-gtk1+= firefox-gtk1>=2.0 15BUILDLINK_API_DEPENDS.firefox-gtk1+= firefox-gtk1>=2.0
16BUILDLINK_ABI_DEPENDS.firefox-gtk1+= firefox-gtk1>=2.0.0.3nb1 16BUILDLINK_ABI_DEPENDS.firefox-gtk1+= firefox-gtk1>=2.0.0.3nb1
17BUILDLINK_PKGSRCDIR.firefox-gtk1?= ../../www/firefox-gtk1 17BUILDLINK_PKGSRCDIR.firefox-gtk1?= ../../www/firefox-gtk1
18.endif # FIREFOX_GTK2_BUILDLINK3_MK 18.endif # FIREFOX_GTK1_BUILDLINK3_MK
19 19
20BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} 20BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
cvs diff -r1.6 -r1.7 pkgsrc/www/firefox/patches/Attic/patch-ba (expand / switch to unified diff)

--- pkgsrc/www/firefox/patches/Attic/patch-ba 2007/05/12 13:53:08 1.6
+++ pkgsrc/www/firefox/patches/Attic/patch-ba 2008/05/19 10:43:02 1.7
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1$NetBSD: patch-ba,v 1.6 2007/05/12 13:53:08 ghen Exp $ 1$NetBSD: patch-ba,v 1.7 2008/05/19 10:43:02 tnn Exp $
2 2
3diff -ruN ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg ./nsprpub/pr/include/md/_netbsd.cfg 3diff -ruN ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg ./nsprpub/pr/include/md/_netbsd.cfg
4--- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg 2004-04-28 09:33:44.000000000 +0900 4--- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg 2004-04-28 09:33:44.000000000 +0900
5+++ ./nsprpub/pr/include/md/_netbsd.cfg 2005-12-04 19:09:16.000000000 +0900 5+++ ./nsprpub/pr/include/md/_netbsd.cfg 2005-12-04 19:09:16.000000000 +0900
6@@ -48,7 +48,8 @@ 6@@ -48,7 +48,8 @@
7  7
8 #define PR_AF_INET6 24 /* same as AF_INET6 */ 8 #define PR_AF_INET6 24 /* same as AF_INET6 */
9  9
10-#if defined(__i386__) || defined(__arm32__) || defined(__MIPSEL__) 10-#if defined(__i386__) || defined(__arm32__) || defined(__MIPSEL__)
11+#if defined(__i386__) || defined(__arm32__) || defined(__ARMEL__) || \ 11+#if defined(__i386__) || defined(__arm32__) || defined(__ARMEL__) || \
12+ defined(__MIPSEL__) 12+ defined(__MIPSEL__)
13  13
14 #define IS_LITTLE_ENDIAN 1 14 #define IS_LITTLE_ENDIAN 1
15 #undef IS_BIG_ENDIAN 15 #undef IS_BIG_ENDIAN
16@@ -94,7 +95,53 @@ 16@@ -94,7 +95,53 @@
17 #define PR_ALIGN_OF_DOUBLE 4 17 #define PR_ALIGN_OF_DOUBLE 4
18 #define PR_ALIGN_OF_POINTER 4 18 #define PR_ALIGN_OF_POINTER 4
19  19
20-#elif defined(__sparc__) || defined(__MIPSEB__) 20-#elif defined(__sparc__) || defined(__MIPSEB__)
21+#elif defined(__sparc_v9__) 21+#elif defined(__sparcv9)
22+ 22+
23+#undef IS_LITTLE_ENDIAN 23+#undef IS_LITTLE_ENDIAN
24+#define IS_BIG_ENDIAN 1 24+#define IS_BIG_ENDIAN 1
25+#define HAVE_LONG_LONG 25+#define HAVE_LONG_LONG
26+#define HAVE_ALIGNED_DOUBLES 26+#define HAVE_ALIGNED_DOUBLES
27+#define HAVE_ALIGNED_LONGLONGS 27+#define HAVE_ALIGNED_LONGLONGS
28+ 28+
29+#define PR_BYTES_PER_BYTE 1 29+#define PR_BYTES_PER_BYTE 1
30+#define PR_BYTES_PER_SHORT 2 30+#define PR_BYTES_PER_SHORT 2
31+#define PR_BYTES_PER_INT 4 31+#define PR_BYTES_PER_INT 4
32+#define PR_BYTES_PER_INT64 8 32+#define PR_BYTES_PER_INT64 8
33+#define PR_BYTES_PER_LONG 8 33+#define PR_BYTES_PER_LONG 8
34+#define PR_BYTES_PER_FLOAT 4 34+#define PR_BYTES_PER_FLOAT 4
@@ -54,27 +54,27 @@ diff -ruN ../Orig/mozilla/nsprpub/pr/inc @@ -54,27 +54,27 @@ diff -ruN ../Orig/mozilla/nsprpub/pr/inc
54+#define PR_BITS_PER_LONG_LOG2 6 54+#define PR_BITS_PER_LONG_LOG2 6
55+#define PR_BITS_PER_FLOAT_LOG2 5 55+#define PR_BITS_PER_FLOAT_LOG2 5
56+#define PR_BITS_PER_DOUBLE_LOG2 6 56+#define PR_BITS_PER_DOUBLE_LOG2 6
57+#define PR_BITS_PER_WORD_LOG2 6 57+#define PR_BITS_PER_WORD_LOG2 6
58+ 58+
59+#define PR_ALIGN_OF_SHORT 2 59+#define PR_ALIGN_OF_SHORT 2
60+#define PR_ALIGN_OF_INT 4 60+#define PR_ALIGN_OF_INT 4
61+#define PR_ALIGN_OF_LONG 8 61+#define PR_ALIGN_OF_LONG 8
62+#define PR_ALIGN_OF_INT64 8  62+#define PR_ALIGN_OF_INT64 8
63+#define PR_ALIGN_OF_FLOAT 4  63+#define PR_ALIGN_OF_FLOAT 4
64+#define PR_ALIGN_OF_DOUBLE 8  64+#define PR_ALIGN_OF_DOUBLE 8
65+#define PR_ALIGN_OF_POINTER 8  65+#define PR_ALIGN_OF_POINTER 8
66+ 66+
67+#elif defined(__sparc__) || defined(__MIPSEB__) || defined(__ARMEB__) 67+#elif defined(__sparc) || defined(__MIPSEB__) || defined(__ARMEB__)
68  68
69 #undef IS_LITTLE_ENDIAN 69 #undef IS_LITTLE_ENDIAN
70 #define IS_BIG_ENDIAN 1 70 #define IS_BIG_ENDIAN 1
71@@ -187,6 +234,55 @@ 71@@ -187,6 +234,55 @@
72 #define PR_BYTES_PER_WORD_LOG2 3 72 #define PR_BYTES_PER_WORD_LOG2 3
73 #define PR_BYTES_PER_DWORD_LOG2 3 73 #define PR_BYTES_PER_DWORD_LOG2 3
74  74
75+#elif defined(__amd64__) 75+#elif defined(__amd64__)
76+#define IS_LITTLE_ENDIAN 1 76+#define IS_LITTLE_ENDIAN 1
77+#undef IS_BIG_ENDIAN 77+#undef IS_BIG_ENDIAN
78+#define IS_64 78+#define IS_64
79+ 79+
80+#define PR_BYTES_PER_BYTE 1 80+#define PR_BYTES_PER_BYTE 1
cvs diff -r1.29 -r1.30 pkgsrc/www/seamonkey/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/www/seamonkey/Attic/Makefile.common 2008/02/08 10:34:19 1.29
+++ pkgsrc/www/seamonkey/Attic/Makefile.common 2008/05/19 10:43:02 1.30
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1# $NetBSD: Makefile.common,v 1.29 2008/02/08 10:34:19 tnn Exp $ 1# $NetBSD: Makefile.common,v 1.30 2008/05/19 10:43:02 tnn Exp $
 2# used by mail/thunderbird/Makefile-thunderbird.common
 3# used by www/seamonkey/Makefile-seamonkey.common
2 4
3MOZ_DIST_VER?= ${MOZ_VER} 5MOZ_DIST_VER?= ${MOZ_VER}
4DISTNAME?= seamonkey-${MOZ_DIST_VER}.source 6DISTNAME?= seamonkey-${MOZ_DIST_VER}.source
5PKGNAME= ${MOZILLA}-${MOZ_VER} 7PKGNAME= ${MOZILLA}-${MOZ_VER}
6MASTER_SITES?= ${MASTER_SITE_MOZILLA:=seamonkey/releases/${MOZ_DIST_VER}/} 8MASTER_SITES?= ${MASTER_SITE_MOZILLA:=seamonkey/releases/${MOZ_DIST_VER}/}
7CATEGORIES?= www 9CATEGORIES?= www
8 10
9MAINTAINER?= ghen@NetBSD.org 11MAINTAINER?= ghen@NetBSD.org
10HOMEPAGE?= http://www.mozilla.org/projects/seamonkey/ 12HOMEPAGE?= http://www.mozilla.org/projects/seamonkey/
11 13
12FILESDIR= ${.CURDIR}/../../www/seamonkey/files 14FILESDIR= ${.CURDIR}/../../www/seamonkey/files
13 15
14BUILD_DEPENDS+= zip>=2.3:../../archivers/zip 16BUILD_DEPENDS+= zip>=2.3:../../archivers/zip
cvs diff -r1.29 -r1.30 pkgsrc/www/seamonkey/distinfo (expand / switch to unified diff)

--- pkgsrc/www/seamonkey/distinfo 2008/03/30 15:02:41 1.29
+++ pkgsrc/www/seamonkey/distinfo 2008/05/19 10:43:02 1.30
@@ -1,37 +1,37 @@ @@ -1,37 +1,37 @@
1$NetBSD: distinfo,v 1.29 2008/03/30 15:02:41 ghen Exp $ 1$NetBSD: distinfo,v 1.30 2008/05/19 10:43:02 tnn Exp $
2 2
3SHA1 (seamonkey-1.1.9.source.tar.bz2) = e33d78a005d01f982e45db55034d776fda419e25 3SHA1 (seamonkey-1.1.9.source.tar.bz2) = e33d78a005d01f982e45db55034d776fda419e25
4RMD160 (seamonkey-1.1.9.source.tar.bz2) = 30ae304710fae33f83bdbb57b1d9092eb6ed8daf 4RMD160 (seamonkey-1.1.9.source.tar.bz2) = 30ae304710fae33f83bdbb57b1d9092eb6ed8daf
5Size (seamonkey-1.1.9.source.tar.bz2) = 35273677 bytes 5Size (seamonkey-1.1.9.source.tar.bz2) = 35273677 bytes
6SHA1 (patch-aa) = 2d117311991c4c71803f3c446334d7b6f1e1067a 6SHA1 (patch-aa) = 2d117311991c4c71803f3c446334d7b6f1e1067a
7SHA1 (patch-ab) = b83dc786559d010f9bbb1adde697975166e0735e 7SHA1 (patch-ab) = b83dc786559d010f9bbb1adde697975166e0735e
8SHA1 (patch-ac) = 393920aabf9476b668510a88af041d9a54c6019d 8SHA1 (patch-ac) = 393920aabf9476b668510a88af041d9a54c6019d
9SHA1 (patch-ad) = 2210b695a2eedefb82c16698a51f4f0f6b2e53e4 9SHA1 (patch-ad) = 2210b695a2eedefb82c16698a51f4f0f6b2e53e4
10SHA1 (patch-ae) = f3c8ffcdfc8c0d5cc75413602c97c731721d751e 10SHA1 (patch-ae) = f3c8ffcdfc8c0d5cc75413602c97c731721d751e
11SHA1 (patch-af) = 4844013ad49c77b87be7c30931ca786f246b40f3 11SHA1 (patch-af) = 4844013ad49c77b87be7c30931ca786f246b40f3
12SHA1 (patch-ag) = eaebefa81d03b2ebc8a32465f59889d92944d750 12SHA1 (patch-ag) = eaebefa81d03b2ebc8a32465f59889d92944d750
13SHA1 (patch-ah) = 8f92f4294ead04ddc5b719ff66b4aada912dcc01 13SHA1 (patch-ah) = 8f92f4294ead04ddc5b719ff66b4aada912dcc01
14SHA1 (patch-ai) = 189aa46f116e424c23368e1c7fbc6c56dd389954 14SHA1 (patch-ai) = 189aa46f116e424c23368e1c7fbc6c56dd389954
15SHA1 (patch-aj) = 951b5ea63116d876a6fcef586256a5728a2df2cf 15SHA1 (patch-aj) = 951b5ea63116d876a6fcef586256a5728a2df2cf
16SHA1 (patch-ak) = f867ca0973fb4d0ca325b25f83586f10f6e85e32 16SHA1 (patch-ak) = f867ca0973fb4d0ca325b25f83586f10f6e85e32
17SHA1 (patch-al) = d916f38de2fa0ca1993ec75c457fccc60ee6d612 17SHA1 (patch-al) = d916f38de2fa0ca1993ec75c457fccc60ee6d612
18SHA1 (patch-an) = 99ac2da44322db96f8d65fbfdb380727b9da96fe 18SHA1 (patch-an) = 99ac2da44322db96f8d65fbfdb380727b9da96fe
19SHA1 (patch-ao) = 617d232bd335bc988388f2004ca919c829e371da 19SHA1 (patch-ao) = 617d232bd335bc988388f2004ca919c829e371da
20SHA1 (patch-ap) = b696056ad90e539cb537e95b163385a48c8ea2cc 20SHA1 (patch-ap) = b696056ad90e539cb537e95b163385a48c8ea2cc
21SHA1 (patch-aq) = 29183e61d6b1a38853151426c2d4ffe45efd9c43 21SHA1 (patch-aq) = 29183e61d6b1a38853151426c2d4ffe45efd9c43
22SHA1 (patch-aw) = db73e21e67dc4200312285973faaaed308ea436e 22SHA1 (patch-aw) = db73e21e67dc4200312285973faaaed308ea436e
23SHA1 (patch-ax) = 2d5cfeef594ed34249828b6d7c222b17901a4164 23SHA1 (patch-ax) = 2d5cfeef594ed34249828b6d7c222b17901a4164
24SHA1 (patch-ba) = add9ecd6cff002525b2bc63aad7eb142e610b190 24SHA1 (patch-ba) = 6913628bbbd38596b008730be49a79ed038dd9fb
25SHA1 (patch-bb) = 02739e33cc1f35294257125c39a1223e0e1b07a6 25SHA1 (patch-bb) = 02739e33cc1f35294257125c39a1223e0e1b07a6
26SHA1 (patch-bm) = 3e297a2dece8dcad7bde86f79f944a98d09174a7 26SHA1 (patch-bm) = 3e297a2dece8dcad7bde86f79f944a98d09174a7
27SHA1 (patch-bo) = 6e06648e1ea9320349f3b2a524055b513ca74358 27SHA1 (patch-bo) = 6e06648e1ea9320349f3b2a524055b513ca74358
28SHA1 (patch-bq) = 2b29436d138fea4e1941d537be1a636969db9a77 28SHA1 (patch-bq) = 2b29436d138fea4e1941d537be1a636969db9a77
29SHA1 (patch-br) = 17c64ca592a5482a780ad3bc6d5f835ed2c91588 29SHA1 (patch-br) = 17c64ca592a5482a780ad3bc6d5f835ed2c91588
30SHA1 (patch-bs) = 3263560fed55d5c7075f28d405d9d705608bfb67 30SHA1 (patch-bs) = 3263560fed55d5c7075f28d405d9d705608bfb67
31SHA1 (patch-bu) = db33b8651e3cb1fbf9a18dbe78e1e8288cfda0ee 31SHA1 (patch-bu) = db33b8651e3cb1fbf9a18dbe78e1e8288cfda0ee
32SHA1 (patch-bv) = 4f23dfd885131ea866f31370f1421e7c19706860 32SHA1 (patch-bv) = 4f23dfd885131ea866f31370f1421e7c19706860
33SHA1 (patch-bw) = a9924b3db72bcf6949c9a6fc36d56220c8f68d4e 33SHA1 (patch-bw) = a9924b3db72bcf6949c9a6fc36d56220c8f68d4e
34SHA1 (patch-bx) = 046e19c9c4b431369411658373b14c1822841d85 34SHA1 (patch-bx) = 046e19c9c4b431369411658373b14c1822841d85
35SHA1 (patch-by) = 643185af7a0df7030b2b96447ee4031dc9c82f88 35SHA1 (patch-by) = 643185af7a0df7030b2b96447ee4031dc9c82f88
36SHA1 (patch-bz) = 6f854d74a9d1d1174ce8eff7d65f8024a7da4711 36SHA1 (patch-bz) = 6f854d74a9d1d1174ce8eff7d65f8024a7da4711
37SHA1 (patch-ca) = 479ef14631ae019ae5ca1c08a2f786294f3e972b 37SHA1 (patch-ca) = 479ef14631ae019ae5ca1c08a2f786294f3e972b
cvs diff -r1.7 -r1.8 pkgsrc/www/seamonkey/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/www/seamonkey/Attic/buildlink3.mk 2006/07/08 23:11:13 1.7
+++ pkgsrc/www/seamonkey/Attic/buildlink3.mk 2008/05/19 10:43:02 1.8
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:13 jlam Exp $ 1# $NetBSD: buildlink3.mk,v 1.8 2008/05/19 10:43:02 tnn Exp $
2 2
3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ 3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
4SEAMONKEY_BUILDLINK3_MK:= ${SEAMONKEY_BUILDLINK3_MK}+ 4SEAMONKEY_BUILDLINK3_MK:= ${SEAMONKEY_BUILDLINK3_MK}+
5 5
6.if !empty(BUILDLINK_DEPTH:M+) 6.if !empty(BUILDLINK_DEPTH:M+)
7BUILDLINK_DEPENDS+= seamonkey 7BUILDLINK_DEPENDS+= seamonkey
8.endif 8.endif
9 9
10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nseamonkey} 10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nseamonkey}
11BUILDLINK_PACKAGES+= seamonkey 11BUILDLINK_PACKAGES+= seamonkey
12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}seamonkey 12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}seamonkey
13 13
14.if !empty(SEAMONKEY_BUILDLINK3_MK:M+) 14.if !empty(SEAMONKEY_BUILDLINK3_MK:M+)
15BUILDLINK_API_DEPENDS.seamonkey+= seamonkey>=1.0 15BUILDLINK_API_DEPENDS.seamonkey+= seamonkey>=1.0
16BUILDLINK_ABI_DEPENDS.seamonkey?= seamonkey>=1.0.1nb1 16BUILDLINK_ABI_DEPENDS.seamonkey?= seamonkey>=1.0.1nb1
17BUILDLINK_PKGSRCDIR.seamonkey?= ../../www/seamonkey 17BUILDLINK_PKGSRCDIR.seamonkey?= ../../www/seamonkey
18.endif # SEAMONKEY_BUILDLINK3_MK 18.endif # SEAMONKEY_BUILDLINK3_MK
19 19
20.include "../../graphics/freetype2/buildlink3.mk" 20.include "../../graphics/freetype2/buildlink3.mk"
21.include "../../graphics/jpeg/buildlink3.mk" 21.include "../../graphics/jpeg/buildlink3.mk"
22.include "../../graphics/png/buildlink3.mk" 22.include "../../graphics/png/buildlink3.mk"
23.include "../../net/libIDL/buildlink3.mk" 23.include "../../net/libIDL/buildlink3.mk"
24.include "../../x11/gtk2/buildlink3.mk" 24.include "../../x11/gtk2/buildlink3.mk"
25 25
26BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} 26BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
cvs diff -r1.10 -r1.11 pkgsrc/www/seamonkey/options.mk (expand / switch to unified diff)

--- pkgsrc/www/seamonkey/options.mk 2008/03/02 15:24:07 1.10
+++ pkgsrc/www/seamonkey/options.mk 2008/05/19 10:43:02 1.11
@@ -1,17 +1,19 @@ @@ -1,17 +1,19 @@
1# $NetBSD: options.mk,v 1.10 2008/03/02 15:24:07 abs Exp $ 1# $NetBSD: options.mk,v 1.11 2008/05/19 10:43:02 tnn Exp $
 2# used by www/firefox/Makefile.common
 3# used by www/seamonkey/Makefile.common
2 4
3PKG_OPTIONS_VAR = PKG_OPTIONS.gecko 5PKG_OPTIONS_VAR= PKG_OPTIONS.gecko
4PKG_SUPPORTED_OPTIONS = debug official-mozilla-branding 6PKG_SUPPORTED_OPTIONS= debug official-mozilla-branding
5 7
6.if ( ${MOZILLA_BIN} == "firefox-bin" || ${MOZILLA_BIN} == "seamonkey-bin" || ${MOZILLA_BIN} == "thunderbird-bin" ) 8.if ( ${MOZILLA_BIN} == "firefox-bin" || ${MOZILLA_BIN} == "seamonkey-bin" || ${MOZILLA_BIN} == "thunderbird-bin" )
7PKG_SUPPORTED_OPTIONS += mozilla-single-profile 9PKG_SUPPORTED_OPTIONS += mozilla-single-profile
8.endif 10.endif
9 11
10.include "../../mk/bsd.options.mk" 12.include "../../mk/bsd.options.mk"
11 13
12# this .if test looks backward, but the missing options disables debug, 14# this .if test looks backward, but the missing options disables debug,
13# so it is correct 15# so it is correct
14.if empty(PKG_OPTIONS:Mdebug) 16.if empty(PKG_OPTIONS:Mdebug)
15CONFIGURE_ARGS+= --disable-debug 17CONFIGURE_ARGS+= --disable-debug
16.else 18.else
17CONFIGURE_ARGS+= --enable-debug 19CONFIGURE_ARGS+= --enable-debug
cvs diff -r1.1.1.1 -r1.2 pkgsrc/www/seamonkey/patches/Attic/patch-ba (expand / switch to unified diff)

--- pkgsrc/www/seamonkey/patches/Attic/patch-ba 2006/03/30 19:15:48 1.1.1.1
+++ pkgsrc/www/seamonkey/patches/Attic/patch-ba 2008/05/19 10:43:02 1.2
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1$NetBSD: patch-ba,v 1.1.1.1 2006/03/30 19:15:48 ghen Exp $ 1$NetBSD: patch-ba,v 1.2 2008/05/19 10:43:02 tnn Exp $
2 2
3--- nsprpub/pr/include/md/_netbsd.cfg.orig 2004-04-28 02:33:44.000000000 +0200 3--- nsprpub/pr/include/md/_netbsd.cfg.orig 2004-04-28 02:33:44.000000000 +0200
4+++ nsprpub/pr/include/md/_netbsd.cfg 4+++ nsprpub/pr/include/md/_netbsd.cfg
5@@ -48,7 +48,8 @@ 5@@ -48,7 +48,8 @@
6  6
7 #define PR_AF_INET6 24 /* same as AF_INET6 */ 7 #define PR_AF_INET6 24 /* same as AF_INET6 */
8  8
9-#if defined(__i386__) || defined(__arm32__) || defined(__MIPSEL__) 9-#if defined(__i386__) || defined(__arm32__) || defined(__MIPSEL__)
10+#if defined(__i386__) || defined(__arm32__) || defined(__ARMEL__) || \ 10+#if defined(__i386__) || defined(__arm32__) || defined(__ARMEL__) || \
11+ defined(__MIPSEL__) 11+ defined(__MIPSEL__)
12  12
13 #define IS_LITTLE_ENDIAN 1 13 #define IS_LITTLE_ENDIAN 1
14 #undef IS_BIG_ENDIAN 14 #undef IS_BIG_ENDIAN
15@@ -94,7 +95,53 @@ 15@@ -94,7 +95,53 @@
16 #define PR_ALIGN_OF_DOUBLE 4 16 #define PR_ALIGN_OF_DOUBLE 4
17 #define PR_ALIGN_OF_POINTER 4 17 #define PR_ALIGN_OF_POINTER 4
18  18
19-#elif defined(__sparc__) || defined(__MIPSEB__) 19-#elif defined(__sparc__) || defined(__MIPSEB__)
20+#elif defined(__sparc_v9__) 20+#elif defined(__sparcv9)
21+ 21+
22+#undef IS_LITTLE_ENDIAN 22+#undef IS_LITTLE_ENDIAN
23+#define IS_BIG_ENDIAN 1 23+#define IS_BIG_ENDIAN 1
24+#define HAVE_LONG_LONG 24+#define HAVE_LONG_LONG
25+#define HAVE_ALIGNED_DOUBLES 25+#define HAVE_ALIGNED_DOUBLES
26+#define HAVE_ALIGNED_LONGLONGS 26+#define HAVE_ALIGNED_LONGLONGS
27+ 27+
28+#define PR_BYTES_PER_BYTE 1 28+#define PR_BYTES_PER_BYTE 1
29+#define PR_BYTES_PER_SHORT 2 29+#define PR_BYTES_PER_SHORT 2
30+#define PR_BYTES_PER_INT 4 30+#define PR_BYTES_PER_INT 4
31+#define PR_BYTES_PER_INT64 8 31+#define PR_BYTES_PER_INT64 8
32+#define PR_BYTES_PER_LONG 8 32+#define PR_BYTES_PER_LONG 8
33+#define PR_BYTES_PER_FLOAT 4 33+#define PR_BYTES_PER_FLOAT 4