Sat Oct 18 01:28:22 2008 UTC ()
 - Add missing -Wl to patch-ch and patch-cs.
 - Correct flag for disabling optimizations.

Ride on previous PKGREVISION bump.


(hira)
diff -r1.45 -r1.46 pkgsrc/misc/openoffice2/distinfo
diff -r1.3 -r1.4 pkgsrc/misc/openoffice2/patches/patch-ch
diff -r1.2 -r1.3 pkgsrc/misc/openoffice2/patches/patch-cs
cvs diff -r1.45 -r1.46 pkgsrc/misc/openoffice2/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/openoffice2/Attic/distinfo 2008/10/18 01:09:44 1.45
+++ pkgsrc/misc/openoffice2/Attic/distinfo 2008/10/18 01:28:22 1.46
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.45 2008/10/18 01:09:44 hira Exp $ 1$NetBSD: distinfo,v 1.46 2008/10/18 01:28:22 hira Exp $
2 2
3SHA1 (openoffice-2.4.1/OOo_2.4.1_src_binfilter.tar.bz2) = a50c7f317643b756c2b0e8937fa9d64b99f05ed9 3SHA1 (openoffice-2.4.1/OOo_2.4.1_src_binfilter.tar.bz2) = a50c7f317643b756c2b0e8937fa9d64b99f05ed9
4RMD160 (openoffice-2.4.1/OOo_2.4.1_src_binfilter.tar.bz2) = 04ffce167f94a250f94f05923a70af0b0744c417 4RMD160 (openoffice-2.4.1/OOo_2.4.1_src_binfilter.tar.bz2) = 04ffce167f94a250f94f05923a70af0b0744c417
5Size (openoffice-2.4.1/OOo_2.4.1_src_binfilter.tar.bz2) = 6674779 bytes 5Size (openoffice-2.4.1/OOo_2.4.1_src_binfilter.tar.bz2) = 6674779 bytes
6SHA1 (openoffice-2.4.1/OOo_2.4.1_src_core.tar.bz2) = 170642263c32f614ee7e9439a8af30410e00d318 6SHA1 (openoffice-2.4.1/OOo_2.4.1_src_core.tar.bz2) = 170642263c32f614ee7e9439a8af30410e00d318
7RMD160 (openoffice-2.4.1/OOo_2.4.1_src_core.tar.bz2) = 64f43d426005b6c5f464cf55e72df41fe833620b 7RMD160 (openoffice-2.4.1/OOo_2.4.1_src_core.tar.bz2) = 64f43d426005b6c5f464cf55e72df41fe833620b
8Size (openoffice-2.4.1/OOo_2.4.1_src_core.tar.bz2) = 153573457 bytes 8Size (openoffice-2.4.1/OOo_2.4.1_src_core.tar.bz2) = 153573457 bytes
9SHA1 (openoffice-2.4.1/OOo_2.4.1_src_l10n.tar.bz2) = b21f4531ea8182d87ff6f5f68809086c1c063295 9SHA1 (openoffice-2.4.1/OOo_2.4.1_src_l10n.tar.bz2) = b21f4531ea8182d87ff6f5f68809086c1c063295
10RMD160 (openoffice-2.4.1/OOo_2.4.1_src_l10n.tar.bz2) = d41f43b27e84ae5a4620b591e46d884e0c94a72c 10RMD160 (openoffice-2.4.1/OOo_2.4.1_src_l10n.tar.bz2) = d41f43b27e84ae5a4620b591e46d884e0c94a72c
11Size (openoffice-2.4.1/OOo_2.4.1_src_l10n.tar.bz2) = 81193580 bytes 11Size (openoffice-2.4.1/OOo_2.4.1_src_l10n.tar.bz2) = 81193580 bytes
12SHA1 (openoffice-2.4.1/OOo_2.4.1_src_system.tar.bz2) = d42b8345b55ef6f0f2a4adb575c815bbb23ec00d 12SHA1 (openoffice-2.4.1/OOo_2.4.1_src_system.tar.bz2) = d42b8345b55ef6f0f2a4adb575c815bbb23ec00d
13RMD160 (openoffice-2.4.1/OOo_2.4.1_src_system.tar.bz2) = e476e4ca0804c58e4c8249b6f17f100094ad030d 13RMD160 (openoffice-2.4.1/OOo_2.4.1_src_system.tar.bz2) = e476e4ca0804c58e4c8249b6f17f100094ad030d
14Size (openoffice-2.4.1/OOo_2.4.1_src_system.tar.bz2) = 44069977 bytes 14Size (openoffice-2.4.1/OOo_2.4.1_src_system.tar.bz2) = 44069977 bytes
@@ -39,32 +39,32 @@ SHA1 (patch-bk) = 5a5c03a0c965edb32e95ad @@ -39,32 +39,32 @@ SHA1 (patch-bk) = 5a5c03a0c965edb32e95ad
39SHA1 (patch-bl) = d9d6860e4491863dd5b2f09eeff97e4023dbd23d 39SHA1 (patch-bl) = d9d6860e4491863dd5b2f09eeff97e4023dbd23d
40SHA1 (patch-bm) = 0f7367782155c1d0f0459912aac69a1c759ad7fa 40SHA1 (patch-bm) = 0f7367782155c1d0f0459912aac69a1c759ad7fa
41SHA1 (patch-bn) = a891c1620a53d9c25cf414232a80a4cdb54e0e27 41SHA1 (patch-bn) = a891c1620a53d9c25cf414232a80a4cdb54e0e27
42SHA1 (patch-bo) = 3e4bcccd0a7cea535e443d750039fa844380f8bc 42SHA1 (patch-bo) = 3e4bcccd0a7cea535e443d750039fa844380f8bc
43SHA1 (patch-bp) = 9005edd4a24bfa32b5e5a731ed626fb35d0b675e 43SHA1 (patch-bp) = 9005edd4a24bfa32b5e5a731ed626fb35d0b675e
44SHA1 (patch-bq) = b2402ee86620726d5628f4bd5ebaec2c2a29726b 44SHA1 (patch-bq) = b2402ee86620726d5628f4bd5ebaec2c2a29726b
45SHA1 (patch-br) = 5ffb7dd1e313ef0e6fc65da7c4380244840d80ca 45SHA1 (patch-br) = 5ffb7dd1e313ef0e6fc65da7c4380244840d80ca
46SHA1 (patch-bs) = ede4ffcb762e89efbf95b6e4b644eb268534f1ca 46SHA1 (patch-bs) = ede4ffcb762e89efbf95b6e4b644eb268534f1ca
47SHA1 (patch-bt) = f52b0fa4453a580ac256accf221aef0f2c059661 47SHA1 (patch-bt) = f52b0fa4453a580ac256accf221aef0f2c059661
48SHA1 (patch-bv) = bc035bdbc8420666a52417f2226e3e687d199e33 48SHA1 (patch-bv) = bc035bdbc8420666a52417f2226e3e687d199e33
49SHA1 (patch-bw) = e0d438f886e97c0342f56ba155ebb6a7e9414093 49SHA1 (patch-bw) = e0d438f886e97c0342f56ba155ebb6a7e9414093
50SHA1 (patch-bx) = 157878e1fb4297f118ed0bbf06009506666fbc1c 50SHA1 (patch-bx) = 157878e1fb4297f118ed0bbf06009506666fbc1c
51SHA1 (patch-by) = 1612b765467e51ca7498497d38a0bb6ac694f9a6 51SHA1 (patch-by) = 1612b765467e51ca7498497d38a0bb6ac694f9a6
52SHA1 (patch-ch) = 5785607cff893f32b16bb5bcd30dc6c3942633e0 52SHA1 (patch-ch) = be68bf0e05b2d80102fb098f703bf80bb4fa6abc
53SHA1 (patch-ci) = 4743cee1c391e04a53bd83f6ae7e58e737d08d1e 53SHA1 (patch-ci) = 4743cee1c391e04a53bd83f6ae7e58e737d08d1e
54SHA1 (patch-cj) = 45ff359ec795e5ef5c692e954d88912c74017162 54SHA1 (patch-cj) = 45ff359ec795e5ef5c692e954d88912c74017162
55SHA1 (patch-cn) = 67afccde1d7bfa42ec4082067189da23ada97190 55SHA1 (patch-cn) = 67afccde1d7bfa42ec4082067189da23ada97190
56SHA1 (patch-cp) = 35151ba658859c9d116ccdf44ec372c9e66435b1 56SHA1 (patch-cp) = 35151ba658859c9d116ccdf44ec372c9e66435b1
57SHA1 (patch-cq) = 6691fd7fa330db000ec5a9319bf9030b83aa593d 57SHA1 (patch-cq) = 6691fd7fa330db000ec5a9319bf9030b83aa593d
58SHA1 (patch-cr) = aa797461919635c3e6aaa30678a7585d5640dedd 58SHA1 (patch-cr) = aa797461919635c3e6aaa30678a7585d5640dedd
59SHA1 (patch-cs) = ac54843e3aca0c798753bbb7670bb12bcb92272e 59SHA1 (patch-cs) = 55f2296e74c80f32ea548d38c4bbd9114e403fd3
60SHA1 (patch-ct) = a06c5cbc543acecb4f18e858cd844302bbdb50b4 60SHA1 (patch-ct) = a06c5cbc543acecb4f18e858cd844302bbdb50b4
61SHA1 (patch-cu) = b930fd94413c2bdf23ea94b074e3bb5e93784009 61SHA1 (patch-cu) = b930fd94413c2bdf23ea94b074e3bb5e93784009
62SHA1 (patch-cv) = 2e14a54d369a255ee39fcec7d4f1d2b11a8f4d2e 62SHA1 (patch-cv) = 2e14a54d369a255ee39fcec7d4f1d2b11a8f4d2e
63SHA1 (patch-cw) = 9c122919fed1b77bfc2edeb5297a7f6bdf4d45ae 63SHA1 (patch-cw) = 9c122919fed1b77bfc2edeb5297a7f6bdf4d45ae
64SHA1 (patch-cx) = 1c2efe192b0535ff6b2dc59e6a138c9931e6e946 64SHA1 (patch-cx) = 1c2efe192b0535ff6b2dc59e6a138c9931e6e946
65SHA1 (patch-cy) = 8d47bcf1da6f351f4f0cbf6a8355903094b0baee 65SHA1 (patch-cy) = 8d47bcf1da6f351f4f0cbf6a8355903094b0baee
66SHA1 (patch-da) = c2c9332dcf22d2d201215813ac9fc7e7ac401c6d 66SHA1 (patch-da) = c2c9332dcf22d2d201215813ac9fc7e7ac401c6d
67SHA1 (patch-dc) = 2a6b826ca2849110f33c612a4c4beba8f7e27e67 67SHA1 (patch-dc) = 2a6b826ca2849110f33c612a4c4beba8f7e27e67
68SHA1 (patch-dd) = d733d6e54db93bbb7be5382ddf96cf83731a6176 68SHA1 (patch-dd) = d733d6e54db93bbb7be5382ddf96cf83731a6176
69SHA1 (patch-de) = 138fbea73fec80c744c3eede57dfe5f1cddef573 69SHA1 (patch-de) = 138fbea73fec80c744c3eede57dfe5f1cddef573
70SHA1 (patch-dy) = 12d93711aa31d7deeb50022cc88cc7c243a098dd 70SHA1 (patch-dy) = 12d93711aa31d7deeb50022cc88cc7c243a098dd
cvs diff -r1.3 -r1.4 pkgsrc/misc/openoffice2/patches/Attic/patch-ch (expand / switch to unified diff)

--- pkgsrc/misc/openoffice2/patches/Attic/patch-ch 2007/10/06 20:02:23 1.3
+++ pkgsrc/misc/openoffice2/patches/Attic/patch-ch 2008/10/18 01:28:22 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ch,v 1.3 2007/10/06 20:02:23 hira Exp $ 1$NetBSD: patch-ch,v 1.4 2008/10/18 01:28:22 hira Exp $
2 2
3--- solenv/inc/unxbsdi3.mk.orig 2007-10-05 10:11:25.000000000 +0900 3--- solenv/inc/unxbsdi3.mk.orig 2007-10-05 10:11:25.000000000 +0900
4+++ solenv/inc/unxbsdi3.mk 2007-10-05 10:14:03.000000000 +0900 4+++ solenv/inc/unxbsdi3.mk 2007-10-05 10:14:03.000000000 +0900
5@@ -0,0 +1,178 @@ 5@@ -0,0 +1,178 @@
6+# 6+#
7+# mk file for NetBSD/i386 with gcc 3.4.x and higher. 7+# mk file for NetBSD/i386 with gcc 3.4.x and higher.
8+# 8+#
9+ 9+
10+ASM= 10+ASM=
11+AFLAGS= 11+AFLAGS=
12+ 12+
13+SOLAR_JAVA= 13+SOLAR_JAVA=
14+JAVAFLAGSDEBUG=-g 14+JAVAFLAGSDEBUG=-g
@@ -81,49 +81,49 @@ $NetBSD: patch-ch,v 1.3 2007/10/06 20:02 @@ -81,49 +81,49 @@ $NetBSD: patch-ch,v 1.3 2007/10/06 20:02
81+CFLAGSSLOGUIMT=$(PICSWITCH) 81+CFLAGSSLOGUIMT=$(PICSWITCH)
82+# Compiler flags for compiling shared object in multi threaded environment with character user interface 82+# Compiler flags for compiling shared object in multi threaded environment with character user interface
83+CFLAGSSLOCUIMT=$(PICSWITCH) 83+CFLAGSSLOCUIMT=$(PICSWITCH)
84+# Compiler flags for profiling 84+# Compiler flags for profiling
85+CFLAGSPROF= 85+CFLAGSPROF=
86+# Compiler flags for debugging 86+# Compiler flags for debugging
87+CFLAGSDEBUG=-g 87+CFLAGSDEBUG=-g
88+CFLAGSDBGUTIL= 88+CFLAGSDBGUTIL=
89+# Compiler flags for enabling optimizations 89+# Compiler flags for enabling optimizations
90+# CFLAGSOPT=-O2 90+# CFLAGSOPT=-O2
91+# reduce to -O1 to avoid optimization problems 91+# reduce to -O1 to avoid optimization problems
92+CFLAGSOPT=-O1 92+CFLAGSOPT=-O1
93+# Compiler flags for disabling optimizations 93+# Compiler flags for disabling optimizations
94+CFLAGSNOOPT=-O 94+CFLAGSNOOPT=-O0
95+# Compiler flags for describing the output path 95+# Compiler flags for describing the output path
96+CFLAGSOUTOBJ=-o 96+CFLAGSOUTOBJ=-o
97+ 97+
98+CFLAGSWARNCC= 98+CFLAGSWARNCC=
99+CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy 99+CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
100+# -Wshadow does not work for C with nested uses of pthread_cleanup_push: 100+# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
101+CFLAGSWALLCC=-Wall -Wextra -Wendif-labels 101+CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
102+CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy 102+CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
103+CFLAGSWERRCC=-Werror 103+CFLAGSWERRCC=-Werror
104+ 104+
105+# switches for dynamic and static linking 105+# switches for dynamic and static linking
106+STATIC = -Wl,-Bstatic 106+STATIC = -Wl,-Bstatic
107+DYNAMIC = -Wl,-Bdynamic 107+DYNAMIC = -Wl,-Bdynamic
108+ 108+
109+# name of linker 109+# name of linker
110+LINK*=$(CXX) 110+LINK*=$(CXX)
111+LINKC*=$(CC) 111+LINKC*=$(CC)
112+ 112+
113+# default linker flags 113+# default linker flags
114+LINKFLAGSDEFS*=-z defs 114+LINKFLAGSDEFS*=-Wl,-z,defs
115+LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\' 115+LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
116+LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH) 116+LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
117+ 117+
118+# linker flags for linking applications 118+# linker flags for linking applications
119+LINKFLAGSAPPGUI= -Wl,-export-dynamic  119+LINKFLAGSAPPGUI= -Wl,-export-dynamic
120+LINKFLAGSAPPCUI= -Wl,-export-dynamic  120+LINKFLAGSAPPCUI= -Wl,-export-dynamic
121+ 121+
122+# linker flags for linking shared libraries 122+# linker flags for linking shared libraries
123+LINKFLAGSSHLGUI= -shared 123+LINKFLAGSSHLGUI= -shared
124+LINKFLAGSSHLCUI= -shared 124+LINKFLAGSSHLCUI= -shared
125+ 125+
126+LINKFLAGSTACK= 126+LINKFLAGSTACK=
127+LINKFLAGSPROF= 127+LINKFLAGSPROF=
128+LINKFLAGSDEBUG=-g 128+LINKFLAGSDEBUG=-g
129+LINKFLAGSOPT=-L$(SOLARVERSION)$/$(INPATH)$/lib 129+LINKFLAGSOPT=-L$(SOLARVERSION)$/$(INPATH)$/lib
cvs diff -r1.2 -r1.3 pkgsrc/misc/openoffice2/patches/Attic/patch-cs (expand / switch to unified diff)

--- pkgsrc/misc/openoffice2/patches/Attic/patch-cs 2008/10/18 01:09:44 1.2
+++ pkgsrc/misc/openoffice2/patches/Attic/patch-cs 2008/10/18 01:28:22 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-cs,v 1.2 2008/10/18 01:09:44 hira Exp $ 1$NetBSD: patch-cs,v 1.3 2008/10/18 01:28:22 hira Exp $
2 2
3--- solenv/inc/unxbsdx3.mk.orig 2007-10-13 00:24:19.000000000 +0900 3--- solenv/inc/unxbsdx3.mk.orig 2007-10-13 00:24:19.000000000 +0900
4+++ solenv/inc/unxbsdx3.mk 2007-10-13 00:28:56.000000000 +0900 4+++ solenv/inc/unxbsdx3.mk 2007-10-13 00:28:56.000000000 +0900
5@@ -0,0 +1,178 @@ 5@@ -0,0 +1,178 @@
6+# 6+#
7+# mk file for NetBSD/amd64 with gcc 3.4.x and higher. 7+# mk file for NetBSD/amd64 with gcc 3.4.x and higher.
8+# 8+#
9+ 9+
10+ASM= 10+ASM=
11+AFLAGS= 11+AFLAGS=
12+ 12+
13+SOLAR_JAVA= 13+SOLAR_JAVA=
14+JAVAFLAGSDEBUG=-g 14+JAVAFLAGSDEBUG=-g
@@ -81,49 +81,49 @@ $NetBSD: patch-cs,v 1.2 2008/10/18 01:09 @@ -81,49 +81,49 @@ $NetBSD: patch-cs,v 1.2 2008/10/18 01:09
81+CFLAGSSLOGUIMT=$(PICSWITCH) 81+CFLAGSSLOGUIMT=$(PICSWITCH)
82+# Compiler flags for compiling shared object in multi threaded environment with character user interface 82+# Compiler flags for compiling shared object in multi threaded environment with character user interface
83+CFLAGSSLOCUIMT=$(PICSWITCH) 83+CFLAGSSLOCUIMT=$(PICSWITCH)
84+# Compiler flags for profiling 84+# Compiler flags for profiling
85+CFLAGSPROF= 85+CFLAGSPROF=
86+# Compiler flags for debugging 86+# Compiler flags for debugging
87+CFLAGSDEBUG=-g 87+CFLAGSDEBUG=-g
88+CFLAGSDBGUTIL= 88+CFLAGSDBGUTIL=
89+# Compiler flags for enabling optimizations 89+# Compiler flags for enabling optimizations
90+# CFLAGSOPT=-O2 90+# CFLAGSOPT=-O2
91+# reduce to -O1 to avoid optimization problems 91+# reduce to -O1 to avoid optimization problems
92+CFLAGSOPT=-O1 92+CFLAGSOPT=-O1
93+# Compiler flags for disabling optimizations 93+# Compiler flags for disabling optimizations
94+CFLAGSNOOPT=-O 94+CFLAGSNOOPT=-O0
95+# Compiler flags for describing the output path 95+# Compiler flags for describing the output path
96+CFLAGSOUTOBJ=-o 96+CFLAGSOUTOBJ=-o
97+ 97+
98+CFLAGSWARNCC= 98+CFLAGSWARNCC=
99+CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy 99+CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
100+# -Wshadow does not work for C with nested uses of pthread_cleanup_push: 100+# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
101+CFLAGSWALLCC=-Wall -Wextra -Wendif-labels 101+CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
102+CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy 102+CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
103+CFLAGSWERRCC=-Werror 103+CFLAGSWERRCC=-Werror
104+ 104+
105+# switches for dynamic and static linking 105+# switches for dynamic and static linking
106+STATIC = -Wl,-Bstatic 106+STATIC = -Wl,-Bstatic
107+DYNAMIC = -Wl,-Bdynamic 107+DYNAMIC = -Wl,-Bdynamic
108+ 108+
109+# name of linker 109+# name of linker
110+LINK*=$(CXX) 110+LINK*=$(CXX)
111+LINKC*=$(CC) 111+LINKC*=$(CC)
112+ 112+
113+# default linker flags 113+# default linker flags
114+LINKFLAGSDEFS*=-z defs 114+LINKFLAGSDEFS*=-Wl,-z,defs
115+LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\' 115+LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
116+LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH) 116+LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
117+ 117+
118+# linker flags for linking applications 118+# linker flags for linking applications
119+LINKFLAGSAPPGUI= -Wl,-export-dynamic  119+LINKFLAGSAPPGUI= -Wl,-export-dynamic
120+LINKFLAGSAPPCUI= -Wl,-export-dynamic  120+LINKFLAGSAPPCUI= -Wl,-export-dynamic
121+ 121+
122+# linker flags for linking shared libraries 122+# linker flags for linking shared libraries
123+LINKFLAGSSHLGUI= -shared 123+LINKFLAGSSHLGUI= -shared
124+LINKFLAGSSHLCUI= -shared 124+LINKFLAGSSHLCUI= -shared
125+ 125+
126+LINKFLAGSTACK= 126+LINKFLAGSTACK=
127+LINKFLAGSPROF= 127+LINKFLAGSPROF=
128+LINKFLAGSDEBUG=-g 128+LINKFLAGSDEBUG=-g
129+LINKFLAGSOPT=-L$(SOLARVERSION)$/$(INPATH)$/lib 129+LINKFLAGSOPT=-L$(SOLARVERSION)$/$(INPATH)$/lib