graphics/gnash: cleanup after r488774

GTK2 is compulsory so make it non-optional and remove related processing code.

Submitted by:	jbeich

2 files changed, 11 insertions, 30 deletions

diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile
index 53ab8bd81a4c..29bc5192d8c4 100644
--- a/graphics/gnash/Makefile
+++ b/graphics/gnash/Makefile
@@ -31,7 +31,7 @@ USES=		autoreconf compiler:c++11-lang cpe desktop-file-utils gl \
 CPE_VENDOR=	gnu
 GNU_CONFIGURE=	yes
 WANT_GSTREAMER=	yes
-USE_GNOME=	libxml2
+USE_GNOME=	atk gconf2 gtk20 libxml2 pango
 USE_XORG=	x11 xau xdmcp xext xi xinerama ice sm xv
 USE_GL=		egl
 INSTALLS_ICONS=	yes
@@ -45,6 +45,7 @@ CONFIGURE_ARGS=	--with-boost-incl="${LOCALBASE}/include" \
 		--with-boost-lib="${LOCALBASE}/lib" \
 		--with-plugins-install=prefix \
 		--sysconfdir="${SYSCONFIGDIR}" \
+		--enable-gui=gtk \
 		--disable-testsuite \
 		--disable-kparts3 \
 		--disable-jemalloc
@@ -57,11 +58,11 @@ PLIST_SUB+=	GNASHVER="${GNASHVER}"
 
 USE_LDCONFIG=	${PREFIX}/lib/gnash
 
-OPTIONS_DEFINE=	CYGNAL VAAPI DOCS NLS GTK2
+OPTIONS_DEFINE=	CYGNAL VAAPI DOCS NLS
 OPTIONS_SINGLE=	MEDIA RENDERER
 OPTIONS_SINGLE_MEDIA=	FFMPEG GSTREAMER
 OPTIONS_SINGLE_RENDERER=AGG OPENGL CAIRO
-OPTIONS_DEFAULT=GTK2 AGG FFMPEG VAAPI
+OPTIONS_DEFAULT=AGG FFMPEG VAAPI
 
 NO_OPTIONS_SORT=yes
 OPTIONS_SUB=	yes
@@ -91,25 +92,7 @@ CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-CONFIGURE_ARGS+=	--disable-npapi
-
-CONFIGURE_ARGS+=	--disable-kparts4
-
-#
-# GUI options processing
-#
-GNASH_GUIS=
-
-.if ${PORT_OPTIONS:MGTK2}
-USE_GNOME+=	gtk20 pango atk gconf2
-GNASH_GUIS+=	gtk
-.endif
-
-.if ${GNASH_GUIS} == ""
-IGNORE=		needs at least one GUI enabled. Please rerun 'make config' and enable GTK
-.endif
-
-CONFIGURE_ARGS+=--enable-gui=`${ECHO} ${GNASH_GUIS} | ${TR} ' ' ,`
+CONFIGURE_ARGS+=	--disable-npapi --disable-kparts4
 
 #
 # Renderer options processing
@@ -124,10 +107,8 @@ GNASH_RENDERERS+=	agg
 .if ${PORT_OPTIONS:MOPENGL}
 IGNORE=		support for OpenGL is currently broken, use option AGG
 GNASH_RENDERERS+=	ogl
-.if ${PORT_OPTIONS:MGTK2}
 LIB_DEPENDS+=		libgdkglext-x11-1.0.so:x11-toolkits/gtkglext
 .endif
-.endif
 
 .if ${PORT_OPTIONS:MCAIRO}
 LIB_DEPENDS+=		libcairo.so:graphics/cairo
diff --git a/graphics/gnash/pkg-plist b/graphics/gnash/pkg-plist
index c2cf4f08fe18..22d28228eaa8 100644
--- a/graphics/gnash/pkg-plist
+++ b/graphics/gnash/pkg-plist
@@ -1,7 +1,7 @@
 bin/eglinfo-gnash
 bin/gnash
-%%GTK2%%bin/gnash-gtk-launcher
-%%GTK2%%bin/gtk-gnash
+bin/gnash-gtk-launcher
+bin/gtk-gnash
 bin/gprocessor
 bin/rtmpget
 %%GSTREAMER%%bin/findmicrophones
@@ -199,7 +199,7 @@ lib/gnash/libgnashsound.so
 %%VAAPI%%lib/gnash/libgnashvaapi-%%GNASHVER%%.so
 %%VAAPI%%lib/gnash/libgnashvaapi.so
 libdata/pkgconfig/gnash.pc
-%%GTK2%%share/applications/gnash.desktop
+share/applications/gnash.desktop
 man/man1/cygnal.1.gz
 man/man1/findmicrophones.1.gz
 man/man1/findwebcams.1.gz
@@ -208,15 +208,15 @@ man/man1/gnash.1.gz
 man/man1/gprocessor.1.gz
 man/man1/rtmpget.1.gz
 man/man1/soldumper.1.gz
-%%GTK2%%man/man1/gnash-gtk-launcher.1.gz
-%%GTK2%%man/man1/gtk-gnash.1.gz
+man/man1/gnash-gtk-launcher.1.gz
+man/man1/gtk-gnash.1.gz
 %%DATADIR%%/GnashG.png
 %%DATADIR%%/gnash-splash.swf
 %%DATADIR%%/gnash_128_96.ico
 %%PORTDOCS%%%%DOCSDIR%%/gnashref.html
 %%PORTDOCS%%%%DOCSDIR%%/gnashuser.html
 %%PORTDOCS%%%%DOCSDIR%%/images/rtmp.png
-%%GTK2%%share/icons/hicolor/32x32/apps/gnash.xpm
+share/icons/hicolor/32x32/apps/gnash.xpm
 share/locale/cs/LC_MESSAGES/gnash.mo
 share/locale/da/LC_MESSAGES/gnash.mo
 share/locale/de/LC_MESSAGES/gnash.mo