Index: multimedia/gxine/Makefile
===================================================================
--- multimedia/gxine/Makefile
+++ multimedia/gxine/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gxine
 PORTVERSION=	0.5.910
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/xine/${PORTNAME}/${PORTVERSION}
 
@@ -10,6 +11,7 @@
 COMMENT=	Alternative GUI for the Xine media player
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libnspr4.so:devel/nspr \
 		libmozjs185.so:lang/spidermonkey185 \
@@ -18,35 +20,28 @@
 USES=		desktop-file-utils gettext gmake libtool pathfix pkgconfig tar:xz
 USE_GNOME=	gtk30
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--without-hal --with-libintl-prefix=${LOCALBASE} --with-gtk3
-LLD_UNSAFE=	yes
+CONFIGURE_ARGS=	--without-hal --with-libintl-prefix=${LOCALBASE} --with-gtk3 \
+		--with-image-format=auto
 INSTALLS_ICONS=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lm
 
-OPTIONS_DEFINE=		GNOME LIRC WEBPLUGIN
-OPTIONS_SUB=		yes
+OPTIONS_DEFINE=	GNOME LIRC WEBPLUGIN
+OPTIONS_SUB=	yes
 
-GNOME_BUILD_DEPENDS=	gnome-screensaver:x11/gnome-screensaver
-GNOME_LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
-GNOME_RUN_DEPENDS=	gnome-screensaver:x11/gnome-screensaver
-GNOME_CONFIGURE_ON=	--with-dbus
-GNOME_CONFIGURE_OFF=	--disable-integration-wizard --without-dbus
-LIRC_LIB_DEPENDS=	liblirc_client.so:comms/lirc
-LIRC_CONFIGURE_ON=	--enable-lirc
-LIRC_CONFIGURE_OFF=	--disable-lirc
-WEBPLUGIN_DESC=		Build and/or install Web browser plugins
-WEBPLUGIN_USE=		xorg=xaw
-WEBPLUGIN_USES=		webplugin:native
-WEBPLUGIN_CONFIGURE_OFF=	--without-browser-plugin
+GNOME_LIB_DEPENDS=		libdbus-glib-1.so:devel/dbus-glib
+GNOME_CONFIGURE_WITH=		dbus
+GNOME_CONFIGURE_ENABLE=		integration-wizard
+LIRC_LIB_DEPENDS=		liblirc_client.so:comms/lirc
+LIRC_CONFIGURE_ENABLE=		lirc
+WEBPLUGIN_DESC=			Build and/or install Web browser plugins
+WEBPLUGIN_USE=			xorg=xaw
+WEBPLUGIN_USES=			webplugin:native
+WEBPLUGIN_CONFIGURE_WITH=	browser-plugin
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MWEBPLUGIN}
 WEBPLUGIN_DIR=	${PREFIX}/lib/gxine
 WEBPLUGIN_FILES=gxineplugin.so
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e \
@@ -58,9 +53,9 @@
 		's|@MAKE_PNG_TRUE@|#|' ${WRKSRC}/pixmaps/Makefile.in
 
 post-install:
-	${CP} ${WRKSRC}/pixmaps/logo.mpv ${STAGEDIR}${PREFIX}/share/gxine
-.if ${PORT_OPTIONS:MWEBPLUGIN}
+	${INSTALL_DATA} ${WRKSRC}/pixmaps/logo.mpv ${STAGEDIR}${PREFIX}/share/gxine
+
+post-install-WEBPLUGIN-on:
 	@${STRIP_CMD} ${STAGEDIR}${WEBPLUGIN_DIR}/${WEBPLUGIN_FILES}
-.endif
 
 .include <bsd.port.mk>
Index: multimedia/gxine/pkg-plist
===================================================================
--- multimedia/gxine/pkg-plist
+++ multimedia/gxine/pkg-plist
@@ -13,6 +13,7 @@
 man/man1/gxine.1.gz
 man/man1/gxine_client.1.gz
 share/applications/gxine.desktop
+%%DATADIR%%/logo.jpg
 %%DATADIR%%/logo.mpv
 %%DATADIR%%/mediamarks
 %%DATADIR%%/pixmaps/gxine-icon.xpm