22 files changed, 524 insertions, 446 deletions

diff --git a/MOVED b/MOVED
index 712062220d4f..13778b450b0d 100644
--- a/MOVED
+++ b/MOVED
@@ -9600,3 +9600,5 @@ lang/fpc-tcl||2017-10-20|Has expired: This port depends on Tcl/Tk 8.4 , which is
 net/asterisk11|net/asterisk13|2017-10-28|Has expired: Asterisk 11.x will reach EOL on 2017-10-25. Please migrate to net/asterisk13
 lang/gcc5-aux|lang/gcc6-aux|2017-11-01|Has expired: Essentially unmaintained and replaced by gcc6-aux
 textproc/rubygem-rouge1|textproc/rubygem-rouge|2017-11-01|Has expired: Use textproc/rubygem-rouge instead
+devel/linux-c6-ncurses-base||2017-11-01|Merged into emulators/linux_base-c6
+devel/linux-c7-ncurses-base||2017-11-01|Merged into emulators/linux_base-c7
diff --git a/Mk/Uses/linux.mk b/Mk/Uses/linux.mk
index ac848b629aed..18035e7803bb 100644
--- a/Mk/Uses/linux.mk
+++ b/Mk/Uses/linux.mk
@@ -114,7 +114,6 @@ linux_libvorbis_DEP=		linux-${linux_ARGS}-libvorbis>0:audio/linux-${linux_ARGS}-
 linux_libxml2_DEP=		linux-${linux_ARGS}-libxml2>0:textproc/linux-${linux_ARGS}-libxml2
 linux_mikmod_DEP=		linux-${linux_ARGS}-libmikmod>0:audio/linux-${linux_ARGS}-mikmod
 linux_naslibs_DEP=		linux-${linux_ARGS}-nas>0:audio/linux-${linux_ARGS}-nas-libs
-linux_ncurses-base_DEP=		linux-${linux_ARGS}-ncurses-base>0:devel/linux-${linux_ARGS}-ncurses-base
 linux_nettle_DEP=		linux-${linux_ARGS}-nettle>0:security/linux-${linux_ARGS}-nettle
 linux_nspr_DEP=			linux-${linux_ARGS}-nspr>0:devel/linux-${linux_ARGS}-nspr
 linux_nss_DEP=			linux-${linux_ARGS}-nss>0:security/linux-${linux_ARGS}-nss
diff --git a/devel/Makefile b/devel/Makefile
index f12abb5fedc1..04ac41b7a3d2 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1596,7 +1596,6 @@
     SUBDIR += linux-c6-libsigc++20
     SUBDIR += linux-c6-libsoup
     SUBDIR += linux-c6-libthai
-    SUBDIR += linux-c6-ncurses-base
     SUBDIR += linux-c6-nspr
     SUBDIR += linux-c6-qt47
     SUBDIR += linux-c6-sdl12
@@ -1609,7 +1608,6 @@
     SUBDIR += linux-c7-libpciaccess
     SUBDIR += linux-c7-libsigc++20
     SUBDIR += linux-c7-libthai
-    SUBDIR += linux-c7-ncurses-base
     SUBDIR += linux-c7-nspr
     SUBDIR += linux-c7-qt
     SUBDIR += linux-c7-sdl12
diff --git a/devel/linux-c6-ncurses-base/Makefile b/devel/linux-c6-ncurses-base/Makefile
deleted file mode 100644
index d58fc4fd8240..000000000000
--- a/devel/linux-c6-ncurses-base/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# Created by: Johannes Meixner <johannes@perceivon.net>
-# $FreeBSD$
-
-PORTNAME=	ncurses
-PORTVERSION=	5.7
-PORTREVISION=	4
-CATEGORIES=	devel linux
-PKGNAMESUFFIX=	-base
-BIN_DISTNAMES=	${LINUXNAME}-${DISTVERSIONFULL}
-
-MAINTAINER=	emulation@FreeBSD.org
-COMMENT=	Terminfo database required by Linux ncurses programs
-
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-LINUXNAME=	${PORTNAME}${PKGNAMESUFFIX}
-RPMVERSION=	4.20090207.el6
-USES=		linux:c6
-USE_LINUX_RPM=	nolib
-
-.include <bsd.port.mk>
diff --git a/devel/linux-c6-ncurses-base/distinfo b/devel/linux-c6-ncurses-base/distinfo
deleted file mode 100644
index 022a917222db..000000000000
--- a/devel/linux-c6-ncurses-base/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1485516555
-SHA256 (centos/ncurses-base-5.7-4.20090207.el6.i686.rpm) = 5811c992ccefadbecbdf3b9091b1971e2e80cbd47eb8b7a1bd307d80a86f67ca
-SIZE (centos/ncurses-base-5.7-4.20090207.el6.i686.rpm) = 62504
-SHA256 (centos/ncurses-base-5.7-4.20090207.el6.x86_64.rpm) = 6254a095635de3984d426f5a133d0e961a94decd4a0018bb1a9921e51232f7dc
-SIZE (centos/ncurses-base-5.7-4.20090207.el6.x86_64.rpm) = 62472
-SHA256 (centos/ncurses-5.7-4.20090207.el6.src.rpm) = f60edf25d3cc6e9cf6f9a590a869d351ceb6cae161abf3102939c678be421f55
-SIZE (centos/ncurses-5.7-4.20090207.el6.src.rpm) = 2647744
diff --git a/devel/linux-c6-ncurses-base/pkg-plist.amd64 b/devel/linux-c6-ncurses-base/pkg-plist.amd64
deleted file mode 100644
index 131aca52c863..000000000000
--- a/devel/linux-c6-ncurses-base/pkg-plist.amd64
+++ /dev/null
@@ -1,127 +0,0 @@
-usr/lib/terminfo/a/ansi
-usr/lib/terminfo/d/dumb
-usr/lib/terminfo/l/linux
-usr/lib/terminfo/v/vt100
-usr/lib/terminfo/v/vt100-am
-usr/lib/terminfo/v/vt100-nav
-usr/lib/terminfo/v/vt102
-usr/lib/terminfo/v/vt200
-usr/lib/terminfo/v/vt220
-usr/lib/terminfo/v/vt52
-usr/share/tabset/std
-usr/share/tabset/stdcrt
-usr/share/tabset/vt100
-usr/share/tabset/vt300
-usr/share/terminfo/A/Apple_Terminal
-usr/share/terminfo/E/Eterm
-usr/share/terminfo/E/Eterm-256color
-usr/share/terminfo/E/Eterm-88color
-usr/share/terminfo/E/Eterm-color
-usr/share/terminfo/a/ansi
-usr/share/terminfo/a/ansi80x25
-usr/share/terminfo/a/ansis
-usr/share/terminfo/a/aterm
-usr/share/terminfo/c/cons25
-usr/share/terminfo/c/cygwin
-usr/share/terminfo/d/dumb
-usr/share/terminfo/e/eterm
-usr/share/terminfo/e/eterm-color
-usr/share/terminfo/g/gnome
-usr/share/terminfo/g/gnome-256color
-usr/share/terminfo/h/hurd
-usr/share/terminfo/j/jfbterm
-usr/share/terminfo/k/kon
-usr/share/terminfo/k/kon2
-usr/share/terminfo/k/konsole
-usr/share/terminfo/k/konsole-256color
-usr/share/terminfo/l/linux
-usr/share/terminfo/m/mach
-usr/share/terminfo/m/mach-bold
-usr/share/terminfo/m/mach-color
-usr/share/terminfo/m/mlterm
-usr/share/terminfo/m/mrxvt
-usr/share/terminfo/n/nsterm
-usr/share/terminfo/n/nxterm
-usr/share/terminfo/p/pcansi
-usr/share/terminfo/p/putty
-usr/share/terminfo/p/putty-256color
-usr/share/terminfo/p/putty-vt100
-usr/share/terminfo/r/rxvt
-usr/share/terminfo/r/rxvt-16color
-usr/share/terminfo/r/rxvt-256color
-usr/share/terminfo/r/rxvt-88color
-usr/share/terminfo/r/rxvt-basic
-usr/share/terminfo/r/rxvt-color
-usr/share/terminfo/r/rxvt-cygwin
-usr/share/terminfo/r/rxvt-cygwin-native
-usr/share/terminfo/r/rxvt-unicode
-usr/share/terminfo/r/rxvt-xpm
-usr/share/terminfo/s/screen
-usr/share/terminfo/s/screen-16color
-usr/share/terminfo/s/screen-16color-bce
-usr/share/terminfo/s/screen-16color-bce-s
-usr/share/terminfo/s/screen-16color-s
-usr/share/terminfo/s/screen-256color
-usr/share/terminfo/s/screen-256color-bce
-usr/share/terminfo/s/screen-256color-bce-s
-usr/share/terminfo/s/screen-256color-s
-usr/share/terminfo/s/screen-bce
-usr/share/terminfo/s/screen-s
-usr/share/terminfo/s/screen-w
-usr/share/terminfo/s/screen.Eterm
-usr/share/terminfo/s/screen.linux
-usr/share/terminfo/s/screen.mlterm
-usr/share/terminfo/s/screen.rxvt
-usr/share/terminfo/s/screen.teraterm
-usr/share/terminfo/s/screen.xterm-new
-usr/share/terminfo/s/screen.xterm-r6
-usr/share/terminfo/s/screen.xterm-xfree86
-usr/share/terminfo/s/sun
-usr/share/terminfo/s/sun1
-usr/share/terminfo/s/sun2
-usr/share/terminfo/t/teraterm
-usr/share/terminfo/t/teraterm2.3
-usr/share/terminfo/v/vs100
-usr/share/terminfo/v/vt100
-usr/share/terminfo/v/vt100-am
-usr/share/terminfo/v/vt100-nav
-usr/share/terminfo/v/vt102
-usr/share/terminfo/v/vt200
-usr/share/terminfo/v/vt220
-usr/share/terminfo/v/vt52
-usr/share/terminfo/w/wsvt25
-usr/share/terminfo/w/wsvt25m
-usr/share/terminfo/x/xfce
-usr/share/terminfo/x/xterm
-usr/share/terminfo/x/xterm-1002
-usr/share/terminfo/x/xterm-1003
-usr/share/terminfo/x/xterm-16color
-usr/share/terminfo/x/xterm-24
-usr/share/terminfo/x/xterm-256color
-usr/share/terminfo/x/xterm-88color
-usr/share/terminfo/x/xterm-8bit
-usr/share/terminfo/x/xterm-basic
-usr/share/terminfo/x/xterm-bold
-usr/share/terminfo/x/xterm-color
-usr/share/terminfo/x/xterm-hp
-usr/share/terminfo/x/xterm-new
-usr/share/terminfo/x/xterm-nic
-usr/share/terminfo/x/xterm-noapp
-usr/share/terminfo/x/xterm-old
-usr/share/terminfo/x/xterm-pcolor
-usr/share/terminfo/x/xterm-r5
-usr/share/terminfo/x/xterm-r6
-usr/share/terminfo/x/xterm-sco
-usr/share/terminfo/x/xterm-sun
-usr/share/terminfo/x/xterm-vt220
-usr/share/terminfo/x/xterm-vt52
-usr/share/terminfo/x/xterm-xf86-v32
-usr/share/terminfo/x/xterm-xf86-v33
-usr/share/terminfo/x/xterm-xf86-v333
-usr/share/terminfo/x/xterm-xf86-v40
-usr/share/terminfo/x/xterm-xf86-v43
-usr/share/terminfo/x/xterm-xf86-v44
-usr/share/terminfo/x/xterm-xfree86
-usr/share/terminfo/x/xterm-xi
-usr/share/terminfo/x/xterms
-@dir etc/terminfo
diff --git a/devel/linux-c6-ncurses-base/pkg-plist.i386 b/devel/linux-c6-ncurses-base/pkg-plist.i386
deleted file mode 100644
index 131aca52c863..000000000000
--- a/devel/linux-c6-ncurses-base/pkg-plist.i386
+++ /dev/null
@@ -1,127 +0,0 @@
-usr/lib/terminfo/a/ansi
-usr/lib/terminfo/d/dumb
-usr/lib/terminfo/l/linux
-usr/lib/terminfo/v/vt100
-usr/lib/terminfo/v/vt100-am
-usr/lib/terminfo/v/vt100-nav
-usr/lib/terminfo/v/vt102
-usr/lib/terminfo/v/vt200
-usr/lib/terminfo/v/vt220
-usr/lib/terminfo/v/vt52
-usr/share/tabset/std
-usr/share/tabset/stdcrt
-usr/share/tabset/vt100
-usr/share/tabset/vt300
-usr/share/terminfo/A/Apple_Terminal
-usr/share/terminfo/E/Eterm
-usr/share/terminfo/E/Eterm-256color
-usr/share/terminfo/E/Eterm-88color
-usr/share/terminfo/E/Eterm-color
-usr/share/terminfo/a/ansi
-usr/share/terminfo/a/ansi80x25
-usr/share/terminfo/a/ansis
-usr/share/terminfo/a/aterm
-usr/share/terminfo/c/cons25
-usr/share/terminfo/c/cygwin
-usr/share/terminfo/d/dumb
-usr/share/terminfo/e/eterm
-usr/share/terminfo/e/eterm-color
-usr/share/terminfo/g/gnome
-usr/share/terminfo/g/gnome-256color
-usr/share/terminfo/h/hurd
-usr/share/terminfo/j/jfbterm
-usr/share/terminfo/k/kon
-usr/share/terminfo/k/kon2
-usr/share/terminfo/k/konsole
-usr/share/terminfo/k/konsole-256color
-usr/share/terminfo/l/linux
-usr/share/terminfo/m/mach
-usr/share/terminfo/m/mach-bold
-usr/share/terminfo/m/mach-color
-usr/share/terminfo/m/mlterm
-usr/share/terminfo/m/mrxvt
-usr/share/terminfo/n/nsterm
-usr/share/terminfo/n/nxterm
-usr/share/terminfo/p/pcansi
-usr/share/terminfo/p/putty
-usr/share/terminfo/p/putty-256color
-usr/share/terminfo/p/putty-vt100
-usr/share/terminfo/r/rxvt
-usr/share/terminfo/r/rxvt-16color
-usr/share/terminfo/r/rxvt-256color
-usr/share/terminfo/r/rxvt-88color
-usr/share/terminfo/r/rxvt-basic
-usr/share/terminfo/r/rxvt-color
-usr/share/terminfo/r/rxvt-cygwin
-usr/share/terminfo/r/rxvt-cygwin-native
-usr/share/terminfo/r/rxvt-unicode
-usr/share/terminfo/r/rxvt-xpm
-usr/share/terminfo/s/screen
-usr/share/terminfo/s/screen-16color
-usr/share/terminfo/s/screen-16color-bce
-usr/share/terminfo/s/screen-16color-bce-s
-usr/share/terminfo/s/screen-16color-s
-usr/share/terminfo/s/screen-256color
-usr/share/terminfo/s/screen-256color-bce
-usr/share/terminfo/s/screen-256color-bce-s
-usr/share/terminfo/s/screen-256color-s
-usr/share/terminfo/s/screen-bce
-usr/share/terminfo/s/screen-s
-usr/share/terminfo/s/screen-w
-usr/share/terminfo/s/screen.Eterm
-usr/share/terminfo/s/screen.linux
-usr/share/terminfo/s/screen.mlterm
-usr/share/terminfo/s/screen.rxvt
-usr/share/terminfo/s/screen.teraterm
-usr/share/terminfo/s/screen.xterm-new
-usr/share/terminfo/s/screen.xterm-r6
-usr/share/terminfo/s/screen.xterm-xfree86
-usr/share/terminfo/s/sun
-usr/share/terminfo/s/sun1
-usr/share/terminfo/s/sun2
-usr/share/terminfo/t/teraterm
-usr/share/terminfo/t/teraterm2.3
-usr/share/terminfo/v/vs100
-usr/share/terminfo/v/vt100
-usr/share/terminfo/v/vt100-am
-usr/share/terminfo/v/vt100-nav
-usr/share/terminfo/v/vt102
-usr/share/terminfo/v/vt200
-usr/share/terminfo/v/vt220
-usr/share/terminfo/v/vt52
-usr/share/terminfo/w/wsvt25
-usr/share/terminfo/w/wsvt25m
-usr/share/terminfo/x/xfce
-usr/share/terminfo/x/xterm
-usr/share/terminfo/x/xterm-1002
-usr/share/terminfo/x/xterm-1003
-usr/share/terminfo/x/xterm-16color
-usr/share/terminfo/x/xterm-24
-usr/share/terminfo/x/xterm-256color
-usr/share/terminfo/x/xterm-88color
-usr/share/terminfo/x/xterm-8bit
-usr/share/terminfo/x/xterm-basic
-usr/share/terminfo/x/xterm-bold
-usr/share/terminfo/x/xterm-color
-usr/share/terminfo/x/xterm-hp
-usr/share/terminfo/x/xterm-new
-usr/share/terminfo/x/xterm-nic
-usr/share/terminfo/x/xterm-noapp
-usr/share/terminfo/x/xterm-old
-usr/share/terminfo/x/xterm-pcolor
-usr/share/terminfo/x/xterm-r5
-usr/share/terminfo/x/xterm-r6
-usr/share/terminfo/x/xterm-sco
-usr/share/terminfo/x/xterm-sun
-usr/share/terminfo/x/xterm-vt220
-usr/share/terminfo/x/xterm-vt52
-usr/share/terminfo/x/xterm-xf86-v32
-usr/share/terminfo/x/xterm-xf86-v33
-usr/share/terminfo/x/xterm-xf86-v333
-usr/share/terminfo/x/xterm-xf86-v40
-usr/share/terminfo/x/xterm-xf86-v43
-usr/share/terminfo/x/xterm-xf86-v44
-usr/share/terminfo/x/xterm-xfree86
-usr/share/terminfo/x/xterm-xi
-usr/share/terminfo/x/xterms
-@dir etc/terminfo
diff --git a/devel/linux-c7-ncurses-base/Makefile b/devel/linux-c7-ncurses-base/Makefile
deleted file mode 100644
index d139b762b38d..000000000000
--- a/devel/linux-c7-ncurses-base/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# Created by: Piotr Kubaj <pkubaj@anongoth.pl>
-# $FreeBSD$
-
-PORTNAME=	ncurses
-PORTVERSION=	5.9
-PORTREVISION=	2
-CATEGORIES=	devel linux
-PKGNAMESUFFIX=	-base
-SHARE_DISTNAMES=${LINUXNAME}-${DISTVERSIONFULL}
-
-MAINTAINER=	emulation@FreeBSD.org
-COMMENT=	Terminfo database required by Linux ncurses programs
-
-CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
-
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-DOCSDIR=	${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
-LINUXNAME=	${PORTNAME}${PKGNAMESUFFIX}
-RPMVERSION=	14.20130511.el7_4
-USES=		linux:c7
-USE_LINUX_RPM=	noarch
-
-.include <bsd.port.mk>
diff --git a/devel/linux-c7-ncurses-base/distinfo b/devel/linux-c7-ncurses-base/distinfo
deleted file mode 100644
index 15af9a541a61..000000000000
--- a/devel/linux-c7-ncurses-base/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1507235043
-SHA256 (centos/ncurses-base-5.9-14.20130511.el7_4.noarch.rpm) = 9b008b5d10b431676ac53ee028c3f4349cc56b9f8dc831569b9ac95d1603c802
-SIZE (centos/ncurses-base-5.9-14.20130511.el7_4.noarch.rpm) = 69900
-SHA256 (centos/ncurses-5.9-14.20130511.el7_4.src.rpm) = 7250cb2d8e0dbaf1ec64be098662858486948eb53c3e924b9de873e40857b236
-SIZE (centos/ncurses-5.9-14.20130511.el7_4.src.rpm) = 3940747
diff --git a/devel/linux-c7-ncurses-base/pkg-plist b/devel/linux-c7-ncurses-base/pkg-plist
deleted file mode 100644
index cd0aaebc5dac..000000000000
--- a/devel/linux-c7-ncurses-base/pkg-plist
+++ /dev/null
@@ -1,125 +0,0 @@
-%%PORTDOCS%%%%DOCSDIR%%/README
-usr/share/tabset/std
-usr/share/tabset/stdcrt
-usr/share/tabset/vt100
-usr/share/tabset/vt300
-usr/share/terminfo/A/Apple_Terminal
-usr/share/terminfo/E/Eterm
-usr/share/terminfo/E/Eterm-256color
-usr/share/terminfo/E/Eterm-88color
-usr/share/terminfo/E/Eterm-color
-usr/share/terminfo/a/ansi
-usr/share/terminfo/a/ansi80x25
-usr/share/terminfo/a/ansis
-usr/share/terminfo/a/aterm
-usr/share/terminfo/b/bterm
-usr/share/terminfo/c/cons25
-usr/share/terminfo/c/cygwin
-usr/share/terminfo/d/dumb
-usr/share/terminfo/e/eterm
-usr/share/terminfo/e/eterm-color
-usr/share/terminfo/g/gnome
-usr/share/terminfo/g/gnome-256color
-usr/share/terminfo/h/hurd
-usr/share/terminfo/j/jfbterm
-usr/share/terminfo/k/kon
-usr/share/terminfo/k/kon2
-usr/share/terminfo/k/konsole
-usr/share/terminfo/k/konsole-256color
-usr/share/terminfo/l/linux
-usr/share/terminfo/m/mach
-usr/share/terminfo/m/mach-bold
-usr/share/terminfo/m/mach-color
-usr/share/terminfo/m/mach-gnu
-usr/share/terminfo/m/mach-gnu-color
-usr/share/terminfo/m/mlterm
-usr/share/terminfo/m/mrxvt
-usr/share/terminfo/n/nsterm
-usr/share/terminfo/n/nxterm
-usr/share/terminfo/p/pcansi
-usr/share/terminfo/p/putty
-usr/share/terminfo/p/putty-256color
-usr/share/terminfo/p/putty-sco
-usr/share/terminfo/p/putty-vt100
-usr/share/terminfo/r/rxvt
-usr/share/terminfo/r/rxvt-16color
-usr/share/terminfo/r/rxvt-256color
-usr/share/terminfo/r/rxvt-88color
-usr/share/terminfo/r/rxvt-basic
-usr/share/terminfo/r/rxvt-color
-usr/share/terminfo/r/rxvt-cygwin
-usr/share/terminfo/r/rxvt-cygwin-native
-usr/share/terminfo/r/rxvt-unicode
-usr/share/terminfo/r/rxvt-xpm
-usr/share/terminfo/s/screen
-usr/share/terminfo/s/screen-16color
-usr/share/terminfo/s/screen-256color
-usr/share/terminfo/s/screen.Eterm
-usr/share/terminfo/s/screen.gnome
-usr/share/terminfo/s/screen.konsole
-usr/share/terminfo/s/screen.linux
-usr/share/terminfo/s/screen.mlterm
-usr/share/terminfo/s/screen.mrxvt
-usr/share/terminfo/s/screen.rxvt
-usr/share/terminfo/s/screen.teraterm
-usr/share/terminfo/s/screen.vte
-usr/share/terminfo/s/screen.xterm-new
-usr/share/terminfo/s/screen.xterm-r6
-usr/share/terminfo/s/screen.xterm-xfree86
-usr/share/terminfo/s/simpleterm
-usr/share/terminfo/s/st
-usr/share/terminfo/s/st-16color
-usr/share/terminfo/s/st-256color
-usr/share/terminfo/s/sun
-usr/share/terminfo/s/sun1
-usr/share/terminfo/s/sun2
-usr/share/terminfo/t/teraterm
-usr/share/terminfo/t/teraterm2.3
-usr/share/terminfo/v/vs100
-usr/share/terminfo/v/vt100
-usr/share/terminfo/v/vt100-am
-usr/share/terminfo/v/vt100-nav
-usr/share/terminfo/v/vt102
-usr/share/terminfo/v/vt200
-usr/share/terminfo/v/vt220
-usr/share/terminfo/v/vt52
-usr/share/terminfo/v/vte
-usr/share/terminfo/v/vte-256color
-usr/share/terminfo/v/vwmterm
-usr/share/terminfo/w/wsvt25
-usr/share/terminfo/w/wsvt25m
-usr/share/terminfo/x/xfce
-usr/share/terminfo/x/xterm
-usr/share/terminfo/x/xterm-1002
-usr/share/terminfo/x/xterm-1003
-usr/share/terminfo/x/xterm-16color
-usr/share/terminfo/x/xterm-24
-usr/share/terminfo/x/xterm-256color
-usr/share/terminfo/x/xterm-88color
-usr/share/terminfo/x/xterm-8bit
-usr/share/terminfo/x/xterm-basic
-usr/share/terminfo/x/xterm-bold
-usr/share/terminfo/x/xterm-color
-usr/share/terminfo/x/xterm-hp
-usr/share/terminfo/x/xterm-new
-usr/share/terminfo/x/xterm-nic
-usr/share/terminfo/x/xterm-noapp
-usr/share/terminfo/x/xterm-old
-usr/share/terminfo/x/xterm-pcolor
-usr/share/terminfo/x/xterm-r5
-usr/share/terminfo/x/xterm-r6
-usr/share/terminfo/x/xterm-sco
-usr/share/terminfo/x/xterm-sun
-usr/share/terminfo/x/xterm-utf8
-usr/share/terminfo/x/xterm-vt220
-usr/share/terminfo/x/xterm-vt52
-usr/share/terminfo/x/xterm-xf86-v32
-usr/share/terminfo/x/xterm-xf86-v33
-usr/share/terminfo/x/xterm-xf86-v333
-usr/share/terminfo/x/xterm-xf86-v40
-usr/share/terminfo/x/xterm-xf86-v43
-usr/share/terminfo/x/xterm-xf86-v44
-usr/share/terminfo/x/xterm-xfree86
-usr/share/terminfo/x/xterm-xi
-usr/share/terminfo/x/xterms
-@dir etc/terminfo
diff --git a/emulators/linux-c6/Makefile b/emulators/linux-c6/Makefile
index 708b918633a2..00d22895cc02 100644
--- a/emulators/linux-c6/Makefile
+++ b/emulators/linux-c6/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	linux-c6
 PORTVERSION=	${LINUX_DIST_VER}
+PORTREVISION=	1
 CATEGORIES=	emulators linux
 
 MAINTAINER=	emulation@FreeBSD.org
@@ -26,7 +27,6 @@ RUN_DEPENDS=	linux-c6-libasyncns>0:dns/linux-c6-libasyncns \
 		linux-c6-dbus-libs>0:devel/linux-c6-dbus-libs \
 		linux-c6-qt47>0:devel/linux-c6-qt47 \
 		linux-c6-dbus-glib>0:devel/linux-c6-dbus-glib \
-		linux-c6-ncurses-base>0:devel/linux-c6-ncurses-base \
 		linux-c6-xorg-libs>0:x11/linux-c6-xorg-libs \
 		linux-c6-fontconfig>0:x11-fonts/linux-c6-fontconfig \
 		linux-c6-cups-libs>0:print/linux-c6-cups-libs \
diff --git a/emulators/linux-c7/Makefile b/emulators/linux-c7/Makefile
index 587959705b1e..67218cbf894f 100644
--- a/emulators/linux-c7/Makefile
+++ b/emulators/linux-c7/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	linux-c7
 PORTVERSION=	${LINUX_DIST_VER}
+PORTREVISION=	1
 CATEGORIES=	emulators linux
 
 MAINTAINER=	emulation@FreeBSD.org
@@ -26,7 +27,6 @@ RUN_DEPENDS=	linux-c7-libasyncns>0:dns/linux-c7-libasyncns \
 		linux-c7-dbus-libs>0:devel/linux-c7-dbus-libs \
 		linux-c7-qt>0:devel/linux-c7-qt \
 		linux-c7-dbus-glib>0:devel/linux-c7-dbus-glib \
-		linux-c7-ncurses-base>0:devel/linux-c7-ncurses-base \
 		linux-c7-xorg-libs>0:x11/linux-c7-xorg-libs \
 		linux-c7-fontconfig>0:x11-fonts/linux-c7-fontconfig \
 		linux-c7-cups-libs>0:print/linux-c7-cups-libs \
diff --git a/emulators/linux_base-c6/Makefile b/emulators/linux_base-c6/Makefile
index eb91be521475..36bde0bc0b05 100644
--- a/emulators/linux_base-c6/Makefile
+++ b/emulators/linux_base-c6/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	c6
 PORTVERSION=	${LINUX_DIST_VER}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	emulators linux
 PKGNAMEPREFIX=	linux_base-
 BIN_DISTNAMES=	bash-4.1.2-48.el6 \
@@ -19,6 +19,7 @@ BIN_DISTNAMES=	bash-4.1.2-48.el6 \
 		keyutils-1.4-5.el6 \
 		less-436-13.el6 \
 		ncurses-5.7-4.20090207.el6 \
+		ncurses-base-5.7-4.20090207.el6 \
 		sed-4.2.1-10.el6 \
 		setserial-2.17-25.el6 \
 		which-2.19-6.el6 \
diff --git a/emulators/linux_base-c6/distinfo b/emulators/linux_base-c6/distinfo
index a3384dd81755..8b8164409d0e 100644
--- a/emulators/linux_base-c6/distinfo
+++ b/emulators/linux_base-c6/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1507218213
+TIMESTAMP = 1509540613
 SHA256 (centos/basesystem-10.0-4.el6.noarch.rpm) = 18860007697438e375733bb4a36a599daac2e2ae95d98a74c436a10d0974710e
 SIZE (centos/basesystem-10.0-4.el6.noarch.rpm) = 4784
 SHA256 (centos/bash-4.1.2-48.el6.i686.rpm) = 0300a6935602bb86a6e44dc526993069e79b80a32a02cfaeec7def94e3a2973e
@@ -153,6 +153,10 @@ SHA256 (centos/ncurses-5.7-4.20090207.el6.i686.rpm) = 5d7449100c2c23593fbaf7bf50
 SIZE (centos/ncurses-5.7-4.20090207.el6.i686.rpm) = 274852
 SHA256 (centos/ncurses-5.7-4.20090207.el6.x86_64.rpm) = a4cd0365f3fe8240e5b081597458888ebe42fbe88d0c86e87f5b48b718ca402b
 SIZE (centos/ncurses-5.7-4.20090207.el6.x86_64.rpm) = 273996
+SHA256 (centos/ncurses-base-5.7-4.20090207.el6.i686.rpm) = 5811c992ccefadbecbdf3b9091b1971e2e80cbd47eb8b7a1bd307d80a86f67ca
+SIZE (centos/ncurses-base-5.7-4.20090207.el6.i686.rpm) = 62504
+SHA256 (centos/ncurses-base-5.7-4.20090207.el6.x86_64.rpm) = 6254a095635de3984d426f5a133d0e961a94decd4a0018bb1a9921e51232f7dc
+SIZE (centos/ncurses-base-5.7-4.20090207.el6.x86_64.rpm) = 62472
 SHA256 (centos/ncurses-libs-5.7-4.20090207.el6.i686.rpm) = fe1778ee05c4840cb27a6804e6af6d61ca6f48666560654e3cfd765fa20ff2bb
 SIZE (centos/ncurses-libs-5.7-4.20090207.el6.i686.rpm) = 255352
 SHA256 (centos/ncurses-libs-5.7-4.20090207.el6.x86_64.rpm) = 88b5174e139c595569787ebe4750fefdfc5e047657f13df0c87b8316ff6cf956
diff --git a/emulators/linux_base-c6/pkg-plist.amd64 b/emulators/linux_base-c6/pkg-plist.amd64
index d6e3fc3cf98f..c68555f1ff9d 100644
--- a/emulators/linux_base-c6/pkg-plist.amd64
+++ b/emulators/linux_base-c6/pkg-plist.amd64
@@ -766,6 +766,16 @@ usr/lib/sse2/libgmpxx.so.4
 usr/lib/sse2/libgmpxx.so.4.1.0
 usr/lib/sse2/libmp.so.3
 usr/lib/sse2/libmp.so.3.1.14
+usr/lib/terminfo/a/ansi
+usr/lib/terminfo/d/dumb
+usr/lib/terminfo/l/linux
+usr/lib/terminfo/v/vt100
+usr/lib/terminfo/v/vt100-am
+usr/lib/terminfo/v/vt100-nav
+usr/lib/terminfo/v/vt102
+usr/lib/terminfo/v/vt200
+usr/lib/terminfo/v/vt220
+usr/lib/terminfo/v/vt52
 usr/lib64/db4.3.29/libdb.so
 usr/lib64/db4.3.29/libdb_cxx.so
 usr/lib64/gconv/ANSI_X3.110.so
@@ -2766,6 +2776,122 @@ usr/share/man/man8/tunelp.8.gz
 usr/share/man/man8/umount.8.gz
 usr/share/man/man8/wipefs.8.gz
 usr/share/man/man8/x86_64.8.gz
+usr/share/tabset/std
+usr/share/tabset/stdcrt
+usr/share/tabset/vt100
+usr/share/tabset/vt300
+usr/share/terminfo/A/Apple_Terminal
+usr/share/terminfo/E/Eterm
+usr/share/terminfo/E/Eterm-256color
+usr/share/terminfo/E/Eterm-88color
+usr/share/terminfo/E/Eterm-color
+usr/share/terminfo/a/ansi
+usr/share/terminfo/a/ansi80x25
+usr/share/terminfo/a/ansis
+usr/share/terminfo/a/aterm
+usr/share/terminfo/c/cons25
+usr/share/terminfo/c/cygwin
+usr/share/terminfo/d/dumb
+usr/share/terminfo/e/eterm
+usr/share/terminfo/e/eterm-color
+usr/share/terminfo/g/gnome
+usr/share/terminfo/g/gnome-256color
+usr/share/terminfo/h/hurd
+usr/share/terminfo/j/jfbterm
+usr/share/terminfo/k/kon
+usr/share/terminfo/k/kon2
+usr/share/terminfo/k/konsole
+usr/share/terminfo/k/konsole-256color
+usr/share/terminfo/l/linux
+usr/share/terminfo/m/mach
+usr/share/terminfo/m/mach-bold
+usr/share/terminfo/m/mach-color
+usr/share/terminfo/m/mlterm
+usr/share/terminfo/m/mrxvt
+usr/share/terminfo/n/nsterm
+usr/share/terminfo/n/nxterm
+usr/share/terminfo/p/pcansi
+usr/share/terminfo/p/putty
+usr/share/terminfo/p/putty-256color
+usr/share/terminfo/p/putty-vt100
+usr/share/terminfo/r/rxvt
+usr/share/terminfo/r/rxvt-16color
+usr/share/terminfo/r/rxvt-256color
+usr/share/terminfo/r/rxvt-88color
+usr/share/terminfo/r/rxvt-basic
+usr/share/terminfo/r/rxvt-color
+usr/share/terminfo/r/rxvt-cygwin
+usr/share/terminfo/r/rxvt-cygwin-native
+usr/share/terminfo/r/rxvt-unicode
+usr/share/terminfo/r/rxvt-xpm
+usr/share/terminfo/s/screen
+usr/share/terminfo/s/screen-16color
+usr/share/terminfo/s/screen-16color-bce
+usr/share/terminfo/s/screen-16color-bce-s
+usr/share/terminfo/s/screen-16color-s
+usr/share/terminfo/s/screen-256color
+usr/share/terminfo/s/screen-256color-bce
+usr/share/terminfo/s/screen-256color-bce-s
+usr/share/terminfo/s/screen-256color-s
+usr/share/terminfo/s/screen-bce
+usr/share/terminfo/s/screen-s
+usr/share/terminfo/s/screen-w
+usr/share/terminfo/s/screen.Eterm
+usr/share/terminfo/s/screen.linux
+usr/share/terminfo/s/screen.mlterm
+usr/share/terminfo/s/screen.rxvt
+usr/share/terminfo/s/screen.teraterm
+usr/share/terminfo/s/screen.xterm-new
+usr/share/terminfo/s/screen.xterm-r6
+usr/share/terminfo/s/screen.xterm-xfree86
+usr/share/terminfo/s/sun
+usr/share/terminfo/s/sun1
+usr/share/terminfo/s/sun2
+usr/share/terminfo/t/teraterm
+usr/share/terminfo/t/teraterm2.3
+usr/share/terminfo/v/vs100
+usr/share/terminfo/v/vt100
+usr/share/terminfo/v/vt100-am
+usr/share/terminfo/v/vt100-nav
+usr/share/terminfo/v/vt102
+usr/share/terminfo/v/vt200
+usr/share/terminfo/v/vt220
+usr/share/terminfo/v/vt52
+usr/share/terminfo/w/wsvt25
+usr/share/terminfo/w/wsvt25m
+usr/share/terminfo/x/xfce
+usr/share/terminfo/x/xterm
+usr/share/terminfo/x/xterm-1002
+usr/share/terminfo/x/xterm-1003
+usr/share/terminfo/x/xterm-16color
+usr/share/terminfo/x/xterm-24
+usr/share/terminfo/x/xterm-256color
+usr/share/terminfo/x/xterm-88color
+usr/share/terminfo/x/xterm-8bit
+usr/share/terminfo/x/xterm-basic
+usr/share/terminfo/x/xterm-bold
+usr/share/terminfo/x/xterm-color
+usr/share/terminfo/x/xterm-hp
+usr/share/terminfo/x/xterm-new
+usr/share/terminfo/x/xterm-nic
+usr/share/terminfo/x/xterm-noapp
+usr/share/terminfo/x/xterm-old
+usr/share/terminfo/x/xterm-pcolor
+usr/share/terminfo/x/xterm-r5
+usr/share/terminfo/x/xterm-r6
+usr/share/terminfo/x/xterm-sco
+usr/share/terminfo/x/xterm-sun
+usr/share/terminfo/x/xterm-vt220
+usr/share/terminfo/x/xterm-vt52
+usr/share/terminfo/x/xterm-xf86-v32
+usr/share/terminfo/x/xterm-xf86-v33
+usr/share/terminfo/x/xterm-xf86-v333
+usr/share/terminfo/x/xterm-xf86-v40
+usr/share/terminfo/x/xterm-xf86-v43
+usr/share/terminfo/x/xterm-xf86-v44
+usr/share/terminfo/x/xterm-xfree86
+usr/share/terminfo/x/xterm-xi
+usr/share/terminfo/x/xterms
 usr/tmp
 @rmtry var/cache/ldconfig/aux-cache
 var/mail
@@ -2781,6 +2907,7 @@ var/mail
 @dir etc/popt.d
 @dir etc/request-key.d
 @dir etc/sysconfig
+@dir etc/terminfo
 @dir etc/xdg/autostart
 @dir etc/xinetd.d
 @dir opt
diff --git a/emulators/linux_base-c6/pkg-plist.i386 b/emulators/linux_base-c6/pkg-plist.i386
index a6ff3378af32..280fd5375322 100644
--- a/emulators/linux_base-c6/pkg-plist.i386
+++ b/emulators/linux_base-c6/pkg-plist.i386
@@ -761,6 +761,16 @@ usr/lib/sse2/libgmpxx.so.4
 usr/lib/sse2/libgmpxx.so.4.1.0
 usr/lib/sse2/libmp.so.3
 usr/lib/sse2/libmp.so.3.1.14
+usr/lib/terminfo/a/ansi
+usr/lib/terminfo/d/dumb
+usr/lib/terminfo/l/linux
+usr/lib/terminfo/v/vt100
+usr/lib/terminfo/v/vt100-am
+usr/lib/terminfo/v/vt100-nav
+usr/lib/terminfo/v/vt102
+usr/lib/terminfo/v/vt200
+usr/lib/terminfo/v/vt220
+usr/lib/terminfo/v/vt52
 usr/libexec/gam_server
 usr/libexec/getconf/POSIX_V6_ILP32_OFF32
 usr/libexec/getconf/POSIX_V6_ILP32_OFFBIG
@@ -2338,6 +2348,122 @@ usr/share/man/man8/tune2fs.8.gz
 usr/share/man/man8/tunelp.8.gz
 usr/share/man/man8/umount.8.gz
 usr/share/man/man8/wipefs.8.gz
+usr/share/tabset/std
+usr/share/tabset/stdcrt
+usr/share/tabset/vt100
+usr/share/tabset/vt300
+usr/share/terminfo/A/Apple_Terminal
+usr/share/terminfo/E/Eterm
+usr/share/terminfo/E/Eterm-256color
+usr/share/terminfo/E/Eterm-88color
+usr/share/terminfo/E/Eterm-color
+usr/share/terminfo/a/ansi
+usr/share/terminfo/a/ansi80x25
+usr/share/terminfo/a/ansis
+usr/share/terminfo/a/aterm
+usr/share/terminfo/c/cons25
+usr/share/terminfo/c/cygwin
+usr/share/terminfo/d/dumb
+usr/share/terminfo/e/eterm
+usr/share/terminfo/e/eterm-color
+usr/share/terminfo/g/gnome
+usr/share/terminfo/g/gnome-256color
+usr/share/terminfo/h/hurd
+usr/share/terminfo/j/jfbterm
+usr/share/terminfo/k/kon
+usr/share/terminfo/k/kon2
+usr/share/terminfo/k/konsole
+usr/share/terminfo/k/konsole-256color
+usr/share/terminfo/l/linux
+usr/share/terminfo/m/mach
+usr/share/terminfo/m/mach-bold
+usr/share/terminfo/m/mach-color
+usr/share/terminfo/m/mlterm
+usr/share/terminfo/m/mrxvt
+usr/share/terminfo/n/nsterm
+usr/share/terminfo/n/nxterm
+usr/share/terminfo/p/pcansi
+usr/share/terminfo/p/putty
+usr/share/terminfo/p/putty-256color
+usr/share/terminfo/p/putty-vt100
+usr/share/terminfo/r/rxvt
+usr/share/terminfo/r/rxvt-16color
+usr/share/terminfo/r/rxvt-256color
+usr/share/terminfo/r/rxvt-88color
+usr/share/terminfo/r/rxvt-basic
+usr/share/terminfo/r/rxvt-color
+usr/share/terminfo/r/rxvt-cygwin
+usr/share/terminfo/r/rxvt-cygwin-native
+usr/share/terminfo/r/rxvt-unicode
+usr/share/terminfo/r/rxvt-xpm
+usr/share/terminfo/s/screen
+usr/share/terminfo/s/screen-16color
+usr/share/terminfo/s/screen-16color-bce
+usr/share/terminfo/s/screen-16color-bce-s
+usr/share/terminfo/s/screen-16color-s
+usr/share/terminfo/s/screen-256color
+usr/share/terminfo/s/screen-256color-bce
+usr/share/terminfo/s/screen-256color-bce-s
+usr/share/terminfo/s/screen-256color-s
+usr/share/terminfo/s/screen-bce
+usr/share/terminfo/s/screen-s
+usr/share/terminfo/s/screen-w
+usr/share/terminfo/s/screen.Eterm
+usr/share/terminfo/s/screen.linux
+usr/share/terminfo/s/screen.mlterm
+usr/share/terminfo/s/screen.rxvt
+usr/share/terminfo/s/screen.teraterm
+usr/share/terminfo/s/screen.xterm-new
+usr/share/terminfo/s/screen.xterm-r6
+usr/share/terminfo/s/screen.xterm-xfree86
+usr/share/terminfo/s/sun
+usr/share/terminfo/s/sun1
+usr/share/terminfo/s/sun2
+usr/share/terminfo/t/teraterm
+usr/share/terminfo/t/teraterm2.3
+usr/share/terminfo/v/vs100
+usr/share/terminfo/v/vt100
+usr/share/terminfo/v/vt100-am
+usr/share/terminfo/v/vt100-nav
+usr/share/terminfo/v/vt102
+usr/share/terminfo/v/vt200
+usr/share/terminfo/v/vt220
+usr/share/terminfo/v/vt52
+usr/share/terminfo/w/wsvt25
+usr/share/terminfo/w/wsvt25m
+usr/share/terminfo/x/xfce
+usr/share/terminfo/x/xterm
+usr/share/terminfo/x/xterm-1002
+usr/share/terminfo/x/xterm-1003
+usr/share/terminfo/x/xterm-16color
+usr/share/terminfo/x/xterm-24
+usr/share/terminfo/x/xterm-256color
+usr/share/terminfo/x/xterm-88color
+usr/share/terminfo/x/xterm-8bit
+usr/share/terminfo/x/xterm-basic
+usr/share/terminfo/x/xterm-bold
+usr/share/terminfo/x/xterm-color
+usr/share/terminfo/x/xterm-hp
+usr/share/terminfo/x/xterm-new
+usr/share/terminfo/x/xterm-nic
+usr/share/terminfo/x/xterm-noapp
+usr/share/terminfo/x/xterm-old
+usr/share/terminfo/x/xterm-pcolor
+usr/share/terminfo/x/xterm-r5
+usr/share/terminfo/x/xterm-r6
+usr/share/terminfo/x/xterm-sco
+usr/share/terminfo/x/xterm-sun
+usr/share/terminfo/x/xterm-vt220
+usr/share/terminfo/x/xterm-vt52
+usr/share/terminfo/x/xterm-xf86-v32
+usr/share/terminfo/x/xterm-xf86-v33
+usr/share/terminfo/x/xterm-xf86-v333
+usr/share/terminfo/x/xterm-xf86-v40
+usr/share/terminfo/x/xterm-xf86-v43
+usr/share/terminfo/x/xterm-xf86-v44
+usr/share/terminfo/x/xterm-xfree86
+usr/share/terminfo/x/xterm-xi
+usr/share/terminfo/x/xterms
 usr/tmp
 @rmtry var/cache/ldconfig/aux-cache
 var/mail
@@ -2353,6 +2479,7 @@ var/mail
 @dir etc/popt.d
 @dir etc/request-key.d
 @dir etc/sysconfig
+@dir etc/terminfo
 @dir etc/xdg/autostart
 @dir etc/xinetd.d
 @dir opt
diff --git a/emulators/linux_base-c7/Makefile b/emulators/linux_base-c7/Makefile
index 4e9c34d47a87..adaf343bf125 100644
--- a/emulators/linux_base-c7/Makefile
+++ b/emulators/linux_base-c7/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	c7
 PORTVERSION=	${LINUX_DIST_VER}
+PORTREVISION=	1
 CATEGORIES=	emulators linux
 PKGNAMEPREFIX=	linux_base-
 BIN_DISTNAMES=	centos-release-7-4.1708.el7.centos \
@@ -57,6 +58,7 @@ LIB_DISTNAMES=	bzip2-libs-1.0.6-13.el7 \
 		xz-libs-5.2.2-1.el7 \
 		zlib-1.2.7-17.el7
 SHARE_DISTNAMES=basesystem-10.0-7.el7.centos \
+		ncurses-base-5.9-14.20130511.el7_4 \
 		setup-2.8.71-7.el7
 SRC_DISTFILES=	acl-2.2.51-12.el7${SRC_SUFX}:SOURCE \
 		attr-2.4.46-12.el7${SRC_SUFX}:SOURCE \
diff --git a/emulators/linux_base-c7/distinfo b/emulators/linux_base-c7/distinfo
index c5e0a3282177..21dab72f4829 100644
--- a/emulators/linux_base-c7/distinfo
+++ b/emulators/linux_base-c7/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1507907267
+TIMESTAMP = 1509539757
 SHA256 (centos/basesystem-10.0-7.el7.centos.noarch.rpm) = 0280ee16df09be0cebf62695706598caed8ff5cba47de1fed625068a90a9ef68
 SIZE (centos/basesystem-10.0-7.el7.centos.noarch.rpm) = 5124
 SHA256 (centos/bash-4.2.46-29.el7_4.i686.rpm) = aba06dce43a1484266c85795d36f12af7aa07de31bbb6f061ea0cc48b532edf9
@@ -157,6 +157,8 @@ SHA256 (centos/ncurses-5.9-14.20130511.el7_4.i686.rpm) = ad7a2660acba812a13c6715
 SIZE (centos/ncurses-5.9-14.20130511.el7_4.i686.rpm) = 309728
 SHA256 (centos/ncurses-5.9-14.20130511.el7_4.x86_64.rpm) = 59773dff8c5aa8f084fd2edc88b5dc34f574f254ec98280fc2b0adafe07f85a2
 SIZE (centos/ncurses-5.9-14.20130511.el7_4.x86_64.rpm) = 310928
+SHA256 (centos/ncurses-base-5.9-14.20130511.el7_4.noarch.rpm) = 9b008b5d10b431676ac53ee028c3f4349cc56b9f8dc831569b9ac95d1603c802
+SIZE (centos/ncurses-base-5.9-14.20130511.el7_4.noarch.rpm) = 69900
 SHA256 (centos/ncurses-libs-5.9-14.20130511.el7_4.i686.rpm) = 7f251dac0fdc4eb4c8e78ae21de44e1cb3e8f380209ed4620cc0394f9c36049e
 SIZE (centos/ncurses-libs-5.9-14.20130511.el7_4.i686.rpm) = 323976
 SHA256 (centos/ncurses-libs-5.9-14.20130511.el7_4.x86_64.rpm) = 7bb52546082410c98e9d3d1a80bba05cee335f5b0adecc633ffa8a8c8c1b4c38
diff --git a/emulators/linux_base-c7/pkg-plist.amd64 b/emulators/linux_base-c7/pkg-plist.amd64
index 42710b3565f2..f1b049b99a82 100644
--- a/emulators/linux_base-c7/pkg-plist.amd64
+++ b/emulators/linux_base-c7/pkg-plist.amd64
@@ -1580,6 +1580,7 @@ usr/share/centos-release/EULA
 %%PORTDOCS%%usr/share/doc/ncurses-5.9/NEWS.bz2
 %%PORTDOCS%%usr/share/doc/ncurses-5.9/README
 %%PORTDOCS%%usr/share/doc/ncurses-5.9/TO-DO
+%%PORTDOCS%%usr/share/doc/ncurses-base-5.9/README
 %%PORTDOCS%%usr/share/doc/pcre-8.32/AUTHORS
 %%PORTDOCS%%usr/share/doc/pcre-8.32/COPYING
 %%PORTDOCS%%usr/share/doc/pcre-8.32/ChangeLog
@@ -3038,6 +3039,129 @@ usr/share/man/man8/wipefs.8.gz
 usr/share/man/man8/x86_64.8.gz
 usr/share/man/man8/zramctl.8.gz
 usr/share/redhat-release
+usr/share/tabset/std
+usr/share/tabset/stdcrt
+usr/share/tabset/vt100
+usr/share/tabset/vt300
+usr/share/terminfo/A/Apple_Terminal
+usr/share/terminfo/E/Eterm
+usr/share/terminfo/E/Eterm-256color
+usr/share/terminfo/E/Eterm-88color
+usr/share/terminfo/E/Eterm-color
+usr/share/terminfo/a/ansi
+usr/share/terminfo/a/ansi80x25
+usr/share/terminfo/a/ansis
+usr/share/terminfo/a/aterm
+usr/share/terminfo/b/bterm
+usr/share/terminfo/c/cons25
+usr/share/terminfo/c/cygwin
+usr/share/terminfo/d/dumb
+usr/share/terminfo/e/eterm
+usr/share/terminfo/e/eterm-color
+usr/share/terminfo/g/gnome
+usr/share/terminfo/g/gnome-256color
+usr/share/terminfo/h/hurd
+usr/share/terminfo/j/jfbterm
+usr/share/terminfo/k/kon
+usr/share/terminfo/k/kon2
+usr/share/terminfo/k/konsole
+usr/share/terminfo/k/konsole-256color
+usr/share/terminfo/l/linux
+usr/share/terminfo/m/mach
+usr/share/terminfo/m/mach-bold
+usr/share/terminfo/m/mach-color
+usr/share/terminfo/m/mach-gnu
+usr/share/terminfo/m/mach-gnu-color
+usr/share/terminfo/m/mlterm
+usr/share/terminfo/m/mrxvt
+usr/share/terminfo/n/nsterm
+usr/share/terminfo/n/nxterm
+usr/share/terminfo/p/pcansi
+usr/share/terminfo/p/putty
+usr/share/terminfo/p/putty-256color
+usr/share/terminfo/p/putty-sco
+usr/share/terminfo/p/putty-vt100
+usr/share/terminfo/r/rxvt
+usr/share/terminfo/r/rxvt-16color
+usr/share/terminfo/r/rxvt-256color
+usr/share/terminfo/r/rxvt-88color
+usr/share/terminfo/r/rxvt-basic
+usr/share/terminfo/r/rxvt-color
+usr/share/terminfo/r/rxvt-cygwin
+usr/share/terminfo/r/rxvt-cygwin-native
+usr/share/terminfo/r/rxvt-unicode
+usr/share/terminfo/r/rxvt-xpm
+usr/share/terminfo/s/screen
+usr/share/terminfo/s/screen-16color
+usr/share/terminfo/s/screen-256color
+usr/share/terminfo/s/screen.Eterm
+usr/share/terminfo/s/screen.gnome
+usr/share/terminfo/s/screen.konsole
+usr/share/terminfo/s/screen.linux
+usr/share/terminfo/s/screen.mlterm
+usr/share/terminfo/s/screen.mrxvt
+usr/share/terminfo/s/screen.rxvt
+usr/share/terminfo/s/screen.teraterm
+usr/share/terminfo/s/screen.vte
+usr/share/terminfo/s/screen.xterm-new
+usr/share/terminfo/s/screen.xterm-r6
+usr/share/terminfo/s/screen.xterm-xfree86
+usr/share/terminfo/s/simpleterm
+usr/share/terminfo/s/st
+usr/share/terminfo/s/st-16color
+usr/share/terminfo/s/st-256color
+usr/share/terminfo/s/sun
+usr/share/terminfo/s/sun1
+usr/share/terminfo/s/sun2
+usr/share/terminfo/t/teraterm
+usr/share/terminfo/t/teraterm2.3
+usr/share/terminfo/v/vs100
+usr/share/terminfo/v/vt100
+usr/share/terminfo/v/vt100-am
+usr/share/terminfo/v/vt100-nav
+usr/share/terminfo/v/vt102
+usr/share/terminfo/v/vt200
+usr/share/terminfo/v/vt220
+usr/share/terminfo/v/vt52
+usr/share/terminfo/v/vte
+usr/share/terminfo/v/vte-256color
+usr/share/terminfo/v/vwmterm
+usr/share/terminfo/w/wsvt25
+usr/share/terminfo/w/wsvt25m
+usr/share/terminfo/x/xfce
+usr/share/terminfo/x/xterm
+usr/share/terminfo/x/xterm-1002
+usr/share/terminfo/x/xterm-1003
+usr/share/terminfo/x/xterm-16color
+usr/share/terminfo/x/xterm-24
+usr/share/terminfo/x/xterm-256color
+usr/share/terminfo/x/xterm-88color
+usr/share/terminfo/x/xterm-8bit
+usr/share/terminfo/x/xterm-basic
+usr/share/terminfo/x/xterm-bold
+usr/share/terminfo/x/xterm-color
+usr/share/terminfo/x/xterm-hp
+usr/share/terminfo/x/xterm-new
+usr/share/terminfo/x/xterm-nic
+usr/share/terminfo/x/xterm-noapp
+usr/share/terminfo/x/xterm-old
+usr/share/terminfo/x/xterm-pcolor
+usr/share/terminfo/x/xterm-r5
+usr/share/terminfo/x/xterm-r6
+usr/share/terminfo/x/xterm-sco
+usr/share/terminfo/x/xterm-sun
+usr/share/terminfo/x/xterm-utf8
+usr/share/terminfo/x/xterm-vt220
+usr/share/terminfo/x/xterm-vt52
+usr/share/terminfo/x/xterm-xf86-v32
+usr/share/terminfo/x/xterm-xf86-v33
+usr/share/terminfo/x/xterm-xf86-v333
+usr/share/terminfo/x/xterm-xf86-v40
+usr/share/terminfo/x/xterm-xf86-v43
+usr/share/terminfo/x/xterm-xf86-v44
+usr/share/terminfo/x/xterm-xfree86
+usr/share/terminfo/x/xterm-xi
+usr/share/terminfo/x/xterms
 usr/tmp
 @rmtry var/cache/ldconfig/aux-cache
 var/db/Makefile
@@ -3056,6 +3180,7 @@ var/mail
 @dir etc/popt.d
 @dir etc/request-key.d
 @dir etc/sysconfig
+@dir etc/terminfo
 @dir etc/xdg/autostart
 @dir etc/xinetd.d
 @dir opt
diff --git a/emulators/linux_base-c7/pkg-plist.i386 b/emulators/linux_base-c7/pkg-plist.i386
index 5e4b2522c1b7..a288f919b011 100644
--- a/emulators/linux_base-c7/pkg-plist.i386
+++ b/emulators/linux_base-c7/pkg-plist.i386
@@ -1137,6 +1137,7 @@ usr/share/centos-release/EULA
 %%PORTDOCS%%usr/share/doc/ncurses-5.9/NEWS.bz2
 %%PORTDOCS%%usr/share/doc/ncurses-5.9/README
 %%PORTDOCS%%usr/share/doc/ncurses-5.9/TO-DO
+%%PORTDOCS%%usr/share/doc/ncurses-base-5.9/README
 %%PORTDOCS%%usr/share/doc/pcre-8.32/AUTHORS
 %%PORTDOCS%%usr/share/doc/pcre-8.32/COPYING
 %%PORTDOCS%%usr/share/doc/pcre-8.32/ChangeLog
@@ -2588,6 +2589,129 @@ usr/share/man/man8/wdctl.8.gz
 usr/share/man/man8/wipefs.8.gz
 usr/share/man/man8/zramctl.8.gz
 usr/share/redhat-release
+usr/share/tabset/std
+usr/share/tabset/stdcrt
+usr/share/tabset/vt100
+usr/share/tabset/vt300
+usr/share/terminfo/A/Apple_Terminal
+usr/share/terminfo/E/Eterm
+usr/share/terminfo/E/Eterm-256color
+usr/share/terminfo/E/Eterm-88color
+usr/share/terminfo/E/Eterm-color
+usr/share/terminfo/a/ansi
+usr/share/terminfo/a/ansi80x25
+usr/share/terminfo/a/ansis
+usr/share/terminfo/a/aterm
+usr/share/terminfo/b/bterm
+usr/share/terminfo/c/cons25
+usr/share/terminfo/c/cygwin
+usr/share/terminfo/d/dumb
+usr/share/terminfo/e/eterm
+usr/share/terminfo/e/eterm-color
+usr/share/terminfo/g/gnome
+usr/share/terminfo/g/gnome-256color
+usr/share/terminfo/h/hurd
+usr/share/terminfo/j/jfbterm
+usr/share/terminfo/k/kon
+usr/share/terminfo/k/kon2
+usr/share/terminfo/k/konsole
+usr/share/terminfo/k/konsole-256color
+usr/share/terminfo/l/linux
+usr/share/terminfo/m/mach
+usr/share/terminfo/m/mach-bold
+usr/share/terminfo/m/mach-color
+usr/share/terminfo/m/mach-gnu
+usr/share/terminfo/m/mach-gnu-color
+usr/share/terminfo/m/mlterm
+usr/share/terminfo/m/mrxvt
+usr/share/terminfo/n/nsterm
+usr/share/terminfo/n/nxterm
+usr/share/terminfo/p/pcansi
+usr/share/terminfo/p/putty
+usr/share/terminfo/p/putty-256color
+usr/share/terminfo/p/putty-sco
+usr/share/terminfo/p/putty-vt100
+usr/share/terminfo/r/rxvt
+usr/share/terminfo/r/rxvt-16color
+usr/share/terminfo/r/rxvt-256color
+usr/share/terminfo/r/rxvt-88color
+usr/share/terminfo/r/rxvt-basic
+usr/share/terminfo/r/rxvt-color
+usr/share/terminfo/r/rxvt-cygwin
+usr/share/terminfo/r/rxvt-cygwin-native
+usr/share/terminfo/r/rxvt-unicode
+usr/share/terminfo/r/rxvt-xpm
+usr/share/terminfo/s/screen
+usr/share/terminfo/s/screen-16color
+usr/share/terminfo/s/screen-256color
+usr/share/terminfo/s/screen.Eterm
+usr/share/terminfo/s/screen.gnome
+usr/share/terminfo/s/screen.konsole
+usr/share/terminfo/s/screen.linux
+usr/share/terminfo/s/screen.mlterm
+usr/share/terminfo/s/screen.mrxvt
+usr/share/terminfo/s/screen.rxvt
+usr/share/terminfo/s/screen.teraterm
+usr/share/terminfo/s/screen.vte
+usr/share/terminfo/s/screen.xterm-new
+usr/share/terminfo/s/screen.xterm-r6
+usr/share/terminfo/s/screen.xterm-xfree86
+usr/share/terminfo/s/simpleterm
+usr/share/terminfo/s/st
+usr/share/terminfo/s/st-16color
+usr/share/terminfo/s/st-256color
+usr/share/terminfo/s/sun
+usr/share/terminfo/s/sun1
+usr/share/terminfo/s/sun2
+usr/share/terminfo/t/teraterm
+usr/share/terminfo/t/teraterm2.3
+usr/share/terminfo/v/vs100
+usr/share/terminfo/v/vt100
+usr/share/terminfo/v/vt100-am
+usr/share/terminfo/v/vt100-nav
+usr/share/terminfo/v/vt102
+usr/share/terminfo/v/vt200
+usr/share/terminfo/v/vt220
+usr/share/terminfo/v/vt52
+usr/share/terminfo/v/vte
+usr/share/terminfo/v/vte-256color
+usr/share/terminfo/v/vwmterm
+usr/share/terminfo/w/wsvt25
+usr/share/terminfo/w/wsvt25m
+usr/share/terminfo/x/xfce
+usr/share/terminfo/x/xterm
+usr/share/terminfo/x/xterm-1002
+usr/share/terminfo/x/xterm-1003
+usr/share/terminfo/x/xterm-16color
+usr/share/terminfo/x/xterm-24
+usr/share/terminfo/x/xterm-256color
+usr/share/terminfo/x/xterm-88color
+usr/share/terminfo/x/xterm-8bit
+usr/share/terminfo/x/xterm-basic
+usr/share/terminfo/x/xterm-bold
+usr/share/terminfo/x/xterm-color
+usr/share/terminfo/x/xterm-hp
+usr/share/terminfo/x/xterm-new
+usr/share/terminfo/x/xterm-nic
+usr/share/terminfo/x/xterm-noapp
+usr/share/terminfo/x/xterm-old
+usr/share/terminfo/x/xterm-pcolor
+usr/share/terminfo/x/xterm-r5
+usr/share/terminfo/x/xterm-r6
+usr/share/terminfo/x/xterm-sco
+usr/share/terminfo/x/xterm-sun
+usr/share/terminfo/x/xterm-utf8
+usr/share/terminfo/x/xterm-vt220
+usr/share/terminfo/x/xterm-vt52
+usr/share/terminfo/x/xterm-xf86-v32
+usr/share/terminfo/x/xterm-xf86-v33
+usr/share/terminfo/x/xterm-xf86-v333
+usr/share/terminfo/x/xterm-xf86-v40
+usr/share/terminfo/x/xterm-xf86-v43
+usr/share/terminfo/x/xterm-xf86-v44
+usr/share/terminfo/x/xterm-xfree86
+usr/share/terminfo/x/xterm-xi
+usr/share/terminfo/x/xterms
 usr/tmp
 @rmtry var/cache/ldconfig/aux-cache
 var/db/Makefile
@@ -2606,6 +2730,7 @@ var/mail
 @dir etc/popt.d
 @dir etc/request-key.d
 @dir etc/sysconfig
+@dir etc/terminfo
 @dir etc/xdg/autostart
 @dir etc/xinetd.d
 @dir opt
diff --git a/games/adom/Makefile b/games/adom/Makefile
index a71099d2f6ae..e3f115c549a5 100644
--- a/games/adom/Makefile
+++ b/games/adom/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	adom
 PORTVERSION=	1.1.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games linux
 MASTER_SITES=	http://www.adom.de/adom/download/linux/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}-elf
@@ -22,7 +22,7 @@ OPTIONS_DEFINE=	DOCS
 
 ONLY_FOR_ARCHS=	i386 amd64
 USES=		linux
-USE_LINUX=	ncurses-base xorglibs
+USE_LINUX=	xorglibs
 
 WRKSRC=		${WRKDIR}/adom
 NO_BUILD=	yes
diff --git a/math/matlab-installer/Makefile b/math/matlab-installer/Makefile
index 4ee648722233..47e1eef4792c 100644
--- a/math/matlab-installer/Makefile
+++ b/math/matlab-installer/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	matlab-installer
 PORTVERSION=	0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math science java
 MASTER_SITES=	http://acadix.biz/Ports/distfiles/
 
@@ -17,7 +17,7 @@ RUN_DEPENDS=	mount_cd9660_image:sysutils/diskimage-tools \
 		webbrowser:www/webbrowser \
 
 USES=		linux tar:xz
-USE_LINUX=	ncurses-base dri devtools
+USE_LINUX=	dri devtools
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 JAVA_OS=	linux