From owner-freebsd-gnome@FreeBSD.ORG  Sat Oct 23 22:51:46 2004
Return-Path: <owner-freebsd-gnome@FreeBSD.ORG>
Delivered-To: freebsd-gnome@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 5F7E916A4CE; Sat, 23 Oct 2004 22:51:46 +0000 (GMT)
Received: from imf23aec.mail.bellsouth.net (imf23aec.mail.bellsouth.net
	[205.152.59.71])	by mx1.FreeBSD.org (Postfix) with ESMTP
	id CCF4C43D45; Sat, 23 Oct 2004 22:51:45 +0000 (GMT)
	(envelope-from ahze@blueheron.ahze.net)
Received: from blueheron.ahze.net ([68.209.163.3])
	by imf23aec.mail.bellsouth.netESMTP
	<20041023225143.USZH22847.imf23aec.mail.bellsouth.net@blueheron.ahze.net>;
	Sat, 23 Oct 2004 18:51:43 -0400
Received: (from root@localhost)
	by blueheron.ahze.net (8.13.1/8.13.1/Submit) id i9NMpgmw084465;
	Sat, 23 Oct 2004 18:51:42 -0400 (EDT)
	(envelope-from ahze)
Date: Sat, 23 Oct 2004 18:51:42 -0400 (EDT)
Message-Id: <200410232251.i9NMpgmw084465@blueheron.ahze.net>
To: FreeBSD-gnats-submit@freebsd.org
From: Michael Johnson <ahze@ahze.net>
X-send-pr-version: 3.113
X-GNATS-Notify: 
cc: gnome@freebsd.org
Subject: [PATCH] www/mozilla: [move REINPLACE_CMD to pre-install]
X-BeenThere: freebsd-gnome@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: GNOME for FreeBSD -- porting and maintaining
	<freebsd-gnome.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gnome>,
	<mailto:freebsd-gnome-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-gnome>
List-Post: <mailto:freebsd-gnome@freebsd.org>
List-Help: <mailto:freebsd-gnome-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gnome>,
	<mailto:freebsd-gnome-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 23 Oct 2004 22:51:46 -0000


>Submitter-Id:	current-users
>Originator:	Michael Johnson
>Organization:	
>Confidential:	no 
>Synopsis:	[PATCH] www/mozilla: [move REINPLACE_CMD to pre-install]
>Severity:	non-critical
>Priority:	low
>Category:	ports 
>Class:		change-request
>Release:	FreeBSD 5.3-STABLE i386
>Environment:
System: FreeBSD blueheron.ahze.net 5.3-STABLE FreeBSD 5.3-STABLE #68: Sat Oct 16 21:30:18 EDT 2004
>Description:
- Move REINPLACE_CMD up from do-install to pre-install 
  so there aren't .bak files left behind after pkg_delete.

Port maintainer (gnome@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- mozilla-1.7.2_5,2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/mozilla/Makefile,v
retrieving revision 1.174
diff -u -r1.174 Makefile
--- Makefile	21 Oct 2004 03:35:24 -0000	1.174
+++ Makefile	23 Oct 2004 22:48:27 -0000
@@ -274,6 +274,9 @@
 	${TOUCH} -f ${PLIST}
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
 		Makefile ${MAKE_ARGS} install
+	${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \
+		${FAKEDIR}/bin/mozilla \
+		${FAKEDIR}/bin/mozilla-config
 	if [ ! -x ${PREFIX}/bin/mozilla -a ! -L ${PREFIX}/bin/mozilla ]; then \
 		${ECHO_CMD} bin/mozilla >> ${PLIST} ; \
 	fi
@@ -310,9 +313,6 @@
 	${CHMOD} 755 ${PREFIX}/lib/${MOZILLA}
 	${INSTALL_SCRIPT} ${FAKEDIR}/bin/mozilla ${PREFIX}/lib/${MOZILLA}
 	${INSTALL_SCRIPT} ${FAKEDIR}/bin/mozilla-config ${PREFIX}/lib/${MOZILLA}
-	${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \
-		${PREFIX}/lib/${MOZILLA}/mozilla \
-		${PREFIX}/lib/${MOZILLA}/mozilla-config
 	cd ${FAKEDIR}/lib/${MOZILLA} && ${FIND} . | \
 		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${MOZILLA}
 	${INSTALL_SCRIPT} ${WRKSRC}/${MOZILLA} ${PREFIX}/bin
--- mozilla-1.7.2_5,2.patch ends here ---