Replace hand made patches for pkgconfig tempates with PKGCONFIG_OVERRIDE.

7 files changed, 7 insertions, 67 deletions

diff --git a/devel/pango/Makefile b/devel/pango/Makefile
index a3da1075666..657f592a5ef 100644
--- a/devel/pango/Makefile
+++ b/devel/pango/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/10/21 03:02:24 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.13 2002/10/30 03:09:31 rh Exp $
 #
 
 DISTNAME=		pango-1.0.5
@@ -19,6 +19,11 @@ GNU_CONFIGURE=		yes
 
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+PKGCONFIG_OVERRIDE=	${WRKSRC}/pango.pc.in
+PKGCONFIG_OVERRIDE+=	${WRKSRC}/pangoft2.pc.in
+PKGCONFIG_OVERRIDE+=	${WRKSRC}/pangox.pc.in
+PKGCONFIG_OVERRIDE+=	${WRKSRC}/pangowin32.pc.in
+PKGCONFIG_OVERRIDE+=	${WRKSRC}/pangoxft.pc.in
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/devel/pango/distinfo b/devel/pango/distinfo
index 163f2eb1d1f..022c83d860a 100644
--- a/devel/pango/distinfo
+++ b/devel/pango/distinfo
@@ -1,9 +1,4 @@
-$NetBSD: distinfo,v 1.8 2002/10/21 03:02:24 dmcmahill Exp $
+$NetBSD: distinfo,v 1.9 2002/10/30 03:09:31 rh Exp $
 
 SHA1 (pango-1.0.5.tar.gz) = cf33b4a956d0de77956aa09b9004b530e4d6df54
 Size (pango-1.0.5.tar.gz) = 1203673 bytes
-SHA1 (patch-aa) = 74ee4b95170ccb1085d9786c986cbbc305ce6347
-SHA1 (patch-ab) = 8d0cf48a021b1f39eac87894c9b025fb1dcc39ae
-SHA1 (patch-ac) = dc3d6393bdf434dd2e7fc219b7539b16d64e56cf
-SHA1 (patch-ad) = c638a698dcf0fe95df4a33925637d48dc1f55a69
-SHA1 (patch-ae) = 7511495fddbcc5c3d30eb40063ebc2e6d912be82
diff --git a/devel/pango/patches/patch-aa b/devel/pango/patches/patch-aa
deleted file mode 100644
index 4c9a0caedda..00000000000
--- a/devel/pango/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2002/08/25 19:22:36 jlam Exp $
-
---- pango.pc.in.orig	Thu Mar  7 03:04:39 2002
-+++ pango.pc.in
-@@ -9,6 +9,6 @@
- Description: Internationalized text handling
- Version: @VERSION@
- Requires: @FRIBIDI_PC@glib-2.0,gobject-2.0,gmodule-2.0
--Libs: -L${libdir} -lpango-@PANGO_API_VERSION@
-+Libs: -Wl,-R${libdir} -L${libdir} -lpango-@PANGO_API_VERSION@
- Cflags: -I${includedir}/pango-1.0
- 
diff --git a/devel/pango/patches/patch-ab b/devel/pango/patches/patch-ab
deleted file mode 100644
index 19c337a82b5..00000000000
--- a/devel/pango/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2002/08/25 19:22:37 jlam Exp $
-
---- pangoft2.pc.in.orig	Wed Mar  6 03:20:57 2002
-+++ pangoft2.pc.in
-@@ -7,6 +7,6 @@
- Description: Freetype 2.0 font support for Pango
- Version: @VERSION@
- Requires: pango
--Libs: -L${libdir} -lpangoft2-@PANGO_API_VERSION@ @PKGCONFIG_FREETYPE_LIBS@
-+Libs: -Wl,-R${libdir} -L${libdir} -lpangoft2-@PANGO_API_VERSION@ @PKGCONFIG_FREETYPE_LIBS@
- Cflags: -I${includedir}/pango-1.0 @FREETYPE_CFLAGS@
- 
diff --git a/devel/pango/patches/patch-ac b/devel/pango/patches/patch-ac
deleted file mode 100644
index 4150323b76b..00000000000
--- a/devel/pango/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2002/08/25 19:22:37 jlam Exp $
-
---- pangox.pc.in.orig	Wed Mar  6 03:20:57 2002
-+++ pangox.pc.in
-@@ -7,6 +7,6 @@
- Description: X Window System font support for Pango
- Version: @VERSION@
- Requires: pango
--Libs: -L${libdir} -lpangox-@PANGO_API_VERSION@ @PKGCONFIG_X_LIBS@
-+Libs: -Wl,-R${libdir} -L${libdir} -lpangox-@PANGO_API_VERSION@ @PKGCONFIG_X_LIBS@
- Cflags: -I${includedir}/pango-1.0 @X_CFLAGS@
- 
diff --git a/devel/pango/patches/patch-ad b/devel/pango/patches/patch-ad
deleted file mode 100644
index 2f19b3c5749..00000000000
--- a/devel/pango/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2002/08/25 19:22:37 jlam Exp $
-
---- pangowin32.pc.in.orig	Wed Mar  6 03:20:57 2002
-+++ pangowin32.pc.in
-@@ -7,6 +7,6 @@ Name: Pango Win32
- Description: Win32 GDI font support for Pango
- Version: @VERSION@
- Requires: pango
--Libs: -L${libdir} -lpangowin32-@PANGO_API_VERSION@ @WIN32_LIBS@
-+Libs: -L${libdir} -Wl,-R${libdir} -lpangowin32-@PANGO_API_VERSION@ @WIN32_LIBS@
- Cflags: -I${includedir}/pango-1.0
- 
diff --git a/devel/pango/patches/patch-ae b/devel/pango/patches/patch-ae
deleted file mode 100644
index 58ea5954f98..00000000000
--- a/devel/pango/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2002/08/25 19:22:37 jlam Exp $
-
---- pangoxft.pc.in.orig	Wed Mar  6 03:20:57 2002
-+++ pangoxft.pc.in
-@@ -7,6 +7,6 @@ Name: Pango Xft
- Description: Xft font support for Pango
- Version: @VERSION@
- Requires: pango
--Libs: -L${libdir} -lpangoxft-@PANGO_API_VERSION@ @PKGCONFIG_XFT_LIBS@
-+Libs: -L${libdir} -Wl,-R${libdir} -lpangoxft-@PANGO_API_VERSION@ @PKGCONFIG_XFT_LIBS@
- Cflags: -I${includedir}/pango-1.0 @X_CFLAGS@ @FREETYPE_CFLAGS@
-