Replace hand made patches for pkgconfig tempates with PKGCONFIG_OVERRIDE.

6 files changed, 6 insertions, 50 deletions

diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index 72f9efb6ff2..a01cfc7e193 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/10/19 10:54:48 rh Exp $
+# $NetBSD: Makefile,v 1.11 2002/10/30 03:09:30 rh Exp $
 #
 
 DISTNAME=		glib-2.0.6
@@ -21,6 +21,10 @@ USE_PERL5=		yes
 
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+PKGCONFIG_OVERRIDE=	${WRKSRC}/glib-2.0.pc.in
+PKGCONFIG_OVERRIDE+=	${WRKSRC}/gmodule-2.0.pc.in
+PKGCONFIG_OVERRIDE+=	${WRKSRC}/gobject-2.0.pc.in
+PKGCONFIG_OVERRIDE+=	${WRKSRC}/gthread-2.0.pc.in
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/glib
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index ae8e6c92fd8..fc564ae24d6 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.6 2002/08/23 02:37:42 dmcmahill Exp $
+$NetBSD: distinfo,v 1.7 2002/10/30 03:09:30 rh Exp $
 
 SHA1 (glib-2.0.6.tar.gz) = 5c42257ecb7ef97d644a0960f26e8107ae52bd7c
 Size (glib-2.0.6.tar.gz) = 1963573 bytes
-SHA1 (patch-aa) = 02f422fed74442042593ef232e6791ce7d2e8b6f
-SHA1 (patch-ab) = d5789b61254a84dcf9320014310b9e1ae295b169
-SHA1 (patch-ac) = 550c433ecbc778be6749306dac2967e6a4513c14
-SHA1 (patch-ad) = f58919a3ef05183b3bb4e5b369b56ffe74df5379
 SHA1 (patch-ae) = 595a79aea5bbe65a10e34084629900b1da7b4b7b
 SHA1 (patch-af) = 28dff19acbe3df8c1bcf2055b35eb5b20201f395
diff --git a/devel/glib2/patches/patch-aa b/devel/glib2/patches/patch-aa
deleted file mode 100644
index a7f0a3fb863..00000000000
--- a/devel/glib2/patches/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2002/08/25 19:22:29 jlam Exp $
-
---- glib-2.0.pc.in.orig	Wed Mar  6 01:37:24 2002
-+++ glib-2.0.pc.in
-@@ -10,5 +10,5 @@
- Name: GLib
- Description: C Utility Library
- Version: @VERSION@
--Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ @ICONV_LIBS@
-+Libs: -Wl,-R${libdir} -L${libdir} -lglib-2.0 @INTLLIBS@ @ICONV_LIBS@
- Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include 
diff --git a/devel/glib2/patches/patch-ab b/devel/glib2/patches/patch-ab
deleted file mode 100644
index 0a573dc1a4a..00000000000
--- a/devel/glib2/patches/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2002/08/25 19:22:29 jlam Exp $
-
---- gmodule-2.0.pc.in.orig	Wed Mar  6 01:37:24 2002
-+++ gmodule-2.0.pc.in
-@@ -9,5 +9,5 @@
- Description: Dynamic module loader for GLib
- Requires: glib-2.0
- Version: @VERSION@
--Libs: -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule-2.0 @G_MODULE_LIBS@
-+Libs: -Wl,-R${libdir} -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule-2.0 @G_MODULE_LIBS@
- Cflags:
diff --git a/devel/glib2/patches/patch-ac b/devel/glib2/patches/patch-ac
deleted file mode 100644
index e8d8654643c..00000000000
--- a/devel/glib2/patches/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2002/08/25 19:22:29 jlam Exp $
-
---- gobject-2.0.pc.in.orig	Wed Mar  6 01:37:24 2002
-+++ gobject-2.0.pc.in
-@@ -7,5 +7,5 @@
- Description: GLib Type, Object, Parameter and Signal Library
- Requires: glib-2.0
- Version: @VERSION@
--Libs: -L${libdir} -lgobject-2.0
-+Libs: -Wl,-R${libdir} -L${libdir} -lgobject-2.0
- Cflags:
diff --git a/devel/glib2/patches/patch-ad b/devel/glib2/patches/patch-ad
deleted file mode 100644
index 30b94c05563..00000000000
--- a/devel/glib2/patches/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2002/08/25 19:22:29 jlam Exp $
-
---- gthread-2.0.pc.in.orig	Wed Mar  6 01:37:24 2002
-+++ gthread-2.0.pc.in
-@@ -7,5 +7,5 @@
- Description: Thread support for GLib
- Requires: glib-2.0
- Version: @VERSION@
--Libs: -L${libdir} -lgthread-2.0 @G_THREAD_LIBS@
-+Libs: -Wl,-R${libdir} -L${libdir} -lgthread-2.0 @G_THREAD_LIBS@
- Cflags: @G_THREAD_CFLAGS@