2 files changed, 5 insertions, 33 deletions

diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 346fcc184a37..644d85ea5f62 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	vlc
-DISTVERSION=	1.1.4
-PORTREVISION=	2
+DISTVERSION=	1.1.5
 PORTEPOCH=	3
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION}/ \
@@ -55,7 +54,6 @@ OPTIONS=	A52 "A52 DVD audio decoder" On \
 		OCFLAGS "Optimized CFLAGS" Off \
 		OGG "Ogg audio decoder support" On \
 		OPENGL "OpenGL acceleration support" Off \
-		PLUGIN "VLC Mozilla Plugin" Off \
 		PNG "PNG graphics format support" On \
 		PORTAUDIO "Portaudio library support" Off \
 		PULSE "Pulse Audio support" Off \
@@ -444,19 +442,6 @@ CONFIGURE_ARGS+=--enable-opengl
 CONFIGURE_ARGS+=--disable-opengl
 .endif
 
-.if defined(WITH_PLUGIN)
-USE_GECKO=	libxul
-USE_WEBPLUGINS=	gecko*
-WEBPLUGINS_FILES=libvlcplugin.so
-.include "${PORTSDIR}/www/firefox/Makefile.webplugins"
-CONFIGURE_ENV+=	MOZILLA_CONFIG="${GECKO_CONFIG}" \
-		XPIDL="${XPIDL}" \
-		XPIDL_INCL="${XPIDL_INCL}"
-CONFIGURE_ARGS+=--enable-mozilla
-.else
-CONFIGURE_ARGS+=--disable-mozilla
-.endif
-
 .if defined(WITHOUT_PNG)
 CONFIGURE_ARGS+=--disable-png
 .else
@@ -634,6 +619,7 @@ CONFIGURE_ARGS+=--disable-x264
 .if defined(WITHOUT_XCB)
 CONFIGURE_ARGS+=--disable-xcb --without-x
 .else
+USE_XORG=	xpm
 LIBDEPENDS+=	xcb.2:${PORTSDIR}/x11/libxcb
 CONFIGURE_ARGS+=--enable-xcb --with-x
 .endif
@@ -668,11 +654,6 @@ post-patch:
 		${WRKSRC}/include/vlc_config.h
 	${REINPLACE_CMD} -e 's|portaudio\.h|portaudio2/&|g' \
 		${WRKSRC}/modules/audio_output/portaudio.c
-.if defined(WITH_PLUGIN)
-	@${REINPLACE_CMD} -e 's|npvlcdir = $$(libdir)/mozilla/plugins|npvlcdir = ${WEBPLUGINS_DIR}|g' \
-		${WRKSRC}/projects/mozilla/Makefile.am \
-		${WRKSRC}/projects/mozilla/Makefile.in
-.endif
 
 pre-install:
 	${RM} -rf ${PLIST} ${FAKEDIR}
@@ -694,14 +675,6 @@ pre-install:
 	${RM} -f ${FAKEDIR}/lib/vlc/plugins/services_discovery/libsap_plugin.la
 	${RM} -f ${FAKEDIR}/lib/vlc/plugins/services_discovery/libsap_plugin.so
 .endif
-.if defined(WITH_PLUGIN)
-.for ext in so la
-	${ECHO_CMD} "${WEBPLUGINS_DIR}/libvlcplugin.${ext}" | \
-		${SED} -e 's|${PREFIX}/||' >> ${PLIST}
-.endfor
-	${ECHO_CMD} "@dirrmtry ${WEBPLUGINS_DIR}" | \
-		${SED} -e 's|${PREFIX}/||' >> ${PLIST}
-.endif
 	cd ${FAKEDIR}/lib && ${FIND} -s * -type f -o -type l| \
 		${SED} -e 's|^|lib/|' >> ${PLIST} \
 		&& ${FIND} -d * -type d | \
@@ -757,6 +730,6 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/vlc-config.1 ${MANPREFIX}/man/man1/
 	if [ ! -d ${PREFIX}/share/applications ]; then \
 		${MKDIR} ${PREFIX}/share/applications ; \
-fi
+	fi
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo
index 02f8db8fe163..02a1cb5a3737 100644
--- a/multimedia/vlc/distinfo
+++ b/multimedia/vlc/distinfo
@@ -1,3 +1,2 @@
-MD5 (vlc-1.1.4.tar.bz2) = b71aacaa242f8050a64c6ffe09d6f067
-SHA256 (vlc-1.1.4.tar.bz2) = 0951493d27af3f950ed57ff123d9cb17ed1d17c8ae51741d3a90f4973af397d7
-SIZE (vlc-1.1.4.tar.bz2) = 23923550
+SHA256 (vlc-1.1.5.tar.bz2) = f8e3af9c317fb2e695ba2b9b7f5ac904e6eda3b078f632b98746ffc277e5ca26
+SIZE (vlc-1.1.5.tar.bz2) = 24111723