[pkgsrc/trunk]: pkgsrc/shells Register extra shared objects used where ncurse...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/236685e38677
branches:  trunk
changeset: 552124:236685e38677
user:      uebayasi <uebayasi%pkgsrc.org@localhost>
date:      Sun Dec 28 14:52:05 2008 +0000

description:
Register extra shared objects used where ncurses exists.  Hopefully fix PLIST
errors reported by Takahiro Kambe (FreeBSD) and Aleksey Cheusov (Linux).

No bump because nothing changes on NetBSD.

diffstat:

 shells/zsh-current/PLIST   |   4 +++-
 shells/zsh/Makefile.common |  25 +++++++++++++++----------
 shells/zsh/PLIST           |   3 ++-
 3 files changed, 20 insertions(+), 12 deletions(-)

diffs (92 lines):

diff -r 41212d65368d -r 236685e38677 shells/zsh-current/PLIST
--- a/shells/zsh-current/PLIST  Sun Dec 28 14:01:14 2008 +0000
+++ b/shells/zsh-current/PLIST  Sun Dec 28 14:52:05 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2008/12/22 17:03:21 uebayasi Exp $
+@comment $NetBSD: PLIST,v 1.13 2008/12/28 14:52:05 uebayasi Exp $
 bin/${PKGNAME}
 bin/zsh
 info/zsh.info
@@ -8,6 +8,7 @@
 ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/complete.so
 ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/complist.so
 ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/computil.so
+${PLIST.dynamic}${PLIST.terminfo}lib/zsh/${PKGVERSION}/zsh/curses.so
 ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/datetime.so
 ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/deltochar.so
 ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/example.so
@@ -25,6 +26,7 @@
 ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/stat.so
 ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/system.so
 ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/termcap.so
+${PLIST.dynamic}${PLIST.terminfo}lib/zsh/${PKGVERSION}/zsh/terminfo.so
 ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/zftp.so
 ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/zle.so
 ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/zleparameter.so
diff -r 41212d65368d -r 236685e38677 shells/zsh/Makefile.common
--- a/shells/zsh/Makefile.common        Sun Dec 28 14:01:14 2008 +0000
+++ b/shells/zsh/Makefile.common        Sun Dec 28 14:52:05 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.52 2008/12/22 17:03:21 uebayasi Exp $
+# $NetBSD: Makefile.common,v 1.53 2008/12/28 14:52:05 uebayasi Exp $
 
 DISTNAME=      zsh-${ZSH_VERSION}
 CATEGORIES=    shells
@@ -34,19 +34,19 @@
 MAKE_JOBS_SAFE=        no
 INSTALL_TARGET=        install install.info
 PKG_SHELL=     bin/zsh
-PLIST_VARS=    dynamic
+PLIST_VARS=    dynamic terminfo
 
 ################################################################################
 
-_ZSH_OPSYS.OpenBSD=            ldflags tcsetpgrp
-_ZSH_OPSYS.Linux=              ldflags tcsetpgrp
-_ZSH_OPSYS.IRIX=               ldflags tcsetpgrp
-_ZSH_OPSYS.Interix=            ldflags notcsetpgrp
-_ZSH_OPSYS.DragonFly=          ldflags tcsetpgrp
-_ZSH_OPSYS.FreeBSD=            ldflags tcsetpgrp
-_ZSH_OPSYS.SunOS=              -       tcsetpgrp
+_ZSH_OPSYS.OpenBSD=            ldflags tcsetpgrp   -
+_ZSH_OPSYS.Linux=              ldflags tcsetpgrp   terminfo
+_ZSH_OPSYS.IRIX=               ldflags tcsetpgrp   -
+_ZSH_OPSYS.Interix=            ldflags notcsetpgrp -
+_ZSH_OPSYS.DragonFly=          ldflags tcsetpgrp   -
+_ZSH_OPSYS.FreeBSD=            ldflags tcsetpgrp   terminfo
+_ZSH_OPSYS.SunOS=              -       tcsetpgrp   -
 
-_ZSH_OPSYS.${OPSYS}?=          ldflags tcsetpgrp
+_ZSH_OPSYS.${OPSYS}?=          ldflags tcsetpgrp   -
 
 ################################################################################
 
@@ -74,6 +74,11 @@
 _ZSH_OPSYS_VARS.tcsetpgrp=     --with-tcsetpgrp
 _ZSH_OPSYS_VARS.notcsetpgrp=   --without-tcsetpgrp
 
+### terminfo (ncurses)
+.if !empty(_ZSH_OPSYS.${OPSYS}:Mterminfo)
+PLIST.terminfo=        yes
+.endif
+
 ################################################################################
 
 # XXXUEBAYASI old make(1) has problems to handle :?true_str:false_str
diff -r 41212d65368d -r 236685e38677 shells/zsh/PLIST
--- a/shells/zsh/PLIST  Sun Dec 28 14:01:14 2008 +0000
+++ b/shells/zsh/PLIST  Sun Dec 28 14:52:05 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2008/12/23 02:58:44 uebayasi Exp $
+@comment $NetBSD: PLIST,v 1.23 2008/12/28 14:52:05 uebayasi Exp $
 bin/${PKGNAME}
 bin/zsh
 info/zsh.info
@@ -23,6 +23,7 @@
 ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/stat.so
 ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/system.so
 ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/termcap.so
+${PLIST.dynamic}${PLIST.terminfo}lib/zsh/${PKGVERSION}/zsh/terminfo.so
 ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/zftp.so
 ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/zle.so
 ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/zleparameter.so