From 91168ec57880cf3ac7ccc26187844ebf05ed46a1 Mon Sep 17 00:00:00 2001 From: uebayasi Date: Mon, 22 Dec 2008 02:15:54 +0000 Subject: Garbage collect unused code. No functional changes. --- shells/zsh-current/PLIST | 4 +--- shells/zsh/Makefile.common | 24 ++++++++++-------------- shells/zsh/PLIST | 4 +--- 3 files changed, 12 insertions(+), 20 deletions(-) diff --git a/shells/zsh-current/PLIST b/shells/zsh-current/PLIST index f247b2e2396..69118423f5c 100644 --- a/shells/zsh-current/PLIST +++ b/shells/zsh-current/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2008/12/21 16:53:45 uebayasi Exp $ +@comment $NetBSD: PLIST,v 1.11 2008/12/22 02:15:54 uebayasi Exp $ bin/${PKGNAME} bin/zsh info/zsh.info @@ -31,8 +31,6 @@ ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/zprof.so ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/zpty.so ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/zselect.so ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/zutil.so -@comment ${PLIST.terminfo}lib/zsh/${PKGVERSION}/zsh/terminfo.so -@comment ${PLIST.shlibs}lib/zsh/libzsh-${PKGVERSION}.so man/man1/zsh.1 man/man1/zshall.1 man/man1/zshbuiltins.1 diff --git a/shells/zsh/Makefile.common b/shells/zsh/Makefile.common index 54f76c180e5..ab6e5cf5a36 100644 --- a/shells/zsh/Makefile.common +++ b/shells/zsh/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.49 2008/12/21 16:53:31 uebayasi Exp $ +# $NetBSD: Makefile.common,v 1.50 2008/12/22 02:15:54 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 terminfo shlibs +PLIST_VARS= dynamic ################################################################################ -_ZSH_OPSYS.OpenBSD= dynamic terminfo - ldflags tcsetpgrp -_ZSH_OPSYS.Linux= dynamic terminfo - ldflags tcsetpgrp -_ZSH_OPSYS.IRIX= dynamic terminfo - ldflags tcsetpgrp -_ZSH_OPSYS.Interix= dynamic terminfo shlibs ldflags notcsetpgrp -_ZSH_OPSYS.DragonFly= dynamic terminfo shlibs ldflags tcsetpgrp -_ZSH_OPSYS.FreeBSD= dynamic terminfo shlibs ldflags tcsetpgrp -_ZSH_OPSYS.SunOS= dynamic - - - tcsetpgrp +_ZSH_OPSYS.OpenBSD= dynamic ldflags tcsetpgrp +_ZSH_OPSYS.Linux= dynamic ldflags tcsetpgrp +_ZSH_OPSYS.IRIX= dynamic ldflags tcsetpgrp +_ZSH_OPSYS.Interix= dynamic ldflags notcsetpgrp +_ZSH_OPSYS.DragonFly= dynamic ldflags tcsetpgrp +_ZSH_OPSYS.FreeBSD= dynamic ldflags tcsetpgrp +_ZSH_OPSYS.SunOS= dynamic - tcsetpgrp -_ZSH_OPSYS.${OPSYS}?= dynamic - shlibs ldflags tcsetpgrp +_ZSH_OPSYS.${OPSYS}?= dynamic ldflags tcsetpgrp ################################################################################ @@ -70,8 +70,6 @@ _ZSH_LINKAGE.dynamic.BUILDLINK_PASSTHRU_RPATHDIRS= _ZSH_LINKAGE.dynamic.LDFLAGS= ${_ZSH_DYNAMIC_VARS.${_ZSH_OPSYS.${OPSYS}:Mldflags}} _ZSH_LINKAGE.dynamic.PLIST.dynamic= ${_ZSH_OPSYS.${OPSYS}:Mdynamic:?yes:no} -_ZSH_LINKAGE.dynamic.PLIST.terminfo= ${_ZSH_OPSYS.${OPSYS}:Mterminfo:?yes:no} -_ZSH_LINKAGE.dynamic.PLIST.shlibs= ${_ZSH_OPSYS.${OPSYS}:Mshlibs:?yes:no} ### @@ -88,8 +86,6 @@ CONFIGURE_ARGS+= ${_ZSH_LINKAGE.${_ZSH_LINKAGE}.CONFIGURE_ARGS} \ BUILDLINK_PASSTHRU_RPATHDIRS+= ${_ZSH_LINKAGE.${_ZSH_LINKAGE}.BUILDLINK_PASSTHRU_RPATHDIRS} LDFLAGS+= ${_ZSH_LINKAGE.${_ZSH_LINKAGE}.LDFLAGS} PLIST.dynamic= ${_ZSH_LINKAGE.${_ZSH_LINKAGE}.PLIST.dynamic} -PLIST.terminfo= ${_ZSH_LINKAGE.${_ZSH_LINKAGE}.PLIST.terminfo} -PLIST.shlibs= ${_ZSH_LINKAGE.${_ZSH_LINKAGE}.PLIST.shlibs} ################################################################################ diff --git a/shells/zsh/PLIST b/shells/zsh/PLIST index 712971096ea..7d32876afa1 100644 --- a/shells/zsh/PLIST +++ b/shells/zsh/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.19 2008/12/21 16:53:31 uebayasi Exp $ +@comment $NetBSD: PLIST,v 1.20 2008/12/22 02:15:54 uebayasi Exp $ bin/${PKGNAME} bin/zsh info/zsh.info @@ -612,8 +612,6 @@ ${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zftransfer ${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zftype ${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfuget ${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfuput -@comment ${PLIST.terminfo}lib/zsh/${PKGVERSION}/zsh/terminfo.so -@comment ${PLIST.shlibs}lib/zsh/libzsh-${PKGVERSION}.so @exec ${MKDIR} %D/share/zsh/site-functions @dirrm share/zsh/site-functions @dirrm share/zsh/${PKGVERSION}/functions -- cgit v1.2.3