- Update to 0.8.4a

- Switch to USE_GECKO

2 files changed, 14 insertions, 38 deletions

diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index a3ccf4ca0469..ac2cc0d32bdf 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -175,8 +175,8 @@
 # WITH_DVDREAD=yes
 #  Enable Regular DVD support (non-menu)
 #
-# WITH_MOZILLA=	[mozilla|mozilla-devel|firefox]
-# WITH_MOZILLA_PLUGIN= yes
+# WITH_GECKO= [firefox|mozilla|seamonkey|nvu]
+# WITH_VLC_MOZILLA_PLUGIN= yes
 #  Enable A mozilla plugin for VLC
 #  See http://www.videolan.org/doc/vlc-user-guide/en/ch07.html#id2529837
 #  for more info on using this plugin.
@@ -223,7 +223,7 @@
 #
 
 PORTNAME=	vlc
-DISTVERSION=	0.8.4
+DISTVERSION=	0.8.4a
 PORTREVISION=	0
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download2.videolan.org/pub/videolan/testing/${PORTNAME}-${DISTVERSION}/ \
@@ -279,31 +279,14 @@ MAN1=		vlc.1 \
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_MOZILLA_PLUGIN) && !defined(WITHOUT_MOZILLA_PLUGIN)
-### Remove comment when gnome 2.12 hits the streets.
-#WITH_MOZILLA?=	firefox
-.if defined(WITH_MOZILLA) && ${WITH_MOZILLA}=="firefox"
-BUILD_DEPENDS+=	${X11BASE}/libdata/pkgconfig/firefox-plugin.pc:${PORTSDIR}/www/firefox
-RUN_DEPENDS+=	${X11BASE}/libdata/pkgconfig/firefox-plugin.pc:${PORTSDIR}/www/firefox
-
-CONFIGURE_ENV+=	MOZILLA_CONFIG="${X11BASE}/bin/firefox-config" \
-		XPIDL="${X11BASE}/lib/firefox/xpidl"\
-		XPIDL_INCL="-I${X11BASE}/share/idl/firefox"
-.else
-BUILD_DEPENDS+=	${X11BASE}/libdata/pkgconfig/mozilla-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/mozilla${HEADERS_SUFX}
-RUN_DEPENDS+=	${X11BASE}/libdata/pkgconfig/mozilla-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/mozilla${HEADERS_SUFX}
-
-CONFIGURE_ENV+=	MOZILLA_CONFIG="${X11BASE}/lib/mozilla${HEADERS_SUFX}/mozilla-config" \
-		XPIDL="${X11BASE}/lib/mozilla${HEADERS_SUFX}/xpidl" \
-		XPIDL_INCL="-I${X11BASE}/share/idl/mozilla${HEADERS_SUFX}"
-.endif
+.if defined(WITH_VLC_MOZILLA_PLUGIN) && !defined(WITHOUT_VLC_MOZILLA_PLUGIN)
+USE_GECKO=      firefox mozilla seamonkey nvu
+.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
+CONFIGURE_ENV+=	MOZILLA_CONFIG="${GECKO_CONFIG}" \
+		XPIDL="${XPIDL}" \
+		XPIDL_INCL="${XPIDL_INCL}"
 MOZILLA_SUFFIX=-mozilla
 CONFIGURE_ARGS+=--enable-mozilla
-.if defined(WITH_MOZILLA) && ${WITH_MOZILLA}=="mozilla-devel"
-HEADERS_SUFX=	-devel
-.else
-HEADERS_SUFX=
-.endif
 .endif
 
 .if defined(WITH_WXGTK_VER) && ${WITH_WXGTK_VER}=="2.4"
@@ -323,13 +306,6 @@ BROKEN=	"Does not compile with perl ${PERL_VERSION}"
 WITH_WXGTK_VER=	2.4
 .endif
 
-.if ${OSVERSION} < 500000 && defined(WITH_MOZILLA_PLUGIN) && !defined(WITHOUT_MOZILLA_PLUGIN)
-.if ${WITH_MOZILLA}=="mozilla-devel"
-USE_GCC=	3.4
-WITHOUT_LIVEMEDIA=	yes
-.endif
-.endif
-
 # compatible knobs.
 .if defined(WITH_DEBUG)
 DEBUG=	yes
@@ -851,7 +827,7 @@ pre-install:
 	cd ${FAKEDIR}/share/locale &&  ${FIND} -s * -type f -o -type l | \
 		${SED} -e 's|^|share/locale/|' >> ${PLIST}
 .endif
-.if defined(WITH_MOZILLA_PLUGIN) && !defined(WITHOUT_MOZILLA_PLUGIN)
+.if defined(WITH_VLC_MOZILLA_PLUGIN) && !defined(WITHOUT_VLC_MOZILLA_PLUGIN)
 	cd ${FAKEDIR}/mozilla && ${FIND} -s * | \
 		${SED} -e 's|^|lib/browser_plugins/|' >> ${PLIST}
 .endif
@@ -872,7 +848,7 @@ do-install:
 		${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib
 	cd ${FAKEDIR}/share && ${FIND} . | \
 		${CPIO} -vpdm -L -R ${SHAREOWN} ${PREFIX}/share
-.if defined(WITH_MOZILLA_PLUGIN) && !defined(WITHOUT_MOZILLA_PLUGIN)
+.if defined(WITH_VLC_MOZILLA_PLUGIN) && !defined(WITHOUT_VLC_MOZILLA_PLUGIN)
 	@${MKDIR} ${PREFIX}/lib/browser_plugins
 	${INSTALL_DATA} ${FAKEDIR}/mozilla/* ${PREFIX}/lib/browser_plugins
 .endif
diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo
index 2b50bb634fad..6a46d77a699a 100644
--- a/multimedia/vlc/distinfo
+++ b/multimedia/vlc/distinfo
@@ -1,3 +1,3 @@
-MD5 (vlc-0.8.4.tar.bz2) = 5e94de5a374d2cab2a8d6f315204cc71
-SHA256 (vlc-0.8.4.tar.bz2) = f9149af2c02e37a418bddb9f09bce382e84beba104d32fa792070418929f9b6a
-SIZE (vlc-0.8.4.tar.bz2) = 7245500
+MD5 (vlc-0.8.4a.tar.bz2) = 944329bc288ef815e678745e07f1999e
+SHA256 (vlc-0.8.4a.tar.bz2) = 003b6bb71255af006ac3a36ff0184e0cb9d5e08589b2d500f73b3c8052d6adf9
+SIZE (vlc-0.8.4a.tar.bz2) = 7191539