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

Bump PKGREVISION

10 files changed, 79 insertions, 5 deletions

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@