From 74d5785eeb7650f2961b529837d8daedb9250534 Mon Sep 17 00:00:00 2001 From: xtraeme Date: Mon, 12 Apr 2004 10:53:07 +0000 Subject: bl3ify --- editors/emacs-nox11/Makefile | 4 ++-- editors/emacs/Makefile | 16 ++++++++-------- editors/emacs20/Makefile | 8 ++++---- editors/jed/Makefile.common | 6 +++--- editors/nvi-m17n/Makefile | 6 +++--- editors/nvi/Makefile | 6 +++--- editors/pico/Makefile | 6 +++--- 7 files changed, 26 insertions(+), 26 deletions(-) (limited to 'editors') diff --git a/editors/emacs-nox11/Makefile b/editors/emacs-nox11/Makefile index 0701455617d..899df253131 100644 --- a/editors/emacs-nox11/Makefile +++ b/editors/emacs-nox11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2004/02/29 14:14:19 kristerw Exp $ +# $NetBSD: Makefile,v 1.10 2004/04/12 10:53:07 xtraeme Exp $ # FreeBSD Id: Makefile,v 1.30 1997/12/14 02:03:53 asami Exp DISTNAME= emacs-21.3 @@ -16,7 +16,7 @@ CONFLICTS+= emacs-[0-9]* GNU_CONFIGURE= yes USE_GNU_TOOLS+= make -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes PATCHDIR= ${PKGDIR}/../emacs/patches FILESDIR= ${PKGDIR}/../emacs/files diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index b8f0589036c..8b2296a5775 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.70 2004/03/25 22:28:12 kristerw Exp $ +# $NetBSD: Makefile,v 1.71 2004/04/12 10:53:07 xtraeme Exp $ # FreeBSD Id: Makefile,v 1.30 1997/12/14 02:03:53 asami Exp DISTNAME= emacs-21.3 @@ -12,7 +12,7 @@ COMMENT= GNU editing macros (editor) CONFLICTS= mule-[0-9]* -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes USE_X11= yes USE_GNU_TOOLS+= make USE_LIBTOOL= yes @@ -22,21 +22,21 @@ CONFIGURE_ARGS+= --with-x CONFIGURE_ARGS+= --with-x-toolkit=athena CONFIGURE_ARGS+= --srcdir=${WRKSRC} -.include "../../graphics/xpm/buildlink2.mk" +.include "../../graphics/xpm/buildlink3.mk" CONFIGURE_ARGS+= --with-xpm -.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/jpeg/buildlink3.mk" CONFIGURE_ARGS+= --with-jpeg -.include "../../graphics/tiff/buildlink2.mk" +.include "../../graphics/tiff/buildlink3.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/buildlink2.mk" +.include "../../graphics/libungif/buildlink3.mk" CONFIGURE_ARGS+= --with-gif -.include "../../graphics/png/buildlink2.mk" +.include "../../graphics/png/buildlink3.mk" CONFIGURE_ARGS+= --with-png .if defined(EMACS_USE_XAW3D) && !empty(EMACS_USE_XAW3D:M[Yy][Ee][Ss]) -.include "../../x11/Xaw3d/buildlink2.mk" +.include "../../x11/Xaw3d/buildlink3.mk" .endif .include "../../mk/bsd.prefs.mk" diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile index 5df5239ec10..ffd01a48b9c 100644 --- a/editors/emacs20/Makefile +++ b/editors/emacs20/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2004/03/25 22:13:34 kristerw Exp $ +# $NetBSD: Makefile,v 1.13 2004/04/12 10:53:07 xtraeme Exp $ DISTNAME= emacs-20.7 PKGREVISION= 3 @@ -22,7 +22,7 @@ COMMENT= GNU editing macros (editor) CONFLICTS= mule-[0-9]* -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes GNU_CONFIGURE= yes USE_GNU_TOOLS+= make USE_LIBTOOL= yes @@ -58,9 +58,9 @@ CONFIGURE_ARGS+= --with-x=yes .if defined(EMACS_USE_X_TOOLKIT) CONFIGURE_ARGS+= --with-x-toolkit=${EMACS_USE_X_TOOLKIT} .if ${EMACS_USE_X_TOOLKIT} == "lucid" || ${EMACS_USE_X_TOOLKIT} == "athena" -.include "../../mk/xaw.buildlink2.mk" +.include "../../mk/xaw.buildlink3.mk" .elif ${EMACS_USE_X_TOOLKIT} == "motif" -.include "../../mk/motif.buildlink2.mk" +.include "../../mk/motif.buildlink3.mk" .endif .endif .else diff --git a/editors/jed/Makefile.common b/editors/jed/Makefile.common index c726c008423..56fb5f4ef81 100644 --- a/editors/jed/Makefile.common +++ b/editors/jed/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2003/07/30 10:41:22 jmmv Exp $ +# $NetBSD: Makefile.common,v 1.3 2004/04/12 10:55:49 xtraeme Exp $ # DISTNAME= jed-0.99-16 CATEGORIES= editors @@ -12,7 +12,7 @@ EXTRACT_SUFX= .tar.bz2 MAINTAINER= joerg@gmx.net HOMEPAGE= http://www.jedsoft.org/jed/ -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes USE_PKGINSTALL= yes GNU_CONFIGURE= yes @@ -25,4 +25,4 @@ post-install: ${INSTALL_DATA_DIR} ${EGDIR} ${INSTALL_DATA} ${WRKSRC}/lib/jed.conf ${EGDIR} -.include "../../devel/libslang/buildlink2.mk" +.include "../../devel/libslang/buildlink3.mk" diff --git a/editors/nvi-m17n/Makefile b/editors/nvi-m17n/Makefile index 6ece4c252d4..7ae73c2c522 100644 --- a/editors/nvi-m17n/Makefile +++ b/editors/nvi-m17n/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2004/04/03 17:30:56 yamt Exp $ +# $NetBSD: Makefile,v 1.26 2004/04/12 11:09:01 xtraeme Exp $ # FreeBSD Id: Makefile,v 1.11 1999/04/17 10:51:03 itojun Exp DISTNAME= nvi-1.79 @@ -17,7 +17,7 @@ COMMENT= Clone of vi/ex, with multilingual patch CONFLICTS= vigor-[0-9]* nvi-[0-9]* WRKSRC= ${WRKDIR}/${DISTNAME}/build -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES GNU_CONFIGURE= YES PATCH_DIST_ARGS=-d ${WRKSRC}/.. --forward --quiet -E -p1 -f CONFIGURE_ENV= OPTFLAG='-D_PATH_SYSEXRC=\"${PREFIX}/etc/vi.exrc\"' @@ -28,7 +28,7 @@ CONFIGURE_ARGS+=--enable-multibyte --program-prefix=n PATCH_FUZZ_FACTOR= -F1 .if !defined(USE_CANNA) || ${USE_CANNA} == YES -.include "../../inputmethod/canna-lib/buildlink2.mk" +.include "../../inputmethod/canna-lib/buildlink3.mk" CONFIGURE_ARGS+=--enable-canna=${BUILDLINK_PREFIX.canna-lib} CANNA_OPT.euc-jp=canna cannactrl cannakey= CANNA_OPT.sjis=${CANNA_OPT.euc-jp} diff --git a/editors/nvi/Makefile b/editors/nvi/Makefile index 0b6ac0ee3fe..f69144c2d7e 100644 --- a/editors/nvi/Makefile +++ b/editors/nvi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/02/14 17:21:39 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2004/04/12 11:09:01 xtraeme Exp $ # DISTNAME= nvi-1.81.5 @@ -24,7 +24,7 @@ CONFIGURE_SCRIPT= ../dist/configure CONFIGURE_ARGS+= --with-db3=${BUILDLINK_PREFIX.db3} CONFIGURE_ARGS+= --program-transform-name='s,^,n,' USE_LIBTOOL= YES -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES -.include "../../databases/db3/buildlink2.mk" +.include "../../databases/db3/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/pico/Makefile b/editors/pico/Makefile index b9a11187788..61109743d3e 100644 --- a/editors/pico/Makefile +++ b/editors/pico/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2004/02/08 04:03:15 jlam Exp $ +# $NetBSD: Makefile,v 1.50 2004/04/12 11:12:31 xtraeme Exp $ DISTNAME= pine4.58 PKGNAME= pico-4.6 @@ -13,7 +13,7 @@ COMMENT= Text editor (ships with Pine), and Pine's text editing lib LICENSE= pine-license -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES USE_LIBTOOL= YES .include "../../mk/bsd.prefs.mk" @@ -47,5 +47,5 @@ do-install: cd ${WRKSRC}/pico && \ ${INSTALL_DATA} *.h ${PREFIX}/include/pico -.include "../../devel/ncurses/buildlink2.mk" +.include "../../devel/ncurses/buildlink3.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3