diff options
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/glib/Makefile | 12 | ||||
| -rw-r--r-- | devel/glib/files/md5 | 4 | ||||
| -rw-r--r-- | devel/glib/files/patch-sum | 4 | ||||
| -rw-r--r-- | devel/glib/patches/patch-ad | 18 | ||||
| -rw-r--r-- | devel/glib/pkg/PLIST | 8 |
5 files changed, 25 insertions, 21 deletions
diff --git a/devel/glib/Makefile b/devel/glib/Makefile index 27b13a139ff..d3fca9680d3 100644 --- a/devel/glib/Makefile +++ b/devel/glib/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.20 1999/10/22 23:34:22 tron Exp $ +# $NetBSD: Makefile,v 1.21 2000/03/12 22:24:05 tron Exp $ # FreeBSD Id: Makefile,v 1.2 1998/08/06 14:55:12 vanilla Exp # -DISTNAME= glib-1.2.6 +DISTNAME= glib-1.2.7 CATEGORIES= devel MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v1.2/ \ ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \ @@ -14,16 +14,20 @@ HOMEPAGE= http://www.gtk.org/docs/glib_toc.html CONFLICTS= gtk+-1.0.* +DEPENDS+= pth>=1.3.2:../pth + GNU_CONFIGURE= yes USE_LIBTOOL= yes +CONFIGURE_ARGS+=--includedir=${PREFIX}/include/glib +LIBTOOL_FLAGS= --install-la +CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" INFO_FILES= glib.info -CONFIGURE_ARGS+= --includedir=${PREFIX}/include/glib -LIBTOOL_FLAGS= --install-la # XXX egcs is still broken on arm32. .if (${MACHINE_ARCH} == arm32) CFLAGS= -O0 .endif .include "../../mk/bsd.pkg.mk" + diff --git a/devel/glib/files/md5 b/devel/glib/files/md5 index c486c02c88b..b228e91bcc0 100644 --- a/devel/glib/files/md5 +++ b/devel/glib/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.10 1999/10/22 23:34:23 tron Exp $ +$NetBSD: md5,v 1.11 2000/03/12 22:24:07 tron Exp $ -MD5 (glib-1.2.6.tar.gz) = 0a3af2085d6a597e43a3bfff9034ca68 +MD5 (glib-1.2.7.tar.gz) = 1d0990f88759ddd48dc04160fbba4a04 diff --git a/devel/glib/files/patch-sum b/devel/glib/files/patch-sum index 578f03ca2ab..e73164ffcdf 100644 --- a/devel/glib/files/patch-sum +++ b/devel/glib/files/patch-sum @@ -1,7 +1,7 @@ -$NetBSD: patch-sum,v 1.4 1999/10/22 23:34:23 tron Exp $ +$NetBSD: patch-sum,v 1.5 2000/03/12 22:24:07 tron Exp $ MD5 (patch-aa) = f0f79c4b4966ceb121bd12f240e5aef6 MD5 (patch-ab) = 9037429c991ff06f71a81e91c1e963f7 MD5 (patch-ac) = cd3b59c2ee386ad8bd293b09adca1ba6 -MD5 (patch-ad) = 9aa610413ef097543e5e19ec626efe0e +MD5 (patch-ad) = 848f6f27ef61d243dbce4dee0636e0ae MD5 (patch-ae) = f4182beff6eedc691d74330a54dbb63b diff --git a/devel/glib/patches/patch-ad b/devel/glib/patches/patch-ad index 16899e73b9d..c6cb9bee580 100644 --- a/devel/glib/patches/patch-ad +++ b/devel/glib/patches/patch-ad @@ -1,17 +1,17 @@ -$NetBSD: patch-ad,v 1.8 1999/10/22 23:34:23 tron Exp $ +$NetBSD: patch-ad,v 1.9 2000/03/12 22:24:07 tron Exp $ ---- configure.orig Mon Aug 23 21:44:19 1999 -+++ configure Sun Aug 29 00:33:53 1999 +--- configure.orig Wed Feb 16 12:14:08 2000 ++++ configure Sun Mar 12 22:26:00 2000 @@ -26,7 +26,7 @@ # GLIB_MAJOR_VERSION=1 GLIB_MINOR_VERSION=2 --GLIB_MICRO_VERSION=6 -+GLIB_MICRO_VERSION=19 - GLIB_INTERFACE_AGE=6 - GLIB_BINARY_AGE=6 +-GLIB_MICRO_VERSION=7 ++GLIB_MICRO_VERSION=20 + GLIB_INTERFACE_AGE=7 + GLIB_BINARY_AGE=7 GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION -@@ -1537,9 +1537,12 @@ +@@ -1540,9 +1540,12 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh" @@ -24,7 +24,7 @@ $NetBSD: patch-ad,v 1.8 1999/10/22 23:34:23 tron Exp $ # Redirect the config.log output again, so that the ltconfig log is not # clobbered by the next message. exec 5>>./config.log -@@ -5795,10 +5798,12 @@ +@@ -5796,10 +5799,12 @@ top_srcdir="$ac_dots$ac_given_srcdir" ;; esac diff --git a/devel/glib/pkg/PLIST b/devel/glib/pkg/PLIST index d974c965add..f480d9e4701 100644 --- a/devel/glib/pkg/PLIST +++ b/devel/glib/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.14 1999/10/22 23:34:23 tron Exp $ +@comment $NetBSD: PLIST,v 1.15 2000/03/12 22:24:07 tron Exp $ bin/glib-config include/glib/glib.h include/glib/gmodule.h @@ -8,13 +8,13 @@ info/glib.info lib/glib/include/glibconfig.h lib/libglib.a lib/libglib.la -lib/libglib.so.13.6 +lib/libglib.so.13.7 lib/libgmodule.a lib/libgmodule.la -lib/libgmodule.so.13.6 +lib/libgmodule.so.13.7 lib/libgthread.a lib/libgthread.la -lib/libgthread.so.13.6 +lib/libgthread.so.13.7 man/man1/glib-config.1 share/aclocal/glib.m4 @dirrm lib/glib/include |