diff options
author | hira <hira@pkgsrc.org> | 2008-10-20 16:14:54 +0000 |
---|---|---|
committer | hira <hira@pkgsrc.org> | 2008-10-20 16:14:54 +0000 |
commit | 1628985f7854c1eb7b28108503611208a285f00d (patch) | |
tree | 9738a9d8cd369c94d92ac1843d2e68e7001e74f5 /misc/openoffice3 | |
parent | 27025061cd005a3c3473b1d69327793458ed3106 (diff) | |
download | pkgsrc-1628985f7854c1eb7b28108503611208a285f00d.tar.gz |
Re-add LD_LIBRARY_PATH to startup scripts (for java option only).
NOTE: With java option and PKG_DEVELOPER=yes, this package will fail
to build. Please fix wip/jdk15 (runtime library search paths
are missing).
Diffstat (limited to 'misc/openoffice3')
-rw-r--r-- | misc/openoffice3/distinfo | 8 | ||||
-rw-r--r-- | misc/openoffice3/options.mk | 14 | ||||
-rw-r--r-- | misc/openoffice3/patches/patch-cn | 9 | ||||
-rw-r--r-- | misc/openoffice3/patches/patch-du | 9 | ||||
-rw-r--r-- | misc/openoffice3/patches/patch-dw | 14 | ||||
-rw-r--r-- | misc/openoffice3/patches/patch-dx | 14 |
6 files changed, 49 insertions, 19 deletions
diff --git a/misc/openoffice3/distinfo b/misc/openoffice3/distinfo index 2a7accef2c8..60d714f2fcd 100644 --- a/misc/openoffice3/distinfo +++ b/misc/openoffice3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2008/10/20 14:26:22 hira Exp $ +$NetBSD: distinfo,v 1.8 2008/10/20 16:14:54 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 @@ -49,7 +49,7 @@ SHA1 (patch-ch) = caa598140bcb78ec61bc33d44c5873da84e1628a SHA1 (patch-ci) = 4743cee1c391e04a53bd83f6ae7e58e737d08d1e SHA1 (patch-cj) = 45ff359ec795e5ef5c692e954d88912c74017162 SHA1 (patch-ck) = 01925efa75759b3b8efda3ab109b0f6481f45a7f -SHA1 (patch-cn) = 358fd67f20f3ffdb993fb3f4cb38d5733274fd6b +SHA1 (patch-cn) = d129e69d8ce9303e46f0b486e495d09c1e446444 SHA1 (patch-cp) = 35151ba658859c9d116ccdf44ec372c9e66435b1 SHA1 (patch-cq) = 6691fd7fa330db000ec5a9319bf9030b83aa593d SHA1 (patch-cr) = aa797461919635c3e6aaa30678a7585d5640dedd @@ -70,7 +70,9 @@ SHA1 (patch-dk) = 1f022fe11b4b1c6cb960f416724054954442ee74 SHA1 (patch-do) = c505e2e03912a068aa4666c8460b129447ec5a4e SHA1 (patch-dp) = ce90ba6c2cce3af1ade0257fd42106ea8345661b SHA1 (patch-dt) = 59964a31a8abbb324029653609b0decadbe03a75 -SHA1 (patch-du) = b14cb8c58eb9780dc76910495294f7bd9cd9ed4b +SHA1 (patch-du) = 093482d2847014fa894fe7e8d515c762723344b0 +SHA1 (patch-dw) = 0737b08aafee1796dd83cd52b04a4fa589309f1b +SHA1 (patch-dx) = 272daa1f31af090f5aa1c99d17a63470c60fe3b5 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 2f614f47b83..2ef02e43959 100644 --- a/misc/openoffice3/options.mk +++ b/misc/openoffice3/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.6 2008/10/20 14:26:22 hira Exp $ +# $NetBSD: options.mk,v 1.7 2008/10/20 16:14:54 hira Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.openoffice3 PKG_SUPPORTED_OPTIONS= cups gnome gtk2 java kde ooo-external-libwpd @@ -82,27 +82,23 @@ USE_JAVA2= yes 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= -L${JAVA_LIB_ROOT} ${COMPILER_RPATH_FLAG}${JAVA_LIB_ROOT} -LIB.mawt= ${COMPILER_RPATH_FLAG}${JAVA_LIB_ROOT}/xawt +LIB.awtlib= -L${JAVA_LIB_ROOT} ${COMPILER_RPATH_FLAG}${JAVA_LIB_ROOT} +# -rpath is missing from wip/jdk15. 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" MAKE_ENV+= JAVACMD="${PKG_JAVA_HOME}/bin/java" -# XXX -LIB.awtlib= -L${JAVA_LIB_ROOT} ${COMPILER_RPATH_FLAG}${JAVA_LIB_ROOT} - .include "../../mk/java-env.mk" .include "../../mk/java-vm.mk" .else CONFIGURE_ARGS+= --without-java PKG_JAVA_HOME= LIB.jawt= -LIB.mawt= LIB.awtlib= .endif @@ -110,9 +106,11 @@ SUBST_CLASSES+= java SUBST_STAGE.java= post-patch SUBST_MESSAGE.java= Adding JAVA_HOME SUBST_FILES.java= desktop/scripts/soffice.sh +SUBST_FILES.java+= desktop/scripts/unopkg.sh +SUBST_FILES.java+= padmin/source/spadmin.sh SUBST_SED.java+= -e 's,@JAVA_HOME@,${PKG_JAVA_HOME},g' +SUBST_SED.java+= -e 's,@JAVA_MAWT_DIR@,${JAVA_LIB_ROOT}/xawt,g' SUBST_SED.lib+= -e 's|@LIB_jawt@|${LIB.jawt}|g' -SUBST_SED.lib+= -e 's|@LIB_mawt@|${LIB.mawt}|g' SUBST_SED.lib+= -e 's|@LIB_awtlib@|${LIB.awtlib}|g' .if !empty(PKG_OPTIONS:Mkde) diff --git a/misc/openoffice3/patches/patch-cn b/misc/openoffice3/patches/patch-cn index f8b824c838d..495e69f550e 100644 --- a/misc/openoffice3/patches/patch-cn +++ b/misc/openoffice3/patches/patch-cn @@ -1,7 +1,7 @@ -$NetBSD: patch-cn,v 1.2 2008/10/20 12:30:16 hira Exp $ +$NetBSD: patch-cn,v 1.3 2008/10/20 16:14:54 hira Exp $ --- desktop/scripts/soffice.sh.orig 2008-08-07 02:44:36.000000000 +0900 -+++ desktop/scripts/soffice.sh 2008-10-19 14:38:10.000000000 +0900 ++++ desktop/scripts/soffice.sh 2008-10-20 23:36:39.000000000 +0900 @@ -49,6 +49,12 @@ export JITC_PROCESSOR_TYPE fi @@ -15,10 +15,13 @@ $NetBSD: patch-cn,v 1.2 2008/10/20 12:30:16 hira Exp $ # resolve installation directory sd_cwd="`pwd`" if [ -h "$0" ] ; then -@@ -64,6 +70,11 @@ +@@ -64,6 +70,14 @@ sd_binary=`basename "$0"`.bin ++LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:@JAVA_MAWT_DIR@ ++export LD_LIBRARY_PATH ++ +if [ -z ${JAVA_HOME} ]; then + JAVA_HOME=@JAVA_HOME@ + export JAVA_HOME diff --git a/misc/openoffice3/patches/patch-du b/misc/openoffice3/patches/patch-du index 20260b532b6..4b918b828fb 100644 --- a/misc/openoffice3/patches/patch-du +++ b/misc/openoffice3/patches/patch-du @@ -1,8 +1,8 @@ -$NetBSD: patch-du,v 1.5 2008/10/20 14:26:23 hira Exp $ +$NetBSD: patch-du,v 1.6 2008/10/20 16:14:54 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 -@@ -0,0 +1,36 @@ ++++ solenv/inc/pkgsrc.mk 2008-10-21 00:03:23.000000000 +0900 +@@ -0,0 +1,35 @@ +# +# Settings for pkgsrc. +# @@ -28,9 +28,8 @@ $NetBSD: patch-du,v 1.5 2008/10/20 14:26:23 hira Exp $ +LIB_base=@COMPILER_RPATH_FLAG@@OO_LIBDIR@ +LIB_ure=@COMPILER_RPATH_FLAG@@OO_LIBDIR@/../ure-link/lib +LIB_jawt=@LIB_jawt@ -+LIB_mawt=@LIB_mawt@ + -+AWTLIB=${LIB_jawt} ${LIB_mawt} -ljawt ++AWTLIB=${LIB_jawt} -ljawt + +# Add runtime search path ($ORIGIN cannot be used in pkgsrc). +LINKFLAGS+= ${LIB_base} ${LIB_ure} diff --git a/misc/openoffice3/patches/patch-dw b/misc/openoffice3/patches/patch-dw new file mode 100644 index 00000000000..21b060f1d23 --- /dev/null +++ b/misc/openoffice3/patches/patch-dw @@ -0,0 +1,14 @@ +$NetBSD: patch-dw,v 1.3 2008/10/20 16:14:54 hira Exp $ + +--- padmin/source/spadmin.sh.orig 2008-09-28 01:39:37.000000000 +0900 ++++ padmin/source/spadmin.sh 2008-10-20 23:34:38.000000000 +0900 +@@ -56,6 +56,9 @@ + esac + done + ++LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:@JAVA_MAWT_DIR@ ++export LD_LIBRARY_PATH ++ + # extend the ld_library_path for java: javaldx checks the sofficerc for us + if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then + my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \ diff --git a/misc/openoffice3/patches/patch-dx b/misc/openoffice3/patches/patch-dx new file mode 100644 index 00000000000..a1ef07c798b --- /dev/null +++ b/misc/openoffice3/patches/patch-dx @@ -0,0 +1,14 @@ +$NetBSD: patch-dx,v 1.3 2008/10/20 16:14:54 hira Exp $ + +--- desktop/scripts/unopkg.sh.orig 2008-10-02 14:41:08.000000000 +0900 ++++ desktop/scripts/unopkg.sh 2008-10-20 23:35:43.000000000 +0900 +@@ -56,6 +56,9 @@ + esac + done + ++LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:@JAVA_MAWT_DIR@ ++export LD_LIBRARY_PATH ++ + # extend the ld_library_path for java: javaldx checks the sofficerc for us + if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then + my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \ |