diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2004-08-26 00:42:41 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2004-08-26 00:42:41 +0000 |
| commit | 5b13cfaba17727dbd44893af05df0dc51e06f553 (patch) | |
| tree | 0ad69b27860e54357cb2f797537a4f90a023e481 /editors/openoffice-1.1/Makefile | |
| parent | Add eGroupWare (repocopied from phpgroupware). (diff) | |
o remove apache ant dependency when WITHOUT_JAVA is set
o some cleanups
Notes
Notes:
svn path=/head/; revision=117283
Diffstat (limited to '')
| -rw-r--r-- | editors/openoffice-1.1/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile index eb31c925aee6..5861d919cc7f 100644 --- a/editors/openoffice-1.1/Makefile +++ b/editors/openoffice-1.1/Makefile @@ -89,7 +89,6 @@ CXX= g++32 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip \ gcp:${PORTSDIR}/sysutils/coreutils \ - ${ANT}:${PORTSDIR}/devel/apache-ant \ ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft .if !defined(DISPLAY) BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} @@ -100,6 +99,8 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ freetype.9:${PORTSDIR}/print/freetype2 .if defined(WITHOUT_JAVA) LIB_DEPENDS= xslt.2:${PORTSDIR}/textproc/libxslt +.else +BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant .endif GNU_CONFIGURE= yes USE_AUTOCONF_VER= 259 @@ -231,12 +232,11 @@ post-patch: fi .endif -.include <${FILESDIR}/Makefile.mozilla> - .if !defined(WITHOUT_MOZILLA) && ( \ !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip) || \ !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip) || \ !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip) ) +.include <${FILESDIR}/Makefile.mozilla> do-build: mozilla .else do-build: |