diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2003-03-26 17:06:20 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2003-03-26 17:06:20 +0000 |
| commit | d57aeca8a1cf878842c82d6849078d1574aaaade (patch) | |
| tree | fb8a5bb7bd320a8897c6eedbae96d11ad249978e /editors/openoffice-1.0 | |
| parent | o Update to 0.90 rc5 [1] (diff) | |
Hopefully fix the build on bento:
The JDK dependency needs to be at the first place, so all
following dependencies use the same JDK.
Notes
Notes:
svn path=/head/; revision=77489
Diffstat (limited to 'editors/openoffice-1.0')
| -rw-r--r-- | editors/openoffice-1.0/Makefile | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile index 545132d817fb..928e5a3b3231 100644 --- a/editors/openoffice-1.0/Makefile +++ b/editors/openoffice-1.0/Makefile @@ -107,6 +107,17 @@ EXTRACT_ONLY= OOo_${PORTVERSION}_source.tar.bz2 MAINTAINER= openoffice@FreeBSD.org COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser + +# +# The JDK dependency needs to be at the first place, so all +# following dependencies use the same JDK. +# +.if !defined(WITH_BSD_JDK) +BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/linux-sun-jdk13 +.else +BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 +.endif + #.if !defined(USE_GCC) #BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport #.endif @@ -117,11 +128,6 @@ BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries .if !defined(DISPLAY) BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer .endif -.if !defined(WITH_BSD_JDK) -BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/linux-sun-jdk13 -.else -BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 -.endif USE_PERL5= yes USE_BZIP2= yes |