[pkgsrc/trunk]: pkgsrc/multimedia/mkvtoolnix Fix patch to boost libraries and...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/83872ccc8b52
branches:  trunk
changeset: 355104:83872ccc8b52
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Nov 20 21:58:39 2016 +0000

description:
Fix patch to boost libraries and hackaround for the surprising error
messages.

diffstat:

 multimedia/mkvtoolnix/Makefile                |   4 ++--
 multimedia/mkvtoolnix/distinfo                |   3 +--
 multimedia/mkvtoolnix/patches/patch-configure |  17 -----------------
 3 files changed, 3 insertions(+), 21 deletions(-)

diffs (51 lines):

diff -r 24a62c17b152 -r 83872ccc8b52 multimedia/mkvtoolnix/Makefile
--- a/multimedia/mkvtoolnix/Makefile    Sun Nov 20 21:23:31 2016 +0000
+++ b/multimedia/mkvtoolnix/Makefile    Sun Nov 20 21:58:39 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2016/11/20 21:15:19 joerg Exp $
+# $NetBSD: Makefile,v 1.84 2016/11/20 21:58:39 joerg Exp $
 
 DISTNAME=      mkvtoolnix-9.5.0
 CATEGORIES=    multimedia
@@ -17,7 +17,7 @@
 USE_TOOLS+=            gmake msgfmt
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --without-curl --disable-precompiled-headers
-CONFIGURE_ARGS+=       --with-boost-libdir=${BUILDLINK_PREFIX.boost-libs}
+CONFIGURE_ARGS+=       --with-boost-libdir=${BUILDLINK_PREFIX.boost-libs}/lib
 CONFIGURE_ARGS+=       --with-boost_regex=boost_regex
 CONFIGURE_ARGS+=       --with-boost-system=boost_system
 CONFIGURE_ARGS+=       --with-boost-filesystem=boost_filesystem
diff -r 24a62c17b152 -r 83872ccc8b52 multimedia/mkvtoolnix/distinfo
--- a/multimedia/mkvtoolnix/distinfo    Sun Nov 20 21:23:31 2016 +0000
+++ b/multimedia/mkvtoolnix/distinfo    Sun Nov 20 21:58:39 2016 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.39 2016/11/20 21:15:19 joerg Exp $
+$NetBSD: distinfo,v 1.40 2016/11/20 21:58:39 joerg Exp $
 
 SHA1 (mkvtoolnix-9.5.0.tar.xz) = 66050c813ee5a5ec7e2cbdff1e601a9087ddf5b8
 RMD160 (mkvtoolnix-9.5.0.tar.xz) = 0391f1800f50be8604d9fd1d1fd5636a00d6ccd5
 SHA512 (mkvtoolnix-9.5.0.tar.xz) = 8a7742a395556ac00878ecb775334bf88d833054415ffd2820283fa4b430770934d312665093b876777571410c4f23f2cc7b3a97768bbfa0476cc9b4159e8435
 Size (mkvtoolnix-9.5.0.tar.xz) = 3785316 bytes
-SHA1 (patch-configure) = 47b07a3a6c3d90ac2f219c99d8232cb9eca61135
diff -r 24a62c17b152 -r 83872ccc8b52 multimedia/mkvtoolnix/patches/patch-configure
--- a/multimedia/mkvtoolnix/patches/patch-configure     Sun Nov 20 21:23:31 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2016/09/08 16:18:01 joerg Exp $
-
-Bogus conditional is failing when using external Boost after the test
-actually passed.
-
---- configure.orig     2016-08-27 21:03:55.775361937 +0000
-+++ configure
-@@ -10043,9 +10038,6 @@ fi
-       if test "x$ax_lib" = "x"; then
-         as_fn_error $? "Could not find a version of the library!" "$LINENO" 5
-       fi
--      if test "x$link_date_time" != "xyes"; then
--        as_fn_error $? "Could not link against $ax_lib !" "$LINENO" 5
--      fi
-     fi
- 
-     CPPFLAGS="$CPPFLAGS_SAVED"