Update librsvg2 to 1.1.6 after a repo-copy from ports/graphics/librsvg and

connect it to the build.

6 files changed, 23 insertions, 102 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index 3a872d5c263b..8f17144be453 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -174,6 +174,7 @@
     SUBDIR += libmovtar
     SUBDIR += libmpeg2
     SUBDIR += librsvg
+    SUBDIR += librsvg2
     SUBDIR += libungif
     SUBDIR += libwmf
     SUBDIR += libxine
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 519c0a13507c..fd3f4e43f7cb 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -1,38 +1,42 @@
-# New ports collection makefile for:    librsvg
+# New ports collection makefile for:    librsvg2
 # Date created:         		8th May 2001
 # Whom:                 		Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	librsvg
-PORTVERSION=	1.0.3
-PORTREVISION=	1
+PORTNAME=	librsvg2
+PORTVERSION=	1.1.6
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/librsvg
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta5
+DIST_SUBDIR=	gnome2
+DISTNAME=	librsvg-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2	# XXX
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
-		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
-		xml.5:${PORTSDIR}/textproc/libxml \
+		art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \
+		xml2.5:${PORTSDIR}/textproc/libxml2 \
+		gdk_pixbuf-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 \
 		popt.0:${PORTSDIR}/devel/popt
 
+USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_GNOMELIBS=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
-		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g ; \
+		 s|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g'
 
 .include <bsd.port.mk>
diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo
index 2efc7acf4215..f149c578cec3 100644
--- a/graphics/librsvg2/distinfo
+++ b/graphics/librsvg2/distinfo
@@ -1 +1 @@
-MD5 (librsvg-1.0.3.tar.gz) = dedaae33d63db3e5c7e3b310ae87ff00
+MD5 (gnome2/librsvg-1.1.6.tar.bz2) = 0976fe7bef01ad8ff576ab78ebe86e70
diff --git a/graphics/librsvg2/files/patch-Makefile.in b/graphics/librsvg2/files/patch-Makefile.in
deleted file mode 100644
index b11b408da623..000000000000
--- a/graphics/librsvg2/files/patch-Makefile.in
+++ /dev/null
@@ -1,55 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.in.orig	Fri Jul 27 16:29:51 2001
-+++ Makefile.in	Fri Jul 27 16:30:27 2001
-@@ -110,7 +110,7 @@
- XML_CONFIG = @XML_CONFIG@
- XML_LIBS = @XML_LIBS@
- 
--noinst_PROGRAMS = test-ft-gtk test-ft test-rsvg
-+noinst_PROGRAMS = #test-ft-gtk test-ft test-rsvg
- 
- bin_SCRIPTS =  	librsvg-config
- 
-@@ -151,10 +151,10 @@
- test_rsvg_DEPENDENCIES = $(DEPS)
- test_rsvg_LDADD = $(LDADDS) -lm
- 
--m4datadir = $(datadir)/aclocal
-+m4datadir = $(prefix)/share/aclocal
- m4data_DATA = librsvg.m4
- 
--confexecdir = $(libdir)
-+confexecdir = $(sysconfdir)
- confexec_DATA = librsvgConf.sh
- 
- pkgconfigdir = $(libdir)/pkgconfig
-@@ -188,7 +188,7 @@
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
--DATA =  $(confexec_DATA) $(m4data_DATA) $(pkgconfig_DATA)
-+DATA =  $(confexec_DATA) $(m4data_DATA)
- 
- HEADERS =  $(librsvginc_HEADERS)
- 
-@@ -560,8 +560,7 @@
- 		install-confexecDATA
- install-exec: install-exec-am
- 
--install-data-am: install-m4dataDATA install-pkgconfigDATA \
--		install-librsvgincHEADERS
-+install-data-am: install-m4dataDATA install-librsvgincHEADERS
- install-data: install-data-am
- 
- install-am: all-am
-@@ -579,7 +578,7 @@
- installdirs:
- 	$(mkinstalldirs)  $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \
- 		$(DESTDIR)$(confexecdir) $(DESTDIR)$(m4datadir) \
--		$(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(librsvgincdir)
-+		$(DESTDIR)$(librsvgincdir)
- 
- 
- mostlyclean-generic:
diff --git a/graphics/librsvg2/files/patch-librsvg-config.in b/graphics/librsvg2/files/patch-librsvg-config.in
deleted file mode 100644
index 84d673894427..000000000000
--- a/graphics/librsvg2/files/patch-librsvg-config.in
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- librsvg-config.in	2001/10/05 14:55:24	1.1
-+++ librsvg-config.in	2001/10/05 15:05:57
-@@ -39,9 +39,7 @@
-       echo @LIBRSVG_VERSION@
-       ;;
-     --cflags)
--      if test @includedir@ != /usr/include ; then
--        includes=-I@includedir@
--      fi
-+      includes=-I@includedir@/librsvg-1
-       echo $includes
-       ;;
-     --libs)
diff --git a/graphics/librsvg2/pkg-plist b/graphics/librsvg2/pkg-plist
index 94cde0f2d87c..90a16992c884 100644
--- a/graphics/librsvg2/pkg-plist
+++ b/graphics/librsvg2/pkg-plist
@@ -1,21 +1,8 @@
-bin/librsvg-config
-etc/librsvgConf.sh
-include/librsvg-1/librsvg/art_render.h
-include/librsvg-1/librsvg/art_render_gradient.h
-include/librsvg-1/librsvg/art_render_mask.h
-include/librsvg-1/librsvg/art_render_svp.h
-include/librsvg-1/librsvg/art_rgba.h
-include/librsvg-1/librsvg/librsvg-features.h
-include/librsvg-1/librsvg/rsvg-bpath-util.h
-include/librsvg-1/librsvg/rsvg-css.h
-include/librsvg-1/librsvg/rsvg-defs.h
-include/librsvg-1/librsvg/rsvg-ft.h
-include/librsvg-1/librsvg/rsvg-paint-server.h
-include/librsvg-1/librsvg/rsvg-path.h
-include/librsvg-1/librsvg/rsvg.h
-lib/librsvg.a
-lib/librsvg.so
-lib/librsvg.so.1
-share/aclocal/librsvg.m4
-@dirrm include/librsvg-1/librsvg
-@dirrm include/librsvg-1
+include/librsvg-2/librsvg/librsvg-features.h
+include/librsvg-2/librsvg/rsvg.h
+lib/librsvg-2.a
+lib/librsvg-2.so
+lib/librsvg-2.so.2
+libdata/pkgconfig/librsvg-2.0.pc
+@dirrm include/librsvg-2/librsvg
+@dirrm include/librsvg-2