diff --git a/audio/jack/Makefile b/audio/jack/Makefile
index 409d0f65b04..d19c929fd03 100644
--- a/audio/jack/Makefile
+++ b/audio/jack/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.42 2019/04/02 07:27:19 naddy Exp $
+# $OpenBSD: Makefile,v 1.43 2019/05/17 16:19:37 sthen Exp $
 
 COMMENT =		low latency sound server
 
@@ -6,7 +6,7 @@ V =			0.125.0
 DISTNAME =		jack-audio-connection-kit-${V}
 PKGNAME =		jack-${V}
 CATEGORIES =		audio
-REVISION =		1
+REVISION =		2
 
 SHARED_LIBS +=		jack		2.0	# 0.28
 SHARED_LIBS +=		jackserver	2.0	# 0.28
@@ -16,8 +16,8 @@ HOMEPAGE =		http://jackaudio.org/
 # LGPLv2/GPLv2
 PERMIT_PACKAGE_CDROM =	Yes
 
-WANTLIB += c celt0>=1 db m pthread readline samplerate sndfile
-WANTLIB += sndio termcap FLAC ogg vorbis vorbisenc
+WANTLIB += FLAC c celt0>=1 curses db m ogg pthread readline samplerate
+WANTLIB += sndfile sndio vorbis vorbisenc
 
 MASTER_SITES =		${HOMEPAGE}downloads/
 
diff --git a/audio/pms/Makefile b/audio/pms/Makefile
index 516fc947222..8b5562241cf 100644
--- a/audio/pms/Makefile
+++ b/audio/pms/Makefile
@@ -1,18 +1,18 @@
-# $OpenBSD: Makefile,v 1.21 2018/10/24 14:27:58 sthen Exp $
+# $OpenBSD: Makefile,v 1.22 2019/05/17 16:19:37 sthen Exp $
 
 COMMENT=		curses based frontend for mpd
 
 DISTNAME=		pms-0.42
 EXTRACT_SUFX = 		.tar.bz2
 CATEGORIES=		audio
-REVISION =		8
+REVISION =		9
 
 HOMEPAGE=		https://ambientsound.github.io/pms/
 
 # GPLv3
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB += c glib-2.0 intl m ncursesw pthread ${COMPILER_LIBCXX}
+WANTLIB += ${COMPILER_LIBCXX} c curses glib-2.0 intl m pthread
 
 COMPILER =		base-clang ports-gcc base-gcc
 
diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index b90b10a4686..72b1a484415 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -1,16 +1,15 @@
-# $OpenBSD: Makefile,v 1.50 2016/05/05 19:52:28 naddy Exp $
+# $OpenBSD: Makefile,v 1.51 2019/05/17 16:19:37 sthen Exp $
 
 COMMENT=	Motif CD player
 
 DISTNAME=	xmcd-2.6
-REVISION=	14
+REVISION=	15
 CATEGORIES=	audio
 HOMEPAGE=	http://www.amb.org/xmcd/
 
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB=	ICE SM Xau Xdmcp X11 Xaw Xext Xmu Xpm Xt c curses \
-		m termlib Xm
+WANTLIB += ICE SM X11 Xau Xaw Xdmcp Xext Xm Xmu Xpm Xt c curses m
 
 MASTER_SITES=	https://distfiles.nl/
 
diff --git a/cad/gnucap/Makefile b/cad/gnucap/Makefile
index d550b583200..326c3bcbc61 100644
--- a/cad/gnucap/Makefile
+++ b/cad/gnucap/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2018/11/18 19:12:13 naddy Exp $
+# $OpenBSD: Makefile,v 1.19 2019/05/17 16:19:37 sthen Exp $
 
 # gcc spins compiling d_mos7
 NOT_FOR_ARCHS=		m88k
@@ -6,7 +6,7 @@ NOT_FOR_ARCHS=		m88k
 COMMENT=		Gnu Circuit Analysis Package
 
 DISTNAME=		gnucap-0.35
-REVISION =		7
+REVISION=		8
 CATEGORIES=		cad
 
 HOMEPAGE=		http://www.gnucap.org/
@@ -14,9 +14,9 @@ HOMEPAGE=		http://www.gnucap.org/
 # GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB=		c m ${COMPILER_LIBCXX} readline termcap
+WANTLIB += ${COMPILER_LIBCXX} c curses m readline
 
-COMPILER =		base-clang ports-gcc base-gcc
+COMPILER =		base-clang ports-gcc
 
 MASTER_SITES=		${HOMEPAGE}dist/ \
 			http://www.geda.seul.org/dist/
diff --git a/chinese/cless/Makefile b/chinese/cless/Makefile
index c08ee97b58b..8828f8b9367 100644
--- a/chinese/cless/Makefile
+++ b/chinese/cless/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Thu Jan 18, 2000
 # Whom:                 Kevin Lo <kevlo@openbsd.org>
 #
-# $OpenBSD: Makefile,v 1.22 2018/05/12 14:01:17 espie Exp $
+# $OpenBSD: Makefile,v 1.23 2019/05/17 16:19:37 sthen Exp $
 #
 
 COMMENT=	pager utility that speaks Chinese
@@ -12,12 +12,12 @@ DISTNAME=       cless-290
 PKGNAME=        zh-${DISTNAME}
 CATEGORIES=     chinese misc
 MASTER_SITES=   http://ftp.cuhk.hk/pub/chinese/ifcss/software/unix/c-utils/
-REVISION =	1
+REVISION =	2
 
 # BSD
 PERMIT_PACKAGE_CDROM=   Yes
 
-WANTLIB=		c curses termcap
+WANTLIB += c curses
 
 CONFIGURE_STYLE= gnu dest old
 CFLAGS+=        -DHANZI # LDFLAGS=-s datadir=/usr/local/lib/less
diff --git a/comms/c3270/Makefile b/comms/c3270/Makefile
index f03020fc1ac..20a2ee1665c 100644
--- a/comms/c3270/Makefile
+++ b/comms/c3270/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2017/11/13 22:05:33 jeremy Exp $
+# $OpenBSD: Makefile,v 1.8 2019/05/17 16:19:37 sthen Exp $
 
 COMMENT=	curses-based 3270 terminal editor
 
@@ -6,6 +6,7 @@ DISTNAME=	suite3270-3.5ga11-src
 PKGNAME=	c3270-3.5.11
 EXTRACT_SUFX=	.tgz
 CATEGORIES=	comms
+REVISION=	0
 
 HOMEPAGE=	http://x3270.bgp.nu/
 
@@ -13,7 +14,8 @@ MAINTAINER=	Jeremy Evans <jeremy@openbsd.org>
 
 # BSD-like
 PERMIT_PACKAGE_CDROM=	Yes
-WANTLIB=		c crypto iconv ssl ncursesw readline util
+
+WANTLIB += c crypto curses iconv readline ssl util
 
 LIB_DEPENDS=		converters/libiconv
 
diff --git a/comms/pilot-link/Makefile b/comms/pilot-link/Makefile
index ac07e46242f..bc51fa4a1d8 100644
--- a/comms/pilot-link/Makefile
+++ b/comms/pilot-link/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.83 2018/11/14 20:48:21 sthen Exp $
+# $OpenBSD: Makefile,v 1.84 2019/05/17 16:19:37 sthen Exp $
 
 COMMENT=	tools to connect your PalmOS(R) compatible handheld
 
 DISTNAME=	pilot-link-0.12.5
-REVISION=	11
+REVISION=	12
 
 SHARED_LIBS +=  pisock               11.0     # 9.2
 SHARED_LIBS +=  pisync               2.0      # 1.3
@@ -21,7 +21,8 @@ EXTRACT_SUFX=	.tar.bz2
 # GPLv2 - LGPLv2
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB += c iconv intl m perl png popt pthread readline termcap z
+WANTLIB += c curses iconv intl m perl png popt pthread readline z
+
 # uses perl ABI
 
 LIB_DEPENDS=		graphics/png \
diff --git a/comms/qodem/Makefile b/comms/qodem/Makefile
index cc9cc4f566b..4b9e500af70 100644
--- a/comms/qodem/Makefile
+++ b/comms/qodem/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2017/11/14 20:26:49 fcambus Exp $
+# $OpenBSD: Makefile,v 1.2 2019/05/17 16:19:37 sthen Exp $
 
 COMMENT =	Qodem Terminal Emulator
 
 DISTNAME =	qodem-1.0.0
+REVISION =	0
 
 CATEGORIES =	comms
 
@@ -14,7 +15,7 @@ MAINTAINER =	Frederic Cambus <fcambus@openbsd.org>
 # MIT (UTF-8 decoder in source/codepage.c)
 PERMIT_PACKAGE_CDROM =	Yes
 
-WANTLIB +=	c ncursesw util
+WANTLIB += c curses util
 
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=qodem/}
 
diff --git a/databases/postgresql-previous/Makefile b/databases/postgresql-previous/Makefile
index 71f66c65a9c..c48339977c8 100644
--- a/databases/postgresql-previous/Makefile
+++ b/databases/postgresql-previous/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.8 2019/02/21 13:08:25 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2019/05/17 16:19:37 sthen Exp $
 
 COMMENT=	PostgreSQL RDBMS (previous version, for pg_upgrade)
 
 VERSION=	10.6
 DISTNAME=	postgresql-${VERSION}
 PKGNAME=	postgresql-previous-${VERSION}
+REVISION=	0
 
 CATEGORIES=	databases
 SHARED_LIBS=	ecpg		7.8 \
@@ -19,6 +20,8 @@ MAINTAINER=	Pierre-Emmanuel Andre <pea@openbsd.org>
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes
 
+WANTLIB += c crypto curses m perl readline ssl xml2 z
+
 MASTER_SITES=	https://ftp.postgresql.org/pub/source/v${VERSION}/ \
 		ftp://ftp.postgresql.org/pub/source/v${VERSION}/
 
@@ -77,7 +80,6 @@ ALL_TARGET=	all
 INSTALL_TARGET=	install
 
 LIB_DEPENDS = textproc/libxml
-WANTLIB += c crypto m readline ssl termcap z xml2 perl
 
 MAKE_ENV=	LIBpq_MAJOR=${LIBpq_VERSION:R} \
 		LIBpq_MINOR=${LIBpq_VERSION:E} \
diff --git a/databases/repmgr/Makefile b/databases/repmgr/Makefile
index 2c70430f70b..10803c6ebe4 100644
--- a/databases/repmgr/Makefile
+++ b/databases/repmgr/Makefile
@@ -1,15 +1,16 @@
-# $OpenBSD: Makefile,v 1.8 2016/03/16 16:46:32 naddy Exp $
+# $OpenBSD: Makefile,v 1.9 2019/05/17 16:19:37 sthen Exp $
 
 COMMENT =	HA and replication cluster management for PostgreSQL
 
 DISTNAME =	repmgr-3.0.3
 CATEGORIES =	databases
 HOMEPAGE =	http://www.repmgr.org/
+REVISION =	0
 
 # GPLv3
 PERMIT_PACKAGE_CDROM =	Yes
 
-WANTLIB += c crypto m pq pthread readline ssl termcap xml2 z
+WANTLIB += c crypto curses m pq pthread readline ssl xml2 z
 
 MASTER_SITES =	${HOMEPAGE}download/
 USE_GMAKE =	Yes
diff --git a/devel/ald/Makefile b/devel/ald/Makefile
index ef6bb33988f..30ed4288e06 100644
--- a/devel/ald/Makefile
+++ b/devel/ald/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2014/12/08 21:35:32 naddy Exp $
+# $OpenBSD: Makefile,v 1.11 2019/05/17 16:19:37 sthen Exp $
 
 ONLY_FOR_ARCHS=		i386
 
@@ -6,6 +6,7 @@ COMMENT=		assembly language debugger
 
 DISTNAME=		ald-0.1.7
 CATEGORIES=		devel
+REVISION=		0
 
 HOMEPAGE=		http://ald.sourceforge.net/
 
@@ -13,7 +14,8 @@ MAINTAINER=		Patrick Alken <alken@colorado.edu>
 
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
-WANTLIB=		c readline termcap
+
+WANTLIB += c curses readline
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=ald/}
 
diff --git a/devel/avrdude/Makefile b/devel/avrdude/Makefile
index 7b36ed26839..3861530c71c 100644
--- a/devel/avrdude/Makefile
+++ b/devel/avrdude/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.24 2018/09/04 12:46:10 espie Exp $
+# $OpenBSD: Makefile,v 1.25 2019/05/17 16:19:37 sthen Exp $
 
 COMMENT=	AVR microcontroller hardware in-system programmer
 
 V=		5.11
 DISTNAME=	avrdude-${V}
-REVISION=	3
+REVISION=	4
 DISTFILES+=	avrdude-${V}.tar.gz avrdude-doc-${V}.pdf
 CATEGORIES=	devel
 
@@ -13,7 +13,7 @@ HOMEPAGE=	http://www.nongnu.org/avrdude/
 # GPLv2+
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB += c ftdi m ncurses pthread readline termcap usb usb-1.0
+WANTLIB += c curses ftdi m pthread readline usb usb-1.0
 
 MASTER_SITES=	${MASTER_SITE_SAVANNAH:=avrdude/}
 EXTRACT_ONLY=	avrdude-${V}${EXTRACT_SUFX}
diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile
index 136228eb854..4cd27b36905 100644
--- a/devel/libslang/Makefile
+++ b/devel/libslang/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.63 2018/05/27 08:37:05 espie Exp $
+# $OpenBSD: Makefile,v 1.64 2019/05/17 16:19:37 sthen Exp $
 
 COMMENT=	stack-based interpreter for terminal applications
 
 DISTNAME=	slang-2.2.4
-REVISION=	4
+REVISION=	5
 PKGNAME=	lib${DISTNAME}
 SHARED_LIBS=	slang 16.0
 
@@ -15,7 +15,7 @@ HOMEPAGE=	http://jedsoft.org/slang/
 # Artistic
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB += c iconv m onig pcre png termcap z
+WANTLIB += c curses iconv m onig pcre png z
 
 LIB_DEPENDS=		converters/libiconv \
 			devel/pcre \
diff --git a/devel/libxsvf/Makefile b/devel/libxsvf/Makefile
index 80fb07cee7b..9e64a8b1bb6 100644
--- a/devel/libxsvf/Makefile
+++ b/devel/libxsvf/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.4 2015/11/24 09:11:04 jasper Exp $
+# $OpenBSD: Makefile,v 1.5 2019/05/17 16:19:37 sthen Exp $
 
 COMMENT=	library and tools for creating SVF and XSVF JTAG players
 
 # svn rev 62
 DISTNAME=	libxsvf-0.0.62
-REVISION=	0
+REVISION=	1
 CATEGORIES=	devel
 
 HOMEPAGE=	http://www.clifford.at/libxsvf/
@@ -12,9 +12,10 @@ HOMEPAGE=	http://www.clifford.at/libxsvf/
 # ISC
 PERMIT_PACKAGE_CDROM=	Yes
 
+WANTLIB += c curses ftdi pthread readline usb
+
 MASTER_SITES=	https://distfiles.nl/
 
-WANTLIB += c ftdi pthread readline termcap usb
 
 LIB_DEPENDS=	devel/libftdi
 
diff --git a/devel/mspdebug/Makefile b/devel/mspdebug/Makefile
index 592d4c02d0d..98a044a5240 100644
--- a/devel/mspdebug/Makefile
+++ b/devel/mspdebug/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2018/07/10 13:13:42 jasper Exp $
+# $OpenBSD: Makefile,v 1.22 2019/05/17 16:19:38 sthen Exp $
 
 COMMENT=		debugger for use with MSP 430 MCUs
 
@@ -6,7 +6,7 @@ GH_ACCOUNT =		dlbeer
 GH_PROJECT =		mspdebug
 GH_TAGNAME =		v0.23
 DISTNAME=		mspdebug-0.23
-REVISION =		0
+REVISION =		1
 CATEGORIES=		devel
 
 HOMEPAGE=		https://dlbeer.co.nz/mspdebug/
@@ -16,7 +16,7 @@ MAINTAINER=		Jasper Lievisse Adriaanse <jasper@openbsd.org>
 # GPLv2+
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB += c pthread readline termcap usb
+WANTLIB += c curses pthread readline usb
 
 LIB_DEPENDS=		devel/libusb-compat
 
diff --git a/devel/p5-Curses/Makefile b/devel/p5-Curses/Makefile
index ef8d46ddbca..3c3c02a669e 100644
--- a/devel/p5-Curses/Makefile
+++ b/devel/p5-Curses/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2017/12/02 11:34:17 espie Exp $
+# $OpenBSD: Makefile,v 1.29 2019/05/17 16:19:38 sthen Exp $
 
 COMMENT=	terminal screen handling and optimisation
 
@@ -7,12 +7,13 @@ DISTNAME =	Curses-1.32
 CPAN_AUTHOR=	GIRAFFED
 EXTRACT_SUFX=	.tgz
 FIX_EXTRACT_PERMISSIONS = Yes
+REVISION =	0
 
 CATEGORIES=	devel
 
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB += c curses form menu panel perl termcap
+WANTLIB += c curses form menu panel perl
 
 MAKE_FLAGS=PASTHRU_DEFINE='-idirafter $${PERL_INC}'
 CONFIGURE_ARGS=	PANELS MENUS FORMS
diff --git a/devel/p5-Term-ReadLine-Gnu/Makefile b/devel/p5-Term-ReadLine-Gnu/Makefile
index a25dd8654d8..1b3a3228258 100644
--- a/devel/p5-Term-ReadLine-Gnu/Makefile
+++ b/devel/p5-Term-ReadLine-Gnu/Makefile
@@ -1,14 +1,15 @@
-# $OpenBSD: Makefile,v 1.33 2016/03/20 19:56:36 naddy Exp $
+# $OpenBSD: Makefile,v 1.34 2019/05/17 16:19:38 sthen Exp $
 
 COMMENT=		GNU Readline Library Wrapper Module
 
 MODULES=		cpan
 DISTNAME=		Term-ReadLine-Gnu-1.28
 CATEGORIES=		devel
+REVISION=		0
 
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB += c perl readline termcap
+WANTLIB += c curses perl readline
 
 TEST_DEPENDS=	x11/p5-Tk
 TEST_FLAGS=		TERM=${TERM}
diff --git a/devel/remake/Makefile b/devel/remake/Makefile
index 6f47875881e..95e53fad54f 100644
--- a/devel/remake/Makefile
+++ b/devel/remake/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.10 2018/11/14 20:48:21 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2019/05/17 16:19:38 sthen Exp $
 
 COMMENT=		GNU make debugger
 
 PKGNAME=		remake-0.61p0
 DISTNAME=		remake-3.80+dbg-0.61
-REVISION=		1
+REVISION=		2
 
 CATEGORIES=		devel
 
@@ -14,8 +14,9 @@ MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=bashdb/}
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
 
+WANTLIB += c curses readline
+
 CONFIGURE_STYLE=	gnu
-WANTLIB=		c readline termcap
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/make ${PREFIX}/bin/remake
diff --git a/devel/stfl/Makefile b/devel/stfl/Makefile
index b1fcc9e0cd1..624ef3f41c9 100755
--- a/devel/stfl/Makefile
+++ b/devel/stfl/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2016/04/09 20:14:48 naddy Exp $
+# $OpenBSD: Makefile,v 1.7 2019/05/17 16:19:38 sthen Exp $
 
 COMMENT=	Structured Terminal Forms Language/Library
 
 DISTNAME=	stfl-0.24
+REVISION=	0
 
 SHARED_LIBS+=	stfl 0.0
 
@@ -13,7 +14,7 @@ HOMEPAGE=	http://www.clifford.at/stfl/
 # LGPLv3
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB += iconv ncursesw pthread
+WANTLIB += curses iconv pthread
 
 MASTER_SITES=	http://www.clifford.at/stfl/
 
diff --git a/editors/jed/Makefile b/editors/jed/Makefile
index 057943f3bfb..3e82d5f1a53 100644
--- a/editors/jed/Makefile
+++ b/editors/jed/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.42 2015/06/18 06:05:20 bentley Exp $
+# $OpenBSD: Makefile,v 1.43 2019/05/17 16:19:38 sthen Exp $
 
 COMMENT=	text editor
 
 DISTNAME=	jed-0.99-19
 PKGNAME=	jed-0.99.19
-REVISION=	1
+REVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=   http://www.jedsoft.org/releases/jed/ \
 		ftp://space.mit.edu/pub/davis/jed/v0.99/ \
@@ -16,7 +16,7 @@ HOMEPAGE=	http://www.jedsoft.org/jed/
 # GPLv2+
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB += c m slang>=15 termcap util
+WANTLIB += c curses m slang>=15 util
 
 LIB_DEPENDS=	devel/libslang
 
diff --git a/editors/jove/Makefile b/editors/jove/Makefile
index 5eab3b9be6e..23030d46e15 100644
--- a/editors/jove/Makefile
+++ b/editors/jove/Makefile
@@ -1,20 +1,21 @@
-# $OpenBSD: Makefile,v 1.28 2015/02/19 12:42:06 naddy Exp $
+# $OpenBSD: Makefile,v 1.29 2019/05/17 16:19:38 sthen Exp $
 
 COMMENT=	Jonathan's Own Version of Emacs
 
 V=		4.16.0.73
 DISTNAME=	jove${V}
 PKGNAME=	jove-${V}
-REVISION=	0
+REVISION=	1
 CATEGORIES=	editors
 
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes
 
+WANTLIB += c curses
+
 MASTER_SITES=	ftp://ftp.cs.toronto.edu/cs/ftp/pub/hugh/jove-dev/
 EXTRACT_SUFX=	.tgz
 
-WANTLIB=	c termcap
 
 BUILD_DEPENDS=	textproc/groff
 
diff --git a/editors/le/Makefile b/editors/le/Makefile
index 5f4a425d9f2..f860e2fe84c 100644
--- a/editors/le/Makefile
+++ b/editors/le/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.12 2018/10/24 14:28:01 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2019/05/17 16:19:38 sthen Exp $
 
 COMMENT =	text editor inspired by Norton Commander
 DISTNAME =	le-1.16.5
 CATEGORIES =	editors
-REVISION =	0
+REVISION =	1
 
 HOMEPAGE =	http://lav.yar.ru/programs.html
 MAINTAINER =	Ivan Ivanov <rambiusparkisanius@gmail.com>
@@ -11,7 +11,7 @@ MAINTAINER =	Ivan Ivanov <rambiusparkisanius@gmail.com>
 # GPLv3+
 PERMIT_PACKAGE_CDROM =	Yes
 
-WANTLIB +=	c m ncursesw ${COMPILER_LIBCXX}
+WANTLIB +=	${COMPILER_LIBCXX} c curses m
 
 COMPILER =		base-clang ports-gcc base-gcc
 
diff --git a/editors/nvi/Makefile b/editors/nvi/Makefile
index 686b91525fe..0be33192d83 100644
--- a/editors/nvi/Makefile
+++ b/editors/nvi/Makefile
@@ -1,22 +1,22 @@
-# $OpenBSD: Makefile,v 1.16 2016/09/12 22:44:08 naddy Exp $
+# $OpenBSD: Makefile,v 1.17 2019/05/17 16:19:38 sthen Exp $
 
 COMMENT=	ex/vi text editor with wide character support
 
 V =		2.1.3
+GH_ACCOUNT =	lichray
+GH_PROJECT =	nvi2
+GH_TAGNAME =	v$V
 DISTNAME =	nvi-$V
-CATEGORIES=	editors
-REVISION =	1
+REVISION =	2
+
+CATEGORIES =	editors
 
 MAINTAINER =	Anthony J. Bentley <anthony@anjbe.name>
 
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes
 
-GH_ACCOUNT =	lichray
-GH_PROJECT =	nvi2
-GH_TAGNAME =	v$V
-
-WANTLIB=	c ncursesw util
+WANTLIB=	c curses util
 
 MODULES=	devel/cmake
 
diff --git a/editors/uemacs/Makefile b/editors/uemacs/Makefile
index 12907caa67c..2abfbaf85eb 100644
--- a/editors/uemacs/Makefile
+++ b/editors/uemacs/Makefile
@@ -1,17 +1,18 @@
-# $OpenBSD: Makefile,v 1.22 2018/05/20 08:32:01 espie Exp $
+# $OpenBSD: Makefile,v 1.23 2019/05/17 16:19:38 sthen Exp $
 
 COMMENT=	full screen simple editor
 
 DISTNAME=	uemacs
 PKGNAME=	uemacs-4.0
 CATEGORIES=	editors
-REVISION =	0
+REVISION =	1
 
 HOMEPAGE=	http://uemacs.tripod.com/
 
 PERMIT_PACKAGE_CDROM=	weird no fee license
 PERMIT_PACKAGE_FTP=	Yes
-WANTLIB=		c termcap
+
+WANTLIB += c curses
 
 MASTER_SITES=	ftp://aquest.com/pub/uemacs400/disk2/
 DISTFILES=	ue400dev.zip
diff --git a/editors/zile/Makefile b/editors/zile/Makefile
index 8342e02dbcb..48af828e553 100644
--- a/editors/zile/Makefile
+++ b/editors/zile/Makefile
@@ -1,18 +1,20 @@
-# $OpenBSD: Makefile,v 1.48 2017/10/13 01:33:47 gonzalo Exp $
+# $OpenBSD: Makefile,v 1.49 2019/05/17 16:19:38 sthen Exp $
 
 COMMENT=		lightweight Emacs clone
 DISTNAME=		zile-2.4.14
 CATEGORIES=		editors
 HOMEPAGE=		https://www.gnu.org/software/zile/
+REVISION=		0
 
 MAINTAINER=		Gonzalo L. R. <gonzalo@openbsd.org>
 
 # GPLv3+
 PERMIT_PACKAGE_CDROM=	Yes
 
+WANTLIB += c curses gc pthread
+
 MASTER_SITES=		${MASTER_SITE_GNU:=zile/}
 
-WANTLIB += c gc ncursesw pthread
 
 LIB_DEPENDS=		devel/boehm-gc
 
diff --git a/education/gtypist/Makefile b/education/gtypist/Makefile
index 756b87331b4..424b16bdf3e 100644
--- a/education/gtypist/Makefile
+++ b/education/gtypist/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.33 2018/05/20 08:43:45 espie Exp $
+# $OpenBSD: Makefile,v 1.34 2019/05/17 16:19:38 sthen Exp $
 
 COMMENT=	interactive typing tutor
 
 DISTNAME=	gtypist-2.9.5
-REVISION=	1
+REVISION=	2
 CATEGORIES=	education
 HOMEPAGE=	https://www.gnu.org/software/gtypist/
 
@@ -12,10 +12,11 @@ MAINTAINER=	Christian Weisgerber <naddy@openbsd.org>
 # GPLv3+
 PERMIT_PACKAGE_CDROM=	Yes
 
+WANTLIB += c curses iconv intl
+
 MASTER_SITES=	${MASTER_SITE_GNU:=gtypist/}
 EXTRACT_SUFX=	.tar.xz
 
-WANTLIB=	c iconv intl ncursesw
 LIB_DEPENDS=	devel/gettext
 
 CONFIGURE_STYLE=gnu
diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index 561eb942e8b..d5ba26bc1be 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -1,18 +1,18 @@
-# $OpenBSD: Makefile,v 1.72 2018/10/24 14:28:01 sthen Exp $
+# $OpenBSD: Makefile,v 1.73 2019/05/17 16:19:38 sthen Exp $
 
 COMMENT=	x86 machine simulator
 
 DISTNAME=	bochs-2.6.9
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bochs/}
-REVISION=	1
+REVISION=	2
 
 HOMEPAGE=	http://bochs.sourceforge.net/
 
 # LGPLv2.1+ and MIT
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB=	c m pthread ${COMPILER_LIBCXX} termlib
+WANTLIB += ${COMPILER_LIBCXX} c curses m pthread
 
 COMPILER =		base-clang ports-gcc base-gcc
 
diff --git a/games/clines/Makefile b/games/clines/Makefile
index 845d3b68f40..aa70be0a4a0 100644
--- a/games/clines/Makefile
+++ b/games/clines/Makefile
@@ -1,17 +1,17 @@
-# $OpenBSD: Makefile,v 1.11 2018/05/20 08:48:55 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2019/05/17 16:19:38 sthen Exp $
 
 COMMENT=		curses-based Lines game
 
 DISTNAME=		clines-1.0.4
 CATEGORIES=		games
-REVISION=		2
+REVISION=		3
 
 HOMEPAGE=		http://manticore.2y.net/prj/clines-a.html
 
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB += c ncursesw
+WANTLIB += c curses
 
 MASTER_SITES=		http://manticore.2y.net/cgi-bin/dlwct.sh?f=clines/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/games/cpat/Makefile b/games/cpat/Makefile
index 31b99f5dd85..a09d8b1361d 100644
--- a/games/cpat/Makefile
+++ b/games/cpat/Makefile
@@ -1,15 +1,16 @@
-# $OpenBSD: Makefile,v 1.3 2016/10/31 10:46:08 kirby Exp $
+# $OpenBSD: Makefile,v 1.4 2019/05/17 16:19:38 sthen Exp $
 
 COMMENT =	curses-based solitaire collection suite
 DISTNAME =	cpat-1.4.1
 CATEGORIES =	games
+REVISION =	0
 
 HOMEPAGE =	http://cpat.sourceforge.net/
 
 # GPLv2 only
 PERMIT_PACKAGE_CDROM =	Yes
 
-WANTLIB += c ncursesw
+WANTLIB += c curses
 
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=cpat/}
 
diff --git a/games/dungeon/Makefile b/games/dungeon/Makefile
index 9b21717a6e7..37620583b89 100644
--- a/games/dungeon/Makefile
+++ b/games/dungeon/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.4 2016/05/07 12:40:56 pascal Exp $
+# $OpenBSD: Makefile,v 1.5 2019/05/17 16:19:38 sthen Exp $
 
 COMMENT =		text adventure game
 
 PKGNAME =		dungeon-2.7s
 DISTNAME =		dungn27s
 EXTRACT_SUFX =		.zip
-REVISION =		0
+REVISION =		1
 
 CATEGORIES =		games
 
@@ -15,7 +15,7 @@ MAINTAINER =		Pascal Stumpf <pascal@stumpf.co>
 PERMIT_PACKAGE_CDROM =	no commercial use
 PERMIT_PACKAGE_FTP =	Yes
 
-WANTLIB =		c termcap
+WANTLIB += c curses
 
 MASTER_SITES =		http://mirror.ifarchive.org/if-archive/games/source/ \
 			ftp://ftp.ifarchive.org/if-archive/games/source/ \
diff --git a/games/eliot/Makefile b/games/eliot/Makefile
index d13108c4460..e3d9dff7647 100644
--- a/games/eliot/Makefile
+++ b/games/eliot/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.12 2018/10/24 14:28:02 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2019/05/17 16:19:38 sthen Exp $
 
 V =		2.1
 COMMENT =	scrabble game
 DISTNAME =	eliot-${V}
 CATEGORIES =	games
-REVISION =	4
+REVISION =	5
 
 HOMEPAGE =	http://nongnu.org/eliot/
 
@@ -36,7 +36,7 @@ BUILD_DEPENDS =	devel/boost \
 RUN_DEPENDS =	devel/desktop-file-utils
 LIB_DEPENDS =	textproc/arabica devel/libconfig
 WANTLIB +=	lib/qt4/QtGui lib/qt4/QtNetwork c m pthread ${COMPILER_LIBCXX}
-WANTLIB +=	arabica config++ expat iconv intl ncursesw
+WANTLIB +=	arabica config++ expat iconv intl curses
 
 post-configure:
 	${SUBST_CMD} ${WRKSRC}/qt/main_window.cpp
diff --git a/games/moria/Makefile b/games/moria/Makefile
index 5d5b5b08b90..a0500cfa29a 100644
--- a/games/moria/Makefile
+++ b/games/moria/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.19 2017/04/25 15:47:41 espie Exp $
+# $OpenBSD: Makefile,v 1.20 2019/05/17 16:19:38 sthen Exp $
 
 COMMENT=	The Dungeons of Moria
 
 V=		5.5.2
 DISTNAME=	um$V
 PKGNAME=	moria-$V
-REVISION=	4
+REVISION=	5
 
 CATEGORIES=	games
 
@@ -14,7 +14,7 @@ HOMEPAGE=	http://www-math.bgsu.edu/~grabine/moria.html
 PERMIT_PACKAGE_CDROM=	not-for-profit redistribution only
 PERMIT_PACKAGE_FTP=	Yes
 
-WANTLIB=	c curses termcap
+WANTLIB += c curses
 
 MASTER_SITES=	http://www.nic.funet.fi/pub/unix/games/moria/source/
 
diff --git a/games/nethack/3.4/Makefile b/games/nethack/3.4/Makefile
index 9efdc8451b8..be9b4464a41 100644
--- a/games/nethack/3.4/Makefile
+++ b/games/nethack/3.4/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.3 2018/10/24 14:28:03 sthen Exp $
+# $OpenBSD: Makefile,v 1.4 2019/05/17 16:19:38 sthen Exp $
 
 COMMENT =	dungeon explorin', hackin', game.  Piece of cake
 V =		3.4.3
 DISTNAME =	nethack-$V
 PKGNAME =	${DISTNAME}
-REVISION =	14
+REVISION =	15
 CATEGORIES =	games
 
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=nethack/}
@@ -16,7 +16,8 @@ MAINTAINER =	Marc Espie <espie@openbsd.org>
 
 # GPL
 PERMIT_PACKAGE_CDROM =	Yes
-WANTLIB =		c termlib
+
+WANTLIB +=	c curses
 
 COMPILER =		base-clang ports-gcc base-gcc
 
diff --git a/games/netris/Makefile b/games/netris/Makefile
index 2ae54b7e91d..b1f46a532c5 100644
--- a/games/netris/Makefile
+++ b/games/netris/Makefile
@@ -1,16 +1,17 @@
-# $OpenBSD: Makefile,v 1.25 2018/03/08 17:19:20 fcambus Exp $
+# $OpenBSD: Makefile,v 1.26 2019/05/17 16:19:38 sthen Exp $
 
 COMMENT=	network head-to-head version of T*tris
 
 DISTNAME=	netris-0.52
-REVISION=	2
+REVISION=	3
 CATEGORIES=	games
 
 MASTER_SITES=	https://www.distfiles.pl/
 
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
-WANTLIB=		c ncurses termcap
+
+WANTLIB += c curses
 
 CONFIGURE_STYLE=	simple
 CONFIGURE_SCRIPT=	Configure
diff --git a/games/omega/Makefile b/games/omega/Makefile
index 91a3ac5b6f0..280ae3ae523 100644
--- a/games/omega/Makefile
+++ b/games/omega/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.13 2014/01/24 22:03:45 landry Exp $
+# $OpenBSD: Makefile,v 1.14 2019/05/17 16:19:38 sthen Exp $
 
 COMMENT=	complex rogue-style game of dungeon exploration
 
 VERSION=	0.90.4
 DISTFILES=	omega-${VERSION}-src.tar.gz
 DISTNAME=	omega-${VERSION}
-REVISION =	2
+REVISION =	3
 CATEGORIES=     games
 MASTER_SITES=   http://www.alcyone.com/binaries/omega/
 
@@ -13,7 +13,8 @@ HOMEPAGE=	http://www.alcyone.com/max/projects/omega/
 
 # LGPL
 PERMIT_PACKAGE_CDROM=   Yes
-WANTLIB=		c curses termcap
+
+WANTLIB += c curses
 
 WRKDIST=        ${WRKDIR}/omega
 WRKSRC=         ${WRKDIST}
diff --git a/games/slash-em/Makefile b/games/slash-em/Makefile
index 821f0177ff8..ac602d154b9 100644
--- a/games/slash-em/Makefile
+++ b/games/slash-em/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.29 2017/10/23 17:10:49 sthen Exp $
+# $OpenBSD: Makefile,v 1.30 2019/05/17 16:19:39 sthen Exp $
 
 COMMENT =	dungeon explorin', hackin', game.  Hard
 DISTNAME =	se007e7f1
 PKGNAME =	slash-em-3.4.3.7e7f1
-REVISION =	7
+REVISION =	8
 V =		3.4.3.7e7f1
 CATEGORIES =	games
 
@@ -14,7 +14,8 @@ MAINTAINER =	Marc Espie <espie@openbsd.org>
 
 # GPL
 PERMIT_PACKAGE_CDROM =	Yes
-WANTLIB =		c termlib
+
+WANTLIB += c curses
 
 WRKDIST =		${WRKDIR}/slashem-0.0.7E7F1
 
diff --git a/games/slash/Makefile b/games/slash/Makefile
index 6710dcbe986..33a2969c5a1 100644
--- a/games/slash/Makefile
+++ b/games/slash/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.50 2017/10/23 17:10:49 sthen Exp $
+# $OpenBSD: Makefile,v 1.51 2019/05/17 16:19:39 sthen Exp $
 
 COMMENT =	dungeon explorin', hackin' game, but harder than nethack
 
 DISTNAME =	slash-e8
 PKGNAME =	slash-3.2.2.e8
-REVISION =	7
+REVISION =	8
 CATEGORIES =	games
 
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=nethack/}
@@ -18,7 +18,8 @@ MAINTAINER =	Marc Espie <espie@openbsd.org>
 
 #	GPL
 PERMIT_PACKAGE_CDROM =	Yes
-WANTLIB =		c termlib
+
+WANTLIB += c curses
 
 FAKE_FLAGS =	PREFIX=${PREFIX}
 
diff --git a/games/stone-soup/Makefile b/games/stone-soup/Makefile
index 3a800633438..77464f8dffa 100644
--- a/games/stone-soup/Makefile
+++ b/games/stone-soup/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.36 2019/04/30 12:50:29 kirby Exp $
+# $OpenBSD: Makefile,v 1.37 2019/05/17 16:19:39 sthen Exp $
 
 BROKEN-hppa =	ICE on dgn-shoals.cc:638
 
@@ -7,7 +7,7 @@ COMMENT = 	dungeon crawl stone soup
 VERSION = 	0.23.2
 DISTNAME=	stone_soup-${VERSION}-nodeps
 PKGNAME=	stone-soup-${VERSION}
-REVISION=	0
+REVISION=	1
 
 CATEGORIES = 	games
 
@@ -16,7 +16,7 @@ HOMEPAGE = 	https://crawl.develz.org/
 # GPLv2+
 PERMIT_PACKAGE_CDROM =	 Yes
 
-WANTLIB = 	c m ${MODLUA_WANTLIB} sqlite3 ${COMPILER_LIBCXX}
+WANTLIB += ${COMPILER_LIBCXX} ${MODLUA_WANTLIB} c m sqlite3
 
 MASTER_SITES = 	https://crawl.develz.org/release/${VERSION:R}/
 EXTRACT_SUFX=	.tar.xz
@@ -51,7 +51,7 @@ FLAVORS = 	no_x11
 FLAVOR ?=
 
 .if ${FLAVOR:Mno_x11}
-WANTLIB += 	ncursesw pthread z
+WANTLIB += 	curses pthread z
 MAKE_FLAGS += 	USE_UNICODE=y UNICODE_LOCALE=y
 .else
 # This should be automatically set during "gmake -C rltiles..." but isn't...
diff --git a/games/xlife/Makefile b/games/xlife/Makefile
index b3fc5120449..bf2e368e912 100644
--- a/games/xlife/Makefile
+++ b/games/xlife/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.33 2017/10/23 17:10:50 sthen Exp $
+# $OpenBSD: Makefile,v 1.34 2019/05/17 16:19:39 sthen Exp $
 
 COMMENT=	John Horton Conway's Game of Life
 
 DISTNAME=	xlife-5.3
-REVISION =	6
+REVISION =	7
 CATEGORIES=	games
 
 HOMEPAGE=	http://www.catb.org/~esr/software.html
@@ -12,7 +12,7 @@ MASTER_SITES=	https://www.distfiles.pl/
 
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB=	X11 Xau Xdmcp Xext c curses termcap xcb
+WANTLIB += X11 Xau Xdmcp Xext c curses xcb
 
 CONFIGURE_STYLE=	imake
 WRKSRC=	${WRKDIST}/xlife
diff --git a/graphics/libcaca/Makefile b/graphics/libcaca/Makefile
index 9d36dd7fc73..aedce2e42b8 100644
--- a/graphics/libcaca/Makefile
+++ b/graphics/libcaca/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.33 2016/11/22 21:26:04 jca Exp $
+# $OpenBSD: Makefile,v 1.34 2019/05/17 16:19:39 sthen Exp $
 
 COMMENT=		color ascii art library
 
@@ -6,14 +6,14 @@ DISTNAME=		libcaca-0.99.beta19
 PKGNAME=		libcaca-0.99.19
 SHARED_LIBS +=  caca           1.2               # .0.99
 CATEGORIES=		graphics
-REVISION=		1
+REVISION=		2
 
 HOMEPAGE=		http://caca.zoy.org/wiki/libcaca
 
 # LGPLv2.1/Do What The Fuck You Want To Public License
 PERMIT_PACKAGE_CDROM=   Yes
 
-WANTLIB=		c ncursesw m z
+WANTLIB=		c curses m z
 
 MASTER_SITES=		http://caca.zoy.org/files/libcaca/ \
 			https://distfiles.nl/
diff --git a/graphics/s10sh/Makefile b/graphics/s10sh/Makefile
index 5194597d82c..f2651d4e4be 100644
--- a/graphics/s10sh/Makefile
+++ b/graphics/s10sh/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.15 2019/05/01 20:12:52 danj Exp $
+# $OpenBSD: Makefile,v 1.16 2019/05/17 16:19:39 sthen Exp $
 
 COMMENT=	S10sh - a Canon PowerShot digital camera driver
 
 DISTNAME=	s10sh-0.2.0
-REVISION =	4
+REVISION =	5
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.kyuzz.org/antirez/s10sh-src/
 
@@ -12,7 +12,7 @@ HOMEPAGE=	http://www.kyuzz.org/antirez/s10sh.html
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB=	readline c termcap usb pthread
+WANTLIB += c curses pthread readline usb
 
 DOCDIR=		${PREFIX}/share/doc/s10sh
 
diff --git a/korean/hanterm-xf/Makefile b/korean/hanterm-xf/Makefile
index 9fefe6a2dd9..2cab0d042b4 100644
--- a/korean/hanterm-xf/Makefile
+++ b/korean/hanterm-xf/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2017/05/14 23:12:55 schwarze Exp $
+# $OpenBSD: Makefile,v 1.26 2019/05/17 16:19:39 sthen Exp $
 
 COMMENT=	X Hangul Terminal (XFree86 xterm Based)
 
@@ -6,7 +6,7 @@ V=		2.0.6-177
 DISTNAME=	hanterm-xf-$V
 CATEGORIES=	korean
 PKGNAME=	hanterm-xf-${V:S/-/./}
-REVISION=	4
+REVISION=	5
 EPOCH=		0
 
 MASTER_SITES=	http://kldp.net/frs/download.php/3281/
@@ -14,9 +14,10 @@ HOMEPAGE=	http://hanterm-xf.kldp.net
 
 PERMIT_PACKAGE_CDROM=	yes
 
+WANTLIB += ICE SM X11 Xaw Xext Xmu Xt c curses iconv util
+
 MAINTAINER=	Jung Lee <moorang@gmail.com>
 
-WANTLIB=	ICE SM X11 Xaw Xext Xmu Xt c iconv termcap util
 
 LIB_DEPENDS=	converters/libiconv
 NO_TEST=	Yes 
diff --git a/lang/datalog/Makefile b/lang/datalog/Makefile
index e25fe36a440..290993bf442 100644
--- a/lang/datalog/Makefile
+++ b/lang/datalog/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.13 2017/07/27 19:55:46 zhuk Exp $
+# $OpenBSD: Makefile,v 1.14 2019/05/17 16:19:39 sthen Exp $
 
 COMMENT=	deductive database system similar to Prolog
 
 DISTNAME=	datalog-2.6
-REVISION=	0
+REVISION=	1
 SHARED_LIBS +=  datalog                   0.0 # 0.0
 CATEGORIES=	lang
 
@@ -12,7 +12,8 @@ HOMEPAGE=	http://datalog.sourceforge.net/
 # LGPLv2.1+
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB += c m readline termcap ${MODLUA_WANTLIB}
+WANTLIB += ${MODLUA_WANTLIB}
+WANTLIB += c curses m readline
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=datalog/}
 
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 250ce810dbd..a54cb602aa0 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.161 2019/04/28 20:51:42 sthen Exp $
+# $OpenBSD: Makefile,v 1.162 2019/05/17 16:19:39 sthen Exp $
 
 COMMENT =		compiler for the functional language Haskell
 
@@ -12,7 +12,7 @@ COMMENT =		compiler for the functional language Haskell
 NO_CCACHE =		Yes
 
 DISTNAME =		ghc-${MODGHC_VER}
-REVISION =		3
+REVISION =		4
 CATEGORIES =		lang devel
 HOMEPAGE =		https://www.haskell.org/ghc/
 
@@ -32,6 +32,8 @@ MODPY_VERSION =		${MODPY_DEFAULT_VERSION_3}
 # binaries, with BSD, GPLv2 and Perl artistic license.
 PERMIT_PACKAGE_CDROM =		Yes
 
+WANTLIB += c curses iconv m pthread util
+
 LIB_DEPENDS =		converters/libiconv
 
 BUILD_DEPENDS =		archivers/gtar \
@@ -43,7 +45,6 @@ RUN_DEPENDS =
 # CONFIGURE_ENV below)
 USE_WXNEEDED =		special
 
-WANTLIB +=		c iconv m ncursesw pthread util
 
 MASTER_SITES =		${HOMEPAGE}dist/${MODGHC_VER}/ \
 			${HOMEPAGE}dist/stable/dist/
diff --git a/lang/scm/Makefile b/lang/scm/Makefile
index c190e54f93a..e89438b78ba 100644
--- a/lang/scm/Makefile
+++ b/lang/scm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.40 2016/09/01 10:53:27 jasper Exp $
+# $OpenBSD: Makefile,v 1.41 2019/05/17 16:19:39 sthen Exp $
 # losely based on the FreeBSD port
 
 .for m in alpha powerpc sparc64
@@ -6,7 +6,7 @@ BROKEN-$m =	segfaults in longjump return while testing continuations
 .endfor
 
 COMMENT =	scheme r5 interpreter
-REVISION =	1
+REVISION =	2
 
 CATEGORIES =	lang
 
@@ -26,7 +26,7 @@ WRKDIST =	${WRKDIR}/scm
 # LGPLv3
 PERMIT_PACKAGE_CDROM =	Yes
 
-WANTLIB =		c curses termcap m readline
+WANTLIB += c curses m readline
 
 FLAVORS =	no_x11
 
diff --git a/lang/swi-prolog/Makefile b/lang/swi-prolog/Makefile
index d5095513ce3..616da43f7b4 100644
--- a/lang/swi-prolog/Makefile
+++ b/lang/swi-prolog/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.79 2019/02/28 01:52:37 naddy Exp $
+# $OpenBSD: Makefile,v 1.80 2019/05/17 16:19:39 sthen Exp $
 
 BROKEN-hppa =		undefined reference to __sync_fetch_and_add_4
 BROKEN-powerpc =	pl-modul.c:1497: internal compiler error: in extract_insn, at recog.c:2077
@@ -7,7 +7,7 @@ BROKEN-sparc64 =	infinite loop or aborts during build
 COMMENT =		Prolog for the real world
 
 V =			7.6.0
-REVISION =		3
+REVISION =		4
 DISTNAME =		swipl-$V
 PKGNAME =		swi-prolog-$V
 CATEGORIES =		lang
@@ -21,9 +21,9 @@ MAINTAINER =		Edd Barrett <edd@openbsd.org>
 # LGPLv2.1
 PERMIT_PACKAGE_CDROM =	Yes
 
-WANTLIB += ICE SM X11 Xext Xft Xinerama Xpm Xt archive c crypto
-WANTLIB += db edit execinfo fontconfig freetype gmp iodbc jpeg
-WANTLIB += m ncursesw ossp-uuid pcre pthread readline ssl z
+WANTLIB += ICE SM X11 Xext Xft Xinerama Xpm Xt archive c crypto curses
+WANTLIB += db edit execinfo fontconfig freetype gmp iodbc jpeg m
+WANTLIB += ossp-uuid pcre pthread readline ssl z
 
 MASTER_SITES =		${HOMEPAGE}download/stable/src/ \
 			https://distfiles.nl/
diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index b781c1c6b8d..2af787630a0 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.30 2019/04/04 03:38:12 naddy Exp $
+# $OpenBSD: Makefile,v 1.31 2019/05/17 16:19:39 sthen Exp $
 
 COMMENT=	once-popular mail user agent
 
 DISTNAME=	elm-2.4ME+66
-REVISION=	2
+REVISION=	3
 CATEGORIES=	mail
 
 MASTER_SITES=	ftp://ftp.ozone.fmi.fi/KEH/
@@ -11,7 +11,8 @@ MASTER_SITES=	ftp://ftp.ozone.fmi.fi/KEH/
 MAINTAINER=	Paul Janzen <pjanzen@foatdi.net>
 
 PERMIT_PACKAGE_CDROM=	Yes
-WANTLIB=		c termlib
+
+WANTLIB += c curses
 
 CONFIGURE_STYLE=	simple
 CONFIGURE_SCRIPT= Configure
diff --git a/mail/lumail/Makefile b/mail/lumail/Makefile
index 2b1de355bf4..e9512386abb 100644
--- a/mail/lumail/Makefile
+++ b/mail/lumail/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2017/11/16 23:20:39 naddy Exp $
+# $OpenBSD: Makefile,v 1.31 2019/05/17 16:19:39 sthen Exp $
 
 PORTROACH =		limit:^0
 
@@ -6,7 +6,7 @@ COMMENT =		console-based e-mail client with Lua scripting support
 
 DISTNAME =		lumail-0.26
 CATEGORIES =		mail
-REVISION =		5
+REVISION =		6
 
 HOMEPAGE =		http://lumail.org/
 MASTER_SITES =		http://lumail.org/download/
@@ -14,9 +14,8 @@ MASTER_SITES =		http://lumail.org/download/
 # GPLv2+
 PERMIT_PACKAGE_CDROM =	Yes
 
-WANTLIB +=		c gio-2.0 glib-2.0 glibmm-2.4 gmime-2.6 gobject-2.0
-WANTLIB +=		intl ${MODLUA_WANTLIB} m ncursesw pcrecpp pthread
-WANTLIB +=		sigc-2.0 ${COMPILER_LIBCXX}
+WANTLIB += ${COMPILER_LIBCXX} ${MODLUA_WANTLIB} c curses gio-2.0 glib-2.0
+WANTLIB += glibmm-2.4 gmime-2.6 gobject-2.0 intl m pcrecpp pthread sigc-2.0
 
 MODULES =		lang/lua
 
@@ -34,7 +33,7 @@ MAKE_FLAGS =		C="${CC}" CC="${CXX}" \
 			CPPFLAGS="-std=gnu++0x -I${LOCALBASE}/include \
 				`pkg-config --cflags ${MODLUA_DEP}`" \
 			LDLIBS="`pkg-config --libs ${MODLUA_DEP}` \
-				-lncursesw -lpcrecpp"
+				-lcurses -lpcrecpp"
 
 NO_TEST =		Yes
 
diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile
index 90ef5f8a721..5c10e5469e9 100644
--- a/mail/metamail/Makefile
+++ b/mail/metamail/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.31 2016/06/28 23:05:39 sthen Exp $
+# $OpenBSD: Makefile,v 1.32 2019/05/17 16:19:39 sthen Exp $
 
 COMMENT=	MIME implementation
 
 DISTNAME=	mm2.7
 PKGNAME=	metamail-2.7
-REVISION=	5
+REVISION=	6
 CATEGORIES=	mail
 
 MASTER_SITES=	http://www.guppylake.com/~nsb/metamail/
@@ -12,7 +12,8 @@ EXTRACT_SUFX=	.tar.Z
 
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB=	c termcap
+WANTLIB += c curses
+
 # mkfontdir & friends
 USE_X11 =	Yes
 
diff --git a/mail/nmzmail/Makefile b/mail/nmzmail/Makefile
index 26c580255e5..fde8387f04c 100644
--- a/mail/nmzmail/Makefile
+++ b/mail/nmzmail/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2017/07/05 10:22:05 sthen Exp $
+# $OpenBSD: Makefile,v 1.10 2019/05/17 16:19:39 sthen Exp $
 
 COMMENT=	fast maildir search engine
 
 DISTNAME=	nmzmail-1.1
-REVISION=	3
+REVISION=	4
 
 CATEGORIES=	mail textproc
 HOMEPAGE=	http://www.ecademix.com/JohannesHofmann/nmzmail.html
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.ecademix.com/JohannesHofmann/nmzmail.html
 # GPLv3
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB=	c readline termcap
+WANTLIB += c curses readline
 
 MASTER_SITES=	${HOMEPAGE:nmzmail.html=}
 
diff --git a/math/aamath/Makefile b/math/aamath/Makefile
index dc49ae28702..c40478d8cbb 100644
--- a/math/aamath/Makefile
+++ b/math/aamath/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.18 2018/10/24 14:28:07 sthen Exp $
+# $OpenBSD: Makefile,v 1.19 2019/05/17 16:19:39 sthen Exp $
 
 COMMENT=		ASCII art mathematics
 
 DISTNAME=		aamath-0.3
-REVISION =		4
+REVISION =		5
 CATEGORIES=		math
 
 HOMEPAGE=		http://fuse.superglue.se/aamath/
@@ -15,7 +15,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 MASTER_SITES=		http://openbsd.dead-parrot.de/distfiles/
 
-WANTLIB=		c m ${COMPILER_LIBCXX} termcap readline
+WANTLIB += ${COMPILER_LIBCXX} c curses m readline
 
 COMPILER =		base-clang ports-gcc base-gcc
 
diff --git a/math/foma/Makefile b/math/foma/Makefile
index c7eb29b7194..ee2b34a33c3 100644
--- a/math/foma/Makefile
+++ b/math/foma/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2017/08/22 19:25:52 jasper Exp $
+# $OpenBSD: Makefile,v 1.7 2019/05/17 16:19:39 sthen Exp $
 
 COMMENT =		finite-state compiler and C library
 
 DISTNAME =		foma-0.9.17
-REVISION =		0
+REVISION =		1
 
 SHARED_LIBS +=		foma                      0.1 # 0.9.16
 
@@ -14,7 +14,7 @@ HOMEPAGE =		https://bitbucket.org/mhulden/foma
 # Apache 2.0
 PERMIT_PACKAGE_CDROM =		Yes
 
-WANTLIB +=		c readline termcap z
+WANTLIB += c curses readline z
 
 MASTER_SITES =		https://bitbucket.org/mhulden/foma/downloads/
 
diff --git a/math/pspp/Makefile b/math/pspp/Makefile
index e8d5a2909c3..6037d8262f0 100644
--- a/math/pspp/Makefile
+++ b/math/pspp/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.2 2018/11/12 22:58:38 naddy Exp $
+# $OpenBSD: Makefile,v 1.3 2019/05/17 16:19:39 sthen Exp $
 
 COMMENT =	program for statistical analysis of sampled data
 DISTNAME =	pspp-1.2.0
-REVISION =	0
+REVISION =	1
 CATEGORIES =	math x11
 
 HOMEPAGE =	https://www.gnu.org/software/pspp/
@@ -11,15 +11,15 @@ MAINTAINER =	Brian Callahan <bcallah@openbsd.org>
 # GPLv3+
 PERMIT_PACKAGE_CDROM =	Yes
 
-WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
-WANTLIB += Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi c cairo
-WANTLIB += cairo-gobject crypto curses dbus-1 epoxy expat ffi
-WANTLIB += fontconfig freetype fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0
-WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gsl gslcblas
-WANTLIB += gthread-2.0 gtk-3 gtksourceview-3.0 harfbuzz iconv
-WANTLIB += intl lzma m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
-WANTLIB += pixman-1 png pq pthread readline spread-sheet-widget
-WANTLIB += ssl xcb xcb-render xcb-shm xml2 z
+WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama Xrandr
+WANTLIB += Xrender atk-1.0 atk-bridge-2.0 atspi c cairo cairo-gobject
+WANTLIB += crypto curses dbus-1 epoxy expat ffi fontconfig freetype
+WANTLIB += fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
+WANTLIB += gobject-2.0 graphite2 gsl gslcblas gthread-2.0 gtk-3
+WANTLIB += gtksourceview-3.0 harfbuzz iconv intl lzma m pango-1.0
+WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pq pthread
+WANTLIB += readline spread-sheet-widget ssl xcb xcb-render xcb-shm xml2
+WANTLIB += z
 
 MASTER_SITES =	${MASTER_SITE_GNU:=pspp/}
 
diff --git a/math/sc/Makefile b/math/sc/Makefile
index fc3e28d8a9f..38fa5514ac4 100644
--- a/math/sc/Makefile
+++ b/math/sc/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.19 2019/05/07 17:04:59 danj Exp $
+# $OpenBSD: Makefile,v 1.20 2019/05/17 16:19:39 sthen Exp $
 
 COMMENT=	curses spreadsheet-calculator program
 
 DISTNAME=	sc-7.16
-REVISION=	5
+REVISION=	6
 CATEGORIES=	math
 
 MASTER_SITES=	${MASTER_SITE_SUNSITE:=apps/financial/spreadsheet/}
@@ -11,7 +11,7 @@ MASTER_SITES=	${MASTER_SITE_SUNSITE:=apps/financial/spreadsheet/}
 # Public Domain
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB += c curses m termcap
+WANTLIB += c curses m
 
 NO_TEST=	Yes
 
diff --git a/math/wcalc/Makefile b/math/wcalc/Makefile
index 8d6ce7e9af6..2d9f09e574d 100644
--- a/math/wcalc/Makefile
+++ b/math/wcalc/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.10 2018/11/14 20:48:21 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2019/05/17 16:19:39 sthen Exp $
 # Original from: Kyle Wheeler <kyle@memoryhole.net>
 
 COMMENT =		natural-expression command-line calculator
 
 DISTNAME =		wcalc-2.5
-REVISION =		1
+REVISION =		2
 CATEGORIES =		math
 HOMEPAGE =		http://w-calc.sourceforge.net/
 MAINTAINER =		Amarendra Godbole <amarendra.godbole@gmail.com>
@@ -12,9 +12,10 @@ MAINTAINER =		Amarendra Godbole <amarendra.godbole@gmail.com>
 # GPLv2+
 PERMIT_PACKAGE_CDROM =	Yes
 
+WANTLIB += c curses gmp>=7 m mpfr>=0.2 readline
+
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=w-calc/}
 
-WANTLIB =		c m readline termcap gmp>=7 mpfr>=0.2
 LIB_DEPENDS =		devel/gmp devel/mpfr
 
 USE_GMAKE =		Yes
diff --git a/misc/dvtm/Makefile b/misc/dvtm/Makefile
index d7e69dc13b5..fe3264e12ed 100644
--- a/misc/dvtm/Makefile
+++ b/misc/dvtm/Makefile
@@ -1,16 +1,17 @@
-# $OpenBSD: Makefile,v 1.17 2016/04/27 13:22:41 jca Exp $
+# $OpenBSD: Makefile,v 1.18 2019/05/17 16:19:39 sthen Exp $
 
 COMMENT=		tiling window management for the console
 
 DISTNAME=		dvtm-0.15
 CATEGORIES=		misc
+REVISION=		0
 
 HOMEPAGE=		http://www.brain-dump.org/projects/dvtm/
 
 # MIT/X
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB= 		c ncursesw util
+WANTLIB += c curses util
 
 MASTER_SITES=		${HOMEPAGE}
 
diff --git a/misc/lifelines/Makefile b/misc/lifelines/Makefile
index 6c61495bef7..cca568cd644 100644
--- a/misc/lifelines/Makefile
+++ b/misc/lifelines/Makefile
@@ -1,17 +1,17 @@
-# $OpenBSD: Makefile,v 1.14 2016/04/12 15:19:40 naddy Exp $
+# $OpenBSD: Makefile,v 1.15 2019/05/17 16:19:40 sthen Exp $
 
 COMMENT=		genealogical database and programming system
 DISTNAME=		lifelines-3.0.62
 CATEGORIES=		misc
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=lifelines/}
-REVISION=		0
+REVISION=		1
 
 HOMEPAGE=		http://lifelines.sourceforge.net/
 
 # MIT
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB=		c iconv intl m ncursesw
+WANTLIB += c curses iconv intl m
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ENV+=		YACC="bison -y" \
diff --git a/misc/most/Makefile b/misc/most/Makefile
index 0845dfabbc2..db0087ffd8e 100644
--- a/misc/most/Makefile
+++ b/misc/most/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.21 2018/06/24 12:06:43 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.22 2019/05/17 16:19:40 sthen Exp $
 
 PORTROACH=	skipv:5.0.0
 
 COMMENT=	browse or page through a text file
 
 DISTNAME=	most-5.0.0a
-REVISION=	0
+REVISION=	1
 CATEGORIES=	misc
 
 MASTER_SITES=	ftp://space.mit.edu/pub/davis/most/
@@ -15,7 +15,7 @@ LIB_DEPENDS=	devel/libslang
 # GPLv2+
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB=	c m slang termcap
+WANTLIB += c curses m slang
 
 CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS=	--with-slang=${LOCALBASE}
diff --git a/multimedia/gstreamer-0.10/plugins-good/Makefile b/multimedia/gstreamer-0.10/plugins-good/Makefile
index a9f226d5e85..936e8f35d72 100644
--- a/multimedia/gstreamer-0.10/plugins-good/Makefile
+++ b/multimedia/gstreamer-0.10/plugins-good/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.110 2018/10/24 14:28:08 sthen Exp $
+# $OpenBSD: Makefile,v 1.111 2019/05/17 16:19:40 sthen Exp $
 
 # XXX ossaudio(3) is only enabled to be used as a mixing device by
 # audio/pulseaudio and x11/xfce4/xfce4-mixer
@@ -18,10 +18,10 @@ PKGNAME-dv=		gstreamer-dv-${V}
 PKGNAME-caca=		gstreamer-libcaca-${V}
 EPOCH-main=		0
 
-REVISION-main=		24
-REVISION-aalib=		12
+REVISION-main=		25
+REVISION-aalib=		13
+REVISION-caca=		13
 REVISION-dv=		12
-REVISION-caca=		12
 
 MULTI_PACKAGES=		-main -aalib -dv -caca
 
@@ -34,7 +34,7 @@ MODGCONF2_SCHEMAS_DIR=	gst-plugins
 WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 iconv intl lzma pthread
 WANTLIB += pcre xml2 m z gstreamer-0.10 gstbase-0.10 ffi
 
-WANTLIB-main += ${WANTLIB} ${MODGCONF2_WANTLIB}
+WANTLIB-main += ${WANTLIB} ${MODGCONF2_WANTLIB} ${COMPILER_LIBCXX}
 WANTLIB-main += FLAC ICE SM X11 Xdamage Xext Xfixes Xrender
 WANTLIB-main += Xv bz2 cairo cairo-gobject dbus-1 dbus-glib-1
 WANTLIB-main += expat execinfo fontconfig freetype gdk_pixbuf-2.0
@@ -43,14 +43,14 @@ WANTLIB-main += gstfft-0.10 gstinterfaces-0.10 gstnetbuffer-0.10 gstpbutils-0.10
 WANTLIB-main += gstriff-0.10 gstrtp-0.10 gstrtsp-0.10 gstsdp-0.10 gsttag-0.10
 WANTLIB-main += gstvideo-0.10 jpeg ogg orc-0.4 ossaudio pixman-1 png
 WANTLIB-main += shout sndio soup-2.4 soup-gnome-2.4 speex
-WANTLIB-main += sqlite3 ${COMPILER_LIBCXX} tag theora v4l2 v4lconvert vorbis wavpack
+WANTLIB-main += sqlite3 tag theora v4l2 v4lconvert vorbis wavpack
 WANTLIB-main += xcb xcb-render
 
 WANTLIB-aalib += ${WANTLIB}
-WANTLIB-aalib += X11 aa ncurses xcb
+WANTLIB-aalib += X11 aa curses xcb
 
 WANTLIB-caca += ${WANTLIB}
-WANTLIB-caca += X11 caca ncursesw xcb
+WANTLIB-caca += X11 caca curses xcb
 
 WANTLIB-dv += ${WANTLIB}
 WANTLIB-dv += dv gstaudio-0.10 gstinterfaces-0.10 gstpbutils-0.10
diff --git a/multimedia/vitunes/Makefile b/multimedia/vitunes/Makefile
index f4f0fdd8a91..9069d8f3c55 100755
--- a/multimedia/vitunes/Makefile
+++ b/multimedia/vitunes/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.12 2018/04/25 12:44:10 naddy Exp $
+# $OpenBSD: Makefile,v 1.13 2019/05/17 16:19:40 sthen Exp $
 
 COMMENT =		curses media indexer and player for vi users
 
 DISTNAME =		vitunes-2.3
-REVISION =		2
+REVISION =		3
 
 CATEGORIES =		multimedia
 
@@ -15,7 +15,7 @@ FIX_EXTRACT_PERMISSIONS=Yes
 # BSD
 PERMIT_PACKAGE_CDROM =	Yes
 
-WANTLIB =		c m ncursesw tag tag_c util
+WANTLIB += c curses m tag tag_c util
 
 LIB_DEPENDS =		audio/taglib
 RUN_DEPENDS =		x11/mplayer
diff --git a/net/cftp/Makefile b/net/cftp/Makefile
index 765223b4565..5bbdf3860ee 100644
--- a/net/cftp/Makefile
+++ b/net/cftp/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2014/10/28 22:25:45 sthen Exp $
+# $OpenBSD: Makefile,v 1.10 2019/05/17 16:19:40 sthen Exp $
 
 COMMENT=	full screen FTP client
 
 DISTNAME=	cftp-0.12
-REVISION=	2
+REVISION=	3
 CATEGORIES=	net
 
 HOMEPAGE=	http://nih.at/cftp/
@@ -13,7 +13,7 @@ MAINTAINER=	Josh Rivel <josh@rivels.org>
 # GPLv2+
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB=		c termcap
+WANTLIB += c curses
 
 MASTER_SITES=	${HOMEPAGE}
 
diff --git a/net/gopher/Makefile b/net/gopher/Makefile
index a1fdac8ab83..038b361d9ae 100644
--- a/net/gopher/Makefile
+++ b/net/gopher/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.9 2015/01/22 18:41:16 naddy Exp $
+# $OpenBSD: Makefile,v 1.10 2019/05/17 16:19:40 sthen Exp $
 
 COMMENT=	distributed document delivery client
 
 V=		3.0.11
 DISTNAME=	gopher_${V}
 PKGNAME=	gopher-${V}
-REVISION=	2
+REVISION=	3
 CATEGORIES=	net
 
 HOMEPAGE=	http://quux.org/devel/gopher/Downloads/
@@ -13,9 +13,10 @@ HOMEPAGE=	http://quux.org/devel/gopher/Downloads/
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
 
+WANTLIB += c curses m
+
 MASTER_SITES=	${HOMEPAGE}
 
-WANTLIB=	c m curses termcap
 
 USE_GMAKE=	Yes
 CONFIGURE_STYLE=gnu
diff --git a/net/irrtoolset/Makefile b/net/irrtoolset/Makefile
index dac8a34eb82..7df3e42dca5 100644
--- a/net/irrtoolset/Makefile
+++ b/net/irrtoolset/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2018/10/24 14:28:08 sthen Exp $
+# $OpenBSD: Makefile,v 1.8 2019/05/17 16:19:40 sthen Exp $
 
 COMMENT=	toolset for internet routing registries
 
 V=		5.0.1
-REVISION =	3
+REVISION=	4
 DISTNAME=	irrtoolset-$V
 
 CATEGORIES=	net
@@ -15,9 +15,9 @@ MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB += c m readline ${COMPILER_LIBCXX} termcap
+WANTLIB += ${COMPILER_LIBCXX} c curses m readline
 
-COMPILER =		base-clang ports-gcc base-gcc
+COMPILER =	base-clang ports-gcc base-gcc
 
 MASTER_SITES=	http://ftp.isc.org/isc/IRRToolSet/IRRToolSet-$V/ \
 		ftp://ftp.isc.org/isc/IRRToolSet/IRRToolSet-$V/
diff --git a/net/mcabber/Makefile b/net/mcabber/Makefile
index d3cc05a487c..6ec201cfe24 100644
--- a/net/mcabber/Makefile
+++ b/net/mcabber/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.35 2018/06/27 21:04:00 espie Exp $
+# $OpenBSD: Makefile,v 1.36 2019/05/17 16:19:40 sthen Exp $
 
 COMMENT=		console jabber client
 DISTNAME=		mcabber-1.1.0
 CATEGORIES=		net
-REVISION=		2
+REVISION=		3
 
 HOMEPAGE=		https://mcabber.com/
 
@@ -12,13 +12,13 @@ MAINTAINER=		Markus Hennecke <markus-hennecke@markus-hennecke.de>
 # GPLv2+ with SSL exemption
 PERMIT_PACKAGE_CDROM=	Yes
 
+WANTLIB += assuan c crypto curses gcrypt glib-2.0 gpg-error gpgme iconv
+WANTLIB += idn intl loudmouth-1>=3 otr panelw pcre pthread ssl
+
 MASTER_SITES=		${HOMEPAGE}/files/
 EXTRACT_SUFX=		.tar.bz2
 
 # uses pledge()
-WANTLIB += assuan c crypto gcrypt glib-2.0 gpg-error gpgme iconv
-WANTLIB += idn intl loudmouth-1>=3 ncursesw otr panelw pcre pthread
-WANTLIB += ssl
 
 LIB_DEPENDS=		devel/glib2 \
 			security/gpgme \
diff --git a/net/mosh/Makefile b/net/mosh/Makefile
index d7090468f6e..865f03306d0 100644
--- a/net/mosh/Makefile
+++ b/net/mosh/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.17 2019/02/05 13:27:25 jca Exp $
+# $OpenBSD: Makefile,v 1.18 2019/05/17 16:19:40 sthen Exp $
 
 COMMENT =		mobile shell
 
 DISTNAME =		mosh-1.3.2
-REVISION =		2
+REVISION =		3
 
 CATEGORIES =		net
 
@@ -15,8 +15,8 @@ MAINTAINER =		Jeremie Courreges-Anglas <jca@wxcvbn.org>
 PERMIT_PACKAGE_CDROM =	Yes
 
 # uses pledge()
-WANTLIB +=		c crypto m ncursesw protobuf pthread ssl ${COMPILER_LIBCXX} util
-WANTLIB +=		z
+WANTLIB +=		${COMPILER_LIBCXX} c crypto curses m protobuf
+WANTLIB +=		pthread ssl util z
 
 MASTER_SITES =		${HOMEPAGE}
 
diff --git a/net/ntp/Makefile b/net/ntp/Makefile
index bd83712e22c..2d2f52d9fb6 100644
--- a/net/ntp/Makefile
+++ b/net/ntp/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.77 2018/11/14 20:48:21 sthen Exp $
+# $OpenBSD: Makefile,v 1.78 2019/05/17 16:19:40 sthen Exp $
 
 COMMENT=	Network Time Protocol reference implementation
 
@@ -7,7 +7,7 @@ COMMENT=	Network Time Protocol reference implementation
 # 'pl' for local use.
 
 VERSION=	4.2.8p10
-REVISION=	4
+REVISION=	5
 DISTNAME=	ntp-${VERSION}
 PKGNAME=	ntp-${VERSION:S/p/pl/}
 CATEGORIES=	net
@@ -20,8 +20,7 @@ MASTER_SITES=	http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ \
 # modified ISC
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB += c crypto edit event_core event_pthreads
-WANTLIB += m pthread ssl termcap
+WANTLIB += c crypto curses edit event_core event_pthreads m pthread ssl
 
 # enabling SEPARATE_BUILD causes the parser to be rebuilt .y -> .c,
 # which requires bison
diff --git a/net/pidgin/Makefile b/net/pidgin/Makefile
index 3cc9455e777..10b358c5f3f 100644
--- a/net/pidgin/Makefile
+++ b/net/pidgin/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.142 2018/10/24 14:28:09 sthen Exp $
+# $OpenBSD: Makefile,v 1.143 2019/05/17 16:19:40 sthen Exp $
 
 COMMENT-main=	multi-protocol instant messaging client
 COMMENT-finch=	multi-protocol instant messaging client, console client
@@ -17,7 +17,7 @@ CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pidgin/}
 EXTRACT_SUFX=	.tar.bz2
 REVISION-main=	2
-REVISION-finch=	0
+REVISION-finch=	1
 REVISION-libpurple=0
 
 SHARED_LIBS=	jabber		0.0 \
@@ -45,7 +45,7 @@ WANTLIB-main=	X11 ICE SM Xcomposite Xcursor Xdamage Xext Xfixes Xi \
 		png purple ${COMPILER_LIBCXX} xcb-render xcb-shm xcb \
 		${WANTLIB}
 WANTLIB-libpurple= crypto meanwhile ssl silc silcclient ${WANTLIB}
-WANTLIB-finch=	X11 ncursesw panelw purple util xcb ${WANTLIB} \
+WANTLIB-finch=	X11 curses panelw purple util xcb ${WANTLIB} \
 		${MODPY_WANTLIB}
 
 MODULES=	textproc/intltool \
diff --git a/net/pktstat/Makefile b/net/pktstat/Makefile
index c357b8c6558..4ccc41a17b3 100644
--- a/net/pktstat/Makefile
+++ b/net/pktstat/Makefile
@@ -1,14 +1,14 @@
-# $OpenBSD: Makefile,v 1.19 2016/04/09 14:50:59 sthen Exp $
+# $OpenBSD: Makefile,v 1.20 2019/05/17 16:19:40 sthen Exp $
 
 COMMENT=		network traffic viewer
 DISTNAME=		pktstat-1.8.4
-REVISION=		4
+REVISION=		5
 CATEGORIES=		net
 
 # Public Domain
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB=		c m pcap termlib
+WANTLIB += c curses m pcap
 
 MASTER_SITES=		http://openbsd.fi/dist/
 
diff --git a/net/rtorrent/Makefile b/net/rtorrent/Makefile
index 1ff0f33e338..c21abc37db4 100644
--- a/net/rtorrent/Makefile
+++ b/net/rtorrent/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.65 2019/04/28 02:13:31 cwen Exp $
+# $OpenBSD: Makefile,v 1.66 2019/05/17 16:19:40 sthen Exp $
 
 COMMENT=		ncurses BitTorrent client based on libTorrent
 
 DISTNAME=		rtorrent-0.9.6
-REVISION=		7
+REVISION=		8
 EPOCH=			0
 CATEGORIES=		net
 
@@ -12,8 +12,8 @@ HOMEPAGE=		https://rakshasa.github.io/rtorrent/
 # GPLv2+
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB=		c crypto curl>=14 m ncursesw nghttp2 \
-			pthread ssl ${COMPILER_LIBCXX} torrent>=21 z
+WANTLIB += ${COMPILER_LIBCXX} c crypto curl curses m nghttp2 pthread
+WANTLIB += ssl torrent>=21 z
 
 COMPILER =		base-clang ports-gcc base-gcc
 
diff --git a/net/tinyfugue/Makefile b/net/tinyfugue/Makefile
index ac67ca554fd..c139be044ef 100644
--- a/net/tinyfugue/Makefile
+++ b/net/tinyfugue/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.28 2015/06/14 06:27:42 bentley Exp $
+# $OpenBSD: Makefile,v 1.29 2019/05/17 16:19:40 sthen Exp $
 
 COMMENT=	programmable MUD client, with macro support and more
 
 PKGNAME=	tinyfugue-4.0s1
-REVISION=	4
+REVISION=	5
 DISTNAME=	tf-40s1
 CATEGORIES=	net games
 
@@ -13,7 +13,8 @@ MAINTAINER=	Markus Lude <markus.lude@gmx.de>
 
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
-WANTLIB=		c m termcap z 
+
+WANTLIB += c curses m z
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tinyfugue/}
 
diff --git a/net/trafshow/Makefile b/net/trafshow/Makefile
index bf89aa32a0c..b1e4a145ff2 100644
--- a/net/trafshow/Makefile
+++ b/net/trafshow/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.24 2017/08/15 22:02:50 danj Exp $
+# $OpenBSD: Makefile,v 1.25 2019/05/17 16:19:40 sthen Exp $
 
 COMMENT=	full screen visualization of network traffic
 
 DISTNAME=	trafshow-3.1
-REVISION=	1
+REVISION=	2
 CATEGORIES=	net
 
 MASTER_SITES=	https://spacehopper.org/mirrors/ \
@@ -19,7 +19,7 @@ HOMEPAGE=	http://soft.risp.ru/trafshow/index_en.shtml
 
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB=		c ncurses pcap termcap
+WANTLIB += c curses pcap
 
 CONFIGURE_STYLE= gnu
 #CONFIGURE_ENV=	CPPFLAGS="-DINET6"
diff --git a/net/ysmv7/Makefile b/net/ysmv7/Makefile
index 4f939283b4a..19971df1ba4 100644
--- a/net/ysmv7/Makefile
+++ b/net/ysmv7/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.23 2018/11/14 20:48:21 sthen Exp $
+# $OpenBSD: Makefile,v 1.24 2019/05/17 16:19:40 sthen Exp $
 
 COMMENT=		ICQ console client with encryption support
 
 DISTNAME=		ysmv7_2_9_9_1
 PKGNAME=		${DISTNAME:S/_/-/:S/_/./g}
 CATEGORIES=		net
-REVISION=		1
+REVISION=		2
 
 HOMEPAGE=		http://ysmv7.sourceforge.net/
 
@@ -15,7 +15,8 @@ LIB_DEPENDS=		converters/libiconv
 
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
-WANTLIB=		c iconv pthread readline termcap
+
+WANTLIB += c curses iconv pthread readline
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/news/nn/Makefile b/news/nn/Makefile
index f070c50dc89..180d8e94235 100644
--- a/news/nn/Makefile
+++ b/news/nn/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.17 2019/05/03 13:45:29 danj Exp $
+# $OpenBSD: Makefile,v 1.18 2019/05/17 16:19:40 sthen Exp $
 
 COMMENT =		menu-based Usenet newsreader
 DISTNAME =		nn-6.7.3
-REVISION =		4
+REVISION =		5
 CATEGORIES =		news
 HOMEPAGE =		http://www.nndev.org
 
@@ -11,7 +11,7 @@ HOMEPAGE =		http://www.nndev.org
 PERMIT_PACKAGE_CDROM =	CDs not sold at cost
 PERMIT_PACKAGE_FTP =	Yes
 
-WANTLIB =		c termlib
+WANTLIB += c curses
 
 MASTER_SITES =		ftp://ftp.nndev.org/pub/nn-6.7/ \
                         https://distfiles.nl/
diff --git a/plan9/rc/Makefile b/plan9/rc/Makefile
index 99871258eae..1d0eb1f887f 100644
--- a/plan9/rc/Makefile
+++ b/plan9/rc/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.25 2016/04/05 22:54:46 jca Exp $
+# $OpenBSD: Makefile,v 1.26 2019/05/17 16:19:40 sthen Exp $
 
 COMMENT=	shell (clone of plan9 shell)
 
 DISTNAME=	rc-1.7.4
-REVISION=	0
+REVISION=	1
 CATEGORIES=	plan9 shells
 MASTER_SITES=	http://static.tobold.org/rc/
 
@@ -25,10 +25,10 @@ TEST_TARGET= trip
 
 .if ${FLAVOR} == "readline"
 CONFIGURE_ARGS+= --with-edit=readline
-WANTLIB+=		readline termcap
+WANTLIB+=		curses readline
 .elif ${FLAVOR} == "editline"
 CONFIGURE_ARGS+= --with-edit=edit
-WANTLIB += edit termcap
+WANTLIB += curses edit
 .endif
 
 .include <bsd.port.mk>
diff --git a/productivity/siag/Makefile b/productivity/siag/Makefile
index f79a041c98a..1eb763a1199 100644
--- a/productivity/siag/Makefile
+++ b/productivity/siag/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.18 2017/05/08 09:55:26 schwarze Exp $
+# $OpenBSD: Makefile,v 1.19 2019/05/17 16:19:40 sthen Exp $
 
 COMMENT=		tightly integrated, free office package
 
 VERSION=		3.6.1
 DISTNAME=		siag-${VERSION}
-REVISION=		5
+REVISION=		6
 CATEGORIES=		productivity x11
 
 HOMEPAGE=		http://siag.nu/
@@ -12,8 +12,7 @@ HOMEPAGE=		http://siag.nu/
 # GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB += ICE Mowitz SM X11 Xext Xmu Xpm Xt c m ncurses neXtaw
-WANTLIB += termcap
+WANTLIB += ICE Mowitz SM X11 Xext Xmu Xpm Xt c curses m neXtaw
 
 MASTER_SITES=		${HOMEPAGE}/pub/siag/
 
diff --git a/productivity/tdl/Makefile b/productivity/tdl/Makefile
index f10f8974e08..1e0120d91e4 100644
--- a/productivity/tdl/Makefile
+++ b/productivity/tdl/Makefile
@@ -1,20 +1,21 @@
-# $OpenBSD: Makefile,v 1.10 2019/05/06 19:51:38 danj Exp $
+# $OpenBSD: Makefile,v 1.11 2019/05/17 16:19:40 sthen Exp $
 
 COMMENT=	to-do list manager
 
 DISTNAME=	tdl-1.5.2
-REVISION=	4
+REVISION=	5
 CATEGORIES=	productivity
 
 MASTER_SITES=	http://www.rpcurnow.force9.co.uk/tdl/
 
 HOMEPAGE=	http://www.rc0.org.uk/tdl/
 
-WANTLIB=	c readline termcap
 
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
 
+WANTLIB += c curses readline
+
 CONFIGURE_STYLE= simple
 
 NO_TEST=	Yes
diff --git a/productivity/tudu/Makefile b/productivity/tudu/Makefile
index a57dde69cea..e37779fa697 100644
--- a/productivity/tudu/Makefile
+++ b/productivity/tudu/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2019/01/18 09:00:15 fcambus Exp $
+# $OpenBSD: Makefile,v 1.7 2019/05/17 16:19:40 sthen Exp $
 
 COMMENT =	hierarchical todos manager
 
 DISTNAME =	tudu-0.10.2
-REVISION =	3
+REVISION =	4
 
 CATEGORIES =	productivity
 
@@ -14,7 +14,7 @@ MAINTAINER =	Frederic Cambus <fcambus@openbsd.org>
 # GPLv3 only
 PERMIT_PACKAGE_CDROM =	Yes
 
-WANTLIB +=	c m ncursesw ${COMPILER_LIBCXX}
+WANTLIB +=	${COMPILER_LIBCXX} c m curses
 
 COMPILER =		base-clang ports-gcc base-gcc
 
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 586a1a6d12c..3ec1c785690 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.111 2018/11/14 20:48:22 sthen Exp $
+# $OpenBSD: Makefile,v 1.112 2019/05/17 16:19:41 sthen Exp $
 
 COMMENT=	GNU privacy guard - a free PGP replacement
 
 DISTNAME=	gnupg-1.4.23
-REVISION=	1
+REVISION=	2
 CATEGORIES=	security
 
 # restrict, not compatible with gnupg-2.
@@ -18,8 +18,7 @@ MAINTAINER=	Jeremie Courreges-Anglas <jca@wxcvbn.org>
 # GPLv3
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB += bz2 c crypto curl iconv intl nghttp2 readline ssl
-WANTLIB += termcap z
+WANTLIB += bz2 c crypto curses curl iconv intl nghttp2 readline ssl z
 
 LIB_DEPENDS=	archivers/bzip2 \
 		devel/gettext \
diff --git a/security/nfsshell/Makefile b/security/nfsshell/Makefile
index 472f0d7feab..74cb0ba8f51 100644
--- a/security/nfsshell/Makefile
+++ b/security/nfsshell/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.18 2013/03/11 11:41:26 espie Exp $
+# $OpenBSD: Makefile,v 1.19 2019/05/17 16:19:41 sthen Exp $
 
 COMMENT=	NFS auditing tool
 
 PKGNAME=	nfsshell-1.0
-REVISION =	1
+REVISION =	2
 DISTNAME=	nfsshell
 CATEGORIES=	security
 
@@ -14,7 +14,7 @@ MASTER_SITES=	ftp://ftp.cs.vu.nl/pub/leendert/
 PERMIT_PACKAGE_CDROM=	no obvious license
 PERMIT_PACKAGE_FTP=	Yes
 
-WANTLIB=		c readline termcap
+WANTLIB += c curses readline
 
 ALL_TARGET=	nfs
 
diff --git a/shells/nsh/Makefile b/shells/nsh/Makefile
index 0ffe0b5dce2..c16839b7b5f 100644
--- a/shells/nsh/Makefile
+++ b/shells/nsh/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.35 2017/11/27 22:03:24 sthen Exp $
+# $OpenBSD: Makefile,v 1.36 2019/05/17 16:19:41 sthen Exp $
 
 COMMENT =	network switch style shell
 
 DISTNAME =	nsh-1.0.20170819
+REVISION =	0
 
 GH_ACCOUNT =	yellowman
 GH_PROJECT =	nsh
@@ -14,7 +15,7 @@ HOMEPAGE =	http://www.nmedia.net/nsh/
 # 3 & 2 clause BSD
 PERMIT_PACKAGE_CDROM =	Yes
 
-WANTLIB += c edit termcap sqlite3
+WANTLIB += c curses edit sqlite3
 
 FLAVORS =	static
 FLAVOR ?=
diff --git a/sysutils/shmux/Makefile b/sysutils/shmux/Makefile
index 3f6caca0015..ad08cc6d365 100644
--- a/sysutils/shmux/Makefile
+++ b/sysutils/shmux/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2015/01/22 18:41:16 naddy Exp $
+# $OpenBSD: Makefile,v 1.7 2019/05/17 16:19:41 sthen Exp $
 
 COMMENT=		execute a command on many hosts in parallel
 
@@ -7,13 +7,15 @@ CATEGORIES=		sysutils
 HOMEPAGE=		http://web.taranis.org/shmux/
 MASTER_SITES=		${HOMEPAGE}dist/
 EXTRACT_SUFX=		.tgz
+REVISION=		0
 
 # XXX N.B. if adding patches: redistributing modified versions
 # is not permitted.  See LICENSE, it has an important restriction
 # on top of what at first glance looks like a typical BSD license.
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB=		c termcap pcre
+WANTLIB += c curses pcre
+
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/sysutils/testdisk/Makefile b/sysutils/testdisk/Makefile
index 5f39f9dbacc..d8287fb6ef6 100644
--- a/sysutils/testdisk/Makefile
+++ b/sysutils/testdisk/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.17 2016/09/13 18:52:05 naddy Exp $
+# $OpenBSD: Makefile,v 1.18 2019/05/17 16:19:41 sthen Exp $
 
 COMMENT =	data recovery software
 
 VERSION =	7.0
 DISTNAME =	testdisk-${VERSION}
 CATEGORIES =	sysutils
+REVISION =	0
 
 HOMEPAGE =	http://www.cgsecurity.org/
 MASTER_SITES =	${HOMEPAGE}
@@ -15,6 +16,8 @@ MAINTAINER =	Landry Breuil <landry@openbsd.org>
 # GPLv2
 PERMIT_PACKAGE_CDROM =	Yes
 
+WANTLIB += c com_err curses ext2fs iconv jpeg ntfs-3g uuid z
+
 SUBST_VARS +=		VERSION
 
 CONFIGURE_STYLE =	gnu
@@ -27,7 +30,6 @@ LIB_DEPENDS =		converters/libiconv \
 			sysutils/ntfs-3g \
 			graphics/jpeg
 
-WANTLIB =		c com_err iconv uuid ext2fs jpeg ncursesw ntfs-3g z
 
 post-install:
 			${INSTALL_DATA} ${WRKSRC}/documentation.html ${PREFIX}/share/doc/testdisk/
diff --git a/textproc/aspell/core/Makefile b/textproc/aspell/core/Makefile
index c1a8b00403a..f1f21620b77 100644
--- a/textproc/aspell/core/Makefile
+++ b/textproc/aspell/core/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.43 2018/11/15 21:12:45 bcallah Exp $
+# $OpenBSD: Makefile,v 1.44 2019/05/17 16:19:41 sthen Exp $
 
 COMMENT=	spell checker designed to eventually replace Ispell
 
 DISTNAME=	aspell-0.60.6.1
-REVISION=	8
+REVISION=	9
 SHARED_LIBS +=  aspell               17.0     # .16.4
 SHARED_LIBS +=  pspell               17.0     # .16.4
 DIST_SUBDIR=	aspell
@@ -22,7 +22,7 @@ HOMEPAGE=	http://aspell.net/
 # LGPLv2.1
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB=		c iconv intl m ncursesw pthread ${COMPILER_LIBCXX}
+WANTLIB=		c iconv intl m curses pthread ${COMPILER_LIBCXX}
 
 COMPILER =		base-clang ports-gcc base-gcc
 
diff --git a/textproc/hgrep/Makefile b/textproc/hgrep/Makefile
index c70c1650e7f..5c837d81cda 100644
--- a/textproc/hgrep/Makefile
+++ b/textproc/hgrep/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.10 2014/01/01 20:46:29 naddy Exp $
+# $OpenBSD: Makefile,v 1.11 2019/05/17 16:19:41 sthen Exp $
 
 COMMENT=		grep wrapper with search highlighting
 
 DISTNAME=		hgrep-19991004
-REVISION =		0
+REVISION =		1
 CATEGORIES=		textproc
 
 HOMEPAGE=		http://www.acme.com/software/hgrep/
@@ -12,7 +12,8 @@ MAINTAINER=		Nick Nauwelaerts <nick@nauwelaerts.net>
 
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes
-WANTLIB=		c termcap 
+
+WANTLIB += c curses
 
 MASTER_SITES=		${HOMEPAGE}
 DISTFILES=		hgrep_04oct1999.tar.gz
diff --git a/textproc/ispell/Makefile b/textproc/ispell/Makefile
index 2584152ec67..fae6100628b 100644
--- a/textproc/ispell/Makefile
+++ b/textproc/ispell/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.67 2018/09/04 12:46:24 espie Exp $
+# $OpenBSD: Makefile,v 1.68 2019/05/17 16:19:41 sthen Exp $
 
 COMMENT-main=		interactive spelling checker
 COMMENT-dutch=		ispell dictionary for Dutch
@@ -9,11 +9,19 @@ COMMENT-portuguese=	ispell dictionary for Portuguese
 COMMENT-slovak=		ispell dictionary for Slovak
 COMMENT-spanish=	ispell dictionary for Spanish
 COMMENT-swedish=	ispell dictionary for Swedish
+REVISION-dutch=		0
+REVISION-french=	0
+REVISION-german=	0
+REVISION-portuguese=	0
+REVISION-russian=	0
+REVISION-slovak=	0
+REVISION-spanish=	0
+REVISION-swedish=	0
 
 VERSION=	3.4.00
 DISTNAME=	ispell-${VERSION}
 PKGNAME-main=	${DISTNAME}
-REVISION-main=	1
+REVISION-main=	2
 
 CATEGORIES=	textproc
 
@@ -66,11 +74,16 @@ MULTI_PACKAGES=	-main -dutch -french -german -swedish -russian -portuguese \
 # dictionaries: GPL or BSD-like
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB-main=		c ncursesw
 
 PERMIT_PACKAGE_CDROM-german=	no license
 PERMIT_PACKAGE_FTP-german=	no license
 
+WANTLIB += curses
+
+WANTLIB-main += c curses
+
+WANTLIB-german += curses
+
 RUN_DEPENDS=	textproc/ispell
 RUN_DEPENDS-main=
 
diff --git a/textproc/wdiff/Makefile b/textproc/wdiff/Makefile
index f80ae678c3c..60aa200c8c0 100644
--- a/textproc/wdiff/Makefile
+++ b/textproc/wdiff/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.32 2016/04/12 15:19:40 naddy Exp $
+# $OpenBSD: Makefile,v 1.33 2019/05/17 16:19:41 sthen Exp $
 
 COMMENT=	word differences between text files
 
@@ -6,12 +6,12 @@ DISTNAME=	wdiff-1.2.2
 CATEGORIES=	textproc
 HOMEPAGE=	https://www.gnu.org/software/wdiff
 MASTER_SITES=	${MASTER_SITE_GNU:=wdiff/}
-REVISION=	0
+REVISION=	1
 
 # GPLv3+
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB=		c iconv intl termcap
+WANTLIB += c curses iconv intl
 
 LIB_DEPENDS=		devel/gettext
 TEST_DEPENDS=	misc/screen
diff --git a/www/canto/Makefile b/www/canto/Makefile
index 97144c27a0d..a738104aa02 100644
--- a/www/canto/Makefile
+++ b/www/canto/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.7 2015/08/12 22:27:31 sthen Exp $
+# $OpenBSD: Makefile,v 1.8 2019/05/17 16:19:41 sthen Exp $
 
 COMMENT =	ncurses Atom/RSS newsreader for the console
 DISTNAME =	canto-0.7.10
-REVISION =	4
+REVISION =	5
 CATEGORIES =	www
 
 MASTER_SITES =	http://codezen.org/static/
@@ -11,7 +11,8 @@ HOMEPAGE =	http://codezen.org/canto/
 # GPLv2
 PERMIT_PACKAGE_CDROM =	Yes
 
-WANTLIB +=	ncursesw pthread ${MODPY_WANTLIB}
+WANTLIB += ${MODPY_WANTLIB}
+WANTLIB += curses pthread
 
 MODULES =	lang/python
 
diff --git a/x11/fvwm2/Makefile b/x11/fvwm2/Makefile
index ec3a966228d..b37574371a3 100644
--- a/x11/fvwm2/Makefile
+++ b/x11/fvwm2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.64 2019/05/07 17:04:59 danj Exp $
+# $OpenBSD: Makefile,v 1.65 2019/05/17 16:19:41 sthen Exp $
 
 COMMENT-main=	multiple virtual desktop window manager, with icons
 COMMENT-fvicons=multiple virtual desktop window manager icons
@@ -9,8 +9,8 @@ DISTNAME=	fvwm-${VERSION}
 PKGNAME-main=	fvwm2+fvicons-${VERSION}
 FULLPKGNAME-fvicons=fvicons-${VERSION}
 PKGNAME-fvwm2=	fvwm2-${VERSION}
-REVISION=	4
-REVISION-fvicons=2
+REVISION=	5
+REVISION-fvicons=3
 
 CATEGORIES=     x11
 
@@ -21,10 +21,9 @@ HOMEPAGE=	http://www.fvwm.org/
 # GPL/BSD-like (badly worded)
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB += ICE SM X11 Xcursor Xext Xft Xinerama Xpm Xrender
-WANTLIB += c cairo fontconfig freetype gdk_pixbuf-2.0 gio-2.0
-WANTLIB += glib-2.0 gobject-2.0 iconv intl m png
-WANTLIB += readline rsvg-2 termcap z
+WANTLIB += curses
+
+WANTLIB-fvicons = # no-arch package
 
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/
 
@@ -44,7 +43,6 @@ CONFIGURE_ARGS+= --enable-debug-msgs
 
 PKG_ARCH-fvicons=	*
 LIB_DEPENDS-fvicons=
-WANTLIB-fvicons=
 FULLPKGPATH-fvicons=	${PKGPATH},-fvicons
 
 SUBST_VARS=	VERSION