Use $SUB_FILES & $SUB_LIST to dynamically adjust pkg-message.
PR: 142449, 142450, 142451 and 142452 Submitted by: Sevan Janiyan <venture37@geeklan.co.uk> Feature safe: yes
This commit is contained in:
parent
56674828ec
commit
407bccbf7f
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=249980
6 changed files with 12 additions and 43 deletions
|
@ -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}
|
||||
|
|
|
@ -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}
|
||||
|
|
|
@ -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}
|
||||
|
|
|
@ -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}
|
||||
|
|
|
@ -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}
|
||||
|
|
|
@ -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}
|
||||
|
|
Loading…
Reference in a new issue