summaryrefslogtreecommitdiff
path: root/misc/openoffice2/patches/patch-dy
blob: efd684e90005fdf80d5b6cfd18265f98250aa3af (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
$NetBSD: patch-dy,v 1.2 2008/10/31 11:02:55 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"