diff options
| author | ahze <ahze@FreeBSD.org> | 2006-03-30 02:29:45 +0800 |
|---|---|---|
| committer | ahze <ahze@FreeBSD.org> | 2006-03-30 02:29:45 +0800 |
| commit | e3230aad7b972a494936bed6afa3267abae3a2e5 (patch) | |
| tree | 036f238051894f439ed31ce56b887fb56d9f0561 /www/mozilla | |
| parent | 896966217b4c0f84c936ffac863f08ba06b3a86d (diff) | |
| download | freebsd-ports-gnome-e3230aad7b972a494936bed6afa3267abae3a2e5.tar.gz freebsd-ports-gnome-e3230aad7b972a494936bed6afa3267abae3a2e5.tar.zst freebsd-ports-gnome-e3230aad7b972a494936bed6afa3267abae3a2e5.zip | |
- Convert all gecko pkg-[de]install scripts into a generic
pkg-[de]install script
- Always use pkg-install to create missing dir's [1]
Requested by: marcus [1]
Diffstat (limited to 'www/mozilla')
| -rw-r--r-- | www/mozilla/Makefile | 2 | ||||
| -rw-r--r-- | www/mozilla/Makefile.common | 6 | ||||
| -rw-r--r-- | www/mozilla/pkg-deinstall.in | 5 | ||||
| -rw-r--r-- | www/mozilla/pkg-install.in | 14 |
4 files changed, 21 insertions, 6 deletions
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 |