Response file while installation is not needed.
Install script now can handle ${PREFIX}.
This commit is contained in:
parent
27a837dc88
commit
20bf2d1bc8
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=103828
8 changed files with 24 additions and 72 deletions
|
@ -464,11 +464,6 @@ do-build:
|
|||
.endif
|
||||
|
||||
pre-install:
|
||||
@${CP} ${FILESDIR}/oo_setup.resp \
|
||||
${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/
|
||||
@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
|
||||
-e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' \
|
||||
${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
|
||||
@${MKDIR} -p ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/${LANG_EXT}/osl/
|
||||
|
||||
do-install:
|
||||
|
@ -478,15 +473,15 @@ do-install:
|
|||
#
|
||||
${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
|
||||
@sleep 5
|
||||
@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
|
||||
TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
|
||||
${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
|
||||
@cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \
|
||||
@SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
|
||||
./install --prefix=${PREFIX}
|
||||
@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
|
||||
@${RM} -f ${WRKDIR}/.Xvfb.pid
|
||||
.else
|
||||
@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
|
||||
TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
|
||||
${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
|
||||
@cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \
|
||||
@SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
|
||||
./install --prefix=${PREFIX}
|
||||
.endif
|
||||
|
||||
install-user:
|
||||
|
|
|
@ -1,7 +0,0 @@
|
|||
[Environment]
|
||||
InstallationMode = INSTALL_NETWORK
|
||||
InstallationType = STANDARD
|
||||
DestinationPath = %%PREFIX%%/OpenOffice.org%%FRELEASE_NR%%
|
||||
|
||||
[Java]
|
||||
JavaSupport = preinstalled_or_none
|
|
@ -464,11 +464,6 @@ do-build:
|
|||
.endif
|
||||
|
||||
pre-install:
|
||||
@${CP} ${FILESDIR}/oo_setup.resp \
|
||||
${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/
|
||||
@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
|
||||
-e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' \
|
||||
${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
|
||||
@${MKDIR} -p ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/${LANG_EXT}/osl/
|
||||
|
||||
do-install:
|
||||
|
@ -478,15 +473,15 @@ do-install:
|
|||
#
|
||||
${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
|
||||
@sleep 5
|
||||
@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
|
||||
TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
|
||||
${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
|
||||
@cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \
|
||||
@SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
|
||||
./install --prefix=${PREFIX}
|
||||
@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
|
||||
@${RM} -f ${WRKDIR}/.Xvfb.pid
|
||||
.else
|
||||
@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
|
||||
TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
|
||||
${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
|
||||
@cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \
|
||||
@SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
|
||||
./install --prefix=${PREFIX}
|
||||
.endif
|
||||
|
||||
install-user:
|
||||
|
|
|
@ -1,7 +0,0 @@
|
|||
[Environment]
|
||||
InstallationMode = INSTALL_NETWORK
|
||||
InstallationType = STANDARD
|
||||
DestinationPath = %%PREFIX%%/OpenOffice.org%%FRELEASE_NR%%
|
||||
|
||||
[Java]
|
||||
JavaSupport = preinstalled_or_none
|
|
@ -464,11 +464,6 @@ do-build:
|
|||
.endif
|
||||
|
||||
pre-install:
|
||||
@${CP} ${FILESDIR}/oo_setup.resp \
|
||||
${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/
|
||||
@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
|
||||
-e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' \
|
||||
${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
|
||||
@${MKDIR} -p ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/${LANG_EXT}/osl/
|
||||
|
||||
do-install:
|
||||
|
@ -478,15 +473,15 @@ do-install:
|
|||
#
|
||||
${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
|
||||
@sleep 5
|
||||
@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
|
||||
TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
|
||||
${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
|
||||
@cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \
|
||||
@SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
|
||||
./install --prefix=${PREFIX}
|
||||
@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
|
||||
@${RM} -f ${WRKDIR}/.Xvfb.pid
|
||||
.else
|
||||
@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
|
||||
TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
|
||||
${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
|
||||
@cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \
|
||||
@SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
|
||||
./install --prefix=${PREFIX}
|
||||
.endif
|
||||
|
||||
install-user:
|
||||
|
|
|
@ -1,7 +0,0 @@
|
|||
[Environment]
|
||||
InstallationMode = INSTALL_NETWORK
|
||||
InstallationType = STANDARD
|
||||
DestinationPath = %%PREFIX%%/OpenOffice.org%%FRELEASE_NR%%
|
||||
|
||||
[Java]
|
||||
JavaSupport = preinstalled_or_none
|
|
@ -464,11 +464,6 @@ do-build:
|
|||
.endif
|
||||
|
||||
pre-install:
|
||||
@${CP} ${FILESDIR}/oo_setup.resp \
|
||||
${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/
|
||||
@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
|
||||
-e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' \
|
||||
${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
|
||||
@${MKDIR} -p ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/${LANG_EXT}/osl/
|
||||
|
||||
do-install:
|
||||
|
@ -478,15 +473,15 @@ do-install:
|
|||
#
|
||||
${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
|
||||
@sleep 5
|
||||
@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
|
||||
TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
|
||||
${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
|
||||
@cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \
|
||||
@SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
|
||||
./install --prefix=${PREFIX}
|
||||
@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
|
||||
@${RM} -f ${WRKDIR}/.Xvfb.pid
|
||||
.else
|
||||
@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
|
||||
TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
|
||||
${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
|
||||
@cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \
|
||||
@SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
|
||||
./install --prefix=${PREFIX}
|
||||
.endif
|
||||
|
||||
install-user:
|
||||
|
|
|
@ -1,7 +0,0 @@
|
|||
[Environment]
|
||||
InstallationMode = INSTALL_NETWORK
|
||||
InstallationType = STANDARD
|
||||
DestinationPath = %%PREFIX%%/OpenOffice.org%%FRELEASE_NR%%
|
||||
|
||||
[Java]
|
||||
JavaSupport = preinstalled_or_none
|
Loading…
Reference in a new issue