diff options
| author | mbr <mbr@FreeBSD.org> | 2003-03-27 01:06:20 +0800 |
|---|---|---|
| committer | mbr <mbr@FreeBSD.org> | 2003-03-27 01:06:20 +0800 |
| commit | 227b04556af60548782228af1e8610a525e9d514 (patch) | |
| tree | c6ed7d30ce48c9d3d90c164fc02a58b2334a152b /editors/openoffice-devel | |
| parent | 8c267c8337b8ce9752586594c88e6915cc869f50 (diff) | |
| download | freebsd-ports-gnome-227b04556af60548782228af1e8610a525e9d514.tar.gz freebsd-ports-gnome-227b04556af60548782228af1e8610a525e9d514.tar.zst freebsd-ports-gnome-227b04556af60548782228af1e8610a525e9d514.zip | |
Hopefully fix the build on bento:
The JDK dependency needs to be at the first place, so all
following dependencies use the same JDK.
Diffstat (limited to 'editors/openoffice-devel')
| -rw-r--r-- | editors/openoffice-devel/Makefile | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index 6f740924c399..2aae27767a5c 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -112,6 +112,17 @@ MAINTAINER= openoffice@FreeBSD.org .if !defined(COMMENT) COMMENT= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser .endif + +# +# 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-jdk14 +.else +BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14 +.endif + #.if !defined(USE_GCC) #BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport #.endif @@ -122,11 +133,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-jdk14 -.else -BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14 -.endif USE_PERL5= yes USE_BZIP2= yes |