Sync w/ FreeBSD ports tree.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7083 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 36 insertions, 23 deletions

diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile
index 6807eb268..cecd471bf 100644
--- a/multimedia/vlc-devel/Makefile
+++ b/multimedia/vlc-devel/Makefile
@@ -3,14 +3,14 @@
 # Whom:			Brian Somers <brian@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/multimedia/vlc-devel/Makefile,v 1.15 2006/07/23 04:58:06 ahze Exp $
+#    $MCom: ports/multimedia/vlc-devel/Makefile,v 1.16 2006/08/09 15:43:58 ahze Exp $
 #
 # *** PLEASE READ Makefile.inc for more information on knobs ***
 #
 
 PORTNAME=	vlc
 DISTVERSION=	0.8.6.20060719
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://nightlies.videolan.org/build/source/
 #		http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \
@@ -44,7 +44,7 @@ USE_PERL5_BUILD=yes
 FAKEDIR=	${WRKDIR}/fake
 PLIST=		${WRKDIR}/plist
 
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${WRKSRC}/include ${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
@@ -74,7 +74,7 @@ CPPFLAGS+=	-I${X11BASE}/include/wx-2.6/
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500800
-BROKEN=Does not compile with perl ${PERL_VERSION}
+BROKEN=	Does not compile with perl ${PERL_VERSION}
 .endif
 
 .if exists(${LOCALBASE}/libdata/pkgconfig/libavcodec.pc) || !exists(${LOCALBASE}/lib/libavformat.a)
@@ -386,7 +386,7 @@ CONFIGURE_ARGS+=	--enable-real \
 
 .if (defined(WITH_SHOUT) || exists(${LOCALBASE}/lib/libshout.a)) && !defined(WITHOUT_SHOUT)
 LIB_DEPENDS+=	shout.5:${PORTSDIR}/audio/libshout2
-CONFIGURE_AGRS+=	--enable-shout
+CONFIGURE_ARGS+=	--enable-shout
 .endif
 
 .if (defined(WITH_THEORA) || exists(${LOCALBASE}/lib/libtheora.a)) && !defined(WITHOUT_THEORA)
@@ -433,7 +433,7 @@ CONFIGURE_ARGS+=--disable-galaktos
 .endif
 
 .if !defined(WITHOUT_SAMBA)
-LIB_DEPEND+=	smbclient.0:${PORTSDIR}/net/samba-libsmbclient
+LIB_DEPENDS+=	smbclient.0:${PORTSDIR}/net/samba-libsmbclient
 CONFIGURE_ARGS+=--enable-smb
 .else
 CONFIGURE_ARGS+=--disable-smb
@@ -479,7 +479,7 @@ CONFIGURE_ARGS+=--disable-sout
 USE_GNOME+=	librsvg2
 CONFIGURE_ARGS+=--enable-svg
 .else
-CONFIGURE_AGRS+=--disable-svg
+CONFIGURE_ARGS+=--disable-svg
 .endif
 
 .if (defined(WITH_SVGALIB) || exists(${LOCALBASE}/lib/lib/vga.a)) && !defined(WITHOUT_SVGALIB)
@@ -517,7 +517,7 @@ CONFIGURE_ARGS+=--disable-xosd
 .endif
 
 .if defined(DEBUG)
-CONFIGURE_AGRS+=--enable-debug
+CONFIGURE_ARGS+=--enable-debug
 .else
 CONFIGURE_ARGS+=--enable-release
 .endif
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index c012ec364..8bcae511a 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -3,14 +3,14 @@
 # Whom:			Brian Somers <brian@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/multimedia/vlc/Makefile,v 1.1 2006/07/18 20:53:46 ahze Exp $
+#    $MCom$
 #
 # *** PLEASE READ Makefile.inc for more information on knobs ***
 #
 
 PORTNAME=	vlc
 DISTVERSION=	0.8.5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \
 		http://ftp.snt.utwente.nl/pub/software/videolan/vlc/${PORTVERSION}/ \
@@ -39,7 +39,7 @@ USE_PERL5_BUILD=yes
 FAKEDIR=	${WRKDIR}/fake
 PLIST=		${WRKDIR}/plist
 
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${WRKSRC}/include ${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
@@ -68,11 +68,11 @@ CPPFLAGS+=	-I${X11BASE}/include/wx-2.6/
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500035
-BROKEN= does not build on FreeBSD 4.x
+BROKEN=	Does not build on FreeBSD 4.x
 .endif
 
 .if ${PERL_LEVEL} < 500800
-BROKEN=	does not compile with perl ${PERL_VERSION}
+BROKEN=	Does not compile with perl ${PERL_VERSION}
 .endif
 
 .if exists(${LOCALBASE}/libdata/pkgconfig/libavcodec.pc) || !exists(${LOCALBASE}/lib/libavformat.a)
@@ -272,13 +272,13 @@ CONFIGURE_ARGS+=--enable-aa
 CONFIGURE_ARGS+=--disable-aa
 .endif
 
-.if (defined(WITH_DIRAC) || exists(${LOCALBASE}/lib/libdirac_decoder.a)) && !defined(WITHOUT_DIRAC)
-LIB_DEPENDS+=	dirac_encoder.0:${PORTSDIR}/multimedia/dirac
-CONFIGURE_ARGS+=--enable-dirac
-CPPFLAGS+=	-I${LOCALBASE}/include/dirac
-.else
+#.if (defined(WITH_DIRAC) || exists(${LOCALBASE}/lib/libdirac_decoder.a)) && !defined(WITHOUT_DIRAC)
+#LIB_DEPENDS+=	dirac_encoder.0:${PORTSDIR}/multimedia/dirac
+#CONFIGURE_ARGS+=--enable-dirac
+#CPPFLAGS+=	-I${LOCALBASE}/include/dirac
+#.else
 CONFIGURE_ARGS+=--disable-dirac
-.endif
+#.endif
 
 .if !defined(WITHOUT_X264)
 CONFIGURE_ARGS+=--enable-x264
@@ -377,7 +377,7 @@ CONFIGURE_ARGS+=	--enable-real \
 
 .if (defined(WITH_SHOUT) || exists(${LOCALBASE}/lib/libshout.a)) && !defined(WITHOUT_SHOUT)
 LIB_DEPENDS+=	shout.5:${PORTSDIR}/audio/libshout2
-CONFIGURE_AGRS+=	--enable-shout
+CONFIGURE_ARGS+=	--enable-shout
 .endif
 
 .if (defined(WITH_THEORA) || exists(${LOCALBASE}/lib/libtheora.a)) && !defined(WITHOUT_THEORA)
@@ -424,7 +424,7 @@ CONFIGURE_ARGS+=--disable-galaktos
 .endif
 
 .if !defined(WITHOUT_SAMBA)
-LIB_DEPEND+=	smbclient.0:${PORTSDIR}/net/samba-libsmbclient
+LIB_DEPENDS+=	smbclient.0:${PORTSDIR}/net/samba-libsmbclient
 CONFIGURE_ARGS+=--enable-smb
 .else
 CONFIGURE_ARGS+=--disable-smb
@@ -470,7 +470,7 @@ CONFIGURE_ARGS+=--disable-sout
 USE_GNOME+=	librsvg2
 CONFIGURE_ARGS+=--enable-svg
 .else
-CONFIGURE_AGRS+=--disable-svg
+CONFIGURE_ARGS+=--disable-svg
 .endif
 
 .if (defined(WITH_SVGALIB) || exists(${LOCALBASE}/lib/lib/vga.a)) && !defined(WITHOUT_SVGALIB)
@@ -508,7 +508,7 @@ CONFIGURE_ARGS+=--disable-xosd
 .endif
 
 .if defined(DEBUG)
-CONFIGURE_AGRS+=--enable-debug
+CONFIGURE_ARGS+=--enable-debug
 .else
 CONFIGURE_ARGS+=--enable-release
 .endif
diff --git a/multimedia/vlc/Makefile.inc b/multimedia/vlc/Makefile.inc
index ae0d0e3e0..227e6fa11 100644
--- a/multimedia/vlc/Makefile.inc
+++ b/multimedia/vlc/Makefile.inc
@@ -1,3 +1,4 @@
+
 # NOTES about VLC Knobs:
 # Below you will see a number of knobs, if it starts with WITHOUT_ it is
 # enabled by default, if it starts with WITH_ it is disabled by default
diff --git a/multimedia/vlc/files/patch-modules_control_corba_corba.c b/multimedia/vlc/files/patch-modules_control_corba_corba.c
new file mode 100644
index 000000000..040a156ca
--- /dev/null
+++ b/multimedia/vlc/files/patch-modules_control_corba_corba.c
@@ -0,0 +1,12 @@
+--- modules/control/corba/corba.c.orig	Sun Aug 20 00:16:21 2006
++++ modules/control/corba/corba.c	Sun Aug 20 00:17:24 2006
+@@ -28,8 +28,8 @@
+ #include "MediaControl.h"
+ #include "orbit/poa/portableserver-poa-type.h"
+ 
+-#include <vlc/control.h>
+ #include <vlc/vlc.h>
++#include <vlc/mediacontrol.h>
+ #include <vlc/intf.h>
+ #include <vlc/vout.h>
+ #include <vlc/aout.h>