diff options
author | rh <rh@pkgsrc.org> | 2002-10-30 03:09:25 +0000 |
---|---|---|
committer | rh <rh@pkgsrc.org> | 2002-10-30 03:09:25 +0000 |
commit | e525650d57c64ed0d063922256be9d4729b94bf6 (patch) | |
tree | b57a6c9b34c1159eea1751ac22709c1f6436e822 /devel | |
parent | c60effffcceee870310186cecfcaf1cc480de223 (diff) | |
download | pkgsrc-e525650d57c64ed0d063922256be9d4729b94bf6.tar.gz |
Replace hand made patches for pkgconfig tempates with PKGCONFIG_OVERRIDE.
Diffstat (limited to 'devel')
33 files changed, 33 insertions, 227 deletions
diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile index 1d00edbbc35..34e35a08eb3 100644 --- a/devel/GConf/Makefile +++ b/devel/GConf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2002/10/19 10:54:43 rh Exp $ +# $NetBSD: Makefile,v 1.32 2002/10/30 03:09:27 rh Exp $ # DISTNAME= GConf-1.0.9 @@ -20,6 +20,7 @@ GNU_CONFIGURE= YES USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +PKGCONFIG_OVERRIDE= ${WRKSRC}/gconf.pc.in CPPFLAGS+= -I${BUILDLINK_PREFIX.db3}/include/db3 PLIST_SUBST+= LOCALBASE=${LOCALBASE} diff --git a/devel/GConf/distinfo b/devel/GConf/distinfo index 0c5e5a354db..3844a4fad10 100644 --- a/devel/GConf/distinfo +++ b/devel/GConf/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.9 2002/08/25 19:22:15 jlam Exp $ +$NetBSD: distinfo,v 1.10 2002/10/30 03:09:27 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-ae) = 91a8bcd108b4f6682fe559db5b6af7f37a41533b diff --git a/devel/GConf/patches/patch-ab b/devel/GConf/patches/patch-ab deleted file mode 100644 index 9e109bfdaf7..00000000000 --- a/devel/GConf/patches/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-ab,v 1.5 2002/08/25 19:22:15 jlam 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/atk/Makefile b/devel/atk/Makefile index 466ef40fbe1..723b5a81b4d 100644 --- a/devel/atk/Makefile +++ b/devel/atk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2002/10/19 10:54:43 rh Exp $ +# $NetBSD: Makefile,v 1.10 2002/10/30 03:09:27 rh Exp $ # DISTNAME= atk-1.0.3 @@ -19,6 +19,7 @@ GNU_CONFIGURE= yes USE_LIBTOOL= yes LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +PKGCONFIG_OVERRIDE= ${WRKSRC}/atk.pc.in # glib-mkenums overflows a 2048kb stack on atkobject.h UNLIMIT_RESOURCES= stacksize diff --git a/devel/atk/distinfo b/devel/atk/distinfo index 7e50ebfedce..5a65f6fccb5 100644 --- a/devel/atk/distinfo +++ b/devel/atk/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.7 2002/08/23 03:05:17 dmcmahill Exp $ +$NetBSD: distinfo,v 1.8 2002/10/30 03:09:27 rh Exp $ SHA1 (atk-1.0.3.tar.gz) = 72233b700af2a8d0e65a0847fce269fe8fc2990f Size (atk-1.0.3.tar.gz) = 346642 bytes SHA1 (patch-aa) = 12baad6715a485f4dd1e0d3176299552fb275598 -SHA1 (patch-ab) = 83508b6261ed51791e3afa7a7a4ae6dfe5d6422a diff --git a/devel/atk/patches/patch-ab b/devel/atk/patches/patch-ab deleted file mode 100644 index fa01353ae6b..00000000000 --- a/devel/atk/patches/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2002/08/25 19:22:22 jlam 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-activation/Makefile b/devel/bonobo-activation/Makefile index 6cd4c923e86..1656053b244 100644 --- a/devel/bonobo-activation/Makefile +++ b/devel/bonobo-activation/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2002/10/27 09:30:59 rh Exp $ +# $NetBSD: Makefile,v 1.11 2002/10/30 03:09:29 rh Exp $ # DISTNAME= bonobo-activation-2.1.0 @@ -19,6 +19,7 @@ USE_LIBTOOL= YES USE_BUILDLINK2= YES USE_PERL5= build LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +PKGCONFIG_OVERRIDE= ${WRKSRC}/bonobo-activation-2.0.pc.in GNU_CONFIGURE= YES .include "../../devel/gettext-lib/buildlink2.mk" diff --git a/devel/bonobo-activation/distinfo b/devel/bonobo-activation/distinfo index 98b1a854aef..e56b4cfcac1 100644 --- a/devel/bonobo-activation/distinfo +++ b/devel/bonobo-activation/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.5 2002/10/27 09:31:00 rh Exp $ +$NetBSD: distinfo,v 1.6 2002/10/30 03:09:29 rh Exp $ SHA1 (bonobo-activation-2.1.0.tar.bz2) = c4a645573ce234c30c7b1d7d25befe7f94d3c8bc Size (bonobo-activation-2.1.0.tar.bz2) = 452883 bytes SHA1 (patch-aa) = bb2de068441860108ae049a10c6edc072defda96 -SHA1 (patch-ab) = 59af0344f3d63f57bf1099d03b7141b82f20054a SHA1 (patch-ac) = e13034cc28f8fcf3b27a39db2a6002c8444de0bf SHA1 (patch-ad) = 25a374f25860e3c857b663db95d32a383d40eae4 diff --git a/devel/bonobo-activation/patches/patch-ab b/devel/bonobo-activation/patches/patch-ab deleted file mode 100644 index 2b4a723f788..00000000000 --- a/devel/bonobo-activation/patches/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/04/27 08:57:58 rh Exp $ - ---- bonobo-activation-2.0.pc.in.orig Sat Apr 27 18:34:26 2002 -+++ bonobo-activation-2.0.pc.in -@@ -9,5 +9,5 @@ - Version: @VERSION@ - Description: Object activation framework for GNOME - Requires: glib-2.0 gmodule-2.0 ORBit-2.0 libxml-2.0 --Libs: -L${libdir} -lbonobo-activation -+Libs: -Wl,-R${libdir} -L${libdir} -lbonobo-activation - Cflags: -I${includedir} diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile index c91553439b3..d1e96fc2042 100644 --- a/devel/bonobo/Makefile +++ b/devel/bonobo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2002/10/19 10:54:44 rh Exp $ +# $NetBSD: Makefile,v 1.31 2002/10/30 03:09:28 rh Exp $ # DISTNAME= bonobo-1.0.18 @@ -24,6 +24,7 @@ CONFIGURE_ENV+= X11BASE="${X11BASE}" USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +PKGCONFIG_OVERRIDE= ${WRKSRC}/libefs/libefs.pc.in post-install: -@${RMDIR} ${PREFIX}/share/libefs/html/libefs diff --git a/devel/bonobo/distinfo b/devel/bonobo/distinfo index 80cd8943274..e31832a2678 100644 --- a/devel/bonobo/distinfo +++ b/devel/bonobo/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.12 2002/09/21 10:38:57 jlam Exp $ +$NetBSD: distinfo,v 1.13 2002/10/30 03:09:28 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-ac) = 1d8f6121f1ad54d95cace5f79f8e17cb24522857 SHA1 (patch-ad) = dd532f6506516babb55442b5f3e44e04721c4a99 diff --git a/devel/bonobo/patches/patch-ac b/devel/bonobo/patches/patch-ac deleted file mode 100644 index ce7b652a534..00000000000 --- a/devel/bonobo/patches/patch-ac +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ac,v 1.4 2002/08/25 19:22:25 jlam 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/eel2/Makefile b/devel/eel2/Makefile index 6ec6c9fe035..7579ae364da 100644 --- a/devel/eel2/Makefile +++ b/devel/eel2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/10/16 09:37:26 rh Exp $ +# $NetBSD: Makefile,v 1.2 2002/10/30 03:09:29 rh Exp $ # DISTNAME= eel-2.0.7 @@ -19,6 +19,7 @@ USE_GMAKE= YES USE_LIBTOOL= YES GNU_CONFIGURE= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +PKGCONFIG_OVERRIDE= ${WRKSRC}/eel-2.0.pc.in .include "../../sysutils/gnome-vfs2/buildlink2.mk" .include "../../devel/gettext-lib/buildlink2.mk" diff --git a/devel/eel2/distinfo b/devel/eel2/distinfo index 2fb3834f9cd..9db57a0c68b 100644 --- a/devel/eel2/distinfo +++ b/devel/eel2/distinfo @@ -1,5 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/10/16 09:37:26 rh Exp $ +$NetBSD: distinfo,v 1.2 2002/10/30 03:09:29 rh Exp $ SHA1 (eel-2.0.7.tar.bz2) = 1d0dd301dd6c4da78935291adf15f54365f2c4ec Size (eel-2.0.7.tar.bz2) = 433877 bytes -SHA1 (patch-aa) = dcf3f1d8f58e63bb64502fc1afd7efa0346c41bb diff --git a/devel/eel2/patches/patch-aa b/devel/eel2/patches/patch-aa deleted file mode 100644 index 24a9ef26269..00000000000 --- a/devel/eel2/patches/patch-aa +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/10/16 09:37:26 rh Exp $ - ---- eel-2.0.pc.in.orig Wed Oct 16 19:21:18 2002 -+++ eel-2.0.pc.in -@@ -7,5 +7,5 @@ Name: eel - Description: Eazel Extensions Library - Version: @VERSION@ - Requires: gconf-2.0 gdk-pixbuf-2.0 glib-2.0 gmodule-2.0 gnome-vfs-2.0 gthread-2.0 gtk+-2.0 libart-2.0 libgnome-2.0 libgnomecanvas-2.0 libgnomeui-2.0 libxml-2.0 gail libglade-2.0 --Libs: -L${libdir} -leel-2 -+Libs: -Wl,-R${libdir} -L${libdir} -leel-2 - Cflags: -I${includedir} diff --git a/devel/glib/Makefile b/devel/glib/Makefile index 947fdcab237..626c8d41b53 100644 --- a/devel/glib/Makefile +++ b/devel/glib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2002/10/19 10:54:47 rh Exp $ +# $NetBSD: Makefile,v 1.51 2002/10/30 03:09:30 rh Exp $ # FreeBSD Id: Makefile,v 1.2 1998/08/06 14:55:12 vanilla Exp # @@ -20,6 +20,9 @@ USE_BUILDLINK2= yes GNU_CONFIGURE= yes USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +PKGCONFIG_OVERRIDE= ${WRKSRC}/glib.pc.in +PKGCONFIG_OVERRIDE+= ${WRKSRC}/gmodule.pc.in +PKGCONFIG_OVERRIDE+= ${WRKSRC}/gthread.pc.in CONFIGURE_ARGS+= --includedir=${PREFIX}/include/glib INFO_FILES= glib.info diff --git a/devel/glib/distinfo b/devel/glib/distinfo index 3a15affc933..7d50459f88e 100644 --- a/devel/glib/distinfo +++ b/devel/glib/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2002/08/25 18:38:28 jlam Exp $ +$NetBSD: distinfo,v 1.8 2002/10/30 03:09:30 rh Exp $ SHA1 (glib-1.2.10.tar.gz) = e5a9361c594608d152d5d9650154c2e3260b87fa Size (glib-1.2.10.tar.gz) = 421480 bytes @@ -7,7 +7,4 @@ 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 SHA1 (patch-ai) = 8c81ff9ed494a00663ce92afc889050a4eb37218 diff --git a/devel/glib/patches/patch-af b/devel/glib/patches/patch-af deleted file mode 100644 index d6405a0d938..00000000000 --- a/devel/glib/patches/patch-af +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-af,v 1.2 2002/08/25 18:38:29 jlam 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 deleted file mode 100644 index 60d1e9168cf..00000000000 --- a/devel/glib/patches/patch-ag +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-ag,v 1.2 2002/08/25 18:38:29 jlam 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 deleted file mode 100644 index c58f0b7da08..00000000000 --- a/devel/glib/patches/patch-ah +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-ah,v 1.2 2002/08/25 18:38:29 jlam 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/glib2/Makefile b/devel/glib2/Makefile index 72f9efb6ff2..a01cfc7e193 100644 --- a/devel/glib2/Makefile +++ b/devel/glib2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2002/10/19 10:54:48 rh Exp $ +# $NetBSD: Makefile,v 1.11 2002/10/30 03:09:30 rh Exp $ # DISTNAME= glib-2.0.6 @@ -21,6 +21,10 @@ USE_PERL5= yes USE_LIBTOOL= yes LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +PKGCONFIG_OVERRIDE= ${WRKSRC}/glib-2.0.pc.in +PKGCONFIG_OVERRIDE+= ${WRKSRC}/gmodule-2.0.pc.in +PKGCONFIG_OVERRIDE+= ${WRKSRC}/gobject-2.0.pc.in +PKGCONFIG_OVERRIDE+= ${WRKSRC}/gthread-2.0.pc.in GNU_CONFIGURE= yes CONFIGURE_ARGS+= --includedir=${PREFIX}/include/glib diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo index ae8e6c92fd8..fc564ae24d6 100644 --- a/devel/glib2/distinfo +++ b/devel/glib2/distinfo @@ -1,10 +1,6 @@ -$NetBSD: distinfo,v 1.6 2002/08/23 02:37:42 dmcmahill Exp $ +$NetBSD: distinfo,v 1.7 2002/10/30 03:09:30 rh Exp $ SHA1 (glib-2.0.6.tar.gz) = 5c42257ecb7ef97d644a0960f26e8107ae52bd7c Size (glib-2.0.6.tar.gz) = 1963573 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 deleted file mode 100644 index a7f0a3fb863..00000000000 --- a/devel/glib2/patches/patch-aa +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2002/08/25 19:22:29 jlam 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 deleted file mode 100644 index 0a573dc1a4a..00000000000 --- a/devel/glib2/patches/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-ab,v 1.4 2002/08/25 19:22:29 jlam 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 deleted file mode 100644 index e8d8654643c..00000000000 --- a/devel/glib2/patches/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-ac,v 1.4 2002/08/25 19:22:29 jlam 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 deleted file mode 100644 index 30b94c05563..00000000000 --- a/devel/glib2/patches/patch-ad +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-ad,v 1.4 2002/08/25 19:22:29 jlam 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@ diff --git a/devel/pango/Makefile b/devel/pango/Makefile index a3da1075666..657f592a5ef 100644 --- a/devel/pango/Makefile +++ b/devel/pango/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2002/10/21 03:02:24 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.13 2002/10/30 03:09:31 rh Exp $ # DISTNAME= pango-1.0.5 @@ -19,6 +19,11 @@ GNU_CONFIGURE= yes USE_LIBTOOL= yes LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +PKGCONFIG_OVERRIDE= ${WRKSRC}/pango.pc.in +PKGCONFIG_OVERRIDE+= ${WRKSRC}/pangoft2.pc.in +PKGCONFIG_OVERRIDE+= ${WRKSRC}/pangox.pc.in +PKGCONFIG_OVERRIDE+= ${WRKSRC}/pangowin32.pc.in +PKGCONFIG_OVERRIDE+= ${WRKSRC}/pangoxft.pc.in .include "../../mk/bsd.prefs.mk" diff --git a/devel/pango/distinfo b/devel/pango/distinfo index 163f2eb1d1f..022c83d860a 100644 --- a/devel/pango/distinfo +++ b/devel/pango/distinfo @@ -1,9 +1,4 @@ -$NetBSD: distinfo,v 1.8 2002/10/21 03:02:24 dmcmahill Exp $ +$NetBSD: distinfo,v 1.9 2002/10/30 03:09:31 rh Exp $ SHA1 (pango-1.0.5.tar.gz) = cf33b4a956d0de77956aa09b9004b530e4d6df54 Size (pango-1.0.5.tar.gz) = 1203673 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-aa b/devel/pango/patches/patch-aa deleted file mode 100644 index 4c9a0caedda..00000000000 --- a/devel/pango/patches/patch-aa +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2002/08/25 19:22:36 jlam 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 deleted file mode 100644 index 19c337a82b5..00000000000 --- a/devel/pango/patches/patch-ab +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ab,v 1.4 2002/08/25 19:22:37 jlam 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 deleted file mode 100644 index 4150323b76b..00000000000 --- a/devel/pango/patches/patch-ac +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ac,v 1.4 2002/08/25 19:22:37 jlam 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@ - diff --git a/devel/pango/patches/patch-ad b/devel/pango/patches/patch-ad deleted file mode 100644 index 2f19b3c5749..00000000000 --- a/devel/pango/patches/patch-ad +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ad,v 1.2 2002/08/25 19:22:37 jlam 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 deleted file mode 100644 index 58ea5954f98..00000000000 --- a/devel/pango/patches/patch-ae +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ae,v 1.2 2002/08/25 19:22:37 jlam 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@ - |