11 files changed, 41 insertions, 44 deletions

diff --git a/graphics/djview4/Makefile b/graphics/djview4/Makefile
index 1a741fa9d980..840a13614f9f 100644
--- a/graphics/djview4/Makefile
+++ b/graphics/djview4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	djview
 PORTVERSION=	4.4
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF/djvu
 DISTNAME=	${PORTNAME}4-${PORTVERSION}
@@ -39,18 +39,20 @@ QMAKESPEC?=	freebsd-g++
 MAN1=	djview4.1 nsdejavu.1
 MLINKS=	djview4.1 djview.1
 
+USE_WEBPLUGINS=		gecko*
+WEBPLUGINS_DIR=		${PREFIX}/lib/djview4/plugins
+WEBPLUGINS_FILES=	nsdejavu.so
+
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/www/firefox/Makefile.webplugins"
+
 post-patch:
 	@${REINPLACE_CMD} -e 's,/netscape/,/djview4/,' \
 		${WRKSRC}/nsdejavu/Makefile.in ${WRKSRC}/nsdejavu/nsdejavu.1.in
 	@${REINPLACE_CMD} -e 's,@NSDEJAVU_LIBS@,@NSDEJAVU_LIBS@ -lXt -lXext,g' \
-		${WRKSRC}/nsdejavu/Makefile.in ${WRKSRC}/nsdejavu/nsdejavu.1.in
-
+		${WRKSRC}/nsdejavu/Makefile.in
 
 post-install:
-	@${MKDIR} ${LOCALBASE}/lib/browser_plugins
-	${LN} -sf ${PREFIX}/lib/djview4/plugins/nsdejavu.so \
-		${LOCALBASE}/lib/browser_plugins/nsdejavu.so
-
 	@${FIND} -ds ${PREFIX}/share/djvu/djview4/ ! -type d | \
 		${SED} 's,${PREFIX}/,,' >> ${TMPPLIST}
 
@@ -59,4 +61,4 @@ post-install:
 	@${ECHO_CMD} "@unexec ${RMDIR} %D/share/djvu 2>/dev/null || true" \
 		>> ${TMPPLIST}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/graphics/djview4/pkg-plist b/graphics/djview4/pkg-plist
index 72167c10a222..4d796c1616a1 100644
--- a/graphics/djview4/pkg-plist
+++ b/graphics/djview4/pkg-plist
@@ -1,9 +1,5 @@
 bin/djview
 bin/djview4
 lib/djview4/plugins/nsdejavu.so
-@exec mkdir -p %%LOCALBASE%%/lib/browser_plugins
-@exec ln -sf %D/lib/djview4/plugins/nsdejavu.so %%LOCALBASE%%/lib/browser_plugins/nsdejavu.so
-@unexec rm -f %%LOCALBASE%%/lib/browser_plugins/nsdejavu.so
-@unexec rmdir %%LOCALBASE%%/lib/browser_plugins > /dev/null 2>&1 || true
 @dirrm lib/djview4/plugins
 @dirrm lib/djview4
diff --git a/graphics/djvulibre/Makefile b/graphics/djvulibre/Makefile
index 9443d97b9c9b..def7456bba41 100644
--- a/graphics/djvulibre/Makefile
+++ b/graphics/djvulibre/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	djvulibre
 PORTVERSION=	3.5.21
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics www
 MASTER_SITES=	SF/djvu
 
@@ -41,7 +41,12 @@ MAN1=		djview3.1 nsdejavu.1
 MLINKS=		djview3.1 djview.1
 DESKTOPDIR=	${PREFIX}/share/djvu/djview3/desktop
 
+USE_WEBPLUGINS=		gecko*
+WEBPLUGINS_DIR=		${PREFIX}/lib/djvulibre/plugins
+WEBPLUGINS_FILES=	nsdejavu.so
+
 .include <bsd.port.pre.mk>
+.include "${PORTSDIR}/www/firefox/Makefile.webplugins"
 
 post-patch:
 	@${REINPLACE_CMD} -E \
@@ -82,11 +87,4 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/desktopfiles/register-djview-menu \
 		${DESKTOPDIR}
 
-#
-# Install browser plugin.
-#
-	@${MKDIR} ${LOCALBASE}/lib/browser_plugins
-	${LN} -sf ${PREFIX}/lib/djvulibre/plugins/nsdejavu.so \
-		${LOCALBASE}/lib/browser_plugins/nsdejavu.so
-
 .include <bsd.port.post.mk>
diff --git a/graphics/djvulibre/pkg-plist b/graphics/djvulibre/pkg-plist
index 4dcef853b7fd..d2f54f5e40be 100644
--- a/graphics/djvulibre/pkg-plist
+++ b/graphics/djvulibre/pkg-plist
@@ -12,9 +12,6 @@ share/djvu/djview3/fr/djview.qm
 share/djvu/djview3/fr/qt.qm
 share/djvu/djview3/ja/djview.qm
 share/djvu/djview3/ja/qt.qm
-@exec mkdir -p %%LOCALBASE%%/lib/browser_plugins
-@exec ln -sf %D/lib/djvulibre/plugins/nsdejavu.so %%LOCALBASE%%/lib/browser_plugins/nsdejavu.so
-@unexec rm -f %%LOCALBASE%%/lib/browser_plugins/nsdejavu.so
 @dirrm share/djvu/djview3/ja
 @dirrm share/djvu/djview3/fr
 @dirrm share/djvu/djview3/desktop
@@ -24,4 +21,3 @@ share/djvu/djview3/ja/qt.qm
 @dirrmtry share/djvu
 @dirrm lib/djvulibre/plugins
 @dirrm lib/djvulibre
-@unexec rmdir %%LOCALBASE%%/lib/browser_plugins 2>/dev/null || true
diff --git a/graphics/gnash-devel/Makefile b/graphics/gnash-devel/Makefile
index f1fbbcd87237..a3d7db0346f0 100644
--- a/graphics/gnash-devel/Makefile
+++ b/graphics/gnash-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnash
 PORTVERSION=	20081208
+PORTREVISION=	1
 CATEGORIES=	graphics
 # gnashdev.org is slower
 MASTER_SITES=	http://mirror.amdmi3.ru/ \
@@ -43,7 +44,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS} ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--with-boost-incl="${LOCALBASE}/include" \
 		--with-boost-lib="${LOCALBASE}/lib" \
-		--with-npapi-plugindir="${PREFIX}/lib/browser_plugins" \
+		--with-npapi-plugindir="${WEBPLUGINS_DIR}" \
 		--with-kde-pluginprefix="${PREFIX}"
 
 GNASHVER=	trunk
@@ -70,6 +71,9 @@ OPTIONS=	PLUGIN		"Enable browser plugin" on \
 
 # Plugin option processing
 .if !defined(WITHOUT_GTK) && !defined(WITHOUT_PLUGIN)
+USE_WEBPLUGINS=		native
+WEBPLUGINS_FILES=	libgnashplugin.so
+.include "${PORTSDIR}/www/firefox/Makefile.webplugins"
 PLIST_SUB+=	FFPLUGIN=""
 .else
 PLIST_SUB+=	FFPLUGIN="@comment "
diff --git a/graphics/gnash-devel/pkg-plist b/graphics/gnash-devel/pkg-plist
index 8b8cdc664a16..4178ce302650 100644
--- a/graphics/gnash-devel/pkg-plist
+++ b/graphics/gnash-devel/pkg-plist
@@ -6,7 +6,7 @@ bin/soldumper
 %%GTK%%bin/gtk-gnash
 %%KDE%%bin/kde-gnash
 %%CYGNAL%%bin/cygnal
-%%FFPLUGIN%%lib/browser_plugins/libgnashplugin.so
+%%FFPLUGIN%%%%WEBPLUGINS_DIR%%/libgnashplugin.so
 %%KONQPLUGIN%%share/apps/klash/pluginsinfo
 %%KONQPLUGIN%%share/apps/klash/klashpartui.rc
 %%KONQPLUGIN%%share/services/klash_part.desktop
@@ -58,4 +58,4 @@ share/locale/sv/LC_MESSAGES/gnash.mo
 @dirrm %%DOCSDIR%%
 @dirrm lib/gnash
 %%KONQPLUGIN%%@dirrm share/apps/klash
-%%FFPLUGIN%%@dirrmtry lib/browser_plugins
+%%FFPLUGIN%%@dirrmtry %%WEBPLUGINS_DIR%%
diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile
index 26d7a059158e..747f581b8560 100644
--- a/graphics/gnash/Makefile
+++ b/graphics/gnash/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnash
 PORTVERSION=	0.8.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://getgnash.org/packages/releases/ \
 		${MASTER_SITE_GNU}
@@ -40,7 +40,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS} ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--with-boost-incl="${LOCALBASE}/include" \
 		--with-boost-lib="${LOCALBASE}/lib" \
-		--with-npapi-plugindir="${PREFIX}/lib/browser_plugins" \
+		--with-npapi-plugindir="${WEBPLUGINS_DIR}" \
 		--with-kde-pluginprefix="${PREFIX}"
 
 GNASHVER=	${PORTVERSION}
@@ -66,6 +66,9 @@ OPTIONS=	PLUGIN		"Enable browser plugin" on \
 
 # Plugin option processing
 .if !defined(WITHOUT_GTK) && !defined(WITHOUT_PLUGIN)
+USE_WEBPLUGINS=		native
+WEBPLUGINS_FILES=	libgnashplugin.so
+.include "${PORTSDIR}/www/firefox/Makefile.webplugins"
 PLIST_SUB+=	FFPLUGIN=""
 .else
 PLIST_SUB+=	FFPLUGIN="@comment "
diff --git a/graphics/gnash/pkg-plist b/graphics/gnash/pkg-plist
index d67932f9985a..03107d0aa589 100644
--- a/graphics/gnash/pkg-plist
+++ b/graphics/gnash/pkg-plist
@@ -6,7 +6,7 @@ bin/soldumper
 %%GTK%%bin/gtk-gnash
 %%KDE%%bin/kde-gnash
 %%CYGNAL%%bin/cygnal
-%%FFPLUGIN%%lib/browser_plugins/libgnashplugin.so
+%%FFPLUGIN%%%%WEBPLUGINS_DIR%%/libgnashplugin.so
 %%KONQPLUGIN%%share/apps/klash/pluginsinfo
 %%KONQPLUGIN%%share/apps/klash/klashpartui.rc
 %%KONQPLUGIN%%share/services/klash_part.desktop
@@ -55,4 +55,4 @@ share/locale/sv/LC_MESSAGES/gnash.mo
 @dirrm %%DOCSDIR%%
 @dirrm lib/gnash
 %%KONQPLUGIN%%@dirrm share/apps/klash
-%%FFPLUGIN%%@dirrmtry lib/browser_plugins
+%%FFPLUGIN%%@dirrmtry %%WEBPLUGINS_DIR%%
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index cb1d4f798781..df15602807d8 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -3,11 +3,12 @@
 # Whom:                 		Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/librsvg2/Makefile,v 1.121 2008/03/04 18:51:53 kwm Exp $
+#   $MCom: ports-stable/graphics/librsvg2/Makefile,v 1.3 2008/09/23 20:34:45 mezz Exp $
 #
 
 PORTNAME=	librsvg2
 PORTVERSION=	2.22.3
+PORTREVISION=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -46,7 +47,10 @@ OPTIONS=	MOZILLA_PLUGIN "Enable the SVG browser plug-in" no
 
 .if defined(WITH_MOZILLA_PLUGIN)
 USE_GECKO=	firefox mozilla seamonkey xulrunner
+USE_WEBPLUGINS=	gecko*
+WEBPLUGINS_FILES=libmozsvgdec.so
 .include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
+.include "${PORTSDIR}/www/firefox/Makefile.webplugins"
 CONFIGURE_ENV+=	MOZILLA_CONFIG=no
 CONFIGURE_ARGS+=--enable-mozilla-plugin=yes
 
@@ -61,6 +65,8 @@ post-patch:
 .if defined(WITH_MOZILLA_PLUGIN)
 	@${REINPLACE_CMD} -e 's|mozilla-plugin|${GECKO}-plugin|g' \
 		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|[$$][(]libdir[)]/mozilla/plugins|${WEBPLUGINS_DIR}|g' \
+		${WRKSRC}/moz-plugin/Makefile.in
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/graphics/librsvg2/files/patch-moz-plugin_Makefile.in b/graphics/librsvg2/files/patch-moz-plugin_Makefile.in
index 93551c798bd0..728d20fcbd1c 100644
--- a/graphics/librsvg2/files/patch-moz-plugin_Makefile.in
+++ b/graphics/librsvg2/files/patch-moz-plugin_Makefile.in
@@ -1,14 +1,5 @@
 --- moz-plugin/Makefile.in.orig	2008-09-23 15:17:45.000000000 -0500
 +++ moz-plugin/Makefile.in	2008-09-23 15:19:11.000000000 -0500
-@@ -227,7 +227,7 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--plugindir = $(libdir)/mozilla/plugins
-+plugindir = $(libdir)/browser_plugins
- @WITH_MOZILLA_FALSE@plugin_LTLIBRARIES = 
- @WITH_MOZILLA_TRUE@plugin_LTLIBRARIES = libmozsvgdec.la
- INCLUDES = $(MOZILLA_CFLAGS) -DBINDIR=\"$(bindir)/\" $(GLIB_CFLAGS) $(GDK_X11_CFLAGS)
 @@ -270,7 +270,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
diff --git a/graphics/librsvg2/pkg-plist b/graphics/librsvg2/pkg-plist
index e437b5ef6ca9..c89581974118 100644
--- a/graphics/librsvg2/pkg-plist
+++ b/graphics/librsvg2/pkg-plist
@@ -5,9 +5,9 @@ include/librsvg-2/librsvg/librsvg-enum-types.h
 include/librsvg-2/librsvg/librsvg-features.h
 include/librsvg-2/librsvg/rsvg-cairo.h
 include/librsvg-2/librsvg/rsvg.h
-%%PLUGIN%%lib/browser_plugins/libmozsvgdec.a
-%%PLUGIN%%lib/browser_plugins/libmozsvgdec.la
-%%PLUGIN%%lib/browser_plugins/libmozsvgdec.so
+%%PLUGIN%%%%WEBPLUGINS_DIR%%/libmozsvgdec.a
+%%PLUGIN%%%%WEBPLUGINS_DIR%%/libmozsvgdec.la
+%%PLUGIN%%%%WEBPLUGINS_DIR%%/libmozsvgdec.so
 lib/gtk-2.0/%%GTK2_VERSION%%/engines/libsvg.a
 lib/gtk-2.0/%%GTK2_VERSION%%/engines/libsvg.la
 lib/gtk-2.0/%%GTK2_VERSION%%/engines/libsvg.so
@@ -38,6 +38,7 @@ share/doc/rsvg/style.css
 share/doc/rsvg/up.png
 share/pixmaps/svg-viewer.svg
 @dirrm share/doc/rsvg
+%%PLUGIN%%@dirrmtry %%WEBPLUGINS_DIR%%
 @dirrm include/librsvg-2/librsvg
 @dirrm include/librsvg-2
 @exec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/etc/gtk-2.0/gdk-pixbuf.loaders 2>/dev/null || /usr/bin/true