Patch the various pkgconfig files to include proper -Wl,-R options.

Bump PKGREVISION

19 files changed, 116 insertions, 12 deletions

diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile
index 63a08aff496..4c955d3f468 100644
--- a/devel/GConf/Makefile
+++ b/devel/GConf/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2002/04/09 18:28:43 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2002/07/18 02:19:36 rh Exp $
 #
 
 DISTNAME=		GConf-1.0.9
+PKGREVISION=		1
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/GConf/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/GConf/distinfo b/devel/GConf/distinfo
index 565a7a05b14..c6a9ff8140e 100644
--- a/devel/GConf/distinfo
+++ b/devel/GConf/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.6 2002/03/20 12:36:45 wiz Exp $
+$NetBSD: distinfo,v 1.7 2002/07/18 02:19:37 rh Exp $
 
 SHA1 (GConf-1.0.9.tar.bz2) = 91a1172c7855a235bf09e2ab925343a2e5250c13
 Size (GConf-1.0.9.tar.bz2) = 784363 bytes
 SHA1 (patch-aa) = 2ca0b21fb70f9355235a8bd1fc38f6a75175f493
+SHA1 (patch-ab) = d44b5b913ef44b72101e60de04b650d321147841
 SHA1 (patch-ac) = 497128a91cae960780a9f24ee38c15c84a6c0649
+SHA1 (patch-ad) = da39a3ee5e6b4b0d3255bfef95601890afd80709
 SHA1 (patch-ae) = 91a8bcd108b4f6682fe559db5b6af7f37a41533b
diff --git a/devel/GConf/patches/patch-ab b/devel/GConf/patches/patch-ab
new file mode 100644
index 00000000000..b3332ac4bd7
--- /dev/null
+++ b/devel/GConf/patches/patch-ab
@@ -0,0 +1,11 @@
+$NetBSD: patch-ab,v 1.4 2002/07/18 02:19:37 rh Exp $
+
+--- gconf.pc.in.orig	Sat Mar 24 08:52:30 2001
++++ gconf.pc.in
+@@ -8,5 +8,5 @@ Name: gconf
+ Description: GNOME Config System.
+ Version: @VERSION@
+ Requires: oaf
+-Libs: -L${libdir} -lgconf-@MAJOR_VERSION@
++Libs: -L${libdir} -Wl,-R${libdir} -lgconf-@MAJOR_VERSION@
+ Cflags: -I${includedir}/gconf/@MAJOR_VERSION@
diff --git a/devel/GConf/patches/patch-ad b/devel/GConf/patches/patch-ad
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/devel/GConf/patches/patch-ad
diff --git a/devel/atk/Makefile b/devel/atk/Makefile
index 7e4ac12c318..46ddd65d86b 100644
--- a/devel/atk/Makefile
+++ b/devel/atk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2002/06/30 14:04:26 jschauma Exp $
+# $NetBSD: Makefile,v 1.5 2002/07/18 02:19:26 rh Exp $
 #
 
 DISTNAME=		atk-1.0.2
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.0/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.0/ \
diff --git a/devel/atk/distinfo b/devel/atk/distinfo
index 4aede055e45..fe6268c5ffb 100644
--- a/devel/atk/distinfo
+++ b/devel/atk/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.5 2002/06/30 14:04:26 jschauma Exp $
+$NetBSD: distinfo,v 1.6 2002/07/18 02:19:26 rh Exp $
 
 SHA1 (atk-1.0.2.tar.gz) = 70cdf03295fb16fb0e9a7cacf3633a7d913cbf1e
 Size (atk-1.0.2.tar.gz) = 341640 bytes
 SHA1 (patch-aa) = 12baad6715a485f4dd1e0d3176299552fb275598
+SHA1 (patch-ab) = 83508b6261ed51791e3afa7a7a4ae6dfe5d6422a
diff --git a/devel/atk/patches/patch-ab b/devel/atk/patches/patch-ab
new file mode 100644
index 00000000000..af19a2679e1
--- /dev/null
+++ b/devel/atk/patches/patch-ab
@@ -0,0 +1,11 @@
+$NetBSD: patch-ab,v 1.1 2002/07/18 02:19:26 rh Exp $
+
+--- atk.pc.in.orig	Wed Mar  6 03:27:29 2002
++++ atk.pc.in
+@@ -7,5 +7,5 @@ Name: Atk
+ Description: Accessibility Toolkit
+ Version: @VERSION@
+ Requires: @GLIB_PACKAGES@
+-Libs: -L${libdir} -latk-@ATK_API_VERSION@
++Libs: -L${libdir} -Wl,-R${libdir} -latk-@ATK_API_VERSION@
+ Cflags: -I${includedir}/atk-1.0
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index 0d7fd7a1fa2..3a776808468 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2002/04/10 14:37:16 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2002/07/18 02:19:39 rh Exp $
 #
 
 DISTNAME=		bonobo-1.0.18
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/bonobo/}
 
diff --git a/devel/bonobo/distinfo b/devel/bonobo/distinfo
index cf8a5405879..c45928810c7 100644
--- a/devel/bonobo/distinfo
+++ b/devel/bonobo/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.9 2002/04/10 14:37:17 jlam Exp $
+$NetBSD: distinfo,v 1.10 2002/07/18 02:19:39 rh Exp $
 
 SHA1 (bonobo-1.0.18.tar.gz) = e6f6790e0c0eb29a295163f643569e36896d27a0
 Size (bonobo-1.0.18.tar.gz) = 1279988 bytes
 SHA1 (patch-aa) = abb08c79e9971e755f4fef72bce46a88e9299397
 SHA1 (patch-ab) = f0e9525cc00145687fbeab000023c566e797c6c4
+SHA1 (patch-ac) = 1d8f6121f1ad54d95cace5f79f8e17cb24522857
diff --git a/devel/bonobo/patches/patch-ac b/devel/bonobo/patches/patch-ac
new file mode 100644
index 00000000000..4d7b9e7017b
--- /dev/null
+++ b/devel/bonobo/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.3 2002/07/18 02:19:40 rh Exp $
+
+--- libefs/libefs.pc.in.orig	Tue Oct 10 18:02:25 2000
++++ libefs/libefs.pc.in
+@@ -4,6 +4,6 @@ includedir=@prefix@/include
+ Name: libefs
+ Description: Embeded Filesystem Library
+ Version: 1.0.0
+-Libs: -L${libdir} -lefs -lz @CRYPTLIB@
++Libs: -L${libdir} -Wl,-R${libdir} -lefs -lz @CRYPTLIB@
+ Requires: glib
+ Cflags: -I${includedir}
diff --git a/devel/glib/Makefile b/devel/glib/Makefile
index 7472dc0bac0..80a6c41d101 100644
--- a/devel/glib/Makefile
+++ b/devel/glib/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.45 2002/05/18 22:46:47 zuntum Exp $
+# $NetBSD: Makefile,v 1.46 2002/07/18 02:19:30 rh Exp $
 # FreeBSD Id: Makefile,v 1.2 1998/08/06 14:55:12 vanilla Exp
 #
 
 DISTNAME=		glib-1.2.10
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v1.2/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
diff --git a/devel/glib/distinfo b/devel/glib/distinfo
index bd4ecea44b5..842f0e4e457 100644
--- a/devel/glib/distinfo
+++ b/devel/glib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/04/26 17:38:28 rh Exp $
+$NetBSD: distinfo,v 1.4 2002/07/18 02:19:30 rh Exp $
 
 SHA1 (glib-1.2.10.tar.gz) = e5a9361c594608d152d5d9650154c2e3260b87fa
 Size (glib-1.2.10.tar.gz) = 421480 bytes
@@ -7,3 +7,6 @@ SHA1 (patch-ab) = 56e5035d8c144733752e38e0c1e790dfe44f87b7
 SHA1 (patch-ac) = ab176e926d9fee6d463096ad3853e06718129acc
 SHA1 (patch-ad) = a7c10916ccaef52a62415d129060a6dddbc5fbd8
 SHA1 (patch-ae) = 222a1f4c470fd1123deb3b4dd918b036b3607e59
+SHA1 (patch-af) = a1fa53f4c903f42b3f6490abf910ce6276eae5c7
+SHA1 (patch-ag) = f475066fa24d77b9c5f182abbd060bbb40023de6
+SHA1 (patch-ah) = be1e06b11cdd6fb91d371101b46ba9dda7935107
diff --git a/devel/glib/patches/patch-af b/devel/glib/patches/patch-af
new file mode 100644
index 00000000000..3da906c31eb
--- /dev/null
+++ b/devel/glib/patches/patch-af
@@ -0,0 +1,12 @@
+$NetBSD: patch-af,v 1.1 2002/07/18 02:19:30 rh Exp $
+
+--- glib.pc.in.orig	Thu Nov 30 11:15:33 2000
++++ glib.pc.in
+@@ -6,6 +6,6 @@ includedir=@includedir@
+ Name: GLib
+ Description: C Utility Library
+ Version: @VERSION@
+-Libs: -L${libdir} -lglib
++Libs: -L${libdir} -Wl,-R${libdir} -lglib
+ Cflags: -I${includedir}/glib-1.2 -I${libdir}/glib/include 
+ 
diff --git a/devel/glib/patches/patch-ag b/devel/glib/patches/patch-ag
new file mode 100644
index 00000000000..95aa5e73613
--- /dev/null
+++ b/devel/glib/patches/patch-ag
@@ -0,0 +1,11 @@
+$NetBSD: patch-ag,v 1.1 2002/07/18 02:19:30 rh Exp $
+
+--- gmodule.pc.in.orig	Thu Nov 30 11:15:33 2000
++++ gmodule.pc.in
+@@ -7,5 +7,5 @@ Name: GModule
+ Description: Dynamic module loader for GLib
+ Requires: glib
+ Version: @VERSION@
+-Libs: -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule @G_MODULE_LIBS@
++Libs: -L${libdir} -Wl,-R${libdir} @G_MODULE_LDFLAGS@ -lgmodule @G_MODULE_LIBS@
+ Cflags:
diff --git a/devel/glib/patches/patch-ah b/devel/glib/patches/patch-ah
new file mode 100644
index 00000000000..a6015873083
--- /dev/null
+++ b/devel/glib/patches/patch-ah
@@ -0,0 +1,11 @@
+$NetBSD: patch-ah,v 1.1 2002/07/18 02:19:31 rh Exp $
+
+--- gthread.pc.in.orig	Thu Nov 30 11:15:33 2000
++++ gthread.pc.in
+@@ -7,5 +7,5 @@ Name: GThread
+ Description: Thread support for GLib
+ Requires: glib
+ Version: @VERSION@
+-Libs: -L${libdir} -lgthread @G_THREAD_LIBS@
++Libs: -L${libdir} -Wl,-R${libdir} -lgthread @G_THREAD_LIBS@
+ Cflags: @G_THREAD_CFLAGS@
diff --git a/devel/pango/Makefile b/devel/pango/Makefile
index 163ff9cbcb6..e2367d20400 100644
--- a/devel/pango/Makefile
+++ b/devel/pango/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2002/07/03 01:29:39 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.6 2002/07/18 02:19:35 rh Exp $
 #
 
 DISTNAME=		pango-1.0.3
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.0/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.0/ \
diff --git a/devel/pango/distinfo b/devel/pango/distinfo
index 25bf0ff78db..d19260c5d05 100644
--- a/devel/pango/distinfo
+++ b/devel/pango/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.5 2002/06/30 01:51:30 jschauma Exp $
+$NetBSD: distinfo,v 1.6 2002/07/18 02:19:35 rh Exp $
 
 SHA1 (pango-1.0.3.tar.gz) = d05cee8095918351fe044a191491028225a74272
 Size (pango-1.0.3.tar.gz) = 1180586 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-ad b/devel/pango/patches/patch-ad
new file mode 100644
index 00000000000..6e39d53a732
--- /dev/null
+++ b/devel/pango/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1 2002/07/18 02:19:36 rh 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
new file mode 100644
index 00000000000..34b48cecb36
--- /dev/null
+++ b/devel/pango/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1 2002/07/18 02:19:36 rh 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@
+