Fix plist and improve options.

2 files changed, 35 insertions, 16 deletions

diff --git a/www/gecko-mediaplayer/Makefile b/www/gecko-mediaplayer/Makefile
index 77d55fffb2cb..799b6e9e1f11 100644
--- a/www/gecko-mediaplayer/Makefile
+++ b/www/gecko-mediaplayer/Makefile
@@ -17,17 +17,21 @@ LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
 		gmlib:${PORTSDIR}/multimedia/gmtk
 RUN_DEPENDS=	gnome-mplayer:${PORTSDIR}/multimedia/gnome-mplayer
 
-OPTIONS_DEFINE=	NOCACHE DOCS
-NOCACHE_DESC=	Disable caching of remote media to local storage
+OPTIONS_DEFINE=	CACHE DOCS NLS
+OPTIONS_DEFAULT=CACHE
+CACHE_DESC=	Enable caching of remote media to local storage
 
 GNU_CONFIGURE=	yes
-USE_GETTEXT=	yes
 USE_PKGCONFIG=	build
 USE_GNOME=	glib20
 USE_GECKO=	libxul libxul19
 USE_WEBPLUGINS=	native
-WEBPLUGINS_FILES=	${PORTNAME}-dvx.so ${PORTNAME}-qt.so ${PORTNAME}-rm.so \
-				${PORTNAME}-wmp.so ${PORTNAME}.so
+
+WEBPLUGINS_FILES=	${PORTNAME}.so
+.for p in dvx rm qt wmp
+WEBPLUGINS_FILES+=	${PORTNAME}-${p}.so
+.endfor
+
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=--with-plugin_dir="${WEBPLUGINS_DIR}"
@@ -36,8 +40,18 @@ PORTDOCS=	README COPYING AUTHORS ChangeLog INSTALL NEWS javascript.txt
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MNLS}
+USE_GETTEXT=	yes
+PLIST_SUB=	NLS=""
+.else
+USE_GETTEXT=	build
+PLIST_SUB=	NLS="@comment "
+.endif
+
 .if ${PORT_OPTIONS:MNOCACHE}
 CONFIGURE_ARGS+=	--disable-caching
+.else
+CONFIGURE_ARGS+=	--enable-caching
 .endif
 
 post-patch:
@@ -47,7 +61,11 @@ post-patch:
 .if empty(PORT_OPTIONS:MDOCS)
 	@${REINPLACE_CMD} -e \
 		's|install-gecko_mediaplayerdocDATA install-schemaDATA|install-schemaDATA|' \
-		${WRKSRC}/Makefile.in
+	    ${WRKSRC}/Makefile.in
+.endif
+.if empty(PORT_OPTIONS:MNLS)
+	@${REINPLACE_CMD} -e 's/^ALL_LINGUAS=".*"/ALL_LINGUAS=""/' \
+	    ${WRKSRC}/configure
 .endif
 
 .include "${PORTSDIR}/www/firefox/Makefile.webplugins"
diff --git a/www/gecko-mediaplayer/pkg-plist b/www/gecko-mediaplayer/pkg-plist
index 71aa78154a2b..3f0dfcdca124 100644
--- a/www/gecko-mediaplayer/pkg-plist
+++ b/www/gecko-mediaplayer/pkg-plist
@@ -3,14 +3,15 @@
 %%WEBPLUGINS_DIR%%/gecko-mediaplayer-rm.so
 %%WEBPLUGINS_DIR%%/gecko-mediaplayer-wmp.so
 %%WEBPLUGINS_DIR%%/gecko-mediaplayer.so
-share/locale/cs/LC_MESSAGES/gecko-mediaplayer.mo
-share/locale/de/LC_MESSAGES/gecko-mediaplayer.mo
-share/locale/es/LC_MESSAGES/gecko-mediaplayer.mo
-share/locale/fr/LC_MESSAGES/gecko-mediaplayer.mo
-share/locale/it/LC_MESSAGES/gecko-mediaplayer.mo
-share/locale/ja/LC_MESSAGES/gecko-mediaplayer.mo
-share/locale/nl/LC_MESSAGES/gecko-mediaplayer.mo
-share/locale/pl/LC_MESSAGES/gecko-mediaplayer.mo
-share/locale/pt_BR/LC_MESSAGES/gecko-mediaplayer.mo
-share/locale/tr/LC_MESSAGES/gecko-mediaplayer.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/gecko-mediaplayer.mo
+%%NLS%%share/locale/de/LC_MESSAGES/gecko-mediaplayer.mo
+%%NLS%%share/locale/es/LC_MESSAGES/gecko-mediaplayer.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/gecko-mediaplayer.mo
+%%NLS%%share/locale/it/LC_MESSAGES/gecko-mediaplayer.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/gecko-mediaplayer.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/gecko-mediaplayer.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/gecko-mediaplayer.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/gecko-mediaplayer.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/gecko-mediaplayer.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/gecko-mediaplayer.mo
 @dirrmtry %%WEBPLUGINS_DIR%%