Date: Wed, 12 Sep 2012 09:51:10 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1011 - in trunk: Mk www/firefox www/seamonkey Message-ID: <201209120951.q8C9pAL2072479@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Wed Sep 12 09:51:09 2012
New Revision: 1011
Log:
move remaining shared files to www/firefox
Added:
trunk/www/firefox/pkg-deinstall.in
- copied, changed from r1010, trunk/www/seamonkey/pkg-deinstall.in
trunk/www/firefox/pkg-install.in
- copied, changed from r1010, trunk/www/seamonkey/pkg-install.in
Deleted:
trunk/www/seamonkey/pkg-deinstall.in
trunk/www/seamonkey/pkg-install.in
Modified:
trunk/Mk/bsd.gecko.mk
Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk Wed Sep 12 09:14:40 2012 (r1010)
+++ trunk/Mk/bsd.gecko.mk Wed Sep 12 09:51:09 2012 (r1011)
@@ -520,7 +520,6 @@
PLIST?= ${WRKDIR}/plist
PLISTD?= ${WRKDIR}/plist_dirs
PLISTF?= ${WRKDIR}/plist_files
-MASTER_DIR?= ${.CURDIR}/../../www/seamonkey
MOZ_PIS_DIR?= lib/${MOZILLA}/init.d
@@ -529,9 +528,8 @@
MOZILLA_PLIST_DIRS?= bin lib
PKGINSTALL?= ${WRKDIR}/pkg-install
PKGDEINSTALL?= ${WRKDIR}/pkg-deinstall
-MASTER_MOZDIR?= ${PORTSDIR}/www/seamonkey
-PKGINSTALL_INC?= ${MASTER_MOZDIR}/pkg-install.in
-PKGDEINSTALL_INC?= ${MASTER_MOZDIR}/pkg-deinstall.in
+PKGINSTALL_INC?= ${.CURDIR}/../../www/firefox/pkg-install.in
+PKGDEINSTALL_INC?= ${.CURDIR}/../../www/firefox/pkg-deinstall.in
EXTRACT_AFTER_ARGS?= | ${TAR} -xf - --exclude */CVS/* \
--exclude */macbuild/* \
Copied and modified: trunk/www/firefox/pkg-deinstall.in (from r1010, trunk/www/seamonkey/pkg-deinstall.in)
==============================================================================
Copied and modified: trunk/www/firefox/pkg-install.in (from r1010, trunk/www/seamonkey/pkg-install.in)
==============================================================================
Deleted: trunk/www/seamonkey/pkg-deinstall.in
==============================================================================
--- trunk/www/seamonkey/pkg-deinstall.in Wed Sep 12 09:51:09 2012 (r1010)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# $MCom: ports/www/mozilla/pkg-deinstall.in,v 1.25 2008/07/26 19:07:07 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
-rm -f ${MOZDIR}/components.ini
-rm -f ${MOZDIR}/defaults.ini
-rm -f ${MOZDIR}/chrome/app-chrome.manifest
-rm -rf ${MOZDIR}/updates
-find %%MOZDIR%%/plugins/ -depth 1 -type l -delete > /dev/null 2>&1
-find %%MOZDIR%%/extensions/ -depth 1 -type l -delete > /dev/null 2>&1
-
-exit 0
Deleted: trunk/www/seamonkey/pkg-install.in
==============================================================================
--- trunk/www/seamonkey/pkg-install.in Wed Sep 12 09:51:09 2012 (r1010)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,38 +0,0 @@
-#!/bin/sh
-#
-# $MCom: ports/www/mozilla/pkg-install.in,v 1.26 2008/08/04 16:58:03 mezz 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" != "xPOST-INSTALL" ] && exit 0
-
-MOZDIR=%%MOZDIR%%
-MOZBIN=${MOZDIR}/%%MOZILLA_BIN%%
-REGXPCOM=${MOZDIR}/regxpcom
-REGCHROME=${MOZDIR}/regchrome
-
-echo "===> Building Chrome's registry..."
-rm -rf ${MOZDIR}/chrome/overlayinfo
-rm -f ${MOZDIR}/chrome/*.rdf
-mkdir -p ${MOZDIR}/chrome/overlayinfo
-rm -f ${MOZDIR}/component.reg
-
-cd ${MOZDIR} || exit 1
-if [ -f ${REGXPCOM} ]; then
- ./run-mozilla.sh ${REGXPCOM} || true
-fi
-if [ -f ${REGCHROME} ]; then
- ./run-mozilla.sh ${REGCHROME} || true
-fi
-if [ -f ${MOZBIN} -a "${1%-*}" = "nvu" ]; then
- ./run-mozilla.sh ${MOZBIN} -register > /dev/null 2>&1
-fi
-cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%MOZILLA%%/ %%MOZDIR%%/extensions/ > /dev/null 2>&1
-
-exit 0
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209120951.q8C9pAL2072479>