mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-19 08:13:21 +00:00
Code Issues Releases Activity

o remove apache ant dependency when WITHOUT_JAVA is set

Browse Source 
o some cleanups
This commit is contained in:
Maho Nakata 2004-08-26 00:42:41 +00:00
parent 26439a86cb
commit 5b13cfaba1
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=117283
4 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
editors/openoffice-1.1-devel/Makefile
View File

@ -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:

6
editors/openoffice-1.1/Makefile
View File

@ -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:

12
editors/openoffice.org-1.1-devel/Makefile
View File

@ -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:

6
editors/openoffice.org-1.1/Makefile
View File

@ -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: