Date: Sat, 23 Oct 2004 18:51:42 -0400 (EDT) From: Michael Johnson <ahze@ahze.net> To: FreeBSD-gnats-submit@freebsd.org Cc: gnome@freebsd.org Subject: [PATCH] www/mozilla: [move REINPLACE_CMD to pre-install] Message-ID: <200410232251.i9NMpgmw084465@blueheron.ahze.net>
next in thread | raw e-mail | index | archive | help
>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 ---
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200410232251.i9NMpgmw084465>