4 files changed, 7 insertions, 55 deletions

diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 6e0c836cf8c3..55100263d78c 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -3,12 +3,11 @@
 # Whom:                 		Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/librsvg2/Makefile,v 1.128 2009/11/28 05:59:01 mezz Exp $
+#   $MCom: ports/graphics/librsvg2/Makefile,v 1.131 2010/05/02 10:25:51 kwm Exp $
 #
 
 PORTNAME=	librsvg2
-PORTVERSION=	2.26.0
-PORTREVISION=	4
+PORTVERSION=	2.26.3
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -31,43 +30,11 @@ USE_GNOME=	gnomehack gnomeprefix libgsf gtk20 ltverhack
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-svgz \
-		--without-gimp \
 		--with-croco \
-		--disable-gnome-vfs \
-		--enable-gtk-theme \
-		--disable-gnome-print
+		--enable-gtk-theme
 
 CROCO_VERSION=	0.6
 
 MAN1=		rsvg.1
 
-OPTIONS=	MOZILLA_PLUGIN "Enable the SVG browser plug-in" on
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_MOZILLA_PLUGIN)
-USE_GECKO=	libxul seamonkey
-USE_WEBPLUGINS=	gecko19
-WEBPLUGINS_FILES=libmozsvgdec.so
-.include "${PORTSDIR}/www/firefox/Makefile.webplugins"
-CONFIGURE_ENV+=	MOZILLA_CONFIG=no
-CONFIGURE_ARGS+=--enable-mozilla-plugin=yes
-
-PLIST_SUB+=	PLUGIN=""
-.else
-CONFIGURE_ARGS+=--enable-mozilla-plugin=no
-
-PLIST_SUB+=	PLUGIN="@comment "
-.endif
-
-post-patch:
-.if defined(WITH_MOZILLA_PLUGIN)
-.if "${GECKO:Mlibxul}"
-	@${REINPLACE_CMD} -e 's|mozilla-plugin|${GECKO}-plugin|g' \
-		${WRKSRC}/configure
-.endif
-	@${REINPLACE_CMD} -e 's|[$$][(]libdir[)]/mozilla/plugins|${WEBPLUGINS_DIR}|g' \
-		${WRKSRC}/moz-plugin/Makefile.in
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo
index 0807c3d1b7b5..b81219c6e67e 100644
--- a/graphics/librsvg2/distinfo
+++ b/graphics/librsvg2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/librsvg-2.26.0.tar.bz2) = 65dbd726a514fe8b797d26254b8efc1e
-SHA256 (gnome2/librsvg-2.26.0.tar.bz2) = fdcab5f0d86198d8cbd4ffe5b333076f75e707f6d7e4af5e87a8644ff7533bea
-SIZE (gnome2/librsvg-2.26.0.tar.bz2) = 477499
+MD5 (gnome2/librsvg-2.26.3.tar.bz2) = 8df68c2c02cdf2a96a92b43bf737bf9c
+SHA256 (gnome2/librsvg-2.26.3.tar.bz2) = c0005f9471b4bd3ba4873d165d8e481ee6b1d124dda4efc6bdc24b7da024b7e5
+SIZE (gnome2/librsvg-2.26.3.tar.bz2) = 511876
diff --git a/graphics/librsvg2/files/patch-moz-plugin_Makefile.in b/graphics/librsvg2/files/patch-moz-plugin_Makefile.in
deleted file mode 100644
index 728d20fcbd1c..000000000000
--- a/graphics/librsvg2/files/patch-moz-plugin_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
-@@ -270,7 +270,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
-+@WITH_MOZILLA_TRUE@	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
- 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
diff --git a/graphics/librsvg2/pkg-plist b/graphics/librsvg2/pkg-plist
index c89581974118..52425f347f26 100644
--- a/graphics/librsvg2/pkg-plist
+++ b/graphics/librsvg2/pkg-plist
@@ -5,9 +5,6 @@ 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%%%%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,7 +35,6 @@ 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