diff options
author | hira <hira@pkgsrc.org> | 2008-10-20 12:30:16 +0000 |
---|---|---|
committer | hira <hira@pkgsrc.org> | 2008-10-20 12:30:16 +0000 |
commit | 61a42520d722b58b74397a09750b4015e9ee8602 (patch) | |
tree | 85cdadf7682414747e11d584a1a995c6d37f0616 /misc | |
parent | bf9856d7c6c303af6a58391a8dd33d1c621beb8b (diff) | |
download | pkgsrc-61a42520d722b58b74397a09750b4015e9ee8602.tar.gz |
- Install to ${DESTDIR}${PREFIX}/lib/OpenOffice.org3.0.0 (c and c++
wrappers ignore -Wl,-R${DESTDIR}${PREFIX}/OpenOffice.org3.0.0/...).
- Add runtime library search paths by linker option instead of adding
LD_LIBRARY_PATH to startup scripts.
It should fix build with PKG_DEVELOPER=yes. No functional changes.
Diffstat (limited to 'misc')
-rw-r--r-- | misc/openoffice3/MESSAGE | 6 | ||||
-rw-r--r-- | misc/openoffice3/Makefile | 17 | ||||
-rw-r--r-- | misc/openoffice3/distinfo | 15 | ||||
-rw-r--r-- | misc/openoffice3/options.mk | 24 | ||||
-rw-r--r-- | misc/openoffice3/patches/patch-br | 58 | ||||
-rw-r--r-- | misc/openoffice3/patches/patch-cn | 9 | ||||
-rw-r--r-- | misc/openoffice3/patches/patch-du | 23 | ||||
-rw-r--r-- | misc/openoffice3/patches/patch-dw | 14 | ||||
-rw-r--r-- | misc/openoffice3/patches/patch-dx | 14 | ||||
-rw-r--r-- | misc/openoffice3/patches/patch-dy | 106 | ||||
-rw-r--r-- | misc/openoffice3/patches/patch-dz | 48 | ||||
-rw-r--r-- | misc/openoffice3/patches/patch-ea | 46 | ||||
-rw-r--r-- | misc/openoffice3/patches/patch-eb | 46 |
13 files changed, 288 insertions, 138 deletions
diff --git a/misc/openoffice3/MESSAGE b/misc/openoffice3/MESSAGE index 79da4582ad5..45b0696a6c0 100644 --- a/misc/openoffice3/MESSAGE +++ b/misc/openoffice3/MESSAGE @@ -1,10 +1,10 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $ +$NetBSD: MESSAGE,v 1.2 2008/10/20 12:30:16 hira Exp $ - OpenOffice has now been installed in ${PREFIX}/${OO_RELEASE}. + OpenOffice has now been installed in ${OO_PREFIX}. Before using this package for the first time, each user has to run a setup program, which is automatically invoked at the first start. Thereafter, OpenOffice can be started using the - ${PREFIX}/bin/soffice command. + ${DESTDIR}${PREFIX}/bin/soffice command. =========================================================================== diff --git a/misc/openoffice3/Makefile b/misc/openoffice3/Makefile index fb0a964dda5..e4dc4165334 100644 --- a/misc/openoffice3/Makefile +++ b/misc/openoffice3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2008/10/18 01:08:44 hira Exp $ +# $NetBSD: Makefile,v 1.7 2008/10/20 12:30:16 hira Exp $ # OO_VER= 3.0.0 @@ -67,6 +67,8 @@ SUBST_CLASSES+= lib SUBST_STAGE.lib= post-patch SUBST_MESSAGE.lib= Adding library paths SUBST_FILES.lib= solenv/inc/pkgsrc.mk +SUBST_SED.lib+= -e 's|@COMPILER_RPATH_FLAG@|${COMPILER_RPATH_FLAG}|g' +SUBST_SED.lib+= -e 's|@OO_LIBDIR@|${OO_PREFIX}/${OO_UNXNAME}/basis-link/program|g' .for pkg in db4 expat icu jpeg zlib LIB.${pkg}= -L${BUILDLINK_PREFIX.${pkg}}/lib LIB.${pkg}+= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.${pkg}}/lib @@ -125,13 +127,14 @@ UNLIMIT_RESOURCES+= datasize OO_RELEASE= OpenOffice.org${OO_VER} PLIST_SRC+= ${PKGDIR}/PLIST PLIST_SRC+= ${WRKDIR}/PLIST -MESSAGE_SUBST+= OO_RELEASE=${OO_RELEASE} -INSTALLATION_DIRS= bin ${OO_RELEASE} share/applications +MESSAGE_SUBST+= DESTDIR=${DESTDIR} +MESSAGE_SUBST+= OO_PREFIX=${OO_PREFIX} +INSTALLATION_DIRS= bin lib/${OO_RELEASE} share/applications OO_UNXNAME= openoffice.org3 OO_PKGPATH= ${WRKSRC}/instsetoo_native/${OPENOFFICE_OUTPATH}.pro/OpenOffice/portable/install OO_PROGRAMS= scalc sdraw simpress soffice swriter unopkg -OO_PREFIX= ${DESTDIR}${PREFIX}/${OO_RELEASE} +OO_PREFIX= ${DESTDIR}${PREFIX}/lib/${OO_RELEASE} post-extract: cd ${WRKSRC}/bridges/source/cpp_uno && \ @@ -177,9 +180,9 @@ do-install: post-install: cd ${DESTDIR}${PREFIX} && \ - find ${OO_RELEASE} \! -type d -print | \ - sort > ${WRKDIR}/PLIST && \ - find ${OO_RELEASE} -type d -print | sort -r | \ + find lib/${OO_RELEASE} \! -type d -print | \ + sort > ${WRKDIR}/PLIST && \ + find lib/${OO_RELEASE} -type d -print | sort -r | \ awk '{print("@dirrm "$$1)}' >> ${WRKDIR}/PLIST ${ECHO} bin/${OO_UNXNAME} >> ${WRKDIR}/PLIST ${ECHO} bin/${OO_UNXNAME}-printeradmin >> ${WRKDIR}/PLIST diff --git a/misc/openoffice3/distinfo b/misc/openoffice3/distinfo index 3a97f4ba7ad..add02306f42 100644 --- a/misc/openoffice3/distinfo +++ b/misc/openoffice3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2008/10/18 11:09:11 hira Exp $ +$NetBSD: distinfo,v 1.6 2008/10/20 12:30:16 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 @@ -40,7 +40,6 @@ SHA1 (patch-bm) = 0f7367782155c1d0f0459912aac69a1c759ad7fa SHA1 (patch-bn) = 6f21ecf499135b5b47ed191eca79848b4c404447 SHA1 (patch-bo) = 3e4bcccd0a7cea535e443d750039fa844380f8bc SHA1 (patch-bq) = 5a78794aac28cefb9386034e6937c8f63b2ebc65 -SHA1 (patch-br) = 2af5c86f4cf04b29cb3bab76e23b5d9b46445978 SHA1 (patch-bs) = ede4ffcb762e89efbf95b6e4b644eb268534f1ca SHA1 (patch-bv) = bc035bdbc8420666a52417f2226e3e687d199e33 SHA1 (patch-bw) = 223963fe59b71468420a697d8ea27c153b9f37ce @@ -50,7 +49,7 @@ SHA1 (patch-ch) = caa598140bcb78ec61bc33d44c5873da84e1628a SHA1 (patch-ci) = 4743cee1c391e04a53bd83f6ae7e58e737d08d1e SHA1 (patch-cj) = 45ff359ec795e5ef5c692e954d88912c74017162 SHA1 (patch-ck) = 01925efa75759b3b8efda3ab109b0f6481f45a7f -SHA1 (patch-cn) = 12e09dde1e8fd8afaf2f48fd6455625790b9ecc4 +SHA1 (patch-cn) = 358fd67f20f3ffdb993fb3f4cb38d5733274fd6b SHA1 (patch-cp) = 35151ba658859c9d116ccdf44ec372c9e66435b1 SHA1 (patch-cq) = 6691fd7fa330db000ec5a9319bf9030b83aa593d SHA1 (patch-cr) = aa797461919635c3e6aaa30678a7585d5640dedd @@ -71,8 +70,8 @@ SHA1 (patch-dk) = 1f022fe11b4b1c6cb960f416724054954442ee74 SHA1 (patch-do) = c505e2e03912a068aa4666c8460b129447ec5a4e SHA1 (patch-dp) = ce90ba6c2cce3af1ade0257fd42106ea8345661b SHA1 (patch-dt) = 59964a31a8abbb324029653609b0decadbe03a75 -SHA1 (patch-du) = 85a7ccaffc5165617b031359873727f7a29d1938 -SHA1 (patch-dw) = de171dec68a1a55a47f2652ecdad429020d773ef -SHA1 (patch-dx) = 7579b1f7326951c57bd2ff597209c17d5d54f28d -SHA1 (patch-dy) = 1feec77ce8c87fc1afb797401047669b3da41c54 -SHA1 (patch-dz) = c3d345ad74dcaa45667ce4de97d8b4686edb773a +SHA1 (patch-du) = 57434c4c30bf1335aef089a9c267328a2ba6959a +SHA1 (patch-dy) = 4af56ef04180ab3dec7d0051e4075e84b62c8405 +SHA1 (patch-dz) = 3932f59e8f78c8a641e52d5284ccc0395c7ee172 +SHA1 (patch-ea) = 8c54345a53bd49d9c4c3b206d43778a56df0b292 +SHA1 (patch-eb) = 34562ae59bc67ab6ced1d63b39594a1b44ca3834 diff --git a/misc/openoffice3/options.mk b/misc/openoffice3/options.mk index cdfdcffc0fe..8aaf7792dc8 100644 --- a/misc/openoffice3/options.mk +++ b/misc/openoffice3/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2008/10/19 05:01:21 hira Exp $ +# $NetBSD: options.mk,v 1.5 2008/10/20 12:30:16 hira Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.openoffice3 PKG_SUPPORTED_OPTIONS= cups gnome gtk2 java kde ooo-external-libwpd @@ -82,25 +82,26 @@ USE_JAVA2= yes DEPENDS+= apache-ant>=1.7.0:../../devel/apache-ant CONFIGURE_ARGS+= --with-java --disable-mediawiki -# -rpath is missing for -lmawt. Please fix wip/jdk15. -JAVA_XAWT_DIR= ${PKG_JAVA_HOME}/jre/lib/${MACHINE_ARCH}/xawt -CONFIGURE_ENV+= LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${JAVA_XAWT_DIR}" +# -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" -# I can't find wrapper of Java (${PREFIX}/bin/java). -# It exists in ${PREFIX}/bin/ant. +# 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${PKG_JAVA_HOME}/jre/lib/${MACHINE_ARCH} -LIB.awtlib+= ${COMPILER_RPATH_FLAG}${PKG_JAVA_HOME}/jre/lib/${MACHINE_ARCH} +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= -JAVA_XAWT_DIR= +LIB.jawt= +LIB.mawt= LIB.awtlib= .endif @@ -108,10 +109,9 @@ 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_XAWT_DIR@,${JAVA_XAWT_DIR},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-br b/misc/openoffice3/patches/patch-br deleted file mode 100644 index 88797134452..00000000000 --- a/misc/openoffice3/patches/patch-br +++ /dev/null @@ -1,58 +0,0 @@ -$NetBSD: patch-br,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $ - ---- scp2/source/ooo/file_library_ooo.scp.orig 2008-07-18 00:34:36.000000000 +0900 -+++ scp2/source/ooo/file_library_ooo.scp 2008-07-27 05:30:49.000000000 +0900 -@@ -217,6 +217,8 @@ - #ifdef UNX - #ifdef MACOSX - Name = STRING(CONCAT2(libcurl.3,UNXSUFFIX)); -+ #elif defined(NETBSD) -+ Name = STRING(CONCAT6(libcurl,UNXSUFFIX,.,CURL_MAJOR,.,CURL_MINOR)); - #else - Name = STRING(CONCAT8(libcurl,UNXSUFFIX,.,CURL_MAJOR,.,CURL_MINOR,.,CURL_MICRO)); - #endif -@@ -1662,6 +1664,8 @@ - #ifdef UNX - #ifdef MACOSX - Name = STRING(CONCAT2(libxmlsec1.1.2.6,UNXSUFFIX)); -+ #elif defined(NETBSD) -+ Name = STRING(CONCAT3(libxmlsec1,UNXSUFFIX,.3.6)); - #else - Name = STRING(CONCAT3(libxmlsec1,UNXSUFFIX,.1.2.6)); - #endif -@@ -1694,6 +1698,8 @@ - TXT_FILE_BODY; - #ifdef MACOSX - Name = STRING(CONCAT2(libxmlsec1-nss.1.2.6,UNXSUFFIX)); -+ #elif defined(NETBSD) -+ Name = STRING(CONCAT3(libxmlsec1-nss,UNXSUFFIX,.3.6)); - #else - Name = STRING(CONCAT3(libxmlsec1-nss,UNXSUFFIX,.1.2.6)); - #endif -@@ -1805,6 +1811,8 @@ - #ifdef UNX - #ifdef MACOSX - Name = STRING(CONCAT8(libraptor,.,RAPTOR_MAJOR,.,RAPTOR_MINOR,.,RAPTOR_MICRO,UNXSUFFIX)); -+ #elif defined(NETBSD) -+ Name = "libraptor.so.2.0"; /* XXX */ - #else - Name = STRING(CONCAT8(libraptor,UNXSUFFIX,.,RAPTOR_MAJOR,.,RAPTOR_MINOR,.,RAPTOR_MICRO)); - #endif -@@ -1824,6 +1832,8 @@ - #ifdef UNX - #ifdef MACOSX - Name = STRING(CONCAT8(librasqal,.,RASQAL_MAJOR,.,RASQAL_MINOR,.,RASQAL_MICRO,UNXSUFFIX)); -+ #elif defined(NETBSD) -+ Name = STRING(CONCAT6(librasqal,UNXSUFFIX,.,RASQAL_MAJOR,.,RASQAL_MINOR)); - #else - Name = STRING(CONCAT8(librasqal,UNXSUFFIX,.,RASQAL_MAJOR,.,RASQAL_MINOR,.,RASQAL_MICRO)); - #endif -@@ -1843,6 +1853,8 @@ - #ifdef UNX - #ifdef MACOSX - Name = STRING(CONCAT8(librdf,.,REDLAND_MAJOR,.,REDLAND_MINOR,.,REDLAND_MICRO,UNXSUFFIX)); -+ #elif defined(NETBSD) -+ Name = STRING(CONCAT6(librdf,UNXSUFFIX,.,REDLAND_MAJOR,.,REDLAND_MINOR)); - #else - Name = STRING(CONCAT8(librdf,UNXSUFFIX,.,REDLAND_MAJOR,.,REDLAND_MINOR,.,REDLAND_MICRO)); - #endif diff --git a/misc/openoffice3/patches/patch-cn b/misc/openoffice3/patches/patch-cn index 2ac7ecec54a..f8b824c838d 100644 --- a/misc/openoffice3/patches/patch-cn +++ b/misc/openoffice3/patches/patch-cn @@ -1,7 +1,7 @@ -$NetBSD: patch-cn,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $ +$NetBSD: patch-cn,v 1.2 2008/10/20 12:30:16 hira Exp $ --- desktop/scripts/soffice.sh.orig 2008-08-07 02:44:36.000000000 +0900 -+++ desktop/scripts/soffice.sh 2008-08-27 21:51:39.000000000 +0900 ++++ desktop/scripts/soffice.sh 2008-10-19 14:38:10.000000000 +0900 @@ -49,6 +49,12 @@ export JITC_PROCESSOR_TYPE fi @@ -15,13 +15,10 @@ $NetBSD: patch-cn,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $ # resolve installation directory sd_cwd="`pwd`" if [ -h "$0" ] ; then -@@ -64,6 +70,14 @@ +@@ -64,6 +70,11 @@ sd_binary=`basename "$0"`.bin -+LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${sd_prog}/../basis-link/program:${sd_prog}/../basis-link/ure-link/lib:@JAVA_XAWT_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 a881c03880a..aa43b879685 100644 --- a/misc/openoffice3/patches/patch-du +++ b/misc/openoffice3/patches/patch-du @@ -1,8 +1,8 @@ -$NetBSD: patch-du,v 1.3 2008/10/16 23:16:47 hira Exp $ +$NetBSD: patch-du,v 1.4 2008/10/20 12:30:16 hira Exp $ --- solenv/inc/pkgsrc.mk.orig 2008-10-16 18:30:22.000000000 +0900 -+++ solenv/inc/pkgsrc.mk 2008-10-16 18:32:40.000000000 +0900 -@@ -0,0 +1,23 @@ ++++ solenv/inc/pkgsrc.mk 2008-10-17 16:32:40.000000000 +0900 +@@ -0,0 +1,36 @@ +# +# Settings for pkgsrc. +# @@ -22,7 +22,20 @@ $NetBSD: patch-du,v 1.3 2008/10/16 23:16:47 hira Exp $ + +ZLIB3RDLIB="@LIB_zlib@ -lz" + -+AWTLIB="@LIB_awtlib@ -ljawt" -+ +STDLIBGUIMT+=${X11_LDFLAGS} +STDSHLGUIMT+=${X11_LDFLAGS} ++ ++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 ++ ++# 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} ++ ++# XXX: unoxml/source/rdf and libxmlsec don't use LINKFLAGS. ++REDLANDLIB+= ${LIB_base} ${LIB_ure} ++xmlsec_LDFLAGS+= ${LIB_base} ${LIB_ure} diff --git a/misc/openoffice3/patches/patch-dw b/misc/openoffice3/patches/patch-dw deleted file mode 100644 index d455e648537..00000000000 --- a/misc/openoffice3/patches/patch-dw +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-dw,v 1.1.1.1 2008/10/14 11:02:25 hira Exp $ - ---- padmin/source/spadmin.sh.orig 2008-09-28 01:39:37.000000000 +0900 -+++ padmin/source/spadmin.sh 2008-09-28 01:57:38.000000000 +0900 -@@ -56,6 +56,9 @@ - esac - done - -+LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${sd_prog}/../basis-link/program:${sd_prog}/../basis-link/ure-link/lib:@JAVA_XAWT_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 deleted file mode 100644 index cbcbd26cfa4..00000000000 --- a/misc/openoffice3/patches/patch-dx +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-dx,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $ - ---- desktop/scripts/unopkg.sh.orig 2008-10-02 14:41:08.000000000 +0900 -+++ desktop/scripts/unopkg.sh 2008-10-02 14:41:43.000000000 +0900 -@@ -56,6 +56,9 @@ - esac - done - -+LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${sd_prog}/../basis-link/program:${sd_prog}/../basis-link/ure-link/lib:@JAVA_XAWT_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-dy b/misc/openoffice3/patches/patch-dy index 05db07547bd..9370f0ba88b 100644 --- a/misc/openoffice3/patches/patch-dy +++ b/misc/openoffice3/patches/patch-dy @@ -1,8 +1,104 @@ -$NetBSD: patch-dy,v 1.1.1.1 2008/10/14 11:02:25 hira Exp $ +$NetBSD: patch-dy,v 1.2 2008/10/20 12:30:16 hira Exp $ ---- libxmlsec/xmlsec1-1.2.6.patch.orig 2008-10-03 21:53:36.000000000 +0900 -+++ libxmlsec/xmlsec1-1.2.6.patch 2008-10-03 21:54:01.000000000 +0900 -@@ -418,7 +418,7 @@ +--- libxmlsec/xmlsec1-1.2.6.patch.orig 2008-03-18 23:06:34.000000000 +0900 ++++ libxmlsec/xmlsec1-1.2.6.patch 2008-10-20 03:29:32.000000000 +0900 +@@ -175,6 +175,23 @@ + case $version_type in + freebsd-elf*) + *************** ++*** 7969,7975 **** ++ ;; ++ ++ netbsd*) ++! version_type=sunos ++ need_lib_prefix=no ++ need_version=no ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++--- 7970,7976 ---- ++ ;; ++ ++ netbsd*) ++! version_type=freebsd-elf ++ need_lib_prefix=no ++ need_version=no ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++*************** + *** 9046,9052 **** + ;; + esac +@@ -249,6 +266,23 @@ + case $version_type in + freebsd-elf*) + *************** ++*** 11688,11694 **** ++ ;; ++ ++ netbsd*) ++! version_type=sunos ++ need_lib_prefix=no ++ need_version=no ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++--- 11689,11695 ---- ++ ;; ++ ++ netbsd*) ++! version_type=freebsd-elf ++ need_lib_prefix=no ++ need_version=no ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++*************** + *** 13259,13269 **** + lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' + ;; +@@ -308,6 +342,23 @@ + case $version_type in + freebsd-elf*) + *************** ++*** 14858,14864 **** ++ ;; ++ ++ netbsd*) ++! version_type=sunos ++ need_lib_prefix=no ++ need_version=no ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++--- 14859,14865 ---- ++ ;; ++ ++ netbsd*) ++! version_type=freebsd-elf ++ need_lib_prefix=no ++ need_version=no ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++*************** + *** 15607,15617 **** + lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4' + ;; +@@ -384,6 +435,23 @@ + case $version_type in + freebsd-elf*) + *************** ++*** 17226,17232 **** ++ ;; ++ ++ netbsd*) ++! version_type=sunos ++ need_lib_prefix=no ++ need_version=no ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++--- 17227,17233 ---- ++ ;; ++ ++ netbsd*) ++! version_type=freebsd-elf ++ need_lib_prefix=no ++ need_version=no ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++*************** + *** 24598,24604 **** + fi + +@@ -418,7 +486,7 @@ XMLSEC_NO_NSS="1" MOZILLA_MIN_VERSION="1.4" @@ -11,7 +107,7 @@ $NetBSD: patch-dy,v 1.1.1.1 2008/10/14 11:02:25 hira Exp $ + MOZILLA_MIN_VERSION="1.0" + fi NSS_MIN_VERSION="3.2" -@@ -2705,7 +2705,7 @@ +@@ -2705,7 +2773,7 @@ XMLSEC_NO_NSS="1" MOZILLA_MIN_VERSION="1.4" diff --git a/misc/openoffice3/patches/patch-dz b/misc/openoffice3/patches/patch-dz index 4fca0a2c030..1ee7d6e4111 100644 --- a/misc/openoffice3/patches/patch-dz +++ b/misc/openoffice3/patches/patch-dz @@ -1,15 +1,51 @@ -$NetBSD: patch-dz,v 1.1 2008/10/18 11:09:11 hira Exp $ +$NetBSD: patch-dz,v 1.2 2008/10/20 12:30:16 hira Exp $ XXX: lang/gcc34 allows implicit function declaration. ---- redland/raptor-1.4.17.patch.orig 2008-10-18 10:43:14.000000000 +0000 -+++ redland/raptor-1.4.17.patch 2008-10-18 10:44:08.000000000 +0000 -@@ -271,3 +271,14 @@ +--- redland/raptor-1.4.17.patch.orig 2008-07-18 18:25:27.000000000 +0900 ++++ redland/raptor-1.4.17.patch 2008-10-20 03:04:03.000000000 +0900 +@@ -271,3 +271,50 @@ ;; irix | nonstopux) -+--- misc/raptor-1.4.17/configure 2008-10-18 10:41:27.000000000 +0000 -++++ misc/build/raptor-1.4.17/configure 2008-10-18 10:42:41.000000000 +0000 ++--- misc/raptor-1.4.17/configure 2008-03-17 16:37:20.000000000 +0900 +++++ misc/build/raptor-1.4.17/configure 2008-10-20 03:01:08.000000000 +0900 ++@@ -8776,7 +8776,7 @@ ++ ;; ++ ++ netbsd*) ++- version_type=sunos +++ version_type=freebsd-elf ++ need_lib_prefix=no ++ need_version=no ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++@@ -12754,7 +12754,7 @@ ++ ;; ++ ++ netbsd*) ++- version_type=sunos +++ version_type=freebsd-elf ++ need_lib_prefix=no ++ need_version=no ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++@@ -15388,7 +15388,7 @@ ++ ;; ++ ++ netbsd*) ++- version_type=sunos +++ version_type=freebsd-elf ++ need_lib_prefix=no ++ need_version=no ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++@@ -18022,7 +18022,7 @@ ++ ;; ++ ++ netbsd*) ++- version_type=sunos +++ version_type=freebsd-elf ++ need_lib_prefix=no ++ need_version=no ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +@@ -22667,7 +22667,7 @@ + *) ac_try_echo=$ac_try;; + esac diff --git a/misc/openoffice3/patches/patch-ea b/misc/openoffice3/patches/patch-ea new file mode 100644 index 00000000000..2297fcf6759 --- /dev/null +++ b/misc/openoffice3/patches/patch-ea @@ -0,0 +1,46 @@ +$NetBSD: patch-ea,v 1.1 2008/10/20 12:30:16 hira Exp $ + +--- redland/rasqal-0.9.15.patch.orig 2008-10-20 03:08:13.000000000 +0900 ++++ redland/rasqal-0.9.15.patch 2008-10-20 03:08:52.000000000 +0900 +@@ -225,3 +225,41 @@ + ;; + + irix | nonstopux) ++--- misc/rasqal-0.9.15/configure 2008-10-20 03:06:36.000000000 +0900 +++++ misc/build/rasqal-0.9.15/configure 2008-10-20 03:07:46.000000000 +0900 ++@@ -8399,7 +8399,7 @@ ++ ;; ++ ++ netbsd*) ++- version_type=sunos +++ version_type=freebsd-elf ++ need_lib_prefix=no ++ need_version=no ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++@@ -12380,7 +12380,7 @@ ++ ;; ++ ++ netbsd*) ++- version_type=sunos +++ version_type=freebsd-elf ++ need_lib_prefix=no ++ need_version=no ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++@@ -14994,7 +14994,7 @@ ++ ;; ++ ++ netbsd*) ++- version_type=sunos +++ version_type=freebsd-elf ++ need_lib_prefix=no ++ need_version=no ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++@@ -17608,7 +17608,7 @@ ++ ;; ++ ++ netbsd*) ++- version_type=sunos +++ version_type=freebsd-elf ++ need_lib_prefix=no ++ need_version=no ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then diff --git a/misc/openoffice3/patches/patch-eb b/misc/openoffice3/patches/patch-eb new file mode 100644 index 00000000000..c9236685db7 --- /dev/null +++ b/misc/openoffice3/patches/patch-eb @@ -0,0 +1,46 @@ +$NetBSD: patch-eb,v 1.1 2008/10/20 12:30:16 hira Exp $ + +--- redland/redland-1.0.7.patch.orig 2008-10-20 03:13:47.000000000 +0900 ++++ redland/redland-1.0.7.patch 2008-10-20 03:14:30.000000000 +0900 +@@ -710,3 +710,41 @@ + ;; + + irix | nonstopux) ++--- misc/redland-1.0.7/configure 2008-10-20 03:12:31.000000000 +0900 +++++ misc/build/redland-1.0.7/configure 2008-10-20 03:13:23.000000000 +0900 ++@@ -8687,7 +8687,7 @@ ++ ;; ++ ++ netbsd*) ++- version_type=sunos +++ version_type=freebsd-elf ++ need_lib_prefix=no ++ need_version=no ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++@@ -12668,7 +12668,7 @@ ++ ;; ++ ++ netbsd*) ++- version_type=sunos +++ version_type=freebsd-elf ++ need_lib_prefix=no ++ need_version=no ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++@@ -15282,7 +15282,7 @@ ++ ;; ++ ++ netbsd*) ++- version_type=sunos +++ version_type=freebsd-elf ++ need_lib_prefix=no ++ need_version=no ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++@@ -17896,7 +17896,7 @@ ++ ;; ++ ++ netbsd*) ++- version_type=sunos +++ version_type=freebsd-elf ++ need_lib_prefix=no ++ need_version=no ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then |