From 820e439a9a3dca428857b86f83a228814fc24328 Mon Sep 17 00:00:00 2001
From: snj <snj@pkgsrc.org>
Date: Mon, 26 Apr 2004 22:07:06 +0000
Subject: Convert to buildlink3.

---
 chat/gabber/Makefile            | 18 +++++++++---------
 chat/xchat-gnome/Makefile       |  6 +++---
 chat/xchat/Makefile             |  6 +++---
 chat/xchat/Makefile.common      | 10 +++++-----
 comms/efax-gtk/Makefile         | 10 +++++-----
 devel/coconut/Makefile          | 20 +++++++++++---------
 devel/libsigc++10/Makefile      |  6 +++---
 devel/libsigc++10/buildlink3.mk | 18 ++++++++++++++++++
 misc/bbdb/Makefile              |  4 ++--
 misc/gnome-utils/Makefile       | 20 ++++++++++----------
 sysutils/gcdmaster/Makefile     | 12 ++++++------
 x11/gnome--/Makefile            | 10 +++++-----
 x11/gnome--/buildlink2.mk       | 28 ----------------------------
 x11/gnome--/buildlink3.mk       | 22 ++++++++++++++++++++++
 x11/gtk--/Makefile              |  8 ++++----
 x11/gtk--/buildlink3.mk         | 21 +++++++++++++++++++++
 x11/gtk--/distinfo              |  3 ++-
 x11/gtk--/patches/patch-ab      | 13 +++++++++++++
 18 files changed, 142 insertions(+), 93 deletions(-)
 create mode 100644 devel/libsigc++10/buildlink3.mk
 delete mode 100644 x11/gnome--/buildlink2.mk
 create mode 100644 x11/gnome--/buildlink3.mk
 create mode 100644 x11/gtk--/buildlink3.mk
 create mode 100644 x11/gtk--/patches/patch-ab

diff --git a/chat/gabber/Makefile b/chat/gabber/Makefile
index 7f18befc30f..058f231b2e5 100644
--- a/chat/gabber/Makefile
+++ b/chat/gabber/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2004/04/14 19:30:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.34 2004/04/26 22:07:06 snj Exp $
 
 DISTNAME=	gabber-0.8.8
 PKGREVISION=	5
@@ -9,7 +9,7 @@ MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://gabber.sourceforge.net/
 COMMENT=	Gnome Jabber Client
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	YES
 USE_GNU_TOOLS+=		make
@@ -21,13 +21,13 @@ GCC_REQD+=		2.95.3
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--disable-xmms --disable-sigctest
 
-.include "../../devel/gal/buildlink2.mk"
-.include "../../devel/libglade/buildlink2.mk"
-.include "../../devel/libsigc++10/buildlink2.mk"
-.include "../../graphics/freetype-lib/buildlink2.mk"
+.include "../../devel/gal/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
+.include "../../devel/libsigc++10/buildlink3.mk"
+.include "../../graphics/freetype-lib/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
-.include "../../x11/gtk--/buildlink2.mk"
-.include "../../x11/gnome--/buildlink2.mk"
-.include "../../x11/gnome-libs/buildlink2.mk"
+.include "../../x11/gtk--/buildlink3.mk"
+.include "../../x11/gnome--/buildlink3.mk"
+.include "../../x11/gnome-libs/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/xchat-gnome/Makefile b/chat/xchat-gnome/Makefile
index 983a168eb2c..853eef31b77 100644
--- a/chat/xchat-gnome/Makefile
+++ b/chat/xchat-gnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/10/03 07:47:59 xtraeme Exp $
+# $NetBSD: Makefile,v 1.11 2004/04/26 22:07:06 snj Exp $
 
 .include "../xchat/Makefile.common"
 
@@ -9,7 +9,7 @@ COMMENT+=	and GNOME libraries
 
 CONFIGURE_ARGS+=	--enable-panel
 
-.include "../../graphics/gdk-pixbuf-gnome/buildlink2.mk"
-.include "../../x11/gnome-core/buildlink2.mk"
+.include "../../graphics/gdk-pixbuf-gnome/buildlink3.mk"
+.include "../../x11/gnome-core/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/xchat/Makefile b/chat/xchat/Makefile
index 38bd81ba541..6f39d62f613 100644
--- a/chat/xchat/Makefile
+++ b/chat/xchat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2003/10/03 07:43:11 xtraeme Exp $
+# $NetBSD: Makefile,v 1.29 2004/04/26 22:07:06 snj Exp $
 
 .include "Makefile.common"
 
@@ -9,7 +9,7 @@ CONFIGURE_ARGS+=	--disable-zvt
 
 CONFLICTS+=		xchat-gnome-[0-9]*
 
-.include "../../graphics/gdk-pixbuf/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../graphics/gdk-pixbuf/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/xchat/Makefile.common b/chat/xchat/Makefile.common
index 691ccc4329b..622384124d8 100644
--- a/chat/xchat/Makefile.common
+++ b/chat/xchat/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.28 2004/04/25 04:16:43 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.29 2004/04/26 22:07:06 snj Exp $
 
 DISTNAME=	xchat-1.8.11
 PKGREVISION=	8
@@ -18,7 +18,7 @@ PATCHDIR=	${.CURDIR}/../xchat/patches
 PKGDIR=		${.CURDIR}/../xchat
 PLIST_SRC=	${.CURDIR}/../xchat/PLIST
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_DIRS+=		gnome1-1.5
 USE_PKGLOCALEDIR=	YES
 USE_X11BASE=		YES
@@ -41,7 +41,7 @@ CONFIGURE_ARGS+=	--enable-ipv6
 
 # SSL support
 .if defined(XCHAT_USE_SSL) && ${XCHAT_USE_SSL} == "YES"
-.  include "../../security/openssl/buildlink2.mk"
+.  include "../../security/openssl/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-openssl=${SSLBASE}
 .endif
 
@@ -54,6 +54,6 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xchat
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/xchat
 
-.include "../../devel/glib/buildlink2.mk"
-.include "../../lang/perl5/buildlink2.mk"
+.include "../../devel/glib/buildlink3.mk"
+.include "../../lang/perl5/buildlink3.mk"
 .include "../../lang/python/application.mk"
diff --git a/comms/efax-gtk/Makefile b/comms/efax-gtk/Makefile
index 3e9c4b18451..0b41d5da3be 100644
--- a/comms/efax-gtk/Makefile
+++ b/comms/efax-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/01/20 12:10:01 agc Exp $
+# $NetBSD: Makefile,v 1.13 2004/04/26 22:07:06 snj Exp $
 
 DISTNAME=		efax-gtk-1.0.1b.src
 PKGNAME=		efax-gtk-1.0.1b
@@ -15,7 +15,7 @@ DEPENDS+=		efax>=0.9:../../comms/efax
 
 WRKSRC=			${WRKDIR}/efax-gtk
 GNU_CONFIGURE=		YES
-USE_BUILDLINK2= 	YES
+USE_BUILDLINK3= 	YES
 USE_PKGINSTALL=		YES
 
 CONFIGURE_ARGS+=	--with-spooldir=/var/spool/efax
@@ -32,8 +32,8 @@ post-extract:
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/efax-gtk
 
-.include "../../devel/libsigc++10/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
-.include "../../x11/gtk--/buildlink2.mk"
+.include "../../devel/libsigc++10/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
+.include "../../x11/gtk--/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/coconut/Makefile b/devel/coconut/Makefile
index 8e19dd4cd99..ee4609fbd11 100644
--- a/devel/coconut/Makefile
+++ b/devel/coconut/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/04/25 22:59:28 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2004/04/26 22:07:06 snj Exp $
 #
 
 DISTNAME=	coconut-0.3.0
@@ -13,11 +13,12 @@ COMMENT=	Objective-C library for Unix-like systems
 
 BUILD_DEPENDS+=	papaya>=0.1.7:../../devel/papaya
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_LIBTOOL=	YES
 USE_X11=	YES
 GNU_CONFIGURE=	YES
 CPPFLAGS+=	-I${PREFIX}/include/libxml2/libxml -DGL_GLEXT_LEGACY
+MAKE_ENV+=	AM_MAKEFLAGS="am__depfiles_maybe="
 
 pre-configure:
 	cd ${WRKSRC} &&							\
@@ -25,11 +26,12 @@ pre-configure:
 	${SED} < configure.old > configure				\
 	's|^\(INCLUDE_DIR_LIST=\).*|\1"${PREFIX}/include ${X11PREFIX}/include"|'
 
-.include "../../graphics/gtkglext/buildlink2.mk"
-.include "../../textproc/libxml2/buildlink2.mk"
-.include "../../textproc/libxslt/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
-.include "../../devel/popt/buildlink2.mk"
-.include "../../net/gnet1/buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../graphics/gtkglext/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../textproc/libxslt/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
+.include "../../devel/popt/buildlink3.mk"
+.include "../../net/gnet1/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libsigc++10/Makefile b/devel/libsigc++10/Makefile
index 927ff8c56c3..163296db5da 100644
--- a/devel/libsigc++10/Makefile
+++ b/devel/libsigc++10/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/02/05 08:00:08 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/04/26 22:07:06 snj Exp $
 
 DISTNAME=	libsigc++-1.0.4
 PKGREVISION=	1
@@ -10,13 +10,13 @@ MAINTAINER=	bsieker@freenet.de
 HOMEPAGE=	http://libsigc.sourceforge.net/
 COMMENT=	Type-safe callback system for C++ programs
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 GNU_CONFIGURE=		YES
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/scripts/ltconfig
 
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../mk/pthread.buildlink3.mk"
 
 .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none")
 CONFIGURE_ARGS+=	--disable-threads
diff --git a/devel/libsigc++10/buildlink3.mk b/devel/libsigc++10/buildlink3.mk
new file mode 100644
index 00000000000..ff821620065
--- /dev/null
+++ b/devel/libsigc++10/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/26 22:07:06 snj Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+LIBSIGCXX10_BUILDLINK3_MK:=	${LIBSIGCXX10_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	libsigcxx10
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibsigcxx10}
+BUILDLINK_PACKAGES+=	libsigcxx10
+
+.if !empty(LIBSIGCXX10_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.libsigcxx10+=	libsigc++10>=1.0.4nb1
+BUILDLINK_PKGSRCDIR.libsigcxx10?=	../../devel/libsigc++10
+.endif	# LIBSIGCXX10_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/misc/bbdb/Makefile b/misc/bbdb/Makefile
index 4e81713739c..40546748baf 100644
--- a/misc/bbdb/Makefile
+++ b/misc/bbdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/12/30 17:09:32 cjep Exp $
+# $NetBSD: Makefile,v 1.4 2004/04/26 22:07:06 snj Exp $
 #
 
 DISTNAME=		bbdb-2.34
@@ -13,7 +13,7 @@ COMMENT=		Insidious Big Brother DataBase, a rolodex-like database Emacs program
 EMACS_VERSIONS_ACCEPTED=	emacs21 emacs21nox emacs20
 CONFLICTS+=		xemacs-packages
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 ALL_TARGET=		all mhe
diff --git a/misc/gnome-utils/Makefile b/misc/gnome-utils/Makefile
index ac440f2326e..0d99f59ef0b 100644
--- a/misc/gnome-utils/Makefile
+++ b/misc/gnome-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2004/04/14 16:15:25 jmmv Exp $
+# $NetBSD: Makefile,v 1.74 2004/04/26 22:07:06 snj Exp $
 
 DISTNAME=		gnome-utils-1.4.1.2
 PKGREVISION=		9
@@ -20,7 +20,7 @@ CONFLICTS=		coreutils<=5.0
 USE_DIRS+=		gnome1-1.5
 USE_GNU_TOOLS+=		make
 USE_X11BASE=		YES
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_PKGLOCALEDIR=	YES
 
 GNU_CONFIGURE=		YES
@@ -29,12 +29,12 @@ CONFIGURE_ENV+=		PKG_CONFIG_PATH="${LOCALBASE}/lib/pkgconfig:${X11BASE}/lib/pkgc
 CONFIGURE_ENV+=		LOCALBASE="${LOCALBASE}"
 
 .include "../../textproc/scrollkeeper/omf.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/gnome-objc/buildlink2.mk"
-.include "../../devel/libglade/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
-#.include "../../lang/guile14/buildlink2.mk"	# XXX: req. guile1[46] fix first
-.include "../../sysutils/libgtop/buildlink2.mk"
-.include "../../www/gtkhtml/buildlink2.mk"
-.include "../../x11/gnome-core/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/gnome-objc/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
+#.include "../../lang/guile14/buildlink3.mk"	# XXX: req. guile1[46] fix first
+.include "../../sysutils/libgtop/buildlink3.mk"
+.include "../../www/gtkhtml/buildlink3.mk"
+.include "../../x11/gnome-core/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gcdmaster/Makefile b/sysutils/gcdmaster/Makefile
index 284102d8f61..420e3c3df29 100644
--- a/sysutils/gcdmaster/Makefile
+++ b/sysutils/gcdmaster/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/04/14 16:15:27 jmmv Exp $
+# $NetBSD: Makefile,v 1.18 2004/04/26 22:15:28 snj Exp $
 #
 
 DISTNAME=		cdrdao-1.1.7.src
@@ -16,7 +16,7 @@ DEPENDS+=		cdrdao-1.1.7:../../sysutils/cdrdao
 WRKSRC=			${WRKDIR}/cdrdao-1.1.7
 USE_X11BASE=		YES
 GNU_CONFIGURE=		YES
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_DIRS+=		gnome1-1.5
 USE_GNU_TOOLS+=		make
 CONFIGURE_ARGS+=	--with-pcctsbin=${LOCALBASE}/bin
@@ -34,8 +34,8 @@ post-configure:
 	${LN} -sf netbsd-gcc.rul ${MACHINE}-netbsd-gcc.rul; \
 	${LN} -sf netbsd-cc.rul ${MACHINE}-netbsd-cc.rul;
 
-.include "../../devel/libglade/buildlink2.mk"
-.include "../../devel/pccts/buildlink2.mk"
-.include "../../x11/gnome--/buildlink2.mk"
-.include "../../x11/gtk--/buildlink2.mk"
+.include "../../devel/libglade/buildlink3.mk"
+.include "../../devel/pccts/buildlink3.mk"
+.include "../../x11/gnome--/buildlink3.mk"
+.include "../../x11/gtk--/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome--/Makefile b/x11/gnome--/Makefile
index 266ff1bc377..e19b4a91aca 100644
--- a/x11/gnome--/Makefile
+++ b/x11/gnome--/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/02/14 17:21:55 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2004/04/26 22:07:06 snj Exp $
 #
 
 DISTNAME=	gnomemm-1.2.4
@@ -16,10 +16,10 @@ USE_PERL5=	build
 USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	yes
 USE_X11BASE=	yes
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 REPLACE_PERL=	docgen/pce2
 
-.include "../../devel/libsigc++10/buildlink2.mk"
-.include "../../x11/gnome-libs/buildlink2.mk"
-.include "../../x11/gtk--/buildlink2.mk"
+.include "../../devel/libsigc++10/buildlink3.mk"
+.include "../../x11/gnome-libs/buildlink3.mk"
+.include "../../x11/gtk--/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome--/buildlink2.mk b/x11/gnome--/buildlink2.mk
deleted file mode 100644
index 38f77e43e98..00000000000
--- a/x11/gnome--/buildlink2.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.9 2004/03/29 05:05:48 jlam Exp $
-
-.if !defined(GNOMEMM_BUILDLINK2_MK)
-GNOMEMM_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=		gnomemm
-BUILDLINK_PKGBASE.gnomemm?=	gnome--
-BUILDLINK_DEPENDS.gnomemm?=	gnome-->=1.2.4nb1
-BUILDLINK_PKGSRCDIR.gnomemm?=	../../x11/gnome--
-
-EVAL_PREFIX+=				BUILDLINK_PREFIX.gnomemm=gnome--
-BUILDLINK_PREFIX.gnomemm_DEFAULT=	${X11PREFIX}
-
-BUILDLINK_FILES.gnomemm=	include/gnome--/private/*
-BUILDLINK_FILES.gnomemm+=	include/gnome--/*
-BUILDLINK_FILES.gnomemm+=	include/gnome--.h
-BUILDLINK_FILES.gnomemm+=	lib/libgnomemm-1.1.*
-BUILDLINK_FILES.gnomemm+=	lib/libgnomemm.*
-
-.include "../../devel/libsigc++10/buildlink2.mk"
-.include "../../x11/gnome-libs/buildlink2.mk"
-.include "../../x11/gtk--/buildlink2.mk"
-
-BUILDLINK_TARGETS+=	gnomemm-buildlink
-
-gnomemm-buildlink: _BUILDLINK_USE
-
-.endif	# GNOMEMM_BUILDLINK2_MK
diff --git a/x11/gnome--/buildlink3.mk b/x11/gnome--/buildlink3.mk
new file mode 100644
index 00000000000..bf5b704035d
--- /dev/null
+++ b/x11/gnome--/buildlink3.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/26 22:07:06 snj Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+GNOMEMM_BUILDLINK3_MK:=	${GNOMEMM_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	gnomemm
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnomemm}
+BUILDLINK_PACKAGES+=	gnomemm
+
+.if !empty(GNOMEMM_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.gnomemm+=	gnome-->=1.2.4nb1
+BUILDLINK_PKGSRCDIR.gnomemm?=	../../x11/gnome--
+.endif	# GNOMEMM_BUILDLINK3_MK
+
+.include "../../devel/libsigc++10/buildlink3.mk"
+.include "../../x11/gnome-libs/buildlink3.mk"
+.include "../../x11/gtk--/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gtk--/Makefile b/x11/gtk--/Makefile
index b71c61ea4b7..c4e00ddf457 100644
--- a/x11/gtk--/Makefile
+++ b/x11/gtk--/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2004/02/14 17:21:55 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2004/04/26 22:07:06 snj Exp $
 #
 
 DISTNAME=		gtkmm-1.2.10
@@ -14,7 +14,7 @@ COMMENT=		C++ wrapper for GTK+
 
 USE_X11BASE=		YES
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 GNU_CONFIGURE=		YES
 USE_PERL5=		build
 USE_GNU_TOOLS+=		m4 make
@@ -28,6 +28,6 @@ post-install:
 	${LN} -fs ${PREFIX}/share/aclocal/gtk--.m4 \
 		${LOCALBASE}/share/aclocal/gtk--.m4
 
-.include "../../devel/libsigc++10/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../devel/libsigc++10/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtk--/buildlink3.mk b/x11/gtk--/buildlink3.mk
new file mode 100644
index 00000000000..50e6c5c480a
--- /dev/null
+++ b/x11/gtk--/buildlink3.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/26 22:07:06 snj Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+GTKMM_BUILDLINK3_MK:=	${GTKMM_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	gtkmm
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtkmm}
+BUILDLINK_PACKAGES+=	gtkmm
+
+.if !empty(GTKMM_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.gtkmm+=	gtk-->=1.2.10nb3
+BUILDLINK_PKGSRCDIR.gtkmm?=	../../x11/gtk--
+.endif	# GTKMM_BUILDLINK3_MK
+
+.include "../../devel/libsigc++10/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gtk--/distinfo b/x11/gtk--/distinfo
index 388b3586c12..dfc944a48f7 100644
--- a/x11/gtk--/distinfo
+++ b/x11/gtk--/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.6 2002/10/27 13:34:59 bouyer Exp $
+$NetBSD: distinfo,v 1.7 2004/04/26 22:07:06 snj Exp $
 
 SHA1 (gtkmm-1.2.10.tar.gz) = fb220aa8bdb609b7ead42fac1afbbbf57031fb2a
 Size (gtkmm-1.2.10.tar.gz) = 716700 bytes
 SHA1 (patch-aa) = f23a20f6fa3912d9d1a743363de0fcaf8c69818d
+SHA1 (patch-ab) = 42c8a11cf88e105290dac40d9d2de75c02afb93c
 SHA1 (patch-ag) = de2719b25d41927b52f2de7bf5ee1a4720c34e26
 SHA1 (patch-ah) = 5bd15cf450b81c6bc6f73e9f5f0ccd1700e5c626
 SHA1 (patch-ai) = d9c3a26edf0dd0baca519b5477f09ba267fbebd5
diff --git a/x11/gtk--/patches/patch-ab b/x11/gtk--/patches/patch-ab
new file mode 100644
index 00000000000..95945f42546
--- /dev/null
+++ b/x11/gtk--/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.3 2004/04/26 22:07:06 snj Exp $
+
+--- src/gtkmmproc/Makefile.in.orig	2004-04-26 14:30:13.000000000 -0700
++++ src/gtkmmproc/Makefile.in	2004-04-26 14:30:30.000000000 -0700
+@@ -113,7 +113,7 @@ m4include_HEADERS = doc1.m4 stage1.m4 co
+ 
+ YFLAGS = -d
+ CXXFLAGS =  
+-CPPFLAGS =  -D MACRO_DIR=\"$(m4includedir)\" -D M4=\"@M4@\"
++CPPFLAGS =  -DMACRO_DIR=\"$(m4includedir)\" -DM4=\"@M4@\"
+ mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
+ CONFIG_HEADER = ../../config.h ../../gdk--config.h ../../gtk--config.h
+ CONFIG_CLEAN_FILES = 
-- 
cgit v1.2.3