Date: Fri, 8 Jan 2010 00:17:40 GMT From: Sevan Janiyan <venture37@geeklan.co.uk> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/142451: [patch] editors/openoffice.org-3-RC use $SUB_FILES & $SUB_LIST to dynamically adjust pkg-message Message-ID: <201001080017.o080Heig028319@www.freebsd.org> Resent-Message-ID: <201001080020.o080K55j050252@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 142451
>Category: ports
>Synopsis: [patch] editors/openoffice.org-3-RC use $SUB_FILES & $SUB_LIST to dynamically adjust pkg-message
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Jan 08 00:20:05 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Sevan Janiyan
>Release:
>Organization:
>Environment:
>Description:
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/editors/openoffice.org-3-RC/Makefile,v
retrieving revision 1.410
diff -u -r1.410 Makefile
--- Makefile 23 Dec 2009 03:02:39 -0000 1.410
+++ Makefile 8 Jan 2010 00:11:53 -0000
@@ -122,7 +122,8 @@
GNU_CONFIGURE= yes
WRKSRC?= ${WRKDIR}/${OOOTAG}
TCSH?= /bin/tcsh
-PKGMESSAGE= ${WRKDIR}/pkg-message
+SUB_FILES= pkg-message
+SUB_LIST= EXECBASE=${EXECBASE} OOOTAG=${OOOTAG} OOODIR=${OOODIR}
.if defined(DISABLE_MAKE_JOBS)
MAKE_JOBS_NUMBER= 1
@@ -291,12 +292,6 @@
@${ECHO_CMD} "@unexec ${RM} %D/share/icons/hicolor/icon-theme.cache 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
@${ECHO_CMD} "@exec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
@${ECHO_CMD} "@unexec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
- @${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
- @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
- -e 's#%%EXECBASE%%#${EXECBASE}#g' \
- -e 's#%%OOOTAG%%#${OOOTAG}#g' \
- -e 's#%%OOODIR%%#${OOODIR}#g' \
- ${PKGMESSAGE}
@${ECHO_CMD}
@${CAT} ${PKGMESSAGE}
@${ECHO_CMD}
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001080017.o080Heig028319>