Date: Fri, 8 Jan 2010 00:03:40 GMT From: Sevan Janiyan <venture37@geeklan.co.uk> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/142449: [patch] editors/openoffice.org-2 use $SUB_FILES & $SUB_LIST to dynamically adjust pkg-message Message-ID: <201001080003.o0803e5v017022@www.freebsd.org> Resent-Message-ID: <201001080010.o080A1KK040778@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 142449
>Category: ports
>Synopsis: [patch] editors/openoffice.org-2 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:10:01 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-2/Makefile,v
retrieving revision 1.321
diff -u -r1.321 Makefile
--- Makefile 13 Dec 2009 08:40:10 -0000 1.321
+++ Makefile 7 Jan 2010 23:57:38 -0000
@@ -121,7 +121,8 @@
WRKSRC?= ${WRKDIR}/${OOOTAG}
CONFIGURE_WRKSRC= ${WRKSRC}/config_office
TCSH?= /bin/tcsh
-PKGMESSAGE= ${WRKDIR}/pkg-message
+SUB_FILES= pkg-message
+SUB_LIST= EXECBASE=${EXECBASE} INSTALLATION_BASEDIR=${INSTALLATION_BASEDIR} OOOTAG=${OOOTAG} OOOVERSION=${OOOVERSION}
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp \
--with-gnu-patch=${LOCALBASE}/bin/gpatch \
@@ -270,13 +271,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#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
- -e 's#%%EXECBASE%%#${EXECBASE}#g' \
- -e 's#%%OOOTAG%%#${OOOTAG}#g' \
- -e 's#%%OOOVERSION%%#${OOOVERSION}#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?201001080003.o0803e5v017022>