From owner-freebsd-gecko@FreeBSD.ORG Thu Sep 13 12:47:24 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 50631106564A for ; Thu, 13 Sep 2012 12:47:24 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id E498E8FC16 for ; Thu, 13 Sep 2012 12:47:23 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q8DClGmO076566 for ; Thu, 13 Sep 2012 12:47:16 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q8DClA8F075388 for freebsd-gecko@freebsd.org; Thu, 13 Sep 2012 12:47:10 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 13 Sep 2012 12:47:10 GMT Message-Id: <201209131247.q8DClA8F075388@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r1013 - in trunk: Mk www/firefox www/firefox/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Sep 2012 12:47:24 -0000 Author: jbeich Date: Thu Sep 13 12:47:10 2012 New Revision: 1013 Log: move .in files under files/ directory Added: trunk/www/firefox/files/pkg-deinstall.in - copied, changed from r1012, trunk/www/firefox/pkg-deinstall.in trunk/www/firefox/files/pkg-install.in - copied, changed from r1012, trunk/www/firefox/pkg-install.in Deleted: trunk/www/firefox/pkg-deinstall.in trunk/www/firefox/pkg-install.in Modified: trunk/Mk/bsd.gecko.mk Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Wed Sep 12 09:51:16 2012 (r1012) +++ trunk/Mk/bsd.gecko.mk Thu Sep 13 12:47:10 2012 (r1013) @@ -528,8 +528,8 @@ MOZILLA_PLIST_DIRS?= bin lib PKGINSTALL?= ${WRKDIR}/pkg-install PKGDEINSTALL?= ${WRKDIR}/pkg-deinstall -PKGINSTALL_INC?= ${.CURDIR}/../../www/firefox/pkg-install.in -PKGDEINSTALL_INC?= ${.CURDIR}/../../www/firefox/pkg-deinstall.in +PKGINSTALL_INC?= ${.CURDIR}/../../www/firefox/files/pkg-install.in +PKGDEINSTALL_INC?= ${.CURDIR}/../../www/firefox/files/pkg-deinstall.in EXTRACT_AFTER_ARGS?= | ${TAR} -xf - --exclude */CVS/* \ --exclude */macbuild/* \ Copied and modified: trunk/www/firefox/files/pkg-deinstall.in (from r1012, trunk/www/firefox/pkg-deinstall.in) ============================================================================== Copied and modified: trunk/www/firefox/files/pkg-install.in (from r1012, trunk/www/firefox/pkg-install.in) ============================================================================== Deleted: trunk/www/firefox/pkg-deinstall.in ============================================================================== --- trunk/www/firefox/pkg-deinstall.in Thu Sep 13 12:47:10 2012 (r1012) +++ /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 () -# 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/firefox/pkg-install.in ============================================================================== --- trunk/www/firefox/pkg-install.in Thu Sep 13 12:47:10 2012 (r1012) +++ /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 () -# 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