diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2005-05-15 04:33:48 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2005-05-15 04:33:48 +0000 |
| commit | a26f8cd77265dac3f02c9c01bda670dd68ced5da (patch) | |
| tree | 26c890ebcd748a2705d3769af459961e2dc3cc70 /editors/openoffice-1.1 | |
| parent | Fix wrapper (diff) | |
Change build process to much safer one.
if only 1 processor runs at the same time,
top level dmake is enough, and a bit noisy
if parallel build is enabled.
Notes
Notes:
svn path=/head/; revision=135277
Diffstat (limited to 'editors/openoffice-1.1')
| -rw-r--r-- | editors/openoffice-1.1/Makefile | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile index 06028d30bcca..eef3c1cec77a 100644 --- a/editors/openoffice-1.1/Makefile +++ b/editors/openoffice-1.1/Makefile @@ -33,7 +33,8 @@ COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser USE_GNOME= gtk20 MOZILLA_PROJECT= cws_srx645_mozooo.20040203.tar.gz -MOZILLA_SOURCE= mozilla-source-1.0.tar.gz +MOZILLA_VERSION= 1.0 +MOZILLA_SOURCE= mozilla-source-${MOZILLA_VERSION}.tar.gz .if !defined(WITHOUT_MOZILLA) DISTFILES+= ${MOZILLA_PROJECT}:moz ${MOZILLA_SOURCE}:mozsrc USE_GNOME+= orbit gtk12 @@ -115,7 +116,6 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ gcp:${PORTSDIR}/sysutils/coreutils \ xmkmf:${X_IMAKE_PORT} \ ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft - .if !defined(DISPLAY) BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} .endif @@ -134,7 +134,6 @@ WRKSRC= ${WRKDIR} CONFIGURE_WRKSRC= ${WRKSRC}/config_office ANT?= ${LOCALBASE}/bin/ant TCSH?= /bin/tcsh -ZIP?= ${PREFIX}/bin/zip UNZIP?= ${PREFIX}/bin/unzip PKGMESSAGE= ${WRKDIR}/pkg-message NUMOFPROCESSES?= 1 @@ -210,11 +209,19 @@ do-build: # ${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid @sleep 5 - @cd ${WRKSRC} ; DISPLAY=${DISPLAYHACK} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo ; build.pl -P${NUMOFPROCESSES} --all' +.if (${NUMOFPROCESSES}>1) + @cd ${WRKSRC} ; DISPLAY=${DISPLAYHACK} ; ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all" +.else + cd ${WRKSRC} ; DISPLAY=${DISPLAYHACK} ; ${TCSH} -c "source FreeBSDEnv.Set ; dmake" +.endif @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill @${RM} -f ${WRKDIR}/.Xvfb.pid .else - @cd ${WRKSRC} ; DISPLAY=${DISPLAY} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo ; build.pl -P${NUMOFPROCESSES} --all' +.if (${NUMOFPROCESSES}>1) + @cd ${WRKSRC} ; DISPLAY=${DISPLAY} ; ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all" +.else + @cd ${WRKSRC} ; DISPLAY=${DISPLAY} ; ${TCSH} -c "source FreeBSDEnv.Set ; dmake" +.endif .endif do-install: |