From ac1943c24fbe7ed1aa9bc2741ea3cb508e30f54e Mon Sep 17 00:00:00 2001
From: tron <tron>
Date: Mon, 8 Mar 2004 10:11:17 +0000
Subject: Use buildlink3 framework to fix build problem caused by (too early)
 removal of "pkgsrc/textproc/intltool/buildlink2.mk".

---
 net/gftp-gtk1/Makefile   |  4 ++--
 net/gftp/Makefile        |  4 ++--
 net/gftp/Makefile.common | 16 ++++++++--------
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'net')

diff --git a/net/gftp-gtk1/Makefile b/net/gftp-gtk1/Makefile
index 93685e75a09..dabdbd3b1ec 100644
--- a/net/gftp-gtk1/Makefile
+++ b/net/gftp-gtk1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/01 21:41:48 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/03/08 10:11:17 tron Exp $
 
 .include "${.CURDIR}/../gftp/Makefile.common"
 
@@ -13,5 +13,5 @@ CONFIGURE_ARGS+=	--disable-gtk20
 PLIST_SRC=	${.CURDIR}/../gftp/PLIST
 DISTINFO_FILE=	${.CURDIR}/../gftp/distinfo
 
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../x11/gtk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/gftp/Makefile b/net/gftp/Makefile
index e7a221fda11..3931f578371 100644
--- a/net/gftp/Makefile
+++ b/net/gftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/01/03 18:49:47 reed Exp $
+# $NetBSD: Makefile,v 1.16 2004/03/08 10:11:17 tron Exp $
 #
 
 .include "${.CURDIR}/Makefile.common"
@@ -10,5 +10,5 @@ DEPENDS+=	gnome2-dirs>=1.2:../../misc/gnome2-dirs
 
 CONFLICTS=	gftp-gtk1-[0-9]*
 
-.include "../../x11/gtk2/buildlink2.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/gftp/Makefile.common b/net/gftp/Makefile.common
index 2ad0f53c816..808ddf1bfef 100644
--- a/net/gftp/Makefile.common
+++ b/net/gftp/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2003/12/13 11:49:39 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.3 2004/03/08 10:11:17 tron Exp $
 
 DISTNAME=	gftp-${VERSION}
 CATEGORIES=	net
@@ -11,7 +11,7 @@ HOMEPAGE=	http://gftp.seul.org/
 
 BUILD_USES_MSGFMT=	yes
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
@@ -27,9 +27,9 @@ VERSION=		2.0.16
 DEPENDS+=       openssh-[0-9]*:../../security/openssh
 .endif
 
-.include "../../converters/libiconv/buildlink2.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/readline/buildlink2.mk"
-.include "../../security/openssl/buildlink2.mk"
-.include "../../textproc/intltool/buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/intltool/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
-- 
cgit v1.2.3