[pkgsrc/trunk]: pkgsrc/devel/ncurses Repair this package on solaris after bei...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/766155a442a1
branches:  trunk
changeset: 524037:766155a442a1
user:      dmcmahill <dmcmahill%pkgsrc.org@localhost>
date:      Wed Jan 17 13:43:49 2007 +0000

description:
Repair this package on solaris after being broken by the last update.
Addresses PR/35387.

diffstat:

 devel/ncurses/Makefile |  15 +++++++++++++--
 devel/ncurses/PLIST    |  18 +++++++++---------
 2 files changed, 22 insertions(+), 11 deletions(-)

diffs (67 lines):

diff -r ada936185832 -r 766155a442a1 devel/ncurses/Makefile
--- a/devel/ncurses/Makefile    Wed Jan 17 13:20:56 2007 +0000
+++ b/devel/ncurses/Makefile    Wed Jan 17 13:43:49 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2007/01/08 11:01:05 adam Exp $
+# $NetBSD: Makefile,v 1.76 2007/01/17 13:43:49 dmcmahill Exp $
 
 .include "Makefile.common"
 
@@ -7,13 +7,24 @@
 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-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.teraterm|/,/^$$/d'
+SUBST_SED.ti+=         -e '/^screen-16color/,/^$$/d'
+SUBST_SED.ti+=         -e '/^screen-256color/,/^$$/d'
 .endif
 
 post-configure:
diff -r ada936185832 -r 766155a442a1 devel/ncurses/PLIST
--- a/devel/ncurses/PLIST       Wed Jan 17 13:20:56 2007 +0000
+++ b/devel/ncurses/PLIST       Wed Jan 17 13:43:49 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2007/01/08 11:01:05 adam Exp $
+@comment $NetBSD: PLIST,v 1.12 2007/01/17 13:43:49 dmcmahill Exp $
 bin/captoinfo
 bin/clear
 bin/infocmp
@@ -2418,14 +2418,14 @@
 ${TERMINFODIR}/s/scoansi-new
 ${TERMINFODIR}/s/scoansi-old
 ${NOT_SUNOS}${TERMINFODIR}/s/screen
-${TERMINFODIR}/s/screen-16color
-${TERMINFODIR}/s/screen-16color-bce
-${TERMINFODIR}/s/screen-16color-bce-s
-${TERMINFODIR}/s/screen-16color-s
-${TERMINFODIR}/s/screen-256color
-${TERMINFODIR}/s/screen-256color-bce
-${TERMINFODIR}/s/screen-256color-bce-s
-${TERMINFODIR}/s/screen-256color-s
+${NOT_SUNOS}${TERMINFODIR}/s/screen-16color
+${NOT_SUNOS}${TERMINFODIR}/s/screen-16color-bce
+${NOT_SUNOS}${TERMINFODIR}/s/screen-16color-bce-s
+${NOT_SUNOS}${TERMINFODIR}/s/screen-16color-s
+${NOT_SUNOS}${TERMINFODIR}/s/screen-256color
+${NOT_SUNOS}${TERMINFODIR}/s/screen-256color-bce
+${NOT_SUNOS}${TERMINFODIR}/s/screen-256color-bce-s
+${NOT_SUNOS}${TERMINFODIR}/s/screen-256color-s
 ${NOT_SUNOS}${TERMINFODIR}/s/screen-bce
 ${NOT_SUNOS}${TERMINFODIR}/s/screen-s
 ${NOT_SUNOS}${TERMINFODIR}/s/screen-w