diff options
| author | wiz <wiz> | 2014-08-16 12:05:45 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2014-08-16 12:05:45 +0000 |
| commit | ff8232881e1f160c0692b8e4bb2fe2524ac2be1f (patch) | |
| tree | 0a369f75d17006824d982dead4016641115851a8 /misc/libreoffice4/Makefile | |
| parent | fdf8d1eb903caaf0c00280e2df56bce315373001 (diff) | |
| download | pkgsrc-ff8232881e1f160c0692b8e4bb2fe2524ac2be1f.tar.gz | |
Switch to libreoffice's version of boost (1.54.0) to make it build again.
(1.56.0 broke the build.)
Also disable pkgsrc mdds because that pulls in boost as well.
Bump PKGREVISION.
Diffstat (limited to 'misc/libreoffice4/Makefile')
| -rw-r--r-- | misc/libreoffice4/Makefile | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/misc/libreoffice4/Makefile b/misc/libreoffice4/Makefile index 1ae55f5c688..d9bd1a0951b 100644 --- a/misc/libreoffice4/Makefile +++ b/misc/libreoffice4/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.37 2014/08/13 10:57:37 adam Exp $ +# $NetBSD: Makefile,v 1.38 2014/08/16 12:05:45 wiz Exp $ VERREL= 4.2.5 VERRC= 2 VER= ${VERREL}.${VERRC} DISTNAME= libreoffice-${VER} PKGNAME= libreoffice4-${VER} -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= misc MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/${VERREL}/ EXTRACT_SUFX= .tar.xz @@ -57,6 +57,8 @@ MORE_DISTFILES= \ 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip \ 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz \ 46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz \ + 15cb8c0803064faef0c4ddf5bc5ca279-boost_1_54_0.tar.bz2 \ + aa5ca9d1ed1082890835afab26400a39-mdds_0.10.3.tar.bz2 \ 36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 \ 7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz \ 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip \ @@ -162,7 +164,11 @@ CONFIGURE_ARGS+= --with-fonts CONFIGURE_ARGS+= --with-lang="ALL" CONFIGURE_ARGS+= --with-myspell-dicts CONFIGURE_ARGS+= --with-parallelism=${MAKE_JOBS:Q} -CONFIGURE_ARGS+= --with-boost-libdir=${BUILDLINK_PREFIX.boost-libs}/lib +# needs fixes for boost-1.56.0 +#CONFIGURE_ARGS+= --with-boost-libdir=${BUILDLINK_PREFIX.boost-libs}/lib +CONFIGURE_ARGS+= --without-system-boost +# also pulls in boost +CONFIGURE_ARGS+= --without-system-mdds CONFIGURE_ARGS+= --with-system-libs CONFIGURE_ARGS+= --with-system-dicts # internal vigra should be used because only header files are used. @@ -199,7 +205,6 @@ REPLACE_PERL= sd/res/webview/editpic.pl REPLACE_PERL+= sd/res/webview/poll.pl REPLACE_PERL+= sd/res/webview/savepic.pl REPLACE_PERL+= sd/res/webview/show.pl -REPLACE_PERL+= sd/res/webview/webview.pl LO_PROGRAMS= sbase scalc sdraw simpress smath soffice swriter # Base depends on java, we don't install the icon @@ -256,12 +261,12 @@ post-install: .include "../../databases/shared-mime-info/buildlink3.mk" .include "../../databases/unixodbc/buildlink3.mk" .include "../../mk/pgsql.buildlink3.mk" -.include "../../devel/boost-libs/buildlink3.mk" +#.include "../../devel/boost-libs/buildlink3.mk" .include "../../devel/cppunit/buildlink3.mk" .include "../../devel/gperf/buildlink3.mk" .include "../../devel/libexecinfo/buildlink3.mk" .include "../../devel/liblangtag/buildlink3.mk" -.include "../../devel/mdds/buildlink3.mk" +#.include "../../devel/mdds/buildlink3.mk" .include "../../devel/nss/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" |