diff options
81 files changed, 83 insertions, 499 deletions
diff --git a/audio/esound/Makefile b/audio/esound/Makefile index 134d12cd5bf..aaada47dad1 100644 --- a/audio/esound/Makefile +++ b/audio/esound/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2002/10/03 12:21:29 jlam Exp $ +# $NetBSD: Makefile,v 1.38 2002/10/30 03:09:25 rh Exp $ DISTNAME= esound-0.2.29 CATEGORIES= audio @@ -11,6 +11,7 @@ COMMENT= the Enlightened sound daemon USE_BUILDLINK2= YES USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +PKGCONFIG_OVERRIDE= ${WRKSRC}/esound.pc.in GNU_CONFIGURE= YES CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} diff --git a/audio/esound/distinfo b/audio/esound/distinfo index 905a651ddda..bd72cace618 100644 --- a/audio/esound/distinfo +++ b/audio/esound/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.11 2002/10/03 12:21:29 jlam Exp $ +$NetBSD: distinfo,v 1.12 2002/10/30 03:09:25 rh Exp $ SHA1 (esound-0.2.29.tar.gz) = fea170b3453a14d5a4cdbf3ab9a578f0a423ebd9 Size (esound-0.2.29.tar.gz) = 364819 bytes SHA1 (patch-aa) = fe632a5514073f8d898fef5182a1047b9f2a44c9 SHA1 (patch-ab) = 50d4c829fe5d53f28a4a38b1962097b8a47b97c7 SHA1 (patch-ac) = 8c68050320c80363b831745eb17cc0703acbaf24 -SHA1 (patch-ad) = 288711212e603d9e93415c95797a8698eec19e86 SHA1 (patch-ae) = f0e06658e7cd1f19da089c20f0b89ff89ca5a10f diff --git a/audio/esound/patches/patch-ad b/audio/esound/patches/patch-ad deleted file mode 100644 index 9b82d999cb7..00000000000 --- a/audio/esound/patches/patch-ad +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-ad,v 1.2 2002/08/25 18:38:07 jlam 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 4f01ef0f25a..79e910516e9 100644 --- a/audio/libaudiofile/Makefile +++ b/audio/libaudiofile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2002/10/19 10:54:43 rh Exp $ +# $NetBSD: Makefile,v 1.26 2002/10/30 03:09:26 rh Exp $ DISTNAME= audiofile-0.2.3 PKGNAME= lib${DISTNAME} @@ -15,6 +15,7 @@ USE_BUILDLINK2= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +PKGCONFIG_OVERRIDE= ${WRKSRC}/audiofile.pc.in DOCDIR= ${PREFIX}/share/doc/libaudiofile diff --git a/audio/libaudiofile/distinfo b/audio/libaudiofile/distinfo index 75e9f4689cb..bd23647b18c 100644 --- a/audio/libaudiofile/distinfo +++ b/audio/libaudiofile/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.5 2002/08/25 18:38:13 jlam Exp $ +$NetBSD: distinfo,v 1.6 2002/10/30 03:09:26 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 deleted file mode 100644 index 5fe3122f854..00000000000 --- a/audio/libaudiofile/patches/patch-aa +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-aa,v 1.8 2002/08/25 18:38:13 jlam 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 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@ - diff --git a/graphics/gtkglext/Makefile b/graphics/gtkglext/Makefile index 24ceba477be..8f7bf4f15ce 100644 --- a/graphics/gtkglext/Makefile +++ b/graphics/gtkglext/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/10/16 03:37:02 rh Exp $ +# $NetBSD: Makefile,v 1.2 2002/10/30 03:09:32 rh Exp $ # DISTNAME= gtkglext-0.5.1 @@ -17,6 +17,7 @@ USE_GMAKE= YES USE_X11= YES USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +PKGCONFIG_OVERRIDE= ${WRKSRC}/gtkglext.pc.in LIBS+= -lm .include "../../textproc/gtk-doc/buildlink2.mk" diff --git a/graphics/gtkglext/distinfo b/graphics/gtkglext/distinfo index 69511569ddc..800d26268c3 100644 --- a/graphics/gtkglext/distinfo +++ b/graphics/gtkglext/distinfo @@ -1,5 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/10/16 03:37:03 rh Exp $ +$NetBSD: distinfo,v 1.2 2002/10/30 03:09:33 rh Exp $ SHA1 (gtkglext-0.5.1.tar.bz2) = e721221127c7ce2b4d6a1d86837d0919ae36cc34 Size (gtkglext-0.5.1.tar.bz2) = 292316 bytes -SHA1 (patch-aa) = ee0496edaf2a946ca52417bc80659bab1c062581 diff --git a/graphics/gtkglext/patches/patch-aa b/graphics/gtkglext/patches/patch-aa deleted file mode 100644 index e9ba76488aa..00000000000 --- a/graphics/gtkglext/patches/patch-aa +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/10/16 03:37:03 rh Exp $ - ---- gtkglext.pc.in.orig Tue May 28 08:36:12 2002 -+++ gtkglext.pc.in -@@ -10,5 +10,5 @@ Name: GtkGLExt - Description: OpenGL Extension to GTK+ (${target} target) - Version: @VERSION@ - Requires: gdkglext-${target}-${api_version} @GTKGLEXT_PACKAGES@ --Libs: -L${libdir} -lgtkglext-${target}-${api_version} @GTKGLEXT_EXTRA_LIBS@ -+Libs: -Wl,-R${libdir} -L${libdir} -lgtkglext-${target}-${api_version} @GTKGLEXT_EXTRA_LIBS@ - Cflags: -I${includedir}/gtkglext-${api_version} @GTKGLEXT_EXTRA_CFLAGS@ diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile index 4943f435925..1c436d855e1 100644 --- a/graphics/imlib/Makefile +++ b/graphics/imlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.70 2002/10/19 10:54:53 rh Exp $ +# $NetBSD: Makefile,v 1.71 2002/10/30 03:09:33 rh Exp $ # DISTNAME= imlib-1.9.14 @@ -13,6 +13,7 @@ COMMENT= image manipulation library for X11 USE_X11BASE= yes USE_LIBTOOL= yes LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +PKGCONFIG_OVERRIDE= ${WRKSRC}/imlib.pc.in GNU_CONFIGURE= yes PLIST_SUBST+= LOCALBASE=${LOCALBASE} USE_GMAKE= yes diff --git a/graphics/imlib/distinfo b/graphics/imlib/distinfo index 823b99e3176..1a6875ce0f3 100644 --- a/graphics/imlib/distinfo +++ b/graphics/imlib/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.11 2002/08/25 18:39:11 jlam Exp $ +$NetBSD: distinfo,v 1.12 2002/10/30 03:09:33 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-ae) = 3ed6fff2e73f04ec83c27dc6e3f2db2fa446abbb SHA1 (patch-ag) = 0ed464cb26492f3eebb8812efdb49ee83ef4ae6b diff --git a/graphics/imlib/patches/patch-ac b/graphics/imlib/patches/patch-ac deleted file mode 100644 index 32bc68417a5..00000000000 --- a/graphics/imlib/patches/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-ac,v 1.11 2002/08/25 18:39:12 jlam 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/librsvg2/Makefile b/graphics/librsvg2/Makefile index 9a730e75ee3..a3f43811767 100644 --- a/graphics/librsvg2/Makefile +++ b/graphics/librsvg2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/10/16 10:29:01 rh Exp $ +# $NetBSD: Makefile,v 1.2 2002/10/30 03:09:34 rh Exp $ # DISTNAME= librsvg-2.0.1 @@ -16,6 +16,7 @@ USE_X11= YES USE_LIBTOOL= YES GNU_CONFIGURE= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +PKGCONFIG_OVERRIDE= ${WRKSRC}/librsvg-2.0.pc.in .include "../../graphics/freetype2/buildlink2.mk" .include "../../graphics/libart2/buildlink2.mk" diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo index 09f680bc3e5..b0bf37b4440 100644 --- a/graphics/librsvg2/distinfo +++ b/graphics/librsvg2/distinfo @@ -1,5 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/10/16 10:29:01 rh Exp $ +$NetBSD: distinfo,v 1.2 2002/10/30 03:09:34 rh Exp $ SHA1 (librsvg-2.0.1.tar.bz2) = 9c38ca158baaf492fdf20612d1d32dc38aa5c393 Size (librsvg-2.0.1.tar.bz2) = 155093 bytes -SHA1 (patch-aa) = e590ed66c4ded7a494483ebfb49efc4959664838 diff --git a/graphics/librsvg2/patches/patch-aa b/graphics/librsvg2/patches/patch-aa deleted file mode 100644 index 0841bdb19f4..00000000000 --- a/graphics/librsvg2/patches/patch-aa +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/10/16 10:29:01 rh Exp $ - ---- librsvg-2.0.pc.in.orig Sat Jan 5 03:49:35 2002 -+++ librsvg-2.0.pc.in -@@ -7,5 +7,5 @@ - Description: library that renders svg files using libart and pango - Version: @VERSION@ - Requires: glib-2.0 gdk-pixbuf-2.0 libart-2.0 libxml-2.0 pangoft2 --Libs: -L${libdir} -lrsvg-2 -+Libs: -Wl,-R${libdir} -L${libdir} -lrsvg-2 - Cflags: -I${includedir}/librsvg-2 diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile index fde810479a6..a54b3db934f 100644 --- a/net/ORBit/Makefile +++ b/net/ORBit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.80 2002/10/19 10:54:55 rh Exp $ +# $NetBSD: Makefile,v 1.81 2002/10/30 03:09:34 rh Exp $ # DISTNAME= ORBit-0.${ORBIT_MAJOR}.${ORBIT_MINOR} @@ -18,6 +18,8 @@ USE_LIBTOOL= YES LIBTOOL_OVERRIDE+= ${WRKSRC}/libtool LIBTOOL_OVERRIDE+= ${WRKSRC}/popt/libtool LIBTOOL_OVERRIDE+= ${WRKSRC}/libIDL/libtool +PKGCONFIG_OVERRIDE+= ${WRKSRC}/ORBit.pc.in +PKGCONFIG_OVERRIDE+= ${WRKSRC}/libIDL/libIDL.pc.in GNU_CONFIGURE= YES USE_BUILDLINK2= YES diff --git a/net/ORBit/distinfo b/net/ORBit/distinfo index 5bf3db90605..f61649fa30f 100644 --- a/net/ORBit/distinfo +++ b/net/ORBit/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2002/09/27 00:45:13 jlam Exp $ +$NetBSD: distinfo,v 1.14 2002/10/30 03:09:35 rh Exp $ SHA1 (ORBit-0.5.15.tar.gz) = 1571976662311060175008d225de05e9bc2eb038 Size (ORBit-0.5.15.tar.gz) = 1335272 bytes @@ -9,9 +9,7 @@ SHA1 (patch-ad) = d4f61e2fef4b862606473ced8f0b27ea3b7f22b3 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 deleted file mode 100644 index 790a964b9d9..00000000000 --- a/net/ORBit/patches/patch-ah +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-ah,v 1.7 2002/08/25 18:39:32 jlam 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 deleted file mode 100644 index b6d1608c4e8..00000000000 --- a/net/ORBit/patches/patch-aj +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-aj,v 1.9 2002/08/25 18:39:32 jlam 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 09719ce07ed..210f8555dac 100644 --- a/net/ORBit2/Makefile +++ b/net/ORBit2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2002/10/27 09:16:08 rh Exp $ +# $NetBSD: Makefile,v 1.11 2002/10/30 03:09:35 rh Exp $ # DISTNAME= ORBit2-2.5.0 @@ -15,6 +15,8 @@ USE_LIBTOOL= YES USE_BUILDLINK2= YES GNU_CONFIGURE= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +PKGCONFIG_OVERRIDE= ${WRKSRC}/ORBit-2.0.pc.in +PKGCONFIG_OVERRIDE+= ${WRKSRC}/ORBit-CosNaming-2.0.pc.in .include "../../net/linc/buildlink2.mk" .include "../../net/libIDL/buildlink2.mk" diff --git a/net/ORBit2/distinfo b/net/ORBit2/distinfo index eee6d42c24f..35d78e4fb69 100644 --- a/net/ORBit2/distinfo +++ b/net/ORBit2/distinfo @@ -1,6 +1,4 @@ -$NetBSD: distinfo,v 1.9 2002/10/27 09:16:09 rh Exp $ +$NetBSD: distinfo,v 1.10 2002/10/30 03:09:35 rh Exp $ SHA1 (ORBit2-2.5.0.tar.bz2) = bce1b2ce54fbb0e2d699a2ebe0b9b46ef0284aca Size (ORBit2-2.5.0.tar.bz2) = 429821 bytes -SHA1 (patch-aa) = 41e3dd08b704ed3fc20161e2c151bfc58b969eaa -SHA1 (patch-ab) = 1dee388a93179376810250207e52cebeb55af875 diff --git a/net/ORBit2/patches/patch-aa b/net/ORBit2/patches/patch-aa deleted file mode 100644 index a9b665445bb..00000000000 --- a/net/ORBit2/patches/patch-aa +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2002/08/25 19:23:10 jlam Exp $ - ---- ORBit-2.0.pc.in.orig Sat Apr 27 18:24:08 2002 -+++ ORBit-2.0.pc.in -@@ -9,5 +9,5 @@ - Description: High-performance CORBA Object Request Broker. - Version: @ORBIT_VERSION@ - Requires: linc glib-2.0 gmodule-2.0 --Libs: -L${libdir} -lORBit-2 @ORBIT_LIBS@ @LIBS@ -lm -+Libs: -Wl,-R${libdir} -L${libdir} -lORBit-2 @ORBIT_LIBS@ @LIBS@ -lm - Cflags: -I${includedir}/orbit-2.0 -DORBIT2=1 diff --git a/net/ORBit2/patches/patch-ab b/net/ORBit2/patches/patch-ab deleted file mode 100644 index e7f70c1e6b5..00000000000 --- a/net/ORBit2/patches/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2002/08/25 19:23:10 jlam 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/net/gnet/Makefile b/net/gnet/Makefile index 482c4d105bb..a6433223d0e 100644 --- a/net/gnet/Makefile +++ b/net/gnet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/10/16 07:58:55 rh Exp $ +# $NetBSD: Makefile,v 1.4 2002/10/30 03:09:36 rh Exp $ # DISTNAME= gnet-1.1.7 @@ -11,6 +11,7 @@ COMMENT= simple network library USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +PKGCONFIG_OVERRIDE= ${WRKSRC}/gnet.pc.in GNU_CONFIGURE= YES USE_BUILDLINK2= YES CONFIGURE_ARGS= --enable-glib2 diff --git a/net/gnet/distinfo b/net/gnet/distinfo index 4485c756827..7d1a81efa4e 100644 --- a/net/gnet/distinfo +++ b/net/gnet/distinfo @@ -1,5 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/10/16 07:58:57 rh Exp $ +$NetBSD: distinfo,v 1.5 2002/10/30 03:09:36 rh Exp $ SHA1 (gnet-1.1.7.tar.gz) = 42e68deee3c82c38153ae361edee785399476f5d Size (gnet-1.1.7.tar.gz) = 367915 bytes -SHA1 (patch-aa) = 2a3b2229b69f4276d939bbd3716a17a4ba225cb4 diff --git a/net/gnet/patches/patch-aa b/net/gnet/patches/patch-aa deleted file mode 100644 index 19fa7288ea8..00000000000 --- a/net/gnet/patches/patch-aa +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2002/10/16 07:58:57 rh Exp $ - ---- gnet.pc.in.orig Sat Apr 13 06:20:37 2002 -+++ gnet.pc.in -@@ -6,5 +6,5 @@ includedir=@includedir@ - Name: Gnet - Description: A network compatibility layer library - Version: @VERSION@ --Libs: -L${libdir} -lgnet @GLIB_LIBS@ @GTHREAD_LIBS@ -+Libs: -Wl,-R${libdir} -L${libdir} -lgnet @GLIB_LIBS@ @GTHREAD_LIBS@ - Cflags: -I${includedir}/gnet -I${libdir}/gnet/include/ @GLIB_CFLAGS@ @GTHREAD_CFLAGS@ diff --git a/net/libIDL/Makefile b/net/libIDL/Makefile index 4957fbb7714..a315fe85fb1 100644 --- a/net/libIDL/Makefile +++ b/net/libIDL/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2002/10/19 10:54:56 rh Exp $ +# $NetBSD: Makefile,v 1.7 2002/10/30 03:09:36 rh Exp $ # DISTNAME= libIDL-0.7.4 @@ -15,6 +15,7 @@ USE_BUILDLINK2= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +PKGCONFIG_OVERRIDE= ${WRKSRC}/libIDL-2.0.pc.in .include "../../converters/libiconv/buildlink2.mk" .include "../../devel/pkgconfig/buildlink2.mk" diff --git a/net/libIDL/distinfo b/net/libIDL/distinfo index 51a3e4b9825..8dea116815f 100644 --- a/net/libIDL/distinfo +++ b/net/libIDL/distinfo @@ -1,5 +1,4 @@ -$NetBSD: distinfo,v 1.2 2002/04/27 08:49:14 rh Exp $ +$NetBSD: distinfo,v 1.3 2002/10/30 03:09:36 rh Exp $ SHA1 (libIDL-0.7.4.tar.bz2) = c371334d04145f7ccf869305069fee545f093cee Size (libIDL-0.7.4.tar.bz2) = 265009 bytes -SHA1 (patch-aa) = caba0f73305316d7e01682767660d383e6e23bac diff --git a/net/libIDL/patches/patch-aa b/net/libIDL/patches/patch-aa deleted file mode 100644 index d74d7b073a5..00000000000 --- a/net/libIDL/patches/patch-aa +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2002/04/27 08:49:14 rh Exp $ - ---- libIDL-2.0.pc.in.orig Sat Apr 27 18:27:04 2002 -+++ libIDL-2.0.pc.in -@@ -8,5 +8,5 @@ - Description: IDL parsing library - Version: @LIBIDL_VERSION@ - Requires: glib-2.0 --Libs: -L${libdir} -lIDL-2 -+Libs: -Wl,-R${libdir} -L${libdir} -lIDL-2 - Cflags: -I${includedir}/libIDL-2.0 diff --git a/net/linc/Makefile b/net/linc/Makefile index 077320e64e5..d48436233fe 100644 --- a/net/linc/Makefile +++ b/net/linc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2002/10/27 09:08:41 rh Exp $ +# $NetBSD: Makefile,v 1.10 2002/10/30 03:09:37 rh Exp $ # DISTNAME= linc-0.7.0 @@ -16,6 +16,7 @@ USE_BUILDLINK2= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +PKGCONFIG_OVERRIDE= ${WRKSRC}/linc.pc.in .include "../../devel/glib2/buildlink2.mk" .include "../../devel/pkgconfig/buildlink2.mk" diff --git a/net/linc/distinfo b/net/linc/distinfo index 716e4d4fedc..8eca74aa76e 100644 --- a/net/linc/distinfo +++ b/net/linc/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.5 2002/10/27 09:08:41 rh Exp $ +$NetBSD: distinfo,v 1.6 2002/10/30 03:09:37 rh Exp $ SHA1 (linc-0.7.0.tar.bz2) = 0e5670a952bf7ca74f27a8c82148391868f8d500 Size (linc-0.7.0.tar.bz2) = 181681 bytes SHA1 (patch-aa) = 1643b8decf11568a2aaaf8cbe8c0e0989a897196 -SHA1 (patch-ab) = c39278f85cd48413523252a6a12e7c042386dfce diff --git a/net/linc/patches/patch-ab b/net/linc/patches/patch-ab deleted file mode 100644 index 709d6724e36..00000000000 --- a/net/linc/patches/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2002/04/27 08:48:34 rh Exp $ - ---- linc.pc.in.orig Sat Apr 27 18:18:53 2002 -+++ linc.pc.in -@@ -7,5 +7,5 @@ - Description: ORBit2 network transport library - Version: @LINC_VERSION@ - Requires: glib-2.0 gobject-2.0 gthread-2.0 --Libs: -L${libdir} -llinc -+Libs: -Wl,-R${libdir} -L${libdir} -llinc - Cflags: -I${includedir}/linc-1.0 diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile index 4a2519d4e40..6c21ccccf92 100644 --- a/textproc/gtkspell/Makefile +++ b/textproc/gtkspell/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/09/25 04:54:46 rh Exp $ +# $NetBSD: Makefile,v 1.2 2002/10/30 03:09:37 rh Exp $ # DISTNAME= gtkspell-2.0.2 @@ -16,6 +16,7 @@ USE_BUILDLINK2= YES USE_X11= YES USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +PKGCONFIG_OVERRIDE= ${WRKSRC}/gtkspell-2.0.pc.in .include "../../textproc/libpspell/buildlink2.mk" .include "../../devel/pkgconfig/buildlink2.mk" diff --git a/textproc/gtkspell/distinfo b/textproc/gtkspell/distinfo index 925609016aa..b46ae6571a9 100644 --- a/textproc/gtkspell/distinfo +++ b/textproc/gtkspell/distinfo @@ -1,5 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/09/25 04:54:47 rh Exp $ +$NetBSD: distinfo,v 1.2 2002/10/30 03:09:37 rh Exp $ SHA1 (gtkspell-2.0.2.tar.gz) = d7a2117d49c35c8d47d7bc9e5c581c9d469dec7e Size (gtkspell-2.0.2.tar.gz) = 189818 bytes -SHA1 (patch-aa) = 9d88b5bfc86aebaaf9bba7a68d3277211cf94f1e diff --git a/textproc/gtkspell/patches/patch-aa b/textproc/gtkspell/patches/patch-aa deleted file mode 100644 index 6cf25d238e5..00000000000 --- a/textproc/gtkspell/patches/patch-aa +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/09/25 04:54:47 rh Exp $ - ---- gtkspell-2.0.pc.in.orig Fri Aug 2 14:31:47 2002 -+++ gtkspell-2.0.pc.in -@@ -7,6 +7,6 @@ Name: GTKSpell - Description: GTK spelling library - Version: @VERSION@ - Requires: @GTKSPELL_PACKAGES@ --Libs: -L${libdir} -lgtkspell -lpspell -+Libs: -Wl,-R${libdir} -L${libdir} -lgtkspell -lpspell - Cflags: -I${includedir}/gtkspell-2.0 - diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile index 3e42b76c327..43654f69f10 100644 --- a/textproc/libxml/Makefile +++ b/textproc/libxml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2002/10/19 10:54:58 rh Exp $ +# $NetBSD: Makefile,v 1.26 2002/10/30 03:09:38 rh Exp $ # DISTNAME= libxml-1.8.17 @@ -15,6 +15,7 @@ GNU_CONFIGURE= YES USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +PKGCONFIG_OVERRIDE= ${WRKSRC}/libxml.pc.in .include "../../devel/zlib/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/libxml/distinfo b/textproc/libxml/distinfo index ba3b2aac372..2410897e485 100644 --- a/textproc/libxml/distinfo +++ b/textproc/libxml/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.6 2002/08/26 10:21:04 martti Exp $ +$NetBSD: distinfo,v 1.7 2002/10/30 03:09:38 rh Exp $ SHA1 (libxml-1.8.17.tar.gz) = ebe7b76bb2b62c882000c1a846a6f8f8346e3bb4 Size (libxml-1.8.17.tar.gz) = 996351 bytes SHA1 (patch-ab) = 6c72ef59fe094ddbb4901b0f35eb681a4d0b4ff2 SHA1 (patch-ac) = b94818200397d6c6457053fa5fe02a6049d52c44 -SHA1 (patch-ad) = 383abbc31c894ccedd324ae4188c071e2d8595ea diff --git a/textproc/libxml/patches/patch-ad b/textproc/libxml/patches/patch-ad deleted file mode 100644 index 65fbe786978..00000000000 --- a/textproc/libxml/patches/patch-ad +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2001/03/10 12:37:21 drochner Exp $ - ---- libxml.pc.in.orig Wed Jan 17 17:12:55 2001 -+++ libxml.pc.in Wed Jan 17 17:13:29 2001 -@@ -8,5 +8,5 @@ - Version: @VERSION@ - Description: libXML library. - Requires: --Libs: -L${libdir} -lxml @Z_LIBS@ @M_LIBS@ @LIBS@ -+Libs: -L${libdir} -Wl,-R${libdir} -lxml @Z_LIBS@ @M_LIBS@ @LIBS@ - Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@ diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile index 5fc3b5a1090..5f0d64d75f4 100644 --- a/x11/gtk/Makefile +++ b/x11/gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.76 2002/10/19 10:55:02 rh Exp $ +# $NetBSD: Makefile,v 1.77 2002/10/30 03:09:39 rh Exp $ DISTNAME= gtk+-1.2.10 PKGREVISION= 3 @@ -16,10 +16,12 @@ BUILD_USES_MSGFMT= yes USE_BUILDLINK2= yes USE_PERL5= build -USE_LIBTOOL= yes -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig USE_X11BASE= yes USE_GMAKE= yes +USE_LIBTOOL= yes +LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +PKGCONFIG_OVERRIDE= ${WRKSRC}/gdk.pc.in +PKGCONFIG_OVERRIDE+= ${WRKSRC}/gtk+.pc.in GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-xinput=xfree \ diff --git a/x11/gtk/distinfo b/x11/gtk/distinfo index 0614c26fe82..d788d1bf0f7 100644 --- a/x11/gtk/distinfo +++ b/x11/gtk/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2002/09/01 14:52:29 tron Exp $ +$NetBSD: distinfo,v 1.6 2002/10/30 03:09:39 rh Exp $ SHA1 (gtk+-1.2.10.tar.gz) = a5adcb909257da01ae4d4761e1d41081d06e4d7c Size (gtk+-1.2.10.tar.gz) = 2868322 bytes @@ -8,5 +8,3 @@ SHA1 (patch-ac) = 4f7ffd7dbca81740e8b0304f96f7b3ce592404db SHA1 (patch-ad) = 86c29afeaf008e0412298047da6e7cb545c8fc60 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 deleted file mode 100644 index 3cf44e21680..00000000000 --- a/x11/gtk/patches/patch-ag +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-ag,v 1.2 2002/08/25 18:40:34 jlam 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 deleted file mode 100644 index 083a051d8d5..00000000000 --- a/x11/gtk/patches/patch-ah +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-ah,v 1.2 2002/08/25 18:40:35 jlam 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 fb80b1b748f..b9d13a50f7a 100644 --- a/x11/gtk2/Makefile +++ b/x11/gtk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2002/10/19 10:55:03 rh Exp $ +# $NetBSD: Makefile,v 1.14 2002/10/30 03:09:39 rh Exp $ # DISTNAME= gtk+-2.0.6 @@ -25,6 +25,10 @@ MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" USE_LIBTOOL= yes LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +PKGCONFIG_OVERRIDE= ${WRKSRC}/gdk-2.0.pc.in +PKGCONFIG_OVERRIDE+= ${WRKSRC}/gtk+-2.0.pc.in +PKGCONFIG_OVERRIDE+= ${WRKSRC}/gdk-pixbuf-2.0.pc.in +PKGCONFIG_OVERRIDE+= ${WRKSRC}/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in BUILD_DIRS= ${WRKSRC} ${WRKSRC}/demos/gtk-demo diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo index 2ea2b18bba0..de50aae25b1 100644 --- a/x11/gtk2/distinfo +++ b/x11/gtk2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2002/10/08 00:02:18 jlam Exp $ +$NetBSD: distinfo,v 1.9 2002/10/30 03:09:39 rh Exp $ SHA1 (gtk+-2.0.6.tar.gz) = 94b0f429d8f86742e385ae55881a52fbae2bb6e2 Size (gtk+-2.0.6.tar.gz) = 8545717 bytes @@ -7,7 +7,6 @@ SHA1 (patch-ab) = d9c84c3d896a999746e7750ead9791309e99e93d SHA1 (patch-ac) = 73793591a49fc5d600617240c92cb7369568cef8 SHA1 (patch-ad) = fd82d510c7d3a761e5218fda9abe61e73ca7299b SHA1 (patch-ae) = bb68fd2552b080f98c90c562de94780ff14bf4f2 -SHA1 (patch-af) = 387012e67fc3129cce87807d108ea1474ab4e90a SHA1 (patch-ag) = 55165f8a8d8f0aa1324dcc1c2fbce567e8380c07 SHA1 (patch-ah) = 144e4931bdb6c28f38191b201227249f125512fb SHA1 (patch-ai) = 49d6bf894b88cfd976ba58403ae2291a853f7779 @@ -15,7 +14,4 @@ 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 SHA1 (patch-aq) = 1e5330847d80f3e39b6949a79a48a7e94b64bb4f diff --git a/x11/gtk2/patches/patch-af b/x11/gtk2/patches/patch-af deleted file mode 100644 index b4a60b29403..00000000000 --- a/x11/gtk2/patches/patch-af +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-af,v 1.6 2002/08/25 19:23:32 jlam 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 deleted file mode 100644 index f5b56170f69..00000000000 --- a/x11/gtk2/patches/patch-an +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-an,v 1.4 2002/08/25 19:23:32 jlam 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 deleted file mode 100644 index 43fac144c6a..00000000000 --- a/x11/gtk2/patches/patch-ao +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ao,v 1.4 2002/08/25 19:23:32 jlam 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 deleted file mode 100644 index 6c72c729336..00000000000 --- a/x11/gtk2/patches/patch-ap +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-ap,v 1.2 2002/08/25 19:23:32 jlam 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@ |