summaryrefslogtreecommitdiff
path: root/editors/openoffice-1.1
diff options
context:
space:
mode:
authorMaho Nakata <maho@FreeBSD.org>2004-03-21 03:43:22 +0000
committerMaho Nakata <maho@FreeBSD.org>2004-03-21 03:43:22 +0000
commit6828af599decbbb9cbfe00eda41f78428b444c00 (patch)
treef8e6b2f048ffc0b82047996c3bc67ee4e6d19418 /editors/openoffice-1.1
parentKill Linux-guest specific bogus messages by vmware-guestd. (diff)
Correct SDK making procedure.
Diffstat (limited to 'editors/openoffice-1.1')
-rw-r--r--editors/openoffice-1.1/Makefile15
1 files changed, 10 insertions, 5 deletions
diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile
index e3943ecdecaf..2a0c782ce363 100644
--- a/editors/openoffice-1.1/Makefile
+++ b/editors/openoffice-1.1/Makefile
@@ -546,11 +546,16 @@ package-rename:
sdk:
@${ECHO_MSG} "===> Make SDK of OpenOffice.org"
- @(cd ${WRKSRC}/../odk/unxfbsd.pro/bin ; \
- ${CP} -r odk${BUILD_NR} OpenOffice.org${RELEASE_NR}_SDK ;\
- ${TAR} cfz OOo_${FRELEASE_NR}_${OPSYS}${SIMPLEOSVER}Intel_sdk.tar.gz OpenOffice.org${RELEASE_NR}_SDK ;\
- ${RM} -r OpenOffice.org${RELEASE_NR}_SDK ;\
- ${MV} OOo_${FRELEASE_NR}_${OPSYS}${SIMPLEOSVER}Intel_sdk.tar.gz ${WRKDIR}/..)
+.if !defined(DISPLAY)
+ @cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
+ ${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd sdk_oo && build.pl && deliver.pl'
+ @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
+ @${RM} -f ${WRKDIR}/.Xvfb.pid
+.else
+ @cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
+ ${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd sdk_oo && build.pl && deliver.pl'
+.endif
+ ${MV} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/OpenOffice.org${FRELEASE_NR}_SDK.tar.gz ${WRKDIR}/../OOo_${FRELEASE_NR}_${OPSYS}${SIMPLEOSVER}Intel_sdk.tar.gz
update:
@${MAKE} fetch