Sun Jun 22 23:59:36 2014 UTC ()
Bump PKGREVISION

* Accept python27
* Support debug build and target for debugging
Mostly from richard@.


(ryoon)
diff -r1.31 -r1.32 pkgsrc/misc/libreoffice4/Makefile
diff -r0 -r1.1 pkgsrc/misc/libreoffice4/PLIST.debug
diff -r1.18 -r1.19 pkgsrc/misc/libreoffice4/distinfo
diff -r1.6 -r1.7 pkgsrc/misc/libreoffice4/options.mk
diff -r1.4 -r1.5 pkgsrc/misc/libreoffice4/patches/patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx
diff -r1.4 -r1.5 pkgsrc/misc/libreoffice4/patches/patch-configure.ac
cvs diff -r1.31 -r1.32 pkgsrc/misc/libreoffice4/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/libreoffice4/Attic/Makefile 2014/06/18 09:28:16 1.31
+++ pkgsrc/misc/libreoffice4/Attic/Makefile 2014/06/22 23:59:35 1.32
@@ -1,43 +1,41 @@ @@ -1,43 +1,41 @@
1# $NetBSD: Makefile,v 1.31 2014/06/18 09:28:16 wiz Exp $ 1# $NetBSD: Makefile,v 1.32 2014/06/22 23:59:35 ryoon Exp $
2 2
3VER= 4.2.4.2 3VER= 4.2.4.2
4DISTNAME= libreoffice-${VER} 4DISTNAME= libreoffice-${VER}
5PKGNAME= libreoffice4-${VER} 5PKGNAME= libreoffice4-${VER}
6PKGREVISION= 5 6PKGREVISION= 6
7CATEGORIES= misc 7CATEGORIES= misc
8MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/4.2.4/ 8MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/4.2.4/
9EXTRACT_SUFX= .tar.xz 9EXTRACT_SUFX= .tar.xz
10 10
11MAINTAINER= ryoon@NetBSD.org 11MAINTAINER= ryoon@NetBSD.org
12HOMEPAGE= http://www.libreoffice.org/ 12HOMEPAGE= http://www.libreoffice.org/
13COMMENT= Office productivity suite, 4.x branch 13COMMENT= Office productivity suite, 4.x branch
14LICENSE= gnu-lgpl-v3 14LICENSE= gnu-lgpl-v3
15 15
16# With -O2, when preference window is opened, soffice.bin crashes with SIGFPE. 16# With -O2, when preference window is opened, soffice.bin crashes with SIGFPE.
17.include "../../mk/bsd.prefs.mk" 17.include "../../mk/bsd.prefs.mk"
18.if !empty(MACHINE_PLATFORM:MNetBSD-5.*) 18.if !empty(MACHINE_PLATFORM:MNetBSD-5.*)
19BUILDLINK_TRANSFORM+= rename:-O2:-O 19BUILDLINK_TRANSFORM+= rename:-O2:-O
20.endif 20.endif
21 21
22# LibreOfice's Makefile has its own pararell build mechanism. Avoid conflict. 22# LibreOfice's Makefile has its own pararell build mechanism. Avoid conflict.
23MAKE_JOBS_SAFE= no 23MAKE_JOBS_SAFE= no
24 24
25CHECK_SHLIBS_SUPPORTED= no 25CHECK_SHLIBS_SUPPORTED= no
26 26
27DIST_SUBDIR= libreoffice 27DIST_SUBDIR= libreoffice
28 28
29PYTHON_VERSIONS_ACCEPTED= 33 
30 
31LO_BOOTSTRAP= ${DISTNAME} 29LO_BOOTSTRAP= ${DISTNAME}
32LO_COMPONENTS= dictionaries help translations 30LO_COMPONENTS= dictionaries help translations
33 31
34DISTFILES+= ${LO_BOOTSTRAP}${EXTRACT_SUFX} 32DISTFILES+= ${LO_BOOTSTRAP}${EXTRACT_SUFX}
35EXTRACT_ONLY= ${LO_BOOTSTRAP}${EXTRACT_SUFX} 33EXTRACT_ONLY= ${LO_BOOTSTRAP}${EXTRACT_SUFX}
36 34
37.for component in ${LO_COMPONENTS} 35.for component in ${LO_COMPONENTS}
38DISTFILES+= libreoffice-${component}-${VER}.tar.xz 36DISTFILES+= libreoffice-${component}-${VER}.tar.xz
39EXTRACT_ONLY+= libreoffice-${component}-${VER}.tar.xz 37EXTRACT_ONLY+= libreoffice-${component}-${VER}.tar.xz
40.endfor 38.endfor
41 39
42MORE_DISTFILES= \ 40MORE_DISTFILES= \
43 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz \ 41 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz \
@@ -188,26 +186,31 @@ CONFIGURE_SCRIPT= ./autogen.sh @@ -188,26 +186,31 @@ CONFIGURE_SCRIPT= ./autogen.sh
188#LD_LIBRARY_PATH+= ${WRKSRC}/instdir/sdk/lib:${WRKSRC}/instdir/ure/lib:${WRKSRC}/instdir/program 186#LD_LIBRARY_PATH+= ${WRKSRC}/instdir/sdk/lib:${WRKSRC}/instdir/ure/lib:${WRKSRC}/instdir/program
189 187
190MAKE_ENV+= ROOT_USER=${ROOT_USER} 188MAKE_ENV+= ROOT_USER=${ROOT_USER}
191MAKE_ENV+= ROOT_GROUP=${ROOT_GROUP} 189MAKE_ENV+= ROOT_GROUP=${ROOT_GROUP}
192MAKE_ENV+= SHELL=${BASH} 190MAKE_ENV+= SHELL=${BASH}
193#MAKE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH} 191#MAKE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
194BUILD_MAKE_FLAGS+= VERBOSE=true 192BUILD_MAKE_FLAGS+= VERBOSE=true
195#BUILD_MAKE_FLAGS+= GMAKE_OPTIONS+=-p 193#BUILD_MAKE_FLAGS+= GMAKE_OPTIONS+=-p
196 194
197BUILDLINK_TRANSFORM+= rm:-ldl 195BUILDLINK_TRANSFORM+= rm:-ldl
198 196
199INSTALLATION_DIRS= bin share/applications 197INSTALLATION_DIRS= bin share/applications
200 198
 199.PHONY: debugrun
 200# For debugging
 201debugrun:
 202 cd ${WRKSRC} && gmake debugrun
 203
201post-extract: 204post-extract:
202 ${MKDIR} -p ${WRKSRC}/src 205 ${MKDIR} -p ${WRKSRC}/src
203.for md in ${MORE_DISTFILES} 206.for md in ${MORE_DISTFILES}
204 ${LN} -s ${DISTDIR}/${DIST_SUBDIR}/${md} ${WRKSRC}/src/${md} 207 ${LN} -s ${DISTDIR}/${DIST_SUBDIR}/${md} ${WRKSRC}/src/${md}
205.endfor 208.endfor
206 mkdir ${WRKSRC}/tmp 209 mkdir ${WRKSRC}/tmp
207 210
208do-install: 211do-install:
209 cd ${WRKSRC} && make DESTDIR="${DESTDIR}" install 212 cd ${WRKSRC} && make DESTDIR="${DESTDIR}" install
210# make install cleans ${DESTDIR}${PREFIX}/*, so bin etc. are removed. 213# make install cleans ${DESTDIR}${PREFIX}/*, so bin etc. are removed.
211.for d in ${INSTALLATION_DIRS} 214.for d in ${INSTALLATION_DIRS}
212 cd ${DESTDIR}${PREFIX} && \ 215 cd ${DESTDIR}${PREFIX} && \
213 ${MKDIR} ${d} 216 ${MKDIR} ${d}
File Added: pkgsrc/misc/libreoffice4/Attic/PLIST.debug
@comment $NetBSD: PLIST.debug,v 1.1 2014/06/22 23:59:35 ryoon Exp $
${PKGNAME}/program/resource/abpqtz.res
${PKGNAME}/program/resource/accqtz.res
${PKGNAME}/program/resource/analysisqtz.res
${PKGNAME}/program/resource/avmediaqtz.res
${PKGNAME}/program/resource/basctlqtz.res
${PKGNAME}/program/resource/bibqtz.res
${PKGNAME}/program/resource/chartcontrollerqtz.res
${PKGNAME}/program/resource/cnrqtz.res
${PKGNAME}/program/resource/cuiqtz.res
${PKGNAME}/program/resource/dateqtz.res
${PKGNAME}/program/resource/dbaqtz.res
${PKGNAME}/program/resource/dbmmqtz.res
${PKGNAME}/program/resource/dbpqtz.res
${PKGNAME}/program/resource/dbuqtz.res
${PKGNAME}/program/resource/dbwqtz.res
${PKGNAME}/program/resource/deploymentguiqtz.res
${PKGNAME}/program/resource/deploymentqtz.res
${PKGNAME}/program/resource/dktqtz.res
${PKGNAME}/program/resource/editengqtz.res
${PKGNAME}/program/resource/epsqtz.res
${PKGNAME}/program/resource/eurqtz.res
${PKGNAME}/program/resource/forqtz.res
${PKGNAME}/program/resource/foruiqtz.res
${PKGNAME}/program/resource/fps_officeqtz.res
${PKGNAME}/program/resource/frmqtz.res
${PKGNAME}/program/resource/fweqtz.res
${PKGNAME}/program/resource/galqtz.res
${PKGNAME}/program/resource/impqtz.res
${PKGNAME}/program/resource/ofaqtz.res
${PKGNAME}/program/resource/pcrqtz.res
${PKGNAME}/program/resource/pdffilterqtz.res
${PKGNAME}/program/resource/pricingqtz.res
${PKGNAME}/program/resource/rptqtz.res
${PKGNAME}/program/resource/rptuiqtz.res
${PKGNAME}/program/resource/sbqtz.res
${PKGNAME}/program/resource/scnqtz.res
${PKGNAME}/program/resource/scqtz.res
${PKGNAME}/program/resource/sdbclqtz.res
${PKGNAME}/program/resource/sdberrqtz.res
${PKGNAME}/program/resource/sdbtqtz.res
${PKGNAME}/program/resource/sdqtz.res
${PKGNAME}/program/resource/sfxqtz.res
${PKGNAME}/program/resource/smqtz.res
${PKGNAME}/program/resource/solverqtz.res
${PKGNAME}/program/resource/spaqtz.res
${PKGNAME}/program/resource/svlqtz.res
${PKGNAME}/program/resource/svtqtz.res
${PKGNAME}/program/resource/svxqtz.res
${PKGNAME}/program/resource/swqtz.res
${PKGNAME}/program/resource/t602filterqtz.res
${PKGNAME}/program/resource/textconversiondlgsqtz.res
${PKGNAME}/program/resource/tplqtz.res
${PKGNAME}/program/resource/updqtz.res
${PKGNAME}/program/resource/uuiqtz.res
${PKGNAME}/program/resource/vclqtz.res
${PKGNAME}/program/resource/wziqtz.res
${PKGNAME}/program/resource/xmlsecqtz.res
${PKGNAME}/program/resource/xsltdlgqtz.res
${PKGNAME}/readmes/README_qtz
${PKGNAME}/share/config/images_tango_testing.zip
${PKGNAME}/share/config/soffice.cfg/cui/ui/res/qtz.zip
${PKGNAME}/share/config/soffice.cfg/dbaccess/ui/res/qtz.zip
${PKGNAME}/share/config/soffice.cfg/desktop/ui/res/qtz.zip
${PKGNAME}/share/config/soffice.cfg/filter/ui/res/qtz.zip
${PKGNAME}/share/config/soffice.cfg/modules/BasicIDE/ui/res/qtz.zip
${PKGNAME}/share/config/soffice.cfg/modules/scalc/ui/res/qtz.zip
${PKGNAME}/share/config/soffice.cfg/modules/schart/ui/res/qtz.zip
${PKGNAME}/share/config/soffice.cfg/modules/sdraw/ui/res/qtz.zip
${PKGNAME}/share/config/soffice.cfg/modules/simpress/ui/res/qtz.zip
${PKGNAME}/share/config/soffice.cfg/modules/smath/ui/res/qtz.zip
${PKGNAME}/share/config/soffice.cfg/modules/swriter/ui/res/qtz.zip
${PKGNAME}/share/config/soffice.cfg/sfx/ui/res/qtz.zip
${PKGNAME}/share/config/soffice.cfg/spa/ui/res/qtz.zip
${PKGNAME}/share/config/soffice.cfg/svt/ui/res/qtz.zip
${PKGNAME}/share/config/soffice.cfg/svx/ui/res/qtz.zip
${PKGNAME}/share/config/soffice.cfg/uui/ui/res/qtz.zip
${PKGNAME}/share/config/soffice.cfg/vcl/ui/res/qtz.zip
${PKGNAME}/share/config/soffice.cfg/xmlsec/ui/res/qtz.zip
${PKGNAME}/share/extensions/dict-en/dialog/en_qtz.properties
${PKGNAME}/share/extensions/dict-hu/dialog/hu_HU_qtz.properties
${PKGNAME}/share/extensions/dict-ru/dialog/ru_RU_qtz.properties
${PKGNAME}/share/registry/Langpack-qtz.xcd
${PKGNAME}/share/registry/res/fcfg_langpack_qtz.xcd
${PKGNAME}/share/registry/res/registry_qtz.xcd
@pkgdir ${PKGNAME}/share/autotext/qtz
cvs diff -r1.18 -r1.19 pkgsrc/misc/libreoffice4/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/libreoffice4/Attic/distinfo 2014/06/03 03:21:39 1.18
+++ pkgsrc/misc/libreoffice4/Attic/distinfo 2014/06/22 23:59:35 1.19
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.18 2014/06/03 03:21:39 ryoon Exp $ 1$NetBSD: distinfo,v 1.19 2014/06/22 23:59:35 ryoon Exp $
2 2
3SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093 3SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
4RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b 4RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
5Size (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 96939 bytes 5Size (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 96939 bytes
6SHA1 (libreoffice/0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz) = 66ed8eac9bac2a23ba9e3a3b3d560609fa3acc25 6SHA1 (libreoffice/0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz) = 66ed8eac9bac2a23ba9e3a3b3d560609fa3acc25
7RMD160 (libreoffice/0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz) = 45c0fd5f41e82691dcdebdda87da78b0af529066 7RMD160 (libreoffice/0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz) = 45c0fd5f41e82691dcdebdda87da78b0af529066
8Size (libreoffice/0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz) = 102916 bytes 8Size (libreoffice/0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz) = 102916 bytes
9SHA1 (libreoffice/05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2) = 4e90cefad975ef2f1f92e43ba899629ed3b829f8 9SHA1 (libreoffice/05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2) = 4e90cefad975ef2f1f92e43ba899629ed3b829f8
10RMD160 (libreoffice/05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2) = 8e6c7ac95a134218eea626aabf12d5db258347b2 10RMD160 (libreoffice/05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2) = 8e6c7ac95a134218eea626aabf12d5db258347b2
11Size (libreoffice/05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2) = 443589 bytes 11Size (libreoffice/05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2) = 443589 bytes
12SHA1 (libreoffice/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz) = 28d4ec24dfda4eb41b6ceaa0cfcfca41b578f3b3 12SHA1 (libreoffice/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz) = 28d4ec24dfda4eb41b6ceaa0cfcfca41b578f3b3
13RMD160 (libreoffice/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz) = e99bb5017c29657c3303d8810e21bf02d737c345 13RMD160 (libreoffice/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz) = e99bb5017c29657c3303d8810e21bf02d737c345
14Size (libreoffice/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz) = 315122 bytes 14Size (libreoffice/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz) = 315122 bytes
@@ -128,28 +128,28 @@ RMD160 (libreoffice/libreoffice-4.2.4.2. @@ -128,28 +128,28 @@ RMD160 (libreoffice/libreoffice-4.2.4.2.
128Size (libreoffice/libreoffice-4.2.4.2.tar.xz) = 123378868 bytes 128Size (libreoffice/libreoffice-4.2.4.2.tar.xz) = 123378868 bytes
129SHA1 (libreoffice/libreoffice-dictionaries-4.2.4.2.tar.xz) = 54e0e2af302a4418d7b5ebe65594694b52e5e1cd 129SHA1 (libreoffice/libreoffice-dictionaries-4.2.4.2.tar.xz) = 54e0e2af302a4418d7b5ebe65594694b52e5e1cd
130RMD160 (libreoffice/libreoffice-dictionaries-4.2.4.2.tar.xz) = 3d1f0e61c4c662c51a8838e3375a4eef3c1b1c7f 130RMD160 (libreoffice/libreoffice-dictionaries-4.2.4.2.tar.xz) = 3d1f0e61c4c662c51a8838e3375a4eef3c1b1c7f
131Size (libreoffice/libreoffice-dictionaries-4.2.4.2.tar.xz) = 37216212 bytes 131Size (libreoffice/libreoffice-dictionaries-4.2.4.2.tar.xz) = 37216212 bytes
132SHA1 (libreoffice/libreoffice-help-4.2.4.2.tar.xz) = a0fbe4d143969e9e9ca628782083f8525ffb69e5 132SHA1 (libreoffice/libreoffice-help-4.2.4.2.tar.xz) = a0fbe4d143969e9e9ca628782083f8525ffb69e5
133RMD160 (libreoffice/libreoffice-help-4.2.4.2.tar.xz) = 2dd7ea480b88d89401a21b1f20895444557e778e 133RMD160 (libreoffice/libreoffice-help-4.2.4.2.tar.xz) = 2dd7ea480b88d89401a21b1f20895444557e778e
134Size (libreoffice/libreoffice-help-4.2.4.2.tar.xz) = 1855080 bytes 134Size (libreoffice/libreoffice-help-4.2.4.2.tar.xz) = 1855080 bytes
135SHA1 (libreoffice/libreoffice-translations-4.2.4.2.tar.xz) = 6c1849e270189b88b40583890820d915b4998fb9 135SHA1 (libreoffice/libreoffice-translations-4.2.4.2.tar.xz) = 6c1849e270189b88b40583890820d915b4998fb9
136RMD160 (libreoffice/libreoffice-translations-4.2.4.2.tar.xz) = 4c05f13af991c601ac2c98c073aa4a8251e69bd5 136RMD160 (libreoffice/libreoffice-translations-4.2.4.2.tar.xz) = 4c05f13af991c601ac2c98c073aa4a8251e69bd5
137Size (libreoffice/libreoffice-translations-4.2.4.2.tar.xz) = 127819696 bytes 137Size (libreoffice/libreoffice-translations-4.2.4.2.tar.xz) = 127819696 bytes
138SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__intel_except.cxx) = b7eb550e24f6fa5ff5a6c4121836803360a0883f 138SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__intel_except.cxx) = b7eb550e24f6fa5ff5a6c4121836803360a0883f
139SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx) = 5e02fb3bf5b446ed705b1ca4d6e38d9d3dbd73b6 139SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx) = 5e02fb3bf5b446ed705b1ca4d6e38d9d3dbd73b6
140SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__intel_uno2cpp.cxx) = b01d697451973a873247a370ebec2cd5c3a8029d 140SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__intel_uno2cpp.cxx) = b01d697451973a873247a370ebec2cd5c3a8029d
141SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx) = 2becfe2404078ad6729c236dcc39994dc277eca6 141SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx) = de4e7978cd364d3aff5d1495199f60759c53380e
142SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_uno2cpp.cxx) = 5022ad96533aa1681e6fab323cadf803281a6c17 142SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_uno2cpp.cxx) = 5022ad96533aa1681e6fab323cadf803281a6c17
143SHA1 (patch-configure.ac) = 63ebfaae5d119dad6ce87d221fc71598b25f0b93 143SHA1 (patch-configure.ac) = 181d1b37eebe892cb0999d55c0d0de0ce286a332
144SHA1 (patch-connectivity_source_parse_sqlbison.y) = 2dd006e2a039a4dddaca4357466bb45f3a1e0cd1 144SHA1 (patch-connectivity_source_parse_sqlbison.y) = 2dd006e2a039a4dddaca4357466bb45f3a1e0cd1
145SHA1 (patch-i18npool_CustomTarget__collator.mk) = 8d5304470e47f48e0febdbe0072bf99016334828 145SHA1 (patch-i18npool_CustomTarget__collator.mk) = 8d5304470e47f48e0febdbe0072bf99016334828
146SHA1 (patch-i18npool_Library__collator__data.mk) = a50574288ed7d6ad0bf45b6f0c30ad63a4043721 146SHA1 (patch-i18npool_Library__collator__data.mk) = a50574288ed7d6ad0bf45b6f0c30ad63a4043721
147SHA1 (patch-i18npool_source_collator_collator__unicode.cxx) = 45bc3209137f9ddd2216181fc9a52a80c87cb243 147SHA1 (patch-i18npool_source_collator_collator__unicode.cxx) = 45bc3209137f9ddd2216181fc9a52a80c87cb243
148SHA1 (patch-i18npool_source_collator_data_zh__TW__charset.txt) = 7631d523dd1e0f0eeeed546ba355c54392fd7eb2 148SHA1 (patch-i18npool_source_collator_data_zh__TW__charset.txt) = 7631d523dd1e0f0eeeed546ba355c54392fd7eb2
149SHA1 (patch-odk_CustomTarget__classes.mk) = 991896c402d1d2505e5aacec5df78439c8e9a767 149SHA1 (patch-odk_CustomTarget__classes.mk) = 991896c402d1d2505e5aacec5df78439c8e9a767
150SHA1 (patch-solenv_gbuild_AllLangResTarget.mk) = c6fa51c74e3be0e9d4f18e1481039d44d6c3db98 150SHA1 (patch-solenv_gbuild_AllLangResTarget.mk) = c6fa51c74e3be0e9d4f18e1481039d44d6c3db98
151SHA1 (patch-solenv_gbuild_Deliver.mk) = 07ffb548a24edfe64fcf370423a2124c7a32cafb 151SHA1 (patch-solenv_gbuild_Deliver.mk) = 07ffb548a24edfe64fcf370423a2124c7a32cafb
152SHA1 (patch-solenv_gbuild_Module.mk) = 78d57071ac2c884bb6406356f45db3c55b61c678 152SHA1 (patch-solenv_gbuild_Module.mk) = 78d57071ac2c884bb6406356f45db3c55b61c678
153SHA1 (patch-solenv_gbuild_platform_NETBSD__INTEL__GCC.mk) = a0c2490d0ed5186278778f62505f3e4dc63422cd 153SHA1 (patch-solenv_gbuild_platform_NETBSD__INTEL__GCC.mk) = a0c2490d0ed5186278778f62505f3e4dc63422cd
154SHA1 (patch-solenv_gbuild_platform_NETBSD__X86__64__GCC.mk) = a3afc8c8d82854f187ef455651b492ac801a63a0 154SHA1 (patch-solenv_gbuild_platform_NETBSD__X86__64__GCC.mk) = a3afc8c8d82854f187ef455651b492ac801a63a0
155SHA1 (patch-svtools_source_control_ctrlbox.cxx) = 6b6a99bcf78b3e4ae27cedc9adbbf29a7889b76b 155SHA1 (patch-svtools_source_control_ctrlbox.cxx) = 6b6a99bcf78b3e4ae27cedc9adbbf29a7889b76b
cvs diff -r1.6 -r1.7 pkgsrc/misc/libreoffice4/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/misc/libreoffice4/Attic/options.mk 2014/06/03 03:21:39 1.6
+++ pkgsrc/misc/libreoffice4/Attic/options.mk 2014/06/22 23:59:35 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.6 2014/06/03 03:21:39 ryoon Exp $ 1# $NetBSD: options.mk,v 1.7 2014/06/22 23:59:35 ryoon Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.libreoffice4 3PKG_OPTIONS_VAR= PKG_OPTIONS.libreoffice4
4PKG_SUPPORTED_OPTIONS= java debug kde4 gtk3 4PKG_SUPPORTED_OPTIONS= java debug kde4 gtk3
5 5
6.include "../../mk/bsd.prefs.mk" 6.include "../../mk/bsd.prefs.mk"
7.if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS" 7.if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS"
8PKG_SUGGESTED_OPTIONS= java 8PKG_SUGGESTED_OPTIONS= java
9.endif 9.endif
10 10
11.include "../../mk/bsd.options.mk" 11.include "../../mk/bsd.options.mk"
12 12
13PLIST_VARS+= java kde4 gtk3 13PLIST_VARS+= java kde4 gtk3
14 14
@@ -22,35 +22,36 @@ CONFIGURE_ARGS+= --with-ant-home=${ANTDI @@ -22,35 +22,36 @@ CONFIGURE_ARGS+= --with-ant-home=${ANTDI
22DEPENDS+= hsqldb18-[0-9]*:../../databases/hsqldb18 22DEPENDS+= hsqldb18-[0-9]*:../../databases/hsqldb18
23FIND_PREFIX+= HSQLDB_SYSDIR=hsqldb18 23FIND_PREFIX+= HSQLDB_SYSDIR=hsqldb18
24CONFIGURE_ARGS+= --with-hsqldb-jar=${HSQLDB_SYSDIR}/lib/java/hsqldb18/hsqldb.jar 24CONFIGURE_ARGS+= --with-hsqldb-jar=${HSQLDB_SYSDIR}/lib/java/hsqldb18/hsqldb.jar
25.include "../../mk/find-prefix.mk" 25.include "../../mk/find-prefix.mk"
26CONFIGURE_ARGS+= --enable-ext-wiki-publisher \ 26CONFIGURE_ARGS+= --enable-ext-wiki-publisher \
27 --with-java \ 27 --with-java \
28 --with-jdk-home=${PKG_JAVA_HOME} \ 28 --with-jdk-home=${PKG_JAVA_HOME} \
29 --without-system-beanshell \ 29 --without-system-beanshell \
30 --enable-scripting-beanshell \ 30 --enable-scripting-beanshell \
31 --disable-scripting-javascript \ 31 --disable-scripting-javascript \
32 --with-system-hsqldb 32 --with-system-hsqldb
33.include "../../mk/java-env.mk" 33.include "../../mk/java-env.mk"
34.include "../../mk/java-vm.mk" 34.include "../../mk/java-vm.mk"
35PLIST_SRC+= ${PLIST_SRC_DFLT:Q} PLIST.java 35PLIST_SRC+= ${PLIST_SRC_DFLT:Q} ${PKGDIR}/PLIST.java
36PLIST.java= yes 36PLIST.java= yes
37.else 37.else
38CONFIGURE_ARGS+= --without-java 38CONFIGURE_ARGS+= --without-java
39.endif 39.endif
40 40
41.if !empty(PKG_OPTIONS:Mdebug) 41.if !empty(PKG_OPTIONS:Mdebug)
42CONFIGURE_ARGS+= --enable-debug 42CONFIGURE_ARGS+= --enable-debug
43CONFIGURE_ARGS+= --enable-selective-debuginfo="all" 43CONFIGURE_ARGS+= --enable-selective-debuginfo="all"
 44PLIST_SRC= ${PLIST_SRC_DFLT:Q} ${PKGDIR}/PLIST.debug
44.else 45.else
45CONFIGURE_ARGS+= --enable-release-build 46CONFIGURE_ARGS+= --enable-release-build
46.endif 47.endif
47 48
48.if !empty(PKG_OPTIONS:Mgtk3) 49.if !empty(PKG_OPTIONS:Mgtk3)
49CONFIGURE_ARGS+= --enable-gtk3 50CONFIGURE_ARGS+= --enable-gtk3
50PLIST.gtk3= yes 51PLIST.gtk3= yes
51.include "../../x11/gtk3/buildlink3.mk" 52.include "../../x11/gtk3/buildlink3.mk"
52.else 53.else
53CONFIGURE_ARGS+= --disable-gtk3 54CONFIGURE_ARGS+= --disable-gtk3
54.endif 55.endif
55 56
56.if !empty(PKG_OPTIONS:Mkde4) 57.if !empty(PKG_OPTIONS:Mkde4)
cvs diff -r1.4 -r1.5 pkgsrc/misc/libreoffice4/patches/Attic/patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx (expand / switch to unified diff)

--- pkgsrc/misc/libreoffice4/patches/Attic/patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx 2014/06/01 14:31:08 1.4
+++ pkgsrc/misc/libreoffice4/patches/Attic/patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx 2014/06/22 23:59:36 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx,v 1.4 2014/06/01 14:31:08 ryoon Exp $ 1$NetBSD: patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx,v 1.5 2014/06/22 23:59:36 ryoon Exp $
2 2
3--- bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx.orig 2014-04-30 19:49:45.000000000 +0000 3--- bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx.orig 2014-04-30 19:49:45.000000000 +0000
4+++ bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx 4+++ bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
5@@ -31,6 +31,32 @@ 5@@ -31,6 +31,32 @@
6 #include "config_gcc.h" 6 #include "config_gcc.h"
7 #include "uno/mapping.h" 7 #include "uno/mapping.h"
8  8
9+#ifdef _LIBCPP_VERSION 9+#ifdef _LIBCPP_VERSION
10+ 10+
11+namespace __cxxabiv1 11+namespace __cxxabiv1
12+{ 12+{
13+ struct __class_type_info : public std::type_info 13+ struct __class_type_info : public std::type_info
14+ { 14+ {
@@ -25,35 +25,35 @@ $NetBSD: patch-bridges_source_cpp__uno_g @@ -25,35 +25,35 @@ $NetBSD: patch-bridges_source_cpp__uno_g
25+ }; 25+ };
26+ 26+
27+extern "C" void *__cxa_allocate_exception( std::size_t thrown_size ) _NOEXCEPT; 27+extern "C" void *__cxa_allocate_exception( std::size_t thrown_size ) _NOEXCEPT;
28+ 28+
29+extern "C" _LIBCPP_NORETURN void __cxa_throw( 29+extern "C" _LIBCPP_NORETURN void __cxa_throw(
30+ void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ); 30+ void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) );
31+} 31+}
32+ 32+
33+#else 33+#else
34+ 34+
35 namespace CPPU_CURRENT_NAMESPACE 35 namespace CPPU_CURRENT_NAMESPACE
36 { 36 {
37  37
38@@ -101,6 +127,9 @@ extern "C" void __cxa_throw( 38@@ -102,6 +128,9 @@ extern "C" void __cxa_throw(
39 __attribute__((noreturn)); 
40 } 39 }
41 #endif 40 #endif
42+ 41
43+ 42+
44+#endif 43+#endif
45  44+
46 namespace CPPU_CURRENT_NAMESPACE 45 namespace CPPU_CURRENT_NAMESPACE
47 { 46 {
 47
48@@ -110,7 +139,11 @@ void raiseException( 48@@ -110,7 +139,11 @@ void raiseException(
49 uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); 49 uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
50 //================================================================================================== 50 //==================================================================================================
51 void fillUnoException( 51 void fillUnoException(
52+#ifdef _LIBCPP_VERSION 52+#ifdef _LIBCPP_VERSION
53+ __cxxabiv1::__cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); 53+ __cxxabiv1::__cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
54+#else 54+#else
55 __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); 55 __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
56+#endif 56+#endif
57 } 57 }
58  58
59 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ 59 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
cvs diff -r1.4 -r1.5 pkgsrc/misc/libreoffice4/patches/Attic/patch-configure.ac (expand / switch to unified diff)

--- pkgsrc/misc/libreoffice4/patches/Attic/patch-configure.ac 2014/06/01 14:31:08 1.4
+++ pkgsrc/misc/libreoffice4/patches/Attic/patch-configure.ac 2014/06/22 23:59:36 1.5
@@ -1,39 +1,60 @@ @@ -1,39 +1,60 @@
1$NetBSD: patch-configure.ac,v 1.4 2014/06/01 14:31:08 ryoon Exp $ 1$NetBSD: patch-configure.ac,v 1.5 2014/06/22 23:59:36 ryoon Exp $
2 2
3* Improve portability, replace == with = 3* Improve portability, replace == with =
4* Detect pkgsrc apache-ant library 4* Detect pkgsrc apache-ant library
5* Fix installation directory 5* Fix installation directory
6 6
7--- configure.ac.orig 2014-04-30 19:49:45.000000000 +0000 7--- configure.ac.orig 2014-04-30 19:49:45.000000000 +0000
8+++ configure.ac 8+++ configure.ac
9@@ -611,6 +611,8 @@ aix*) 9@@ -611,6 +611,8 @@ aix*)
10  10
11 openbsd*) 11 openbsd*)
12 test_gtk=yes 12 test_gtk=yes
13+ build_gstreamer=yes 13+ build_gstreamer=yes
14+ build_gstreamer_0_10=yes 14+ build_gstreamer_0_10=yes
15 test_tde=yes 15 test_tde=yes
16 test_kde=yes 16 test_kde=yes
17 test_freetype=yes 17 test_freetype=yes
18@@ -6344,7 +6346,7 @@ if test \( "$_os" != "WINNT" -o "$WITH_M 18@@ -6344,7 +6346,7 @@ if test \( "$_os" != "WINNT" -o "$WITH_M
19  19
20 # Assume visibility is not broken with libc++. The below test is very much designed for libstdc++ 20 # Assume visibility is not broken with libc++. The below test is very much designed for libstdc++
21 # only. 21 # only.
22- if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE" -a "$CPP_LIBRARY" = GLIBCXX; then 22- if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE" -a "$CPP_LIBRARY" = GLIBCXX; then
23+ if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE" -a "$CPP_LIBRARY" = GLIBCXX -a "$COM_GCC_IS_CLANG" != "TRUE"; then 23+ if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE" -a "$CPP_LIBRARY" = GLIBCXX -a "$COM_GCC_IS_CLANG" != "TRUE"; then
24 dnl gcc#19664, gcc#22482, rhbz#162935 24 dnl gcc#19664, gcc#22482, rhbz#162935
25 AC_MSG_CHECKING([if STL headers are visibility safe (GCC bug 22482)]) 25 AC_MSG_CHECKING([if STL headers are visibility safe (GCC bug 22482)])
26 AC_EGREP_HEADER(visibility push, string, stlvisok=yes, stlvisok=no) 26 AC_EGREP_HEADER(visibility push, string, stlvisok=yes, stlvisok=no)
 27@@ -7986,7 +7988,7 @@ no|disable)
 28 else
 29 # Unset variables set by the above AM_PATH_PYTHON so that
 30 # we actually do check anew.
 31- unset PYTHON am_cv_pathless_PYTHON ac_cv_path_PYTHON am_cv_python_version am_cv_python_platform am_cv_python_pythondir am_cv_python_pyexecdir
 32+ #unset PYTHON am_cv_pathless_PYTHON ac_cv_path_PYTHON am_cv_python_version am_cv_python_platform am_cv_python_pythondir am_cv_python_pyexecdir
 33 AM_PATH_PYTHON([3.3],, [:])
 34 if test "$PYTHON" = :; then
 35 AC_MSG_RESULT([internal])
 36@@ -8039,9 +8041,9 @@ if test $enable_python = system; then
 37 elif test "$cross_compiling" != yes; then
 38 # Unset variables set by the above AM_PATH_PYTHON so that
 39 # we actually do check anew.
 40- unset PYTHON am_cv_pathless_PYTHON ac_cv_path_PYTHON am_cv_python_version am_cv_python_platform am_cv_python_pythondir am_cv_python_pyexecdir
 41+ #unset PYTHON am_cv_pathless_PYTHON ac_cv_path_PYTHON am_cv_python_version am_cv_python_platform am_cv_python_pythondir am_cv_python_pyexecdir
 42 # This causes an error if no python command is found
 43- AM_PATH_PYTHON([3.3])
 44+ AM_PATH_PYTHON([2.6])
 45 python_include=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('INCLUDEPY'));"`
 46 python_version=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('VERSION'));"`
 47 python_libs=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBS'));"`
27@@ -8929,7 +8931,7 @@ SYSTEM_GENBRK= 48@@ -8929,7 +8931,7 @@ SYSTEM_GENBRK=
28 SYSTEM_GENCCODE= 49 SYSTEM_GENCCODE=
29 SYSTEM_GENCMN= 50 SYSTEM_GENCMN=
30  51
31-ICU_MAJOR=52 52-ICU_MAJOR=52
32+ICU_MAJOR=53 53+ICU_MAJOR=53
33 ICU_MINOR=1 54 ICU_MINOR=1
34 ICU_RECLASSIFIED_CLOSE_PARENTHESIS="YES" 55 ICU_RECLASSIFIED_CLOSE_PARENTHESIS="YES"
35 ICU_RECLASSIFIED_PREPEND_SET_EMPTY="YES" 56 ICU_RECLASSIFIED_PREPEND_SET_EMPTY="YES"
36@@ -9788,8 +9790,8 @@ if test -z "$PATCH"; then 57@@ -9788,8 +9790,8 @@ if test -z "$PATCH"; then
37 AC_MSG_ERROR([\"patch\" not found in \$PATH, install it]) 58 AC_MSG_ERROR([\"patch\" not found in \$PATH, install it])
38 fi 59 fi
39  60