Thu Oct 16 23:16:47 2008 UTC ()
 - Use security/openssl, textproc/hunspell and textproc/icu.
 - Add missing -Wl to patch-ch and patch-cs.
 - Correct flag for disabling optimizations.

Bump PKGREVISION.


(hira)
diff -r1.3 -r1.4 pkgsrc/misc/openoffice3/Makefile
diff -r1.2 -r1.3 pkgsrc/misc/openoffice3/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/misc/openoffice3/patches/patch-ba
diff -r1.1.1.1 -r1.2 pkgsrc/misc/openoffice3/patches/patch-ch
diff -r1.1.1.1 -r1.2 pkgsrc/misc/openoffice3/patches/patch-cs
diff -r1.1.1.1 -r0 pkgsrc/misc/openoffice3/patches/patch-dl
diff -r1.2 -r1.3 pkgsrc/misc/openoffice3/patches/patch-du
cvs diff -r1.3 -r1.4 pkgsrc/misc/openoffice3/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/openoffice3/Attic/Makefile 2008/10/15 23:17:29 1.3
+++ pkgsrc/misc/openoffice3/Attic/Makefile 2008/10/16 23:16:46 1.4
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.3 2008/10/15 23:17:29 hira Exp $ 1# $NetBSD: Makefile,v 1.4 2008/10/16 23:16:46 hira Exp $
2# 2#
3 3
4OO_VER= 3.0.0 4OO_VER= 3.0.0
 5PKG_REVISION= 1
5OO_TAG= OOO300_m9 6OO_TAG= OOO300_m9
6DISTNAME= openoffice-${OO_VER} 7DISTNAME= openoffice-${OO_VER}
7PKGNAME= openoffice3-${OO_VER} 8PKGNAME= openoffice3-${OO_VER}
8CATEGORIES= misc 9CATEGORIES= misc
9MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/} 10MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/}
10DIST_SUBDIR= ${DISTNAME} 11DIST_SUBDIR= ${DISTNAME}
11 12
12DISTFILES= OOo_${OO_VER}_src_core.tar.bz2 13DISTFILES= OOo_${OO_VER}_src_core.tar.bz2
13DISTFILES+= OOo_${OO_VER}_src_binfilter.tar.bz2 14DISTFILES+= OOo_${OO_VER}_src_binfilter.tar.bz2
14DISTFILES+= OOo_${OO_VER}_src_l10n.tar.bz2 15DISTFILES+= OOo_${OO_VER}_src_l10n.tar.bz2
15DISTFILES+= OOo_${OO_VER}_src_system.tar.bz2 16DISTFILES+= OOo_${OO_VER}_src_system.tar.bz2
16#DISTFILES+= OOo_${OO_VER}_src_extensions.tar.bz2 17#DISTFILES+= OOo_${OO_VER}_src_extensions.tar.bz2
17 18
@@ -52,64 +53,59 @@ PTHREAD_AUTO_VARS= yes @@ -52,64 +53,59 @@ PTHREAD_AUTO_VARS= yes
52ONLY_FOR_PLATFORM= FreeBSD-*-i386 FreeBSD-*-x86_64 53ONLY_FOR_PLATFORM= FreeBSD-*-i386 FreeBSD-*-x86_64
53ONLY_FOR_PLATFORM+= NetBSD-1.6Z[G-Z]*-i386 NetBSD-[2-9]*-i386 54ONLY_FOR_PLATFORM+= NetBSD-1.6Z[G-Z]*-i386 NetBSD-[2-9]*-i386
54ONLY_FOR_PLATFORM+= NetBSD-1.6Z[G-Z]*-x86_64 NetBSD-[2-9]*-x86_64 55ONLY_FOR_PLATFORM+= NetBSD-1.6Z[G-Z]*-x86_64 NetBSD-[2-9]*-x86_64
55 56
56GNU_CONFIGURE= yes 57GNU_CONFIGURE= yes
57 58
58REPLACE_PERL+= sd/res/webview/editpic.pl \ 59REPLACE_PERL+= sd/res/webview/editpic.pl \
59 sd/res/webview/poll.pl \ 60 sd/res/webview/poll.pl \
60 sd/res/webview/savepic.pl \ 61 sd/res/webview/savepic.pl \
61 sd/res/webview/show.pl \ 62 sd/res/webview/show.pl \
62 sd/res/webview/webview.pl 63 sd/res/webview/webview.pl
63REPLACE_PYTHON+= scripting/source/pyprov/mailmerge.py 64REPLACE_PYTHON+= scripting/source/pyprov/mailmerge.py
64 65
65# Hard-coded path exists in a tarball. Cannot use REPLACE_BASH. 
66# patch-dl replaces the path to @BASH@. 
67SUBST_CLASSES+= bash 
68SUBST_STAGE.bash= post-patch 
69SUBST_MESSAGE.bash= Fix hard-coded path 
70SUBST_FILES.bash= hunspell/hunspell-1.1.12.patch 
71SUBST_SED.bash+= -e 's,@BASH@,${BASH},g' 
72 
73SUBST_CLASSES+= lib 66SUBST_CLASSES+= lib
74SUBST_STAGE.lib= post-patch 67SUBST_STAGE.lib= post-patch
75SUBST_MESSAGE.lib= Adding library paths 68SUBST_MESSAGE.lib= Adding library paths
76SUBST_FILES.lib= solenv/inc/pkgsrc.mk 69SUBST_FILES.lib= solenv/inc/pkgsrc.mk
77.for pkg in db4 expat jpeg zlib 70.for pkg in db4 expat icu jpeg zlib
78LIB.${pkg}= -L${BUILDLINK_PREFIX.${pkg}}/lib 71LIB.${pkg}= -L${BUILDLINK_PREFIX.${pkg}}/lib
79LIB.${pkg}+= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.${pkg}}/lib 72LIB.${pkg}+= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.${pkg}}/lib
80SUBST_SED.lib+= -e 's|@LIB_${pkg}@|${LIB.${pkg}}|g' 73SUBST_SED.lib+= -e 's|@LIB_${pkg}@|${LIB.${pkg}}|g'
81LIBS+= ${LIB.${pkg}} 74LIBS+= ${LIB.${pkg}}
82.endfor 75.endfor
83 76
84CONFIGURE_ENV+= LIBS=${LIBS:O:u:Q} 77CONFIGURE_ENV+= LIBS=${LIBS:O:u:Q}
85CONFIGURE_ENV+= X_LIBS=${X11_LDFLAGS:M*:Q} 78CONFIGURE_ENV+= X_LIBS=${X11_LDFLAGS:M*:Q}
86CONFIGURE_ENV+= BLNK_PREFIX_db4=${BUILDLINK_PREFIX.db4} 79CONFIGURE_ENV+= BLNK_PREFIX_db4=${BUILDLINK_PREFIX.db4}
87 80
88CONFIGURE_ARGS+= --with-use-shell=bash 81CONFIGURE_ARGS+= --with-use-shell=bash
89CONFIGURE_ARGS+= --enable-binfilter 82CONFIGURE_ARGS+= --enable-binfilter
90CONFIGURE_ARGS+= --enable-cairo 83CONFIGURE_ARGS+= --enable-cairo
91CONFIGURE_ARGS+= --disable-systray 84CONFIGURE_ARGS+= --disable-systray
92CONFIGURE_ARGS+= --disable-ldap 85CONFIGURE_ARGS+= --disable-ldap
93CONFIGURE_ARGS+= --with-system-stdlibs 86CONFIGURE_ARGS+= --with-system-stdlibs
94CONFIGURE_ARGS+= --with-system-cairo 87CONFIGURE_ARGS+= --with-system-cairo
95CONFIGURE_ARGS+= --with-system-curl 88CONFIGURE_ARGS+= --with-system-curl
96CONFIGURE_ARGS+= --with-system-db 89CONFIGURE_ARGS+= --with-system-db
97CONFIGURE_ARGS+= --with-system-expat 90CONFIGURE_ARGS+= --with-system-expat
98CONFIGURE_ARGS+= --with-system-freetype 91CONFIGURE_ARGS+= --with-system-freetype
 92CONFIGURE_ARGS+= --with-system-hunspell
 93CONFIGURE_ARGS+= --with-system-icu
99CONFIGURE_ARGS+= --with-system-jpeg 94CONFIGURE_ARGS+= --with-system-jpeg
100CONFIGURE_ARGS+= --with-system-libxml 95CONFIGURE_ARGS+= --with-system-libxml
101CONFIGURE_ARGS+= --with-system-libxslt 96CONFIGURE_ARGS+= --with-system-libxslt
102CONFIGURE_ARGS+= --with-system-neon 97CONFIGURE_ARGS+= --with-system-neon
 98CONFIGURE_ARGS+= --with-system-openssl
103CONFIGURE_ARGS+= --with-system-python 99CONFIGURE_ARGS+= --with-system-python
104CONFIGURE_ARGS+= --with-system-zlib 100CONFIGURE_ARGS+= --with-system-zlib
105CONFIGURE_ARGS+= --with-dynamic-xinerama 101CONFIGURE_ARGS+= --with-dynamic-xinerama
106 102
107# Extensions 103# Extensions
108#CONFIGURE_ARGS+= --enable-minimizer 104#CONFIGURE_ARGS+= --enable-minimizer
109#CONFIGURE_ARGS+= --enable-presenter-console 105#CONFIGURE_ARGS+= --enable-presenter-console
110#CONFIGURE_ARGS+= --enable-pdfimport 106#CONFIGURE_ARGS+= --enable-pdfimport
111#CONFIGURE_ARGS+= --enable-wiki-publisher 107#CONFIGURE_ARGS+= --enable-wiki-publisher
112#CONFIGURE_ARGS+= --enable-ogltrans 108#CONFIGURE_ARGS+= --enable-ogltrans
113#CONFIGURE_ARGS+= --enable-report-builder 109#CONFIGURE_ARGS+= --enable-report-builder
114 110
115# `portable' supports all platforms. 111# `portable' supports all platforms.
@@ -195,27 +191,30 @@ post-install: @@ -195,27 +191,30 @@ post-install:
195 191
196.include "../../mk/compiler.mk" 192.include "../../mk/compiler.mk"
197 193
198.include "../../lang/python/application.mk" 194.include "../../lang/python/application.mk"
199 195
200.include "../../databases/db4/buildlink3.mk" 196.include "../../databases/db4/buildlink3.mk"
201.include "../../devel/gperf/buildlink3.mk" 197.include "../../devel/gperf/buildlink3.mk"
202.include "../../devel/zlib/buildlink3.mk" 198.include "../../devel/zlib/buildlink3.mk"
203.include "../../fonts/fontconfig/buildlink3.mk" 199.include "../../fonts/fontconfig/buildlink3.mk"
204.include "../../graphics/MesaLib/buildlink3.mk" 200.include "../../graphics/MesaLib/buildlink3.mk"
205.include "../../graphics/cairo/buildlink3.mk" 201.include "../../graphics/cairo/buildlink3.mk"
206.include "../../graphics/freetype2/buildlink3.mk" 202.include "../../graphics/freetype2/buildlink3.mk"
207.include "../../graphics/jpeg/buildlink3.mk" 203.include "../../graphics/jpeg/buildlink3.mk"
 204.include "../../security/openssl/buildlink3.mk"
208.include "../../textproc/expat/buildlink3.mk" 205.include "../../textproc/expat/buildlink3.mk"
 206.include "../../textproc/hunspell/buildlink3.mk"
 207.include "../../textproc/icu/buildlink3.mk"
209.include "../../textproc/libxml2/buildlink3.mk" 208.include "../../textproc/libxml2/buildlink3.mk"
210.include "../../textproc/libxslt/buildlink3.mk" 209.include "../../textproc/libxslt/buildlink3.mk"
211.include "../../www/curl/buildlink3.mk" 210.include "../../www/curl/buildlink3.mk"
212.include "../../www/neon/buildlink3.mk" 211.include "../../www/neon/buildlink3.mk"
213.include "../../x11/libX11/buildlink3.mk" 212.include "../../x11/libX11/buildlink3.mk"
214.include "../../x11/libXaw/buildlink3.mk" 213.include "../../x11/libXaw/buildlink3.mk"
215.include "../../x11/libXcursor/buildlink3.mk" 214.include "../../x11/libXcursor/buildlink3.mk"
216.include "../../x11/libXext/buildlink3.mk" 215.include "../../x11/libXext/buildlink3.mk"
217.include "../../x11/libXfixes/buildlink3.mk" 216.include "../../x11/libXfixes/buildlink3.mk"
218.include "../../x11/libXi/buildlink3.mk" 217.include "../../x11/libXi/buildlink3.mk"
219.include "../../x11/libXinerama/buildlink3.mk" 218.include "../../x11/libXinerama/buildlink3.mk"
220.include "../../x11/libXrandr/buildlink3.mk" 219.include "../../x11/libXrandr/buildlink3.mk"
221.include "../../x11/libXrender/buildlink3.mk" 220.include "../../x11/libXrender/buildlink3.mk"
cvs diff -r1.2 -r1.3 pkgsrc/misc/openoffice3/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/openoffice3/Attic/distinfo 2008/10/15 23:17:29 1.2
+++ pkgsrc/misc/openoffice3/Attic/distinfo 2008/10/16 23:16:46 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.2 2008/10/15 23:17:29 hira Exp $ 1$NetBSD: distinfo,v 1.3 2008/10/16 23:16:46 hira Exp $
2 2
3SHA1 (openoffice-3.0.0/OOo_3.0.0_src_binfilter.tar.bz2) = 09ff91fd871f00c696befa8064fe04d7a88a3c8a 3SHA1 (openoffice-3.0.0/OOo_3.0.0_src_binfilter.tar.bz2) = 09ff91fd871f00c696befa8064fe04d7a88a3c8a
4RMD160 (openoffice-3.0.0/OOo_3.0.0_src_binfilter.tar.bz2) = edc71b8b0596d63e60431c7266140bf5188abc6d 4RMD160 (openoffice-3.0.0/OOo_3.0.0_src_binfilter.tar.bz2) = edc71b8b0596d63e60431c7266140bf5188abc6d
5Size (openoffice-3.0.0/OOo_3.0.0_src_binfilter.tar.bz2) = 6596201 bytes 5Size (openoffice-3.0.0/OOo_3.0.0_src_binfilter.tar.bz2) = 6596201 bytes
6SHA1 (openoffice-3.0.0/OOo_3.0.0_src_core.tar.bz2) = 8fc1e6140f8a0695accf8d34746253af431c2542 6SHA1 (openoffice-3.0.0/OOo_3.0.0_src_core.tar.bz2) = 8fc1e6140f8a0695accf8d34746253af431c2542
7RMD160 (openoffice-3.0.0/OOo_3.0.0_src_core.tar.bz2) = 43be2cf77523d0d95ec4c684fe705fa9b4ee4b9d 7RMD160 (openoffice-3.0.0/OOo_3.0.0_src_core.tar.bz2) = 43be2cf77523d0d95ec4c684fe705fa9b4ee4b9d
8Size (openoffice-3.0.0/OOo_3.0.0_src_core.tar.bz2) = 183003517 bytes 8Size (openoffice-3.0.0/OOo_3.0.0_src_core.tar.bz2) = 183003517 bytes
9SHA1 (openoffice-3.0.0/OOo_3.0.0_src_l10n.tar.bz2) = 0ee7f44cea5549a3d3473ff7669974e8914caf97 9SHA1 (openoffice-3.0.0/OOo_3.0.0_src_l10n.tar.bz2) = 0ee7f44cea5549a3d3473ff7669974e8914caf97
10RMD160 (openoffice-3.0.0/OOo_3.0.0_src_l10n.tar.bz2) = cb3eac1537b75cb34485037b916b634b90c6ff13 10RMD160 (openoffice-3.0.0/OOo_3.0.0_src_l10n.tar.bz2) = cb3eac1537b75cb34485037b916b634b90c6ff13
11Size (openoffice-3.0.0/OOo_3.0.0_src_l10n.tar.bz2) = 86009445 bytes 11Size (openoffice-3.0.0/OOo_3.0.0_src_l10n.tar.bz2) = 86009445 bytes
12SHA1 (openoffice-3.0.0/OOo_3.0.0_src_system.tar.bz2) = b8af1787bd4651c808d298e81ee797bf2b7ebdcd 12SHA1 (openoffice-3.0.0/OOo_3.0.0_src_system.tar.bz2) = b8af1787bd4651c808d298e81ee797bf2b7ebdcd
13RMD160 (openoffice-3.0.0/OOo_3.0.0_src_system.tar.bz2) = 10c8b58ade00cf22fdb699f38d60abee8e150436 13RMD160 (openoffice-3.0.0/OOo_3.0.0_src_system.tar.bz2) = 10c8b58ade00cf22fdb699f38d60abee8e150436
14Size (openoffice-3.0.0/OOo_3.0.0_src_system.tar.bz2) = 44882699 bytes 14Size (openoffice-3.0.0/OOo_3.0.0_src_system.tar.bz2) = 44882699 bytes
@@ -16,63 +16,62 @@ SHA1 (patch-ac) = ed6d84d40c3543eed754d7 @@ -16,63 +16,62 @@ SHA1 (patch-ac) = ed6d84d40c3543eed754d7
16SHA1 (patch-ad) = 9513865551837a69202f4595232c36a656f200ca 16SHA1 (patch-ad) = 9513865551837a69202f4595232c36a656f200ca
17SHA1 (patch-ag) = 6c2f17424cfc85b5bc923a650167f14b7acabfd4 17SHA1 (patch-ag) = 6c2f17424cfc85b5bc923a650167f14b7acabfd4
18SHA1 (patch-ah) = e0a7dd2bf36e5009b5b8a5ddc593a5a78c01a012 18SHA1 (patch-ah) = e0a7dd2bf36e5009b5b8a5ddc593a5a78c01a012
19SHA1 (patch-ai) = 268c8107052d2650a78d8048513f4acb2a1ee0f1 19SHA1 (patch-ai) = 268c8107052d2650a78d8048513f4acb2a1ee0f1
20SHA1 (patch-ak) = a121e98afdc1e22a5579cb0c70759e8a16d57662 20SHA1 (patch-ak) = a121e98afdc1e22a5579cb0c70759e8a16d57662
21SHA1 (patch-am) = 8e497298dd5534bd0ef438c22595c1c0f63912a5 21SHA1 (patch-am) = 8e497298dd5534bd0ef438c22595c1c0f63912a5
22SHA1 (patch-an) = cdf677a8e135fd4b447eef006558c7fea4df0be6 22SHA1 (patch-an) = cdf677a8e135fd4b447eef006558c7fea4df0be6
23SHA1 (patch-ao) = a83178adec44571ebcf7a4dd66bda52d004d465c 23SHA1 (patch-ao) = a83178adec44571ebcf7a4dd66bda52d004d465c
24SHA1 (patch-ap) = 806668c47374d46cc28ef41b17bf3632b9a81020 24SHA1 (patch-ap) = 806668c47374d46cc28ef41b17bf3632b9a81020
25SHA1 (patch-aq) = 651dad01336dce6901f1aacebe438b565a321be0 25SHA1 (patch-aq) = 651dad01336dce6901f1aacebe438b565a321be0
26SHA1 (patch-ar) = e3592ddc51a311a90d727ef8b595944a0ac3e623 26SHA1 (patch-ar) = e3592ddc51a311a90d727ef8b595944a0ac3e623
27SHA1 (patch-as) = 6f6992430e3cea8a914ad3dcbe9ebcdf288ddc2a 27SHA1 (patch-as) = 6f6992430e3cea8a914ad3dcbe9ebcdf288ddc2a
28SHA1 (patch-aw) = fdd1665c729cd17d8381ab39f2e6672164a058ad 28SHA1 (patch-aw) = fdd1665c729cd17d8381ab39f2e6672164a058ad
29SHA1 (patch-ba) = 0b715158cc2e2b80a5cc6e5127a3c2271eabb483 29SHA1 (patch-ba) = c3b27c83c69b515d2774acb88d56370eb263f872
30SHA1 (patch-bb) = a2fe8b7aff8c875bdf15c70619b430f1fdbfa053 30SHA1 (patch-bb) = a2fe8b7aff8c875bdf15c70619b430f1fdbfa053
31SHA1 (patch-bd) = 8faf878760e476ed13a4506f0615f8b544a2abd4 31SHA1 (patch-bd) = 8faf878760e476ed13a4506f0615f8b544a2abd4
32SHA1 (patch-bf) = d2e2363e7e08d675e3a6b9356d1ffac6d10148de 32SHA1 (patch-bf) = d2e2363e7e08d675e3a6b9356d1ffac6d10148de
33SHA1 (patch-bg) = 0eeb3e521b3d7c47efa67bf38a1ec598056ab32a 33SHA1 (patch-bg) = 0eeb3e521b3d7c47efa67bf38a1ec598056ab32a
34SHA1 (patch-bh) = 39322769872a33293d9dad56b947ca2d6d5069df 34SHA1 (patch-bh) = 39322769872a33293d9dad56b947ca2d6d5069df
35SHA1 (patch-bi) = f9d286d8dd93c7ba99fd0ca809c6dfac5e763464 35SHA1 (patch-bi) = f9d286d8dd93c7ba99fd0ca809c6dfac5e763464
36SHA1 (patch-bj) = 80685500062b9a17e16732a9a6da7a7d1d1ed1f6 36SHA1 (patch-bj) = 80685500062b9a17e16732a9a6da7a7d1d1ed1f6
37SHA1 (patch-bk) = 5a5c03a0c965edb32e95ad342f330e2b0eaf3d9c 37SHA1 (patch-bk) = 5a5c03a0c965edb32e95ad342f330e2b0eaf3d9c
38SHA1 (patch-bl) = 28beb128f19199a1a86965d2e2b6d42a2565224c 38SHA1 (patch-bl) = 28beb128f19199a1a86965d2e2b6d42a2565224c
39SHA1 (patch-bm) = 0f7367782155c1d0f0459912aac69a1c759ad7fa 39SHA1 (patch-bm) = 0f7367782155c1d0f0459912aac69a1c759ad7fa
40SHA1 (patch-bn) = 6f21ecf499135b5b47ed191eca79848b4c404447 40SHA1 (patch-bn) = 6f21ecf499135b5b47ed191eca79848b4c404447
41SHA1 (patch-bo) = 3e4bcccd0a7cea535e443d750039fa844380f8bc 41SHA1 (patch-bo) = 3e4bcccd0a7cea535e443d750039fa844380f8bc
42SHA1 (patch-bq) = 5a78794aac28cefb9386034e6937c8f63b2ebc65 42SHA1 (patch-bq) = 5a78794aac28cefb9386034e6937c8f63b2ebc65
43SHA1 (patch-br) = 2af5c86f4cf04b29cb3bab76e23b5d9b46445978 43SHA1 (patch-br) = 2af5c86f4cf04b29cb3bab76e23b5d9b46445978
44SHA1 (patch-bs) = ede4ffcb762e89efbf95b6e4b644eb268534f1ca 44SHA1 (patch-bs) = ede4ffcb762e89efbf95b6e4b644eb268534f1ca
45SHA1 (patch-bv) = bc035bdbc8420666a52417f2226e3e687d199e33 45SHA1 (patch-bv) = bc035bdbc8420666a52417f2226e3e687d199e33
46SHA1 (patch-bw) = 223963fe59b71468420a697d8ea27c153b9f37ce 46SHA1 (patch-bw) = 223963fe59b71468420a697d8ea27c153b9f37ce
47SHA1 (patch-bx) = 157878e1fb4297f118ed0bbf06009506666fbc1c 47SHA1 (patch-bx) = 157878e1fb4297f118ed0bbf06009506666fbc1c
48SHA1 (patch-by) = 1612b765467e51ca7498497d38a0bb6ac694f9a6 48SHA1 (patch-by) = 1612b765467e51ca7498497d38a0bb6ac694f9a6
49SHA1 (patch-ch) = 0e3af3133273f2d82ad893bf1a165c0897dc0c3d 49SHA1 (patch-ch) = caa598140bcb78ec61bc33d44c5873da84e1628a
50SHA1 (patch-ci) = 4743cee1c391e04a53bd83f6ae7e58e737d08d1e 50SHA1 (patch-ci) = 4743cee1c391e04a53bd83f6ae7e58e737d08d1e
51SHA1 (patch-cj) = 45ff359ec795e5ef5c692e954d88912c74017162 51SHA1 (patch-cj) = 45ff359ec795e5ef5c692e954d88912c74017162
52SHA1 (patch-ck) = 01925efa75759b3b8efda3ab109b0f6481f45a7f 52SHA1 (patch-ck) = 01925efa75759b3b8efda3ab109b0f6481f45a7f
53SHA1 (patch-cn) = 12e09dde1e8fd8afaf2f48fd6455625790b9ecc4 53SHA1 (patch-cn) = 12e09dde1e8fd8afaf2f48fd6455625790b9ecc4
54SHA1 (patch-cp) = 35151ba658859c9d116ccdf44ec372c9e66435b1 54SHA1 (patch-cp) = 35151ba658859c9d116ccdf44ec372c9e66435b1
55SHA1 (patch-cq) = 6691fd7fa330db000ec5a9319bf9030b83aa593d 55SHA1 (patch-cq) = 6691fd7fa330db000ec5a9319bf9030b83aa593d
56SHA1 (patch-cr) = aa797461919635c3e6aaa30678a7585d5640dedd 56SHA1 (patch-cr) = aa797461919635c3e6aaa30678a7585d5640dedd
57SHA1 (patch-cs) = 10c7021fe46e702338f2f065fd666008a886292b 57SHA1 (patch-cs) = dc9afc7cd55cad8f801cb163d25fe2e1803f889a
58SHA1 (patch-ct) = a06c5cbc543acecb4f18e858cd844302bbdb50b4 58SHA1 (patch-ct) = a06c5cbc543acecb4f18e858cd844302bbdb50b4
59SHA1 (patch-cu) = b930fd94413c2bdf23ea94b074e3bb5e93784009 59SHA1 (patch-cu) = b930fd94413c2bdf23ea94b074e3bb5e93784009
60SHA1 (patch-cv) = 2e14a54d369a255ee39fcec7d4f1d2b11a8f4d2e 60SHA1 (patch-cv) = 2e14a54d369a255ee39fcec7d4f1d2b11a8f4d2e
61SHA1 (patch-cw) = ba0a8da07bf6a25bb3e937f96e2827a70d70e9b9 61SHA1 (patch-cw) = ba0a8da07bf6a25bb3e937f96e2827a70d70e9b9
62SHA1 (patch-cx) = db69e17d908e82cedd8cc28208fc7afec0cb3e47 62SHA1 (patch-cx) = db69e17d908e82cedd8cc28208fc7afec0cb3e47
63SHA1 (patch-cy) = 8d47bcf1da6f351f4f0cbf6a8355903094b0baee 63SHA1 (patch-cy) = 8d47bcf1da6f351f4f0cbf6a8355903094b0baee
64SHA1 (patch-dc) = 2a6b826ca2849110f33c612a4c4beba8f7e27e67 64SHA1 (patch-dc) = 2a6b826ca2849110f33c612a4c4beba8f7e27e67
65SHA1 (patch-dd) = d733d6e54db93bbb7be5382ddf96cf83731a6176 65SHA1 (patch-dd) = d733d6e54db93bbb7be5382ddf96cf83731a6176
66SHA1 (patch-de) = e594e9a7a4bb442adc33757c71d9d875abafd24d 66SHA1 (patch-de) = e594e9a7a4bb442adc33757c71d9d875abafd24d
67SHA1 (patch-dh) = 25d1c64a9531daf4a4f1d4fa616607b3eacfd4e0 67SHA1 (patch-dh) = 25d1c64a9531daf4a4f1d4fa616607b3eacfd4e0
68SHA1 (patch-di) = 571b3fb1c65ab76e8bdace418654fff2d45406cf 68SHA1 (patch-di) = 571b3fb1c65ab76e8bdace418654fff2d45406cf
69SHA1 (patch-dj) = ca003c7964ad239fdd2406b0a3a76ae5e855d8d7 69SHA1 (patch-dj) = ca003c7964ad239fdd2406b0a3a76ae5e855d8d7
70SHA1 (patch-dk) = 1f022fe11b4b1c6cb960f416724054954442ee74 70SHA1 (patch-dk) = 1f022fe11b4b1c6cb960f416724054954442ee74
71SHA1 (patch-dl) = 100063c6239efddbc9b7bb994e607d2ea314844e 
72SHA1 (patch-do) = c505e2e03912a068aa4666c8460b129447ec5a4e 71SHA1 (patch-do) = c505e2e03912a068aa4666c8460b129447ec5a4e
73SHA1 (patch-dp) = ce90ba6c2cce3af1ade0257fd42106ea8345661b 72SHA1 (patch-dp) = ce90ba6c2cce3af1ade0257fd42106ea8345661b
74SHA1 (patch-dt) = 59964a31a8abbb324029653609b0decadbe03a75 73SHA1 (patch-dt) = 59964a31a8abbb324029653609b0decadbe03a75
75SHA1 (patch-du) = b0c573d0721b050ccf10472ad2c360a3231a5ad5 74SHA1 (patch-du) = 85a7ccaffc5165617b031359873727f7a29d1938
76SHA1 (patch-dw) = de171dec68a1a55a47f2652ecdad429020d773ef 75SHA1 (patch-dw) = de171dec68a1a55a47f2652ecdad429020d773ef
77SHA1 (patch-dx) = 7579b1f7326951c57bd2ff597209c17d5d54f28d 76SHA1 (patch-dx) = 7579b1f7326951c57bd2ff597209c17d5d54f28d
78SHA1 (patch-dy) = 1feec77ce8c87fc1afb797401047669b3da41c54 77SHA1 (patch-dy) = 1feec77ce8c87fc1afb797401047669b3da41c54
cvs diff -r1.1.1.1 -r1.2 pkgsrc/misc/openoffice3/patches/Attic/patch-ba (expand / switch to unified diff)

--- pkgsrc/misc/openoffice3/patches/Attic/patch-ba 2008/10/14 11:02:24 1.1.1.1
+++ pkgsrc/misc/openoffice3/patches/Attic/patch-ba 2008/10/16 23:16:46 1.2
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-ba,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $ 1$NetBSD: patch-ba,v 1.2 2008/10/16 23:16:46 hira Exp $
2 2
3--- config_office/configure.orig 2008-09-01 20:50:01.000000000 +0900 3--- config_office/configure.orig 2008-09-01 20:50:01.000000000 +0900
4+++ config_office/configure 2008-10-01 11:42:40.000000000 +0900 4+++ config_office/configure 2008-10-16 19:07:22.000000000 +0900
5@@ -4183,11 +4183,11 @@ 5@@ -4183,11 +4183,11 @@
6 test_randr=no 6 test_randr=no
7 _os=OSF1 7 _os=OSF1
8 ;; 8 ;;
9- netbsd) 9- netbsd)
10+ *netbsd*) 10+ *netbsd*)
11 test_gtk=yes 11 test_gtk=yes
12 build_cairo=yes 12 build_cairo=yes
13 test_kde=yes 13 test_kde=yes
14- test_cups=no 14- test_cups=no
15+ test_cups=yes 15+ test_cups=yes
16 test_randr=yes 16 test_randr=yes
17 test_freetype=yes 17 test_freetype=yes
@@ -111,26 +111,44 @@ $NetBSD: patch-ba,v 1.1.1.1 2008/10/14 1 @@ -111,26 +111,44 @@ $NetBSD: patch-ba,v 1.1.1.1 2008/10/14 1
111+ MOZ_FLAVOUR=firefox3 111+ MOZ_FLAVOUR=firefox3
112 elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "mozilla"; then 112 elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "mozilla"; then
113 MOZ_FLAVOUR=mozilla 113 MOZ_FLAVOUR=mozilla
114 else 114 else
115@@ -17378,7 +17381,7 @@ 115@@ -17378,7 +17381,7 @@
116  116
117 #e.g. http://fedoraproject.org/wiki/Releases/FeatureXULRunnerAPIChanges 117 #e.g. http://fedoraproject.org/wiki/Releases/FeatureXULRunnerAPIChanges
118 #the plugin pkg-config etc. reverts to "mozilla-plugin" with libxul 118 #the plugin pkg-config etc. reverts to "mozilla-plugin" with libxul
119- if test "$MOZ_FLAVOUR" == "libxul"; then 119- if test "$MOZ_FLAVOUR" == "libxul"; then
120+ if test "$MOZ_FLAVOUR" = "libxul"; then 120+ if test "$MOZ_FLAVOUR" = "libxul"; then
121 MOZ_FLAVOUR="mozilla" 121 MOZ_FLAVOUR="mozilla"
122 fi 122 fi
123  123
 124@@ -21084,7 +21087,7 @@
 125 NEON_CFLAGS=
 126 BUILD_TYPE="$BUILD_TYPE NEON"
 127 fi
 128-if test "$_os" = "Darwin" && test "$with_system_openssl" != "no"; then
 129+if test "$_os" = "Darwin" -o "$_os" = "NetBSD" && test "$with_system_openssl" != "no"; then
 130 with_system_openssl=yes
 131 fi
 132 { echo "$as_me:$LINENO: checking which libssl to use" >&5
 133@@ -21095,7 +21098,7 @@
 134 echo "${ECHO_T}external" >&6; }
 135 # Mac OS builds should get out without extra stuff is the Mac porters'
 136 # wish. And pkg-config is although Xcode ships a .pc for openssl
 137- if test "$_os" = "Darwin"; then
 138+ if test "$_os" = "Darwin" -o "$_os" = "NetBSD" ; then
 139 OPENSSL_CFLAGS=
 140 OPENSSL_LIBS="-lssl -lcrypto"
 141 else
124@@ -25060,7 +25063,7 @@ 142@@ -25060,7 +25063,7 @@
125 ENABLE_MEDIAWIKI=YES 143 ENABLE_MEDIAWIKI=YES
126 { echo "$as_me:$LINENO: checking which Apache commons-* libs to use" >&5 144 { echo "$as_me:$LINENO: checking which Apache commons-* libs to use" >&5
127 echo $ECHO_N "checking which Apache commons-* libs to use... $ECHO_C" >&6; } 145 echo $ECHO_N "checking which Apache commons-* libs to use... $ECHO_C" >&6; }
128- if test "$with_system_apache_commons" == "yes"; then 146- if test "$with_system_apache_commons" == "yes"; then
129+ if test "$with_system_apache_commons" = "yes"; then 147+ if test "$with_system_apache_commons" = "yes"; then
130 SYSTEM_APACHE_COMMONS=YES 148 SYSTEM_APACHE_COMMONS=YES
131 { echo "$as_me:$LINENO: result: external" >&5 149 { echo "$as_me:$LINENO: result: external" >&5
132 echo "${ECHO_T}external" >&6; } 150 echo "${ECHO_T}external" >&6; }
133@@ -25203,7 +25206,7 @@ 151@@ -25203,7 +25206,7 @@
134  152
135  153
136  154
cvs diff -r1.1.1.1 -r1.2 pkgsrc/misc/openoffice3/patches/Attic/patch-ch (expand / switch to unified diff)

--- pkgsrc/misc/openoffice3/patches/Attic/patch-ch 2008/10/14 11:02:24 1.1.1.1
+++ pkgsrc/misc/openoffice3/patches/Attic/patch-ch 2008/10/16 23:16:46 1.2
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-ch,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $ 1$NetBSD: patch-ch,v 1.2 2008/10/16 23:16:46 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 2008-10-16 19: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
15+ 15+
16+# filter for supressing verbose messages from linker 16+# filter for supressing verbose messages from linker
17+#not needed at the moment 17+#not needed at the moment
@@ -81,49 +81,49 @@ $NetBSD: patch-ch,v 1.1.1.1 2008/10/14 1 @@ -81,49 +81,49 @@ $NetBSD: patch-ch,v 1.1.1.1 2008/10/14 1
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.1.1.1 -r1.2 pkgsrc/misc/openoffice3/patches/Attic/patch-cs (expand / switch to unified diff)

--- pkgsrc/misc/openoffice3/patches/Attic/patch-cs 2008/10/14 11:02:24 1.1.1.1
+++ pkgsrc/misc/openoffice3/patches/Attic/patch-cs 2008/10/16 23:16:46 1.2
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-cs,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $ 1$NetBSD: patch-cs,v 1.2 2008/10/16 23:16:46 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 2008-10-16 19: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
15+ 15+
16+# filter for supressing verbose messages from linker 16+# filter for supressing verbose messages from linker
17+#not needed at the moment 17+#not needed at the moment
@@ -81,49 +81,49 @@ $NetBSD: patch-cs,v 1.1.1.1 2008/10/14 1 @@ -81,49 +81,49 @@ $NetBSD: patch-cs,v 1.1.1.1 2008/10/14 1
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
File Deleted: pkgsrc/misc/openoffice3/patches/Attic/patch-dl
cvs diff -r1.2 -r1.3 pkgsrc/misc/openoffice3/patches/Attic/patch-du (expand / switch to unified diff)

--- pkgsrc/misc/openoffice3/patches/Attic/patch-du 2008/10/15 23:17:29 1.2
+++ pkgsrc/misc/openoffice3/patches/Attic/patch-du 2008/10/16 23:16:47 1.3
@@ -1,23 +1,28 @@ @@ -1,23 +1,28 @@
1$NetBSD: patch-du,v 1.2 2008/10/15 23:17:29 hira Exp $ 1$NetBSD: patch-du,v 1.3 2008/10/16 23:16:47 hira Exp $
2 2
3--- solenv/inc/pkgsrc.mk.orig 2008-08-28 19:43:59.000000000 +0900 3--- solenv/inc/pkgsrc.mk.orig 2008-10-16 18:30:22.000000000 +0900
4+++ solenv/inc/pkgsrc.mk 2008-10-16 02:44:28.000000000 +0900 4+++ solenv/inc/pkgsrc.mk 2008-10-16 18:32:40.000000000 +0900
5@@ -0,0 +1,18 @@ 5@@ -0,0 +1,23 @@
6+# 6+#
7+# Settings for pkgsrc. 7+# Settings for pkgsrc.
8+# 8+#
9+ 9+
10+BERKELEYLIB="@LIB_db4@ -ldb4" 10+BERKELEYLIB="@LIB_db4@ -ldb4"
11+BERKELEYCPPLIB="@LIB_db4@ -ldb4_cxx" 11+BERKELEYCPPLIB="@LIB_db4@ -ldb4_cxx"
12+ 12+
13+EXPAT3RDLIB="@LIB_expat@ -lexpat" 13+EXPAT3RDLIB="@LIB_expat@ -lexpat"
14+EXPATASCII3RDLIB="@LIB_expat@ -lexpat" 14+EXPATASCII3RDLIB="@LIB_expat@ -lexpat"
15+ 15+
 16+ICUINLIB="@LIB_icu@ -licui18n"
 17+ICULELIB="@LIB_icu@ -licule"
 18+ICUUCLIB="@LIB_icu@ -licuuc"
 19+ICUDATALIB="@LIB_icu@ -licudata"
 20+
16+JPEG3RDLIB="@LIB_jpeg@ -ljpeg" 21+JPEG3RDLIB="@LIB_jpeg@ -ljpeg"
17+ 22+
18+ZLIB3RDLIB="@LIB_zlib@ -lz" 23+ZLIB3RDLIB="@LIB_zlib@ -lz"
19+ 24+
20+AWTLIB="@LIB_awtlib@ -ljawt" 25+AWTLIB="@LIB_awtlib@ -ljawt"
21+ 26+
22+STDLIBGUIMT+=${X11_LDFLAGS} 27+STDLIBGUIMT+=${X11_LDFLAGS}
23+STDSHLGUIMT+=${X11_LDFLAGS} 28+STDSHLGUIMT+=${X11_LDFLAGS}