Mon Oct 20 12:30:16 2008 UTC ()
 - 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.


(hira)
diff -r1.1.1.1 -r1.2 pkgsrc/misc/openoffice3/MESSAGE
diff -r1.6 -r1.7 pkgsrc/misc/openoffice3/Makefile
diff -r1.5 -r1.6 pkgsrc/misc/openoffice3/distinfo
diff -r1.4 -r1.5 pkgsrc/misc/openoffice3/options.mk
diff -r1.1.1.1 -r0 pkgsrc/misc/openoffice3/patches/patch-br
diff -r1.1.1.1 -r0 pkgsrc/misc/openoffice3/patches/patch-dw
diff -r1.1.1.1 -r0 pkgsrc/misc/openoffice3/patches/patch-dx
diff -r1.1.1.1 -r1.2 pkgsrc/misc/openoffice3/patches/patch-cn
diff -r1.1.1.1 -r1.2 pkgsrc/misc/openoffice3/patches/patch-dy
diff -r1.3 -r1.4 pkgsrc/misc/openoffice3/patches/patch-du
diff -r1.1 -r1.2 pkgsrc/misc/openoffice3/patches/patch-dz
diff -r0 -r1.1 pkgsrc/misc/openoffice3/patches/patch-ea
diff -r0 -r1.1 pkgsrc/misc/openoffice3/patches/patch-eb
cvs diff -r1.1.1.1 -r1.2 pkgsrc/misc/openoffice3/Attic/MESSAGE (expand / switch to unified diff)

--- pkgsrc/misc/openoffice3/Attic/MESSAGE 2008/10/14 11:02:24 1.1.1.1
+++ pkgsrc/misc/openoffice3/Attic/MESSAGE 2008/10/20 12:30:16 1.2
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1=========================================================================== 1===========================================================================
2$NetBSD: MESSAGE,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $ 2$NetBSD: MESSAGE,v 1.2 2008/10/20 12:30:16 hira Exp $
3 3
4 OpenOffice has now been installed in ${PREFIX}/${OO_RELEASE}. 4 OpenOffice has now been installed in ${OO_PREFIX}.
5 5
6 Before using this package for the first time, each user has to run 6 Before using this package for the first time, each user has to run
7 a setup program, which is automatically invoked at the first start. 7 a setup program, which is automatically invoked at the first start.
8 Thereafter, OpenOffice can be started using the 8 Thereafter, OpenOffice can be started using the
9 ${PREFIX}/bin/soffice command. 9 ${DESTDIR}${PREFIX}/bin/soffice command.
10=========================================================================== 10===========================================================================
cvs diff -r1.6 -r1.7 pkgsrc/misc/openoffice3/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/openoffice3/Attic/Makefile 2008/10/18 01:08:44 1.6
+++ pkgsrc/misc/openoffice3/Attic/Makefile 2008/10/20 12:30:16 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.6 2008/10/18 01:08:44 hira Exp $ 1# $NetBSD: Makefile,v 1.7 2008/10/20 12:30:16 hira Exp $
2# 2#
3 3
4OO_VER= 3.0.0 4OO_VER= 3.0.0
5PKGREVISION= 2 5PKGREVISION= 2
6OO_TAG= OOO300_m9 6OO_TAG= OOO300_m9
7DISTNAME= openoffice-${OO_VER} 7DISTNAME= openoffice-${OO_VER}
8PKGNAME= openoffice3-${OO_VER} 8PKGNAME= openoffice3-${OO_VER}
9CATEGORIES= misc 9CATEGORIES= misc
10MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/} 10MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/}
11DIST_SUBDIR= ${DISTNAME} 11DIST_SUBDIR= ${DISTNAME}
12 12
13DISTFILES= OOo_${OO_VER}_src_core.tar.bz2 13DISTFILES= OOo_${OO_VER}_src_core.tar.bz2
14DISTFILES+= OOo_${OO_VER}_src_binfilter.tar.bz2 14DISTFILES+= OOo_${OO_VER}_src_binfilter.tar.bz2
@@ -57,26 +57,28 @@ ONLY_FOR_PLATFORM+= NetBSD-1.6Z[G-Z]*-x8 @@ -57,26 +57,28 @@ ONLY_FOR_PLATFORM+= NetBSD-1.6Z[G-Z]*-x8
57GNU_CONFIGURE= yes 57GNU_CONFIGURE= yes
58 58
59REPLACE_PERL+= sd/res/webview/editpic.pl \ 59REPLACE_PERL+= sd/res/webview/editpic.pl \
60 sd/res/webview/poll.pl \ 60 sd/res/webview/poll.pl \
61 sd/res/webview/savepic.pl \ 61 sd/res/webview/savepic.pl \
62 sd/res/webview/show.pl \ 62 sd/res/webview/show.pl \
63 sd/res/webview/webview.pl 63 sd/res/webview/webview.pl
64REPLACE_PYTHON+= scripting/source/pyprov/mailmerge.py 64REPLACE_PYTHON+= scripting/source/pyprov/mailmerge.py
65 65
66SUBST_CLASSES+= lib 66SUBST_CLASSES+= lib
67SUBST_STAGE.lib= post-patch 67SUBST_STAGE.lib= post-patch
68SUBST_MESSAGE.lib= Adding library paths 68SUBST_MESSAGE.lib= Adding library paths
69SUBST_FILES.lib= solenv/inc/pkgsrc.mk 69SUBST_FILES.lib= solenv/inc/pkgsrc.mk
 70SUBST_SED.lib+= -e 's|@COMPILER_RPATH_FLAG@|${COMPILER_RPATH_FLAG}|g'
 71SUBST_SED.lib+= -e 's|@OO_LIBDIR@|${OO_PREFIX}/${OO_UNXNAME}/basis-link/program|g'
70.for pkg in db4 expat icu jpeg zlib 72.for pkg in db4 expat icu jpeg zlib
71LIB.${pkg}= -L${BUILDLINK_PREFIX.${pkg}}/lib 73LIB.${pkg}= -L${BUILDLINK_PREFIX.${pkg}}/lib
72LIB.${pkg}+= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.${pkg}}/lib 74LIB.${pkg}+= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.${pkg}}/lib
73SUBST_SED.lib+= -e 's|@LIB_${pkg}@|${LIB.${pkg}}|g' 75SUBST_SED.lib+= -e 's|@LIB_${pkg}@|${LIB.${pkg}}|g'
74LIBS+= ${LIB.${pkg}} 76LIBS+= ${LIB.${pkg}}
75.endfor 77.endfor
76 78
77CONFIGURE_ENV+= LIBS=${LIBS:O:u:Q} 79CONFIGURE_ENV+= LIBS=${LIBS:O:u:Q}
78CONFIGURE_ENV+= X_LIBS=${X11_LDFLAGS:M*:Q} 80CONFIGURE_ENV+= X_LIBS=${X11_LDFLAGS:M*:Q}
79CONFIGURE_ENV+= BLNK_PREFIX_db4=${BUILDLINK_PREFIX.db4} 81CONFIGURE_ENV+= BLNK_PREFIX_db4=${BUILDLINK_PREFIX.db4}
80 82
81CONFIGURE_ARGS+= --with-use-shell=bash 83CONFIGURE_ARGS+= --with-use-shell=bash
82CONFIGURE_ARGS+= --enable-binfilter 84CONFIGURE_ARGS+= --enable-binfilter
@@ -115,33 +117,34 @@ CONFIGURE_ARGS+= --enable-epm --with-pac @@ -115,33 +117,34 @@ CONFIGURE_ARGS+= --enable-epm --with-pac
115CONFIGURE_ARGS+= --disable-odk --disable-gcjaot 117CONFIGURE_ARGS+= --disable-odk --disable-gcjaot
116 118
117# NOTE: In this version, this value should be separated by space (comma 119# NOTE: In this version, this value should be separated by space (comma
118# causes build error). 120# causes build error).
119CONFIGURE_ARGS+= --with-lang=${OO_LANGS:Q} 121CONFIGURE_ARGS+= --with-lang=${OO_LANGS:Q}
120 122
121.include "options.mk" 123.include "options.mk"
122 124
123UNLIMIT_RESOURCES+= datasize 125UNLIMIT_RESOURCES+= datasize
124 126
125OO_RELEASE= OpenOffice.org${OO_VER} 127OO_RELEASE= OpenOffice.org${OO_VER}
126PLIST_SRC+= ${PKGDIR}/PLIST 128PLIST_SRC+= ${PKGDIR}/PLIST
127PLIST_SRC+= ${WRKDIR}/PLIST 129PLIST_SRC+= ${WRKDIR}/PLIST
128MESSAGE_SUBST+= OO_RELEASE=${OO_RELEASE} 130MESSAGE_SUBST+= DESTDIR=${DESTDIR}
129INSTALLATION_DIRS= bin ${OO_RELEASE} share/applications 131MESSAGE_SUBST+= OO_PREFIX=${OO_PREFIX}
 132INSTALLATION_DIRS= bin lib/${OO_RELEASE} share/applications
130 133
131OO_UNXNAME= openoffice.org3 134OO_UNXNAME= openoffice.org3
132OO_PKGPATH= ${WRKSRC}/instsetoo_native/${OPENOFFICE_OUTPATH}.pro/OpenOffice/portable/install 135OO_PKGPATH= ${WRKSRC}/instsetoo_native/${OPENOFFICE_OUTPATH}.pro/OpenOffice/portable/install
133OO_PROGRAMS= scalc sdraw simpress soffice swriter unopkg 136OO_PROGRAMS= scalc sdraw simpress soffice swriter unopkg
134OO_PREFIX= ${DESTDIR}${PREFIX}/${OO_RELEASE} 137OO_PREFIX= ${DESTDIR}${PREFIX}/lib/${OO_RELEASE}
135 138
136post-extract: 139post-extract:
137 cd ${WRKSRC}/bridges/source/cpp_uno && \ 140 cd ${WRKSRC}/bridges/source/cpp_uno && \
138 mv gcc3_netbsd_intel gcc3_netbsd_intel.orig && \ 141 mv gcc3_netbsd_intel gcc3_netbsd_intel.orig && \
139 cp -Rp gcc3_freebsd_intel gcc3_netbsd_intel && \ 142 cp -Rp gcc3_freebsd_intel gcc3_netbsd_intel && \
140 cp -Rp gcc3_freebsd_x86-64 gcc3_netbsd_x86-64 143 cp -Rp gcc3_freebsd_x86-64 gcc3_netbsd_x86-64
141 144
142do-build: 145do-build:
143 ${_ULIMIT_CMD} ${SETENV} ${MAKE_ENV} bash -c "cd ${WRKSRC} && ./bootstrap && source ${OPENOFFICE_SETFILE}Env.Set.sh && dmake build_all" 146 ${_ULIMIT_CMD} ${SETENV} ${MAKE_ENV} bash -c "cd ${WRKSRC} && ./bootstrap && source ${OPENOFFICE_SETFILE}Env.Set.sh && dmake build_all"
144 147
145post-build: 148post-build:
146 cd ${WRKDIR} && \ 149 cd ${WRKDIR} && \
147 rm -fr opt && \ 150 rm -fr opt && \
@@ -167,29 +170,29 @@ do-install: @@ -167,29 +170,29 @@ do-install:
167 cd ${WRKDIR}/opt && \ 170 cd ${WRKDIR}/opt && \
168 tar cf - openoffice.org ${OO_UNXNAME} | tar Cxpf ${OO_PREFIX} - 171 tar cf - openoffice.org ${OO_UNXNAME} | tar Cxpf ${OO_PREFIX} -
169 for f in ${OO_PROGRAMS}; do \ 172 for f in ${OO_PROGRAMS}; do \
170 ln -sf ${OO_PREFIX}/${OO_UNXNAME}/program/$$f \ 173 ln -sf ${OO_PREFIX}/${OO_UNXNAME}/program/$$f \
171 ${DESTDIR}${PREFIX}/bin/$$f; \ 174 ${DESTDIR}${PREFIX}/bin/$$f; \
172 done 175 done
173 ${INSTALL_DATA} ${WRKDIR}/xdg/* ${DESTDIR}${PREFIX}/share/applications 176 ${INSTALL_DATA} ${WRKDIR}/xdg/* ${DESTDIR}${PREFIX}/share/applications
174 ${INSTALL_SCRIPT} ${WRKDIR}/${OO_UNXNAME} ${DESTDIR}${PREFIX}/bin 177 ${INSTALL_SCRIPT} ${WRKDIR}/${OO_UNXNAME} ${DESTDIR}${PREFIX}/bin
175 ${INSTALL_SCRIPT} ${WRKDIR}/${OO_UNXNAME}-printeradmin \ 178 ${INSTALL_SCRIPT} ${WRKDIR}/${OO_UNXNAME}-printeradmin \
176 ${DESTDIR}${PREFIX}/bin 179 ${DESTDIR}${PREFIX}/bin
177 180
178post-install: 181post-install:
179 cd ${DESTDIR}${PREFIX} && \ 182 cd ${DESTDIR}${PREFIX} && \
180 find ${OO_RELEASE} \! -type d -print | \ 183 find lib/${OO_RELEASE} \! -type d -print | \
181 sort > ${WRKDIR}/PLIST && \ 184 sort > ${WRKDIR}/PLIST && \
182 find ${OO_RELEASE} -type d -print | sort -r | \ 185 find lib/${OO_RELEASE} -type d -print | sort -r | \
183 awk '{print("@dirrm "$$1)}' >> ${WRKDIR}/PLIST 186 awk '{print("@dirrm "$$1)}' >> ${WRKDIR}/PLIST
184 ${ECHO} bin/${OO_UNXNAME} >> ${WRKDIR}/PLIST 187 ${ECHO} bin/${OO_UNXNAME} >> ${WRKDIR}/PLIST
185 ${ECHO} bin/${OO_UNXNAME}-printeradmin >> ${WRKDIR}/PLIST 188 ${ECHO} bin/${OO_UNXNAME}-printeradmin >> ${WRKDIR}/PLIST
186 189
187# OS specific Makefile 190# OS specific Makefile
188.if exists(Makefile.${OPSYS}) 191.if exists(Makefile.${OPSYS})
189. include "Makefile.${OPSYS}" 192. include "Makefile.${OPSYS}"
190.endif 193.endif
191 194
192.include "../../mk/compiler.mk" 195.include "../../mk/compiler.mk"
193 196
194.include "../../lang/python/application.mk" 197.include "../../lang/python/application.mk"
195 198
cvs diff -r1.5 -r1.6 pkgsrc/misc/openoffice3/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/openoffice3/Attic/distinfo 2008/10/18 11:09:11 1.5
+++ pkgsrc/misc/openoffice3/Attic/distinfo 2008/10/20 12:30:16 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.5 2008/10/18 11:09:11 hira Exp $ 1$NetBSD: distinfo,v 1.6 2008/10/20 12:30:16 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
@@ -30,49 +30,48 @@ SHA1 (patch-ba) = c3b27c83c69b515d2774ac @@ -30,49 +30,48 @@ SHA1 (patch-ba) = c3b27c83c69b515d2774ac
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 
44SHA1 (patch-bs) = ede4ffcb762e89efbf95b6e4b644eb268534f1ca 43SHA1 (patch-bs) = ede4ffcb762e89efbf95b6e4b644eb268534f1ca
45SHA1 (patch-bv) = bc035bdbc8420666a52417f2226e3e687d199e33 44SHA1 (patch-bv) = bc035bdbc8420666a52417f2226e3e687d199e33
46SHA1 (patch-bw) = 223963fe59b71468420a697d8ea27c153b9f37ce 45SHA1 (patch-bw) = 223963fe59b71468420a697d8ea27c153b9f37ce
47SHA1 (patch-bx) = 157878e1fb4297f118ed0bbf06009506666fbc1c 46SHA1 (patch-bx) = 157878e1fb4297f118ed0bbf06009506666fbc1c
48SHA1 (patch-by) = 1612b765467e51ca7498497d38a0bb6ac694f9a6 47SHA1 (patch-by) = 1612b765467e51ca7498497d38a0bb6ac694f9a6
49SHA1 (patch-ch) = caa598140bcb78ec61bc33d44c5873da84e1628a 48SHA1 (patch-ch) = caa598140bcb78ec61bc33d44c5873da84e1628a
50SHA1 (patch-ci) = 4743cee1c391e04a53bd83f6ae7e58e737d08d1e 49SHA1 (patch-ci) = 4743cee1c391e04a53bd83f6ae7e58e737d08d1e
51SHA1 (patch-cj) = 45ff359ec795e5ef5c692e954d88912c74017162 50SHA1 (patch-cj) = 45ff359ec795e5ef5c692e954d88912c74017162
52SHA1 (patch-ck) = 01925efa75759b3b8efda3ab109b0f6481f45a7f 51SHA1 (patch-ck) = 01925efa75759b3b8efda3ab109b0f6481f45a7f
53SHA1 (patch-cn) = 12e09dde1e8fd8afaf2f48fd6455625790b9ecc4 52SHA1 (patch-cn) = 358fd67f20f3ffdb993fb3f4cb38d5733274fd6b
54SHA1 (patch-cp) = 35151ba658859c9d116ccdf44ec372c9e66435b1 53SHA1 (patch-cp) = 35151ba658859c9d116ccdf44ec372c9e66435b1
55SHA1 (patch-cq) = 6691fd7fa330db000ec5a9319bf9030b83aa593d 54SHA1 (patch-cq) = 6691fd7fa330db000ec5a9319bf9030b83aa593d
56SHA1 (patch-cr) = aa797461919635c3e6aaa30678a7585d5640dedd 55SHA1 (patch-cr) = aa797461919635c3e6aaa30678a7585d5640dedd
57SHA1 (patch-cs) = 3f4f360870ad22b1fb88a2ca9f7907e03010ac79 56SHA1 (patch-cs) = 3f4f360870ad22b1fb88a2ca9f7907e03010ac79
58SHA1 (patch-ct) = a06c5cbc543acecb4f18e858cd844302bbdb50b4 57SHA1 (patch-ct) = a06c5cbc543acecb4f18e858cd844302bbdb50b4
59SHA1 (patch-cu) = b930fd94413c2bdf23ea94b074e3bb5e93784009 58SHA1 (patch-cu) = b930fd94413c2bdf23ea94b074e3bb5e93784009
60SHA1 (patch-cv) = 2e14a54d369a255ee39fcec7d4f1d2b11a8f4d2e 59SHA1 (patch-cv) = 2e14a54d369a255ee39fcec7d4f1d2b11a8f4d2e
61SHA1 (patch-cw) = ba0a8da07bf6a25bb3e937f96e2827a70d70e9b9 60SHA1 (patch-cw) = ba0a8da07bf6a25bb3e937f96e2827a70d70e9b9
62SHA1 (patch-cx) = db69e17d908e82cedd8cc28208fc7afec0cb3e47 61SHA1 (patch-cx) = db69e17d908e82cedd8cc28208fc7afec0cb3e47
63SHA1 (patch-cy) = 8d47bcf1da6f351f4f0cbf6a8355903094b0baee 62SHA1 (patch-cy) = 8d47bcf1da6f351f4f0cbf6a8355903094b0baee
64SHA1 (patch-dc) = 2a6b826ca2849110f33c612a4c4beba8f7e27e67 63SHA1 (patch-dc) = 2a6b826ca2849110f33c612a4c4beba8f7e27e67
65SHA1 (patch-dd) = d733d6e54db93bbb7be5382ddf96cf83731a6176 64SHA1 (patch-dd) = d733d6e54db93bbb7be5382ddf96cf83731a6176
66SHA1 (patch-de) = e594e9a7a4bb442adc33757c71d9d875abafd24d 65SHA1 (patch-de) = e594e9a7a4bb442adc33757c71d9d875abafd24d
67SHA1 (patch-dh) = 25d1c64a9531daf4a4f1d4fa616607b3eacfd4e0 66SHA1 (patch-dh) = 25d1c64a9531daf4a4f1d4fa616607b3eacfd4e0
68SHA1 (patch-di) = 571b3fb1c65ab76e8bdace418654fff2d45406cf 67SHA1 (patch-di) = 571b3fb1c65ab76e8bdace418654fff2d45406cf
69SHA1 (patch-dj) = ca003c7964ad239fdd2406b0a3a76ae5e855d8d7 68SHA1 (patch-dj) = ca003c7964ad239fdd2406b0a3a76ae5e855d8d7
70SHA1 (patch-dk) = 1f022fe11b4b1c6cb960f416724054954442ee74 69SHA1 (patch-dk) = 1f022fe11b4b1c6cb960f416724054954442ee74
71SHA1 (patch-do) = c505e2e03912a068aa4666c8460b129447ec5a4e 70SHA1 (patch-do) = c505e2e03912a068aa4666c8460b129447ec5a4e
72SHA1 (patch-dp) = ce90ba6c2cce3af1ade0257fd42106ea8345661b 71SHA1 (patch-dp) = ce90ba6c2cce3af1ade0257fd42106ea8345661b
73SHA1 (patch-dt) = 59964a31a8abbb324029653609b0decadbe03a75 72SHA1 (patch-dt) = 59964a31a8abbb324029653609b0decadbe03a75
74SHA1 (patch-du) = 85a7ccaffc5165617b031359873727f7a29d1938 73SHA1 (patch-du) = 57434c4c30bf1335aef089a9c267328a2ba6959a
75SHA1 (patch-dw) = de171dec68a1a55a47f2652ecdad429020d773ef 74SHA1 (patch-dy) = 4af56ef04180ab3dec7d0051e4075e84b62c8405
76SHA1 (patch-dx) = 7579b1f7326951c57bd2ff597209c17d5d54f28d 75SHA1 (patch-dz) = 3932f59e8f78c8a641e52d5284ccc0395c7ee172
77SHA1 (patch-dy) = 1feec77ce8c87fc1afb797401047669b3da41c54 76SHA1 (patch-ea) = 8c54345a53bd49d9c4c3b206d43778a56df0b292
78SHA1 (patch-dz) = c3d345ad74dcaa45667ce4de97d8b4686edb773a 77SHA1 (patch-eb) = 34562ae59bc67ab6ced1d63b39594a1b44ca3834
cvs diff -r1.4 -r1.5 pkgsrc/misc/openoffice3/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/misc/openoffice3/Attic/options.mk 2008/10/19 05:01:21 1.4
+++ pkgsrc/misc/openoffice3/Attic/options.mk 2008/10/20 12:30:16 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.4 2008/10/19 05:01:21 hira Exp $ 1# $NetBSD: options.mk,v 1.5 2008/10/20 12:30:16 hira Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.openoffice3 3PKG_OPTIONS_VAR= PKG_OPTIONS.openoffice3
4PKG_SUPPORTED_OPTIONS= cups gnome gtk2 java kde ooo-external-libwpd 4PKG_SUPPORTED_OPTIONS= cups gnome gtk2 java kde ooo-external-libwpd
5PKG_OPTIONS_OPTIONAL_GROUPS= browser 5PKG_OPTIONS_OPTIONAL_GROUPS= browser
6PKG_OPTIONS_GROUP.browser= firefox firefox3 seamonkey 6PKG_OPTIONS_GROUP.browser= firefox firefox3 seamonkey
7# The list from completelangiso in solenv/inc/postset.mk. 7# The list from completelangiso in solenv/inc/postset.mk.
8OO_SUPPORTED_LANGUAGES= af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca \ 8OO_SUPPORTED_LANGUAGES= af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca \
9 cs cy da de dz el en-GB en-US en-ZA eo es et \ 9 cs cy da de dz el en-GB en-US en-ZA eo es et \
10 eu fa fi fr ga gl gu-IN he hi-IN hr hu it ja \ 10 eu fa fi fr ga gl gu-IN he hi-IN hr hu it ja \
11 ka km kn ko ku lo lt lv mk ms ml-IN mr-IN ne \ 11 ka km kn ko ku lo lt lv mk ms ml-IN mr-IN ne \
12 nb nl nn nr ns oc or-IN pa-IN pl pt pt-BR ru \ 12 nb nl nn nr ns oc or-IN pa-IN pl pt pt-BR ru \
13 rw sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER \ 13 rw sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER \
14 ta-IN th tn tr ts tg ur-IN uk uz ve vi xh \ 14 ta-IN th tn tr ts tg ur-IN uk uz ve vi xh \
@@ -72,52 +72,52 @@ PLIST_VARS+= gtk2 @@ -72,52 +72,52 @@ PLIST_VARS+= gtk2
72.if !empty(PKG_OPTIONS:Mgtk2) 72.if !empty(PKG_OPTIONS:Mgtk2)
73PLIST.gtk2= yes 73PLIST.gtk2= yes
74CONFIGURE_ARGS+= --enable-gtk 74CONFIGURE_ARGS+= --enable-gtk
75.include "../../x11/gtk2/buildlink3.mk" 75.include "../../x11/gtk2/buildlink3.mk"
76.else 76.else
77CONFIGURE_ARGS+= --disable-gtk 77CONFIGURE_ARGS+= --disable-gtk
78.endif 78.endif
79 79
80.if !empty(PKG_OPTIONS:Mjava) 80.if !empty(PKG_OPTIONS:Mjava)
81USE_JAVA2= yes 81USE_JAVA2= yes
82DEPENDS+= apache-ant>=1.7.0:../../devel/apache-ant 82DEPENDS+= apache-ant>=1.7.0:../../devel/apache-ant
83CONFIGURE_ARGS+= --with-java --disable-mediawiki 83CONFIGURE_ARGS+= --with-java --disable-mediawiki
84 84
85# -rpath is missing for -lmawt. Please fix wip/jdk15. 85# -rpath are missing from wip/jdk15.
86JAVA_XAWT_DIR= ${PKG_JAVA_HOME}/jre/lib/${MACHINE_ARCH}/xawt 86JAVA_LIB_ROOT= ${PKG_JAVA_HOME}/jre/lib/${MACHINE_ARCH}
87CONFIGURE_ENV+= LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${JAVA_XAWT_DIR}" 87LIB.jawt= ${COMPILER_RPATH_FLAG}${JAVA_LIB_ROOT}
 88LIB.mawt= ${COMPILER_RPATH_FLAG}${JAVA_LIB_ROOT}/xawt
 89CONFIGURE_ENV+= LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${JAVA_LIB_ROOT}:${JAVA_LIB_ROOT}/xawt"
88 90
89# I can't find wrapper of Java (${PREFIX}/bin/java). 91# XXX: devel/apache-ant doesn't setup ${PREFIX}/bin/java.
90# It exists in ${PREFIX}/bin/ant. 
91CONFIGURE_ENV+= JAVACMD="${PKG_JAVA_HOME}/bin/java" 92CONFIGURE_ENV+= JAVACMD="${PKG_JAVA_HOME}/bin/java"
92MAKE_ENV+= JAVACMD="${PKG_JAVA_HOME}/bin/java" 93MAKE_ENV+= JAVACMD="${PKG_JAVA_HOME}/bin/java"
93 94
94# XXX 95# XXX
95LIB.awtlib= -L${PKG_JAVA_HOME}/jre/lib/${MACHINE_ARCH} 96LIB.awtlib= -L${JAVA_LIB_ROOT} ${COMPILER_RPATH_FLAG}${JAVA_LIB_ROOT}
96LIB.awtlib+= ${COMPILER_RPATH_FLAG}${PKG_JAVA_HOME}/jre/lib/${MACHINE_ARCH} 
97 97
98.include "../../mk/java-env.mk" 98.include "../../mk/java-env.mk"
99.include "../../mk/java-vm.mk" 99.include "../../mk/java-vm.mk"
100.else 100.else
101CONFIGURE_ARGS+= --without-java 101CONFIGURE_ARGS+= --without-java
102PKG_JAVA_HOME= 102PKG_JAVA_HOME=
103JAVA_XAWT_DIR= 103LIB.jawt=
 104LIB.mawt=
104LIB.awtlib= 105LIB.awtlib=
105.endif 106.endif
106 107
107SUBST_CLASSES+= java 108SUBST_CLASSES+= java
108SUBST_STAGE.java= post-patch 109SUBST_STAGE.java= post-patch
109SUBST_MESSAGE.java= Adding JAVA_HOME 110SUBST_MESSAGE.java= Adding JAVA_HOME
110SUBST_FILES.java= desktop/scripts/soffice.sh 111SUBST_FILES.java= desktop/scripts/soffice.sh
111SUBST_FILES.java+= desktop/scripts/unopkg.sh 
112SUBST_FILES.java+= padmin/source/spadmin.sh 
113SUBST_SED.java+= -e 's,@JAVA_HOME@,${PKG_JAVA_HOME},g' 112SUBST_SED.java+= -e 's,@JAVA_HOME@,${PKG_JAVA_HOME},g'
114SUBST_SED.java+= -e 's,@JAVA_XAWT_DIR@,${JAVA_XAWT_DIR},g' 113SUBST_SED.lib+= -e 's|@LIB_jawt@|${LIB.jawt}|g'
 114SUBST_SED.lib+= -e 's|@LIB_mawt@|${LIB.mawt}|g'
115SUBST_SED.lib+= -e 's|@LIB_awtlib@|${LIB.awtlib}|g' 115SUBST_SED.lib+= -e 's|@LIB_awtlib@|${LIB.awtlib}|g'
116 116
117.if !empty(PKG_OPTIONS:Mkde) 117.if !empty(PKG_OPTIONS:Mkde)
118CONFIGURE_ENV+= KDEDIR=${BUILDLINK_PREFIX.kdelibs:Q} 118CONFIGURE_ENV+= KDEDIR=${BUILDLINK_PREFIX.kdelibs:Q}
119CONFIGURE_ARGS+= --enable-kde --enable-kdeab 119CONFIGURE_ARGS+= --enable-kde --enable-kdeab
120.include "../../x11/kdelibs3/buildlink3.mk" 120.include "../../x11/kdelibs3/buildlink3.mk"
121.else 121.else
122CONFIGURE_ARGS+= --disable-kde --disable-kdeab 122CONFIGURE_ARGS+= --disable-kde --disable-kdeab
123.endif 123.endif
File Deleted: pkgsrc/misc/openoffice3/patches/Attic/patch-br
File Deleted: pkgsrc/misc/openoffice3/patches/Attic/patch-dw
File Deleted: pkgsrc/misc/openoffice3/patches/Attic/patch-dx
cvs diff -r1.1.1.1 -r1.2 pkgsrc/misc/openoffice3/patches/Attic/patch-cn (expand / switch to unified diff)

--- pkgsrc/misc/openoffice3/patches/Attic/patch-cn 2008/10/14 11:02:24 1.1.1.1
+++ pkgsrc/misc/openoffice3/patches/Attic/patch-cn 2008/10/20 12:30:16 1.2
@@ -1,32 +1,29 @@ @@ -1,32 +1,29 @@
1$NetBSD: patch-cn,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $ 1$NetBSD: patch-cn,v 1.2 2008/10/20 12:30:16 hira Exp $
2 2
3--- desktop/scripts/soffice.sh.orig 2008-08-07 02:44:36.000000000 +0900 3--- desktop/scripts/soffice.sh.orig 2008-08-07 02:44:36.000000000 +0900
4+++ desktop/scripts/soffice.sh 2008-08-27 21:51:39.000000000 +0900 4+++ desktop/scripts/soffice.sh 2008-10-19 14:38:10.000000000 +0900
5@@ -49,6 +49,12 @@ 5@@ -49,6 +49,12 @@
6 export JITC_PROCESSOR_TYPE 6 export JITC_PROCESSOR_TYPE
7 fi 7 fi
8  8
9+# XXX: Ignore "unlocking unlocked mutex" error. 9+# XXX: Ignore "unlocking unlocked mutex" error.
10+if [ "`uname -s`" = "NetBSD" ]; then 10+if [ "`uname -s`" = "NetBSD" ]; then
11+ PTHREAD_DIAGASSERT=AEL 11+ PTHREAD_DIAGASSERT=AEL
12+ export PTHREAD_DIAGASSERT 12+ export PTHREAD_DIAGASSERT
13+fi 13+fi
14+ 14+
15 # resolve installation directory 15 # resolve installation directory
16 sd_cwd="`pwd`" 16 sd_cwd="`pwd`"
17 if [ -h "$0" ] ; then 17 if [ -h "$0" ] ; then
18@@ -64,6 +70,14 @@ 18@@ -64,6 +70,11 @@
19  19
20 sd_binary=`basename "$0"`.bin 20 sd_binary=`basename "$0"`.bin
21  21
22+LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${sd_prog}/../basis-link/program:${sd_prog}/../basis-link/ure-link/lib:@JAVA_XAWT_DIR@ 
23+export LD_LIBRARY_PATH 
24+ 
25+if [ -z ${JAVA_HOME} ]; then 22+if [ -z ${JAVA_HOME} ]; then
26+ JAVA_HOME=@JAVA_HOME@ 23+ JAVA_HOME=@JAVA_HOME@
27+ export JAVA_HOME 24+ export JAVA_HOME
28+fi 25+fi
29+ 26+
30 #collect all bootstrap variables specified on the command line 27 #collect all bootstrap variables specified on the command line
31 #so that they can be passed as arguments to javaldx later on 28 #so that they can be passed as arguments to javaldx later on
32 for arg in $@ 29 for arg in $@
cvs diff -r1.1.1.1 -r1.2 pkgsrc/misc/openoffice3/patches/Attic/patch-dy (expand / switch to unified diff)

--- pkgsrc/misc/openoffice3/patches/Attic/patch-dy 2008/10/14 11:02:25 1.1.1.1
+++ pkgsrc/misc/openoffice3/patches/Attic/patch-dy 2008/10/20 12:30:16 1.2
@@ -1,22 +1,118 @@ @@ -1,22 +1,118 @@
1$NetBSD: patch-dy,v 1.1.1.1 2008/10/14 11:02:25 hira Exp $ 1$NetBSD: patch-dy,v 1.2 2008/10/20 12:30:16 hira Exp $
2 2
3--- libxmlsec/xmlsec1-1.2.6.patch.orig 2008-10-03 21:53:36.000000000 +0900 3--- libxmlsec/xmlsec1-1.2.6.patch.orig 2008-03-18 23:06:34.000000000 +0900
4+++ libxmlsec/xmlsec1-1.2.6.patch 2008-10-03 21:54:01.000000000 +0900 4+++ libxmlsec/xmlsec1-1.2.6.patch 2008-10-20 03:29:32.000000000 +0900
5@@ -418,7 +418,7 @@ 5@@ -175,6 +175,23 @@
 6 case $version_type in
 7 freebsd-elf*)
 8 ***************
 9+*** 7969,7975 ****
 10+ ;;
 11+
 12+ netbsd*)
 13+! version_type=sunos
 14+ need_lib_prefix=no
 15+ need_version=no
 16+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 17+--- 7970,7976 ----
 18+ ;;
 19+
 20+ netbsd*)
 21+! version_type=freebsd-elf
 22+ need_lib_prefix=no
 23+ need_version=no
 24+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 25+***************
 26 *** 9046,9052 ****
 27 ;;
 28 esac
 29@@ -249,6 +266,23 @@
 30 case $version_type in
 31 freebsd-elf*)
 32 ***************
 33+*** 11688,11694 ****
 34+ ;;
 35+
 36+ netbsd*)
 37+! version_type=sunos
 38+ need_lib_prefix=no
 39+ need_version=no
 40+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 41+--- 11689,11695 ----
 42+ ;;
 43+
 44+ netbsd*)
 45+! version_type=freebsd-elf
 46+ need_lib_prefix=no
 47+ need_version=no
 48+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 49+***************
 50 *** 13259,13269 ****
 51 lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
 52 ;;
 53@@ -308,6 +342,23 @@
 54 case $version_type in
 55 freebsd-elf*)
 56 ***************
 57+*** 14858,14864 ****
 58+ ;;
 59+
 60+ netbsd*)
 61+! version_type=sunos
 62+ need_lib_prefix=no
 63+ need_version=no
 64+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 65+--- 14859,14865 ----
 66+ ;;
 67+
 68+ netbsd*)
 69+! version_type=freebsd-elf
 70+ need_lib_prefix=no
 71+ need_version=no
 72+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 73+***************
 74 *** 15607,15617 ****
 75 lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
 76 ;;
 77@@ -384,6 +435,23 @@
 78 case $version_type in
 79 freebsd-elf*)
 80 ***************
 81+*** 17226,17232 ****
 82+ ;;
 83+
 84+ netbsd*)
 85+! version_type=sunos
 86+ need_lib_prefix=no
 87+ need_version=no
 88+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 89+--- 17227,17233 ----
 90+ ;;
 91+
 92+ netbsd*)
 93+! version_type=freebsd-elf
 94+ need_lib_prefix=no
 95+ need_version=no
 96+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 97+***************
 98 *** 24598,24604 ****
 99 fi
 100
 101@@ -418,7 +486,7 @@
6  102
7 XMLSEC_NO_NSS="1" 103 XMLSEC_NO_NSS="1"
8 MOZILLA_MIN_VERSION="1.4" 104 MOZILLA_MIN_VERSION="1.4"
9-+ if test "z$MOZ_FLAVOUR" = "zfirefox" ; then 105-+ if test "z$MOZ_FLAVOUR" = "zfirefox" ; then
10++ if test "z$MOZ_FLAVOUR" = "zfirefox" -o "z$MOZ_FLAVOUR" = "zseamonkey"; then 106++ if test "z$MOZ_FLAVOUR" = "zfirefox" -o "z$MOZ_FLAVOUR" = "zseamonkey"; then
11 + MOZILLA_MIN_VERSION="1.0" 107 + MOZILLA_MIN_VERSION="1.0"
12 + fi 108 + fi
13 NSS_MIN_VERSION="3.2" 109 NSS_MIN_VERSION="3.2"
14@@ -2705,7 +2705,7 @@ 110@@ -2705,7 +2773,7 @@
15  111
16 XMLSEC_NO_NSS="1" 112 XMLSEC_NO_NSS="1"
17 MOZILLA_MIN_VERSION="1.4" 113 MOZILLA_MIN_VERSION="1.4"
18-+ if test "z$MOZ_FLAVOUR" = "zfirefox" ; then 114-+ if test "z$MOZ_FLAVOUR" = "zfirefox" ; then
19++ if test "z$MOZ_FLAVOUR" = "zfirefox" -o "z$MOZ_FLAVOUR" = "zseamonkey"; then 115++ if test "z$MOZ_FLAVOUR" = "zfirefox" -o "z$MOZ_FLAVOUR" = "zseamonkey"; then
20 + MOZILLA_MIN_VERSION="1.0" 116 + MOZILLA_MIN_VERSION="1.0"
21 + fi 117 + fi
22 NSS_MIN_VERSION="3.2" 118 NSS_MIN_VERSION="3.2"
cvs diff -r1.3 -r1.4 pkgsrc/misc/openoffice3/patches/Attic/patch-du (expand / switch to unified diff)

--- pkgsrc/misc/openoffice3/patches/Attic/patch-du 2008/10/16 23:16:47 1.3
+++ pkgsrc/misc/openoffice3/patches/Attic/patch-du 2008/10/20 12:30:16 1.4
@@ -1,28 +1,41 @@ @@ -1,28 +1,41 @@
1$NetBSD: patch-du,v 1.3 2008/10/16 23:16:47 hira Exp $ 1$NetBSD: patch-du,v 1.4 2008/10/20 12:30:16 hira Exp $
2 2
3--- solenv/inc/pkgsrc.mk.orig 2008-10-16 18:30:22.000000000 +0900 3--- solenv/inc/pkgsrc.mk.orig 2008-10-16 18:30:22.000000000 +0900
4+++ solenv/inc/pkgsrc.mk 2008-10-16 18:32:40.000000000 +0900 4+++ solenv/inc/pkgsrc.mk 2008-10-17 16:32:40.000000000 +0900
5@@ -0,0 +1,23 @@ 5@@ -0,0 +1,36 @@
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" 16+ICUINLIB="@LIB_icu@ -licui18n"
17+ICULELIB="@LIB_icu@ -licule" 17+ICULELIB="@LIB_icu@ -licule"
18+ICUUCLIB="@LIB_icu@ -licuuc" 18+ICUUCLIB="@LIB_icu@ -licuuc"
19+ICUDATALIB="@LIB_icu@ -licudata" 19+ICUDATALIB="@LIB_icu@ -licudata"
20+ 20+
21+JPEG3RDLIB="@LIB_jpeg@ -ljpeg" 21+JPEG3RDLIB="@LIB_jpeg@ -ljpeg"
22+ 22+
23+ZLIB3RDLIB="@LIB_zlib@ -lz" 23+ZLIB3RDLIB="@LIB_zlib@ -lz"
24+ 24+
25+AWTLIB="@LIB_awtlib@ -ljawt" 
26+ 
27+STDLIBGUIMT+=${X11_LDFLAGS} 25+STDLIBGUIMT+=${X11_LDFLAGS}
28+STDSHLGUIMT+=${X11_LDFLAGS} 26+STDSHLGUIMT+=${X11_LDFLAGS}
 27+
 28+LIB_base=@COMPILER_RPATH_FLAG@@OO_LIBDIR@
 29+LIB_ure=@COMPILER_RPATH_FLAG@@OO_LIBDIR@/../ure-link/lib
 30+LIB_jawt=@LIB_jawt@
 31+LIB_mawt=@LIB_mawt@
 32+
 33+AWTLIB=${LIB_jawt} ${LIB_mawt} -ljawt
 34+
 35+# Add runtime search path ($ORIGIN cannot be used in pkgsrc).
 36+LINKFLAGS+= ${LIB_base} ${LIB_ure} ${LIB_jawt} ${LIB_mawt}
 37+EXTRA_LINKFLAGS+= ${LIB_base} ${LIB_ure} ${LIB_jawt} ${LIB_mawt}
 38+
 39+# XXX: unoxml/source/rdf and libxmlsec don't use LINKFLAGS.
 40+REDLANDLIB+= ${LIB_base} ${LIB_ure}
 41+xmlsec_LDFLAGS+= ${LIB_base} ${LIB_ure}
cvs diff -r1.1 -r1.2 pkgsrc/misc/openoffice3/patches/Attic/patch-dz (expand / switch to unified diff)

--- pkgsrc/misc/openoffice3/patches/Attic/patch-dz 2008/10/18 11:09:11 1.1
+++ pkgsrc/misc/openoffice3/patches/Attic/patch-dz 2008/10/20 12:30:16 1.2
@@ -1,21 +1,57 @@ @@ -1,21 +1,57 @@
1$NetBSD: patch-dz,v 1.1 2008/10/18 11:09:11 hira Exp $ 1$NetBSD: patch-dz,v 1.2 2008/10/20 12:30:16 hira Exp $
2 2
3XXX: lang/gcc34 allows implicit function declaration. 3XXX: lang/gcc34 allows implicit function declaration.
4 4
5--- redland/raptor-1.4.17.patch.orig 2008-10-18 10:43:14.000000000 +0000 5--- redland/raptor-1.4.17.patch.orig 2008-07-18 18:25:27.000000000 +0900
6+++ redland/raptor-1.4.17.patch 2008-10-18 10:44:08.000000000 +0000 6+++ redland/raptor-1.4.17.patch 2008-10-20 03:04:03.000000000 +0900
7@@ -271,3 +271,14 @@ 7@@ -271,3 +271,50 @@
8 ;; 8 ;;
9  9
10 irix | nonstopux) 10 irix | nonstopux)
11+--- misc/raptor-1.4.17/configure 2008-10-18 10:41:27.000000000 +0000 11+--- misc/raptor-1.4.17/configure 2008-03-17 16:37:20.000000000 +0900
12++++ misc/build/raptor-1.4.17/configure 2008-10-18 10:42:41.000000000 +0000 12++++ misc/build/raptor-1.4.17/configure 2008-10-20 03:01:08.000000000 +0900
 13+@@ -8776,7 +8776,7 @@
 14+ ;;
 15+
 16+ netbsd*)
 17+- version_type=sunos
 18++ version_type=freebsd-elf
 19+ need_lib_prefix=no
 20+ need_version=no
 21+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 22+@@ -12754,7 +12754,7 @@
 23+ ;;
 24+
 25+ netbsd*)
 26+- version_type=sunos
 27++ version_type=freebsd-elf
 28+ need_lib_prefix=no
 29+ need_version=no
 30+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 31+@@ -15388,7 +15388,7 @@
 32+ ;;
 33+
 34+ netbsd*)
 35+- version_type=sunos
 36++ version_type=freebsd-elf
 37+ need_lib_prefix=no
 38+ need_version=no
 39+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 40+@@ -18022,7 +18022,7 @@
 41+ ;;
 42+
 43+ netbsd*)
 44+- version_type=sunos
 45++ version_type=freebsd-elf
 46+ need_lib_prefix=no
 47+ need_version=no
 48+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
13+@@ -22667,7 +22667,7 @@ 49+@@ -22667,7 +22667,7 @@
14+ *) ac_try_echo=$ac_try;; 50+ *) ac_try_echo=$ac_try;;
15+ esac 51+ esac
16+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 52+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17+- (eval "$ac_link") 2>conftest.er1 53+- (eval "$ac_link") 2>conftest.er1
18++ (eval "$ac_link -Werror-implicit-function-declaration") 2>conftest.er1 54++ (eval "$ac_link -Werror-implicit-function-declaration") 2>conftest.er1
19+ ac_status=$? 55+ ac_status=$?
20+ grep -v '^ *+' conftest.er1 >conftest.err 56+ grep -v '^ *+' conftest.er1 >conftest.err
21+ rm -f conftest.er1 57+ rm -f conftest.er1
File Added: pkgsrc/misc/openoffice3/patches/Attic/patch-ea
$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
File Added: pkgsrc/misc/openoffice3/patches/Attic/patch-eb
$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