Update "gtk+" package to version 1.2.6 included in GNOME 1.0.53 release.

5 files changed, 66 insertions, 17 deletions

diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index 672a88f66cb..7f98fa1e786 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.35 1999/10/07 17:42:00 tron Exp $
+# $NetBSD: Makefile,v 1.36 1999/10/22 23:35:04 tron Exp $
 
-DISTNAME=	gtk+-1.2.4
+DISTNAME=	gtk+-1.2.6
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.gtk.org/pub/gtk/v1.2/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
 		http://www.ameth.org/gimp/pub/gtk/v1.2/ \
 		ftp://infosoc.uni-koeln.de/pub/ftp.gimp.org/pub/gtk/v1.2/
 
-MAINTAINER=	packages@netbsd.org
+MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.gtk.org/
 
 DEPENDS+=	gettext-0.10.35:../../devel/gettext
-DEPENDS+=	glib-1.2.4:../../devel/glib
+DEPENDS+=	glib-1.2.*:../../devel/glib
 BUILD_DEPENDS+=	${LOCALBASE}/bin/perl:../../lang/perl5
 
 USE_LIBTOOL=	yes
@@ -25,10 +25,16 @@ INFO_FILES=	gdk.info gtk.info
 
 CPPFLAGS=	-I${LOCALBASE}/include				# libintl.h
 LDFLAGS=	-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib	# -lintl
+PLIST_SUBST+=	LOCALBASE=${LOCALBASE}
 
 # The following ensures that `gtk-config --libs' includes the correct linker
 # flags for linking the X11 libs.
 #
 X_LDFLAGS=	-Wl,-R${X11BASE}/lib -L${X11BASE}/lib
 
+post-install:
+	${TEST} ${PREFIX} = ${LOCALBASE} || \
+	${LN} -fs ${PREFIX}/share/aclocal/gtk.m4 \
+	  ${LOCALBASE}/share/aclocal/gtk.m4
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtk/files/md5 b/x11/gtk/files/md5
index 7050bc2660d..41bd1eb4ff9 100644
--- a/x11/gtk/files/md5
+++ b/x11/gtk/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.13 1999/08/28 09:36:32 rh Exp $
+$NetBSD: md5,v 1.14 1999/10/22 23:35:04 tron Exp $
 
-MD5 (gtk+-1.2.4.tar.gz) = 5bbdb0c73b426885c09098f0de20b711
+MD5 (gtk+-1.2.6.tar.gz) = 490f99cd3e32868e8f2f56a72b5321a9
diff --git a/x11/gtk/files/patch-sum b/x11/gtk/files/patch-sum
index 9d5fd9d7cca..792db8b26bb 100644
--- a/x11/gtk/files/patch-sum
+++ b/x11/gtk/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.3 1999/08/28 22:54:07 rh Exp $
+$NetBSD: patch-sum,v 1.4 1999/10/22 23:35:04 tron Exp $
 
-MD5 (patch-aa) = b139104cf6d625ee13b3cc23446c4388
+MD5 (patch-aa) = 8e41de0b36ae3d362a29eb1fe7f42212
 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 cc50ec0412e..244d638d0f8 100644
--- a/x11/gtk/patches/patch-aa
+++ b/x11/gtk/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.13 1999/08/28 22:54:08 rh Exp $
+$NetBSD: patch-aa,v 1.14 1999/10/22 23:35:04 tron Exp $
 
 --- configure.orig	Mon Aug 23 23:31:31 1999
 +++ configure	Sun Aug 29 00:36:21 1999
@@ -6,11 +6,11 @@ $NetBSD: patch-aa,v 1.13 1999/08/28 22:54:08 rh Exp $
  #
  GTK_MAJOR_VERSION=1
  GTK_MINOR_VERSION=2
--GTK_MICRO_VERSION=4
--GTK_INTERFACE_AGE=2
-+GTK_MICRO_VERSION=16
-+GTK_INTERFACE_AGE=4
- GTK_BINARY_AGE=4
+-GTK_MICRO_VERSION=6
+-GTK_INTERFACE_AGE=1
++GTK_MICRO_VERSION=18
++GTK_INTERFACE_AGE=6
+ GTK_BINARY_AGE=6
  GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
  ac_help="$ac_help
 @@ -1389,6 +1389,7 @@
diff --git a/x11/gtk/pkg/PLIST b/x11/gtk/pkg/PLIST
index d3351082faa..d2351e09cd7 100644
--- a/x11/gtk/pkg/PLIST
+++ b/x11/gtk/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 1999/08/28 22:54:08 rh Exp $
+@comment $NetBSD: PLIST,v 1.23 1999/10/22 23:35:04 tron Exp $
 bin/gtk-config
 etc/gtk/gtkrc.cs
 etc/gtk/gtkrc.hr
@@ -10,6 +10,38 @@ etc/gtk/gtkrc.ja
 etc/gtk/gtkrc.ko
 etc/gtk/gtkrc.ru
 etc/gtk/gtkrc.iso-8859-2
+etc/gtk/gtkrc.bg
+etc/gtk/gtkrc.el
+etc/gtk/gtkrc.eo
+etc/gtk/gtkrc.he
+etc/gtk/gtkrc.hy
+etc/gtk/gtkrc.tr
+etc/gtk/gtkrc.th
+etc/gtk/gtkrc.uk
+etc/gtk/gtkrc.iso-8859-5
+etc/gtk/gtkrc.iso-8859-13
+etc/gtk/gtkrc.iso-8859-14
+etc/gtk/gtkrc.iso-8859-15
+etc/gtk/gtkrc.zh_CN
+etc/gtk/gtkrc.zh_TW.Big5
+etc/gtk/gtkrc.ka_GE.georgianacademy
+etc/gtk/gtkrc.ka_GE.georgianps
+etc/gtk/gtkrc.vi_VN.tcvn
+etc/gtk/gtkrc.vi_VN.viscii
+etc/gtk/gtkrc.ro
+etc/gtk/gtkrc.sq
+etc/gtk/gtkrc.bg_BG.iso88595
+etc/gtk/gtkrc.mk
+etc/gtk/gtkrc.sr
+etc/gtk/gtkrc.ru_RU.iso88595
+etc/gtk/gtkrc.lt
+etc/gtk/gtkrc.cy
+etc/gtk/gtkrc.ga
+etc/gtk/gtkrc.et
+etc/gtk/gtkrc.ka
+etc/gtk/gtkrc.vi_VN.viscii111
+etc/gtk/gtkrc.vi_VN.tcvn5712
+etc/gtk/gtkrc.vi
 include/gdk/gdk.h
 include/gdk/gdkrgb.h
 include/gdk/gdkcursors.h
@@ -130,9 +162,9 @@ include/gtk/gtklayout.h
 include/gtk/gtkplug.h
 include/gtk/gtksocket.h
 include/gtk/gtkthemes.h
-lib/libgdk.so.12.4
+lib/libgdk.so.12.6
 lib/libgdk.a
-lib/libgtk.so.12.4
+lib/libgtk.so.12.6
 lib/libgtk.a
 man/man1/gtk-config.1
 @unexec install-info --delete %D/info/gdk.info %D/info/dir
@@ -148,6 +180,15 @@ info/gtk.info-4
 info/gtk.info-5
 info/gtk.info-6
 share/aclocal/gtk.m4
+share/locale/nl/LC_MESSAGES/gtk+.mo
+share/locale/da/LC_MESSAGES/gtk+.mo
+share/locale/pt_BR/LC_MESSAGES/gtk+.mo
+share/locale/ro/LC_MESSAGES/gtk+.mo
+share/locale/el/LC_MESSAGES/gtk+.mo
+share/locale/eu/LC_MESSAGES/gtk+.mo
+share/locale/ga/LC_MESSAGES/gtk+.mo
+share/locale/et/LC_MESSAGES/gtk+.mo
+share/locale/uk/LC_MESSAGES/gtk+.mo
 share/locale/ko/LC_MESSAGES/gtk+.mo
 share/locale/fr/LC_MESSAGES/gtk+.mo
 share/locale/de/LC_MESSAGES/gtk+.mo
@@ -169,6 +210,8 @@ share/locale/wa/LC_MESSAGES/gtk+.mo
 share/locale/hr/LC_MESSAGES/gtk+.mo
 share/locale/sl/LC_MESSAGES/gtk+.mo
 share/themes/Default/gtk/gtkrc
+@exec test %D = ${LOCALBASE} || ln -s %D/share/aclocal/gtk.m4 ${LOCALBASE}/share/aclocal/gtk.m4
+@unexec test %D = ${LOCALBASE} || rm ${LOCALBASE}/share/aclocal/gtk.m4
 @unexec rmdir %D/share/aclocal 2>/dev/null || true
 @dirrm share/themes/Default/gtk
 @dirrm share/themes/Default