* Explicitly disable options that weren't disabled before (gnomevfs and co).

* Remove deprecated WITH_DVDCSS option, it's not used anymore.
* Depend on SDL_image and libxml2 to build missing modules that are
  enabled by default.

Bump PKGREVISION (BTW this package now works perfectly on NetBSD, thanks
drochner!).

2 files changed, 15 insertions, 21 deletions

diff --git a/multimedia/vlc08/Makefile b/multimedia/vlc08/Makefile
index 87fd9e5c686..1ce4a3adb32 100644
--- a/multimedia/vlc08/Makefile
+++ b/multimedia/vlc08/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/05/04 19:19:59 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2006/05/06 08:25:20 xtraeme Exp $
 #
 
 DISTNAME=		vlc-${VLC_VER}
+PKGREVISION=		1
 CATEGORIES=		multimedia
 MASTER_SITES=		http://download.videolan.org/pub/videolan/vlc/${VLC_VER}/
 EXTRACT_SUFX=		.tar.bz2
@@ -27,19 +28,18 @@ BUILDLINK_API_DEPENDS.ffmpeg+=	ffmpeg>=0.4.8nb1 # Postprocess fix
 
 CONFIGURE_ARGS+=	--disable-skins2
 CONFIGURE_ARGS+=	--disable-speex # needs unstable 1.1.x branch
-
-CONFIGURE_ARGS+=	--enable-dvb
-CONFIGURE_ARGS+=	--enable-flac
 CONFIGURE_ARGS+=	--disable-gtk
+CONFIGURE_ARGS+=	--disable-gnomevfs
+CONFIGURE_ARGS+=	--disable-gnutls
+CONFIGURE_ARGS+=	--disable-smb
+CONFIGURE_ARGS+=	--disable-dvbpsi
+CONFIGURE_ARGS+=	--disable-mod
+CONFIGURE_ARGS+=	--disable-mpc
+CONFIGURE_ARGS+=	--disable-dts
+
 CONFIGURE_ARGS+=	--with-ffmpeg-tree=${BUILDLINK_PREFIX.ffmpeg}/lib
 CONFIGURE_ARGS+=	--enable-cddax
-
-BUILD_DEFS+=		WITH_DVDCSS
-
-.if defined(WITH_DVDCSS) && !empty(WITH_DVDCSS:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=	--with-dvdcss=${BUILDLINK_PREFIX.libdvdcss}
-.include "../../multimedia/libdvdcss/buildlink3.mk"
-.endif
+CONFIGURE_ARGS+=	--enable-dvdread
 
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/http/admin
@@ -71,7 +71,6 @@ SUBST_SED.libav=	-e "s,libavcodec/libavcodec.a,libavcodec.a,g"
 
 BUILDLINK_TRANSFORM.ffmpeg+=	-e "s,include/ffmpeg,include/,g"
 
-.include "../../audio/flac/buildlink3.mk"
 .include "../../audio/lame/buildlink3.mk"
 .include "../../audio/liba52/buildlink3.mk"
 .include "../../audio/libcddb/buildlink3.mk"
@@ -81,18 +80,17 @@ BUILDLINK_TRANSFORM.ffmpeg+=	-e "s,include/ffmpeg,include/,g"
 .include "../../converters/fribidi/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../graphics/SDL_image/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../misc/libcdio/buildlink3.mk"
 .include "../../multimedia/ffmpeg/buildlink3.mk"
 .include "../../multimedia/libdvdplay/buildlink3.mk"
 .include "../../multimedia/libdvdnav/buildlink3.mk"
-.include "../../multimedia/libdvbpsi/buildlink3.mk"
 .include "../../multimedia/libdvdread/buildlink3.mk"
 .include "../../multimedia/libmatroska/buildlink3.mk"
 .include "../../multimedia/libmpeg2/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
-.include "../../net/openslp/buildlink3.mk"
-.include "../../sysutils/vcdimager-devel/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/wxGTK/buildlink3.mk"
 
 .include "../../mk/oss.buildlink3.mk"
diff --git a/multimedia/vlc08/PLIST b/multimedia/vlc08/PLIST
index da7bf0cff7c..d8d692b3f9d 100644
--- a/multimedia/vlc08/PLIST
+++ b/multimedia/vlc08/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/04 19:20:00 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/05/06 08:25:20 xtraeme Exp $
 bin/vlc
 bin/vlc-config
 bin/wxvlc
@@ -77,6 +77,7 @@ lib/vlc/codec/liblpcm_plugin.so
 lib/vlc/codec/libmpeg_audio_plugin.so
 lib/vlc/codec/libpng_plugin.so
 lib/vlc/codec/librawvideo_plugin.so
+lib/vlc/codec/libsdl_image_plugin.so
 lib/vlc/codec/libspudec_plugin.so
 lib/vlc/codec/libsubsdec_plugin.so
 lib/vlc/codec/libsvcdsub_plugin.so
@@ -116,7 +117,6 @@ lib/vlc/demux/librawdv_plugin.so
 lib/vlc/demux/libreal_plugin.so
 lib/vlc/demux/libsgimb_plugin.so
 lib/vlc/demux/libsubtitle_plugin.so
-lib/vlc/demux/libts_plugin.so
 lib/vlc/demux/libty_plugin.so
 lib/vlc/demux/libvobsub_plugin.so
 lib/vlc/demux/libvoc_plugin.so
@@ -132,7 +132,6 @@ lib/vlc/libmemcpy3dn.a
 lib/vlc/libmemcpymmx.a
 lib/vlc/libmemcpymmxext.a
 lib/vlc/libmkv.a
-lib/vlc/libmux_ts.a
 lib/vlc/libstream_out_switcher.a
 lib/vlc/misc/libdummy_plugin.so
 lib/vlc/misc/libexport_plugin.so
@@ -281,9 +280,6 @@ share/vlc/vlc32x32.png
 share/vlc/vlc32x32.xpm
 share/vlc/vlc48x48.ico
 share/vlc/vlc48x48.png
-@exec ${MKDIR} %D/share/vlc/skins/default
-@dirrm share/vlc/skins/default
-@dirrm share/vlc/skins
 @dirrm share/vlc/osdmenu/dvd/volume
 @dirrm share/vlc/osdmenu/dvd/unselect
 @dirrm share/vlc/osdmenu/dvd/selection