Use GTK and SDL.

We now have all the niceties of subtitles and menus and that sort of stuff.
Mirror the archive on ftp.awfulhak.org and people.freebsd.org
Bump PORTREVISION

All ideas submitted by: Scott Lambert <lambert@lambertfam.org>

6 files changed, 48 insertions, 15 deletions

diff --git a/graphics/vlc/Makefile b/graphics/vlc/Makefile
index c35481048995..9329f8318456 100644
--- a/graphics/vlc/Makefile
+++ b/graphics/vlc/Makefile
@@ -7,14 +7,28 @@
 
 PORTNAME=	vlc
 PORTVERSION=	0.2.81
+PORTREVISION=	1
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.videolan.org/pub/videolan/vlc/0.2.81/
+MASTER_SITES=	http://www.videolan.org/pub/videolan/vlc/0.2.81/ \
+		ftp://ftp.Awfulhak.org/pub/vlc/ \
+		http://people.FreeBSD.org/~brian/vlc/
 
 MAINTAINER=	brian@Awfulhak.org
 
-GNU_CONFIGURE=	yes
+LIB_DEPENDS=	SDL-1.1:${PORTSDIR}/devel/sdl12
+
+HAS_CONFIGURE=	yes
+CONFIGURE_ENV=	PATH_GTKCONFIG="${PREFIX}/bin/gtk12-config" \
+		CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		SDL_CONFIG="${LOCALBASE}/bin/sdl11-config"
+USE_GTK=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 
+pre-patch:
+	@${PERL} -pi.orig -e "s|SDL/SDL.h|SDL11/SDL.h|g" ${WRKSRC}/configure \
+	    ${WRKSRC}/plugins/sdl/vout_sdl.c
+
 .include <bsd.port.mk>
diff --git a/graphics/vlc/pkg-descr b/graphics/vlc/pkg-descr
index 549301fcec7c..c56f5e1b54f2 100644
--- a/graphics/vlc/pkg-descr
+++ b/graphics/vlc/pkg-descr
@@ -12,6 +12,3 @@ vlc@videolan.org is a mailing list for support and discussion
 The VideoLAN web site at http://www.videolan.org/ is a good start for
 information about MPEG and DVD playing. Have a look at the documentation
 section (http://www.videolan.org/doc.html), as well as the bookmarks.
-
-vlc is in it's early days.  It may be necessary to run it with with
-``-V x11'' to make it work.
diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile
index c35481048995..9329f8318456 100644
--- a/multimedia/vlc-devel/Makefile
+++ b/multimedia/vlc-devel/Makefile
@@ -7,14 +7,28 @@
 
 PORTNAME=	vlc
 PORTVERSION=	0.2.81
+PORTREVISION=	1
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.videolan.org/pub/videolan/vlc/0.2.81/
+MASTER_SITES=	http://www.videolan.org/pub/videolan/vlc/0.2.81/ \
+		ftp://ftp.Awfulhak.org/pub/vlc/ \
+		http://people.FreeBSD.org/~brian/vlc/
 
 MAINTAINER=	brian@Awfulhak.org
 
-GNU_CONFIGURE=	yes
+LIB_DEPENDS=	SDL-1.1:${PORTSDIR}/devel/sdl12
+
+HAS_CONFIGURE=	yes
+CONFIGURE_ENV=	PATH_GTKCONFIG="${PREFIX}/bin/gtk12-config" \
+		CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		SDL_CONFIG="${LOCALBASE}/bin/sdl11-config"
+USE_GTK=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 
+pre-patch:
+	@${PERL} -pi.orig -e "s|SDL/SDL.h|SDL11/SDL.h|g" ${WRKSRC}/configure \
+	    ${WRKSRC}/plugins/sdl/vout_sdl.c
+
 .include <bsd.port.mk>
diff --git a/multimedia/vlc-devel/pkg-descr b/multimedia/vlc-devel/pkg-descr
index 549301fcec7c..c56f5e1b54f2 100644
--- a/multimedia/vlc-devel/pkg-descr
+++ b/multimedia/vlc-devel/pkg-descr
@@ -12,6 +12,3 @@ vlc@videolan.org is a mailing list for support and discussion
 The VideoLAN web site at http://www.videolan.org/ is a good start for
 information about MPEG and DVD playing. Have a look at the documentation
 section (http://www.videolan.org/doc.html), as well as the bookmarks.
-
-vlc is in it's early days.  It may be necessary to run it with with
-``-V x11'' to make it work.
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index c35481048995..9329f8318456 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -7,14 +7,28 @@
 
 PORTNAME=	vlc
 PORTVERSION=	0.2.81
+PORTREVISION=	1
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.videolan.org/pub/videolan/vlc/0.2.81/
+MASTER_SITES=	http://www.videolan.org/pub/videolan/vlc/0.2.81/ \
+		ftp://ftp.Awfulhak.org/pub/vlc/ \
+		http://people.FreeBSD.org/~brian/vlc/
 
 MAINTAINER=	brian@Awfulhak.org
 
-GNU_CONFIGURE=	yes
+LIB_DEPENDS=	SDL-1.1:${PORTSDIR}/devel/sdl12
+
+HAS_CONFIGURE=	yes
+CONFIGURE_ENV=	PATH_GTKCONFIG="${PREFIX}/bin/gtk12-config" \
+		CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		SDL_CONFIG="${LOCALBASE}/bin/sdl11-config"
+USE_GTK=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 
+pre-patch:
+	@${PERL} -pi.orig -e "s|SDL/SDL.h|SDL11/SDL.h|g" ${WRKSRC}/configure \
+	    ${WRKSRC}/plugins/sdl/vout_sdl.c
+
 .include <bsd.port.mk>
diff --git a/multimedia/vlc/pkg-descr b/multimedia/vlc/pkg-descr
index 549301fcec7c..c56f5e1b54f2 100644
--- a/multimedia/vlc/pkg-descr
+++ b/multimedia/vlc/pkg-descr
@@ -12,6 +12,3 @@ vlc@videolan.org is a mailing list for support and discussion
 The VideoLAN web site at http://www.videolan.org/ is a good start for
 information about MPEG and DVD playing. Have a look at the documentation
 section (http://www.videolan.org/doc.html), as well as the bookmarks.
-
-vlc is in it's early days.  It may be necessary to run it with with
-``-V x11'' to make it work.