4 files changed, 35 insertions, 16 deletions

diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 29430d5de1b1..712ed42ee9f2 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.98 2006/04/13 07:52:35 bland Exp $
+#    $MCom: ports/graphics/librsvg2/Makefile,v 1.109 2006/10/02 04:52:51 bland Exp $
 #
 
 PORTNAME=	librsvg2
-PORTVERSION=	2.14.4
+PORTVERSION=	2.16.0
+PORTREVISION=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -19,14 +20,13 @@ COMMENT=	Library for parsing and rendering SVG vector-graphic files
 
 BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
-		popt.0:${PORTSDIR}/devel/popt \
 		croco-${CROCO_VERSION}.3:${PORTSDIR}/textproc/libcroco
-RUN_DEPENDS=	${X11BASE}/lib/gtk-2.0/${GTK2_VERSION}/engines/libmetal.so:${PORTSDIR}/x11-themes/gtk-engines2
+RUN_DEPENDS=	gtk-engines2>=2.7.5_1:${PORTSDIR}/x11-themes/gtk-engines2
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
-INSTALLS_SHLIB=	yes
+USE_XLIB=	yes
+USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomehack gnomeprefix libgsf gtk20 ltverhack
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -36,7 +36,8 @@ CONFIGURE_ARGS=	--with-svgz \
 		--without-gimp \
 		--with-croco \
 		--disable-gnome-vfs \
-		--enable-gtk-theme
+		--enable-gtk-theme \
+		--disable-gnome-print
 
 CROCO_VERSION=	0.6
 
diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo
index 2a1a170c93cb..19f271896599 100644
--- a/graphics/librsvg2/distinfo
+++ b/graphics/librsvg2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/librsvg-2.14.4.tar.bz2) = 945617bb094975d7353a3852302297c1
-SHA256 (gnome2/librsvg-2.14.4.tar.bz2) = 877f016487042eedc78c472bddd008fe70e17837374ede50726445eb8f5872d5
-SIZE (gnome2/librsvg-2.14.4.tar.bz2) = 415862
+MD5 (gnome2/librsvg-2.16.0.tar.bz2) = dc6385e62ed278732146bca5aab74568
+SHA256 (gnome2/librsvg-2.16.0.tar.bz2) = 2a918455246e8541ce737ea499fd0bcfa207d712cb4efa5583031b9c23c51c66
+SIZE (gnome2/librsvg-2.16.0.tar.bz2) = 420858
diff --git a/graphics/librsvg2/files/patch-moz-plugin_Makefile.in b/graphics/librsvg2/files/patch-moz-plugin_Makefile.in
index b129aca5aa90..5db06266c965 100644
--- a/graphics/librsvg2/files/patch-moz-plugin_Makefile.in
+++ b/graphics/librsvg2/files/patch-moz-plugin_Makefile.in
@@ -1,15 +1,15 @@
---- moz-plugin/Makefile.in.orig	Sat Apr  1 15:25:20 2006
-+++ moz-plugin/Makefile.in	Sat Apr  1 15:27:58 2006
-@@ -246,7 +246,7 @@ sbindir = @sbindir@
+--- moz-plugin/Makefile.in.orig	Thu Jul 27 11:13:53 2006
++++ moz-plugin/Makefile.in	Thu Jul 27 11:14:38 2006
+@@ -241,7 +241,7 @@ sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
--plugindir = $(libdir)/mozilla/plugins/
-+plugindir = $(libdir)/browser_plugins/
+-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)
-@@ -289,7 +289,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(
+@@ -284,7 +284,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
diff --git a/graphics/librsvg2/pkg-plist b/graphics/librsvg2/pkg-plist
index 82ac9dc7a828..ceeb03c21173 100644
--- a/graphics/librsvg2/pkg-plist
+++ b/graphics/librsvg2/pkg-plist
@@ -19,7 +19,25 @@ lib/librsvg-2.la
 lib/librsvg-2.so
 lib/librsvg-2.so.2
 libdata/pkgconfig/librsvg-2.0.pc
+share/doc/rsvg/home.png
+share/doc/rsvg/index.html
+share/doc/rsvg/index.sgml
+share/doc/rsvg/ix01.html
+share/doc/rsvg/left.png
+share/doc/rsvg/pt02.html
+share/doc/rsvg/pt03.html
+share/doc/rsvg/pt04.html
+share/doc/rsvg/right.png
+share/doc/rsvg/rsvg-Cairo.html
+share/doc/rsvg/rsvg-Core-API.html
+share/doc/rsvg/rsvg-GdkPixbuf.html
+share/doc/rsvg/rsvg.devhelp
+share/doc/rsvg/rsvg.devhelp2
+share/doc/rsvg/rsvg.html
+share/doc/rsvg/style.css
+share/doc/rsvg/up.png
 share/gnome/pixmaps/svg-viewer.svg
+@dirrm share/doc/rsvg
 @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