Thu Aug 16 13:30:28 2012 UTC ()
pkglint cleanup.


(wiz)
diff -r1.65 -r1.66 pkgsrc/shells/zsh/Makefile.common
diff -r1.2 -r1.3 pkgsrc/shells/zsh/hacks.mk
cvs diff -r1.65 -r1.66 pkgsrc/shells/zsh/Attic/Makefile.common (switch to unified diff)

--- pkgsrc/shells/zsh/Attic/Makefile.common 2012/07/22 10:03:40 1.65
+++ pkgsrc/shells/zsh/Attic/Makefile.common 2012/08/16 13:30:27 1.66
@@ -1,157 +1,157 @@ @@ -1,157 +1,157 @@
1# $NetBSD: Makefile.common,v 1.65 2012/07/22 10:03:40 ryoon Exp $ 1# $NetBSD: Makefile.common,v 1.66 2012/08/16 13:30:27 wiz Exp $
2# used by shells/zsh/Makefile 2# used by shells/zsh/Makefile
3# used by shells/zsh-current/Makefile 3# used by shells/zsh-current/Makefile
4 4
5DISTNAME= zsh-${ZSH_VERSION} 5DISTNAME= zsh-${ZSH_VERSION}
6CATEGORIES= shells 6CATEGORIES= shells
7MASTER_SITES= ftp://mirrors.dotsrc.org/zsh/ \ 7MASTER_SITES= ftp://mirrors.dotsrc.org/zsh/ \
8 ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/ \ 8 ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/ \
9 http://www.math.technion.ac.il/pub/zsh/ \ 9 http://www.math.technion.ac.il/pub/zsh/ \
10 ftp://ftp.zsh.org/zsh/ 10 ftp://ftp.zsh.org/zsh/
11EXTRACT_SUFX= .tar.bz2 11EXTRACT_SUFX= .tar.bz2
12 12
13MAINTAINER= ${ZSH_MAINTAINER} 13MAINTAINER= ${ZSH_MAINTAINER}
14HOMEPAGE= http://zsh.sourceforge.net/ 14HOMEPAGE= http://zsh.sourceforge.net/
15COMMENT= The Z shell 15COMMENT= The Z shell
16 16
17PKG_DESTDIR_SUPPORT= user-destdir 17PKG_DESTDIR_SUPPORT= user-destdir
18 18
19GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
20 20
21CONFIGURE_ARGS+= --enable-etcdir=${PKG_SYSCONFDIR:Q} 21CONFIGURE_ARGS+= --enable-etcdir=${PKG_SYSCONFDIR:Q}
22 22
23USE_TOOLS+= makeinfo 23USE_TOOLS+= makeinfo
24INFO_FILES= # PLIST 24INFO_FILES= yes
25TEXINFO_REQD= 4.0 25TEXINFO_REQD= 4.0
26 26
27PKG_INSTALLATION_TYPES= overwrite pkgviews 27PKG_INSTALLATION_TYPES= overwrite pkgviews
28 28
29.include "../../mk/bsd.prefs.mk" 29.include "../../mk/bsd.prefs.mk"
30 30
31.if ${OPSYS} == "Darwin" 31.if ${OPSYS} == "Darwin"
32#CONFIGURE_ENV+= INSTALL_PROGRAM=${INSTALL_LIB:Q} 32#CONFIGURE_ENV+= INSTALL_PROGRAM=${INSTALL_LIB:Q}
33INSTALL_UNSTRIPPED= yes 33INSTALL_UNSTRIPPED= yes
34.endif 34.endif
35 35
36PLIST_VARS+= xattr 36PLIST_VARS+= xattr
37.if exists(/usr/include/sys/xattr.h) 37.if exists(/usr/include/sys/xattr.h)
38PLIST.xattr= yes 38PLIST.xattr= yes
39.endif 39.endif
40 40
41# Handle any PKG_OPTIONS that this package might have. 41# Handle any PKG_OPTIONS that this package might have.
42.sinclude "options.mk" 42.sinclude "options.mk"
43 43
44BUILD_DEFS+= ZSH_STATIC 44BUILD_DEFS+= ZSH_STATIC
45MAKE_JOBS_SAFE= no 45MAKE_JOBS_SAFE= no
46INSTALL_TARGET= install install.info 46INSTALL_TARGET= install install.info
47PKG_SHELL= bin/zsh 47PKG_SHELL= bin/zsh
48PLIST_VARS+= dynamic terminfo curses 48PLIST_VARS+= dynamic terminfo curses
49 49
50################################################################################ 50################################################################################
51 51
52_ZSH_OPSYS.OpenBSD= ldflags tcsetpgrp 52_ZSH_OPSYS.OpenBSD= ldflags tcsetpgrp
53_ZSH_OPSYS.Linux= ldflags tcsetpgrp 53_ZSH_OPSYS.Linux= ldflags tcsetpgrp
54_ZSH_OPSYS.IRIX= ldflags tcsetpgrp 54_ZSH_OPSYS.IRIX= ldflags tcsetpgrp
55_ZSH_OPSYS.Interix= ldflags notcsetpgrp 55_ZSH_OPSYS.Interix= ldflags notcsetpgrp
56_ZSH_OPSYS.DragonFly= ldflags tcsetpgrp 56_ZSH_OPSYS.DragonFly= ldflags tcsetpgrp
57_ZSH_OPSYS.FreeBSD= ldflags tcsetpgrp 57_ZSH_OPSYS.FreeBSD= ldflags tcsetpgrp
58_ZSH_OPSYS.SunOS= - tcsetpgrp 58_ZSH_OPSYS.SunOS= - tcsetpgrp
59 59
60_ZSH_OPSYS.${OPSYS}?= ldflags tcsetpgrp 60_ZSH_OPSYS.${OPSYS}?= ldflags tcsetpgrp
61 61
62################################################################################ 62################################################################################
63 63
64### static 64### static
65 65
66_ZSH_LINKAGE.static.CONFIGURE_ARGS= --disable-dynamic 66_ZSH_LINKAGE.static.CONFIGURE_ARGS= --disable-dynamic
67_ZSH_LINKAGE.static.BUILDLINK_PASSTHRU_RPATHDIRS?= 67_ZSH_LINKAGE.static.BUILDLINK_PASSTHRU_RPATHDIRS?=
68_ZSH_LINKAGE.static.LDFLAGS?= -static 68_ZSH_LINKAGE.static.LDFLAGS?= -static
69 69
70### dynamic 70### dynamic
71 71
72_ZSH_DYNAMIC_VARS.ldflags= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/zsh 72_ZSH_DYNAMIC_VARS.ldflags= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/zsh
73 73
74_ZSH_LINKAGE.dynamic.CONFIGURE_ARGS= 74_ZSH_LINKAGE.dynamic.CONFIGURE_ARGS=
75_ZSH_LINKAGE.dynamic.BUILDLINK_PASSTHRU_RPATHDIRS= 75_ZSH_LINKAGE.dynamic.BUILDLINK_PASSTHRU_RPATHDIRS=
76# XXXUEBAYASI old make(1) has problems to handle :?true_str:false_str 76# XXXUEBAYASI old make(1) has problems to handle :?true_str:false_str
77#_ZSH_LINKAGE.dynamic.LDFLAGS= \ 77#_ZSH_LINKAGE.dynamic.LDFLAGS= \
78# ${_ZSH_OPSYS.${OPSYS}:Mldflags:?${_ZSH_DYNAMIC_VARS.ldflags}:} 78# ${_ZSH_OPSYS.${OPSYS}:Mldflags:?${_ZSH_DYNAMIC_VARS.ldflags}:}
79.if !empty(_ZSH_OPSYS.${OPSYS}:Mldflags) 79.if !empty(_ZSH_OPSYS.${OPSYS}:Mldflags)
80_ZSH_LINKAGE.dynamic.LDFLAGS= ${_ZSH_DYNAMIC_VARS.ldflags} 80_ZSH_LINKAGE.dynamic.LDFLAGS= ${_ZSH_DYNAMIC_VARS.ldflags}
81.endif 81.endif
82 82
83### tcsetpgrp 83### tcsetpgrp
84 84
85_ZSH_OPSYS_VARS.tcsetpgrp= --with-tcsetpgrp 85_ZSH_OPSYS_VARS.tcsetpgrp= --with-tcsetpgrp
86_ZSH_OPSYS_VARS.notcsetpgrp= --without-tcsetpgrp 86_ZSH_OPSYS_VARS.notcsetpgrp= --without-tcsetpgrp
87 87
88### terminfo 88### terminfo
89CHECK_BUILTIN.terminfo= yes 89CHECK_BUILTIN.terminfo= yes
90.include "../../mk/terminfo.builtin.mk" 90.include "../../mk/terminfo.builtin.mk"
91.if !empty(USE_BUILTIN.terminfo:M[Yy][Ee][Ss]) 91.if !empty(USE_BUILTIN.terminfo:M[Yy][Ee][Ss])
92PLIST.terminfo= yes 92PLIST.terminfo= yes
93.endif 93.endif
94 94
95### curses 95### curses
96.if empty(MACHINE_PLATFORM:MNetBSD-[0-9]*) 96.if empty(MACHINE_PLATFORM:MNetBSD-[0-9]*)
97CHECK_BUILTIN.curses= yes 97CHECK_BUILTIN.curses= yes
98.include "../../mk/curses.builtin.mk" 98.include "../../mk/curses.builtin.mk"
99.if !empty(USE_BUILTIN.curses:M[Yy][Ee][Ss]) 99.if !empty(USE_BUILTIN.curses:M[Yy][Ee][Ss])
100PLIST.curses= yes 100PLIST.curses= yes
101.endif 101.endif
102.endif 102.endif
103 103
104################################################################################ 104################################################################################
105 105
106# XXXUEBAYASI old make(1) has problems to handle :?true_str:false_str 106# XXXUEBAYASI old make(1) has problems to handle :?true_str:false_str
107#_ZSH_LINKAGE= ${ZSH_STATIC:M[Yy][Ee][Ss]:?static:dynamic} # static / dynamic 107#_ZSH_LINKAGE= ${ZSH_STATIC:M[Yy][Ee][Ss]:?static:dynamic} # static / dynamic
108ZSH_STATIC?= no 108ZSH_STATIC?= no
109.if !empty(ZSH_STATIC:M[Yy][Ee][Ss]) 109.if !empty(ZSH_STATIC:M[Yy][Ee][Ss])
110_ZSH_LINKAGE= static 110_ZSH_LINKAGE= static
111.else 111.else
112_ZSH_LINKAGE= dynamic 112_ZSH_LINKAGE= dynamic
113.endif 113.endif
114 114
115CONFIGURE_ARGS+= ${_ZSH_LINKAGE.${_ZSH_LINKAGE}.CONFIGURE_ARGS} \ 115CONFIGURE_ARGS+= ${_ZSH_LINKAGE.${_ZSH_LINKAGE}.CONFIGURE_ARGS} \
116 ${_ZSH_OPSYS_VARS.${_ZSH_OPSYS.${OPSYS}:Mtcsetpgrp}} \ 116 ${_ZSH_OPSYS_VARS.${_ZSH_OPSYS.${OPSYS}:Mtcsetpgrp}} \
117 ${_ZSH_OPSYS_VARS.${_ZSH_OPSYS.${OPSYS}:Mnotcsetpgrp}} 117 ${_ZSH_OPSYS_VARS.${_ZSH_OPSYS.${OPSYS}:Mnotcsetpgrp}}
118BUILDLINK_PASSTHRU_RPATHDIRS+= ${_ZSH_LINKAGE.${_ZSH_LINKAGE}.BUILDLINK_PASSTHRU_RPATHDIRS} 118BUILDLINK_PASSTHRU_RPATHDIRS+= ${_ZSH_LINKAGE.${_ZSH_LINKAGE}.BUILDLINK_PASSTHRU_RPATHDIRS}
119LDFLAGS+= ${_ZSH_LINKAGE.${_ZSH_LINKAGE}.LDFLAGS} 119LDFLAGS+= ${_ZSH_LINKAGE.${_ZSH_LINKAGE}.LDFLAGS}
120.if ${_ZSH_LINKAGE} == dynamic 120.if ${_ZSH_LINKAGE} == dynamic
121PLIST.dynamic= yes 121PLIST.dynamic= yes
122.endif 122.endif
123 123
124################################################################################ 124################################################################################
125 125
126.undef MANZ 126.undef MANZ
127 127
128pre-install: 128pre-install:
129 @cd ${WRKSRC}/Completion; ${FIND} . -name \*.orig -exec ${RM} \{\} \; 129 cd ${WRKSRC}/Completion; ${FIND} . -name \*.orig -exec ${RM} \{\} \;
130 130
 131INSTALLATION_DIRS+= share/doc/zsh
131post-install: 132post-install:
132 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/zsh 
133 cd ${WRKSRC}/Etc && ${INSTALL_DATA} BUGS FAQ \ 133 cd ${WRKSRC}/Etc && ${INSTALL_DATA} BUGS FAQ \
134 ${DESTDIR}${PREFIX}/share/doc/zsh 134 ${DESTDIR}${PREFIX}/share/doc/zsh
135 cd ${WRKSRC} && ${INSTALL_DATA} FEATURES NEWS \ 135 cd ${WRKSRC} && ${INSTALL_DATA} FEATURES NEWS \
136 ${DESTDIR}${PREFIX}/share/doc/zsh 136 ${DESTDIR}${PREFIX}/share/doc/zsh
137 137
138# Utilize Zsh's test framework. 138# Utilize Zsh's test framework.
139# Testing of dynamic shell only works after install has been done 139# Testing of dynamic shell only works after install has been done
140# 140#
141.PHONY: do-test do-su-test real-su-test 141.PHONY: do-test do-su-test real-su-test
142 142
143do-test: do-su-test 143do-test: do-su-test
144 144
145do-su-test: 145do-su-test:
146 @${_PKG_SILENT}${_PKG_DEBUG} \ 146 ${RUN} \
147 ${ECHO_MSG} "*** Warning: This test needs to be run as root" 147 ${ECHO_MSG} "*** Warning: This test needs to be run as root"
148 @${_PKG_SILENT}${_PKG_DEBUG} \ 148 ${RUN} \
149 realtarget="real-su-test"; \ 149 realtarget="real-su-test"; \
150 action="install"; \ 150 action="install"; \
151 ${_SU_TARGET} 151 ${_SU_TARGET}
152 152
153real-su-test: 153real-su-test:
154 @${_PKG_SILENT}${_PKG_DEBUG} \ 154 ${RUN} \
155 ${ECHO_MSG} "${_PKGSRC_IN}> Testing for ${PKGNAME}" 155 ${ECHO_MSG} "${_PKGSRC_IN}> Testing for ${PKGNAME}"
156 @cd ${WRKSRC} && ${MAKE} check 156 cd ${WRKSRC} && ${MAKE} check
157 @cd ${WRKSRC}/Test && ${MAKE} clean 157 cd ${WRKSRC}/Test && ${MAKE} clean
cvs diff -r1.2 -r1.3 pkgsrc/shells/zsh/Attic/hacks.mk (switch to unified diff)

--- pkgsrc/shells/zsh/Attic/hacks.mk 2008/12/22 14:38:31 1.2
+++ pkgsrc/shells/zsh/Attic/hacks.mk 2012/08/16 13:30:27 1.3
@@ -1,22 +1,24 @@ @@ -1,22 +1,24 @@
 1# $NetBSD: hacks.mk,v 1.3 2012/08/16 13:30:27 wiz Exp $
 2
1.if !defined(ZSH_HACKS_MK) 3.if !defined(ZSH_HACKS_MK)
2ZSH_HACKS_MK= defined 4ZSH_HACKS_MK= defined
3 5
4### [Sun Dec 21 02:00:19 JST 2008 : uebayasi] 6### [Sun Dec 21 02:00:19 JST 2008 : uebayasi]
5### Built a dynamically linked "zsh" binary on NetBSD systems which use 7### Built a dynamically linked "zsh" binary on NetBSD systems which use
6### dynamically linked binaries on the root filesystem. The binary will 8### dynamically linked binaries on the root filesystem. The binary will
7### 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
8### root filesystem. We use "-rpath" below by purpose because the 10### root filesystem. We use "-rpath" below by purpose because the
9### buildlink 3 framework won't filter it out. 11### buildlink 3 framework won't filter it out.
10NETBSD_SHLINKER= /libexec/ld.elf_so # XXX move elsewhere 12NETBSD_SHLINKER= /libexec/ld.elf_so # XXX move elsewhere
11NETBSD_SHLIBDIR= /lib # XXX move elsewhere 13NETBSD_SHLIBDIR= /lib # XXX move elsewhere
12.if ${OPSYS} == "NetBSD" && \ 14.if ${OPSYS} == "NetBSD" && \
13 defined(OBJECT_FMT) && ${OBJECT_FMT} == "ELF" && \ 15 defined(OBJECT_FMT) && ${OBJECT_FMT} == "ELF" && \
14 defined(MKDYNAMICROOT) && ${MKDYNAMICROOT} != "no" && \ 16 defined(MKDYNAMICROOT) && ${MKDYNAMICROOT} != "no" && \
15 defined(NETBSD_SHLINKER) && exists(${NETBSD_SHLINKER}) && \ 17 defined(NETBSD_SHLINKER) && exists(${NETBSD_SHLINKER}) && \
16 defined(NETBSD_SHLIBDIR) && exists(${NETBSD_SHLIBDIR}) 18 defined(NETBSD_SHLIBDIR) && exists(${NETBSD_SHLIBDIR})
17PKG_HACKS+= static-dynamic 19PKG_HACKS+= static-dynamic
18_ZSH_LINKAGE.static.BUILDLINK_PASSTHRU_RPATHDIRS= ${NETBSD_SHLIBDIR} 20_ZSH_LINKAGE.static.BUILDLINK_PASSTHRU_RPATHDIRS= ${NETBSD_SHLIBDIR}
19_ZSH_LINKAGE.static.LDFLAGS= -Wl,-dynamic-linker=${NETBSD_SHLINKER} -Wl,-R${NETBSD_SHLIBDIR} 21_ZSH_LINKAGE.static.LDFLAGS= -Wl,-dynamic-linker=${NETBSD_SHLINKER} -Wl,-R${NETBSD_SHLIBDIR}
20.endif 22.endif
21 23
22.endif # ZSH_HACKS_MK 24.endif # ZSH_HACKS_MK