summaryrefslogtreecommitdiff
path: root/devel/ncurses
diff options
context:
space:
mode:
Diffstat (limited to 'devel/ncurses')
-rw-r--r--devel/ncurses/Makefile15
-rw-r--r--devel/ncurses/PLIST18
2 files changed, 22 insertions, 11 deletions
diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile
index eccfd1ea901..efad627e034 100644
--- a/devel/ncurses/Makefile
+++ b/devel/ncurses/Makefile
@@ -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 @@ COMMENT= CRT screen handling and optimization package
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-w|/,/^$$/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-16color/,/^$$/d'
+SUBST_SED.ti+= -e '/^screen-256color/,/^$$/d'
.endif
post-configure:
diff --git a/devel/ncurses/PLIST b/devel/ncurses/PLIST
index 7b542777b24..25968c59fb3 100644
--- a/devel/ncurses/PLIST
+++ b/devel/ncurses/PLIST
@@ -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
${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