summaryrefslogtreecommitdiff
path: root/shells/zsh
diff options
context:
space:
mode:
authoruebayasi <uebayasi@pkgsrc.org>2008-12-28 14:52:05 +0000
committeruebayasi <uebayasi@pkgsrc.org>2008-12-28 14:52:05 +0000
commit503a6cb56363065b63fa8860b6df5aab9b845861 (patch)
tree1816742febbad0567cc08e0d70378668d3d436a2 /shells/zsh
parent3320604da04102851788b76ddc9edf72c1fa6348 (diff)
downloadpkgsrc-503a6cb56363065b63fa8860b6df5aab9b845861.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/zsh')
-rw-r--r--shells/zsh/Makefile.common25
-rw-r--r--shells/zsh/PLIST3
2 files changed, 17 insertions, 11 deletions
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