From cf5cd72f250d44fd2ca0b3789289727e68647716 Mon Sep 17 00:00:00 2001 From: roy Date: Tue, 3 Jan 2017 21:50:53 +0000 Subject: Use the curses framework. --- games/moria/Makefile | 6 +++--- games/sl/Makefile | 7 ++++--- sysutils/cpmtools/Makefile | 6 ++++-- sysutils/ncdu/Makefile | 7 ++++--- sysutils/pscpug/Makefile | 4 ++-- sysutils/whowatch/Makefile | 7 ++++--- sysutils/wtail/Makefile | 4 ++-- 7 files changed, 23 insertions(+), 18 deletions(-) diff --git a/games/moria/Makefile b/games/moria/Makefile index 3535806c9e5..39de94b16c7 100644 --- a/games/moria/Makefile +++ b/games/moria/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2015/08/18 07:31:08 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2017/01/03 21:50:53 roy Exp $ DISTNAME= um5.5.2 PKGNAME= moria-5.5.2 @@ -15,7 +15,7 @@ HOMEPAGE= http://remarque.org/~grabiner/moria.html COMMENT= Rogue-like game with a different sense of scale than Rogue WRKSRC= ${WRKDIR}/umoria -MAKE_FLAGS+= CURSES=-lncurses VARBASE=${VARBASE} +MAKE_FLAGS+= CURSES=-l${BUILDLINK_LIBNAME.curses} VARBASE=${VARBASE} INSTALLATION_DIRS= bin ${PKGMANDIR}/man6 @@ -28,5 +28,5 @@ do-configure: @${RM} -f ${WRKSRC}/*.[ch] ${WRKSRC}/Makefile @cd ${WRKSRC}; ${LN} -s source/* unix/* . -.include "../../devel/ncurses/buildlink3.mk" +.include "../../mk/curses.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/sl/Makefile b/games/sl/Makefile index eb459c57373..e52eb36d611 100644 --- a/games/sl/Makefile +++ b/games/sl/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.21 2015/08/18 07:31:09 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2017/01/03 22:13:11 roy Exp $ # DISTNAME= sl-5.02 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= games MASTER_SITES= -https://github.com/mtoyoda/sl/archive/${PKGVERSION_NOREV}${EXTRACT_SUFX} @@ -10,6 +10,7 @@ MAINTAINER= minoura@NetBSD.org HOMEPAGE= http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/ COMMENT= Animated SL that runs across the terminal when you type `sl' +FAKE_NCURSES= yes DIST_SUBDIR= ${PKGNAME_NOREV} BUILD_TARGET= sl @@ -23,5 +24,5 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/sl.1.ja \ ${DESTDIR}${PREFIX}/${PKGMANDIR}/ja_JP.EUC/man1/sl.1 -.include "../../devel/ncurses/buildlink3.mk" +.include "../../mk/curses.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/cpmtools/Makefile b/sysutils/cpmtools/Makefile index 92a6062b16c..e4a085777d5 100644 --- a/sysutils/cpmtools/Makefile +++ b/sysutils/cpmtools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2015/08/18 07:31:17 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2017/01/03 22:46:53 roy Exp $ # DISTNAME= cpmtools-2.13 @@ -17,5 +17,7 @@ CONFIGURE_ARGS+= --datarootdir=${PREFIX}/share/cpmtools INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR} INSTALLATION_DIRS+= bin share/cpmtools ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 -.include "../../devel/ncurses/buildlink3.mk" +# I have no idea why this even wants to link against curses as it appears +# to use neither curses, terminfo or termcap. +.include "../../mk/curses.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/ncdu/Makefile b/sysutils/ncdu/Makefile index 81820fb145c..cafdb644dda 100644 --- a/sysutils/ncdu/Makefile +++ b/sysutils/ncdu/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2016/12/04 22:59:56 wiedi Exp $ +# $NetBSD: Makefile,v 1.7 2017/01/03 22:40:43 roy Exp $ DISTNAME= ncdu-1.12 +PKGREVISION= 1 CATEGORIES= filesystems MASTER_SITES= https://dev.yorhel.nl/download/ @@ -10,7 +11,7 @@ HOMEPAGE= http://dev.yorhel.nl/ncdu LICENSE= modified-bsd GNU_CONFIGURE= yes -INCOMPAT_CURSES= NetBSD-[0-5].*-* +FAKE_NCURSES= yes -.include "../../devel/ncurses/buildlink3.mk" +.include "../../mk/curses.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/pscpug/Makefile b/sysutils/pscpug/Makefile index d9098cd31a1..92d87c4b55a 100644 --- a/sysutils/pscpug/Makefile +++ b/sysutils/pscpug/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2015/08/18 07:31:18 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2017/01/03 22:38:01 roy Exp $ DISTNAME= pscpug035 PKGNAME= pscpug-0.3.5 @@ -19,5 +19,5 @@ INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 CFLAGS.NetBSD= -D_KMEMUSER -.include "../../devel/ncurses/buildlink3.mk" +.include "../../mk/curses.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/whowatch/Makefile b/sysutils/whowatch/Makefile index 09af5200a76..3aa6234eb99 100644 --- a/sysutils/whowatch/Makefile +++ b/sysutils/whowatch/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.21 2015/08/18 07:31:18 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2017/01/03 22:19:10 roy Exp $ DISTNAME= whowatch-1.4 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= sysutils MASTER_SITES= http://wizard.ae.krakow.pl/~mike/download/ \ http://janek.ae.krakow.pl/~suszyckm/download/ @@ -11,6 +11,7 @@ HOMEPAGE= http://wizard.ae.krakow.pl/~mike/\#whowatch COMMENT= Interactive who-like program displaying real-time user information GNU_CONFIGURE= YES +FAKE_NCURSES= yes INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 INSTALL_MAKE_FLAGS+= bindir=${DESTDIR}${PREFIX}/bin \ @@ -18,5 +19,5 @@ INSTALL_MAKE_FLAGS+= bindir=${DESTDIR}${PREFIX}/bin \ CFLAGS.NetBSD+= -D_KMEMUSER -.include "../../devel/ncurses/buildlink3.mk" +.include "../../mk/curses.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wtail/Makefile b/sysutils/wtail/Makefile index 7350b22183d..0b2866e2f7f 100644 --- a/sysutils/wtail/Makefile +++ b/sysutils/wtail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2015/08/18 07:31:18 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2017/01/03 22:16:03 roy Exp $ # DISTNAME= wtail-0.2.2 @@ -12,5 +12,5 @@ COMMENT= Watch multiple files at once MAKE_ENV+= SED=${SED:Q} -.include "../../devel/ncurses/buildlink3.mk" +.include "../../mk/curses.buildlink3.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3