aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--editors/openoffice-1.1-devel/Makefile17
-rw-r--r--editors/openoffice-1.1-devel/files/oo_setup.resp7
-rw-r--r--editors/openoffice-1.1/Makefile17
-rw-r--r--editors/openoffice-1.1/files/oo_setup.resp7
-rw-r--r--editors/openoffice.org-1.1-devel/Makefile17
-rw-r--r--editors/openoffice.org-1.1-devel/files/oo_setup.resp7
-rw-r--r--editors/openoffice.org-1.1/Makefile17
-rw-r--r--editors/openoffice.org-1.1/files/oo_setup.resp7
8 files changed, 24 insertions, 72 deletions
diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile
index 6478287b82d6..b753a1863648 100644
--- a/editors/openoffice-1.1-devel/Makefile
+++ b/editors/openoffice-1.1-devel/Makefile
@@ -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:
diff --git a/editors/openoffice-1.1-devel/files/oo_setup.resp b/editors/openoffice-1.1-devel/files/oo_setup.resp
deleted file mode 100644
index a85c68b65d8a..000000000000
--- a/editors/openoffice-1.1-devel/files/oo_setup.resp
+++ /dev/null
@@ -1,7 +0,0 @@
-[Environment]
-InstallationMode = INSTALL_NETWORK
-InstallationType = STANDARD
-DestinationPath = %%PREFIX%%/OpenOffice.org%%FRELEASE_NR%%
-
-[Java]
-JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile
index 6478287b82d6..b753a1863648 100644
--- a/editors/openoffice-1.1/Makefile
+++ b/editors/openoffice-1.1/Makefile
@@ -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:
diff --git a/editors/openoffice-1.1/files/oo_setup.resp b/editors/openoffice-1.1/files/oo_setup.resp
deleted file mode 100644
index a85c68b65d8a..000000000000
--- a/editors/openoffice-1.1/files/oo_setup.resp
+++ /dev/null
@@ -1,7 +0,0 @@
-[Environment]
-InstallationMode = INSTALL_NETWORK
-InstallationType = STANDARD
-DestinationPath = %%PREFIX%%/OpenOffice.org%%FRELEASE_NR%%
-
-[Java]
-JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile
index 6478287b82d6..b753a1863648 100644
--- a/editors/openoffice.org-1.1-devel/Makefile
+++ b/editors/openoffice.org-1.1-devel/Makefile
@@ -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:
diff --git a/editors/openoffice.org-1.1-devel/files/oo_setup.resp b/editors/openoffice.org-1.1-devel/files/oo_setup.resp
deleted file mode 100644
index a85c68b65d8a..000000000000
--- a/editors/openoffice.org-1.1-devel/files/oo_setup.resp
+++ /dev/null
@@ -1,7 +0,0 @@
-[Environment]
-InstallationMode = INSTALL_NETWORK
-InstallationType = STANDARD
-DestinationPath = %%PREFIX%%/OpenOffice.org%%FRELEASE_NR%%
-
-[Java]
-JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile
index 6478287b82d6..b753a1863648 100644
--- a/editors/openoffice.org-1.1/Makefile
+++ b/editors/openoffice.org-1.1/Makefile
@@ -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:
diff --git a/editors/openoffice.org-1.1/files/oo_setup.resp b/editors/openoffice.org-1.1/files/oo_setup.resp
deleted file mode 100644
index a85c68b65d8a..000000000000
--- a/editors/openoffice.org-1.1/files/oo_setup.resp
+++ /dev/null
@@ -1,7 +0,0 @@
-[Environment]
-InstallationMode = INSTALL_NETWORK
-InstallationType = STANDARD
-DestinationPath = %%PREFIX%%/OpenOffice.org%%FRELEASE_NR%%
-
-[Java]
-JavaSupport = preinstalled_or_none
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 05:18:18 +0000