[pkgsrc/trunk]: pkgsrc/devel/ncurses Remove the SunOS hack which removed the ...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/76cc5e962ca8
branches:  trunk
changeset: 635602:76cc5e962ca8
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Mon Jun 09 10:28:10 2014 +0000

description:
Remove the SunOS hack which removed the 'screen' terminfo entries, screen
will now only install those when ncurses is not used.  Fixes various
issues with TERM=screen on systems where misc/screen wasn't installed.

Bump PKGREVISION.

diffstat:

 devel/ncurses/Makefile |  34 ++--------------------------------
 1 files changed, 2 insertions(+), 32 deletions(-)

diffs (48 lines):

diff -r a7671ae19f81 -r 76cc5e962ca8 devel/ncurses/Makefile
--- a/devel/ncurses/Makefile    Mon Jun 09 10:25:41 2014 +0000
+++ b/devel/ncurses/Makefile    Mon Jun 09 10:28:10 2014 +0000
@@ -1,42 +1,12 @@
-# $NetBSD: Makefile,v 1.88 2013/10/04 10:46:25 jperkin Exp $
+# $NetBSD: Makefile,v 1.89 2014/06/09 10:28:10 jperkin Exp $
 
 .include "Makefile.common"
 
 COMMENT=       CRT screen handling and optimization package
-PKGREVISION=   2
+PKGREVISION=   3
 
 INSTALLATION_DIRS+=    share/examples
 
-.if ${OPSYS} == "SunOS"
-# misc/screen installs screen, screen-bce and screen-s, so we need to remove
-# these here to avoid a conflict; this means we also remove the entries which
-# have a use=screen in them
-SUBST_CLASSES+=                ti
-SUBST_STAGE.ti=                post-configure
-SUBST_MESSAGE.ti=      Removing screen entries from the terminfo database.
-SUBST_FILES.ti=                ${TERMINFO_SRC}
-# see misc/screen/PLIST for these:
-SUBST_SED.ti=          -e '/^screen|/,/^$$/d'
-SUBST_SED.ti+=         -e '/^screen-bce|/,/^$$/d'
-SUBST_SED.ti+=         -e '/^screen-bce.xterm-new|/,/^$$/d'
-SUBST_SED.ti+=         -e '/^screen-bce.rxvt|/,/^$$/d'
-SUBST_SED.ti+=         -e '/^screen-bce.Eterm|/,/^$$/d'
-SUBST_SED.ti+=         -e '/^screen-bce.mrxvt|/,/^$$/d'
-SUBST_SED.ti+=         -e '/^screen-bce.gnome|/,/^$$/d'
-SUBST_SED.ti+=         -e '/^screen-bce.konsole|/,/^$$/d'
-SUBST_SED.ti+=         -e '/^screen-bce.linux|/,/^$$/d'
-SUBST_SED.ti+=         -e '/^screen-bce.mlterm|/,/^$$/d'
-SUBST_SED.ti+=         -e '/^screen-s|/,/^$$/d'
-# see ${TERMINFO_SRC} and look for use=screen for these
-SUBST_SED.ti+=         -e '/^screen.teraterm|/,/^$$/d'
-SUBST_SED.ti+=         -e '/^screen.linux|/,/^$$/d'
-SUBST_SED.ti+=         -e '/^screen-w|/,/^$$/d'
-SUBST_SED.ti+=         -e '/^screen-16color/,/^$$/d'
-SUBST_SED.ti+=         -e '/^screen-256color/,/^$$/d'
-SUBST_SED.ti+=         -e '/^screen.mlterm/,/^$$/d'
-SUBST_SED.ti+=         -e '/^screen.rxvt/,/^$$/d'
-.endif
-
 PLIST_SRC=     ${PKGDIR}/PLIST ${WRKDIR}/PLIST.terminfo
 
 post-configure: