Update to 1.2.10, provided by Adam Ciarcinski.

Changes:
1.2.10:
	*  Gtk::Editable: removed default arg values from implementation,
	as suggested by Otmar Struwe. This allows it to build with gcc 3.1
1.2.9:
  * Gtk::SArray_Helpers::Traits<T>:  Added specializations for 'const T*',
    'T *const', 'const T *const' and 'const T[N]', so that the inofficial
    RedHat GCC 2.96 chooses the correct one.

Release: Gtk-- 1.2.8
  * CList_Helpers::Row::Row() implemented, not just declared.
    (Murray Cumming)
  * FontSelection::get_font_name(): Prevent crash when GTK+ returns 0.
    (Joe Yandle)
  * Fixed memory leak in Gtk::Editable::get_chars() (Gergo)
  * Gtk::Widget::get_toplevel is more cautious if the return value is not
    a Gtk::Window* (Gergo)

Release: Gtk-- 1.2.7
  * Minor gtkmmproc install fix. (Grumegargler)
  * Lots of reference documentation text added, based on the GTK+ reference
    documentation. (Jason M'Sadoques)
  * gtkmm-config does not give -I/usr/include, which should be implicit if
    necessary, and which overrides the implicit gcc replacement system
    headers if used. Apparently this is useful for gcc 3.0, and is what
    gtk+ does.(Daniel Elstner)

Release: Gtk-- 1.2.6
  Skipped.

Release: Gtk-- 1.2.5
  * Fixes for code generator.
  * Fixes for RedHat 7.0 configure bug.
  * Numerous patches to clean up code and improve appearance.
  * Added SpinButton::update() (Augustin Ferrin Pozuelo)
  * Menushell namespace fixes (jaycox)
  * Fixes for gtk--.m4 (srittau)
  * Major CTree fixes
  * CTree::selection() fixed. (Murray Cumming)
  * Added CTree::{Row,Column}::moveto()
  * Fix for CTree::RowList::end() (Daniel Elstner)
  * Documentation fixes (Falk Hueffner)
  * TreeItem patch (Joe Yandle)

Converted to buildlink2 by me.

8 files changed, 38 insertions, 39 deletions

diff --git a/x11/gtk--/Makefile b/x11/gtk--/Makefile
index 8fb549d1e78..92ada681f45 100644
--- a/x11/gtk--/Makefile
+++ b/x11/gtk--/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2002/08/25 19:23:30 jlam Exp $
-# FreeBSD Id: Makefile,v 1.6 1999/01/12 16:50:43 vanilla Exp
+# $NetBSD: Makefile,v 1.25 2002/09/11 21:53:46 wiz Exp $
 #
 
-DISTNAME=		gtkmm-1.2.5
-PKGNAME=		gtk---1.2.5
+DISTNAME=		gtkmm-1.2.10
+PKGNAME=		gtk---1.2.10
 CATEGORIES=		x11 devel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gtkmm/} \
 			${MASTER_SITE_GNOME:=stable/sources/gtkmm/}
@@ -16,12 +15,13 @@ BUILD_DEPENDS+=		m4>=1.4:../../devel/m4
 
 USE_X11BASE=		YES
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 USE_PERL5=		build
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/scripts/ltconfig
+CONFIGURE_ARGS=		--enable-static
 
 M4=			${LOCALBASE}/bin/gm4
 PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
@@ -31,7 +31,6 @@ post-install:
 	${LN} -fs ${PREFIX}/share/aclocal/gtk--.m4 \
 		${LOCALBASE}/share/aclocal/gtk--.m4
 
-.include "../../devel/libsigc++/buildlink.mk"
-.include "../../x11/gtk/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../devel/libsigc++/buildlink2.mk"
+.include "../../x11/gtk/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtk--/PLIST b/x11/gtk--/PLIST
index 4bea86305fb..fcce318b896 100644
--- a/x11/gtk--/PLIST
+++ b/x11/gtk--/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:13:08 skrll Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/09/11 21:53:47 wiz Exp $
 bin/gtkmm-config
 include/gdk--.h
 include/gdk--/bitmap.h
@@ -190,12 +190,12 @@ lib/libgdkmm.a
 lib/libgdkmm.la
 lib/libgdkmm.so
 lib/libgdkmm.so.2
-lib/libgdkmm.so.2.0
+lib/libgdkmm.so.2.2
 lib/libgtkmm.a
 lib/libgtkmm.la
 lib/libgtkmm.so
-lib/libgtkmm.so.2
-lib/libgtkmm.so.2.1
+lib/libgtkmm.so.3
+lib/libgtkmm.so.3.4
 @unexec test %D = ${LOCALBASE} || ${RM} ${LOCALBASE}/share/aclocal/gtk--.m4
 share/aclocal/gtk--.m4
 @exec test %D = ${LOCALBASE} || ln -s %D/share/aclocal/gtk--.m4 ${LOCALBASE}/share/aclocal/gtk--.m4
diff --git a/x11/gtk--/buildlink.mk b/x11/gtk--/buildlink.mk
index ee899797e47..b9cd703e790 100644
--- a/x11/gtk--/buildlink.mk
+++ b/x11/gtk--/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2002/03/31 09:37:08 jmc Exp $
+# $NetBSD: buildlink.mk,v 1.3 2002/09/11 21:53:47 wiz Exp $
 #
 # This Makefile fragment is included by packages that use gtk--.
 #
@@ -17,7 +17,7 @@ GTKMM_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.gtkmm?=	gtk-->=1.2.5
+BUILDLINK_DEPENDS.gtkmm?=	gtk-->=1.2.10
 DEPENDS+=			${BUILDLINK_DEPENDS.gtkmm}:../../x11/gtk--
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.gtkmm=gtkmm
diff --git a/x11/gtk--/buildlink2.mk b/x11/gtk--/buildlink2.mk
index 6e506056c73..46a2717d47a 100644
--- a/x11/gtk--/buildlink2.mk
+++ b/x11/gtk--/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:30 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/09/11 21:53:48 wiz Exp $
 
 .if !defined(GTKMM_BUILDLINK2_MK)
 GTKMM_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		gtkmm
-BUILDLINK_DEPENDS.gtkmm?=	gtk-->=1.2.5
+BUILDLINK_DEPENDS.gtkmm?=	gtk-->=1.2.10
 BUILDLINK_PKGSRCDIR.gtkmm?=	../../x11/gtk--
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.gtkmm=gtkmm
diff --git a/x11/gtk--/distinfo b/x11/gtk--/distinfo
index afa02756a0c..5f9c3457708 100644
--- a/x11/gtk--/distinfo
+++ b/x11/gtk--/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2002/02/14 13:58:24 drochner Exp $
+$NetBSD: distinfo,v 1.5 2002/09/11 21:53:48 wiz Exp $
 
-SHA1 (gtkmm-1.2.5.tar.gz) = adf0efe46ca41c2d09c5f93b1dcd7ef151ecb489
-Size (gtkmm-1.2.5.tar.gz) = 650577 bytes
-SHA1 (patch-aa) = 0a9f22cd3061586439b4fdfdbd197b6ed4fd7b6e
-SHA1 (patch-ag) = 32955371bf64162dc2da520ad96788115e1591ef
-SHA1 (patch-ah) = 5db5ac60b28e538977abeb6e9aa4940907910cb2
+SHA1 (gtkmm-1.2.10.tar.gz) = fb220aa8bdb609b7ead42fac1afbbbf57031fb2a
+Size (gtkmm-1.2.10.tar.gz) = 716700 bytes
+SHA1 (patch-aa) = f23a20f6fa3912d9d1a743363de0fcaf8c69818d
+SHA1 (patch-ag) = de2719b25d41927b52f2de7bf5ee1a4720c34e26
+SHA1 (patch-ah) = 5bd15cf450b81c6bc6f73e9f5f0ccd1700e5c626
diff --git a/x11/gtk--/patches/patch-aa b/x11/gtk--/patches/patch-aa
index 007b88697aa..110c39d144c 100644
--- a/x11/gtk--/patches/patch-aa
+++ b/x11/gtk--/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2002/02/14 13:58:25 drochner Exp $
+$NetBSD: patch-aa,v 1.4 2002/09/11 21:53:49 wiz Exp $
 
---- Makefile.in.orig	Sat Feb  2 17:42:03 2002
-+++ Makefile.in	Sat Feb  2 17:42:40 2002
-@@ -104,7 +104,7 @@
+--- Makefile.in.orig	Tue Apr  9 14:34:13 2002
++++ Makefile.in	Tue May 28 13:59:42 2002
+@@ -108,7 +108,7 @@
  DIST_SUBDIRS = gdk-- src examples docs docgen scripts
  #gnome--
  
 -bin_SCRIPTS = gtkmm-config gtkmmconvert
 +bin_SCRIPTS = gtkmm-config # gtkmmconvert
  
- EXTRA_DIST =  gtk--.m4 gtk--.spec.in Makefile.am Makefile.in gtkmmconvert win32/README win32/gdkmm_static.dsp win32/gtkmm_static.dsp win32/gtkmm.dsw win32/makevc.sh
- 
+ EXTRA_DIST = \
+ gtk--.m4 \
diff --git a/x11/gtk--/patches/patch-ag b/x11/gtk--/patches/patch-ag
index 682b651cf97..7d32660147c 100644
--- a/x11/gtk--/patches/patch-ag
+++ b/x11/gtk--/patches/patch-ag
@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.2 2000/07/15 09:48:13 jlam Exp $
+$NetBSD: patch-ag,v 1.3 2002/09/11 21:53:50 wiz Exp $
 
---- gdk--/gdk--/Makefile.in.orig	Sat May 20 14:51:19 2000
-+++ gdk--/gdk--/Makefile.in	Sat Jul 15 04:28:08 2000
-@@ -100,7 +100,7 @@
- 
- libgdkmm_la_SOURCES =  	bitmap.cc    colormap.cc  font.cc      main.cc      window.cc 	color.cc     drawable.cc  gc.cc        pixmap.cc    visual.cc         image.cc     types.cc     cursor.cc
+--- gdk--/gdk--/Makefile.in.orig	Tue Apr  9 14:34:14 2002
++++ gdk--/gdk--/Makefile.in	Tue May 28 13:59:53 2002
+@@ -110,7 +110,7 @@
+ 	color.cc     drawable.cc  gc.cc        pixmap.cc    visual.cc \
+         image.cc     types.cc     cursor.cc
  
 -libgdkmm_la_LDFLAGS = -version-info $(LIBGDKMM_SO_VERSION) -release $(GTKMM_RELEASE)
 +libgdkmm_la_LDFLAGS = -version-info $(LIBGDKMM_SO_VERSION)
  
  libgdkmmincludedir = $(includedir)/gdk--
- libgdkmminclude_HEADERS =  	bitmap.h      colormap.h    gc.h          main.h 	color.h       drawable.h    pixmap.h 	font.h        types.h       window.h      visual.h         image.h       list.h        cursor.h
+ libgdkmminclude_HEADERS = \
diff --git a/x11/gtk--/patches/patch-ah b/x11/gtk--/patches/patch-ah
index 049492fdfd3..696377bc58c 100644
--- a/x11/gtk--/patches/patch-ah
+++ b/x11/gtk--/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.2 2000/07/15 09:48:13 jlam Exp $
+$NetBSD: patch-ah,v 1.3 2002/09/11 21:53:50 wiz Exp $
 
---- src/gtk--/Makefile.in.orig	Sat May 20 14:51:35 2000
-+++ src/gtk--/Makefile.in	Sat Jul 15 04:28:44 2000
-@@ -133,7 +133,7 @@
+--- src/gtk--/Makefile.in.orig	Tue Apr  9 14:34:18 2002
++++ src/gtk--/Makefile.in	Tue May 28 14:00:01 2002
+@@ -142,7 +142,7 @@
  
  # This builds the library
  libgtkmm_la_SOURCES = $(gtkmmc) gtk--.cc proxy.cc base.cc marshal.cc