diff options
author | rh <rh> | 2002-10-30 03:09:25 +0000 |
---|---|---|
committer | rh <rh> | 2002-10-30 03:09:25 +0000 |
commit | adb9044caf9d45e16fdbbf07429ec0ec53b52b9d (patch) | |
tree | b57a6c9b34c1159eea1751ac22709c1f6436e822 /devel/glib | |
parent | 4565acbed844be954a8372ce09a0cbc6a5d7d558 (diff) | |
download | pkgsrc-adb9044caf9d45e16fdbbf07429ec0ec53b52b9d.tar.gz |
Replace hand made patches for pkgconfig tempates with PKGCONFIG_OVERRIDE.
Diffstat (limited to 'devel/glib')
-rw-r--r-- | devel/glib/Makefile | 5 | ||||
-rw-r--r-- | devel/glib/distinfo | 5 | ||||
-rw-r--r-- | devel/glib/patches/patch-af | 12 | ||||
-rw-r--r-- | devel/glib/patches/patch-ag | 11 | ||||
-rw-r--r-- | devel/glib/patches/patch-ah | 11 |
5 files changed, 5 insertions, 39 deletions
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@ |