From 407bccbf7fdb37af4c8a66ba7b01e3d9c9dd464c Mon Sep 17 00:00:00 2001 From: Maho Nakata Date: Tue, 16 Feb 2010 23:21:22 +0000 Subject: Use $SUB_FILES & $SUB_LIST to dynamically adjust pkg-message. PR: 142449, 142450, 142451 and 142452 Submitted by: Sevan Janiyan Feature safe: yes --- editors/openoffice-3-devel/Makefile | 9 ++------- editors/openoffice-3/Makefile | 9 ++------- editors/openoffice.org-2/Makefile | 10 ++-------- editors/openoffice.org-3-RC/Makefile | 9 ++------- editors/openoffice.org-3-devel/Makefile | 9 ++------- editors/openoffice.org-3/Makefile | 9 ++------- 6 files changed, 12 insertions(+), 43 deletions(-) diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index b048c6ec077d..933674a99294 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/Makefile @@ -136,7 +136,8 @@ USE_BISON= build GNU_CONFIGURE= yes WRKSRC?= ${WRKDIR}/${OOOTAG} BASH?= ${PREFIX}/bin/bash -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 @@ -310,12 +311,6 @@ post-install: @${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} diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile index b75ddef18580..6509ff565ae2 100644 --- a/editors/openoffice-3/Makefile +++ b/editors/openoffice-3/Makefile @@ -128,7 +128,8 @@ USE_BISON= build 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 @@ -300,12 +301,6 @@ post-install: @${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} diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile index 5d9cdca8850b..7c1f6cbb4869 100644 --- a/editors/openoffice.org-2/Makefile +++ b/editors/openoffice.org-2/Makefile @@ -122,7 +122,8 @@ GNU_CONFIGURE= yes 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 \ @@ -271,13 +272,6 @@ post-install: @${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} diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile index 2e0837da3e2b..77d669513632 100644 --- a/editors/openoffice.org-3-RC/Makefile +++ b/editors/openoffice.org-3-RC/Makefile @@ -130,7 +130,8 @@ USE_BISON= build 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 @@ -302,12 +303,6 @@ post-install: @${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} diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile index b048c6ec077d..933674a99294 100644 --- a/editors/openoffice.org-3-devel/Makefile +++ b/editors/openoffice.org-3-devel/Makefile @@ -136,7 +136,8 @@ USE_BISON= build GNU_CONFIGURE= yes WRKSRC?= ${WRKDIR}/${OOOTAG} BASH?= ${PREFIX}/bin/bash -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 @@ -310,12 +311,6 @@ post-install: @${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} diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile index b75ddef18580..6509ff565ae2 100644 --- a/editors/openoffice.org-3/Makefile +++ b/editors/openoffice.org-3/Makefile @@ -128,7 +128,8 @@ USE_BISON= build 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 @@ -300,12 +301,6 @@ post-install: @${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} -- cgit v1.2.3