Replace hand made patches for pkgconfig tempates with PKGCONFIG_OVERRIDE.

10 files changed, 12 insertions, 79 deletions

diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index 5fc3b5a1090..5f0d64d75f4 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2002/10/19 10:55:02 rh Exp $
+# $NetBSD: Makefile,v 1.77 2002/10/30 03:09:39 rh Exp $
 
 DISTNAME=		gtk+-1.2.10
 PKGREVISION=		3
@@ -16,10 +16,12 @@ BUILD_USES_MSGFMT=	yes
 
 USE_BUILDLINK2=		yes
 USE_PERL5=		build
-USE_LIBTOOL=		yes
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 USE_X11BASE=		yes
 USE_GMAKE=		yes
+USE_LIBTOOL=		yes
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+PKGCONFIG_OVERRIDE=	${WRKSRC}/gdk.pc.in
+PKGCONFIG_OVERRIDE+=	${WRKSRC}/gtk+.pc.in
 
 GNU_CONFIGURE=		 yes
 CONFIGURE_ARGS+=	--with-xinput=xfree \
diff --git a/x11/gtk/distinfo b/x11/gtk/distinfo
index 0614c26fe82..d788d1bf0f7 100644
--- a/x11/gtk/distinfo
+++ b/x11/gtk/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/09/01 14:52:29 tron Exp $
+$NetBSD: distinfo,v 1.6 2002/10/30 03:09:39 rh Exp $
 
 SHA1 (gtk+-1.2.10.tar.gz) = a5adcb909257da01ae4d4761e1d41081d06e4d7c
 Size (gtk+-1.2.10.tar.gz) = 2868322 bytes
@@ -8,5 +8,3 @@ SHA1 (patch-ac) = 4f7ffd7dbca81740e8b0304f96f7b3ce592404db
 SHA1 (patch-ad) = 86c29afeaf008e0412298047da6e7cb545c8fc60
 SHA1 (patch-ae) = 8ad654085ee8688d083e00b5f968dd732285ff9c
 SHA1 (patch-af) = d969891b6d8fa493294971894b5a355023c75460
-SHA1 (patch-ag) = c5ad908a4ecb18ee0f986d0d18b0248bcbac4b90
-SHA1 (patch-ah) = 4bf43bd6c5481048c6babb9c56a1b99326963cf3
diff --git a/x11/gtk/patches/patch-ag b/x11/gtk/patches/patch-ag
deleted file mode 100644
index 3cf44e21680..00000000000
--- a/x11/gtk/patches/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2002/08/25 18:40:34 jlam Exp $
-
---- gdk.pc.in.orig	Thu Nov 30 11:18:35 2000
-+++ gdk.pc.in
-@@ -7,5 +7,5 @@ Name: GDK
- Description: GIMP Drawing Kit
- Version: @VERSION@
- Requires: glib
--Libs: -L${libdir} @x_ldflags@ -lgdk @INTLLIBS@ @GDK_WLIBS@ @x_libs@ -lm
-+Libs: -L${libdir} -Wl,-R${libdir} @x_ldflags@ -lgdk @INTLLIBS@ @GDK_WLIBS@ @x_libs@ -lm
- Cflags: -I${includedir}/gtk-1.2 @x_cflags@
diff --git a/x11/gtk/patches/patch-ah b/x11/gtk/patches/patch-ah
deleted file mode 100644
index 083a051d8d5..00000000000
--- a/x11/gtk/patches/patch-ah
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2002/08/25 18:40:35 jlam Exp $
-
---- gtk+.pc.in.orig	Thu Nov 30 11:18:35 2000
-+++ gtk+.pc.in
-@@ -7,5 +7,5 @@ Name: GTK+
- Description: GIMP Tool Kit
- Version: @VERSION@
- Requires: gdk
--Libs: -L${libdir} -lgtk
-+Libs: -L${libdir} -Wl,-R${libdir} -lgtk
- Cflags: 
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index fb80b1b748f..b9d13a50f7a 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2002/10/19 10:55:03 rh Exp $
+# $NetBSD: Makefile,v 1.14 2002/10/30 03:09:39 rh Exp $
 #
 
 DISTNAME=		gtk+-2.0.6
@@ -25,6 +25,10 @@ MAKE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+PKGCONFIG_OVERRIDE=	${WRKSRC}/gdk-2.0.pc.in
+PKGCONFIG_OVERRIDE+=	${WRKSRC}/gtk+-2.0.pc.in
+PKGCONFIG_OVERRIDE+=	${WRKSRC}/gdk-pixbuf-2.0.pc.in
+PKGCONFIG_OVERRIDE+=	${WRKSRC}/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in
 
 BUILD_DIRS=		${WRKSRC} ${WRKSRC}/demos/gtk-demo
 
diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo
index 2ea2b18bba0..de50aae25b1 100644
--- a/x11/gtk2/distinfo
+++ b/x11/gtk2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2002/10/08 00:02:18 jlam Exp $
+$NetBSD: distinfo,v 1.9 2002/10/30 03:09:39 rh Exp $
 
 SHA1 (gtk+-2.0.6.tar.gz) = 94b0f429d8f86742e385ae55881a52fbae2bb6e2
 Size (gtk+-2.0.6.tar.gz) = 8545717 bytes
@@ -7,7 +7,6 @@ SHA1 (patch-ab) = d9c84c3d896a999746e7750ead9791309e99e93d
 SHA1 (patch-ac) = 73793591a49fc5d600617240c92cb7369568cef8
 SHA1 (patch-ad) = fd82d510c7d3a761e5218fda9abe61e73ca7299b
 SHA1 (patch-ae) = bb68fd2552b080f98c90c562de94780ff14bf4f2
-SHA1 (patch-af) = 387012e67fc3129cce87807d108ea1474ab4e90a
 SHA1 (patch-ag) = 55165f8a8d8f0aa1324dcc1c2fbce567e8380c07
 SHA1 (patch-ah) = 144e4931bdb6c28f38191b201227249f125512fb
 SHA1 (patch-ai) = 49d6bf894b88cfd976ba58403ae2291a853f7779
@@ -15,7 +14,4 @@ SHA1 (patch-aj) = 3ef780efe0016fbd38d495df3f640853fd0f10df
 SHA1 (patch-ak) = 382c23406a869acda4e220081a56f99b9014bafa
 SHA1 (patch-al) = f9cda85fa0ec0e36bbb6b4f8246fd6911786ec05
 SHA1 (patch-am) = 80bcc1a0eff0b4be3e3f9375a5541954cea48266
-SHA1 (patch-an) = cee3722807b69b8c42d83505e99ef5abb2182f81
-SHA1 (patch-ao) = 9689fd1632e0dbe06bb2ca7fc1116b62cd3058e4
-SHA1 (patch-ap) = 384de00d880e1bc6123205a8f3e6545b0856de02
 SHA1 (patch-aq) = 1e5330847d80f3e39b6949a79a48a7e94b64bb4f
diff --git a/x11/gtk2/patches/patch-af b/x11/gtk2/patches/patch-af
deleted file mode 100644
index b4a60b29403..00000000000
--- a/x11/gtk2/patches/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-af,v 1.6 2002/08/25 19:23:32 jlam Exp $
-
---- contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in.orig	Wed Mar  6 07:03:50 2002
-+++ contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in
-@@ -7,5 +7,5 @@ Name: GdkPixbuf Xlib
- Description: GdkPixbuf rendering for Xlib
- Version: @VERSION@
- Requires: gobject-2.0,gmodule-2.0,gdk-pixbuf-2.0
--Libs: -L${libdir} -lgdk_pixbuf_xlib-@GTK_API_VERSION@
-+Libs: -L${libdir} -Wl,-R${libdir} -lgdk_pixbuf_xlib-@GTK_API_VERSION@
- Cflags: -I${includedir}
diff --git a/x11/gtk2/patches/patch-an b/x11/gtk2/patches/patch-an
deleted file mode 100644
index f5b56170f69..00000000000
--- a/x11/gtk2/patches/patch-an
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-an,v 1.4 2002/08/25 19:23:32 jlam Exp $
-
---- gdk-2.0.pc.in.orig	Wed Mar  6 07:03:49 2002
-+++ gdk-2.0.pc.in
-@@ -8,5 +8,5 @@ Name: GDK
- Description: GIMP Drawing Kit (${target} target)
- Version: @VERSION@
- Requires: gdk-pixbuf-2.0 @GDK_PACKAGES@
--Libs: -L${libdir} -lgdk-${target}-@GTK_API_VERSION@ @GDK_EXTRA_LIBS@
-+Libs: -L${libdir} -Wl,-R${libdir} -lgdk-${target}-@GTK_API_VERSION@ @GDK_EXTRA_LIBS@
- Cflags: -I${includedir}/gtk-2.0 -I${libdir}/gtk-2.0/include @GDK_EXTRA_CFLAGS@
diff --git a/x11/gtk2/patches/patch-ao b/x11/gtk2/patches/patch-ao
deleted file mode 100644
index 43fac144c6a..00000000000
--- a/x11/gtk2/patches/patch-ao
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ao,v 1.4 2002/08/25 19:23:32 jlam Exp $
-
---- gdk-pixbuf-2.0.pc.in.orig	Wed Mar  6 07:03:49 2002
-+++ gdk-pixbuf-2.0.pc.in
-@@ -7,6 +7,6 @@ Name: GdkPixbuf
- Description: Image loading and scaling
- Version: @VERSION@
- Requires: gobject-2.0,gmodule-2.0
--Libs: -L${libdir} -lgdk_pixbuf-@GTK_API_VERSION@ @GDK_PIXBUF_EXTRA_LIBS@
-+Libs: -L${libdir} -Wl,-R${libdir} -lgdk_pixbuf-@GTK_API_VERSION@ @GDK_PIXBUF_EXTRA_LIBS@
- Cflags: -I${includedir}/gtk-2.0 @GDK_PIXBUF_EXTRA_CFLAGS@
- 
diff --git a/x11/gtk2/patches/patch-ap b/x11/gtk2/patches/patch-ap
deleted file mode 100644
index 6c72c729336..00000000000
--- a/x11/gtk2/patches/patch-ap
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ap,v 1.2 2002/08/25 19:23:32 jlam Exp $
-
---- gtk+-2.0.pc.in.orig	Wed Mar  6 07:03:49 2002
-+++ gtk+-2.0.pc.in
-@@ -11,5 +11,5 @@ Name: GTK+
- Description: GIMP Tool Kit (${target} target)
- Version: @VERSION@
- Requires: gdk-${target}-2.0 @GTK_PACKAGES@
--Libs: -L${libdir} -lgtk-${target}-@GTK_API_VERSION@ @GTK_EXTRA_LIBS@
-+Libs: -L${libdir} -Wl,-R${libdir} -lgtk-${target}-@GTK_API_VERSION@ @GTK_EXTRA_LIBS@
- Cflags: -I${includedir}/gtk-2.0 @GTK_EXTRA_CFLAGS@