Update to vlc-0.9.9.

While here, fix some pkglint warnings and enable DESTDIR support.

Changes between 0.9.8a and 0.9.9:
---------------------------------
Decoders:
 * Experimental new decoder for Real Video 3.0 & 4.0
Demuxers:
 * Various fixes related to real demuxer
Mac OS X Interface:
 * Fixed circumstances, which could lead to an empty Information panel
   - Note that VLC will show information on the currently _selected_ item
     instead of the currently _playing_ item, if the playlist is visible in the
     main controller window.
 * Fixed multiple UTF8 issues in the Streaming / Exporting Wizard
Mac OS X Port:
 * Improved video playback performance on Intel-based Macs
New Localizations:
 * Indonesian
 * Bengali
 * Updates of other localizations
Various bugfixes:
 * Support for receiving RTP packets on odd port numbers.
 * Lots of small bugfixes.
 * Correct Fullscreen behaviour on Multi-Screen setups on Windows
 * Telnet fixes on Windows
 * Resampling fixes when transcoding

4 files changed, 28 insertions, 32 deletions

diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 278b44a5a5d..e2cb2b47c40 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.73 2009/02/27 22:38:34 wiz Exp $
+# $NetBSD: Makefile,v 1.74 2009/04/25 17:46:28 tnn Exp $
 #
 
 DISTNAME=		vlc-${VLC_VERSION}
-PKGREVISION=		4
 CATEGORIES=		multimedia
 MASTER_SITES=		http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
 EXTRACT_SUFX=		.tar.bz2
 
-VLC_VERSION=		0.9.8a
+VLC_VERSION=		0.9.9
 
 MAINTAINER=		ahoka@NetBSD.org
 HOMEPAGE=		http://videolan.org/
@@ -15,9 +14,10 @@ COMMENT=		VLC media player and streaming server
 
 CONFLICTS=		vlc07-[0-9]* vlc08-[0-9]*
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake perl pkg-config \
-			aclocal autoconf automake autoheader
+			autoconf automake autoreconf
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 PTHREAD_OPTS+=		require
@@ -67,35 +67,30 @@ PLIST.v4l2=		yes
 CONFIGURE_ARGS+=	--disable-v4l2
 .endif
 
-INSTALLATION_DIRS+=	${PREFIX}/share/vlc/http/dialogs \
-			${PREFIX}/share/vlc/http/images \
-			${PREFIX}/share/vlc/http/js \
-			${PREFIX}/share/vlc/http/old \
-			${PREFIX}/share/vlc/http/old/admin \
-			${PREFIX}/share/vlc/http/old/vlm \
-			${PREFIX}/share/vlc/http/requests \
-			${PREFIX}/share/vlc/osdmenu/default \
-			${PREFIX}/share/vlc/osdmenu/default/selected \
-			${PREFIX}/share/vlc/osdmenu/default/selection \
-			${PREFIX}/share/vlc/osdmenu/default/volume \
-			${PREFIX}/share/vlc/osdmenu/dvd/selected \
-			${PREFIX}/share/vlc/osdmenu/dvd/volume \
-			${PREFIX}/share/vlc/osdmenu/dvd/unselect \
-			${PREFIX}/share/vlc/osdmenu/dvd/selection \
-			${PREFIX}/share/vlc/skins2 \
-			${PREFIX}/share/vlc/skins2/fonts
-
+INSTALLATION_DIRS+=	share/vlc/http/dialogs share/vlc/http/images \
+			share/vlc/http/js share/vlc/http/old \
+			share/vlc/http/old/admin share/vlc/http/old/vlm \
+			share/vlc/http/requests share/vlc/osdmenu/default \
+			share/vlc/osdmenu/default/selected \
+			share/vlc/osdmenu/default/selection \
+			share/vlc/osdmenu/default/volume \
+			share/vlc/osdmenu/dvd/selected \
+			share/vlc/osdmenu/dvd/volume \
+			share/vlc/osdmenu/dvd/unselect \
+			share/vlc/osdmenu/dvd/selection \
+			share/vlc/skins2 share/vlc/skins2/fonts \
+			${PKGMANDIR}/man1
 pre-configure:
-	cd ${WRKSRC} && autoreconf
+	cd ${WRKSRC} && autoreconf -f
 
-pre-install:
+post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/vlc.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_DATA} ${WRKSRC}/doc/vlc-config.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 # Let's use dejavu-ttf as it has nice unicode support
 #
 ORIGFNT=		/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf
-DEFAULT_FONT?=		${LOCALBASE}/lib/X11/fonts/TTF/DejaVuSans.ttf
+DEFAULT_FONT?=		${PREFIX}/lib/X11/fonts/TTF/DejaVuSans.ttf
 DEPENDS+=		dejavu-ttf>=2.26:../../fonts/dejavu-ttf
 
 SUBST_CLASSES+=		oss
@@ -159,6 +154,7 @@ CHECK_WRKREF_SKIP=	lib/libvlccore.a \
 .include "../../multimedia/libtheora/buildlink3.mk"
 .include "../../multimedia/x264-devel/buildlink3.mk"
 
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/vlc/PLIST b/multimedia/vlc/PLIST
index 1f75b114f5a..7518c2cce78 100644
--- a/multimedia/vlc/PLIST
+++ b/multimedia/vlc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2008/12/19 23:28:40 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.26 2009/04/25 17:46:28 tnn 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
@@ -358,6 +358,7 @@ share/locale/gl/LC_MESSAGES/vlc.mo
 share/locale/he/LC_MESSAGES/vlc.mo
 share/locale/hi/LC_MESSAGES/vlc.mo
 share/locale/hu/LC_MESSAGES/vlc.mo
+share/locale/id/LC_MESSAGES/vlc.mo
 share/locale/it/LC_MESSAGES/vlc.mo
 share/locale/ja/LC_MESSAGES/vlc.mo
 share/locale/ka/LC_MESSAGES/vlc.mo
diff --git a/multimedia/vlc/buildlink3.mk b/multimedia/vlc/buildlink3.mk
index f977873b88d..aa3f9338d77 100644
--- a/multimedia/vlc/buildlink3.mk
+++ b/multimedia/vlc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2009/03/20 19:25:06 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2009/04/25 17:46:28 tnn Exp $
 
 BUILDLINK_TREE+=	vlc
 
@@ -17,7 +17,6 @@ pkgbase:= vlc
 .endif
 
 .include "../../audio/flac/buildlink3.mk"
-.include "../../audio/lame/buildlink3.mk"
 .include "../../audio/liba52/buildlink3.mk"
 .include "../../audio/libcddb/buildlink3.mk"
 .include "../../audio/libid3tag/buildlink3.mk"
diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo
index 1f2b9450393..3b73dc11bd6 100644
--- a/multimedia/vlc/distinfo
+++ b/multimedia/vlc/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.25 2009/01/28 12:28:25 jmcneill Exp $
+$NetBSD: distinfo,v 1.26 2009/04/25 17:46:28 tnn Exp $
 
-SHA1 (vlc-0.9.8a.tar.bz2) = 1d68f4e4ef77ffc9cb63de70a610a3969bffd873
-RMD160 (vlc-0.9.8a.tar.bz2) = a9b57d9c6d99c5e3384914003afec974d1996f59
-Size (vlc-0.9.8a.tar.bz2) = 17032727 bytes
+SHA1 (vlc-0.9.9.tar.bz2) = 288afb5916c12f1bbffd36d3b897cb7e9b3da2b3
+RMD160 (vlc-0.9.9.tar.bz2) = eba9309d3594bcb8f2ae793f969e3ad05c74f7f6
+Size (vlc-0.9.9.tar.bz2) = 17285964 bytes
 SHA1 (patch-configure) = 0b69157981409067b42385ee5c81fc422f3842a2
 SHA1 (patch-embedded-video) = 82c59d4bc62c22015cb6923fd1202a598525575d
 SHA1 (patch-v4l2) = 54504b7e3bc41522db5c90983319c0c1ce1f3c8f