Re: Latest OpenOffice and diable-jdk15 errors was Re: openoffice and java

[Coleman Kane]

On Sat, 2008-04-05 at 08:14 -0500, eculp wrote:
> Quoting Robert Huff <[EMAIL PROTECTED]>:
> 
> >
> > David Booth writes:
> >
> >>  I do not have a suggested fix, but I found similar behavior when
> >>  I tried to compile it with JDK 1.6.  Diablo 1.5 worked fine for
> >>  me though.
> >
> >     From the Makefile:
> >
> > USE_JAVA=       yes
> > JAVA_BUILD=     jdk
> > JAVA_VENDOR=    freebsd bsdjava
> > .if (${OSVERSION} >= 700000)
> > JAVA_VERSION=   1.5
> > .else
> > JAVA_VERSION=   1.4 1.5
> > .endif
> >
> >     OOv2 is not rated for JDK-1.6.
> 
> Interesting.  Could it be that I am the only that gets the message  
> with diablo?
> 
> It would appear that I need to follow the instructions which include  
> the config.log http://encontacto.net/Share/amd64/config.log and the  
> pkg list http://encontacto.net/Share/amd64/ls_var-db-pkg.txt for the  
> AMD64 and the same for the  
> i386.http://encontacto.net/Share/i386/config.log and  
> http://encontacto.net/Share/i386/ls_var-db-pkg.txt
> 
> I have a couple of other machines doing the same with i386 with intel  
> processors but hopefully these 2 will be enough for someone who  
> understands the configuration to give some suggestions.
> 
> Thanks for any and all help,
> 
> ed

I may have some insight into your woes. Try removing "freebsd" from the
JAVA_VENDOR line. The "freebsd" vendor indicates the "diablo" release (I
think this should read "diablo", IMO). The "bsdjava" vendor indicates
the sun java from ports (ports/java/jdk15, etc.).

I am attaching a patch that applies this change nicely to the Makefile
(only doing this switch-up on 8.0+), as well as offers another knob to
allow building against the ports version of libicu (instead of using the
shipped version in OO.o, which has been causing other problems).

Cheers,

-- 
Coleman Kane

diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index c870dc7..5655df5 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	2.4.${SNAPDATE}
+PORTREVISION?=	1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		http://openoffice.lunarshells.com/sources/ \
@@ -53,7 +54,11 @@ WITHOUT_CPU_CFLAGS=	true
 
 USE_JAVA=	yes
 JAVA_BUILD=	jdk
+.if (${OSVERSION} >= 800000)
+JAVA_VENDOR=	bsdjava
+.else
 JAVA_VENDOR=	freebsd bsdjava
+.endif
 .if (${OSVERSION} >= 700000)
 JAVA_VERSION=	1.5
 .else
diff --git a/editors/openoffice.org-2-RC/files/Makefile.knobs b/editors/openoffice.org-2-RC/files/Makefile.knobs
index c0c76e9..a5a9644 100644
--- a/editors/openoffice.org-2-RC/files/Makefile.knobs
+++ b/editors/openoffice.org-2-RC/files/Makefile.knobs
@@ -54,6 +54,13 @@ CONFIGURE_ARGS+=	--enable-debug --enable-symbols=TRUE --enable-dbgutil
 CONFIGURE_ARGS+=	--enable-symbols=SMALL
 .endif
 
+.if defined(WITH_SYSTEM_ICU)
+LIB_DEPENDS+=		icule:${PORTSDIR}/devel/icu
+CONFIGURE_ARGS+=	--with-system-icu=yes
+.else
+CONFIGURE_ARGS+=	--with-system-icu=no
+.endif
+
 pre-fetch:
 .if (${OSVERSION} < 503001 && ${OSVERSION} >= 500000) || (${OSVERSION} < 492000)
 	@${ECHO}
@@ -86,6 +93,11 @@ pre-fetch:
 	@${ECHO} "You can compile OOo without gnome VFS support with"
 	@${ECHO} "make -DWITHOUT_GNOMEVFS"
 .endif
+.if !defined(WITH_SYSTEM_ICU)
+	@${ECHO}
+	@${ECHO} "You can compile OOo with devel/icu from ports with"
+	@${ECHO} "make -DWITH_SYSTEM_ICU"
+.endif
 .if !defined(WITH_SYSTEM_FREETYPE)
 	@${ECHO}
 	@${ECHO} "You can compile OOo with freetype2 from ports with"

signature.asc
Description: This is a digitally signed message part