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

Bump PKGREVISION

46 files changed, 283 insertions, 27 deletions

diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index 39dde48e588..d3dd3c4ad2e 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2002/05/08 14:26:07 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2002/07/18 02:19:27 rh Exp $
 
 DISTNAME=		esound-0.2.26
+PKGREVISION=		1
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/esound/}
 
diff --git a/audio/esound/distinfo b/audio/esound/distinfo
index 75a9cde6ac3..46049d9d213 100644
--- a/audio/esound/distinfo
+++ b/audio/esound/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.6 2002/05/08 14:26:07 wiz Exp $
+$NetBSD: distinfo,v 1.7 2002/07/18 02:19:27 rh Exp $
 
 SHA1 (esound-0.2.26.tar.gz) = dffa3424120b896b879a2ea95f2c495a49dadc45
 Size (esound-0.2.26.tar.gz) = 349513 bytes
 SHA1 (patch-aa) = fe632a5514073f8d898fef5182a1047b9f2a44c9
 SHA1 (patch-ab) = af59f6f254812c082566a1c483aec511deed0819
 SHA1 (patch-ac) = 8c68050320c80363b831745eb17cc0703acbaf24
+SHA1 (patch-ad) = 288711212e603d9e93415c95797a8698eec19e86
diff --git a/audio/esound/patches/patch-ad b/audio/esound/patches/patch-ad
new file mode 100644
index 00000000000..0452ce3481c
--- /dev/null
+++ b/audio/esound/patches/patch-ad
@@ -0,0 +1,11 @@
+$NetBSD: patch-ad,v 1.1 2002/07/18 02:19:28 rh Exp $
+
+--- esound.pc.in.orig	Tue Apr 23 18:28:28 2002
++++ esound.pc.in
+@@ -7,5 +7,5 @@ Name: esound
+ Description: esound
+ Requires: audiofile
+ Version: @VERSION@
+-Libs: -L${libdir} -lesd
++Libs: -L${libdir} -Wl,-R${libdir} -lesd
+ Cflags: -I${includedir}
diff --git a/audio/libaudiofile/Makefile b/audio/libaudiofile/Makefile
index d60dfe3b3fc..d1d65fda1a3 100644
--- a/audio/libaudiofile/Makefile
+++ b/audio/libaudiofile/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2002/05/06 12:18:25 tron Exp $
+# $NetBSD: Makefile,v 1.23 2002/07/18 02:19:27 rh Exp $
 
 DISTNAME=		audiofile-0.2.3
 PKGNAME=		lib${DISTNAME}
+PKGREVISION=		1
 CATEGORIES=		audio
 MASTER_SITES=		ftp://ftp.68k.org/pub/michael/ \
 			${MASTER_SITE_GNOME:=stable/sources/audiofile/}
diff --git a/audio/libaudiofile/distinfo b/audio/libaudiofile/distinfo
index c1ed0c489e0..5f88f1ec69e 100644
--- a/audio/libaudiofile/distinfo
+++ b/audio/libaudiofile/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2002/03/24 21:38:26 wiz Exp $
+$NetBSD: distinfo,v 1.4 2002/07/18 02:19:27 rh Exp $
 
 SHA1 (audiofile-0.2.3.tar.gz) = 12bb67ba45985e258e5c077c33e5613f340e3e34
 Size (audiofile-0.2.3.tar.gz) = 332223 bytes
+SHA1 (patch-aa) = 0c5d5b7d86aab11b57a35a42845d3ca0750a09fd
 SHA1 (patch-ab) = cd292a827aa18b9839305b2c62c3dbd526384430
diff --git a/audio/libaudiofile/patches/patch-aa b/audio/libaudiofile/patches/patch-aa
new file mode 100644
index 00000000000..ce6ea251c07
--- /dev/null
+++ b/audio/libaudiofile/patches/patch-aa
@@ -0,0 +1,11 @@
+$NetBSD: patch-aa,v 1.7 2002/07/18 02:19:27 rh Exp $
+
+--- audiofile.pc.in.orig	Fri Oct 26 14:11:38 2001
++++ audiofile.pc.in
+@@ -7,5 +7,5 @@ Name: audiofile
+ Description: audiofile
+ Requires:
+ Version: @VERSION@
+-Libs: -L${libdir} -laudiofile -lm
++Libs: -L${libdir} -Wl,-R${libdir} -laudiofile -lm
+ Cflags: -I${includedir}
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@
+ 
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 24a0d81a352..7c2c841a54e 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.67 2002/04/09 15:29:51 jlam Exp $
+# $NetBSD: Makefile,v 1.68 2002/07/18 02:19:38 rh Exp $
 #
 
 DISTNAME=		imlib-1.9.14
+PKGREVISION=		1
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/imlib/}
 
diff --git a/graphics/imlib/distinfo b/graphics/imlib/distinfo
index 1bf0dff6c7f..bc8bca3040e 100644
--- a/graphics/imlib/distinfo
+++ b/graphics/imlib/distinfo
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.8 2002/03/29 18:01:13 wiz Exp $
+$NetBSD: distinfo,v 1.9 2002/07/18 02:19:38 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-ad) = 0910b5574cca6c7cfbaec04c4c5396488d422ce7
 SHA1 (patch-ae) = 9701e0251592ae8df33b455457b6470f9833bbd7
+SHA1 (patch-af) = da39a3ee5e6b4b0d3255bfef95601890afd80709
 SHA1 (patch-ag) = 5e8452358e1f0625d1a1a5a990512bd51f51e6c9
diff --git a/graphics/imlib/patches/patch-ac b/graphics/imlib/patches/patch-ac
new file mode 100644
index 00000000000..5255991550e
--- /dev/null
+++ b/graphics/imlib/patches/patch-ac
@@ -0,0 +1,11 @@
+$NetBSD: patch-ac,v 1.10 2002/07/18 02:19:38 rh 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/imlib/patches/patch-af b/graphics/imlib/patches/patch-af
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/graphics/imlib/patches/patch-af
diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile
index 99c88fb19ce..804ca8c2992 100644
--- a/net/ORBit/Makefile
+++ b/net/ORBit/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.76 2002/04/29 18:27:17 wiz Exp $
+# $NetBSD: Makefile,v 1.77 2002/07/18 02:19:24 rh Exp $
 #
 
 DISTNAME=		ORBit-0.${ORBIT_MAJOR}.${ORBIT_MINOR}
+PKGREVISION=		1
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/ORBit/}
 
diff --git a/net/ORBit/distinfo b/net/ORBit/distinfo
index 7b0de11348c..8b293f28a50 100644
--- a/net/ORBit/distinfo
+++ b/net/ORBit/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2002/04/25 12:17:04 agc Exp $
+$NetBSD: distinfo,v 1.11 2002/07/18 02:19:24 rh Exp $
 
 SHA1 (ORBit-0.5.15.tar.gz) = 1571976662311060175008d225de05e9bc2eb038
 Size (ORBit-0.5.15.tar.gz) = 1335272 bytes
@@ -9,7 +9,9 @@ SHA1 (patch-ad) = 688920ba423aa2994d9e2e6540f8738305cb7fd9
 SHA1 (patch-ae) = 95cc6f46fa2cfcd34af2e546f3d4a8d55194e5eb
 SHA1 (patch-af) = b88b26b8fe7d42f267c6761edc3e3b8250bd14fb
 SHA1 (patch-ag) = 875e83a597ab39d57abcfd9259d8ec15707ea45c
+SHA1 (patch-ah) = 1b05e1f77ddc3a0ee6637822d4f7359e9329fff9
 SHA1 (patch-ai) = 06e1cb2bc9f4f5460cdde71526417cdaa38ff310
+SHA1 (patch-aj) = 4bb189b042058671a08de84028097bf87f4dbf3b
 SHA1 (patch-ak) = d569014320dbea40ccdb9e369e07c984ee7bd9de
 SHA1 (patch-al) = 7f2992136c3f7b1badfc76a83d6fed0aa73a8873
 SHA1 (patch-am) = f52369447d04a382d6e93a6bddaf3962a3ab6677
diff --git a/net/ORBit/patches/patch-ah b/net/ORBit/patches/patch-ah
new file mode 100644
index 00000000000..052cb071845
--- /dev/null
+++ b/net/ORBit/patches/patch-ah
@@ -0,0 +1,11 @@
+$NetBSD: patch-ah,v 1.6 2002/07/18 02:19:25 rh Exp $
+
+--- ORBit.pc.in.orig	Sat Sep 30 12:09:43 2000
++++ ORBit.pc.in
+@@ -7,5 +7,5 @@ Name: ORBit
+ Description: High-performance CORBA Object Request Broker.
+ Version: @VERSION@
+ Requires: glib
+-Libs: -L${libdir} -lORBit -lIIOP -lORBitutil @LIBS@ -lm
++Libs: -L${libdir} -Wl,-R${libdir} -lORBit -lIIOP -lORBitutil @LIBS@ -lm
+ Cflags: -I${includedir}
diff --git a/net/ORBit/patches/patch-aj b/net/ORBit/patches/patch-aj
new file mode 100644
index 00000000000..a95f81fdab0
--- /dev/null
+++ b/net/ORBit/patches/patch-aj
@@ -0,0 +1,11 @@
+$NetBSD: patch-aj,v 1.8 2002/07/18 02:19:25 rh Exp $
+
+--- libIDL/libIDL.pc.in.orig	Sat Sep 30 12:09:43 2000
++++ libIDL/libIDL.pc.in
+@@ -8,5 +8,5 @@ Name: libIDL
+ Description: IDL parsing library
+ Version: @VERSION@
+ Requires: glib
+-Libs: -L${libdir} -lIDL
++Libs: -L${libdir} -Wl,-R${libdir} -lIDL
+ Cflags: -I${includedir}
diff --git a/net/ORBit2/Makefile b/net/ORBit2/Makefile
index 21f27a9b96f..52d0042f73e 100644
--- a/net/ORBit2/Makefile
+++ b/net/ORBit2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2002/07/12 15:33:12 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2002/07/18 02:19:40 rh Exp $
 #
 
 DISTNAME=		ORBit2-2.4.0
+PKGREVISION=		1
 CATEGORIES=		net gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=2.0.0/sources/ORBit2/}/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/net/ORBit2/distinfo b/net/ORBit2/distinfo
index 3f1b740d042..b8a3357ed51 100644
--- a/net/ORBit2/distinfo
+++ b/net/ORBit2/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.5 2002/07/12 15:33:13 wiz Exp $
+$NetBSD: distinfo,v 1.6 2002/07/18 02:19:40 rh Exp $
 
 SHA1 (ORBit2-2.4.0.tar.bz2) = 234b4b8f66744637386ad7f2caf0aeca88afe484
 Size (ORBit2-2.4.0.tar.bz2) = 431841 bytes
 SHA1 (patch-aa) = 41e3dd08b704ed3fc20161e2c151bfc58b969eaa
+SHA1 (patch-ab) = 1dee388a93179376810250207e52cebeb55af875
diff --git a/net/ORBit2/patches/patch-ab b/net/ORBit2/patches/patch-ab
new file mode 100644
index 00000000000..2095b23870d
--- /dev/null
+++ b/net/ORBit2/patches/patch-ab
@@ -0,0 +1,11 @@
+$NetBSD: patch-ab,v 1.1 2002/07/18 02:19:40 rh Exp $
+
+--- ORBit-CosNaming-2.0.pc.in.orig	Thu Nov  1 11:50:44 2001
++++ ORBit-CosNaming-2.0.pc.in
+@@ -8,5 +8,5 @@ Name: ORBit-CosNaming-2.0
+ Description: High-performance CORBA Object Request Broker - Naming Service.
+ Version: @ORBIT_VERSION@
+ Requires: ORBit-2.0
+-Libs: -L${libdir} -lORBitCosNaming-2
++Libs: -L${libdir} -Wl,-R${libdir} -lORBitCosNaming-2
+ Cflags: -I${includedir}/orbit-2.0
diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index ff31a35a02e..99bf9d420e8 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.70 2002/07/03 03:24:49 jschauma Exp $
+# $NetBSD: Makefile,v 1.71 2002/07/18 02:19:33 rh Exp $
 
 DISTNAME=		gtk+-1.2.10
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v1.2/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
diff --git a/x11/gtk/distinfo b/x11/gtk/distinfo
index aa0e5bf7f60..fdd41e3ad09 100644
--- a/x11/gtk/distinfo
+++ b/x11/gtk/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/26 17:42:54 rh Exp $
+$NetBSD: distinfo,v 1.3 2002/07/18 02:19:33 rh Exp $
 
 SHA1 (gtk+-1.2.10.tar.gz) = a5adcb909257da01ae4d4761e1d41081d06e4d7c
 Size (gtk+-1.2.10.tar.gz) = 2868322 bytes
@@ -8,3 +8,5 @@ SHA1 (patch-ac) = 4f7ffd7dbca81740e8b0304f96f7b3ce592404db
 SHA1 (patch-ad) = 7ea957fa92282e95b223821dc98d9d41ff45200e
 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
new file mode 100644
index 00000000000..8c3c29016f5
--- /dev/null
+++ b/x11/gtk/patches/patch-ag
@@ -0,0 +1,11 @@
+$NetBSD: patch-ag,v 1.1 2002/07/18 02:19:34 rh 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
new file mode 100644
index 00000000000..3f01b379916
--- /dev/null
+++ b/x11/gtk/patches/patch-ah
@@ -0,0 +1,11 @@
+$NetBSD: patch-ah,v 1.1 2002/07/18 02:19:35 rh 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 45f51183006..224da097af5 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2002/07/03 01:23:43 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.5 2002/07/18 02:19:28 rh Exp $
 #
 
 DISTNAME=		gtk+-2.0.5
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.0/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.0/ \
diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo
index d78ef15d2a5..9295735704f 100644
--- a/x11/gtk2/distinfo
+++ b/x11/gtk2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/07/03 01:23:43 dmcmahill Exp $
+$NetBSD: distinfo,v 1.6 2002/07/18 02:19:28 rh Exp $
 
 SHA1 (gtk+-2.0.5.tar.gz) = 944fc99f43f9d5fac281e2edf51e841ff9349e0c
 Size (gtk+-2.0.5.tar.gz) = 8383905 bytes
@@ -7,6 +7,7 @@ SHA1 (patch-ab) = 88ccc48726501c1726ff202095087addd99ba4be
 SHA1 (patch-ac) = 33aab5703886362a3d412b8d115804b1ef132fb7
 SHA1 (patch-ad) = fd82d510c7d3a761e5218fda9abe61e73ca7299b
 SHA1 (patch-ae) = bb68fd2552b080f98c90c562de94780ff14bf4f2
+SHA1 (patch-af) = 387012e67fc3129cce87807d108ea1474ab4e90a
 SHA1 (patch-ag) = 55165f8a8d8f0aa1324dcc1c2fbce567e8380c07
 SHA1 (patch-ah) = 144e4931bdb6c28f38191b201227249f125512fb
 SHA1 (patch-ai) = 49d6bf894b88cfd976ba58403ae2291a853f7779
@@ -14,3 +15,6 @@ 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
diff --git a/x11/gtk2/patches/patch-af b/x11/gtk2/patches/patch-af
new file mode 100644
index 00000000000..f73aa37b639
--- /dev/null
+++ b/x11/gtk2/patches/patch-af
@@ -0,0 +1,11 @@
+$NetBSD: patch-af,v 1.5 2002/07/18 02:19:28 rh 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
new file mode 100644
index 00000000000..373a1e3aa80
--- /dev/null
+++ b/x11/gtk2/patches/patch-an
@@ -0,0 +1,11 @@
+$NetBSD: patch-an,v 1.3 2002/07/18 02:19:29 rh 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
new file mode 100644
index 00000000000..c5a9f1819ef
--- /dev/null
+++ b/x11/gtk2/patches/patch-ao
@@ -0,0 +1,12 @@
+$NetBSD: patch-ao,v 1.3 2002/07/18 02:19:29 rh 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
new file mode 100644
index 00000000000..ff49b7e0fe2
--- /dev/null
+++ b/x11/gtk2/patches/patch-ap
@@ -0,0 +1,11 @@
+$NetBSD: patch-ap,v 1.1 2002/07/18 02:19:29 rh 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@