- Drop firefox3 dependency. After @dirrm deprecation we don't need to worry

  about ownership of the plugins directory anymore.
- Install to ${PREFIX}/lib/mozilla/plugins to make it browser-agnostic.
  (browsers should be taught to look there if they don't already do so).

2 files changed, 9 insertions, 11 deletions

diff --git a/multimedia/totem-browser-plugin/Makefile b/multimedia/totem-browser-plugin/Makefile
index 73fc26d3586..318c3570c74 100644
--- a/multimedia/totem-browser-plugin/Makefile
+++ b/multimedia/totem-browser-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/08/26 20:22:52 sno Exp $
+# $NetBSD: Makefile,v 1.5 2009/09/13 10:53:40 tnn Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -6,7 +6,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 .include "../../multimedia/totem/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/totem/totem-browser-plugin/}
-PKGREVISION=	1
+PKGREVISION=	2
 
 # override Makefile.common
 PLIST_SRC=      ${.CURDIR}/PLIST
@@ -18,13 +18,13 @@ CONFIGURE_ARGS+=	--enable-browser-plugins
 
 BROWSER_PLUGINS=	cone gmp mully narrowspace
 
-INSTALLATION_DIRS=	lib/firefox3/plugins
+INSTALLATION_DIRS=	lib/mozilla/plugins
 INSTALLATION_DIRS+=	libexec
 
 do-install:
 .for plugin in ${BROWSER_PLUGINS}
 	cd ${WRKSRC}/browser-plugin && ${LIBTOOL} --mode=install ${INSTALL_DATA} \
-	 libtotem-${plugin}-plugin.la ${DESTDIR}${PREFIX}/lib/firefox3/plugins
+	 libtotem-${plugin}-plugin.la ${DESTDIR}${PREFIX}/lib/mozilla/plugins
 .endfor
 	cd ${WRKSRC}/browser-plugin && ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \
 	 totem-plugin-viewer ${DESTDIR}${PREFIX}/libexec
@@ -34,7 +34,5 @@ BUILDLINK_API_DEPENDS.shared-mime-info+=	shared-mime-info>=0.22
 .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
 .include "../../multimedia/gst-plugins0.10-good/buildlink3.mk"
 .include "../../multimedia/gstreamer0.10/buildlink3.mk"
-# not actually needed to build, but firefox3 owns the plugin directory
-.include "../../www/firefox3/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/totem-browser-plugin/PLIST b/multimedia/totem-browser-plugin/PLIST
index 40e977ee5f2..4417c993bbe 100644
--- a/multimedia/totem-browser-plugin/PLIST
+++ b/multimedia/totem-browser-plugin/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2009/03/16 12:13:31 jmcneill Exp $
-lib/firefox3/plugins/libtotem-cone-plugin.la
-lib/firefox3/plugins/libtotem-gmp-plugin.la
-lib/firefox3/plugins/libtotem-mully-plugin.la
-lib/firefox3/plugins/libtotem-narrowspace-plugin.la
+@comment $NetBSD: PLIST,v 1.3 2009/09/13 10:53:40 tnn Exp $
+lib/mozilla/plugins/libtotem-cone-plugin.la
+lib/mozilla/plugins/libtotem-gmp-plugin.la
+lib/mozilla/plugins/libtotem-mully-plugin.la
+lib/mozilla/plugins/libtotem-narrowspace-plugin.la
 libexec/totem-plugin-viewer