Update to 1.2.2. Convert to buildlink2.

Changes:
Release 1.2.2
  * Gnome::UI::Help fixed: This should be added to the
    Help menu to automatically add items from the
    topics.dat file. (Murray Cumming)
  * gnome-hello example: The About box is now closed
    and deleted when [Close] is clicked
    (Murray Cumming)

Release 1.2.1
  * App::create_toolbars fixed to use member UI::Array.
    This allows access to the widgets, as well as
    properly managing memory for the UI Items.
    - menu example modified to demonstrate disabling
      of menu item widgets. (Murray Cumming)
  * configure.in: Don't add -I$prefix/include to
    GNOMEMM_INCLUDEDIR if $prefix=/usr. -I/usr/include
    should never be used because it overrides the order
    of gcc's implicit include path. gtkmm-config.in has
    been corrected too. (Daniel Elstner)
  * Dialog, MessageBox, PropertyBox: Added extra
    documentation so people know that these are not
    self-destructed when run() or run_and_close()
    returns. (Murray Cumming)

Release 1.2.0
  * Canvas example:
      Added example.png to test CanvasImage.
      Items are now deleted in the destructor.
      (Murray Cumming)
  * Reference Documentation:
      Location of perl not hardcoded. (Cedric Gustin)
  * Some gcc 3.0 std namespace fixes. (Claudio Bley)

Release 1.1.21
  * CanvasText: set_font(const GdkFont&) conversion
    fixed and set_font(const string&) added.
    (Murray Cumming)
  * CanvasItem: event signal marshalled again. We lost
    this fix sometime after 1.1.17. (Gergõ Érdi)
  * Uncommented the CanvasHelper::anchor property,
    adding the necessary gtkpacker.h #include.
    (Murray Cumming)
  * Fixed CanvasHelpers::font for Gdk_Font input and
    added a string constructor. (Murray Cumming)
  * Added CanvasText::set_fontset(). (Murray Cumming)

Release 1.1.20
  Unofficial, with some 1.1.21 changes.

6 files changed, 81 insertions, 99 deletions

diff --git a/x11/gnome--/Makefile b/x11/gnome--/Makefile
index c486c4e69d4..703402a9b92 100644
--- a/x11/gnome--/Makefile
+++ b/x11/gnome--/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2002/09/11 22:17:10 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2002/09/11 22:36:51 wiz Exp $
 #
 
-DISTNAME=	gnomemm-1.1.19
+DISTNAME=	gnomemm-1.2.2
 PKGNAME=	${DISTNAME:S/mm/--/}
-PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtkmm/}
 
@@ -11,23 +10,16 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://gtkmm.sourceforge.net/
 COMMENT=	C++ binding for the GNOME libraries
 
-GNU_CONFIGURE=	YES
+GNU_CONFIGURE=	yes
 USE_PERL5=	build
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 USE_X11BASE=	yes
-USE_BUILDLINK_ONLY=	YES
-REPLACE_BUILDLINK=	gnomemmConf.sh
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig/scripts
+USE_BUILDLINK2=	yes
+LTCONFIG_OVERRIDE=	${WRKSRC}/scripts/ltconfig
+REPLACE_PERL=	docgen/pce2
 
-EVAL_PREFIX+=	PERLBASE=perl
-
-post-patch:
-	(cd ${WRKSRC}/docgen && ${CP} pce2 pce2.tmp && \
-	 ${SED} "s|XXXPERLBASEXXX|${PERLBASE}|" <pce2.tmp >pce2)
-
-.include "../../devel/libsigc++/buildlink.mk"
-.include "../../x11/gnome-libs/buildlink.mk"
-.include "../../x11/gtk--/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../devel/libsigc++/buildlink2.mk"
+.include "../../x11/gnome-libs/buildlink2.mk"
+.include "../../x11/gtk--/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome--/PLIST b/x11/gnome--/PLIST
index c69f72c5349..b0e44849451 100644
--- a/x11/gnome--/PLIST
+++ b/x11/gnome--/PLIST
@@ -1,4 +1,63 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:10:45 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/09/11 22:36:51 wiz Exp $
+include/gnome--.h
+include/gnome--/about.h
+include/gnome--/affinetrans.h
+include/gnome--/animator.h
+include/gnome--/app-callback.h
+include/gnome--/app-helper.h
+include/gnome--/app.h
+include/gnome--/appbar.h
+include/gnome--/calculator.h
+include/gnome--/canvas-ellipse.h
+include/gnome--/canvas-group.h
+include/gnome--/canvas-image.h
+include/gnome--/canvas-item.h
+include/gnome--/canvas-line.h
+include/gnome--/canvas-polygon.h
+include/gnome--/canvas-property.h
+include/gnome--/canvas-rect-ellipse.h
+include/gnome--/canvas-rect.h
+include/gnome--/canvas-text.h
+include/gnome--/canvas-widget.h
+include/gnome--/canvas.h
+include/gnome--/client.h
+include/gnome--/clock.h
+include/gnome--/color-picker.h
+include/gnome--/construct_copies.h
+include/gnome--/dateedit.h
+include/gnome--/dentry-edit.h
+include/gnome--/dial.h
+include/gnome--/dialog.h
+include/gnome--/dock-band.h
+include/gnome--/dock-item.h
+include/gnome--/dock-layout.h
+include/gnome--/dock.h
+include/gnome--/druid-page-finish.h
+include/gnome--/druid-page-standard.h
+include/gnome--/druid-page-start.h
+include/gnome--/druid-page.h
+include/gnome--/druid.h
+include/gnome--/entry.h
+include/gnome--/file-entry.h
+include/gnome--/font-picker.h
+include/gnome--/href.h
+include/gnome--/icon-entry.h
+include/gnome--/icon-item.h
+include/gnome--/icon-list.h
+include/gnome--/icon-sel.h
+include/gnome--/imlib.h
+include/gnome--/less.h
+include/gnome--/main.h
+include/gnome--/mdi-child.h
+include/gnome--/mdi-generic-child.h
+include/gnome--/mdi.h
+include/gnome--/messagebox.h
+include/gnome--/number-entry.h
+include/gnome--/paper-selector.h
+include/gnome--/pixmap-entry.h
+include/gnome--/pixmap.h
+include/gnome--/pixmapmenuitem.h
+include/gnome--/point.h
 include/gnome--/private/about_p.h
 include/gnome--/private/animator_p.h
 include/gnome--/private/app_p.h
@@ -53,75 +112,17 @@ include/gnome--/private/pixmapmenuitem_p.h
 include/gnome--/private/procbar_p.h
 include/gnome--/private/propertybox_p.h
 include/gnome--/private/stock_p.h
-include/gnome--/about.h
-include/gnome--/animator.h
-include/gnome--/app.h
-include/gnome--/appbar.h
-include/gnome--/calculator.h
-include/gnome--/canvas-ellipse.h
-include/gnome--/canvas-group.h
-include/gnome--/canvas-image.h
-include/gnome--/canvas-item.h
-include/gnome--/canvas-line.h
-include/gnome--/canvas-polygon.h
-include/gnome--/canvas-property.h
-include/gnome--/canvas-rect-ellipse.h
-include/gnome--/canvas-rect.h
-include/gnome--/canvas-text.h
-include/gnome--/canvas-widget.h
-include/gnome--/canvas.h
-include/gnome--/client.h
-include/gnome--/clock.h
-include/gnome--/color-picker.h
-include/gnome--/dateedit.h
-include/gnome--/dial.h
-include/gnome--/dentry-edit.h
-include/gnome--/dialog.h
-include/gnome--/dock-band.h
-include/gnome--/dock-item.h
-include/gnome--/dock-layout.h
-include/gnome--/dock.h
-include/gnome--/druid-page-finish.h
-include/gnome--/druid-page-standard.h
-include/gnome--/druid-page-start.h
-include/gnome--/druid-page.h
-include/gnome--/druid.h
-include/gnome--/entry.h
-include/gnome--/file-entry.h
-include/gnome--/font-picker.h
-include/gnome--/href.h
-include/gnome--/icon-entry.h
-include/gnome--/icon-item.h
-include/gnome--/icon-list.h
-include/gnome--/icon-sel.h
-include/gnome--/less.h
-include/gnome--/main.h
-include/gnome--/mdi-child.h
-include/gnome--/mdi-generic-child.h
-include/gnome--/mdi.h
-include/gnome--/messagebox.h
-include/gnome--/number-entry.h
-include/gnome--/paper-selector.h
-include/gnome--/pixmap-entry.h
-include/gnome--/pixmap.h
-include/gnome--/pixmapmenuitem.h
 include/gnome--/procbar.h
 include/gnome--/propertybox.h
 include/gnome--/stock.h
-include/gnome--/imlib.h
-include/gnome--/app-helper.h
 include/gnome--/types.h
-include/gnome--/app-callback.h
-include/gnome--/point.h
-include/gnome--/affinetrans.h
-include/gnome--/construct_copies.h
-include/gnome--.h
 lib/gnomemmConf.sh
-lib/libgnomemm-1.1.so.7.1
-lib/libgnomemm-1.1.so.7
-lib/libgnomemm-1.1.so
-lib/libgnomemm.so
+lib/libgnomemm-1.2.so
+lib/libgnomemm-1.2.so.9
+lib/libgnomemm-1.2.so.9.3
+lib/libgnomemm.a
 lib/libgnomemm.la
+lib/libgnomemm.so
 share/aclocal/gnome--.m4
 @dirrm include/gnome--/private
 @dirrm include/gnome--
diff --git a/x11/gnome--/buildlink.mk b/x11/gnome--/buildlink.mk
index 7e5902d50d3..83e69bf8ab1 100644
--- a/x11/gnome--/buildlink.mk
+++ b/x11/gnome--/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2002/09/11 22:17:11 wiz Exp $
+# $NetBSD: buildlink.mk,v 1.3 2002/09/11 22:36:52 wiz Exp $
 #
 # This Makefile fragment is included by packages that use gnome--.
 #
@@ -17,7 +17,7 @@ GNOMEMM_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.gnomemm?=	gnome-->=1.1.19nb2
+BUILDLINK_DEPENDS.gnomemm?=	gnome-->=1.2.2
 DEPENDS+=	${BUILDLINK_DEPENDS.gnomemm}:../../x11/gnome--
 
 EVAL_PREFIX+=				BUILDLINK_PREFIX.gnomemm=gnome--
diff --git a/x11/gnome--/buildlink2.mk b/x11/gnome--/buildlink2.mk
index 963721c35a7..ebb3a9c5084 100644
--- a/x11/gnome--/buildlink2.mk
+++ b/x11/gnome--/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/09/11 22:17:11 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2002/09/11 22:36:52 wiz Exp $
 
 .if !defined(GNOMEMM_BUILDLINK2_MK)
 GNOMEMM_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		gnomemm
-BUILDLINK_DEPENDS.gnomemm?=	gnome-->=1.1.19nb2
+BUILDLINK_DEPENDS.gnomemm?=	gnome-->=1.2.2
 BUILDLINK_PKGSRCDIR.gnomemm?=	../../x11/gnome--
 
 EVAL_PREFIX+=				BUILDLINK_PREFIX.gnomemm=gnome--
diff --git a/x11/gnome--/distinfo b/x11/gnome--/distinfo
index 9356e078090..10b75967d0a 100644
--- a/x11/gnome--/distinfo
+++ b/x11/gnome--/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/05/19 10:08:59 drochner Exp $
+$NetBSD: distinfo,v 1.2 2002/09/11 22:36:52 wiz Exp $
 
-SHA1 (gnomemm-1.1.19.tar.gz) = c26de2405dd469d24ac1a7f4d63390e68d3278a9
-Size (gnomemm-1.1.19.tar.gz) = 288165 bytes
-SHA1 (patch-aa) = 1c9ddf16ee8ae1294112a47db081b803c314f69d
+SHA1 (gnomemm-1.2.2.tar.gz) = bdca04fd444e5e57733c6eb2a12682e72024c995
+Size (gnomemm-1.2.2.tar.gz) = 292603 bytes
diff --git a/x11/gnome--/patches/patch-aa b/x11/gnome--/patches/patch-aa
deleted file mode 100644
index 877d702c8b3..00000000000
--- a/x11/gnome--/patches/patch-aa
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/05/19 10:08:59 drochner Exp $
-
---- docgen/pce2.orig	Sat Apr 21 21:07:35 2001
-+++ docgen/pce2	Sat Apr 21 21:08:32 2001
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!XXXPERLBASEXXX/bin/perl
- 
- #  PCE2 - Perl C++ Extractor version 2
- #  Copyright 2000-1999, Karl Nelson  <kenelson@users.sourceforge.net>