svn commit: r333781 - head/audio/rhythmbox

[Baptiste Daroussin]

Author: bapt
Date: Thu Nov 14 18:22:48 2013
New Revision: 333781
URL: http://svnweb.freebsd.org/changeset/ports/333781

Log:
  Revert badly tested conversion to USES=webplugin
  
  Pointyhat to:	bapt

Modified:
  head/audio/rhythmbox/Makefile
  head/audio/rhythmbox/pkg-plist

Modified: head/audio/rhythmbox/Makefile
==============================================================================
--- head/audio/rhythmbox/Makefile	Thu Nov 14 17:59:11 2013	(r333780)
+++ head/audio/rhythmbox/Makefile	Thu Nov 14 18:22:48 2013	(r333781)
@@ -122,11 +122,12 @@ PLIST_SUB+=	IPOD="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MITMS_PLUGIN}
-USES+=	webplugin:gecko
-WEBPLUGIN_FILES=librhythmbox-itms-detection-plugin.so
+USE_WEBPLUGINS=	gecko18
+WEBPLUGINS_FILES=librhythmbox-itms-detection-plugin.so
+.include "${PORTSDIR}/www/firefox/Makefile.webplugins"
 
 CONFIGURE_ARGS+=--enable-browser-plugin
-CONFIGURE_ENV+=	MOZILLA_PLUGINDIR=${WEBPLUGIN_DIR}
+CONFIGURE_ENV+=	MOZILLA_PLUGINDIR=${WEBPLUGINS_DIR}
 PLIST_SUB+=	ITMS_PLUGIN=""
 .else
 CONFIGURE_ARGS+=--disable-browser-plugin

Modified: head/audio/rhythmbox/pkg-plist
==============================================================================
--- head/audio/rhythmbox/pkg-plist	Thu Nov 14 17:59:11 2013	(r333780)
+++ head/audio/rhythmbox/pkg-plist	Thu Nov 14 18:22:48 2013	(r333781)
@@ -1,8 +1,8 @@
 bin/rhythmbox
 bin/rhythmbox-client
-%%ITMS_PLUGIN%%%%WEBPLUGINS_DIR%%/librhythmbox-itms-detection-plugin.a
-%%ITMS_PLUGIN%%%%WEBPLUGINS_DIR%%/librhythmbox-itms-detection-plugin.la
-%%ITMS_PLUGIN%%%%WEBPLUGINS_DIR%%/librhythmbox-itms-detection-plugin.so
+%%ITMS_PLUGIN%%%%WEBPLUGIN_DIR%%/librhythmbox-itms-detection-plugin.a
+%%ITMS_PLUGIN%%%%WEBPLUGIN_DIR%%/librhythmbox-itms-detection-plugin.la
+%%ITMS_PLUGIN%%%%WEBPLUGIN_DIR%%/librhythmbox-itms-detection-plugin.so
 lib/librhythmbox-core.la
 lib/librhythmbox-core.so
 lib/librhythmbox-core.so.0
@@ -761,7 +761,7 @@ share/rhythmbox/uri-new.ui
 %%PYTHON%%@dirrm lib/rhythmbox/plugins/artdisplay
 @dirrm lib/rhythmbox/plugins
 @dirrm lib/rhythmbox
-%%ITMS_PLUGIN%%@dirrmtry %%WEBPLUGINS_DIR%%
+%%ITMS_PLUGIN%%@dirrmtry %%WEBPLUGIN_DIR%%
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/te/LC_MESSAGES