Sat Jun 11 23:34:07 2016 UTC ()
pkglint whitespace


(dholland)
diff -r1.74 -r1.75 pkgsrc/shells/zsh/Makefile
diff -r1.79 -r1.80 pkgsrc/shells/zsh/Makefile.common
diff -r1.3 -r1.4 pkgsrc/shells/zsh/hacks.mk
cvs diff -r1.74 -r1.75 pkgsrc/shells/zsh/Makefile (expand / switch to unified diff)

--- pkgsrc/shells/zsh/Makefile 2015/12/08 11:24:59 1.74
+++ pkgsrc/shells/zsh/Makefile 2016/06/11 23:34:07 1.75
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1# $NetBSD: Makefile,v 1.74 2015/12/08 11:24:59 szptvlfn Exp $ 1# $NetBSD: Makefile,v 1.75 2016/06/11 23:34:07 dholland Exp $
2 2
3.include "../../shells/zsh/Makefile.common" 3.include "../../shells/zsh/Makefile.common"
4 4
5ZSH_VERSION= 5.2 5ZSH_VERSION= 5.2
6ZSH_MAINTAINER= uebayasi@NetBSD.org 6ZSH_MAINTAINER= uebayasi@NetBSD.org
7 7
8CONFIGURE_ARGS+= --disable-gdbm 8CONFIGURE_ARGS+= --disable-gdbm
9 9
10SUBST_CLASSES+= prefix-fixup 10SUBST_CLASSES+= prefix-fixup
11SUBST_STAGE.prefix-fixup= pre-configure 11SUBST_STAGE.prefix-fixup= pre-configure
12SUBST_FILES.prefix-fixup= \ 12SUBST_FILES.prefix-fixup= \
13 Misc/globtests \ 13 Misc/globtests \
14 Misc/globtests.ksh \ 14 Misc/globtests.ksh \
15 Test/ztst.zsh \ 15 Test/ztst.zsh \
16 Test/runtests.zsh \ 16 Test/runtests.zsh \
17 Util/reporter \ 17 Util/reporter \
18 Functions/Calendar/calendar_add \ 18 Functions/Calendar/calendar_add \
19 Functions/Misc/run-help \ 19 Functions/Misc/run-help \
20 Functions/Misc/run-help-ip \ 20 Functions/Misc/run-help-ip \
21 Functions/Misc/checkmail \ 21 Functions/Misc/checkmail \
22 Functions/Misc/sticky-note \ 22 Functions/Misc/sticky-note \
23 Functions/Misc/zcalc \ 23 Functions/Misc/zcalc \
24 Functions/Misc/zkbd \ 24 Functions/Misc/zkbd \
25 Functions/Misc/zed \ 25 Functions/Misc/zed \
26 Functions/Example/cat \ 26 Functions/Example/cat \
27 Functions/Example/zless 27 Functions/Example/zless
28SUBST_SED.prefix-fixup= -e 's|^\#\!/bin/zsh|\#\!${PREFIX}/bin/zsh|g' 28SUBST_SED.prefix-fixup= -e 's|^\#\!/bin/zsh|\#\!${PREFIX}/bin/zsh|g'
29SUBST_SED.prefix-fixup+= -e 's|^\#\! /bin/zsh|\#\! ${PREFIX}/bin/zsh|g' 29SUBST_SED.prefix-fixup+= -e 's|^\#\! /bin/zsh|\#\! ${PREFIX}/bin/zsh|g'
30SUBST_SED.prefix-fixup+= -e 's|^\#\!/usr/local/bin/zsh|\#\!${PREFIX}/bin/zsh|g' 30SUBST_SED.prefix-fixup+= -e 's|^\#\!/usr/local/bin/zsh|\#\!${PREFIX}/bin/zsh|g'
31SUBST_SED.prefix-fixup+= -e 's|^\#\! /usr/local/bin/zsh|\#\! ${PREFIX}/bin/zsh|g' 31SUBST_SED.prefix-fixup+= -e 's|^\#\! /usr/local/bin/zsh|\#\! ${PREFIX}/bin/zsh|g'
32SUBST_SED.prefix-fixup+= -e 's|^\#\! zsh|\#\! ${PREFIX}/bin/zsh|g' 32SUBST_SED.prefix-fixup+= -e 's|^\#\! zsh|\#\! ${PREFIX}/bin/zsh|g'
33 33
34.include "../../mk/bsd.pkg.mk" 34.include "../../mk/bsd.pkg.mk"
cvs diff -r1.79 -r1.80 pkgsrc/shells/zsh/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/shells/zsh/Attic/Makefile.common 2016/05/05 06:28:58 1.79
+++ pkgsrc/shells/zsh/Attic/Makefile.common 2016/06/11 23:34:07 1.80
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.79 2016/05/05 06:28:58 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.80 2016/06/11 23:34:07 dholland Exp $
2# used by shells/zsh/Makefile 2# used by shells/zsh/Makefile
3 3
4DISTNAME= zsh-${ZSH_VERSION} 4DISTNAME= zsh-${ZSH_VERSION}
5CATEGORIES= shells 5CATEGORIES= shells
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=zsh/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=zsh/}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= ${ZSH_MAINTAINER} 9MAINTAINER= ${ZSH_MAINTAINER}
10HOMEPAGE= http://zsh.sourceforge.net/ 10HOMEPAGE= http://zsh.sourceforge.net/
11COMMENT= The Z shell 11COMMENT= The Z shell
12 12
13GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
14 14
@@ -50,29 +50,29 @@ _ZSH_OPSYS.OpenBSD= ldflags tcsetpgrp @@ -50,29 +50,29 @@ _ZSH_OPSYS.OpenBSD= ldflags tcsetpgrp
50_ZSH_OPSYS.Linux= ldflags tcsetpgrp 50_ZSH_OPSYS.Linux= ldflags tcsetpgrp
51_ZSH_OPSYS.IRIX= ldflags tcsetpgrp 51_ZSH_OPSYS.IRIX= ldflags tcsetpgrp
52_ZSH_OPSYS.Interix= ldflags notcsetpgrp 52_ZSH_OPSYS.Interix= ldflags notcsetpgrp
53_ZSH_OPSYS.DragonFly= ldflags tcsetpgrp 53_ZSH_OPSYS.DragonFly= ldflags tcsetpgrp
54_ZSH_OPSYS.FreeBSD= ldflags tcsetpgrp 54_ZSH_OPSYS.FreeBSD= ldflags tcsetpgrp
55_ZSH_OPSYS.SunOS= - tcsetpgrp 55_ZSH_OPSYS.SunOS= - tcsetpgrp
56 56
57_ZSH_OPSYS.${OPSYS}?= ldflags tcsetpgrp 57_ZSH_OPSYS.${OPSYS}?= ldflags tcsetpgrp
58 58
59################################################################################ 59################################################################################
60 60
61### static 61### static
62 62
63_ZSH_LINKAGE.static.CONFIGURE_ARGS= --disable-dynamic 63_ZSH_LINKAGE.static.CONFIGURE_ARGS= --disable-dynamic
64_ZSH_LINKAGE.static.BUILDLINK_PASSTHRU_RPATHDIRS?= 64_ZSH_LINKAGE.static.BUILDLINK_PASSTHRU_RPATHDIRS?=
65_ZSH_LINKAGE.static.LDFLAGS?= -static 65_ZSH_LINKAGE.static.LDFLAGS?= -static
66 66
67### dynamic 67### dynamic
68 68
69_ZSH_DYNAMIC_VARS.ldflags= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/zsh 69_ZSH_DYNAMIC_VARS.ldflags= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/zsh
70 70
71_ZSH_LINKAGE.dynamic.CONFIGURE_ARGS= 71_ZSH_LINKAGE.dynamic.CONFIGURE_ARGS=
72_ZSH_LINKAGE.dynamic.BUILDLINK_PASSTHRU_RPATHDIRS= 72_ZSH_LINKAGE.dynamic.BUILDLINK_PASSTHRU_RPATHDIRS=
73# XXXUEBAYASI old make(1) has problems to handle :?true_str:false_str 73# XXXUEBAYASI old make(1) has problems to handle :?true_str:false_str
74#_ZSH_LINKAGE.dynamic.LDFLAGS= \ 74#_ZSH_LINKAGE.dynamic.LDFLAGS= \
75# ${_ZSH_OPSYS.${OPSYS}:Mldflags:?${_ZSH_DYNAMIC_VARS.ldflags}:} 75# ${_ZSH_OPSYS.${OPSYS}:Mldflags:?${_ZSH_DYNAMIC_VARS.ldflags}:}
76.if !empty(_ZSH_OPSYS.${OPSYS}:Mldflags) 76.if !empty(_ZSH_OPSYS.${OPSYS}:Mldflags)
77_ZSH_LINKAGE.dynamic.LDFLAGS= ${_ZSH_DYNAMIC_VARS.ldflags} 77_ZSH_LINKAGE.dynamic.LDFLAGS= ${_ZSH_DYNAMIC_VARS.ldflags}
78.endif 78.endif
@@ -83,48 +83,48 @@ _ZSH_OPSYS_VARS.tcsetpgrp= --with-tcsetp @@ -83,48 +83,48 @@ _ZSH_OPSYS_VARS.tcsetpgrp= --with-tcsetp
83_ZSH_OPSYS_VARS.notcsetpgrp= --without-tcsetpgrp 83_ZSH_OPSYS_VARS.notcsetpgrp= --without-tcsetpgrp
84 84
85### terminfo 85### terminfo
86CHECK_BUILTIN.terminfo= yes 86CHECK_BUILTIN.terminfo= yes
87.include "../../mk/terminfo.builtin.mk" 87.include "../../mk/terminfo.builtin.mk"
88.if !empty(USE_BUILTIN.terminfo:M[Yy][Ee][Ss]) || ${OPSYS} == "SunOS" || ${OPSYS} == "Linux" 88.if !empty(USE_BUILTIN.terminfo:M[Yy][Ee][Ss]) || ${OPSYS} == "SunOS" || ${OPSYS} == "Linux"
89PLIST.terminfo= yes 89PLIST.terminfo= yes
90.endif 90.endif
91 91
92### curses 92### curses
93.if empty(MACHINE_PLATFORM:MNetBSD-[0-9]*) && empty(MACHINE_PLATFORM:MGNUkFreeBSD-[0-9]*) 93.if empty(MACHINE_PLATFORM:MNetBSD-[0-9]*) && empty(MACHINE_PLATFORM:MGNUkFreeBSD-[0-9]*)
94CHECK_BUILTIN.curses= yes 94CHECK_BUILTIN.curses= yes
95.include "../../mk/curses.builtin.mk" 95.include "../../mk/curses.builtin.mk"
96.if !empty(USE_BUILTIN.curses:M[Yy][Ee][Ss]) || ${OPSYS} == "SunOS" || ${OPSYS} == "Linux" 96. if !empty(USE_BUILTIN.curses:M[Yy][Ee][Ss]) || ${OPSYS} == "SunOS" || ${OPSYS} == "Linux"
97PLIST.curses= yes 97PLIST.curses= yes
98.endif 98. endif
99.endif 99.endif
100 100
101################################################################################ 101################################################################################
102 102
103# XXXUEBAYASI old make(1) has problems to handle :?true_str:false_str 103# XXXUEBAYASI old make(1) has problems to handle :?true_str:false_str
104#_ZSH_LINKAGE= ${ZSH_STATIC:M[Yy][Ee][Ss]:?static:dynamic} # static / dynamic 104#_ZSH_LINKAGE= ${ZSH_STATIC:M[Yy][Ee][Ss]:?static:dynamic} # static / dynamic
105.if !empty(PKG_OPTIONS:Mstatic) 105.if !empty(PKG_OPTIONS:Mstatic)
106_ZSH_LINKAGE= static 106_ZSH_LINKAGE= static
107.else 107.else
108_ZSH_LINKAGE= dynamic 108_ZSH_LINKAGE= dynamic
109.endif 109.endif
110 110
111CONFIGURE_ARGS+= ${_ZSH_LINKAGE.${_ZSH_LINKAGE}.CONFIGURE_ARGS} \ 111CONFIGURE_ARGS+= ${_ZSH_LINKAGE.${_ZSH_LINKAGE}.CONFIGURE_ARGS} \
112 ${_ZSH_OPSYS_VARS.${_ZSH_OPSYS.${OPSYS}:Mtcsetpgrp}} \ 112 ${_ZSH_OPSYS_VARS.${_ZSH_OPSYS.${OPSYS}:Mtcsetpgrp}} \
113 ${_ZSH_OPSYS_VARS.${_ZSH_OPSYS.${OPSYS}:Mnotcsetpgrp}} 113 ${_ZSH_OPSYS_VARS.${_ZSH_OPSYS.${OPSYS}:Mnotcsetpgrp}}
114BUILDLINK_PASSTHRU_RPATHDIRS+= ${_ZSH_LINKAGE.${_ZSH_LINKAGE}.BUILDLINK_PASSTHRU_RPATHDIRS} 114BUILDLINK_PASSTHRU_RPATHDIRS+= ${_ZSH_LINKAGE.${_ZSH_LINKAGE}.BUILDLINK_PASSTHRU_RPATHDIRS}
115LDFLAGS+= ${_ZSH_LINKAGE.${_ZSH_LINKAGE}.LDFLAGS} 115LDFLAGS+= ${_ZSH_LINKAGE.${_ZSH_LINKAGE}.LDFLAGS}
116.if ${_ZSH_LINKAGE} == dynamic 116.if ${_ZSH_LINKAGE} == dynamic
117PLIST.dynamic= yes 117PLIST.dynamic= yes
118.endif 118.endif
119 119
120################################################################################ 120################################################################################
121 121
122.undef MANZ 122.undef MANZ
123 123
124.if ${OPSYS} == "SunOS" || ${OPSYS} == "Interix" 124.if ${OPSYS} == "SunOS" || ${OPSYS} == "Interix"
125do-patch: 125do-patch:
126# $ sha1 files/patch-ac 126# $ sha1 files/patch-ac
127# SHA1 (files/patch-ac) = 0ef6928bbb277dfbcd8aff4f6fde9bdf1c3de483 127# SHA1 (files/patch-ac) = 0ef6928bbb277dfbcd8aff4f6fde9bdf1c3de483
128 ${PATCH} -d ${WRKSRC} -i ${FILESDIR}/patch-ac 128 ${PATCH} -d ${WRKSRC} -i ${FILESDIR}/patch-ac
129.endif 129.endif
130 130
cvs diff -r1.3 -r1.4 pkgsrc/shells/zsh/Attic/hacks.mk (expand / switch to unified diff)

--- pkgsrc/shells/zsh/Attic/hacks.mk 2012/08/16 13:30:27 1.3
+++ pkgsrc/shells/zsh/Attic/hacks.mk 2016/06/11 23:34:07 1.4
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: hacks.mk,v 1.3 2012/08/16 13:30:27 wiz Exp $ 1# $NetBSD: hacks.mk,v 1.4 2016/06/11 23:34:07 dholland Exp $
2 2
3.if !defined(ZSH_HACKS_MK) 3.if !defined(ZSH_HACKS_MK)
4ZSH_HACKS_MK= defined 4ZSH_HACKS_MK= defined
5 5
6### [Sun Dec 21 02:00:19 JST 2008 : uebayasi] 6### [Sun Dec 21 02:00:19 JST 2008 : uebayasi]
7### Built a dynamically linked "zsh" binary on NetBSD systems which use 7### Built a dynamically linked "zsh" binary on NetBSD systems which use
8### dynamically linked binaries on the root filesystem. The binary will 8### dynamically linked binaries on the root filesystem. The binary will
9### only depend on the run-time link-editor and shared libraries on the 9### only depend on the run-time link-editor and shared libraries on the
10### root filesystem. We use "-rpath" below by purpose because the 10### root filesystem. We use "-rpath" below by purpose because the
11### buildlink 3 framework won't filter it out. 11### buildlink 3 framework won't filter it out.
12NETBSD_SHLINKER= /libexec/ld.elf_so # XXX move elsewhere 12NETBSD_SHLINKER= /libexec/ld.elf_so # XXX move elsewhere
13NETBSD_SHLIBDIR= /lib # XXX move elsewhere 13NETBSD_SHLIBDIR= /lib # XXX move elsewhere
14.if ${OPSYS} == "NetBSD" && \ 14.if ${OPSYS} == "NetBSD" && \
15 defined(OBJECT_FMT) && ${OBJECT_FMT} == "ELF" && \ 15 defined(OBJECT_FMT) && ${OBJECT_FMT} == "ELF" && \
16 defined(MKDYNAMICROOT) && ${MKDYNAMICROOT} != "no" && \ 16 defined(MKDYNAMICROOT) && ${MKDYNAMICROOT} != "no" && \
17 defined(NETBSD_SHLINKER) && exists(${NETBSD_SHLINKER}) && \ 17 defined(NETBSD_SHLINKER) && exists(${NETBSD_SHLINKER}) && \