buildlink1 -> buildlink2

5 files changed, 28 insertions, 52 deletions

diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 589de4ae28c..a8f8122c9a6 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2002/09/10 16:06:40 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2002/09/21 11:18:57 jlam Exp $
 #
 # According to AbiSource's explanation of their trademark rights,
 # compilations/distributions of AbiWord not provided by AbiSource must
@@ -20,15 +20,15 @@ DEPENDS+=	ispell-base-[0-9]*:../../textproc/ispell-base
 DIST_SUBDIR=	abisuite
 ABIWORD_VERS=	1.0.2
 
-USE_BUILDLINK_ONLY=	# defined
+USE_BUILDLINK2=	# defined
 USE_X11=	# defined
 USE_GMAKE=	# defined
 HAS_CONFIGURE=	# defined
 MAKEFILE=	GNUmakefile
 
-CONFIGURE_ARGS+=	--with-libiconv=${BUILDLINK_DIR}
-CONFIGURE_ARGS+=	--with-psiconv=${BUILDLINK_DIR}
-CONFIGURE_ARGS+=	--with-expat=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-libiconv=${BUILDLINK_PREFIX.iconv}
+CONFIGURE_ARGS+=	--with-psiconv=${BUILDLINK_PREFIX.psiconv}
+CONFIGURE_ARGS+=	--with-expat=${BUILDLINK_PREFIX.expat}
 CONFIGURE_ARGS+=	--without-libwmf
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share
@@ -46,18 +46,11 @@ MAKE_FLAGS+=	UNIX_CAN_BUILD_STATIC=0
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/abi
 
-FILES_SUBST=		LN=${LN:Q}
-FILES_SUBST+=		MKDIR=${MKDIR:Q}
-FILES_SUBST+=		RM=${RM:Q}
-FILES_SUBST+=		RMDIR=${RMDIR:Q}
-FILES_SUBST+=		TRUE=${TRUE:Q}
-FILES_SUBST_SED=	${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/}
-
-.include "../../converters/libiconv/buildlink.mk"
-.include "../../converters/psiconv/buildlink.mk"
-.include "../../graphics/png/buildlink.mk"
-.include "../../textproc/expat/buildlink.mk"
-.include "../../graphics/xpm/buildlink.mk"
-.include "../../x11/gtk/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../converters/libiconv/buildlink2.mk"
+.include "../../converters/psiconv/buildlink2.mk"
+.include "../../graphics/png/buildlink2.mk"
+.include "../../textproc/expat/buildlink2.mk"
+.include "../../graphics/xpm/buildlink2.mk"
+.include "../../x11/gtk/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/abiword/patches/patch-ai b/editors/abiword/patches/patch-ai
deleted file mode 100644
index 3c3857d901a..00000000000
--- a/editors/abiword/patches/patch-ai
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ai,v 1.5 2001/08/10 04:50:09 jlam Exp $
-
---- src/config/platforms/netbsd.mk.orig	Fri Jun  8 12:07:03 2001
-+++ src/config/platforms/netbsd.mk
-@@ -75,9 +75,9 @@
- # Linker flags
- OS_DLLFLAGS		+=
- 
--GLIB_CONFIG		= glib-config
--GTK_CONFIG		= gtk-config
--GNOME_CONFIG    	= gnome-config
-+#GLIB_CONFIG		= glib-config
-+#GTK_CONFIG		= gtk-config
-+#GNOME_CONFIG    	= gnome-config
- 
- # Shared library flags
- MKSHLIB			= $(LD) $(DSO_LDOPTS) -soname $(@:$(OBJDIR)/%.so=%.so)
diff --git a/editors/ce-x11/Makefile b/editors/ce-x11/Makefile
index ee4b431602e..80662e23160 100644
--- a/editors/ce-x11/Makefile
+++ b/editors/ce-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/04/14 11:34:20 schmonz Exp $
+# $NetBSD: Makefile,v 1.3 2002/09/21 11:09:43 jlam Exp $
 #
 
 .include "../ce/Makefile.common"
@@ -6,11 +6,11 @@
 PKGNAME=		ce-x11-${VERSION}
 COMMENT+=		, X11 version
 
-USE_BUILDLINK_ONLY=	# defined
+USE_BUILDLINK2=		# defined
+USE_X11=		# defined
 
 ALL_TARGET=		xce
 INSTALL_TARGET=		install-x11 man-install-x11
 
-.include "../../devel/ncurses/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile
index daaec6b1730..e83a1f797b8 100644
--- a/editors/cooledit/Makefile
+++ b/editors/cooledit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/07/07 19:45:39 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.2 2002/09/21 11:12:51 jlam Exp $
 #
 
 DISTNAME=	cooledit-3.17.5
@@ -9,11 +9,12 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://cooledit.sourceforge.net/
 COMMENT=	full-featured text editor
 
-USE_X11BASE=	yes
-USE_LIBTOOL=	yes
+BUILD_USES_MSGFMT=	# defined
+USE_BUILDLINK2=		# defined
+USE_X11BASE=		# defined
+GNU_CONFIGURE=		# defined
+USE_LIBTOOL=		# defined
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
-GNU_CONFIGURE=	yes
-BUILD_USES_MSGFMT=	yes
 
 post-configure:
 	if ! ${GREP} -q mbstate_t /usr/include/machine/ansi.h ; then \
@@ -22,6 +23,5 @@ post-configure:
 			< ${WRKSRC}/config.h.bak > ${WRKSRC}/config.h ; \
 	fi
 
-.include "../../graphics/xpm/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../graphics/xpm/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile
index 15dc03fdcf4..59497cd98f7 100644
--- a/editors/nedit/Makefile
+++ b/editors/nedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2002/08/04 13:33:30 mjl Exp $
+# $NetBSD: Makefile,v 1.25 2002/09/21 11:19:07 jlam Exp $
 
 VERS=		5.3
 DISTNAME=	nedit-${VERS}-source
@@ -13,7 +13,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.nedit.org/
 COMMENT=	Motif based standard GUI style text editor
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 USE_X11BASE=		YES
 ALL_TARGET=		netbsd
 
@@ -30,7 +30,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/faq.txt ${PREFIX}/share/doc/nedit
 	${INSTALL_DATA} ${WRKSRC}/doc/NEdit.ad ${PREFIX}/share/doc/nedit
 
-.include "../../graphics/xpm/buildlink.mk"
-.include "../../mk/motif.buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../graphics/xpm/buildlink2.mk"
+.include "../../mk/motif.buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"