diff options
| author | maho <maho@FreeBSD.org> | 2004-08-26 08:42:41 +0800 |
|---|---|---|
| committer | maho <maho@FreeBSD.org> | 2004-08-26 08:42:41 +0800 |
| commit | 1b650a5fb85d930e4a802d5606df8f62fe45d4dd (patch) | |
| tree | 6ba04e7ce8120f5a62adcc43a607bebaecb86984 /editors/openoffice-1.1-devel | |
| parent | 0086dcb928bd36dad3482aeeb50ea50d8d7ebaac (diff) | |
| download | freebsd-ports-gnome-1b650a5fb85d930e4a802d5606df8f62fe45d4dd.tar.gz freebsd-ports-gnome-1b650a5fb85d930e4a802d5606df8f62fe45d4dd.tar.zst freebsd-ports-gnome-1b650a5fb85d930e4a802d5606df8f62fe45d4dd.zip | |
o remove apache ant dependency when WITHOUT_JAVA is set
o some cleanups
Diffstat (limited to 'editors/openoffice-1.1-devel')
| -rw-r--r-- | editors/openoffice-1.1-devel/Makefile | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile index ba29180bd354..23c86d511340 100644 --- a/editors/openoffice-1.1-devel/Makefile +++ b/editors/openoffice-1.1-devel/Makefile @@ -52,7 +52,7 @@ DISTFILES+= helpcontent_31_unix.tgz:help helpcontent_33_unix.tgz:help \ helpcontent_46_unix.tgz:help helpcontent_49_unix.tgz:help \ helpcontent_55_unix.tgz:help \ helpcontent_81_unix.tgz:help helpcontent_82_unix.tgz:help \ - helpcontent_86_unix.tgz:help \ + helpcontent_86_unix.tgz:help helpcontent_88_unix.tgz:help \ helpcontent_90_unix.tgz:help L10NHELPS= helpcontent_31_unix.tgz helpcontent_33_unix.tgz \ helpcontent_34_unix.tgz helpcontent_39_unix.tgz \ @@ -63,10 +63,6 @@ L10NHELPS= helpcontent_31_unix.tgz helpcontent_33_unix.tgz \ helpcontent_90_unix.tgz .endif -.if ${OSVERSION} > 502010 -WITHOUT_MOZILLA= yes #workaround for mozilla subproject -.endif - COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser BUILD_NR= 645 @@ -89,7 +85,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 +95,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 @@ -226,12 +223,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: |