cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use system cppunit to avoid problems during bulk builds

Browse Source
This commit is contained in:
robert 2014-11-08 11:14:23 +00:00
parent 0669cf9a30
commit b82b6d785a
4 changed files with 19 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editors/libreoffice/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.119 2014/10/12 17:43:31 robert Exp $
# $OpenBSD: Makefile,v 1.120 2014/11/08 11:14:23 robert Exp $
ONLY_FOR_ARCHS= amd64 i386
@ -18,7 +18,7 @@ PKGNAME-java= libreoffice-java-${VERSION}
CATEGORIES= editors productivity
DPB_PROPERTIES= parallel tag:kde3
REVISION-main= 0
REVISION-main= 1
EPOCH= 0
@ -75,7 +75,6 @@ DISTFILES+= ${EDISTFILES} \
a4e565e220b5de082c23995e256e3c12-dejavu-fonts-ttf-2.34.zip:0 \
a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip:0 \
aa5ca9d1ed1082890835afab26400a39-mdds_0.10.3.tar.bz2:0 \
ac4781e01619be13461bb2d562b94a7b-cppunit-1.13.1.tar.gz:0 \
ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip:0 \
ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2:0 \
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip:0 \
@ -145,6 +144,7 @@ BUILD_DEPENDS+= archivers/zip \
archivers/gtar \
databases/db/v4 \
devel/bison \
devel/cppunit \
devel/flex \
devel/gpatch \
devel/gperf \
@ -322,7 +322,7 @@ CONFIGURE_ARGS+=\
--without-gssapi \
--without-system-apache-commons \
--without-system-beanshell \
--without-system-cppunit \
--with-system-cppunit \
--without-system-hsqldb \
--without-system-jfreereport \
--without-system-libwpd \

2
editors/libreoffice/distinfo
View File

@ -26,7 +26,6 @@ SHA256 (libreoffice/a2f6010987e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz) = 7v/i
SHA256 (libreoffice/a4e565e220b5de082c23995e256e3c12-dejavu-fonts-ttf-2.34.zip) = 9rgGtKoOo2qNDyxG3NWvpnQ3c5MAJOVimAxM0PkjB5I=
SHA256 (libreoffice/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = dYI3dvtRqcUmr5BPFQOnr6qrkA+6g+2mT4pBBzckyHA=
SHA256 (libreoffice/aa5ca9d1ed1082890835afab26400a39-mdds_0.10.3.tar.bz2) = 2xCTLb5+m1ubP1E7yBZat+KcO/dXArPDz/9pVsUh4MI=
SHA256 (libreoffice/ac4781e01619be13461bb2d562b94a7b-cppunit-1.13.1.tar.gz) = poeLYC0nMOzGnwDQlacWLED62ej6PzVSTT1RKWJbDxU=
SHA256 (libreoffice/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip) = fSeX/p95p3AJch4/FPpKHewXptcGvck/hfHwHRJPq2Y=
SHA256 (libreoffice/ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2) = FsKNPHDyD2Yp+4ofw2Ngv0BNlNbqcca5hwd5L+Q5NBA=
SHA256 (libreoffice/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) = Iz9m6NJcXdlxcW1CACA6YSpAdklobvO1IHXQS0yd8N0=
@ -89,7 +88,6 @@ SIZE (libreoffice/a2f6010987e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz) = 636667
SIZE (libreoffice/a4e565e220b5de082c23995e256e3c12-dejavu-fonts-ttf-2.34.zip) = 5140387
SIZE (libreoffice/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 23150
SIZE (libreoffice/aa5ca9d1ed1082890835afab26400a39-mdds_0.10.3.tar.bz2) = 151389
SIZE (libreoffice/ac4781e01619be13461bb2d562b94a7b-cppunit-1.13.1.tar.gz) = 855746
SIZE (libreoffice/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip) = 2929311
SIZE (libreoffice/ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2) = 1080803
SIZE (libreoffice/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) = 743031

18
editors/libreoffice/patches/patch-unotest_Library_unotest_mk
View File

@ -1,18 +0,0 @@
$OpenBSD: patch-unotest_Library_unotest_mk,v 1.1 2014/11/02 17:49:19 robert Exp $
--- unotest/Library_unotest.mk.orig.port Sun Nov 2 18:20:35 2014
+++ unotest/Library_unotest.mk Sun Nov 2 18:44:17 2014
@@ -30,6 +30,14 @@ $(eval $(call gb_Library_use_externals,unotest,\
cppunit \
))
+$(eval $(call gb_Library_set_ldflags,unotest,\
+ -L$(WORKDIR)/LinkTarget/StaticLibrary \
+ -L$(INSTDIR)/sdk/lib \
+ -L$(INSTDIR)/ure/lib \
+ -L$(INSTDIR)/program \
+ -L$(WORKDIR)/LinkTarget/Library \
+))
+
$(eval $(call gb_Library_add_exception_objects,unotest,\
unotest/source/cpp/bootstrapfixturebase \
unotest/source/cpp/filters-test \

30
editors/libreoffice/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.33 2014/10/10 17:13:10 robert Exp $
@comment $OpenBSD: PLIST-main,v 1.34 2014/11/08 11:14:23 robert Exp $
%%SHARED%%
bin/libreoffice
bin/libreoffice${BV}
@ -2054,19 +2054,19 @@ lib/libreoffice/share/extensions/dict-fr/icon.png
lib/libreoffice/share/extensions/dict-fr/package-description.txt
lib/libreoffice/share/extensions/dict-fr/thes_fr.dat
lib/libreoffice/share/extensions/dict-fr/thes_fr.idx
lib/libreoffice/share/extensions/dict-uk/
lib/libreoffice/share/extensions/dict-uk/META-INF/
lib/libreoffice/share/extensions/dict-uk/META-INF/manifest.xml
lib/libreoffice/share/extensions/dict-uk/README_hyph_uk_UA.txt
lib/libreoffice/share/extensions/dict-uk/README_th_uk_UA.txt
lib/libreoffice/share/extensions/dict-uk/README_uk_UA.txt
lib/libreoffice/share/extensions/dict-uk/description.xml
lib/libreoffice/share/extensions/dict-uk/dictionaries.xcu
lib/libreoffice/share/extensions/dict-uk/hyph_uk_UA.dic
lib/libreoffice/share/extensions/dict-uk/th_uk_UA.dat
lib/libreoffice/share/extensions/dict-uk/th_uk_UA.idx
lib/libreoffice/share/extensions/dict-uk/uk_UA.aff
lib/libreoffice/share/extensions/dict-uk/uk_UA.dic
@comment lib/libreoffice/share/extensions/dict-uk/
@comment lib/libreoffice/share/extensions/dict-uk/META-INF/
@comment lib/libreoffice/share/extensions/dict-uk/META-INF/manifest.xml
@comment lib/libreoffice/share/extensions/dict-uk/README_hyph_uk_UA.txt
@comment lib/libreoffice/share/extensions/dict-uk/README_th_uk_UA.txt
@comment lib/libreoffice/share/extensions/dict-uk/README_uk_UA.txt
@comment lib/libreoffice/share/extensions/dict-uk/description.xml
@comment lib/libreoffice/share/extensions/dict-uk/dictionaries.xcu
@comment lib/libreoffice/share/extensions/dict-uk/hyph_uk_UA.dic
@comment lib/libreoffice/share/extensions/dict-uk/th_uk_UA.dat
@comment lib/libreoffice/share/extensions/dict-uk/th_uk_UA.idx
@comment lib/libreoffice/share/extensions/dict-uk/uk_UA.aff
@comment lib/libreoffice/share/extensions/dict-uk/uk_UA.dic
lib/libreoffice/share/extensions/package.txt
lib/libreoffice/share/filter/
lib/libreoffice/share/filter/oox-drawingml-adj-names
@ -3368,7 +3368,7 @@ lib/libreoffice/share/uno_packages/cache/uno_packages/
lib/libreoffice/share/wordbook/
lib/libreoffice/share/wordbook/en-GB.dic
lib/libreoffice/share/wordbook/en-US.dic
lib/libreoffice/share/wordbook/sl.dic
@comment lib/libreoffice/share/wordbook/sl.dic
lib/libreoffice/share/wordbook/technical.dic
lib/libreoffice/share/xdg/
lib/libreoffice/share/xdg/base.desktop