diff options
Diffstat (limited to 'misc/openoffice3/patches/patch-dy')
-rw-r--r-- | misc/openoffice3/patches/patch-dy | 202 |
1 files changed, 85 insertions, 117 deletions
diff --git a/misc/openoffice3/patches/patch-dy b/misc/openoffice3/patches/patch-dy index 9370f0ba88b..0ee557fef85 100644 --- a/misc/openoffice3/patches/patch-dy +++ b/misc/openoffice3/patches/patch-dy @@ -1,118 +1,86 @@ -$NetBSD: patch-dy,v 1.2 2008/10/20 12:30:16 hira Exp $ +$NetBSD: patch-dy,v 1.3 2009/05/09 18:43:41 hira Exp $ ---- 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" --+ if test "z$MOZ_FLAVOUR" = "zfirefox" ; then -++ if test "z$MOZ_FLAVOUR" = "zfirefox" -o "z$MOZ_FLAVOUR" = "zseamonkey"; then - + MOZILLA_MIN_VERSION="1.0" - + fi - NSS_MIN_VERSION="3.2" -@@ -2705,7 +2773,7 @@ - - XMLSEC_NO_NSS="1" - MOZILLA_MIN_VERSION="1.4" --+ if test "z$MOZ_FLAVOUR" = "zfirefox" ; then -++ if test "z$MOZ_FLAVOUR" = "zfirefox" -o "z$MOZ_FLAVOUR" = "zseamonkey"; then - + MOZILLA_MIN_VERSION="1.0" - + fi - NSS_MIN_VERSION="3.2" +--- libxmlsec/xmlsec1-1.2.6.patch.orig 2009-01-23 03:14:08.000000000 +0900 ++++ libxmlsec/xmlsec1-1.2.6.patch 2009-05-09 14:52:22.000000000 +0900 +@@ -100,6 +100,15 @@ + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) ++@@ -7969,7 +7970,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 + @@ -9046,7 +9047,7 @@ + ;; + esac +@@ -140,6 +149,15 @@ + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) ++@@ -11688,7 +11689,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 + @@ -13259,11 +13260,11 @@ + lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' + ;; +@@ -172,6 +190,15 @@ + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) ++@@ -14858,7 +14859,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 + @@ -15607,11 +15608,11 @@ + lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4' + ;; +@@ -213,6 +240,15 @@ + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) ++@@ -17226,7 +17227,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 + @@ -24598,7 +24599,7 @@ + fi + +@@ -226,7 +262,7 @@ + + XMLSEC_NO_NSS="1" + MOZILLA_MIN_VERSION="1.4" +-+if test "z$MOZ_FLAVOUR" = "zfirefox" ; then +++if test "z$MOZ_FLAVOUR" = "zfirefox" -o "z$MOZ_FLAVOUR" = "zseamonkey"; then + + MOZILLA_MIN_VERSION="1.0" + +fi + NSS_MIN_VERSION="3.2" +@@ -2401,7 +2437,7 @@ + + XMLSEC_NO_NSS="1" + MOZILLA_MIN_VERSION="1.4" +-+if test "z$MOZ_FLAVOUR" = "zfirefox" ; then +++if test "z$MOZ_FLAVOUR" = "zfirefox" "z$MOZ_FLAVOUR" = "zseamonkey"; then + + MOZILLA_MIN_VERSION="1.0" + +fi + NSS_MIN_VERSION="3.2" |