buildlink1 -> buildlink2

3 files changed, 27 insertions, 24 deletions

diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile
index 6cf4c213755..f69d130425c 100644
--- a/devel/libslang/Makefile
+++ b/devel/libslang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2002/08/25 19:22:32 jlam Exp $
+# $NetBSD: Makefile,v 1.37 2002/09/21 11:29:41 jlam Exp $
 #
 
 DISTNAME=	slang-1.4.5
@@ -16,10 +16,11 @@ MAINTAINER=    	packages@netbsd.org
 HOMEPAGE=	http://www.s-lang.org/
 COMMENT=	Routines for rapid alpha-numeric terminal applications development
 
-USE_BUILDLINK_ONLY=	YES
-GNU_CONFIGURE= 	yes
-USE_LIBTOOL=	yes
-USE_GMAKE=	yes
+USE_BUILDLINK2=		# defined
+USE_GMAKE=		# defined
+USE_LIBTOOL=		# defined
+GNU_CONFIGURE=		# defined
+
 CONFIG_GUESS_OVERRIDE=	${WRKSRC}/autoconf/config.guess
 CONFIG_SUB_OVERRIDE=	${WRKSRC}/autoconf/config.sub
 
diff --git a/editors/emacs21/Makefile b/editors/emacs21/Makefile
index 7871a174c9e..4cbca982760 100644
--- a/editors/emacs21/Makefile
+++ b/editors/emacs21/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/05/02 20:21:31 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2002/09/21 11:30:59 jlam Exp $
 # FreeBSD Id: Makefile,v 1.30 1997/12/14 02:03:53 asami Exp
 
 DISTNAME=	emacs-21.2
@@ -11,25 +11,26 @@ COMMENT=	GNU editing macros (editor)
 
 CONFLICTS=	mule-[0-9]*
 
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		yes
+USE_X11=		yes
+USE_GMAKE=		yes
+GNU_CONFIGURE=		yes
 
-CONFIGURE_ARGS+=--with-x
-CONFIGURE_ARGS+=--with-x-toolkit=athena
+CONFIGURE_ARGS+=	--with-x
+CONFIGURE_ARGS+=	--with-x-toolkit=athena
 
-.include "../../graphics/xpm/buildlink.mk"
-CONFIGURE_ARGS+=--with-xpm
-.include "../../graphics/jpeg/buildlink.mk"
-CONFIGURE_ARGS+=--with-jpeg
-.include "../../graphics/tiff/buildlink.mk"
-CONFIGURE_ARGS+=--with-tiff
+.include "../../graphics/xpm/buildlink2.mk"
+CONFIGURE_ARGS+=	--with-xpm
+.include "../../graphics/jpeg/buildlink2.mk"
+CONFIGURE_ARGS+=	--with-jpeg
+.include "../../graphics/tiff/buildlink2.mk"
+CONFIGURE_ARGS+=	--with-tiff
 # need 4.1.0b1 or higher (a bug in 4.1.0 can crash Emacs)
 BUILDLINK_DEPENDS.libungif=	libungif>=4.1.0.1
-.include "../../graphics/libungif/buildlink.mk"
-CONFIGURE_ARGS+=--with-gif
-.include "../../graphics/png/buildlink.mk"
-CONFIGURE_ARGS+=--with-png
+.include "../../graphics/libungif/buildlink2.mk"
+CONFIGURE_ARGS+=	--with-gif
+.include "../../graphics/png/buildlink2.mk"
+CONFIGURE_ARGS+=	--with-png
 
 INFO_FILES=	emacs vip viper forms gnus mh-e cl sc dired-x ediff \
 		    ccmode message widget reftex forms
@@ -43,6 +44,5 @@ pre-install:
 post-install:
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/emacs
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/arcem/Makefile b/emulators/arcem/Makefile
index 219e9d6f9bf..84c25d498a2 100644
--- a/emulators/arcem/Makefile
+++ b/emulators/arcem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/03/31 21:41:31 cjep Exp $
+# $NetBSD: Makefile,v 1.2 2002/09/21 11:29:11 jlam Exp $
 #
 
 DISTNAME=	arcem0.50
@@ -16,6 +16,9 @@ COMMENT=	Dave Gilbert's Acorn Archimedes emulator
 
 WRKSRC=		${WRKDIR}/armul-arc
 
+USE_BUILDLINK2=	# defined
+USE_X11=	# defined
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/arcem
 	${INSTALL_DATA} ${WRKDIR}/linux.rom ${PREFIX}/share/arcem/ROM
@@ -28,5 +31,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README.OrElse \
 				${PREFIX}/share/arcem/README.OrElse
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"