Add missing -Wl,-R to the pkgconfig files. Bump PKGREVISION and default

buildlink dependency.

7 files changed, 53 insertions, 4 deletions

diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index be3cdb1b25c..d29c3047186 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2002/03/30 19:58:09 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.3 2002/05/10 01:17:28 rh Exp $
 #
 
 DISTNAME=		glib-2.0.1
 PKGNAME=		${DISTNAME:S/glib/glib2/}
+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/glib2/buildlink.mk b/devel/glib2/buildlink.mk
index 23f8e901873..9515bb01d86 100644
--- a/devel/glib2/buildlink.mk
+++ b/devel/glib2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2002/03/24 22:21:26 dmcmahill Exp $
+# $NetBSD: buildlink.mk,v 1.3 2002/05/10 01:17:28 rh Exp $
 #
 # This Makefile fragment is included by packages that use glib2.
 #
@@ -17,7 +17,7 @@ GLIB2_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.glib2?=	glib2>=2.0.0
+BUILDLINK_DEPENDS.glib2?=	glib2>=2.0.1nb1
 DEPENDS+=	${BUILDLINK_DEPENDS.glib2}:../../devel/glib2
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.glib2=glib2
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index fc90cb24aba..d4e3cbcbb0b 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,6 +1,10 @@
-$NetBSD: distinfo,v 1.3 2002/03/30 19:58:10 dmcmahill Exp $
+$NetBSD: distinfo,v 1.4 2002/05/10 01:17:28 rh Exp $
 
 SHA1 (glib-2.0.1.tar.gz) = 9590afd43bb14ab85f44affde798f6a9bc6b7760
 Size (glib-2.0.1.tar.gz) = 1843874 bytes
+SHA1 (patch-aa) = 02f422fed74442042593ef232e6791ce7d2e8b6f
+SHA1 (patch-ab) = d5789b61254a84dcf9320014310b9e1ae295b169
+SHA1 (patch-ac) = 550c433ecbc778be6749306dac2967e6a4513c14
+SHA1 (patch-ad) = f58919a3ef05183b3bb4e5b369b56ffe74df5379
 SHA1 (patch-ae) = 595a79aea5bbe65a10e34084629900b1da7b4b7b
 SHA1 (patch-af) = 28dff19acbe3df8c1bcf2055b35eb5b20201f395
diff --git a/devel/glib2/patches/patch-aa b/devel/glib2/patches/patch-aa
new file mode 100644
index 00000000000..d30f2708194
--- /dev/null
+++ b/devel/glib2/patches/patch-aa
@@ -0,0 +1,11 @@
+$NetBSD: patch-aa,v 1.3 2002/05/10 01:17:29 rh Exp $
+
+--- glib-2.0.pc.in.orig	Wed Mar  6 01:37:24 2002
++++ glib-2.0.pc.in
+@@ -10,5 +10,5 @@
+ Name: GLib
+ Description: C Utility Library
+ Version: @VERSION@
+-Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ @ICONV_LIBS@
++Libs: -Wl,-R${libdir} -L${libdir} -lglib-2.0 @INTLLIBS@ @ICONV_LIBS@
+ Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include 
diff --git a/devel/glib2/patches/patch-ab b/devel/glib2/patches/patch-ab
new file mode 100644
index 00000000000..b3a94992acd
--- /dev/null
+++ b/devel/glib2/patches/patch-ab
@@ -0,0 +1,11 @@
+$NetBSD: patch-ab,v 1.3 2002/05/10 01:17:29 rh Exp $
+
+--- gmodule-2.0.pc.in.orig	Wed Mar  6 01:37:24 2002
++++ gmodule-2.0.pc.in
+@@ -9,5 +9,5 @@
+ Description: Dynamic module loader for GLib
+ Requires: glib-2.0
+ Version: @VERSION@
+-Libs: -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule-2.0 @G_MODULE_LIBS@
++Libs: -Wl,-R${libdir} -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule-2.0 @G_MODULE_LIBS@
+ Cflags:
diff --git a/devel/glib2/patches/patch-ac b/devel/glib2/patches/patch-ac
new file mode 100644
index 00000000000..2cca15a7de4
--- /dev/null
+++ b/devel/glib2/patches/patch-ac
@@ -0,0 +1,11 @@
+$NetBSD: patch-ac,v 1.3 2002/05/10 01:17:29 rh Exp $
+
+--- gobject-2.0.pc.in.orig	Wed Mar  6 01:37:24 2002
++++ gobject-2.0.pc.in
+@@ -7,5 +7,5 @@
+ Description: GLib Type, Object, Parameter and Signal Library
+ Requires: glib-2.0
+ Version: @VERSION@
+-Libs: -L${libdir} -lgobject-2.0
++Libs: -Wl,-R${libdir} -L${libdir} -lgobject-2.0
+ Cflags:
diff --git a/devel/glib2/patches/patch-ad b/devel/glib2/patches/patch-ad
new file mode 100644
index 00000000000..ea777af1f06
--- /dev/null
+++ b/devel/glib2/patches/patch-ad
@@ -0,0 +1,11 @@
+$NetBSD: patch-ad,v 1.3 2002/05/10 01:17:30 rh Exp $
+
+--- gthread-2.0.pc.in.orig	Wed Mar  6 01:37:24 2002
++++ gthread-2.0.pc.in
+@@ -7,5 +7,5 @@
+ Description: Thread support for GLib
+ Requires: glib-2.0
+ Version: @VERSION@
+-Libs: -L${libdir} -lgthread-2.0 @G_THREAD_LIBS@
++Libs: -Wl,-R${libdir} -L${libdir} -lgthread-2.0 @G_THREAD_LIBS@
+ Cflags: @G_THREAD_CFLAGS@