aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--french/mozilla-flp/Makefile26
-rw-r--r--french/mozilla-flp/distinfo.seamonkey3
-rw-r--r--french/mozilla-flp/pkg-descr4
-rw-r--r--french/mozilla-flp/pkg-plist1
-rw-r--r--www/adblock/Makefile15
-rw-r--r--www/adblock/pkg-descr2
-rw-r--r--www/bugmenot/Makefile14
-rw-r--r--www/bugmenot/pkg-descr4
-rw-r--r--www/bugmenot/pkg-plist2
-rw-r--r--www/mozex/Makefile18
-rw-r--r--www/mozex/Makefile.xpi48
-rw-r--r--www/mozex/files/pkg-message.in (renamed from www/mozex/pkg-message)2
-rw-r--r--www/mozex/pkg-descr2
-rw-r--r--www/mozex/pkg-install.xpi17
-rw-r--r--www/mozex/pkg-plist2
-rw-r--r--www/preferential/Makefile14
-rw-r--r--www/preferential/pkg-descr2
-rw-r--r--www/preferential/pkg-plist2
18 files changed, 87 insertions, 91 deletions
diff --git a/french/mozilla-flp/Makefile b/french/mozilla-flp/Makefile
index 712321854f35..d613b8a625f2 100644
--- a/french/mozilla-flp/Makefile
+++ b/french/mozilla-flp/Makefile
@@ -5,23 +5,21 @@
# $FreeBSD$
#
-PORTNAME= mozilla-flp
-PORTVERSION= 1.7.13
+PORTNAME= ${GECKO}-flp
+PORTVERSION= ${MOZVERSION}
+PORTEPOCH= 1
CATEGORIES= french www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
- http://frenchmozilla.sourceforge.net/FTP/${PORTVERSION}/
+ http://frenchmozilla.sourceforge.net/FTP/${PORTVERSION}${DISTURL}/
MASTER_SITE_SUBDIR= frenchmozilla
-DISTNAME= mozilla-${PORTVERSION}.fr-FR.langpack
+DISTNAME= ${GECKO}-${PORTVERSION}.fr-FR.langpack
MAINTAINER= thierry@FreeBSD.org
-COMMENT= Mozilla French Language Pack (FLP)
+COMMENT= ${GECKO} French Language Pack (FLP)
USE_X_PREFIX= yes # Cannot be included after <bsd.port.pre.mk>.
WRKSRC= ${WRKDIR}/bin
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/mozex/Makefile.xpi"
-
REPS= defaults/profile/FR/chrome defaults/messenger/FR defaults/isp/FR
FICHIERS= chrome/FR.jar chrome/fr-FR.jar chrome/fr-unix.jar \
components/myspell/fr-FR.aff components/myspell/fr-FR.dic \
@@ -35,6 +33,18 @@ FICHIERS= chrome/FR.jar chrome/fr-FR.jar chrome/fr-unix.jar \
searchplugins/dmoz.src searchplugins/google.gif searchplugins/google.src\
searchplugins/googlefr.gif searchplugins/googlefr.src
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/www/mozex/Makefile.xpi"
+
+.if ${GECKO} == seamonkey
+MOZVERSION= 1.0.4
+DISTURL= /SeaMonkey
+MD5_FILE= ${MASTERDIR}/distinfo.seamonkey
+.else
+MOZVERSION= 1.7.13
+DISTURL= # No subdir
+.endif
+
do-install:
.for rep in ${REPS}
@${MKDIR} ${MOZDIR}/${rep}
diff --git a/french/mozilla-flp/distinfo.seamonkey b/french/mozilla-flp/distinfo.seamonkey
new file mode 100644
index 000000000000..6776300a6ed0
--- /dev/null
+++ b/french/mozilla-flp/distinfo.seamonkey
@@ -0,0 +1,3 @@
+MD5 (seamonkey-1.0.4.fr-FR.langpack.xpi) = 2a116d5dd47a0478ed2ad16d1113c698
+SHA256 (seamonkey-1.0.4.fr-FR.langpack.xpi) = f9db1bfc90ab271e4e19c84aa50ef10aab87c4de22f59d3a3c80564f4902b5b5
+SIZE (seamonkey-1.0.4.fr-FR.langpack.xpi) = 1040061
diff --git a/french/mozilla-flp/pkg-descr b/french/mozilla-flp/pkg-descr
index dae9a0bbb240..a3af24a7de7e 100644
--- a/french/mozilla-flp/pkg-descr
+++ b/french/mozilla-flp/pkg-descr
@@ -1,3 +1,3 @@
-Module de francisation de Mozilla.
+Module de francisation de Mozilla / SeaMonkey.
-WWW: http://frenchmozilla.org/
+WWW: http://frenchmozilla.sourceforge.net/
diff --git a/french/mozilla-flp/pkg-plist b/french/mozilla-flp/pkg-plist
index 08705364c8fc..8099dba0bae1 100644
--- a/french/mozilla-flp/pkg-plist
+++ b/french/mozilla-flp/pkg-plist
@@ -18,3 +18,4 @@
@dirrm %%MOZDIR%%/defaults/profile/FR
@dirrm %%MOZDIR%%/defaults/messenger/FR
@dirrm %%MOZDIR%%/defaults/isp/FR
+@dirrmtry %%MOZDIR%%/defaults/isp
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