From 29747f458a1eb2ce23b4594b09d0256dd62760b8 Mon Sep 17 00:00:00 2001
From: Joe Marcus Clarke <marcus@FreeBSD.org>
Date: Sat, 14 Oct 2006 08:54:54 +0000
Subject: Chase the GNOME X11BASE to LOCALBASE move, and fix the build with the
 new freetype2 where needed.

Submitted by:	mezz, ahze, pav, and many others
Approved by:	portmgr (implicit, kris)
---
 graphics/librsvg/Makefile                      | 8 ++++----
 graphics/librsvg/files/patch-Makefile.in       | 3 ---
 graphics/librsvg/files/patch-librsvg-config.in | 3 ---
 3 files changed, 4 insertions(+), 10 deletions(-)

(limited to 'graphics/librsvg')

diff --git a/graphics/librsvg/Makefile b/graphics/librsvg/Makefile
index ac126f8a3b22..e5b79be29127 100644
--- a/graphics/librsvg/Makefile
+++ b/graphics/librsvg/Makefile
@@ -3,11 +3,11 @@
 # Whom:                 		Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/graphics/librsvg/Makefile,v 1.2 2006/09/10 00:51:11 mezz Exp $
 
 PORTNAME=	librsvg
 PORTVERSION=	1.0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/librsvg/1.0
@@ -20,9 +20,9 @@ LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 		popt.0:${PORTSDIR}/devel/popt
 
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GNOME=	gnomelibs gdkpixbuf
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/graphics/librsvg/files/patch-Makefile.in b/graphics/librsvg/files/patch-Makefile.in
index b11b408da623..076b991ecdcc 100644
--- a/graphics/librsvg/files/patch-Makefile.in
+++ b/graphics/librsvg/files/patch-Makefile.in
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
 --- Makefile.in.orig	Fri Jul 27 16:29:51 2001
 +++ Makefile.in	Fri Jul 27 16:30:27 2001
 @@ -110,7 +110,7 @@
diff --git a/graphics/librsvg/files/patch-librsvg-config.in b/graphics/librsvg/files/patch-librsvg-config.in
index 84d673894427..2c4c58a1984e 100644
--- a/graphics/librsvg/files/patch-librsvg-config.in
+++ b/graphics/librsvg/files/patch-librsvg-config.in
@@ -1,6 +1,3 @@
-
-$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 @@
-- 
cgit v1.2.3