summaryrefslogtreecommitdiff
path: root/multimedia/vlc2
diff options
context:
space:
mode:
authorwiz <wiz>2013-01-21 16:25:21 +0000
committerwiz <wiz>2013-01-21 16:25:21 +0000
commit5fe443513325bfbcd5dd727f45a4b59ebf80159d (patch)
tree518e7ef0fcbaa2a472e64db2c08267ec85f34f08 /multimedia/vlc2
parentd69f91b5446070cc42175a2650c1b10191f1f932 (diff)
downloadpkgsrc-5fe443513325bfbcd5dd727f45a4b59ebf80159d.tar.gz
Fixes for automake-1.13.
Diffstat (limited to 'multimedia/vlc2')
-rw-r--r--multimedia/vlc2/Makefile6
-rw-r--r--multimedia/vlc2/distinfo3
-rw-r--r--multimedia/vlc2/patches/patch-configure.ac15
3 files changed, 21 insertions, 3 deletions
diff --git a/multimedia/vlc2/Makefile b/multimedia/vlc2/Makefile
index db111883ad6..eb741bf4210 100644
--- a/multimedia/vlc2/Makefile
+++ b/multimedia/vlc2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2012/12/17 12:07:01 drochner Exp $
+# $NetBSD: Makefile,v 1.20 2013/01/21 16:25:21 wiz Exp $
#
DISTNAME= vlc-${VLC_VERSION}
@@ -19,6 +19,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
@@ -73,7 +75,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 -if
post-install:
${INSTALL_DATA} ${WRKSRC}/doc/vlc.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
diff --git a/multimedia/vlc2/distinfo b/multimedia/vlc2/distinfo
index ff2b5dec9cb..01a5e081d63 100644
--- a/multimedia/vlc2/distinfo
+++ b/multimedia/vlc2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2012/12/17 12:07:01 drochner Exp $
+$NetBSD: distinfo,v 1.13 2013/01/21 16:25:21 wiz Exp $
SHA1 (vlc-2.0.5.tar.xz) = 31bd518f4edd03ea394305176e5df3478e251cc0
RMD160 (vlc-2.0.5.tar.xz) = 7956c1abb34fda73533019c67010faba9efcbf7e
@@ -18,6 +18,7 @@ SHA1 (patch-at) = bf48ded3571358d6b718af47b28804c3155d84ef
SHA1 (patch-au) = 5ea53969efefe3d9a6e3121b5453b573c633124b
SHA1 (patch-av) = c82b711947ea4bdca9b011e36af6c87d9b6f62a6
SHA1 (patch-ba) = 1898a7a9bf6a45ab4915f1c46df325e6d41ada23
+SHA1 (patch-configure.ac) = 3a2cf801429a085b17384c2f4ac17e72cd925f34
SHA1 (patch-modules_access_directory.c) = e36df1da5b788e12e9fc7d94663dd69d86fe4f7a
SHA1 (patch-modules_access_rtp_Modules.am) = 14aea82ffab2fcfa5b0916ac2e86363d1efdcbf3
SHA1 (patch-modules_audio__output_pulse.c) = 941ee669e62c9d757fc096c74a2aec58cf265b15
diff --git a/multimedia/vlc2/patches/patch-configure.ac b/multimedia/vlc2/patches/patch-configure.ac
new file mode 100644
index 00000000000..5ae5880393b
--- /dev/null
+++ b/multimedia/vlc2/patches/patch-configure.ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure.ac,v 1.1 2013/01/21 16:25:21 wiz Exp $
+
+automake-1.13 compat.
+
+--- configure.ac.orig 2012-10-22 09:03:51.000000000 +0000
++++ configure.ac
+@@ -25,7 +25,7 @@ AC_CANONICAL_HOST
+ AC_PRESERVE_HELP_ORDER
+
+ AM_INIT_AUTOMAKE(tar-ustar color-tests)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADER(config.h)
+
+ # Disable with "./configure --disable-silent-rules" or "make V=1"
+ AM_SILENT_RULES([yes])