Convert to buildlink2.

3 files changed, 13 insertions, 15 deletions

diff --git a/sysutils/gmc/Makefile b/sysutils/gmc/Makefile
index 23906640911..f96e28996bc 100644
--- a/sysutils/gmc/Makefile
+++ b/sysutils/gmc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2002/05/30 18:45:00 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.28 2002/10/21 16:09:51 wiz Exp $
 
 PKGNAME=		g${DISTNAME}
 PKGREVISION=		1
@@ -6,8 +6,6 @@ CATEGORIES+=		gnome
 
 COMMENT=		GNOME version of Midnight Commander, a free Norton Commander Clone
 
-DEPENDS+=		gnome-core>=1.4.0.4nb1:../../x11/gnome-core
-
 USE_X11BASE=		# defined
 CONFIGURE_ARGS+=	--with-tm-x-support
 CONFIGURE_ARGS+=	--with-gnome
@@ -16,4 +14,5 @@ BUILD_USES_MSGFMT=	yes
 post-install:
 	${RMDIR} ${PREFIX}/share/gnome/help/gmc/C/figs
 
+.include "../../x11/gnome-core/buildlink2.mk"
 .include "../../sysutils/mc/Makefile.common"
diff --git a/sysutils/gtop/Makefile b/sysutils/gtop/Makefile
index 1fdf127fff5..6d25bec6ce5 100644
--- a/sysutils/gtop/Makefile
+++ b/sysutils/gtop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2002/10/19 10:54:57 rh Exp $
+# $NetBSD: Makefile,v 1.21 2002/10/21 16:07:47 wiz Exp $
 
 DISTNAME=		gtop-1.0.13
 PKGREVISION=		1
@@ -9,19 +9,19 @@ MAINTAINER=		tron@netbsd.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		GNOME system monitor - top like, memory graphs, process viewer
 
-BUILD_USES_MSGFMT=	yes
-DEPENDS+=		gnome-core>=1.4.0.4nb1:../../x11/gnome-core
-DEPENDS+=		libgtop>=1.0.12nb2:../../devel/libgtop
+BUILD_USES_MSGFMT=	YES
 
 OSVERSION_SPECIFIC=	YES
+USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
 USE_X11BASE=		YES
 USE_LIBTOOL=		YES
-USE_LIBINTL=		YES
 
 GNU_CONFIGURE=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 CONFIGURE_ENV+=		LOCALEDIR=${PKGLOCALEDIR}
-CFLAGS+=		-I${LOCALBASE}/include
 
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/libgtop/buildlink2.mk"
+.include "../../x11/gnome-core/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/mc/Makefile.common b/sysutils/mc/Makefile.common
index 656da98816f..208701cc668 100644
--- a/sysutils/mc/Makefile.common
+++ b/sysutils/mc/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2002/10/08 17:27:19 wiz Exp $
+# $NetBSD: Makefile.common,v 1.16 2002/10/21 16:09:51 wiz Exp $
 
 DISTNAME=		mc-4.5.51
 CATEGORIES+=		sysutils
@@ -7,8 +7,6 @@ MASTER_SITES+=		${MASTER_SITE_GNOME:=stable/sources/mc/}
 MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://www.gnome.org/mc/
 
-DEPENDS+=		libslang-[0-9]*:../../devel/libslang
-DEPENDS+=		glib>=1.2.0:../../devel/glib
 BUILD_USES_MSGFMT=	yes
 
 CONFLICTS+=		mc-[0-9]* gmc-[0-9]*
@@ -16,8 +14,8 @@ CONFLICTS+=		mc-[0-9]* gmc-[0-9]*
 DISTINFO_FILE=		${.CURDIR}/../../sysutils/mc/distinfo
 PATCHDIR=		${.CURDIR}/../../sysutils/mc/patches
 
+USE_BUILDLINK2=		yes
 USE_GMAKE=		yes
-USE_LIBINTL=		yes
 
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--without-included-gettext
@@ -36,8 +34,9 @@ CONFIGURE_ENV+=		LOCALBASE="${LOCALBASE}"
 CONFIGURE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 
 LIBS+=			-lm -ltermcap		# -lslang
-LIBS+=			-lintl			# check for gettext is broken
-CPPFLAGS+=		-I${LOCALBASE}/include	# slang.h
 CPPFLAGS+=		-Dunix
 
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/glib/buildlink2.mk"
+.include "../../devel/libslang/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"