diff options
| author | wiz <wiz@pkgsrc.org> | 2016-02-13 08:46:02 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2016-02-13 08:46:02 +0000 |
| commit | 249e720c9538014e33a3c7c074ca08b757e76377 (patch) | |
| tree | 0d791bdcb42a0d1f36d6f419be7b24e0bdc4ac40 /misc/libreoffice | |
| parent | c11c4b97ed3f1939a7ef64f4f8f55fb9208ebf78 (diff) | |
| download | pkgsrc-249e720c9538014e33a3c7c074ca08b757e76377.tar.gz | |
Add patches for allowing mdds-1.0 to be detected.
Bump PKGREVISION.
Diffstat (limited to 'misc/libreoffice')
| -rw-r--r-- | misc/libreoffice/Makefile | 3 | ||||
| -rw-r--r-- | misc/libreoffice/distinfo | 4 | ||||
| -rw-r--r-- | misc/libreoffice/patches/patch-configure.ac | 14 |
3 files changed, 17 insertions, 4 deletions
diff --git a/misc/libreoffice/Makefile b/misc/libreoffice/Makefile index d048df5d0d0..b93372f1650 100644 --- a/misc/libreoffice/Makefile +++ b/misc/libreoffice/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.72 2016/02/11 09:45:26 ryoon Exp $ +# $NetBSD: Makefile,v 1.73 2016/02/13 08:46:02 wiz Exp $ VERREL= 5.1.0 VERRC= 3 VER= ${VERREL}.${VERRC} DISTNAME= libreoffice-${VER} +PKGREVISION= 1 CATEGORIES= misc MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/${VERREL}/ EXTRACT_SUFX= .tar.xz diff --git a/misc/libreoffice/distinfo b/misc/libreoffice/distinfo index ec857937b86..997da1819b9 100644 --- a/misc/libreoffice/distinfo +++ b/misc/libreoffice/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.16 2016/02/12 19:34:29 tnn Exp $ +$NetBSD: distinfo,v 1.17 2016/02/13 08:46:02 wiz Exp $ SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b @@ -169,7 +169,7 @@ RMD160 (libreoffice/libreoffice-translations-5.1.0.3.tar.xz) = e2c808300cb5d8d37 SHA512 (libreoffice/libreoffice-translations-5.1.0.3.tar.xz) = 156aee6cbcd65a5b375a7cc436adb094989a3b2ce1a3869b7f6504806c3bce00cecc8c4a8cbe17e3f37d5f416e2d2aeaf7b9635627f504bd292d49c9d34cc6af Size (libreoffice/libreoffice-translations-5.1.0.3.tar.xz) = 131527452 bytes SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx) = e3223111488a6ebabf66ae74c3b6c30095fd2294 -SHA1 (patch-configure.ac) = 590ede1fc2369171edc7703d25ae42d9f29b8b3b +SHA1 (patch-configure.ac) = fe603f79587b66fcd56f105330359526384e6e58 SHA1 (patch-solenv_gbuild_AllLangResTarget.mk) = 75af6e02b29bf1dfc619bda9cd5674f19adf2c95 SHA1 (patch-solenv_gbuild_Module.mk) = 45d5b2c41b468bb071253ae0f78d01d535662c40 SHA1 (patch-xmloff_source_draw_ximp3dscene.cxx) = bdd0b2563e54424dd468c2334e17ab23057a69fb diff --git a/misc/libreoffice/patches/patch-configure.ac b/misc/libreoffice/patches/patch-configure.ac index b3533301e49..e9b564ca7c7 100644 --- a/misc/libreoffice/patches/patch-configure.ac +++ b/misc/libreoffice/patches/patch-configure.ac @@ -1,7 +1,19 @@ -$NetBSD: patch-configure.ac,v 1.3 2016/02/11 09:45:27 ryoon Exp $ +$NetBSD: patch-configure.ac,v 1.4 2016/02/13 08:46:03 wiz Exp $ + +* Adapt for mdds-1.0. +* Adapt ant path for pkgsrc. --- configure.ac.orig 2016-01-27 00:58:25.000000000 +0000 +++ configure.ac +@@ -8768,7 +8768,7 @@ AC_SUBST(SYSTEM_BOOST) + dnl =================================================================== + dnl Check for system mdds + dnl =================================================================== +-libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds >= 0.12.0], ["-I${WORKDIR}/UnpackedTarball/mdds/include"]) ++libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.0 >= 0.12.0], ["-I${WORKDIR}/UnpackedTarball/mdds/include"]) + + dnl =================================================================== + dnl Check for system glm @@ -11998,8 +11998,8 @@ EOF dnl Checking for ant.jar if test "$ANT_HOME" != "NO_ANT_HOME"; then |