kpriv/pkgsrc-wip
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to a newer snapshot.

Browse source 
Among other fixes, the platform/netbsd.mk patch has been integrated
upstream and libadabas disabled on all platforms.
This commit is contained in:
Francois Tigeot 2011-06-15 17:20:20 +00:00 committed by Thomas Klausner
parent 589acaba17
commit cbd801ea2a
5 changed files with 70 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libreoffice/Makefile
View file

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.13 2011/06/15 11:53:44 ftigeot Exp $
# $NetBSD: Makefile,v 1.14 2011/06/15 17:20:20 ftigeot Exp $
VER= 2011-06-05
VER= 2011-06-15
DISTNAME= libreoffice-${VER}
PKGNAME= libreoffice-${VER:S/-//g}
CATEGORIES= misc
@ -128,11 +128,6 @@ REPLACE_PERL+= clone/impress/sd/res/webview/savepic.pl
REPLACE_PERL+= clone/impress/sd/res/webview/show.pl
REPLACE_PERL+= clone/impress/sd/res/webview/webview.pl
PLIST_VARS+= adabas
.if ${OPSYS} == "NetBSD"
PLIST.adabas= yes
.endif
LO_PROGRAMS= sbase scalc sdraw simpress smath soffice swriter
post-extract:

6
libreoffice/PLIST
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.6 2011/06/06 15:50:02 thomasklausner Exp $
@comment $NetBSD: PLIST,v 1.7 2011/06/15 17:20:20 ftigeot Exp $
bin/sbase
bin/scalc
bin/sdraw
@ -130,7 +130,6 @@ ${PKGNAME}/basis3.4/program/i18nsearch.uno.so
${PKGNAME}/basis3.4/program/kde-open-url
${PKGNAME}/basis3.4/program/libabplo.so
${PKGNAME}/basis3.4/program/libacclo.so
${PLIST.adabas}${PKGNAME}/basis3.4/program/libadabaslo.so
${PKGNAME}/basis3.4/program/libadabasuilo.so
${PKGNAME}/basis3.4/program/libanalysislo.so
${PKGNAME}/basis3.4/program/libanimcore.so
@ -198,7 +197,7 @@ ${PKGNAME}/basis3.4/program/libfwllo.so
${PKGNAME}/basis3.4/program/libfwmlo.so
${PKGNAME}/basis3.4/program/libguesslanglo.so
${PKGNAME}/basis3.4/program/libhelplinkerlo.so
${PKGNAME}/basis3.4/program/libhwp.so
${PKGNAME}/basis3.4/program/libhwplo.so
${PKGNAME}/basis3.4/program/libhyphenlo.so
${PKGNAME}/basis3.4/program/libi18nisolang1gcc3.so
${PKGNAME}/basis3.4/program/libi18npaperlo.so
@ -310,6 +309,7 @@ ${PKGNAME}/basis3.4/program/libvcllo.so
${PKGNAME}/basis3.4/program/libvclplug_genlo.so
${PKGNAME}/basis3.4/program/libvclplug_gtklo.so
${PKGNAME}/basis3.4/program/libvclplug_svplo.so
${PKGNAME}/basis3.4/program/libvisioimportlo.so
${PKGNAME}/basis3.4/program/libwpftlo.so
${PKGNAME}/basis3.4/program/libwpgimportlo.so
${PKGNAME}/basis3.4/program/libwriterfilterlo.so

120
libreoffice/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.9 2011/06/09 23:33:11 thomasklausner Exp $
$NetBSD: distinfo,v 1.10 2011/06/15 17:20:20 ftigeot Exp $
SHA1 (libreoffice/067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz) = 025d5d0d566a23ddb353495c116116c1088ba2e9
RMD160 (libreoffice/067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz) = aefa80476ef8340be84440b61f738f432da51c92
@ -36,66 +36,66 @@ Size (libreoffice/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2) = 38806
SHA1 (libreoffice/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz) = 6e836945719e137596df1ca82f0afa809e8a2e88
RMD160 (libreoffice/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz) = 6443438ddf0bb5cd277c96108aa2671213edf8df
Size (libreoffice/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz) = 547217 bytes
SHA1 (libreoffice/libreoffice-artwork-2011-06-05.tar.bz2) = 12556d53d7bc7657d05420f474642264ffdb94ae
RMD160 (libreoffice/libreoffice-artwork-2011-06-05.tar.bz2) = 26f6cbb17ce1771444626c09d6198d8fbc1ca751
Size (libreoffice/libreoffice-artwork-2011-06-05.tar.bz2) = 12940686 bytes
SHA1 (libreoffice/libreoffice-base-2011-06-05.tar.bz2) = ee7dede3871d564a5d2435dbd5fa092f95b3f2a7
RMD160 (libreoffice/libreoffice-base-2011-06-05.tar.bz2) = 9efa05eea2c50b93bda1218115de1308719a36cc
Size (libreoffice/libreoffice-base-2011-06-05.tar.bz2) = 1491498 bytes
SHA1 (libreoffice/libreoffice-bootstrap-2011-06-05.tar.bz2) = f2335f0cfce27d11d7d3dbafe89660e430183f99
RMD160 (libreoffice/libreoffice-bootstrap-2011-06-05.tar.bz2) = 357231dc6af402833b8bff276e49526f66230c29
Size (libreoffice/libreoffice-bootstrap-2011-06-05.tar.bz2) = 1639422 bytes
SHA1 (libreoffice/libreoffice-calc-2011-06-05.tar.bz2) = cc0d2611578c933138a62f2f4384708dd1670338
RMD160 (libreoffice/libreoffice-calc-2011-06-05.tar.bz2) = b43c108ba9aed8b35f4d991359b5e707112cf5f4
Size (libreoffice/libreoffice-calc-2011-06-05.tar.bz2) = 8290747 bytes
SHA1 (libreoffice/libreoffice-components-2011-06-05.tar.bz2) = 7e792cdc7abec715df61b72375dbcde173511b87
RMD160 (libreoffice/libreoffice-components-2011-06-05.tar.bz2) = 55d6e4269d422aead34579891e9ff24f69f90ce0
Size (libreoffice/libreoffice-components-2011-06-05.tar.bz2) = 4158593 bytes
SHA1 (libreoffice/libreoffice-extensions-2011-06-05.tar.bz2) = 250c370df71667ed5bf05dd1d14e3e9f46d8474d
RMD160 (libreoffice/libreoffice-extensions-2011-06-05.tar.bz2) = 7d0f748f7555c1abc08aa3a6ec2c2bcae1ab123e
Size (libreoffice/libreoffice-extensions-2011-06-05.tar.bz2) = 4106619 bytes
SHA1 (libreoffice/libreoffice-extras-2011-06-05.tar.bz2) = 6262596be78d03d477a95f7e2e1b901e3dbcc657
RMD160 (libreoffice/libreoffice-extras-2011-06-05.tar.bz2) = fd061edcc2cb212208ea6dcaf14b29b0079f2cd8
Size (libreoffice/libreoffice-extras-2011-06-05.tar.bz2) = 38429654 bytes
SHA1 (libreoffice/libreoffice-filters-2011-06-05.tar.bz2) = 754f7c072d23269d4baee3fb91396a014c62d676
RMD160 (libreoffice/libreoffice-filters-2011-06-05.tar.bz2) = 655dc84a76c7eb1334394e4ad513b55524554e53
Size (libreoffice/libreoffice-filters-2011-06-05.tar.bz2) = 11272162 bytes
SHA1 (libreoffice/libreoffice-help-2011-06-05.tar.bz2) = 058c0d9d3eebb47bb214df5114c486e2bc1fcb98
RMD160 (libreoffice/libreoffice-help-2011-06-05.tar.bz2) = b4450e7f9677f96faebd30e693c703136b97ea1b
Size (libreoffice/libreoffice-help-2011-06-05.tar.bz2) = 1423613 bytes
SHA1 (libreoffice/libreoffice-impress-2011-06-05.tar.bz2) = 48c776e7e2b9c8f2e4118c82cd256ba5fd5e3e08
RMD160 (libreoffice/libreoffice-impress-2011-06-05.tar.bz2) = a7f8f0592e2c9a0450c6005b5953eb7ab900effa
Size (libreoffice/libreoffice-impress-2011-06-05.tar.bz2) = 1928261 bytes
SHA1 (libreoffice/libreoffice-libs-core-2011-06-05.tar.bz2) = 8462be78791339f895c93e13d17f7668c283e73e
RMD160 (libreoffice/libreoffice-libs-core-2011-06-05.tar.bz2) = 78d785592174ee47f4697a78304e643886a5964c
Size (libreoffice/libreoffice-libs-core-2011-06-05.tar.bz2) = 12079471 bytes
SHA1 (libreoffice/libreoffice-libs-extern-2011-06-05.tar.bz2) = 3a6d13ca41813126bbe50804e1eaf99003526747
RMD160 (libreoffice/libreoffice-libs-extern-2011-06-05.tar.bz2) = a1e18281208ca8ff9d3464ccd33541963eb43e13
Size (libreoffice/libreoffice-libs-extern-2011-06-05.tar.bz2) = 548121 bytes
SHA1 (libreoffice/libreoffice-libs-extern-sys-2011-06-05.tar.bz2) = d009ccc5a903b760e8ee2175c03ca3cdbba4014c
RMD160 (libreoffice/libreoffice-libs-extern-sys-2011-06-05.tar.bz2) = f37d8fe71914ce5531045f73bf691d50b40aedcd
Size (libreoffice/libreoffice-libs-extern-sys-2011-06-05.tar.bz2) = 39884021 bytes
SHA1 (libreoffice/libreoffice-libs-gui-2011-06-05.tar.bz2) = 6a62e4b7133d76b407ee327260aea9095f5de3d1
RMD160 (libreoffice/libreoffice-libs-gui-2011-06-05.tar.bz2) = 910eee7224f96ed4cb48eede4e1000419cc45110
Size (libreoffice/libreoffice-libs-gui-2011-06-05.tar.bz2) = 8835115 bytes
SHA1 (libreoffice/libreoffice-postprocess-2011-06-05.tar.bz2) = f16e354b5088573e8a41dc2b96a3ee2a004a3e61
RMD160 (libreoffice/libreoffice-postprocess-2011-06-05.tar.bz2) = 1527ac23c06b944f8846050d2cda2785b2834a5f
Size (libreoffice/libreoffice-postprocess-2011-06-05.tar.bz2) = 24433 bytes
SHA1 (libreoffice/libreoffice-sdk-2011-06-05.tar.bz2) = fe32c8700c4abdf0282f88340ea88b22b0fe9d61
RMD160 (libreoffice/libreoffice-sdk-2011-06-05.tar.bz2) = 3af14622eb61f077f3facf61f02af80e319609cd
Size (libreoffice/libreoffice-sdk-2011-06-05.tar.bz2) = 1527897 bytes
SHA1 (libreoffice/libreoffice-testing-2011-06-05.tar.bz2) = db5d55c54b06446593935a003bd3a59f0509f9a1
RMD160 (libreoffice/libreoffice-testing-2011-06-05.tar.bz2) = 5627181119e5a42d12d0290a05b27a4b4fa6cb85
Size (libreoffice/libreoffice-testing-2011-06-05.tar.bz2) = 50246365 bytes
SHA1 (libreoffice/libreoffice-ure-2011-06-05.tar.bz2) = 098b5d077b89d3aa215af54cb56e746bf5c747ed
RMD160 (libreoffice/libreoffice-ure-2011-06-05.tar.bz2) = 44ab2ea076fc75ca996b4b2d7a8af6ec823bbc51
Size (libreoffice/libreoffice-ure-2011-06-05.tar.bz2) = 4893920 bytes
SHA1 (libreoffice/libreoffice-writer-2011-06-05.tar.bz2) = a3f5b7ee19c170e99a3a5eceb9914ef7cf4d52da
RMD160 (libreoffice/libreoffice-writer-2011-06-05.tar.bz2) = f1fbefeae356fca9db787c729407e7298ea3873c
Size (libreoffice/libreoffice-writer-2011-06-05.tar.bz2) = 5626190 bytes
SHA1 (libreoffice/libreoffice-artwork-2011-06-15.tar.bz2) = d8971679458db3126fdb89da64d1c2506f650c62
RMD160 (libreoffice/libreoffice-artwork-2011-06-15.tar.bz2) = a9244eed4538a961d383520462a1fc8e4f871b3b
Size (libreoffice/libreoffice-artwork-2011-06-15.tar.bz2) = 12914479 bytes
SHA1 (libreoffice/libreoffice-base-2011-06-15.tar.bz2) = c27a58b892f437d2d7495f550d4fea13a2165a7f
RMD160 (libreoffice/libreoffice-base-2011-06-15.tar.bz2) = a12ebd67ac1dc1c0c1f98373f857188ec4c2beb2
Size (libreoffice/libreoffice-base-2011-06-15.tar.bz2) = 1491577 bytes
SHA1 (libreoffice/libreoffice-bootstrap-2011-06-15.tar.bz2) = 038d6917f5d5964161002954657902cd8f90cd46
RMD160 (libreoffice/libreoffice-bootstrap-2011-06-15.tar.bz2) = ae620aedf5a3f77ecf2bef4eabf040bae43edaef
Size (libreoffice/libreoffice-bootstrap-2011-06-15.tar.bz2) = 1638214 bytes
SHA1 (libreoffice/libreoffice-calc-2011-06-15.tar.bz2) = fd43aceb775fa170e88f8af862c6f955de459251
RMD160 (libreoffice/libreoffice-calc-2011-06-15.tar.bz2) = 7143d10d973cd287dad223f1ab0a72b3c75f3d82
Size (libreoffice/libreoffice-calc-2011-06-15.tar.bz2) = 8292054 bytes
SHA1 (libreoffice/libreoffice-components-2011-06-15.tar.bz2) = 35a258b556030ba994ac567a3ae17b9ec6160f5a
RMD160 (libreoffice/libreoffice-components-2011-06-15.tar.bz2) = ec3bb3c47aea261b73c1e4374fba23d85120b4bb
Size (libreoffice/libreoffice-components-2011-06-15.tar.bz2) = 4151454 bytes
SHA1 (libreoffice/libreoffice-extensions-2011-06-15.tar.bz2) = 3d71c01351a9bb17498b1b373afd20560f0d826e
RMD160 (libreoffice/libreoffice-extensions-2011-06-15.tar.bz2) = c0324c464b0d9de142cd2234bf1260c033464561
Size (libreoffice/libreoffice-extensions-2011-06-15.tar.bz2) = 4107566 bytes
SHA1 (libreoffice/libreoffice-extras-2011-06-15.tar.bz2) = 2917a5e70a334e5def497b7d35b40dc85c8149eb
RMD160 (libreoffice/libreoffice-extras-2011-06-15.tar.bz2) = f3855cef12add7c590614ad70a0d9a3ac3a767c4
Size (libreoffice/libreoffice-extras-2011-06-15.tar.bz2) = 38428530 bytes
SHA1 (libreoffice/libreoffice-filters-2011-06-15.tar.bz2) = 9899c822bf7a422f8c5be80d1d44b3db4777742c
RMD160 (libreoffice/libreoffice-filters-2011-06-15.tar.bz2) = 7474577ce70226c2f6e3c22f0eb57815276c3eb8
Size (libreoffice/libreoffice-filters-2011-06-15.tar.bz2) = 11338142 bytes
SHA1 (libreoffice/libreoffice-help-2011-06-15.tar.bz2) = bc34eee1f4ed0a76da7077c10aeb16e28322a71f
RMD160 (libreoffice/libreoffice-help-2011-06-15.tar.bz2) = c94752f18ae5e3541566dba33eb7ced4adc57aa8
Size (libreoffice/libreoffice-help-2011-06-15.tar.bz2) = 1423464 bytes
SHA1 (libreoffice/libreoffice-impress-2011-06-15.tar.bz2) = 8724cf3458df4a73e5a588d8fd04dffafe6387c4
RMD160 (libreoffice/libreoffice-impress-2011-06-15.tar.bz2) = d74514669ee98f7a19ba6fc0cb9b9ffaedf2794c
Size (libreoffice/libreoffice-impress-2011-06-15.tar.bz2) = 1926199 bytes
SHA1 (libreoffice/libreoffice-libs-core-2011-06-15.tar.bz2) = 7766fa0932f36c773dbcff2578f6ec8867fb5c6e
RMD160 (libreoffice/libreoffice-libs-core-2011-06-15.tar.bz2) = 6daef2ba0901a0cf78c212d7f7e76f9548dd76de
Size (libreoffice/libreoffice-libs-core-2011-06-15.tar.bz2) = 12058889 bytes
SHA1 (libreoffice/libreoffice-libs-extern-2011-06-15.tar.bz2) = 76755c831c7ab3c4c779023e9f3c5c15a9e2a2a1
RMD160 (libreoffice/libreoffice-libs-extern-2011-06-15.tar.bz2) = 1416d63d8deca55ae42c146b86942737a42301fa
Size (libreoffice/libreoffice-libs-extern-2011-06-15.tar.bz2) = 551966 bytes
SHA1 (libreoffice/libreoffice-libs-extern-sys-2011-06-15.tar.bz2) = fc038437bd0ddd3f5c265b113d4e5fca461ddee1
RMD160 (libreoffice/libreoffice-libs-extern-sys-2011-06-15.tar.bz2) = e2cbea49a49b290afd94046473b2788b8f0d371e
Size (libreoffice/libreoffice-libs-extern-sys-2011-06-15.tar.bz2) = 39890467 bytes
SHA1 (libreoffice/libreoffice-libs-gui-2011-06-15.tar.bz2) = 9ef13d98481ab84ccea7e1f53128fc70a8eee9c7
RMD160 (libreoffice/libreoffice-libs-gui-2011-06-15.tar.bz2) = 755f029be4666126f613227eafbd6378db2c31dc
Size (libreoffice/libreoffice-libs-gui-2011-06-15.tar.bz2) = 8829163 bytes
SHA1 (libreoffice/libreoffice-postprocess-2011-06-15.tar.bz2) = 639c9562f4b4432949ae8f81222169480ac43524
RMD160 (libreoffice/libreoffice-postprocess-2011-06-15.tar.bz2) = 84584c781d48652fef4ee8068b86dd73d395807a
Size (libreoffice/libreoffice-postprocess-2011-06-15.tar.bz2) = 24420 bytes
SHA1 (libreoffice/libreoffice-sdk-2011-06-15.tar.bz2) = 7c2b220702e508f05e39e7a27378ea41fc388c21
RMD160 (libreoffice/libreoffice-sdk-2011-06-15.tar.bz2) = b5ca4dce97c8bc3cc2a4045ff9b7a84e6b166ac0
Size (libreoffice/libreoffice-sdk-2011-06-15.tar.bz2) = 1528093 bytes
SHA1 (libreoffice/libreoffice-testing-2011-06-15.tar.bz2) = a0263155e5177041725860c728f26be3b21e16b4
RMD160 (libreoffice/libreoffice-testing-2011-06-15.tar.bz2) = 61d2f5789cec09f9a518cebf2e413ef5dd9c6a44
Size (libreoffice/libreoffice-testing-2011-06-15.tar.bz2) = 50245690 bytes
SHA1 (libreoffice/libreoffice-ure-2011-06-15.tar.bz2) = 909b94f1aef0a390bbe8761cbbe028cefbad5b28
RMD160 (libreoffice/libreoffice-ure-2011-06-15.tar.bz2) = d7171ab50aafd2181d328be7f721518766b7d4c4
Size (libreoffice/libreoffice-ure-2011-06-15.tar.bz2) = 4895193 bytes
SHA1 (libreoffice/libreoffice-writer-2011-06-15.tar.bz2) = 6dc8c0c7d93020459755448599e1efa655c347ac
RMD160 (libreoffice/libreoffice-writer-2011-06-15.tar.bz2) = 312df0339f49534ef80b32ef32d8437c94165373
Size (libreoffice/libreoffice-writer-2011-06-15.tar.bz2) = 5635515 bytes
SHA1 (patch-clone_calc_sc_Module_sc.mk) = 8c381b5dbe014095eb9e118d09b8e6b433fcd28f
SHA1 (patch-clone_filters_lotuswordpro_Module_lotuswordpro.mk) = 2a6f457663efe8361e9a74002389d74a75e951dc
SHA1 (patch-clone_impress_sd_Module_sd.mk) = 975c8a47e5b11d8a28e14784515615e2118eccb7
SHA1 (patch-clone_writer_starmath_Module_starmath.mk) = c3398e08b4aca94fa7edcd41485b0abe1105e826
SHA1 (patch-clone_writer_starmath_Module_starmath.mk) = 2acd64f4b4871a840c86946232e2bb0981fe629f
SHA1 (patch-clone_writer_sw_Module_sw.mk) = 5472ad4d9fe56fd034b12a32596f32e51cce96be
SHA1 (patch-set_soenv.in) = 2397076ed3568a6fdfe9a4d2143d1a4112bf5ce9
SHA1 (patch-solenv-gbuild-platform-netbsd.mk) = c1a4c2b9a3a76350534232bc20ba7662b8eababb

8
libreoffice/patches/patch-clone_writer_starmath_Module_starmath.mk
View file

@ -1,14 +1,16 @@
$NetBSD: patch-clone_writer_starmath_Module_starmath.mk,v 1.1.1.1 2011/05/18 11:50:18 ftigeot Exp $
$NetBSD: patch-clone_writer_starmath_Module_starmath.mk,v 1.2 2011/06/15 17:20:21 ftigeot Exp $
--- clone/writer/starmath/Module_starmath.mk.orig 2011-05-11 12:24:36 +0000
--- clone/writer/starmath/Module_starmath.mk.orig 2011-06-14 15:12:29 +0000
+++ clone/writer/starmath/Module_starmath.mk
@@ -29,10 +29,6 @@ $(eval $(call gb_Module_add_targets,sm,\
@@ -29,12 +29,6 @@ $(eval $(call gb_Module_add_targets,sm,\
Package_uiconfig \
))
-ifneq ($(OS),OPENBSD)
-$(eval $(call gb_Module_add_check_targets,sm,\
- CppunitTest_starmath_qa_cppunit \
-))
-endif
-
$(eval $(call gb_Module_add_subsequentcheck_targets,sm,\
JunitTest_starmath_unoapi \

12
libreoffice/patches/patch-solenv-gbuild-platform-netbsd.mk
View file

@ -1,12 +0,0 @@
$NetBSD: patch-solenv-gbuild-platform-netbsd.mk,v 1.1 2011/06/09 23:33:11 thomasklausner Exp $
--- solenv/gbuild/platform/netbsd.mk.orig 2011-05-22 09:36:09.000000000 +0000
+++ solenv/gbuild/platform/netbsd.mk
@@ -40,6 +40,6 @@ gb_COMPILERDEFAULTOPTFLAGS := -O2
include $(GBUILDDIR)/platform/unxgcc.mk
-gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib:/usr/pkg/lib
+gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib:/usr/pkg/lib:/usr/X11R7/lib
# vim: set noet sw=4: