diff options
| -rw-r--r-- | x11/gtk/Makefile | 6 | ||||
| -rw-r--r-- | x11/gtk/files/md5 | 4 | ||||
| -rw-r--r-- | x11/gtk/files/patch-sum | 4 | ||||
| -rw-r--r-- | x11/gtk/patches/patch-aa | 30 | ||||
| -rw-r--r-- | x11/gtk/pkg/PLIST | 8 |
5 files changed, 27 insertions, 25 deletions
diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile index 02ecd1ba5a6..af951974cf4 100644 --- a/x11/gtk/Makefile +++ b/x11/gtk/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.39 2000/01/10 19:11:10 hubertf Exp $ +# $NetBSD: Makefile,v 1.40 2000/03/12 22:30:05 tron Exp $ -DISTNAME= gtk+-1.2.6 +DISTNAME= gtk+-1.2.7 CATEGORIES= x11 MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v1.2/ \ ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \ @@ -11,7 +11,7 @@ MAINTAINER= tron@netbsd.org HOMEPAGE= http://www.gtk.org/ DEPENDS+= gettext-0.10.*:../../devel/gettext -DEPENDS+= glib-1.2.*:../../devel/glib +DEPENDS+= glib>=1.2.7:../../devel/glib BUILD_DEPENDS+= ${LOCALBASE}/bin/perl:../../lang/perl5 USE_LIBTOOL= yes diff --git a/x11/gtk/files/md5 b/x11/gtk/files/md5 index 41bd1eb4ff9..0da133f10d0 100644 --- a/x11/gtk/files/md5 +++ b/x11/gtk/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.14 1999/10/22 23:35:04 tron Exp $ +$NetBSD: md5,v 1.15 2000/03/12 22:30:06 tron Exp $ -MD5 (gtk+-1.2.6.tar.gz) = 490f99cd3e32868e8f2f56a72b5321a9 +MD5 (gtk+-1.2.7.tar.gz) = cc20b2fc612c30be11cebc430ee39e91 diff --git a/x11/gtk/files/patch-sum b/x11/gtk/files/patch-sum index 641c61f7191..aeda1ad2bf4 100644 --- a/x11/gtk/files/patch-sum +++ b/x11/gtk/files/patch-sum @@ -1,6 +1,6 @@ -$NetBSD: patch-sum,v 1.5 1999/11/22 11:23:43 agc Exp $ +$NetBSD: patch-sum,v 1.6 2000/03/12 22:30:07 tron Exp $ -MD5 (patch-aa) = 1f57688999f57cb137d329a7b6e6ed83 +MD5 (patch-aa) = 6f3fcbfbec56d0800ce638430c89ee5b MD5 (patch-ab) = 884c71416aaaaee6dd2d410cb5a9cade MD5 (patch-ac) = 76bcc7c03a39f3562d365a8c57270189 MD5 (patch-ad) = dec2132522595c59687fa3af05b75462 diff --git a/x11/gtk/patches/patch-aa b/x11/gtk/patches/patch-aa index 7653a3ea4ac..2d2cbf236b2 100644 --- a/x11/gtk/patches/patch-aa +++ b/x11/gtk/patches/patch-aa @@ -1,27 +1,27 @@ -$NetBSD: patch-aa,v 1.15 1999/11/22 11:23:43 agc Exp $ +$NetBSD: patch-aa,v 1.16 2000/03/12 22:30:07 tron Exp $ ---- configure.orig Thu Oct 7 18:52:16 1999 -+++ configure Mon Nov 22 11:20:03 1999 +--- configure.orig Wed Feb 16 12:28:06 2000 ++++ configure Sun Mar 12 22:45:47 2000 @@ -22,8 +22,8 @@ # GTK_MAJOR_VERSION=1 GTK_MINOR_VERSION=2 --GTK_MICRO_VERSION=6 --GTK_INTERFACE_AGE=1 -+GTK_MICRO_VERSION=18 -+GTK_INTERFACE_AGE=6 - GTK_BINARY_AGE=6 +-GTK_MICRO_VERSION=7 +-GTK_INTERFACE_AGE=2 ++GTK_MICRO_VERSION=19 ++GTK_INTERFACE_AGE=7 + GTK_BINARY_AGE=7 GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION ac_help="$ac_help -@@ -1391,6 +1391,7 @@ +@@ -1393,6 +1393,7 @@ + *) lt_target="$target" ;; + esac - - # Check for any special flags to pass to ltconfig. +if false; then + # Check for any special flags to pass to ltconfig. libtool_flags="--cache-file=$cache_file" test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" - test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static" -@@ -1543,6 +1544,7 @@ +@@ -1546,6 +1547,7 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.15 1999/11/22 11:23:43 agc Exp $ # Redirect the config.log output again, so that the ltconfig log is not # clobbered by the next message. -@@ -4087,7 +4089,7 @@ +@@ -4094,7 +4096,7 @@ # AM_GTK_GNU_GETTEXT above substs $DATADIRNAME # this is the directory where the *.{mo,gmo} files are installed @@ -38,7 +38,7 @@ $NetBSD: patch-aa,v 1.15 1999/11/22 11:23:43 agc Exp $ echo $ac_n "checking for extra flags to get ANSI library prototypes""... $ac_c" 1>&6 -@@ -6897,10 +6899,12 @@ +@@ -6902,10 +6904,12 @@ top_srcdir="$ac_dots$ac_given_srcdir" ;; esac diff --git a/x11/gtk/pkg/PLIST b/x11/gtk/pkg/PLIST index 4127fad887b..83a9148b0ce 100644 --- a/x11/gtk/pkg/PLIST +++ b/x11/gtk/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.24 2000/02/05 15:47:23 wiz Exp $ +@comment $NetBSD: PLIST,v 1.25 2000/03/12 22:30:07 tron Exp $ bin/gtk-config etc/gtk/gtkrc.cs etc/gtk/gtkrc.hr @@ -162,9 +162,9 @@ include/gtk/gtklayout.h include/gtk/gtkplug.h include/gtk/gtksocket.h include/gtk/gtkthemes.h -lib/libgdk.so.12.6 +lib/libgdk.so.12.7 lib/libgdk.a -lib/libgtk.so.12.6 +lib/libgtk.so.12.7 lib/libgtk.a man/man1/gtk-config.1 @unexec install-info --delete %D/info/gdk.info %D/info/dir @@ -180,6 +180,8 @@ info/gtk.info-6 @exec install-info %D/info/gdk.info %D/info/dir @exec install-info %D/info/gtk.info %D/info/dir share/aclocal/gtk.m4 +share/locale/gl/LC_MESSAGES/gtk+.mo +share/locale/lt/LC_MESSAGES/gtk+.mo share/locale/nl/LC_MESSAGES/gtk+.mo share/locale/da/LC_MESSAGES/gtk+.mo share/locale/pt_BR/LC_MESSAGES/gtk+.mo |