Add Seamonkey's support, with some cleaning.

14 files changed, 63 insertions, 81 deletions

diff --git a/www/adblock/Makefile b/www/adblock/Makefile
index cd27a09fe35e..12b2dc219122 100644
--- a/www/adblock/Makefile
+++ b/www/adblock/Makefile
@@ -5,27 +5,28 @@
 # $FreeBSD$
 #
 
-PORTNAME?=	adblock
+PORTNAME=	adblock
 DISTVERSION=	0.5-dev
-PORTREVISION?=	0
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	thierry
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
-COMMENT?=	A content filtering plug-in for Mozilla
+COMMENT=	A content filtering plug-in for ${GECKO}
 
 USE_X_PREFIX=	yes
 
-PLIST_FILES=	%%MOZDIR%%/chrome/adblock.jar	\
-		%%MOZDIR%%/chrome/overlayinfo/mozapps/content/overlays.rdf
-
-SLAVEDIRS=	www/adblock-firefox
+PLIST_FILES=	%%MOZDIR%%/chrome/adblock.jar
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/www/mozex/Makefile.xpi"
 
+.if ${GECKO} == mozilla
+PLIST_FILES+=	%%MOZDIR%%/chrome/overlayinfo/mozapps/content/overlays.rdf
+.endif
+
 do-install:
 	@${INSTALL_DATA} ${WRKDIR}/chrome/adblock.jar ${MOZDIR}/chrome
 
diff --git a/www/adblock/pkg-descr b/www/adblock/pkg-descr
index 069779f951b9..9c8a689fb2c8 100644
--- a/www/adblock/pkg-descr
+++ b/www/adblock/pkg-descr
@@ -1,4 +1,4 @@
-Adblock is a content filtering plug-in for the Mozilla and Firefox browsers.
+Adblock is a content filtering plug-in for the Mozilla and Seamonkey browsers.
 It is both more robust and more precise than the built-in image blocker.
 
 Adblock allows the user to specify filters, which remove unwanted content based
diff --git a/www/bugmenot/Makefile b/www/bugmenot/Makefile
index e464b408449b..9cec1c1b636a 100644
--- a/www/bugmenot/Makefile
+++ b/www/bugmenot/Makefile
@@ -5,22 +5,28 @@
 # $FreeBSD$
 #
 
-PORTNAME?=	bugmenot
+PORTNAME=	bugmenot
 PORTVERSION=	0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://extensions.roachfiend.com/
 DISTNAME=	${PORTNAME}
-DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}_${PORTREVISION}
+DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}_1
 
 MAINTAINER=	thierry@FreeBSD.org
-COMMENT?=	Mozilla extension to bypass compulsory web registration
+COMMENT=	${GECKO} extension to bypass compulsory web registration
 
 USE_X_PREFIX=	yes	# Cannot be included after <bsd.port.pre.mk>.
 
+PLIST_FILES=	%%MOZDIR%%/chrome/bugmenot.jar
+
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/www/mozex/Makefile.xpi"
 
+.if ${GECKO} == mozilla
+PLIST_FILES+=	%%MOZDIR%%/chrome/overlayinfo/browser/content/overlays.rdf
+.endif
+
 do-install:
 	@${INSTALL_DATA} ${WRKDIR}/chrome/bugmenot.jar ${MOZDIR}/chrome
 
diff --git a/www/bugmenot/pkg-descr b/www/bugmenot/pkg-descr
index 643bdfb54ef4..367d4be7caec 100644
--- a/www/bugmenot/pkg-descr
+++ b/www/bugmenot/pkg-descr
@@ -1,5 +1,5 @@
-Bypass compulsory web registration via Firefox's right-click context menu.
-Compatibile with Mozilla and current Firefox releases.
+Bypass compulsory web registration via Mozilla's right-click context menu.
+Compatibile with Mozilla and current Seamonkey releases.
 
 Visit bugmenot.com for full details of their service.
 
diff --git a/www/bugmenot/pkg-plist b/www/bugmenot/pkg-plist
deleted file mode 100644
index 0b390fcc476a..000000000000
--- a/www/bugmenot/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-%%MOZDIR%%/chrome/bugmenot.jar
-%%MOZDIR%%/chrome/overlayinfo/browser/content/overlays.rdf
diff --git a/www/mozex/Makefile b/www/mozex/Makefile
index 0931274d0c86..8bac7822c053 100644
--- a/www/mozex/Makefile
+++ b/www/mozex/Makefile
@@ -5,21 +5,31 @@
 # $FreeBSD$
 #
 
-PORTNAME?=	mozex
+PORTNAME=	mozex
 PORTVERSION=	1.07
-PORTREVISION?=	3
+PORTREVISION=	4
 CATEGORIES=	www mail news ftp
 MASTER_SITES=	${MASTER_SITE_MOZDEV}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER?=	ports@FreeBSD.org
-COMMENT?=	Mozex allows Mozilla's users to use external programs for mail, news, etc.
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Mozex allows users of ${GEKO} to use external programs for mail, news, etc.
 
 USE_X_PREFIX=	yes	# Cannot be included after <bsd.port.pre.mk>.
 
+SUB_FILES=	pkg-message
+SUB_LIST=	GECKO=${GECKO}
+PKGMESSAGE=	${WRKDIR}/pkg-message
+
+PLIST_FILES=	%%MOZDIR%%/chrome/mozex.jar
+
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/www/mozex/Makefile.xpi"
 
+.if ${GECKO} == mozilla
+PLIST_FILES+=	%%MOZDIR%%/chrome/overlayinfo/browser/content/overlays.rdf
+.endif
+
 do-install:
 	@${INSTALL_DATA} ${WRKDIR}/mozex.jar ${MOZDIR}/chrome
 
diff --git a/www/mozex/Makefile.xpi b/www/mozex/Makefile.xpi
index 95558f57d055..2ad122c92d2f 100644
--- a/www/mozex/Makefile.xpi
+++ b/www/mozex/Makefile.xpi
@@ -4,54 +4,26 @@
 # $FreeBSD$
 #
 
-EXTRACT_SUFX=   .xpi
+USE_GECKO=	seamonkey mozilla
+.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
 
-BUILD_DEPENDS+=	${MOZDIR}/regxpcom:${PORTSDIR}/www/${MOZPORT}
-RUN_DEPENDS+=	${MOZDIR}:${PORTSDIR}/www/${MOZPORT}
+EXTRACT_SUFX=   .xpi
 
 NO_BUILD=	yes
 USE_ZIP=	yes
 
-PKGINSTALL=	${PORTSDIR}/www/mozex/pkg-install.xpi
+PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${PKGINSTALL}
 
-.if !defined(WITH_FIREFOX)
-# "Regular" mozillas
-. if exists(${X11BASE}/lib)
-MOZDIR!=	${FIND} ${X11BASE}/lib -name mozilla-bin -exec dirname {} \; | ${HEAD} -n 1
-. else
-MOZDIR=
-. endif
-. if empty(MOZDIR)
-MOZPORT=	mozilla
-MOZDIR=		${X11BASE}/lib/${MOZPORT}
-. else
-MOZPORT!=	${BASENAME} ${MOZDIR}
-. endif
-MOZLDIR=	lib/${MOZPORT}
-.else
-# Firefox
-DEPRECATED=	"must be converted to include www/xpi-adblock/Makefile.xpi"
-PKGNAMESUFFIX=	-firefox
-. if exists(${X11BASE}/lib)
-MOZDIR!=	${FIND} ${X11BASE}/lib -name firefox-bin -exec dirname {} \; | ${HEAD} -n 1
-. else
-MOZDIR=
-. endif
-. if empty(MOZDIR)
-MOZVER=		firefox
-. else
-MOZVER!=	${BASENAME} ${MOZDIR}
-. endif
-MOZPORT=	firefox
-MOZLDIR=	lib/firefox
-.endif
-.if empty(MOZDIR)
+MOZLDIR=	lib/${GECKO}
 MOZDIR=		${X11BASE}/${MOZLDIR}
-.endif
-
 PLIST_SUB=	MOZDIR=${MOZLDIR}
 
+pre-configure:
+	${SED} -e 's|%%GECKO%%|${GECKO}|g'	\
+		< ${.CURDIR}/../../www/mozex/pkg-install.xpi	\
+		> ${PKGINSTALL}
+
 pre-install:
 .if ${PREFIX} != ${X11BASE}
 	@${ECHO_MSG} ""
diff --git a/www/mozex/pkg-message b/www/mozex/files/pkg-message.in
index 54740e0ef8ef..ff22ac4a29ef 100644
--- a/www/mozex/pkg-message
+++ b/www/mozex/files/pkg-message.in
@@ -1,5 +1,5 @@
 **************************************************************************
-Mozex has been installed. If Mozilla is running, restart it.
+Mozex has been installed. If %%GECKO%% is running, restart it.
 A new "mozex" entry is present in page context menu (right click somewhere
 on the page), and you have to edit preferences (for every profile).
 
diff --git a/www/mozex/pkg-descr b/www/mozex/pkg-descr
index fe15d0df1edf..14fad01f61a4 100644
--- a/www/mozex/pkg-descr
+++ b/www/mozex/pkg-descr
@@ -1,4 +1,4 @@
-Mozex is an extension to Mozilla or Firefox which allows the user to use
+Mozex is an extension to Mozilla or Seamonkey which allows the user to use
 external programs for these actions:
 
     * view page source
diff --git a/www/mozex/pkg-install.xpi b/www/mozex/pkg-install.xpi
index cf216dc45c80..2315d7a8490d 100644
--- a/www/mozex/pkg-install.xpi
+++ b/www/mozex/pkg-install.xpi
@@ -4,7 +4,7 @@
 #
 # Date created:			  Mon Oct 27, 2003
 # Whom:				  Thierry Thomas (<thierry@pompo.net>)
-# Register the extension $1 in the chrome registry.
+# Register the extension $1 in the chrome registry for the browser %%GECKO%%.
 
 umask 022
 PATH=/bin:/usr/bin
@@ -15,27 +15,20 @@ PATH=/bin:/usr/bin
 
 PREFIX=${PKG_PREFIX:-/usr/X11R6}
 
-# If this is an extension for firefox, PKGNAMESUFFIX has been set
 PKG_NAME=${1%%-[0-9._]*}
-PKG_ROOT=$(echo $PKG_NAME | sed 's/-firefox$//')
-if [ $PKG_NAME = $PKG_ROOT ]; then
-MOZBIN=mozilla-bin
-else
-MOZBIN=firefox-bin
-fi
 
-MOZDIR=`find $PREFIX/lib -name $MOZBIN -exec dirname {} \; | head -n 1`
+MOZDIR=$PREFIX/lib/%%GECKO%%
 REGXPCOM=$MOZDIR/regxpcom
 REGCHROME=$MOZDIR/regchrome
 
 if [ "x$2" = "xPOST-DEINSTALL" ]; then
-	case $PKG_ROOT in
-		fr-mozilla-flp|fr-firefox-flp)
+	case $PKG_NAME in
+		fr-mozilla-flp)
 			MODEXT="FR.jar fr-unix.jar"
 			;;
 
 		*)
-			MODEXT=$PKG_ROOT
+			MODEXT=$PKG_NAME
 			;;
 	esac
 	# Removing definition of extension $MODEXT
diff --git a/www/mozex/pkg-plist b/www/mozex/pkg-plist
deleted file mode 100644
index c604d6193377..000000000000
--- a/www/mozex/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-%%MOZDIR%%/chrome/mozex.jar
-%%MOZDIR%%/chrome/overlayinfo/browser/content/overlays.rdf
diff --git a/www/preferential/Makefile b/www/preferential/Makefile
index 578df8d34376..eaece5814d54 100644
--- a/www/preferential/Makefile
+++ b/www/preferential/Makefile
@@ -5,22 +5,28 @@
 # $FreeBSD$
 #
 
-PORTNAME?=	preferential
+PORTNAME=	preferential
 PORTVERSION=	0.7.1
-PORTREVISION?=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZDEV}
 MASTER_SITE_SUBDIR=	${PORTNAME}/versions
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER?=	ports@FreeBSD.org
-COMMENT?=	GUI interface to view & edit all Mozilla prefs
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	GUI interface to view & edit all ${GECKO} prefs
 
 USE_X_PREFIX=	yes	# Cannot be included after <bsd.port.pre.mk>.
 
+PLIST_FILES=	%%MOZDIR%%/chrome/preferential.jar
+
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/www/mozex/Makefile.xpi"
 
+.if ${GECKO} == mozilla
+PLIST_FILES+=	%%MOZDIR%%/chrome/overlayinfo/browser/content/overlays.rdf
+.endif
+
 do-install:
 	@${INSTALL_DATA} ${WRKDIR}/chrome/preferential.jar ${MOZDIR}/chrome
 
diff --git a/www/preferential/pkg-descr b/www/preferential/pkg-descr
index f413839b2503..a191eeb59315 100644
--- a/www/preferential/pkg-descr
+++ b/www/preferential/pkg-descr
@@ -1,5 +1,5 @@
 The Preferential project aims to provide all users of Gecko browsers
-(eg. Mozilla, Firefox) with a simple, accessible GUI that allows the
+(eg. Mozilla, Seamonkey) with a simple, accessible GUI that allows the
 modification of any preference set within that browser environment.
 
 WWW: http://preferential.mozdev.org/
diff --git a/www/preferential/pkg-plist b/www/preferential/pkg-plist
deleted file mode 100644
index c7f67cfb7203..000000000000
--- a/www/preferential/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-%%MOZDIR%%/chrome/preferential.jar
-%%MOZDIR%%/chrome/overlayinfo/browser/content/overlays.rdf