6 files changed, 68 insertions, 86 deletions

diff --git a/graphics/vlc/Makefile b/graphics/vlc/Makefile
index 1807b3cac6c5..84061e931603 100644
--- a/graphics/vlc/Makefile
+++ b/graphics/vlc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	vlc
-PORTVERSION=	0.2.92
+PORTVERSION=	0.4.1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \
 		ftp://ftp.Awfulhak.org/pub/vlc/ \
@@ -14,26 +14,17 @@ MASTER_SITES=	http://www.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \
 
 MAINTAINER=	brian@FreeBSD.org
 
-LIB_DEPENDS=	dvdcss.2:${PORTSDIR}/graphics/libdvdcss
-
+LIB_DEPENDS=	dvdcss.2:${PORTSDIR}/graphics/libdvdcss \
+		dvdread.2:${PORTSDIR}/graphics/libdvdread
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	PATH_GTKCONFIG="${GTK_CONFIG}" \
-		CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		INCLUDE="-I${LOCALBASE}/include" \
-		LIB="-L${LOCALBASE}/lib" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-CONFIGURE_ARGS+=--with-dvdcss=${LOCALBASE}
+CONFIGURE_ENV=	PATH_GTKCONFIG="${GTK_CONFIG}"
+CONFIGURE_ARGS+=--with-dvdcss=${LOCALBASE} \
+		--with-dvdread=${LOCALBASE} \
+		--includedir="${LOCALBASE}/include" \
+		--libdir="${LOCALBASE}/lib"
 
 USE_GTK=	yes
 USE_GMAKE=	yes
-USE_BZIP2=	yes
-
-post-patch:
-	${PERL} -pi.orig -e 's,-lpthread,${PTHREAD_LIBS},g' ${WRKSRC}/configure
-	find ${WRKSRC}/ -name \*.[ch] | xargs ${PERL} -pi.orig \
-	    -e 's,"videolan/dvdcss.h","dvdcss/dvdcss.h",; \
-		s,<videolan/dvdcss.h>,<dvdcss/dvdcss.h>,'
 
 .include <bsd.port.mk>
diff --git a/graphics/vlc/distinfo b/graphics/vlc/distinfo
index c9c8ecaeaa0e..ff22f38f3b6c 100644
--- a/graphics/vlc/distinfo
+++ b/graphics/vlc/distinfo
@@ -1 +1 @@
-MD5 (vlc-0.2.92.tar.bz2) = 921fa1cd65b16d00b7fa21237d78af5a
+MD5 (vlc-0.4.1.tar.gz) = 0f095eef220ca292aa9bb5df7e1fb9c4
diff --git a/graphics/vlc/files/patch-Makefile.opts.in b/graphics/vlc/files/patch-Makefile.opts.in
deleted file mode 100644
index 23b7d5b96c22..000000000000
--- a/graphics/vlc/files/patch-Makefile.opts.in
+++ /dev/null
@@ -1,18 +0,0 @@
---- Makefile.opts.in.orig	Tue Aug  7 19:55:49 2001
-+++ Makefile.opts.in	Sun Aug 12 15:01:13 2001
-@@ -200,6 +200,7 @@
- CFLAGS += -fnative-struct -D_OFF_T_ -D_off_t=long
- endif
- 
-+ifeq ($(MODIFY_CFLAGS),1)
- ifneq (,$(findstring bsd,$(SYS)))
- CFLAGS += -pthread
- endif
-@@ -235,6 +236,7 @@
- endif
- 
- #end of optimisations
-+endif
- endif
- 
- #
diff --git a/graphics/vlc/files/patch-configure b/graphics/vlc/files/patch-configure
deleted file mode 100644
index d2a8c34e446d..000000000000
--- a/graphics/vlc/files/patch-configure
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure.orig	Tue Aug  7 19:55:49 2001
-+++ configure	Sun Aug 12 15:36:05 2001
-@@ -3924,10 +3924,7 @@
- 
- if test x$enable_dsp != xno
- then
--  if test -c /dev/dsp
--  then
--    PLUGINS="${PLUGINS} dsp"
--  fi
-+  PLUGINS="${PLUGINS} dsp"
- fi
- 
- # Check whether --enable-esd or --disable-esd was given.
diff --git a/graphics/vlc/files/patch-libdvdcss b/graphics/vlc/files/patch-libdvdcss
deleted file mode 100644
index 66b6c389303a..000000000000
--- a/graphics/vlc/files/patch-libdvdcss
+++ /dev/null
@@ -1,21 +0,0 @@
---- extras/libdvdcss/Makefile.orig	Fri Aug 24 10:20:05 2001
-+++ extras/libdvdcss/Makefile	Thu Mar 28 19:53:04 2002
-@@ -44,18 +44,6 @@
- all: ../../lib/$(FULL_SO) ../../lib/$(BASE_A)
- 
- install:
--	mkdir -p $(DESTDIR)$(includedir)/videolan
--	$(INSTALL) -m 644 videolan/dvdcss.h $(DESTDIR)$(includedir)/videolan
--	mkdir -p $(DESTDIR)$(libdir)
--	-$(INSTALL) -m 644 ../../lib/$(BASE_A) $(DESTDIR)$(libdir)
--	-$(INSTALL) -m 644 ../../lib/$(FULL_SO) $(DESTDIR)$(libdir)
--	rm -f $(DESTDIR)$(libdir)/$(BASE_SO) && ln -s $(FULL_SO) $(DESTDIR)$(libdir)/$(BASE_SO)
--	rm -f $(DESTDIR)$(libdir)/$(MAJOR_SO) && ln -s $(FULL_SO) $(DESTDIR)$(libdir)/$(MAJOR_SO)
- 
- uninstall:
--	rm -f $(DESTDIR)$(includedir)/videolan/dvdcss.h
--	rm -f $(DESTDIR)$(libdir)/$(BASE_A)
--	rm -f $(DESTDIR)$(libdir)/$(BASE_SO)
--	rm -f $(DESTDIR)$(libdir)/$(MAJOR_SO)
--	rm -f $(DESTDIR)$(libdir)/$(FULL_SO)
- 
diff --git a/graphics/vlc/pkg-plist b/graphics/vlc/pkg-plist
index 24a90b74bb0c..490388592ce1 100644
--- a/graphics/vlc/pkg-plist
+++ b/graphics/vlc/pkg-plist
@@ -1,23 +1,67 @@
 bin/vlc
 bin/gvlc
-lib/videolan/vlc/ac3_spdif.so
+lib/videolan/vlc/dummy.so 
+lib/videolan/vlc/null.so 
+lib/videolan/vlc/rc.so 
+lib/videolan/vlc/logger.so 
+lib/videolan/vlc/mpeg_es.so 
+lib/videolan/vlc/mpeg_ps.so 
+lib/videolan/vlc/mpeg_ts.so 
+lib/videolan/vlc/mpeg_audio.so 
+lib/videolan/vlc/file.so 
+lib/videolan/vlc/udp.so 
+lib/videolan/vlc/http.so 
+lib/videolan/vlc/ipv4.so 
+lib/videolan/vlc/memcpy.so 
+lib/videolan/vlc/lpcm_adec.so 
+lib/videolan/vlc/ac3_spdif.so 
+lib/videolan/vlc/spudec.so 
+lib/videolan/vlc/filter_deinterlace.so 
+lib/videolan/vlc/filter_invert.so 
+lib/videolan/vlc/filter_wall.so 
+lib/videolan/vlc/filter_transform.so 
+lib/videolan/vlc/filter_distort.so 
+lib/videolan/vlc/filter_clone.so 
+lib/videolan/vlc/filter_crop.so 
+lib/videolan/vlc/fx_scope.so 
+lib/videolan/vlc/dvd.so 
+lib/videolan/vlc/dvdread.so 
+lib/videolan/vlc/vcd.so 
+lib/videolan/vlc/ipv6.so 
+lib/videolan/vlc/avi.so 
+lib/videolan/vlc/x11.so 
 lib/videolan/vlc/dsp.so
-lib/videolan/vlc/gtk.so
-lib/videolan/vlc/sdl.so
-lib/videolan/vlc/spu_dec.so
-lib/videolan/vlc/x11.so
+lib/videolan/vlc/gtk.so 
 share/videolan/default8x16.psf
 share/videolan/default8x9.psf
-share/videolan/gnome-vlc.png
-share/videolan/gvlc.png
-share/videolan/kvlc.png
-share/videolan/qvlc.png
-share/videolan/vlc.png
-share/videolan/gnome-vlc.xpm
-share/videolan/gvlc.xpm
-share/videolan/kvlc.xpm
-share/videolan/qvlc.xpm
-share/videolan/vlc.xpm
+share/videolan/gnome-vlc16x16.png
+share/videolan/gnome-vlc32x32.png
+share/videolan/gnome-vlc48x48.png
+share/videolan/gvlc16x16.png
+share/videolan/gvlc32x32.png
+share/videolan/gvlc48x48.png
+share/videolan/kvlc16x16.png
+share/videolan/kvlc32x32.png
+share/videolan/kvlc48x48.png
+share/videolan/qvlc16x16.png
+share/videolan/qvlc32x32.png
+share/videolan/qvlc48x48.png
+share/videolan/vlc16x16.png
+share/videolan/vlc32x32.png
+share/videolan/vlc48x48.png
+share/videolan/gnome-vlc32x32.xpm
+share/videolan/gvlc32x32.xpm
+share/videolan/kvlc32x32.xpm
+share/videolan/qvlc32x32.xpm
+share/videolan/vlc32x32.xpm
+share/locale/de/LC_MESSAGES/vlc.mo
+share/locale/en_GB/LC_MESSAGES/vlc.mo
+share/locale/fr/LC_MESSAGES/vlc.mo
+share/locale/ja/LC_MESSAGES/vlc.mo
+share/locale/no/LC_MESSAGES/vlc.mo
+share/locale/ru/LC_MESSAGES/vlc.mo
+share/locale/nl/LC_MESSAGES/vlc.mo
+share/locale/pl/LC_MESSAGES/vlc.mo
 @dirrm lib/videolan/vlc
 @dirrm lib/videolan
 @dirrm share/videolan