Pullup ticket #2581 - requested by ahoka

vlc: security update

Revisions pulled up:
- multimedia/vlc/Makefile	1.64
- multimedia/vlc/PLIST		1.23
- multimedia/vlc/distinfo	1.22
---
Module Name:    pkgsrc
Committed By:   ahoka
Date:           Fri Nov  7 20:03:13 UTC 2008

Modified Files:
        pkgsrc/multimedia/vlc: Makefile PLIST distinfo

Log Message:
Changes between 0.9.5 and 0.9.6:
--------------------------------
New Localizations:
 * Ukranian

Security updates:
 * Fixed overflow in CUE support from VCD access (SA-0810, CVE-2008-xxxx)
 * Fixed overflow in RealText subtitles support (SA-0810, CVE-2008-xxxx)

3 files changed, 11 insertions, 11 deletions

diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index f29de963977..af70f904f2c 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61.2.2 2008/11/04 12:46:36 tron Exp $
+# $NetBSD: Makefile,v 1.61.2.3 2008/11/08 23:06:38 tron Exp $
 #
 
 DISTNAME=		vlc-${VLC_VERSION}
@@ -6,7 +6,7 @@ CATEGORIES=		multimedia
 MASTER_SITES=		http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
 EXTRACT_SUFX=		.tar.bz2
 
-VLC_VERSION=		0.9.5
+VLC_VERSION=		0.9.6
 
 MAINTAINER=		ahoka@NetBSD.org
 HOMEPAGE=		http://videolan.org/
@@ -15,7 +15,8 @@ COMMENT=		VLC media player and streaming server
 CONFLICTS=		vlc07-[0-9]* vlc08-[0-9]*
 
 USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake perl pkg-config autoconf
+USE_TOOLS+=		gmake perl pkg-config \
+			aclocal autoconf automake autoheader
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 PTHREAD_OPTS+=		require
@@ -43,7 +44,6 @@ CONFIGURE_ARGS+=	--disable-smb
 CONFIGURE_ARGS+=	--enable-cddax \
 			--enable-dvdread \
 			--enable-flac \
-			--enable-lame \
 			--enable-live555 \
 
 # Build optimalized modules
@@ -84,7 +84,7 @@ INSTALLATION_DIRS+=	${PREFIX}/share/vlc/http/dialogs \
 			${PREFIX}/share/vlc/skins2/fonts
 
 pre-configure:
-	cd ${WRKSRC} && autoconf
+	cd ${WRKSRC} && autoreconf
 
 pre-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/vlc.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
@@ -122,7 +122,6 @@ CHECK_WRKREF_SKIP=	lib/libvlccore.a \
 
 .include "../../audio/libmpcdec/buildlink3.mk"
 .include "../../audio/flac/buildlink3.mk"
-.include "../../audio/lame/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../audio/liba52/buildlink3.mk"
diff --git a/multimedia/vlc/PLIST b/multimedia/vlc/PLIST
index 0db8b64fdd4..f1abc9c7a04 100644
--- a/multimedia/vlc/PLIST
+++ b/multimedia/vlc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19.2.2 2008/11/04 12:46:36 tron Exp $
+@comment $NetBSD: PLIST,v 1.19.2.3 2008/11/08 23:06:38 tron Exp $
 ${PLIST.faad}lib/vlc/codec/libfaad_plugin.la
 ${PLIST.dbus}lib/vlc/control/libdbus_plugin.la
 ${PLIST.dbus}lib/vlc/misc/libinhibit_plugin.la
@@ -383,6 +383,7 @@ share/locale/tet/LC_MESSAGES/vlc.mo
 share/locale/th/LC_MESSAGES/vlc.mo
 share/locale/tl/LC_MESSAGES/vlc.mo
 share/locale/tr/LC_MESSAGES/vlc.mo
+share/locale/uk/LC_MESSAGES/vlc.mo
 share/locale/zh_CN/LC_MESSAGES/vlc.mo
 share/locale/zh_TW/LC_MESSAGES/vlc.mo
 share/vlc/http/.hosts
diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo
index dbe1ec40b02..d348a1372dd 100644
--- a/multimedia/vlc/distinfo
+++ b/multimedia/vlc/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.19.2.2 2008/11/04 12:46:36 tron Exp $
+$NetBSD: distinfo,v 1.19.2.3 2008/11/08 23:06:38 tron Exp $
 
-SHA1 (vlc-0.9.5.tar.bz2) = 0f3f315353a09bf769f27bd07e20654b072cd209
-RMD160 (vlc-0.9.5.tar.bz2) = 8ec72d026f6fa086620f63d202d015fa14b4a4d7
-Size (vlc-0.9.5.tar.bz2) = 16457306 bytes
+SHA1 (vlc-0.9.6.tar.bz2) = b56b0ed4152ec841a2145caab5f6710ba9ed0d88
+RMD160 (vlc-0.9.6.tar.bz2) = 7cc3d8b1506469c759780d23ffcdc826a88e4288
+Size (vlc-0.9.6.tar.bz2) = 16981922 bytes
 SHA1 (patch-configure) = 0b69157981409067b42385ee5c81fc422f3842a2
 SHA1 (patch-v4l2) = 54504b7e3bc41522db5c90983319c0c1ce1f3c8f