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.org-1.1-devel | |
| parent | 57ffe5056b02ba277bd76ee897ce21be3e957886 (diff) | |
| download | ports-d57aeca8a1cf878842c82d6849078d1574aaaade.tar.gz ports-d57aeca8a1cf878842c82d6849078d1574aaaade.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.
Notes
Notes:
svn path=/head/; revision=77489
Diffstat (limited to 'editors/openoffice.org-1.1-devel')
| -rw-r--r-- | editors/openoffice.org-1.1-devel/Makefile | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile index 6f740924c399..2aae27767a5c 100644 --- a/editors/openoffice.org-1.1-devel/Makefile +++ b/editors/openoffice.org-1.1-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 |