Fix assorted pkglint complaints and warns.

11 files changed, 44 insertions, 38 deletions

diff --git a/www/firefox-gtk1/buildlink3.mk b/www/firefox-gtk1/buildlink3.mk
index dbf027ee091..ddea80e2821 100644
--- a/www/firefox-gtk1/buildlink3.mk
+++ b/www/firefox-gtk1/buildlink3.mk
@@ -1,7 +1,7 @@
-# $NetBSD: buildlink3.mk,v 1.14 2007/05/12 13:53:11 ghen Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2008/05/19 10:43:02 tnn Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-FIREFOX_GTK2_BUILDLINK3_MK:=	${FIREFOX_GTK2_BUILDLINK3_MK}+
+FIREFOX_GTK1_BUILDLINK3_MK:=	${FIREFOX_GTK1_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	firefox-gtk1
@@ -11,10 +11,10 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfirefox-gtk1}
 BUILDLINK_PACKAGES+=	firefox-gtk1
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}firefox-gtk1
 
-.if !empty(FIREFOX_GTK2_BUILDLINK3_MK:M+)
+.if !empty(FIREFOX_GTK1_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.firefox-gtk1+=	firefox-gtk1>=2.0
 BUILDLINK_ABI_DEPENDS.firefox-gtk1+=	firefox-gtk1>=2.0.0.3nb1
 BUILDLINK_PKGSRCDIR.firefox-gtk1?=	../../www/firefox-gtk1
-.endif	# FIREFOX_GTK2_BUILDLINK3_MK
+.endif	# FIREFOX_GTK1_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/firefox/Makefile-firefox.common b/www/firefox/Makefile-firefox.common
index d5a91b51404..def7ab7b24c 100644
--- a/www/firefox/Makefile-firefox.common
+++ b/www/firefox/Makefile-firefox.common
@@ -1,4 +1,5 @@
-# $NetBSD: Makefile-firefox.common,v 1.56 2008/04/17 07:39:20 ghen Exp $
+# $NetBSD: Makefile-firefox.common,v 1.57 2008/05/19 10:43:02 tnn Exp $
+# used by www/firefox/Makefile
 
 MOZILLA_BIN=		firefox-bin
 MOZ_VER=		2.0.0.14
diff --git a/www/firefox/Makefile.common b/www/firefox/Makefile.common
index 7af105e9bcf..a70be25c163 100644
--- a/www/firefox/Makefile.common
+++ b/www/firefox/Makefile.common
@@ -1,4 +1,5 @@
-# $NetBSD: Makefile.common,v 1.24 2008/02/08 10:34:19 tnn Exp $
+# $NetBSD: Makefile.common,v 1.25 2008/05/19 10:43:02 tnn Exp $
+# used by www/firefox/Makefile-firefox.common
 
 MOZ_DIST_VER?=		${MOZ_VER}
 DISTNAME?=		mozilla-${MOZ_DIST_VER}-source
@@ -183,7 +184,7 @@ post-build:
 # do that part dynamically rather than trying to always keep our conditionals
 # up to date.  Note that the exact set of libfreebl libs has had a history
 # of changing even on minor releases.
-PLIST_SRC=      ${WRKDIR}/PLIST
+PLIST_SRC=	${WRKDIR}/PLIST
 pre-install:
 	cd ${WRKSRC:Q}/dist/bin && ls libfreebl*.${SO_SUFFIX} | ${SORT}  | \
 		${AWK} '{print "lib/$${MOZILLA}/" $$0}' > ${WRKSRC}/PLIST.libfreebl
@@ -206,9 +207,9 @@ post-install:
 .include "../../mk/pthread.buildlink3.mk"
 
 .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none")
-CONFIGURE_ARGS+=	 --without-pthreads
+CONFIGURE_ARGS+=	--without-pthreads
 .else
-CONFIGURE_ARGS+=	 --with-pthreads
+CONFIGURE_ARGS+=	--with-pthreads
 .endif
 
 .if ${MOZILLA_USE_XFT} == "YES"
diff --git a/www/firefox/buildlink3.mk b/www/firefox/buildlink3.mk
index c3a61c1e3a4..206ccfcf117 100644
--- a/www/firefox/buildlink3.mk
+++ b/www/firefox/buildlink3.mk
@@ -1,15 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.15 2007/05/12 13:53:07 ghen Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2008/05/19 10:43:02 tnn Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-FIREFOX_BUILDLINK3_MK:=		${FIREFOX_BUILDLINK3_MK}+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+FIREFOX_BUILDLINK3_MK:=	${FIREFOX_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=		firefox
 .endif
 
-BUILDLINK_PACKAGES:=		${BUILDLINK_PACKAGES:Nfirefox}
-BUILDLINK_PACKAGES+=		firefox
-BUILDLINK_ORDER:=		${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}firefox
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfirefox}
+BUILDLINK_PACKAGES+=	firefox
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}firefox
 
 .if !empty(FIREFOX_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.firefox+=	firefox>=2.0
@@ -17,4 +17,4 @@ BUILDLINK_ABI_DEPENDS.firefox+=	firefox>=2.0.0.3nb1
 BUILDLINK_PKGSRCDIR.firefox?=	../../www/firefox
 .endif	# FIREFOX_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 6c610518821..293a6308d3a 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.76 2008/04/17 07:39:20 ghen Exp $
+$NetBSD: distinfo,v 1.77 2008/05/19 10:43:02 tnn Exp $
 
 SHA1 (firefox-2.0.0.14-source.tar.bz2) = de263675a137a8e2b25757c4d292e7a3e2434f74
 RMD160 (firefox-2.0.0.14-source.tar.bz2) = 31eec3454946cfb1c57bd71f32c2a41982276006
@@ -21,7 +21,7 @@ SHA1 (patch-ap) = 58b4867336c73c3908e508501025bdbd8e2e8b30
 SHA1 (patch-aq) = 59c1c9922413fd50e1b0573158ad56439a79debf
 SHA1 (patch-aw) = 9d4388a7bd89b7ca884b9e7eb4855e3afb8e8c3a
 SHA1 (patch-ax) = 1518e5bb0ee162d7c4135a6cfb8112da83a38855
-SHA1 (patch-ba) = 5e64f23ec426f9baef29f397084dba7158279071
+SHA1 (patch-ba) = f0f3e17b4e2d383d5c45462fa2e3e69b22495932
 SHA1 (patch-bb) = 4ade97ffe2c8b16262dfa992e47ad7c9a666d037
 SHA1 (patch-bm) = a0a69ca516e8a569d5e61293d5610b236192bf85
 SHA1 (patch-bo) = 6e06648e1ea9320349f3b2a524055b513ca74358
diff --git a/www/firefox/patches/patch-ba b/www/firefox/patches/patch-ba
index 8f4eed6a8e5..516a4956042 100644
--- a/www/firefox/patches/patch-ba
+++ b/www/firefox/patches/patch-ba
@@ -1,4 +1,4 @@
-$NetBSD: patch-ba,v 1.6 2007/05/12 13:53:08 ghen Exp $
+$NetBSD: patch-ba,v 1.7 2008/05/19 10:43:02 tnn Exp $
 
 diff -ruN ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg ./nsprpub/pr/include/md/_netbsd.cfg
 --- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg	2004-04-28 09:33:44.000000000 +0900
@@ -18,7 +18,7 @@ diff -ruN ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg ./nsprpub/pr/include
  #define PR_ALIGN_OF_POINTER 4
  
 -#elif defined(__sparc__) || defined(__MIPSEB__)
-+#elif defined(__sparc_v9__)
++#elif defined(__sparcv9)
 +
 +#undef IS_LITTLE_ENDIAN
 +#define  IS_BIG_ENDIAN 1
@@ -64,7 +64,7 @@ diff -ruN ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg ./nsprpub/pr/include
 +#define PR_ALIGN_OF_DOUBLE  8 
 +#define PR_ALIGN_OF_POINTER 8 
 +
-+#elif defined(__sparc__) || defined(__MIPSEB__) || defined(__ARMEB__)
++#elif defined(__sparc) || defined(__MIPSEB__) || defined(__ARMEB__)
  
  #undef IS_LITTLE_ENDIAN
  #define  IS_BIG_ENDIAN 1
diff --git a/www/seamonkey/Makefile.common b/www/seamonkey/Makefile.common
index 089e1ce7bde..f79d5c78fac 100644
--- a/www/seamonkey/Makefile.common
+++ b/www/seamonkey/Makefile.common
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile.common,v 1.29 2008/02/08 10:34:19 tnn Exp $
+# $NetBSD: Makefile.common,v 1.30 2008/05/19 10:43:02 tnn Exp $
+# used by mail/thunderbird/Makefile-thunderbird.common
+# used by www/seamonkey/Makefile-seamonkey.common
 
 MOZ_DIST_VER?=		${MOZ_VER}
 DISTNAME?=		seamonkey-${MOZ_DIST_VER}.source
diff --git a/www/seamonkey/buildlink3.mk b/www/seamonkey/buildlink3.mk
index 257c8396361..747c507216c 100644
--- a/www/seamonkey/buildlink3.mk
+++ b/www/seamonkey/buildlink3.mk
@@ -1,19 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2008/05/19 10:43:02 tnn Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-SEAMONKEY_BUILDLINK3_MK:=		${SEAMONKEY_BUILDLINK3_MK}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+SEAMONKEY_BUILDLINK3_MK:=	${SEAMONKEY_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=			seamonkey
+BUILDLINK_DEPENDS+=	seamonkey
 .endif
 
-BUILDLINK_PACKAGES:=			${BUILDLINK_PACKAGES:Nseamonkey}
-BUILDLINK_PACKAGES+=			seamonkey
-BUILDLINK_ORDER:=			${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}seamonkey
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nseamonkey}
+BUILDLINK_PACKAGES+=	seamonkey
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}seamonkey
 
 .if !empty(SEAMONKEY_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.seamonkey+=	seamonkey>=1.0
-BUILDLINK_ABI_DEPENDS.seamonkey?=		seamonkey>=1.0.1nb1
+BUILDLINK_ABI_DEPENDS.seamonkey?=	seamonkey>=1.0.1nb1
 BUILDLINK_PKGSRCDIR.seamonkey?=		../../www/seamonkey
 .endif	# SEAMONKEY_BUILDLINK3_MK
 
@@ -23,4 +23,4 @@ BUILDLINK_PKGSRCDIR.seamonkey?=		../../www/seamonkey
 .include "../../net/libIDL/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo
index d13402267b5..d3e588259ba 100644
--- a/www/seamonkey/distinfo
+++ b/www/seamonkey/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2008/03/30 15:02:41 ghen Exp $
+$NetBSD: distinfo,v 1.30 2008/05/19 10:43:02 tnn Exp $
 
 SHA1 (seamonkey-1.1.9.source.tar.bz2) = e33d78a005d01f982e45db55034d776fda419e25
 RMD160 (seamonkey-1.1.9.source.tar.bz2) = 30ae304710fae33f83bdbb57b1d9092eb6ed8daf
@@ -21,7 +21,7 @@ SHA1 (patch-ap) = b696056ad90e539cb537e95b163385a48c8ea2cc
 SHA1 (patch-aq) = 29183e61d6b1a38853151426c2d4ffe45efd9c43
 SHA1 (patch-aw) = db73e21e67dc4200312285973faaaed308ea436e
 SHA1 (patch-ax) = 2d5cfeef594ed34249828b6d7c222b17901a4164
-SHA1 (patch-ba) = add9ecd6cff002525b2bc63aad7eb142e610b190
+SHA1 (patch-ba) = 6913628bbbd38596b008730be49a79ed038dd9fb
 SHA1 (patch-bb) = 02739e33cc1f35294257125c39a1223e0e1b07a6
 SHA1 (patch-bm) = 3e297a2dece8dcad7bde86f79f944a98d09174a7
 SHA1 (patch-bo) = 6e06648e1ea9320349f3b2a524055b513ca74358
diff --git a/www/seamonkey/options.mk b/www/seamonkey/options.mk
index 3a014d6dd0b..bf782750792 100644
--- a/www/seamonkey/options.mk
+++ b/www/seamonkey/options.mk
@@ -1,7 +1,9 @@
-# $NetBSD: options.mk,v 1.10 2008/03/02 15:24:07 abs Exp $
+# $NetBSD: options.mk,v 1.11 2008/05/19 10:43:02 tnn Exp $
+# used by www/firefox/Makefile.common
+# used by www/seamonkey/Makefile.common
 
-PKG_OPTIONS_VAR		= PKG_OPTIONS.gecko
-PKG_SUPPORTED_OPTIONS	= debug official-mozilla-branding
+PKG_OPTIONS_VAR=	PKG_OPTIONS.gecko
+PKG_SUPPORTED_OPTIONS=	debug official-mozilla-branding
 
 .if ( ${MOZILLA_BIN} == "firefox-bin" || ${MOZILLA_BIN} == "seamonkey-bin" || ${MOZILLA_BIN} == "thunderbird-bin" )
 PKG_SUPPORTED_OPTIONS  += mozilla-single-profile
diff --git a/www/seamonkey/patches/patch-ba b/www/seamonkey/patches/patch-ba
index cce6c7c18bd..a71137872ee 100644
--- a/www/seamonkey/patches/patch-ba
+++ b/www/seamonkey/patches/patch-ba
@@ -1,4 +1,4 @@
-$NetBSD: patch-ba,v 1.1.1.1 2006/03/30 19:15:48 ghen Exp $
+$NetBSD: patch-ba,v 1.2 2008/05/19 10:43:02 tnn Exp $
 
 --- nsprpub/pr/include/md/_netbsd.cfg.orig	2004-04-28 02:33:44.000000000 +0200
 +++ nsprpub/pr/include/md/_netbsd.cfg
@@ -17,7 +17,7 @@ $NetBSD: patch-ba,v 1.1.1.1 2006/03/30 19:15:48 ghen Exp $
  #define PR_ALIGN_OF_POINTER 4
  
 -#elif defined(__sparc__) || defined(__MIPSEB__)
-+#elif defined(__sparc_v9__)
++#elif defined(__sparcv9)
 +
 +#undef IS_LITTLE_ENDIAN
 +#define  IS_BIG_ENDIAN 1