Index: multimedia/gxine/Makefile
===================================================================
--- multimedia/gxine/Makefile
+++ multimedia/gxine/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gxine
 PORTVERSION=	0.5.910
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/xine/${PORTNAME}/${PORTVERSION}
 
@@ -11,44 +11,39 @@
 COMMENT=	Alternative GUI for the Xine media player
 
 LICENSE=	GPLv2
+LICENSE_FILES=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libnspr4.so:devel/nspr \
 		libmozjs185.so:lang/spidermonkey185 \
 		libxine.so:multimedia/libxine
 
-USES=		desktop-file-utils gettext gmake libtool pathfix pkgconfig tar:xz
+USES=		desktop-file-utils gmake gnome libtool pathfix pkgconfig tar:xz
 USE_GNOME=	gtk30
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-hal --with-libintl-prefix=${LOCALBASE} --with-gtk3
-LLD_UNSAFE=	yes
 INSTALLS_ICONS=	yes
 
+CFLAGS+=	-fPIC
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lm
 
-OPTIONS_DEFINE=		GNOME LIRC WEBPLUGIN
+OPTIONS_DEFINE=		GNOME NLS 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
+LIRC_CONFIGURE_ENABLE=	lirc
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext
+WEBPLUGIN_DESC=			Build and/or install Web browser plugins
+WEBPLUGIN_USE=			xorg=xaw
+WEBPLUGIN_USES=			webplugin:native
+WEBPLUGIN_CONFIGURE_WITH=	browser-plugin
+WEBPLUGIN_DIR=			${PREFIX}/lib/gxine
+WEBPLUGIN_FILES=		gxineplugin.so
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MWEBPLUGIN}
-WEBPLUGIN_DIR=	${PREFIX}/lib/gxine
-WEBPLUGIN_FILES=gxineplugin.so
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/CFLAGS/s|-I/usr/local/include|| ; \
@@ -59,9 +54,10 @@
 		'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}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/pixmaps/logo.jpg ${STAGEDIR}${DATADIR}
+
+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
@@ -6,6 +6,7 @@
 %%ETCDIR%%/startup
 %%ETCDIR%%/toolbar-fullscreen.xml
 %%ETCDIR%%/toolbar-window.xml
+%%WEBPLUGIN%%%%WEBPLUGIN_DIR%%/gxineplugin.so
 man/de/man1/gxine.1.gz
 man/de/man1/gxine_client.1.gz
 man/es/man1/gxine.1.gz
@@ -30,28 +31,28 @@
 %%DATADIR%%/pixmaps/splash.png
 %%DATADIR%%/pixmaps/subtitle.svg
 share/icons/hicolor/64x64/apps/gxine.png
-share/locale/cs/LC_MESSAGES/gxine.mo
-share/locale/cs/LC_MESSAGES/gxine.theme.mo
-share/locale/de/LC_MESSAGES/gxine.mo
-share/locale/de/LC_MESSAGES/gxine.theme.mo
-share/locale/es/LC_MESSAGES/gxine.mo
-share/locale/es/LC_MESSAGES/gxine.theme.mo
-share/locale/fi/LC_MESSAGES/gxine.mo
-share/locale/fi/LC_MESSAGES/gxine.theme.mo
-share/locale/fr/LC_MESSAGES/gxine.mo
-share/locale/fr/LC_MESSAGES/gxine.theme.mo
-share/locale/it/LC_MESSAGES/gxine.mo
-share/locale/it/LC_MESSAGES/gxine.theme.mo
-share/locale/ja/LC_MESSAGES/gxine.mo
-share/locale/ja/LC_MESSAGES/gxine.theme.mo
-share/locale/pl/LC_MESSAGES/gxine.mo
-share/locale/pl/LC_MESSAGES/gxine.theme.mo
-share/locale/ru/LC_MESSAGES/gxine.mo
-share/locale/ru/LC_MESSAGES/gxine.theme.mo
-share/locale/sv/LC_MESSAGES/gxine.mo
-share/locale/sv/LC_MESSAGES/gxine.theme.mo
-share/locale/uk/LC_MESSAGES/gxine.mo
-share/locale/uk/LC_MESSAGES/gxine.theme.mo
-share/locale/zh_CN/LC_MESSAGES/gxine.mo
-share/locale/zh_CN/LC_MESSAGES/gxine.theme.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/gxine.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/gxine.theme.mo
+%%NLS%%share/locale/de/LC_MESSAGES/gxine.mo
+%%NLS%%share/locale/de/LC_MESSAGES/gxine.theme.mo
+%%NLS%%share/locale/es/LC_MESSAGES/gxine.mo
+%%NLS%%share/locale/es/LC_MESSAGES/gxine.theme.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/gxine.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/gxine.theme.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/gxine.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/gxine.theme.mo
+%%NLS%%share/locale/it/LC_MESSAGES/gxine.mo
+%%NLS%%share/locale/it/LC_MESSAGES/gxine.theme.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/gxine.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/gxine.theme.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/gxine.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/gxine.theme.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/gxine.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/gxine.theme.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/gxine.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/gxine.theme.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/gxine.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/gxine.theme.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/gxine.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/gxine.theme.mo
 share/pixmaps/gxine.png