Replace hand made patches for pkgconfig tempates with PKGCONFIG_OVERRIDE.

9 files changed, 9 insertions, 42 deletions

diff --git a/graphics/gtkglext/Makefile b/graphics/gtkglext/Makefile
index 24ceba477be..8f7bf4f15ce 100644
--- a/graphics/gtkglext/Makefile
+++ b/graphics/gtkglext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/10/16 03:37:02 rh Exp $
+# $NetBSD: Makefile,v 1.2 2002/10/30 03:09:32 rh Exp $
 #
 
 DISTNAME=		gtkglext-0.5.1
@@ -17,6 +17,7 @@ USE_GMAKE=		YES
 USE_X11=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+PKGCONFIG_OVERRIDE=	${WRKSRC}/gtkglext.pc.in
 LIBS+=			-lm
 
 .include "../../textproc/gtk-doc/buildlink2.mk"
diff --git a/graphics/gtkglext/distinfo b/graphics/gtkglext/distinfo
index 69511569ddc..800d26268c3 100644
--- a/graphics/gtkglext/distinfo
+++ b/graphics/gtkglext/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/10/16 03:37:03 rh Exp $
+$NetBSD: distinfo,v 1.2 2002/10/30 03:09:33 rh Exp $
 
 SHA1 (gtkglext-0.5.1.tar.bz2) = e721221127c7ce2b4d6a1d86837d0919ae36cc34
 Size (gtkglext-0.5.1.tar.bz2) = 292316 bytes
-SHA1 (patch-aa) = ee0496edaf2a946ca52417bc80659bab1c062581
diff --git a/graphics/gtkglext/patches/patch-aa b/graphics/gtkglext/patches/patch-aa
deleted file mode 100644
index e9ba76488aa..00000000000
--- a/graphics/gtkglext/patches/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/10/16 03:37:03 rh Exp $
-
---- gtkglext.pc.in.orig	Tue May 28 08:36:12 2002
-+++ gtkglext.pc.in
-@@ -10,5 +10,5 @@ Name: GtkGLExt
- Description: OpenGL Extension to GTK+ (${target} target)
- Version: @VERSION@
- Requires: gdkglext-${target}-${api_version} @GTKGLEXT_PACKAGES@
--Libs: -L${libdir} -lgtkglext-${target}-${api_version} @GTKGLEXT_EXTRA_LIBS@
-+Libs: -Wl,-R${libdir} -L${libdir} -lgtkglext-${target}-${api_version} @GTKGLEXT_EXTRA_LIBS@
- Cflags: -I${includedir}/gtkglext-${api_version} @GTKGLEXT_EXTRA_CFLAGS@
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 4943f435925..1c436d855e1 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2002/10/19 10:54:53 rh Exp $
+# $NetBSD: Makefile,v 1.71 2002/10/30 03:09:33 rh Exp $
 #
 
 DISTNAME=		imlib-1.9.14
@@ -13,6 +13,7 @@ COMMENT=		image manipulation library for X11
 USE_X11BASE=		yes
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+PKGCONFIG_OVERRIDE=	${WRKSRC}/imlib.pc.in
 GNU_CONFIGURE=		yes
 PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
 USE_GMAKE=		yes
diff --git a/graphics/imlib/distinfo b/graphics/imlib/distinfo
index 823b99e3176..1a6875ce0f3 100644
--- a/graphics/imlib/distinfo
+++ b/graphics/imlib/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.11 2002/08/25 18:39:11 jlam Exp $
+$NetBSD: distinfo,v 1.12 2002/10/30 03:09:33 rh Exp $
 
 SHA1 (imlib-1.9.14.tar.gz) = 3c8c8c3aaec3cc5a9fc924060a71223862a313f6
 Size (imlib-1.9.14.tar.gz) = 748591 bytes
 SHA1 (patch-aa) = 185a5229af781d3dbc57978a3f4acd8308ca4c14
 SHA1 (patch-ab) = df9f9f7c85f0794748a4ca6f58836f8dd230c805
-SHA1 (patch-ac) = 94e90fa4e33ff2fdee013f8589f5531e717879c8
 SHA1 (patch-ae) = 3ed6fff2e73f04ec83c27dc6e3f2db2fa446abbb
 SHA1 (patch-ag) = 0ed464cb26492f3eebb8812efdb49ee83ef4ae6b
diff --git a/graphics/imlib/patches/patch-ac b/graphics/imlib/patches/patch-ac
deleted file mode 100644
index 32bc68417a5..00000000000
--- a/graphics/imlib/patches/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ac,v 1.11 2002/08/25 18:39:12 jlam Exp $
-
---- imlib.pc.in.orig	Sat Sep 30 12:09:41 2000
-+++ imlib.pc.in
-@@ -9,5 +9,5 @@ Name: Imlib
- Description: An image loading and rendering library for X11R6
- Version: @VERSION@
- Requires:
--Libs: -L${libdir} @LDFLAGS@ -lImlib @SUPPORT_LIBS@ @X_LIBS@ @X_PRE_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@
-+Libs: -L${libdir} -Wl,-R${libdir} @LDFLAGS@ -lImlib @SUPPORT_LIBS@ @X_LIBS@ @X_PRE_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@
- Cflags: -I${includedir} @X_CFLAGS@
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 9a730e75ee3..a3f43811767 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/10/16 10:29:01 rh Exp $
+# $NetBSD: Makefile,v 1.2 2002/10/30 03:09:34 rh Exp $
 #
 
 DISTNAME=		librsvg-2.0.1
@@ -16,6 +16,7 @@ USE_X11=		YES
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+PKGCONFIG_OVERRIDE=	${WRKSRC}/librsvg-2.0.pc.in
 
 .include "../../graphics/freetype2/buildlink2.mk"
 .include "../../graphics/libart2/buildlink2.mk"
diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo
index 09f680bc3e5..b0bf37b4440 100644
--- a/graphics/librsvg2/distinfo
+++ b/graphics/librsvg2/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/10/16 10:29:01 rh Exp $
+$NetBSD: distinfo,v 1.2 2002/10/30 03:09:34 rh Exp $
 
 SHA1 (librsvg-2.0.1.tar.bz2) = 9c38ca158baaf492fdf20612d1d32dc38aa5c393
 Size (librsvg-2.0.1.tar.bz2) = 155093 bytes
-SHA1 (patch-aa) = e590ed66c4ded7a494483ebfb49efc4959664838
diff --git a/graphics/librsvg2/patches/patch-aa b/graphics/librsvg2/patches/patch-aa
deleted file mode 100644
index 0841bdb19f4..00000000000
--- a/graphics/librsvg2/patches/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/10/16 10:29:01 rh Exp $
-
---- librsvg-2.0.pc.in.orig	Sat Jan  5 03:49:35 2002
-+++ librsvg-2.0.pc.in
-@@ -7,5 +7,5 @@
- Description: library that renders svg files using libart and pango
- Version: @VERSION@
- Requires: glib-2.0 gdk-pixbuf-2.0 libart-2.0 libxml-2.0 pangoft2
--Libs: -L${libdir} -lrsvg-2
-+Libs: -Wl,-R${libdir} -L${libdir} -lrsvg-2
- Cflags: -I${includedir}/librsvg-2