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

buildlink dependency.

6 files changed, 44 insertions, 4 deletions

diff --git a/devel/pango/Makefile b/devel/pango/Makefile
index f3916005bf8..7b3c51b0084 100644
--- a/devel/pango/Makefile
+++ b/devel/pango/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2002/03/30 19:59:33 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.3 2002/05/10 00:45:50 rh Exp $
 #
 
 DISTNAME=		pango-1.0.1
+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/buildlink.mk b/devel/pango/buildlink.mk
index 890f689cf48..4c3a711878d 100644
--- a/devel/pango/buildlink.mk
+++ b/devel/pango/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1.1.1 2002/03/24 20:29:35 dmcmahill Exp $
+# $NetBSD: buildlink.mk,v 1.2 2002/05/10 00:45:51 rh Exp $
 #
 # This Makefile fragment is included by packages that use pango.
 #
@@ -17,7 +17,7 @@ PANGO_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.pango?=	pango>=1.0.0
+BUILDLINK_DEPENDS.pango?=	pango>=1.0.1nb1
 DEPENDS+=	${BUILDLINK_DEPENDS.pango}:../../devel/pango
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.pango=pango
diff --git a/devel/pango/distinfo b/devel/pango/distinfo
index c64aceedb95..370bed41820 100644
--- a/devel/pango/distinfo
+++ b/devel/pango/distinfo
@@ -1,4 +1,7 @@
-$NetBSD: distinfo,v 1.3 2002/03/30 19:59:33 dmcmahill Exp $
+$NetBSD: distinfo,v 1.4 2002/05/10 00:45:51 rh Exp $
 
 SHA1 (pango-1.0.1.tar.gz) = c7dfe48f146ba046e999c15f94f372539f98849b
 Size (pango-1.0.1.tar.gz) = 1172891 bytes
+SHA1 (patch-aa) = 74ee4b95170ccb1085d9786c986cbbc305ce6347
+SHA1 (patch-ab) = 8d0cf48a021b1f39eac87894c9b025fb1dcc39ae
+SHA1 (patch-ac) = dc3d6393bdf434dd2e7fc219b7539b16d64e56cf
diff --git a/devel/pango/patches/patch-aa b/devel/pango/patches/patch-aa
new file mode 100644
index 00000000000..2e6da162716
--- /dev/null
+++ b/devel/pango/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.3 2002/05/10 00:45:51 rh Exp $
+
+--- pango.pc.in.orig	Thu Mar  7 03:04:39 2002
++++ pango.pc.in
+@@ -9,6 +9,6 @@
+ Description: Internationalized text handling
+ Version: @VERSION@
+ Requires: @FRIBIDI_PC@glib-2.0,gobject-2.0,gmodule-2.0
+-Libs: -L${libdir} -lpango-@PANGO_API_VERSION@
++Libs: -Wl,-R${libdir} -L${libdir} -lpango-@PANGO_API_VERSION@
+ Cflags: -I${includedir}/pango-1.0
+ 
diff --git a/devel/pango/patches/patch-ab b/devel/pango/patches/patch-ab
new file mode 100644
index 00000000000..732b4fd2edd
--- /dev/null
+++ b/devel/pango/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.3 2002/05/10 00:45:51 rh Exp $
+
+--- pangoft2.pc.in.orig	Wed Mar  6 03:20:57 2002
++++ pangoft2.pc.in
+@@ -7,6 +7,6 @@
+ Description: Freetype 2.0 font support for Pango
+ Version: @VERSION@
+ Requires: pango
+-Libs: -L${libdir} -lpangoft2-@PANGO_API_VERSION@ @PKGCONFIG_FREETYPE_LIBS@
++Libs: -Wl,-R${libdir} -L${libdir} -lpangoft2-@PANGO_API_VERSION@ @PKGCONFIG_FREETYPE_LIBS@
+ Cflags: -I${includedir}/pango-1.0 @FREETYPE_CFLAGS@
+ 
diff --git a/devel/pango/patches/patch-ac b/devel/pango/patches/patch-ac
new file mode 100644
index 00000000000..37da3087795
--- /dev/null
+++ b/devel/pango/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.3 2002/05/10 00:45:51 rh Exp $
+
+--- pangox.pc.in.orig	Wed Mar  6 03:20:57 2002
++++ pangox.pc.in
+@@ -7,6 +7,6 @@
+ Description: X Window System font support for Pango
+ Version: @VERSION@
+ Requires: pango
+-Libs: -L${libdir} -lpangox-@PANGO_API_VERSION@ @PKGCONFIG_X_LIBS@
++Libs: -Wl,-R${libdir} -L${libdir} -lpangox-@PANGO_API_VERSION@ @PKGCONFIG_X_LIBS@
+ Cflags: -I${includedir}/pango-1.0 @X_CFLAGS@
+