Add patches for allowing mdds-1.0 to be detected.

Bump PKGREVISION.

6 files changed, 41 insertions, 18 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
diff --git a/misc/libreoffice4/Makefile b/misc/libreoffice4/Makefile
index d2d800f79cf..83f99034d21 100644
--- a/misc/libreoffice4/Makefile
+++ b/misc/libreoffice4/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.88 2016/01/27 10:31:30 wiz Exp $
+# $NetBSD: Makefile,v 1.89 2016/02/13 08:46:03 wiz Exp $
 
 VERREL=		4.4.7
 VERRC=		2
 VER=		${VERREL}.${VERRC}
 DISTNAME=	libreoffice-${VER}
 PKGNAME=	libreoffice4-${VER}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	http://download.documentfoundation.org/libreoffice/src/${VERREL}/
 EXTRACT_SUFX=	.tar.xz
diff --git a/misc/libreoffice4/distinfo b/misc/libreoffice4/distinfo
index fe214b0165d..0af4de08b86 100644
--- a/misc/libreoffice4/distinfo
+++ b/misc/libreoffice4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.46 2015/12/13 14:31:03 ryoon Exp $
+$NetBSD: distinfo,v 1.47 2016/02/13 08:46:03 wiz Exp $
 
 SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
@@ -194,7 +194,7 @@ SHA512 (libreoffice/libreoffice-translations-4.4.7.2.tar.xz) = 3a9288867dc23c9a6
 Size (libreoffice/libreoffice-translations-4.4.7.2.tar.xz) = 128072392 bytes
 SHA1 (patch-Makefile.in) = e34092a731f4da0d8c048945c75287327b6b9cb2
 SHA1 (patch-bin_distro-install-desktop-integration) = 78921a0fb6db8b87f5d64c09579dc6f9211949b5
-SHA1 (patch-configure.ac) = ff940ab10b913d24bc6b7a8e7c2f8f3c16673ab7
+SHA1 (patch-configure.ac) = b8ffdfad5501feeec88ec0b0d249a399b9d63e3d
 SHA1 (patch-desktop_Library__sofficeapp.mk) = e445b1a265fadf4f83f1c40bc541c11c26860352
 SHA1 (patch-external_jfreereport_java_sac_build.xml) = 675a37dcf3a813f890ec2c28cb7c6b0948610445
 SHA1 (patch-external_libebook_ExternalProject__libebook.mk) = a9c2f7d30cf8efc7acea4d4a0523bad801c9b930
diff --git a/misc/libreoffice4/patches/patch-configure.ac b/misc/libreoffice4/patches/patch-configure.ac
index 24d25ba9e65..6fde961c3a8 100644
--- a/misc/libreoffice4/patches/patch-configure.ac
+++ b/misc/libreoffice4/patches/patch-configure.ac
@@ -1,11 +1,12 @@
-$NetBSD: patch-configure.ac,v 1.9 2015/09/23 20:45:50 joerg Exp $
+$NetBSD: patch-configure.ac,v 1.10 2016/02/13 08:46:03 wiz Exp $
 
 * Use gstreamer under OpenBSD
 * Add FreeBSD support (GNU patch is not needed)
 * Detect pkgsrc apache-ant library
 * Fix installation directory
+* Adapt for mdds-1.0.
 
---- configure.ac.orig	2015-01-22 20:05:28.000000000 +0000
+--- configure.ac.orig	2015-11-25 12:55:38.000000000 +0000
 +++ configure.ac
 @@ -713,6 +713,8 @@ aix*)
  
@@ -16,7 +17,7 @@ $NetBSD: patch-configure.ac,v 1.9 2015/09/23 20:45:50 joerg Exp $
      test_tde=yes
      test_kde=yes
      test_freetype=yes
-@@ -6203,7 +6205,7 @@ if test \( "$_os" != "WINNT" -o "$WITH_M
+@@ -6212,7 +6214,7 @@ if test \( "$_os" != "WINNT" -o "$WITH_M
  
      # Assume visibility is not broken with libc++. The below test is very much designed for libstdc++
      # only.
@@ -25,7 +26,7 @@ $NetBSD: patch-configure.ac,v 1.9 2015/09/23 20:45:50 joerg Exp $
          dnl gcc#19664, gcc#22482, rhbz#162935
          AC_MSG_CHECKING([if STL headers are visibility safe (GCC bug 22482)])
          AC_EGREP_HEADER(visibility push, string, stlvisok=yes, stlvisok=no)
-@@ -6695,7 +6697,7 @@ dnl ====================================
+@@ -6704,7 +6706,7 @@ dnl ====================================
  dnl Set target Java bytecode version
  dnl ===================================================================
  if test "$ENABLE_JAVA" != ""; then
@@ -34,7 +35,7 @@ $NetBSD: patch-configure.ac,v 1.9 2015/09/23 20:45:50 joerg Exp $
          _java_target_ver="1.6"
      else
          _java_target_ver="1.5"
-@@ -6755,30 +6757,7 @@ dnl ====================================
+@@ -6764,30 +6766,7 @@ dnl ====================================
  dnl Checks for javadoc
  dnl ===================================================================
  if test "$ENABLE_JAVA" != ""; then
@@ -66,7 +67,7 @@ $NetBSD: patch-configure.ac,v 1.9 2015/09/23 20:45:50 joerg Exp $
  fi
  AC_SUBST(JAVADOCISGJDOC)
  
-@@ -7780,7 +7782,7 @@ no|disable)
+@@ -7789,7 +7768,7 @@ no|disable)
      else
          # Unset variables set by the above AM_PATH_PYTHON so that
          # we actually do check anew.
@@ -75,7 +76,7 @@ $NetBSD: patch-configure.ac,v 1.9 2015/09/23 20:45:50 joerg Exp $
          AM_PATH_PYTHON([3.3],, [:])
          if test "$PYTHON" = ":"; then
              if test -z "$PYTHON_FOR_BUILD"; then
-@@ -7833,9 +7835,9 @@ if test $enable_python = system; then
+@@ -7842,9 +7821,9 @@ if test $enable_python = system; then
      elif test "$cross_compiling" != yes; then
          # Unset variables set by the above AM_PATH_PYTHON so that
          # we actually do check anew.
@@ -87,7 +88,16 @@ $NetBSD: patch-configure.ac,v 1.9 2015/09/23 20:45:50 joerg Exp $
          python_include=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('INCLUDEPY'));"`
          python_version=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('VERSION'));"`
          python_libs=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBS'));"`
-@@ -9679,8 +9681,8 @@ if test -z "$PATCH"; then
+@@ -8528,7 +8507,7 @@ AC_SUBST(SYSTEM_BOOST)
+ dnl ===================================================================
+ dnl Check for system mdds
+ dnl ===================================================================
+-libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds >= 0.11.2], ["-I${WORKDIR}/UnpackedTarball/mdds/include"])
++libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.0 >= 0.11.2], ["-I${WORKDIR}/UnpackedTarball/mdds/include"])
+ 
+ dnl ===================================================================
+ dnl Check for system glm
+@@ -9688,8 +9667,8 @@ if test -z "$PATCH"; then
      AC_MSG_ERROR(["patch" not found in \$PATH, install it])
  fi
  
@@ -98,7 +108,7 @@ $NetBSD: patch-configure.ac,v 1.9 2015/09/23 20:45:50 joerg Exp $
      if test -z "$with_gnu_patch"; then
          GNUPATCH=$PATCH
      else
-@@ -11959,7 +11961,7 @@ EOF
+@@ -11968,7 +11947,7 @@ EOF
      dnl Checking for ant.jar
      if test "$ANT_HOME" != "NO_ANT_HOME"; then
          AC_MSG_CHECKING([Ant lib directory])
@@ -107,7 +117,7 @@ $NetBSD: patch-configure.ac,v 1.9 2015/09/23 20:45:50 joerg Exp $
              ANT_LIB="$ANT_HOME/lib"
          else
              if test -f $ANT_HOME/ant.jar; then
-@@ -12378,7 +12380,7 @@ AC_SUBST(MANDIR)
+@@ -12389,7 +12368,7 @@ AC_SUBST(MANDIR)
  DOCDIR=[$(eval echo $(eval echo $docdir))]
  AC_SUBST(DOCDIR)