Sat Oct 25 15:18:18 2008 UTC ()
 - Use languagepacks to install multiple languages.
 - Reduce disk usage of ${WRKDIR} with multiple languages.
 - Don't create install set to ${WRKDIR} in post-build stage.
 - Install desktop files to share/applications as symbolic links.
 - Shut up tar warning.
 - Add lang-all option.
 - Add missing lang-* options (by, gd, gu, ms and my).


(hira)
diff -r1.11 -r1.12 pkgsrc/misc/openoffice3/Makefile
diff -r1.11 -r1.12 pkgsrc/misc/openoffice3/distinfo
diff -r1.3 -r1.4 pkgsrc/misc/openoffice3/PLIST
diff -r1.9 -r1.10 pkgsrc/misc/openoffice3/options.mk
diff -r1.1.1.1 -r1.2 pkgsrc/misc/openoffice3/patches/patch-bq
cvs diff -r1.11 -r1.12 pkgsrc/misc/openoffice3/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/openoffice3/Attic/Makefile 2008/10/24 19:41:28 1.11
+++ pkgsrc/misc/openoffice3/Attic/Makefile 2008/10/25 15:18:17 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.11 2008/10/24 19:41:28 hira Exp $ 1# $NetBSD: Makefile,v 1.12 2008/10/25 15:18:17 hira Exp $
2# 2#
3 3
4OO_VER= 3.0.0 4OO_VER= 3.0.0
5PKGREVISION= 4 5PKGREVISION= 4
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
@@ -78,26 +78,28 @@ LIBS+= ${LIB.${pkg}} @@ -78,26 +78,28 @@ LIBS+= ${LIB.${pkg}}
78 78
79CONFIGURE_ENV+= LIBS=${LIBS:O:u:Q} 79CONFIGURE_ENV+= LIBS=${LIBS:O:u:Q}
80CONFIGURE_ENV+= X_LIBS=${X11_LDFLAGS:M*:Q} 80CONFIGURE_ENV+= X_LIBS=${X11_LDFLAGS:M*:Q}
81CONFIGURE_ENV+= BLNK_PREFIX_db4=${BUILDLINK_PREFIX.db4} 81CONFIGURE_ENV+= BLNK_PREFIX_db4=${BUILDLINK_PREFIX.db4}
82CONFIGURE_ENV+= ac_cv_path_SYSTEM_GENBRK=${PREFIX}/bin/genbrk 82CONFIGURE_ENV+= ac_cv_path_SYSTEM_GENBRK=${PREFIX}/bin/genbrk
83CONFIGURE_ENV+= ac_cv_path_SYSTEM_GENCCODE=${PREFIX}/sbin/genccode 83CONFIGURE_ENV+= ac_cv_path_SYSTEM_GENCCODE=${PREFIX}/sbin/genccode
84CONFIGURE_ENV+= ac_cv_path_SYSTEM_GENCMN=${PREFIX}/sbin/gencmn 84CONFIGURE_ENV+= ac_cv_path_SYSTEM_GENCMN=${PREFIX}/sbin/gencmn
85 85
86CONFIGURE_ARGS+= --with-use-shell=bash 86CONFIGURE_ARGS+= --with-use-shell=bash
87CONFIGURE_ARGS+= --enable-binfilter 87CONFIGURE_ARGS+= --enable-binfilter
88CONFIGURE_ARGS+= --enable-cairo 88CONFIGURE_ARGS+= --enable-cairo
89CONFIGURE_ARGS+= --disable-systray 89CONFIGURE_ARGS+= --disable-systray
90CONFIGURE_ARGS+= --disable-ldap 90CONFIGURE_ARGS+= --disable-ldap
 91CONFIGURE_ARGS+= --disable-odk
 92CONFIGURE_ARGS+= --disable-gcjaot
91CONFIGURE_ARGS+= --with-system-stdlibs 93CONFIGURE_ARGS+= --with-system-stdlibs
92CONFIGURE_ARGS+= --with-system-cairo 94CONFIGURE_ARGS+= --with-system-cairo
93CONFIGURE_ARGS+= --with-system-curl 95CONFIGURE_ARGS+= --with-system-curl
94CONFIGURE_ARGS+= --with-system-db 96CONFIGURE_ARGS+= --with-system-db
95CONFIGURE_ARGS+= --with-system-expat 97CONFIGURE_ARGS+= --with-system-expat
96CONFIGURE_ARGS+= --with-system-freetype 98CONFIGURE_ARGS+= --with-system-freetype
97CONFIGURE_ARGS+= --with-system-hunspell 99CONFIGURE_ARGS+= --with-system-hunspell
98CONFIGURE_ARGS+= --with-system-icu 100CONFIGURE_ARGS+= --with-system-icu
99CONFIGURE_ARGS+= --with-system-jpeg 101CONFIGURE_ARGS+= --with-system-jpeg
100CONFIGURE_ARGS+= --with-system-libxml 102CONFIGURE_ARGS+= --with-system-libxml
101CONFIGURE_ARGS+= --with-system-libxslt 103CONFIGURE_ARGS+= --with-system-libxslt
102CONFIGURE_ARGS+= --with-system-neon 104CONFIGURE_ARGS+= --with-system-neon
103CONFIGURE_ARGS+= --with-system-openssl 105CONFIGURE_ARGS+= --with-system-openssl
@@ -106,102 +108,97 @@ CONFIGURE_ARGS+= --with-system-zlib @@ -106,102 +108,97 @@ CONFIGURE_ARGS+= --with-system-zlib
106CONFIGURE_ARGS+= --with-dynamic-xinerama 108CONFIGURE_ARGS+= --with-dynamic-xinerama
107 109
108# Extensions 110# Extensions
109CONFIGURE_ARGS+= --enable-minimizer 111CONFIGURE_ARGS+= --enable-minimizer
110CONFIGURE_ARGS+= --enable-presenter-console 112CONFIGURE_ARGS+= --enable-presenter-console
111CONFIGURE_ARGS+= --enable-pdfimport 113CONFIGURE_ARGS+= --enable-pdfimport
112OO_EXTENSIONS+= minimizer/sun-presentation-minimizer.oxt 114OO_EXTENSIONS+= minimizer/sun-presentation-minimizer.oxt
113OO_EXTENSIONS+= pdfimport/pdfimport.oxt 115OO_EXTENSIONS+= pdfimport/pdfimport.oxt
114OO_EXTENSIONS+= presenter/presenter-screen.oxt 116OO_EXTENSIONS+= presenter/presenter-screen.oxt
115 117
116# `portable' supports all platforms. 118# `portable' supports all platforms.
117CONFIGURE_ARGS+= --enable-epm --with-package-format=portable 119CONFIGURE_ARGS+= --enable-epm --with-package-format=portable
118 120
119# Disable odk, gcjaot. 121# Language option.
120CONFIGURE_ARGS+= --disable-odk --disable-gcjaot 
121 
122# NOTE: In this version, this value should be separated by space (comma 
123# causes build error). 
124CONFIGURE_ARGS+= --with-lang=${OO_LANGS:Q} 122CONFIGURE_ARGS+= --with-lang=${OO_LANGS:Q}
125 123
126.include "options.mk" 124.include "options.mk"
127 125
128UNLIMIT_RESOURCES+= datasize 126UNLIMIT_RESOURCES+= datasize
129 127
130OO_RELEASE= OpenOffice.org${OO_VER} 128OO_RELEASE= OpenOffice.org${OO_VER}
131PLIST_SRC+= ${PKGDIR}/PLIST 129PLIST_SRC+= ${PKGDIR}/PLIST
132PLIST_SRC+= ${WRKDIR}/PLIST 130PLIST_SRC+= ${WRKDIR}/PLIST
 131PLIST_SUBST+= OO_UNXNAME=${OO_UNXNAME}
133MESSAGE_SUBST+= DESTDIR=${DESTDIR} 132MESSAGE_SUBST+= DESTDIR=${DESTDIR}
134MESSAGE_SUBST+= OO_PREFIX=${OO_PREFIX} 133MESSAGE_SUBST+= OO_PREFIX=${OO_PREFIX}
135INSTALLATION_DIRS= bin lib/${OO_RELEASE} share/applications \ 134INSTALLATION_DIRS= bin lib/${OO_RELEASE} share/applications \
136 lib/${OO_RELEASE}/extensions 135 lib/${OO_RELEASE}/extensions
137 136
138OO_UNXNAME= openoffice.org3 137OO_UNXNAME= openoffice.org3
139OO_PKGPATH= ${WRKSRC}/instsetoo_native/${OPENOFFICE_OUTPATH}.pro/OpenOffice/portable/install 138OO_PKGPATH= ${WRKSRC}/instsetoo_native/${OPENOFFICE_OUTPATH}.pro/OpenOffice/portable/install
 139OO_LANGPACKPATH=${WRKSRC}/instsetoo_native/${OPENOFFICE_OUTPATH}.pro/OpenOffice_languagepack/portable/install
140OO_PROGRAMS= scalc sdraw simpress soffice swriter unopkg 140OO_PROGRAMS= scalc sdraw simpress soffice swriter unopkg
141OO_PREFIX= ${DESTDIR}${PREFIX}/lib/${OO_RELEASE} 141OO_PREFIX= ${DESTDIR}${PREFIX}/lib/${OO_RELEASE}
142 142
143post-extract: 143post-extract:
144 cd ${WRKSRC}/bridges/source/cpp_uno && \ 144 cd ${WRKSRC}/bridges/source/cpp_uno && \
145 mv gcc3_netbsd_intel gcc3_netbsd_intel.orig && \ 145 mv gcc3_netbsd_intel gcc3_netbsd_intel.orig && \
146 cp -Rp gcc3_freebsd_intel gcc3_netbsd_intel && \ 146 cp -Rp gcc3_freebsd_intel gcc3_netbsd_intel && \
147 cp -Rp gcc3_freebsd_x86-64 gcc3_netbsd_x86-64 147 cp -Rp gcc3_freebsd_x86-64 gcc3_netbsd_x86-64
148 148
149do-build: 149do-build:
150 ${_ULIMIT_CMD} ${SETENV} ${MAKE_ENV} bash -c "cd ${WRKSRC} && ./bootstrap && source ${OPENOFFICE_SETFILE}Env.Set.sh && cd instsetoo_native && build.pl --checkmodules; build.pl -P${MAKE_JOBS:U1} --all product=full" 150 @${_ULIMIT_CMD} ${SETENV} ${MAKE_ENV} bash -c \
 151 "cd ${WRKSRC} && ./bootstrap && source ${OPENOFFICE_SETFILE}Env.Set.sh && cd instsetoo_native && build.pl --checkmodules && build.pl -P${MAKE_JOBS:U1} --all product=full && cd util && dmake ooolanguagepack"
151 152
152post-build: 153post-build:
153 cd ${WRKDIR} && \ 
154 rm -fr opt && \ 
155 for l in ${OO_LANGS}; do \ 
156 for f in ${OO_PKGPATH:Q}/$${l}/*/*.sw; do \ 
157 tar xpfk $$f; \ 
158 done; \ 
159 done 
160 cd ${WRKDIR} && \ 
161 rm -fr xdg && \ 
162 mv opt/${OO_UNXNAME}/share/xdg . 
163 cd ${WRKDIR}/opt/openoffice.org && \ 
164 chmod ${SHAREMODE} basis3.0/program/hid.lst \ 
165 basis3.0/program/testtoolrc 
166 ${ECHO} "#!${SH}" > ${WRKDIR}/${OO_UNXNAME} 154 ${ECHO} "#!${SH}" > ${WRKDIR}/${OO_UNXNAME}
167 ${ECHO} "exec ${OO_PREFIX}/${OO_UNXNAME}/program/soffice \"\$$@\"" \ 155 ${ECHO} "exec ${OO_PREFIX}/${OO_UNXNAME}/program/soffice \"\$$@\"" \
168 >> ${WRKDIR}/${OO_UNXNAME} 156 >> ${WRKDIR}/${OO_UNXNAME}
169 ${ECHO} "#!${SH}" > ${WRKDIR}/${OO_UNXNAME}-printeradmin 157 ${ECHO} "#!${SH}" > ${WRKDIR}/${OO_UNXNAME}-printeradmin
170 ${ECHO} "exec ${OO_PREFIX}/${OO_UNXNAME}/program/spadmin" \ 158 ${ECHO} "exec ${OO_PREFIX}/${OO_UNXNAME}/program/spadmin" \
171 >> ${WRKDIR}/${OO_UNXNAME}-printeradmin 159 >> ${WRKDIR}/${OO_UNXNAME}-printeradmin
172 160
173do-install: 161do-install:
174 cd ${WRKDIR}/opt && \ 162 cd ${OO_PREFIX} && \
175 tar cf - openoffice.org ${OO_UNXNAME} | tar Cxpf ${OO_PREFIX} - 163 for f in ${OO_PKGPATH:Q}/${OO_BASELANG}/*/*.sw; do \
 164 tar xpf $$f; \
 165 done; \
 166 for lang in ${OO_LANGPACKS}; do \
 167 for f in ${OO_LANGPACKPATH:Q}/$$lang/*/*.sw; do \
 168 tar xpf $$f; \
 169 done; \
 170 done
 171 for d in ${OO_PREFIX}/${OO_UNXNAME}/share/xdg/*; do \
 172 ln -s $$d ${DESTDIR}${PREFIX}/share/applications; \
 173 done
 174 cd ${OO_PREFIX}/${OO_UNXNAME}/basis-link/program && \
 175 chmod ${SHAREMODE} hid.lst testtoolrc
176 for f in ${OO_PROGRAMS}; do \ 176 for f in ${OO_PROGRAMS}; do \
177 ln -sf ${OO_PREFIX}/${OO_UNXNAME}/program/$$f \ 177 ln -sf ${OO_PREFIX}/${OO_UNXNAME}/program/$$f \
178 ${DESTDIR}${PREFIX}/bin/$$f; \ 178 ${DESTDIR}${PREFIX}/bin/$$f; \
179 done 179 done
180 cd ${WRKDIR}/${OO_TAG}/solver/300/${OPENOFFICE_OUTPATH}.pro/bin && \ 180 cd ${WRKDIR}/${OO_TAG}/solver/300/${OPENOFFICE_OUTPATH}.pro/bin && \
181 ${INSTALL_DATA} ${OO_EXTENSIONS} ${OO_PREFIX}/extensions 181 ${INSTALL_DATA} ${OO_EXTENSIONS} ${OO_PREFIX}/extensions
182 ${INSTALL_DATA} ${WRKDIR}/xdg/* ${DESTDIR}${PREFIX}/share/applications 
183 ${INSTALL_SCRIPT} ${WRKDIR}/${OO_UNXNAME} ${DESTDIR}${PREFIX}/bin 182 ${INSTALL_SCRIPT} ${WRKDIR}/${OO_UNXNAME} ${DESTDIR}${PREFIX}/bin
184 ${INSTALL_SCRIPT} ${WRKDIR}/${OO_UNXNAME}-printeradmin \ 183 ${INSTALL_SCRIPT} ${WRKDIR}/${OO_UNXNAME}-printeradmin \
185 ${DESTDIR}${PREFIX}/bin 184 ${DESTDIR}${PREFIX}/bin
186 185
187post-install: 186post-install:
188 cd ${DESTDIR}${PREFIX} && \ 187 cd ${DESTDIR}${PREFIX} && \
189 find lib/${OO_RELEASE} \! -type d -print | \ 188 find lib/${OO_RELEASE} \! -type d -print | \
190 sort > ${WRKDIR}/PLIST && \ 189 sort > ${WRKDIR}/PLIST && \
191 find lib/${OO_RELEASE} -type d -print | sort -r | \ 190 find lib/${OO_RELEASE} -type d -print | sort -r | \
192 awk '{print("@dirrm "$$1)}' >> ${WRKDIR}/PLIST 191 awk '{print("@dirrm "$$1)}' >> ${WRKDIR}/PLIST
193 ${ECHO} bin/${OO_UNXNAME} >> ${WRKDIR}/PLIST 
194 ${ECHO} bin/${OO_UNXNAME}-printeradmin >> ${WRKDIR}/PLIST 
195 192
196# OS specific Makefile 193# OS specific Makefile
197.if exists(Makefile.${OPSYS}) 194.if exists(Makefile.${OPSYS})
198. include "Makefile.${OPSYS}" 195. include "Makefile.${OPSYS}"
199.endif 196.endif
200 197
201.include "../../mk/compiler.mk" 198.include "../../mk/compiler.mk"
202 199
203.include "../../lang/python/application.mk" 200.include "../../lang/python/application.mk"
204 201
205.include "../../databases/db4/buildlink3.mk" 202.include "../../databases/db4/buildlink3.mk"
206.include "../../devel/gperf/buildlink3.mk" 203.include "../../devel/gperf/buildlink3.mk"
207.include "../../devel/zlib/buildlink3.mk" 204.include "../../devel/zlib/buildlink3.mk"
cvs diff -r1.11 -r1.12 pkgsrc/misc/openoffice3/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/openoffice3/Attic/distinfo 2008/10/24 11:35:28 1.11
+++ pkgsrc/misc/openoffice3/Attic/distinfo 2008/10/25 15:18:17 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.11 2008/10/24 11:35:28 hira Exp $ 1$NetBSD: distinfo,v 1.12 2008/10/25 15:18:17 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_extensions.tar.bz2) = 1632374bf75eb6080c0d36e88fd981529be17a0f 9SHA1 (openoffice-3.0.0/OOo_3.0.0_src_extensions.tar.bz2) = 1632374bf75eb6080c0d36e88fd981529be17a0f
10RMD160 (openoffice-3.0.0/OOo_3.0.0_src_extensions.tar.bz2) = a19bdd687abc7829de937b46e4e484a4b27f045b 10RMD160 (openoffice-3.0.0/OOo_3.0.0_src_extensions.tar.bz2) = a19bdd687abc7829de937b46e4e484a4b27f045b
11Size (openoffice-3.0.0/OOo_3.0.0_src_extensions.tar.bz2) = 13941316 bytes 11Size (openoffice-3.0.0/OOo_3.0.0_src_extensions.tar.bz2) = 13941316 bytes
12SHA1 (openoffice-3.0.0/OOo_3.0.0_src_l10n.tar.bz2) = 0ee7f44cea5549a3d3473ff7669974e8914caf97 12SHA1 (openoffice-3.0.0/OOo_3.0.0_src_l10n.tar.bz2) = 0ee7f44cea5549a3d3473ff7669974e8914caf97
13RMD160 (openoffice-3.0.0/OOo_3.0.0_src_l10n.tar.bz2) = cb3eac1537b75cb34485037b916b634b90c6ff13 13RMD160 (openoffice-3.0.0/OOo_3.0.0_src_l10n.tar.bz2) = cb3eac1537b75cb34485037b916b634b90c6ff13
14Size (openoffice-3.0.0/OOo_3.0.0_src_l10n.tar.bz2) = 86009445 bytes 14Size (openoffice-3.0.0/OOo_3.0.0_src_l10n.tar.bz2) = 86009445 bytes
@@ -32,27 +32,27 @@ SHA1 (patch-aw) = fdd1665c729cd17d8381ab @@ -32,27 +32,27 @@ SHA1 (patch-aw) = fdd1665c729cd17d8381ab
32SHA1 (patch-ba) = c3b27c83c69b515d2774acb88d56370eb263f872 32SHA1 (patch-ba) = c3b27c83c69b515d2774acb88d56370eb263f872
33SHA1 (patch-bb) = a2fe8b7aff8c875bdf15c70619b430f1fdbfa053 33SHA1 (patch-bb) = a2fe8b7aff8c875bdf15c70619b430f1fdbfa053
34SHA1 (patch-bd) = 8faf878760e476ed13a4506f0615f8b544a2abd4 34SHA1 (patch-bd) = 8faf878760e476ed13a4506f0615f8b544a2abd4
35SHA1 (patch-bf) = d2e2363e7e08d675e3a6b9356d1ffac6d10148de 35SHA1 (patch-bf) = d2e2363e7e08d675e3a6b9356d1ffac6d10148de
36SHA1 (patch-bg) = 0eeb3e521b3d7c47efa67bf38a1ec598056ab32a 36SHA1 (patch-bg) = 0eeb3e521b3d7c47efa67bf38a1ec598056ab32a
37SHA1 (patch-bh) = 39322769872a33293d9dad56b947ca2d6d5069df 37SHA1 (patch-bh) = 39322769872a33293d9dad56b947ca2d6d5069df
38SHA1 (patch-bi) = f9d286d8dd93c7ba99fd0ca809c6dfac5e763464 38SHA1 (patch-bi) = f9d286d8dd93c7ba99fd0ca809c6dfac5e763464
39SHA1 (patch-bj) = 80685500062b9a17e16732a9a6da7a7d1d1ed1f6 39SHA1 (patch-bj) = 80685500062b9a17e16732a9a6da7a7d1d1ed1f6
40SHA1 (patch-bk) = 5a5c03a0c965edb32e95ad342f330e2b0eaf3d9c 40SHA1 (patch-bk) = 5a5c03a0c965edb32e95ad342f330e2b0eaf3d9c
41SHA1 (patch-bl) = 28beb128f19199a1a86965d2e2b6d42a2565224c 41SHA1 (patch-bl) = 28beb128f19199a1a86965d2e2b6d42a2565224c
42SHA1 (patch-bm) = 0f7367782155c1d0f0459912aac69a1c759ad7fa 42SHA1 (patch-bm) = 0f7367782155c1d0f0459912aac69a1c759ad7fa
43SHA1 (patch-bn) = 6f21ecf499135b5b47ed191eca79848b4c404447 43SHA1 (patch-bn) = 6f21ecf499135b5b47ed191eca79848b4c404447
44SHA1 (patch-bo) = 3e4bcccd0a7cea535e443d750039fa844380f8bc 44SHA1 (patch-bo) = 3e4bcccd0a7cea535e443d750039fa844380f8bc
45SHA1 (patch-bq) = 5a78794aac28cefb9386034e6937c8f63b2ebc65 45SHA1 (patch-bq) = 7fc0395707e5735f35a1154bfe431cca50fad3f2
46SHA1 (patch-bs) = ede4ffcb762e89efbf95b6e4b644eb268534f1ca 46SHA1 (patch-bs) = ede4ffcb762e89efbf95b6e4b644eb268534f1ca
47SHA1 (patch-bv) = bc035bdbc8420666a52417f2226e3e687d199e33 47SHA1 (patch-bv) = bc035bdbc8420666a52417f2226e3e687d199e33
48SHA1 (patch-bw) = 223963fe59b71468420a697d8ea27c153b9f37ce 48SHA1 (patch-bw) = 223963fe59b71468420a697d8ea27c153b9f37ce
49SHA1 (patch-bx) = 157878e1fb4297f118ed0bbf06009506666fbc1c 49SHA1 (patch-bx) = 157878e1fb4297f118ed0bbf06009506666fbc1c
50SHA1 (patch-by) = 1612b765467e51ca7498497d38a0bb6ac694f9a6 50SHA1 (patch-by) = 1612b765467e51ca7498497d38a0bb6ac694f9a6
51SHA1 (patch-ch) = caa598140bcb78ec61bc33d44c5873da84e1628a 51SHA1 (patch-ch) = caa598140bcb78ec61bc33d44c5873da84e1628a
52SHA1 (patch-ci) = 4743cee1c391e04a53bd83f6ae7e58e737d08d1e 52SHA1 (patch-ci) = 4743cee1c391e04a53bd83f6ae7e58e737d08d1e
53SHA1 (patch-cj) = 45ff359ec795e5ef5c692e954d88912c74017162 53SHA1 (patch-cj) = 45ff359ec795e5ef5c692e954d88912c74017162
54SHA1 (patch-ck) = 01925efa75759b3b8efda3ab109b0f6481f45a7f 54SHA1 (patch-ck) = 01925efa75759b3b8efda3ab109b0f6481f45a7f
55SHA1 (patch-cn) = d129e69d8ce9303e46f0b486e495d09c1e446444 55SHA1 (patch-cn) = d129e69d8ce9303e46f0b486e495d09c1e446444
56SHA1 (patch-cp) = 35151ba658859c9d116ccdf44ec372c9e66435b1 56SHA1 (patch-cp) = 35151ba658859c9d116ccdf44ec372c9e66435b1
57SHA1 (patch-cq) = 6691fd7fa330db000ec5a9319bf9030b83aa593d 57SHA1 (patch-cq) = 6691fd7fa330db000ec5a9319bf9030b83aa593d
58SHA1 (patch-cr) = aa797461919635c3e6aaa30678a7585d5640dedd 58SHA1 (patch-cr) = aa797461919635c3e6aaa30678a7585d5640dedd
cvs diff -r1.3 -r1.4 pkgsrc/misc/openoffice3/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/misc/openoffice3/Attic/PLIST 2008/10/18 01:35:25 1.3
+++ pkgsrc/misc/openoffice3/Attic/PLIST 2008/10/25 15:18:17 1.4
@@ -1,15 +1,17 @@ @@ -1,15 +1,17 @@
1@comment $NetBSD: PLIST,v 1.3 2008/10/18 01:35:25 hira Exp $ 1@comment $NetBSD: PLIST,v 1.4 2008/10/25 15:18:17 hira Exp $
2bin/scalc 2bin/scalc
3bin/sdraw 3bin/sdraw
4bin/simpress 4bin/simpress
5bin/soffice 5bin/soffice
6bin/swriter 6bin/swriter
7bin/unopkg 7bin/unopkg
 8bin/${OO_UNXNAME}
 9bin/${OO_UNXNAME}-printeradmin
8share/applications/base.desktop 10share/applications/base.desktop
9share/applications/calc.desktop 11share/applications/calc.desktop
10share/applications/draw.desktop 12share/applications/draw.desktop
11share/applications/impress.desktop 13share/applications/impress.desktop
12share/applications/math.desktop 14share/applications/math.desktop
13share/applications/printeradmin.desktop 15share/applications/printeradmin.desktop
14${PLIST.gtk2}share/applications/qstart.desktop 16${PLIST.gtk2}share/applications/qstart.desktop
15share/applications/writer.desktop 17share/applications/writer.desktop
cvs diff -r1.9 -r1.10 pkgsrc/misc/openoffice3/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/misc/openoffice3/Attic/options.mk 2008/10/24 11:35:28 1.9
+++ pkgsrc/misc/openoffice3/Attic/options.mk 2008/10/25 15:18:17 1.10
@@ -1,41 +1,58 @@ @@ -1,41 +1,58 @@
1# $NetBSD: options.mk,v 1.9 2008/10/24 11:35:28 hira Exp $ 1# $NetBSD: options.mk,v 1.10 2008/10/25 15:18:17 hira Exp $
 2#
2 3
3PKG_OPTIONS_VAR= PKG_OPTIONS.openoffice3 4PKG_OPTIONS_VAR= PKG_OPTIONS.openoffice3
4PKG_SUPPORTED_OPTIONS= cups gnome gtk2 java kde ooo-external-libwpd 5PKG_SUPPORTED_OPTIONS= cups gnome gtk2 java kde ooo-external-libwpd
5PKG_OPTIONS_OPTIONAL_GROUPS= browser 6PKG_OPTIONS_OPTIONAL_GROUPS= browser
6PKG_OPTIONS_GROUP.browser= firefox firefox3 seamonkey 7PKG_OPTIONS_GROUP.browser= firefox firefox3 seamonkey
7# The list from completelangiso in solenv/inc/postset.mk. 8# 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 \ 9OO_SUPPORTED_LANGUAGES= af ar as-IN be-BY bg br bn bn-BD bn-IN bs by \
9 cs cy da de dz el en-GB en-US en-ZA eo es et \ 10 ca cs cy da de dz el en-GB en-US en-ZA eo es \
10 eu fa fi fr ga gl gu-IN he hi-IN hr hu it ja \ 11 et eu fa fi fr ga gd gl gu gu-IN he hi-IN hr \
11 ka km kn ko ku lo lt lv mk ms ml-IN mr-IN ne \ 12 hu it ja ka km kn ko ku lo lt lv mk mn ms \
12 nb nl nn nr ns oc or-IN pa-IN pl pt pt-BR ru \ 13 ml-IN mr-IN my ne nb nl nn nr ns oc or-IN \
13 rw sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER \ 14 pa-IN pl pt pt-BR ru rw sk sl sh sr ss st sv \
14 ta-IN th tn tr ts tg ur-IN uk uz ve vi xh \ 15 sw sw-TZ te-IN ti-ER ta-IN th tn tr ts tg \
15 zh-CN zh-TW zu 16 ur-IN uk uz ve vi xh zh-CN zh-TW zu all
16.for l in ${OO_SUPPORTED_LANGUAGES} 17.for l in ${OO_SUPPORTED_LANGUAGES}
17PKG_SUPPORTED_OPTIONS+= lang-${l} 18PKG_SUPPORTED_OPTIONS+= lang-${l}
18.endfor 19.endfor
19PKG_SUGGESTED_OPTIONS= firefox gtk2 lang-en-US 20PKG_SUGGESTED_OPTIONS= firefox gtk2 lang-en-US
20PKG_OPTIONS_LEGACY_OPTS+= gnome-vfs:gnome 21PKG_OPTIONS_LEGACY_OPTS+= gnome-vfs:gnome
21 22
22.include "../../mk/bsd.options.mk" 23.include "../../mk/bsd.options.mk"
23.include "../../mk/bsd.prefs.mk" 24.include "../../mk/bsd.prefs.mk"
24 25
25.for l in ${PKG_OPTIONS:Mlang-*} 26.if !empty(PKG_OPTIONS:Mlang-all)
26OO_LANGS+= ${l:S/^lang-//1} 27OO_LANGS= ALL
27.endfor 28OO_BASELANG= en-US
 29OO_LANGPACKS= ${OO_SUPPORTED_LANGUAGES:S/en-US//1:S/all//1}
 30.else
 31. for _l in ${PKG_OPTIONS:Mlang-*:S/lang-//g}
 32OO_LANGS+= ${_l}
 33OO_BASELANG?= ${_l} # Get first one.
 34. endfor
 35.endif
28OO_LANGS?= en-US 36OO_LANGS?= en-US
 37OO_BASELANG?= en-US
 38OO_LANGPACKS?= ${OO_LANGS:S/${OO_BASELANG}//1}
 39
 40SUBST_CLASSES+= instset
 41SUBST_STAGE.instset= post-patch
 42SUBST_MESSAGE.instset= Reduce OOo install sets.
 43SUBST_FILES.instset= instsetoo_native/util/makefile.mk
 44SUBST_SED.instset+= -e 's,@BASELANG@,${OO_BASELANG},g'
 45SUBST_SED.instset+= -e 's,@LANGPACKS@,${OO_LANGPACKS},g'
29 46
30.if !empty(PKG_OPTIONS:Mfirefox) 47.if !empty(PKG_OPTIONS:Mfirefox)
31MOZ_FLAVOUR= firefox 48MOZ_FLAVOUR= firefox
32CONFIGURE_ARGS+= --with-system-mozilla=firefox 49CONFIGURE_ARGS+= --with-system-mozilla=firefox
33.include "../../www/firefox/buildlink3.mk" 50.include "../../www/firefox/buildlink3.mk"
34.elif !empty(PKG_OPTIONS:Mfirefox3) 51.elif !empty(PKG_OPTIONS:Mfirefox3)
35MOZ_FLAVOUR= firefox3 52MOZ_FLAVOUR= firefox3
36CONFIGURE_ARGS+= --with-system-mozilla=firefox3 53CONFIGURE_ARGS+= --with-system-mozilla=firefox3
37.include "../../www/firefox3/buildlink3.mk" 54.include "../../www/firefox3/buildlink3.mk"
38.elif !empty(PKG_OPTIONS:Mseamonkey) 55.elif !empty(PKG_OPTIONS:Mseamonkey)
39MOZ_FLAVOUR= seamonkey 56MOZ_FLAVOUR= seamonkey
40CONFIGURE_ARGS+= --with-system-mozilla=seamonkey 57CONFIGURE_ARGS+= --with-system-mozilla=seamonkey
41.include "../../www/seamonkey/buildlink3.mk" 58.include "../../www/seamonkey/buildlink3.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/misc/openoffice3/patches/Attic/patch-bq (expand / switch to unified diff)

--- pkgsrc/misc/openoffice3/patches/Attic/patch-bq 2008/10/14 11:02:24 1.1.1.1
+++ pkgsrc/misc/openoffice3/patches/Attic/patch-bq 2008/10/25 15:18:17 1.2
@@ -1,28 +1,96 @@ @@ -1,28 +1,96 @@
1$NetBSD: patch-bq,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $ 1$NetBSD: patch-bq,v 1.2 2008/10/25 15:18:17 hira Exp $
2 2
3--- instsetoo_native/util/makefile.mk.orig 2008-07-26 06:07:21.000000000 +0900 3--- instsetoo_native/util/makefile.mk.orig 2008-07-30 22:30:16.000000000 +0900
4+++ instsetoo_native/util/makefile.mk 2008-07-26 06:08:22.000000000 +0900 4+++ instsetoo_native/util/makefile.mk 2008-10-26 06:58:43.000000000 +0900
5@@ -54,6 +54,9 @@ 5@@ -54,6 +54,12 @@
6 ENABLE_DOWNLOADSETS=TRUE 6 ENABLE_DOWNLOADSETS=TRUE
7 .ENDIF # "$(FORCE_DOWNLOADSETS)"!="" 7 .ENDIF # "$(FORCE_DOWNLOADSETS)"!=""
8  8
9+# Don't create download set with pkgsrc. 9+# Don't create download set with pkgsrc.
10+ENABLE_DOWNLOADSETS= 10+ENABLE_DOWNLOADSETS=
11+ 11+
 12+BASELANG= @BASELANG@
 13+LANGPACKS= @LANGPACKS@
 14+
12 .EXPORT: ENABLE_DOWNLOADSETS 15 .EXPORT: ENABLE_DOWNLOADSETS
13 .EXPORT: LAST_MINOR 16 .EXPORT: LAST_MINOR
14 .EXPORT: PRJ 17 .EXPORT: PRJ
15@@ -383,10 +386,10 @@ 18@@ -135,13 +141,13 @@
 19
 20 .IF "$(alllangiso)"!=""
 21
 22-openoffice: $(foreach,i,$(alllangiso) openoffice_$i)
 23+openoffice: openoffice_$(BASELANG)
 24
 25 openofficedev: $(foreach,i,$(alllangiso) openofficedev_$i)
 26
 27 openofficewithjre: $(foreach,i,$(alllangiso) openofficewithjre_$i)
 28
 29-ooolanguagepack : $(foreach,i,$(alllangiso) ooolanguagepack_$i)
 30+ooolanguagepack : $(foreach,i,$(LANGPACKS) ooolanguagepack_$i)
 31
 32 ooodevlanguagepack: $(foreach,i,$(alllangiso) ooodevlanguagepack_$i)
 33
 34@@ -183,13 +189,13 @@
 35 ADDDEPS+=hack_msitemplates
 36 .ENDIF
 37
 38-$(foreach,i,$(alllangiso) openoffice_$i) : $(ADDDEPS)
 39+openoffice_$(BASELANG) : $(ADDDEPS)
 40
 41 $(foreach,i,$(alllangiso) openofficedev_$i) : $(ADDDEPS)
 42
 43 $(foreach,i,$(alllangiso) openofficewithjre_$i) : $(ADDDEPS)
 44
 45-$(foreach,i,$(alllangiso) ooolanguagepack_$i) : $(ADDDEPS)
 46+$(foreach,i,$(LANGPACKS) ooolanguagepack_$i) : $(ADDDEPS)
 47
 48 $(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $(ADDDEPS)
 49
 50@@ -217,7 +223,7 @@
 51 .ENDIF # "$(OS)" == "MACOSX"
 52
 53 .IF "$(PKGFORMAT)"!=""
 54-$(foreach,i,$(alllangiso) openoffice_$i) : $$@{$(PKGFORMAT:^".")}
 55+openoffice_$(BASELANG) : $$@{$(PKGFORMAT:^".")}
 56 .IF "$(MAKETARGETS)"!="" && "$(PKGFORMAT)"!=""
 57 .IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
 58 $(MAKETARGETS) : $$@{$(PKGFORMAT:^".")}
 59@@ -228,7 +234,7 @@
 60 .ELSE # "$(PKGFORMAT)"!=""
 61 openoffice_% :
 62 .ENDIF # "$(PKGFORMAT)"!=""
 63- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH) $(VERBOSESWITCH))
 64+ $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -i . -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH) $(VERBOSESWITCH))
 65 $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
 66
 67 .IF "$(PKGFORMAT)"!=""
 68@@ -249,12 +255,12 @@
 69 $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
 70
 71 .IF "$(PKGFORMAT)"!=""
 72-$(foreach,i,$(alllangiso) ooolanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
 73+$(foreach,i,$(LANGPACKS) ooolanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
 74 ooolanguagepack_%{$(PKGFORMAT:^".")} :
 75 .ELSE # "$(PKGFORMAT)"!=""
 76 ooolanguagepack_% :
 77 .ENDIF # "$(PKGFORMAT)"!=""
 78- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH) $(VERBOSESWITCH))
 79+ $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -i . -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH) $(VERBOSESWITCH))
 80
 81 .IF "$(PKGFORMAT)"!=""
 82 $(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
 83@@ -380,10 +386,10 @@
16 -$(MKDIRHIER) $(MSIURETEMPLATEDIR) 84 -$(MKDIRHIER) $(MSIURETEMPLATEDIR)
17 -$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR) 85 -$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)
18 # -$(MKDIRHIER) $(MSIURETEMPLATEDIR) 86 # -$(MKDIRHIER) $(MSIURETEMPLATEDIR)
19- $(GNUCOPY) -ua $(MSIOFFICETEMPLATESOURCE) $(MSIOFFICETEMPLATEDIR:d:d) 87- $(GNUCOPY) -ua $(MSIOFFICETEMPLATESOURCE) $(MSIOFFICETEMPLATEDIR:d:d)
20- $(GNUCOPY) -ua $(MSILANGPACKTEMPLATESOURCE) $(MSILANGPACKTEMPLATEDIR:d:d) 88- $(GNUCOPY) -ua $(MSILANGPACKTEMPLATESOURCE) $(MSILANGPACKTEMPLATEDIR:d:d)
21- $(GNUCOPY) -ua $(MSIURETEMPLATESOURCE) $(MSIURETEMPLATEDIR:d:d) 89- $(GNUCOPY) -ua $(MSIURETEMPLATESOURCE) $(MSIURETEMPLATEDIR:d:d)
22- $(GNUCOPY) -ua $(MSISDKOOTEMPLATESOURCE) $(MSISDKOOTEMPLATEDIR:d:d) 90- $(GNUCOPY) -ua $(MSISDKOOTEMPLATESOURCE) $(MSISDKOOTEMPLATEDIR:d:d)
23+ $(GNUCOPY) -Rp $(MSIOFFICETEMPLATESOURCE) $(MSIOFFICETEMPLATEDIR:d:d) 91+ $(GNUCOPY) -Rp $(MSIOFFICETEMPLATESOURCE) $(MSIOFFICETEMPLATEDIR:d:d)
24+ $(GNUCOPY) -Rp $(MSILANGPACKTEMPLATESOURCE) $(MSILANGPACKTEMPLATEDIR:d:d) 92+ $(GNUCOPY) -Rp $(MSILANGPACKTEMPLATESOURCE) $(MSILANGPACKTEMPLATEDIR:d:d)
25+ $(GNUCOPY) -Rp $(MSIURETEMPLATESOURCE) $(MSIURETEMPLATEDIR:d:d) 93+ $(GNUCOPY) -Rp $(MSIURETEMPLATESOURCE) $(MSIURETEMPLATEDIR:d:d)
26+ $(GNUCOPY) -Rp $(MSISDKOOTEMPLATESOURCE) $(MSISDKOOTEMPLATEDIR:d:d) 94+ $(GNUCOPY) -Rp $(MSISDKOOTEMPLATESOURCE) $(MSISDKOOTEMPLATEDIR:d:d)
27 # $(GNUCOPY) -ua $(MSIURETEMPLATESOURCE) $(MSIURETEMPLATEDIR:d:d) 95 # $(GNUCOPY) -ua $(MSIURETEMPLATESOURCE) $(MSIURETEMPLATEDIR:d:d)
28 $(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp 96 $(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp