aboutsummaryrefslogtreecommitdiffstats
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/firefox-esr/Makefile2
-rw-r--r--www/firefox-esr/pkg-deinstall.in20
-rw-r--r--www/firefox/Makefile2
-rw-r--r--www/firefox/pkg-deinstall.in20
-rw-r--r--www/firefox10/Makefile2
-rw-r--r--www/firefox10/pkg-deinstall.in20
-rw-r--r--www/firefox15/Makefile2
-rw-r--r--www/firefox15/pkg-deinstall.in20
-rw-r--r--www/firefox36/Makefile2
-rw-r--r--www/firefox36/pkg-deinstall.in20
-rw-r--r--www/flock/Makefile2
-rw-r--r--www/flock/pkg-deinstall.in20
-rw-r--r--www/mozilla/Makefile2
-rw-r--r--www/mozilla/Makefile.common6
-rw-r--r--www/mozilla/pkg-deinstall.in5
-rw-r--r--www/mozilla/pkg-install.in14
-rw-r--r--www/seamonkey/Makefile1
-rw-r--r--www/seamonkey/pkg-deinstall.in23
-rw-r--r--www/seamonkey2/Makefile1
-rw-r--r--www/seamonkey2/pkg-deinstall.in23
-rw-r--r--www/xulrunner/Makefile2
21 files changed, 30 insertions, 179 deletions
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index 27ae5726bcb7..954d16f29cd3 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -8,7 +8,7 @@
PORTNAME= firefox
DISTVERSION= 1.5.0.1
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA}
diff --git a/www/firefox-esr/pkg-deinstall.in b/www/firefox-esr/pkg-deinstall.in
deleted file mode 100644
index 0abb7e7c0458..000000000000
--- a/www/firefox-esr/pkg-deinstall.in
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-#
-# Date created: Mon Nov 29, 2003
-# Whom: Thierry Thomas (<thierry@pompo.net>)
-# Fix the chrome registry.
-
-umask 022
-PATH=/bin:/usr/bin
-
-[ "x$1" = "x" ] && exit 1
-[ "x$2" != "xDEINSTALL" ] && exit 0
-
-MOZDIR=%%MOZDIR%%
-
-rm -rf ${MOZDIR}/chrome/overlayinfo
-rm -f ${MOZDIR}/chrome/*.rdf
-rm -f ${MOZDIR}/component.reg
-rm -f ${MOZDIR}/components/*.dat
-
-exit 0
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 27ae5726bcb7..954d16f29cd3 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -8,7 +8,7 @@
PORTNAME= firefox
DISTVERSION= 1.5.0.1
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA}
diff --git a/www/firefox/pkg-deinstall.in b/www/firefox/pkg-deinstall.in
deleted file mode 100644
index 0abb7e7c0458..000000000000
--- a/www/firefox/pkg-deinstall.in
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-#
-# Date created: Mon Nov 29, 2003
-# Whom: Thierry Thomas (<thierry@pompo.net>)
-# Fix the chrome registry.
-
-umask 022
-PATH=/bin:/usr/bin
-
-[ "x$1" = "x" ] && exit 1
-[ "x$2" != "xDEINSTALL" ] && exit 0
-
-MOZDIR=%%MOZDIR%%
-
-rm -rf ${MOZDIR}/chrome/overlayinfo
-rm -f ${MOZDIR}/chrome/*.rdf
-rm -f ${MOZDIR}/component.reg
-rm -f ${MOZDIR}/components/*.dat
-
-exit 0
diff --git a/www/firefox10/Makefile b/www/firefox10/Makefile
index 27ae5726bcb7..954d16f29cd3 100644
--- a/www/firefox10/Makefile
+++ b/www/firefox10/Makefile
@@ -8,7 +8,7 @@
PORTNAME= firefox
DISTVERSION= 1.5.0.1
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA}
diff --git a/www/firefox10/pkg-deinstall.in b/www/firefox10/pkg-deinstall.in
deleted file mode 100644
index 0abb7e7c0458..000000000000
--- a/www/firefox10/pkg-deinstall.in
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-#
-# Date created: Mon Nov 29, 2003
-# Whom: Thierry Thomas (<thierry@pompo.net>)
-# Fix the chrome registry.
-
-umask 022
-PATH=/bin:/usr/bin
-
-[ "x$1" = "x" ] && exit 1
-[ "x$2" != "xDEINSTALL" ] && exit 0
-
-MOZDIR=%%MOZDIR%%
-
-rm -rf ${MOZDIR}/chrome/overlayinfo
-rm -f ${MOZDIR}/chrome/*.rdf
-rm -f ${MOZDIR}/component.reg
-rm -f ${MOZDIR}/components/*.dat
-
-exit 0
diff --git a/www/firefox15/Makefile b/www/firefox15/Makefile
index 27ae5726bcb7..954d16f29cd3 100644
--- a/www/firefox15/Makefile
+++ b/www/firefox15/Makefile
@@ -8,7 +8,7 @@
PORTNAME= firefox
DISTVERSION= 1.5.0.1
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA}
diff --git a/www/firefox15/pkg-deinstall.in b/www/firefox15/pkg-deinstall.in
deleted file mode 100644
index 0abb7e7c0458..000000000000
--- a/www/firefox15/pkg-deinstall.in
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-#
-# Date created: Mon Nov 29, 2003
-# Whom: Thierry Thomas (<thierry@pompo.net>)
-# Fix the chrome registry.
-
-umask 022
-PATH=/bin:/usr/bin
-
-[ "x$1" = "x" ] && exit 1
-[ "x$2" != "xDEINSTALL" ] && exit 0
-
-MOZDIR=%%MOZDIR%%
-
-rm -rf ${MOZDIR}/chrome/overlayinfo
-rm -f ${MOZDIR}/chrome/*.rdf
-rm -f ${MOZDIR}/component.reg
-rm -f ${MOZDIR}/components/*.dat
-
-exit 0
diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile
index 27ae5726bcb7..954d16f29cd3 100644
--- a/www/firefox36/Makefile
+++ b/www/firefox36/Makefile
@@ -8,7 +8,7 @@
PORTNAME= firefox
DISTVERSION= 1.5.0.1
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA}
diff --git a/www/firefox36/pkg-deinstall.in b/www/firefox36/pkg-deinstall.in
deleted file mode 100644
index 0abb7e7c0458..000000000000
--- a/www/firefox36/pkg-deinstall.in
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-#
-# Date created: Mon Nov 29, 2003
-# Whom: Thierry Thomas (<thierry@pompo.net>)
-# Fix the chrome registry.
-
-umask 022
-PATH=/bin:/usr/bin
-
-[ "x$1" = "x" ] && exit 1
-[ "x$2" != "xDEINSTALL" ] && exit 0
-
-MOZDIR=%%MOZDIR%%
-
-rm -rf ${MOZDIR}/chrome/overlayinfo
-rm -f ${MOZDIR}/chrome/*.rdf
-rm -f ${MOZDIR}/component.reg
-rm -f ${MOZDIR}/components/*.dat
-
-exit 0
diff --git a/www/flock/Makefile b/www/flock/Makefile
index 27ae5726bcb7..954d16f29cd3 100644
--- a/www/flock/Makefile
+++ b/www/flock/Makefile
@@ -8,7 +8,7 @@
PORTNAME= firefox
DISTVERSION= 1.5.0.1
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA}
diff --git a/www/flock/pkg-deinstall.in b/www/flock/pkg-deinstall.in
deleted file mode 100644
index 0abb7e7c0458..000000000000
--- a/www/flock/pkg-deinstall.in
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-#
-# Date created: Mon Nov 29, 2003
-# Whom: Thierry Thomas (<thierry@pompo.net>)
-# Fix the chrome registry.
-
-umask 022
-PATH=/bin:/usr/bin
-
-[ "x$1" = "x" ] && exit 1
-[ "x$2" != "xDEINSTALL" ] && exit 0
-
-MOZDIR=%%MOZDIR%%
-
-rm -rf ${MOZDIR}/chrome/overlayinfo
-rm -f ${MOZDIR}/chrome/*.rdf
-rm -f ${MOZDIR}/component.reg
-rm -f ${MOZDIR}/components/*.dat
-
-exit 0
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index adefce7f818f..fc658d31ec36 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -8,7 +8,7 @@
PORTNAME= mozilla
PORTVERSION= 1.7.12
-PORTREVISION?= 5
+PORTREVISION?= 6
PORTEPOCH= 2
CATEGORIES?= www
MASTER_SITES= ${MASTER_SITE_MOZILLA} \
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common
index b13f4e3f3d9c..3719edc177b2 100644
--- a/www/mozilla/Makefile.common
+++ b/www/mozilla/Makefile.common
@@ -77,6 +77,7 @@ USE_REINPLACE= yes
WRKSRC?= ${WRKDIR}/mozilla
FAKEDIR?= ${WRKDIR}/fake
PLIST?= ${WRKDIR}/plist
+MASTER_DIR?= ${.CURDIR}/../../www/mozilla
KRB5_HOME?= /usr
BROWSER_PLUGINS_DIR?= lib/browser_plugins
@@ -230,6 +231,7 @@ MOZ_SED_ARGS+= -e's|@CPPFLAGS@|${CPPFLAGS}|g' \
-e 's|%%FAKEDIR%%|${FAKEDIR}|g' \
-e 's|%%PERL%%|${PERL5}|g' \
-e 's|%%KRB5_HOME%%|${KRB5_HOME}|g' \
+ -e 's|%%MOZILLA%%|${MOZILLA}|g' \
-e 's|%%MOZDIR%%|${PREFIX}/lib/${MOZILLA}|g'
MOZCONFIG_SED?= ${SED} ${MOZ_SED_ARGS}
@@ -237,10 +239,10 @@ post-patch: gecko-post-patch gecko-moz-pis-patch
gecko-post-patch:
.if exists(${.CURDIR}/pkg-install.in)
- @${MOZCONFIG_SED} < ${.CURDIR}/pkg-install.in > ${PKGINSTALL}
+ @${MOZCONFIG_SED} < ${MASTER_DIR}/pkg-install.in > ${PKGINSTALL}
.endif
.if exists(${.CURDIR}/pkg-deinstall.in)
- @${MOZCONFIG_SED} < ${.CURDIR}/pkg-deinstall.in > ${PKGDEINSTALL}
+ @${MOZCONFIG_SED} < ${MASTER_DIR}/pkg-deinstall.in > ${PKGDEINSTALL}
.endif
@${RM} -f ${MOZCONFIG}
.if !defined(NOMOZCONFIG)
diff --git a/www/mozilla/pkg-deinstall.in b/www/mozilla/pkg-deinstall.in
index 8afb74b4514f..b3ae343e37de 100644
--- a/www/mozilla/pkg-deinstall.in
+++ b/www/mozilla/pkg-deinstall.in
@@ -19,5 +19,10 @@ rm -rf ${MOZDIR}/chrome/overlayinfo
rm -f ${MOZDIR}/chrome/*.rdf
rm -f ${MOZDIR}/component.reg
rm -f ${MOZDIR}/components/*.dat
+rm -f ${MOZDIR}/components.ini
+rm -f ${MOZDIR}/defaults.ini
+rm -f ${MOZDIR}/chrome/app-chrome.manifest
+rm -rf ${MOZDIR}/extensions
+rm -rf ${MOZDIR}/updates
exit 0
diff --git a/www/mozilla/pkg-install.in b/www/mozilla/pkg-install.in
index fbc57949a6da..0ae1cab8f3ec 100644
--- a/www/mozilla/pkg-install.in
+++ b/www/mozilla/pkg-install.in
@@ -14,6 +14,7 @@ PATH=/bin:/usr/bin
[ "x$2" != "xPOST-INSTALL" ] && exit 0
MOZDIR=%%MOZDIR%%
+MOZBIN=${MOZDIR}/%%MOZILLA%%-bin
REGXPCOM=${MOZDIR}/regxpcom
REGCHROME=${MOZDIR}/regchrome
@@ -22,11 +23,18 @@ rm -rf ${MOZDIR}/chrome/overlayinfo
rm -f ${MOZDIR}/chrome/*.rdf
mkdir -p ${MOZDIR}/chrome/overlayinfo
rm -f ${MOZDIR}/component.reg
+rm -rf ${MOZDIR}/extensions
cd ${MOZDIR} || exit 1
-./run-mozilla.sh ${REGXPCOM} || true
-./run-mozilla.sh ${REGCHROME} || true
-
+if [ -f ${REGXPCOM} ]; then
+ ./run-mozilla.sh ${REGXPCOM} || true
+fi
+if [ -f ${REGCHROME} ]; then
+ ./run-mozilla.sh ${REGCHROME} || true
+fi
+if [ -f ${MOZBIN} ]; then
+ ./run-mozilla.sh ${MOZBIN} -register > /dev/null 2>&1
+fi
if [ ! -d %%PREFIX%%/lib/browser_plugins ]; then
mkdir -p %%PREFIX%%/lib/browser_plugins
fi
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index ee0cf109beea..6adf9664771f 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -8,6 +8,7 @@
PORTNAME= seamonkey
DISTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES?= www
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}
diff --git a/www/seamonkey/pkg-deinstall.in b/www/seamonkey/pkg-deinstall.in
deleted file mode 100644
index 2aa8d7e4847a..000000000000
--- a/www/seamonkey/pkg-deinstall.in
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-# $MCom: ports-stable/www/seamonkey/pkg-deinstall.in,v 1.1 2006/03/09 21:26:46 ahze Exp $
-#
-# Date created: Mon Nov 29, 2003
-# Whom: Thierry Thomas (<thierry@pompo.net>)
-# Fix the chrome registry.
-
-umask 022
-PATH=/bin:/usr/bin
-
-[ "x$1" = "x" ] && exit 1
-[ "x$2" != "xDEINSTALL" ] && exit 0
-
-MOZDIR=%%MOZDIR%%
-
-rm -rf ${MOZDIR}/chrome/overlayinfo
-rm -f ${MOZDIR}/chrome/*.rdf
-rm -f ${MOZDIR}/component.reg
-rm -f ${MOZDIR}/components/*.dat
-
-exit 0
diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile
index ee0cf109beea..6adf9664771f 100644
--- a/www/seamonkey2/Makefile
+++ b/www/seamonkey2/Makefile
@@ -8,6 +8,7 @@
PORTNAME= seamonkey
DISTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES?= www
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}
diff --git a/www/seamonkey2/pkg-deinstall.in b/www/seamonkey2/pkg-deinstall.in
deleted file mode 100644
index 2aa8d7e4847a..000000000000
--- a/www/seamonkey2/pkg-deinstall.in
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-# $MCom: ports-stable/www/seamonkey/pkg-deinstall.in,v 1.1 2006/03/09 21:26:46 ahze Exp $
-#
-# Date created: Mon Nov 29, 2003
-# Whom: Thierry Thomas (<thierry@pompo.net>)
-# Fix the chrome registry.
-
-umask 022
-PATH=/bin:/usr/bin
-
-[ "x$1" = "x" ] && exit 1
-[ "x$2" != "xDEINSTALL" ] && exit 0
-
-MOZDIR=%%MOZDIR%%
-
-rm -rf ${MOZDIR}/chrome/overlayinfo
-rm -f ${MOZDIR}/chrome/*.rdf
-rm -f ${MOZDIR}/component.reg
-rm -f ${MOZDIR}/components/*.dat
-
-exit 0
diff --git a/www/xulrunner/Makefile b/www/xulrunner/Makefile
index 099944b17af4..0a729baee866 100644
--- a/www/xulrunner/Makefile
+++ b/www/xulrunner/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xulrunner
PORTVERSION= 1.8.0.1
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES?= www devel
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= xulrunner/releases/${PORTVERSION}/source/
generated by cgit (git 2.34.1) at 2024-12-28 17:32:39 +0800