graphics/gnash: remove optional dependency on expired www/libxul

This mean the PLUGIN option is dropped.
Bump PORTREVISION

2 files changed, 3 insertions, 41 deletions

diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile
index 0d2271b8d5f5..47ba1721d7c6 100644
--- a/graphics/gnash/Makefile
+++ b/graphics/gnash/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnash
 PORTVERSION=	0.8.10
-PORTREVISION=	35
+PORTREVISION=	36
 CATEGORIES=	graphics
 MASTER_SITES=	http://git.savannah.gnu.org/cgit/gnash.git/snapshot/
 DISTNAME=	gnash-2b3bdede0305c4fc3ad21a0a4197330606c9b880
@@ -56,16 +56,15 @@ PLIST_SUB+=	GNASHVER="${GNASHVER}"
 
 USE_LDCONFIG=	${PREFIX}/lib/gnash
 
-OPTIONS_DEFINE=	PLUGIN CYGNAL VAAPI DOCS
+OPTIONS_DEFINE=	CYGNAL VAAPI DOCS
 OPTIONS_SINGLE=	MEDIA GUI RENDERER
 OPTIONS_SINGLE_MEDIA=	FFMPEG GSTREAMER
 OPTIONS_SINGLE_GUI=	GTK2 KDE4
 OPTIONS_SINGLE_RENDERER=AGG OPENGL CAIRO
-OPTIONS_DEFAULT=GTK2 PLUGIN AGG FFMPEG VAAPI
+OPTIONS_DEFAULT=GTK2 AGG FFMPEG VAAPI
 
 NO_OPTIONS_SORT=yes
 OPTIONS_SUB=	yes
-PLUGIN_DESC=	browser plugin
 CYGNAL_DESC=	Cygnal media server
 AGG_DESC=	AGG renderer
 OPENGL_DESC=	OpenGL renderer (experimental)
@@ -93,31 +92,9 @@ CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-#
-# Plugin configuration
-#
-.if ${PORT_OPTIONS:MGTK2} && ${PORT_OPTIONS:MPLUGIN}
-USES+=	webplugin:native
-WEBPLUGIN_NAME=		gnash
-WEBPLUGIN_FILES=	libgnashplugin.so
-WEBPLUGIN_DIR=${_WEBPLUGIN_LIBDIR:S,^${LOCALBASE}/,${PREFIX}/,}/${WEBPLUGIN_NAME}
-PLIST_SUB+=	NPAPI=""
-CONFIGURE_ARGS+=--with-npapi-plugindir="${WEBPLUGIN_DIR}"
-BUILD_DEPENDS+=	${LOCALBASE}/bin/xulrunner:www/libxul
-RUN_DEPENDS+=	${LOCALBASE}/bin/xulrunner:www/libxul
-.else
-PLIST_SUB+=	NPAPI="@comment "
 CONFIGURE_ARGS+=	--disable-npapi
-.endif
 
-.if ${PORT_OPTIONS:MKDE4} && ${PORT_OPTIONS:MPLUGIN}
-PLIST_SUB+=	KPARTS4="${KDE_PREFIX}"
-CONFIGURE_ARGS+=	--with-kde4_prefix=${KDE_PREFIX} \
-			--with-kde-appsdatadir=${KDE_PREFIX}/share/apps/klash
-.else
-PLIST_SUB+=	KPARTS4="@comment "
 CONFIGURE_ARGS+=	--disable-kparts4
-.endif
 
 #
 # GUI options processing
@@ -232,15 +209,5 @@ post-install:
 .for conf in ${CONFIG_FILES}
 	${MV} ${STAGEDIR}/${SYSCONFIGDIR}/${conf} ${STAGEDIR}${SYSCONFIGDIR}/${conf}.dist
 .endfor
-.if ${PORT_OPTIONS:MPLUGIN}
-.if ${PORT_OPTIONS:MGTK2}
-	cd ${INSTALL_WRKSRC}/plugin && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-plugin
-.endif
-.if ${PORT_OPTIONS:MKDE4}
-	cd ${INSTALL_WRKSRC}/plugin/klash4 && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-plugin
-.endif
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/graphics/gnash/pkg-plist b/graphics/gnash/pkg-plist
index 315cc08ed2db..2035ff6694ed 100644
--- a/graphics/gnash/pkg-plist
+++ b/graphics/gnash/pkg-plist
@@ -11,7 +11,6 @@ bin/rtmpget
 %%CYGNAL%%bin/cygnal
 %%CYGNAL%%bin/flvdumper
 %%CYGNAL%%bin/soldumper
-%%NPAPI%%%%WEBPLUGIN_DIR%%/libgnashplugin.so
 %%CYGNAL%%@sample etc/cygnalrc.dist etc/cygnalrc
 @sample etc/gnashpluginrc.dist etc/gnashpluginrc
 @sample etc/gnashrc.dist etc/gnashrc
@@ -181,10 +180,6 @@ include/gnash/vm/SafeStack.h
 include/gnash/vm/VM.h
 include/gnash/vm/fn_call.h
 include/gnash/zlib_adapter.h
-%%KPARTS4%%/share/apps/klash/pluginsinfo
-%%KPARTS4%%/share/apps/klash/klashpartui.rc
-%%KPARTS4%%/share/kde4/services/klash_part.desktop
-%%KPARTS4%%/lib/kde4/libklashpart.so
 %%CYGNAL%%lib/cygnal/plugins/echo.so
 %%CYGNAL%%lib/cygnal/plugins/oflaDemo.so
 %%CYGNAL%%lib/gnash/libgnashamf-%%GNASHVER%%.so