From fd1281575acc9db6931023439356ac4b79b9fe5b Mon Sep 17 00:00:00 2001
From: hira <hira@pkgsrc.org>
Date: Mon, 20 Oct 2008 14:26:22 +0000
Subject: Fix build with java option.

---
 misc/openoffice3/distinfo         |  4 ++--
 misc/openoffice3/options.mk       | 11 ++++++-----
 misc/openoffice3/patches/patch-du |  6 +++---
 3 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'misc')

diff --git a/misc/openoffice3/distinfo b/misc/openoffice3/distinfo
index add02306f42..2a7accef2c8 100644
--- a/misc/openoffice3/distinfo
+++ b/misc/openoffice3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2008/10/20 12:30:16 hira Exp $
+$NetBSD: distinfo,v 1.7 2008/10/20 14:26:22 hira Exp $
 
 SHA1 (openoffice-3.0.0/OOo_3.0.0_src_binfilter.tar.bz2) = 09ff91fd871f00c696befa8064fe04d7a88a3c8a
 RMD160 (openoffice-3.0.0/OOo_3.0.0_src_binfilter.tar.bz2) = edc71b8b0596d63e60431c7266140bf5188abc6d
@@ -70,7 +70,7 @@ SHA1 (patch-dk) = 1f022fe11b4b1c6cb960f416724054954442ee74
 SHA1 (patch-do) = c505e2e03912a068aa4666c8460b129447ec5a4e
 SHA1 (patch-dp) = ce90ba6c2cce3af1ade0257fd42106ea8345661b
 SHA1 (patch-dt) = 59964a31a8abbb324029653609b0decadbe03a75
-SHA1 (patch-du) = 57434c4c30bf1335aef089a9c267328a2ba6959a
+SHA1 (patch-du) = b14cb8c58eb9780dc76910495294f7bd9cd9ed4b
 SHA1 (patch-dy) = 4af56ef04180ab3dec7d0051e4075e84b62c8405
 SHA1 (patch-dz) = 3932f59e8f78c8a641e52d5284ccc0395c7ee172
 SHA1 (patch-ea) = 8c54345a53bd49d9c4c3b206d43778a56df0b292
diff --git a/misc/openoffice3/options.mk b/misc/openoffice3/options.mk
index 8aaf7792dc8..2f614f47b83 100644
--- a/misc/openoffice3/options.mk
+++ b/misc/openoffice3/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2008/10/20 12:30:16 hira Exp $
+# $NetBSD: options.mk,v 1.6 2008/10/20 14:26:22 hira Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.openoffice3
 PKG_SUPPORTED_OPTIONS=		cups gnome gtk2 java kde ooo-external-libwpd
@@ -83,10 +83,11 @@ DEPENDS+=		apache-ant>=1.7.0:../../devel/apache-ant
 CONFIGURE_ARGS+=	--with-java --disable-mediawiki
 
 # -rpath are missing from wip/jdk15.
-JAVA_LIB_ROOT=		${PKG_JAVA_HOME}/jre/lib/${MACHINE_ARCH}
-LIB.jawt=		${COMPILER_RPATH_FLAG}${JAVA_LIB_ROOT}
-LIB.mawt=		${COMPILER_RPATH_FLAG}${JAVA_LIB_ROOT}/xawt
-CONFIGURE_ENV+=		LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${JAVA_LIB_ROOT}:${JAVA_LIB_ROOT}/xawt"
+JAVA_LIB_ROOT=	${PKG_JAVA_HOME}/jre/lib/${MACHINE_ARCH}
+LIB.jawt=	-L${JAVA_LIB_ROOT} ${COMPILER_RPATH_FLAG}${JAVA_LIB_ROOT}
+LIB.mawt=	${COMPILER_RPATH_FLAG}${JAVA_LIB_ROOT}/xawt
+
+CONFIGURE_ENV+=	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${JAVA_LIB_ROOT}:${JAVA_LIB_ROOT}/xawt"
 
 # XXX: devel/apache-ant doesn't setup ${PREFIX}/bin/java.
 CONFIGURE_ENV+=		JAVACMD="${PKG_JAVA_HOME}/bin/java"
diff --git a/misc/openoffice3/patches/patch-du b/misc/openoffice3/patches/patch-du
index aa43b879685..20260b532b6 100644
--- a/misc/openoffice3/patches/patch-du
+++ b/misc/openoffice3/patches/patch-du
@@ -1,4 +1,4 @@
-$NetBSD: patch-du,v 1.4 2008/10/20 12:30:16 hira Exp $
+$NetBSD: patch-du,v 1.5 2008/10/20 14:26:23 hira Exp $
 
 --- solenv/inc/pkgsrc.mk.orig	2008-10-16 18:30:22.000000000 +0900
 +++ solenv/inc/pkgsrc.mk	2008-10-17 16:32:40.000000000 +0900
@@ -33,8 +33,8 @@ $NetBSD: patch-du,v 1.4 2008/10/20 12:30:16 hira Exp $
 +AWTLIB=${LIB_jawt} ${LIB_mawt} -ljawt
 +
 +# Add runtime search path ($ORIGIN cannot be used in pkgsrc).
-+LINKFLAGS+= ${LIB_base} ${LIB_ure} ${LIB_jawt} ${LIB_mawt}
-+EXTRA_LINKFLAGS+= ${LIB_base} ${LIB_ure} ${LIB_jawt} ${LIB_mawt}
++LINKFLAGS+= ${LIB_base} ${LIB_ure}
++EXTRA_LINKFLAGS+= ${LIB_base} ${LIB_ure}
 +
 +# XXX: unoxml/source/rdf and libxmlsec don't use LINKFLAGS.
 +REDLANDLIB+= ${LIB_base} ${LIB_ure}
-- 
cgit v1.2.3