From 20bf2d1bc871931cd9f24ac96ebda4eb6db71b3c Mon Sep 17 00:00:00 2001
From: Maho Nakata <maho@FreeBSD.org>
Date: Sat, 13 Mar 2004 02:13:24 +0000
Subject: Response file while installation is not needed. Install script now
 can handle ${PREFIX}.

---
 editors/openoffice-1.1/Makefile            | 17 ++++++-----------
 editors/openoffice-1.1/files/oo_setup.resp |  7 -------
 2 files changed, 6 insertions(+), 18 deletions(-)
 delete mode 100644 editors/openoffice-1.1/files/oo_setup.resp

(limited to 'editors/openoffice-1.1')

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
-- 
cgit v1.2.3