diff options
| author | uebayasi <uebayasi> | 2008-12-28 14:52:05 +0000 |
|---|---|---|
| committer | uebayasi <uebayasi> | 2008-12-28 14:52:05 +0000 |
| commit | 9a0a4a82357b5bafc8df7b122a91d864204fff94 (patch) | |
| tree | 1816742febbad0567cc08e0d70378668d3d436a2 /shells | |
| parent | dae7811c6cef7f6db5a690ebbf203fda721d41f9 (diff) | |
| download | pkgsrc-9a0a4a82357b5bafc8df7b122a91d864204fff94.tar.gz | |
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 (limited to 'shells')
| -rw-r--r-- | shells/zsh-current/PLIST | 4 | ||||
| -rw-r--r-- | shells/zsh/Makefile.common | 25 | ||||
| -rw-r--r-- | shells/zsh/PLIST | 3 |
3 files changed, 20 insertions, 12 deletions
diff --git a/shells/zsh-current/PLIST b/shells/zsh-current/PLIST index ff9fbe093be..0031a28ffbb 100644 --- a/shells/zsh-current/PLIST +++ b/shells/zsh-current/PLIST @@ -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/compctl.so ${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/sched.so ${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 --git a/shells/zsh/Makefile.common b/shells/zsh/Makefile.common index a7e27768fd3..11b86ea8267 100644 --- a/shells/zsh/Makefile.common +++ b/shells/zsh/Makefile.common @@ -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 @@ BUILD_DEFS+= ZSH_STATIC 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_LINKAGE.dynamic.LDFLAGS= ${_ZSH_DYNAMIC_VARS.ldflags} _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 --git a/shells/zsh/PLIST b/shells/zsh/PLIST index 4de03af5494..dfdf7917203 100644 --- a/shells/zsh/PLIST +++ b/shells/zsh/PLIST @@ -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/sched.so ${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 |