Fix build with automake-1.13. Use libdvbpsi0.

6 files changed, 29 insertions, 16 deletions

diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index d8f57c1d940..98418fb0cc2 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.146 2013/01/19 20:34:37 riastradh Exp $
+# $NetBSD: Makefile,v 1.147 2013/01/22 11:46:23 wiz Exp $
 #
 
 DISTNAME=		vlc-${VLC_VERSION}
@@ -20,6 +20,8 @@ CONFLICTS=		vlc07-[0-9]* vlc08-[0-9]*
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake perl pkg-config \
 			autoconf automake autoreconf
+# for autopoint
+BUILD_DEPENDS+=		gettext-tools-[0-9]*:../../devel/gettext-tools
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-kde-solid=${PREFIX}/share/kde/apps/solid/actions
@@ -75,7 +77,7 @@ INSTALLATION_DIRS+=	share/vlc/http/dialogs share/vlc/http/images \
 			share/vlc/skins2/fonts \
 			${PKGMANDIR}/man1
 pre-configure:
-	cd ${WRKSRC} && autoreconf -f
+	cd ${WRKSRC} && autoreconf -fi
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/vlc.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
@@ -132,7 +134,7 @@ CHECK_WRKREF_SKIP=	lib/libvlccore.a \
 
 .include "../../multimedia/ffmpeg010/buildlink3.mk"
 .include "../../multimedia/libdvdplay/buildlink3.mk"
-.include "../../multimedia/libdvbpsi/buildlink3.mk"
+.include "../../multimedia/libdvbpsi0/buildlink3.mk"
 .include "../../multimedia/libdvdnav/buildlink3.mk"
 .include "../../multimedia/libdvdread/buildlink3.mk"
 .include "../../multimedia/libmatroska/buildlink3.mk"
diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo
index 9bb21c48117..00abedb5246 100644
--- a/multimedia/vlc/distinfo
+++ b/multimedia/vlc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.55 2012/08/30 18:54:41 christos Exp $
+$NetBSD: distinfo,v 1.56 2013/01/22 11:46:23 wiz Exp $
 
 SHA1 (vlc-1.1.13.tar.bz2) = 05bbc7ff427f3b919b29a45ce014caff9ba92648
 RMD160 (vlc-1.1.13.tar.bz2) = c5aa438a9085ddbf28e849df442b75475693290d
@@ -17,4 +17,5 @@ SHA1 (patch-ar) = 153164870e9dc50ad32106d9f8ebd25b35ed3dd3
 SHA1 (patch-as) = b53b074b2791d7bf69d5f09c7c32d873608f3086
 SHA1 (patch-at) = 5761ec0809d2b03511666ae81f7b4ae01b6f5930
 SHA1 (patch-au) = 7e1d1e7f2734051fffb988cc4ea01a1a7b264b78
+SHA1 (patch-configure.ac) = db79a1e99bf2859eeb2615359db9a30a3eadfb2d
 SHA1 (patch-modules_audio__output_pulse.c) = 994389b214f3e2b7b8b7ccaf3bb535a94523f81b
diff --git a/multimedia/vlc10/Makefile b/multimedia/vlc10/Makefile
index 3d953f65e95..46180f91d12 100644
--- a/multimedia/vlc10/Makefile
+++ b/multimedia/vlc10/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2012/11/03 01:58:37 ryoon Exp $
+# $NetBSD: Makefile,v 1.27 2013/01/22 11:46:23 wiz Exp $
 #
 
 DISTNAME=		vlc-${VLC_VERSION}
@@ -141,7 +141,7 @@ CHECK_WRKREF_SKIP=	lib/libvlccore.a \
 
 .include "../../multimedia/ffmpeg/buildlink3.mk"
 .include "../../multimedia/libdvdplay/buildlink3.mk"
-.include "../../multimedia/libdvbpsi/buildlink3.mk"
+.include "../../multimedia/libdvbpsi0/buildlink3.mk"
 .include "../../multimedia/libdvdnav/buildlink3.mk"
 .include "../../multimedia/libdvdread/buildlink3.mk"
 .include "../../multimedia/libmatroska/buildlink3.mk"
diff --git a/multimedia/vlc10/distinfo b/multimedia/vlc10/distinfo
index 01cdf2528fb..d71d4278fc7 100644
--- a/multimedia/vlc10/distinfo
+++ b/multimedia/vlc10/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2011/02/14 19:05:52 drochner Exp $
+$NetBSD: distinfo,v 1.3 2013/01/22 11:46:23 wiz Exp $
 
 SHA1 (vlc-1.0.6.tar.bz2) = 834346a84a71d915440b7741e04b6e02de451786
 RMD160 (vlc-1.0.6.tar.bz2) = 2185eb418748f2aadfce5e61b7a9de66a62ef2d1
@@ -7,5 +7,5 @@ SHA1 (patch-aa) = 7e3939a647f04661a2eba4fdbb720637dd267334
 SHA1 (patch-ab) = b17a4f0b5c9712d953ae45ff7d8c72ff8f323271
 SHA1 (patch-au) = 7318b1d40246d5540a67c22565ebd439d5fe069d
 SHA1 (patch-av) = 2d876c99a4bfe2cd964a78fe19dd108d1cb5f550
-SHA1 (patch-configure) = 44f3bc76668d9529ce35812d2c194199a0623a09
+SHA1 (patch-configure) = 2741938a0cae8ebf8f805ebb6e932fbdaf47efb2
 SHA1 (patch-v4l2) = 578622c5233f7f5024ab5a3dca8719e1a258a407
diff --git a/multimedia/vlc10/patches/patch-configure b/multimedia/vlc10/patches/patch-configure
index bb43dd8a371..3fbec0cd06a 100644
--- a/multimedia/vlc10/patches/patch-configure
+++ b/multimedia/vlc10/patches/patch-configure
@@ -1,11 +1,21 @@
-$NetBSD: patch-configure,v 1.1.1.1 2011/01/24 18:45:54 drochner Exp $
+$NetBSD: patch-configure,v 1.2 2013/01/22 11:46:24 wiz Exp $
 
-First chunk: http://trac.videolan.org/vlc/ticket/3762
-Second chunk: http://trac.videolan.org/vlc/ticket/3761
+First chunk: automake-1.13 compat.
+Second chunk: http://trac.videolan.org/vlc/ticket/3762
+Third chunk: http://trac.videolan.org/vlc/ticket/3761
 
---- configure.ac.orig	2009-09-19 21:30:21.000000000 +0200
+--- configure.ac.orig	2010-04-18 13:03:54.000000000 +0000
 +++ configure.ac
-@@ -572,7 +572,7 @@ AC_CHECK_FUNCS(fdatasync,,
+@@ -23,7 +23,7 @@ AC_CANONICAL_BUILD
+ AC_CANONICAL_HOST
+ 
+ AM_INIT_AUTOMAKE(tar-ustar)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADER(config.h)
+ 
+ dnl Too many people are not aware of maintainer mode:
+ dnl If you want to use it, you definitely know what you are doing, so
+@@ -575,7 +575,7 @@ AC_CHECK_FUNCS(fdatasync,,
  ])
  
  dnl Check for non-standard system calls
@@ -14,7 +24,7 @@ Second chunk: http://trac.videolan.org/vlc/ticket/3761
  
  AH_BOTTOM([#include <vlc_fixups.h>])
  
-@@ -2498,7 +2498,7 @@ then
+@@ -2525,7 +2525,7 @@ then
    fi
  
    CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_v4l2}"
diff --git a/multimedia/vlc2/Makefile b/multimedia/vlc2/Makefile
index eb741bf4210..1c6da6d7619 100644
--- a/multimedia/vlc2/Makefile
+++ b/multimedia/vlc2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2013/01/21 16:25:21 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2013/01/22 11:46:24 wiz Exp $
 #
 
 DISTNAME=		vlc-${VLC_VERSION}
@@ -128,7 +128,7 @@ CHECK_WRKREF_SKIP=	lib/libvlccore.a \
 
 .include "../../multimedia/ffmpeg/buildlink3.mk"
 .include "../../multimedia/libdvdplay/buildlink3.mk"
-.include "../../multimedia/libdvbpsi/buildlink3.mk"
+.include "../../multimedia/libdvbpsi0/buildlink3.mk"
 .include "../../multimedia/libdvdnav/buildlink3.mk"
 .include "../../multimedia/libdvdread/buildlink3.mk"
 .include "../../multimedia/libmatroska/buildlink3.mk"