Import of pkgsrc-2015Q3

shells/zsh/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.69 2015/06/13 12:57:28 ryoon Exp $
+# $NetBSD: Makefile,v 1.72 2015/09/02 10:54:29 szptvlfn Exp $
 
 .include "../../shells/zsh/Makefile.common"
 
-ZSH_VERSION=	5.0.8
+ZSH_VERSION=	5.1
 ZSH_MAINTAINER=	uebayasi@NetBSD.org
 
 CONFIGURE_ARGS+=	--disable-gdbm

shells/zsh/Makefile.common

@@ -1,11 +1,10 @@
-# $NetBSD: Makefile.common,v 1.75 2015/06/04 15:08:14 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.78 2015/09/07 12:02:06 jperkin Exp $
 # used by shells/zsh/Makefile
-# used by shells/zsh-current/Makefile
 
 DISTNAME=	zsh-${ZSH_VERSION}
 CATEGORIES=	shells
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=zsh/}
-EXTRACT_SUFX=	.tar.bz2
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	${ZSH_MAINTAINER}
 HOMEPAGE=	http://zsh.sourceforge.net/
@@ -22,11 +21,6 @@ TEXINFO_REQD=		4.0
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "Darwin"
-#CONFIGURE_ENV+=		INSTALL_PROGRAM=${INSTALL_LIB:Q}
-INSTALL_UNSTRIPPED=	yes
-.endif
-
 .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) && ${OPSYS} == "NetBSD"
 # These can't be detected automagically in cross-builds.
 CONFIGURE_ENV+=		zsh_cv_shared_environ=yes
@@ -127,6 +121,13 @@ PLIST.dynamic=	yes
 
 .undef MANZ
 
+.if ${OPSYS} == "SunOS" || ${OPSYS} == "Interix"
+do-patch:
+	# $ sha1 files/patch-ac
+	# SHA1 (files/patch-ac) = 0ef6928bbb277dfbcd8aff4f6fde9bdf1c3de483
+	${PATCH} -d ${WRKSRC} -i ${FILESDIR}/patch-ac
+.endif
+
 pre-install:
 	cd ${WRKSRC}/Completion; ${FIND} . -name \*.orig -exec ${RM} \{\} \;
 

shells/zsh/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.31 2015/06/13 12:57:28 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.32 2015/09/02 10:54:29 szptvlfn Exp $
 bin/zsh
 bin/${PKGNAME}
 info/zsh.info
@@ -136,6 +136,7 @@ share/zsh/${PKGVERSION}/functions/_bash_completions
 share/zsh/${PKGVERSION}/functions/_baz
 share/zsh/${PKGVERSION}/functions/_be_name
 share/zsh/${PKGVERSION}/functions/_beadm
+share/zsh/${PKGVERSION}/functions/_beep
 share/zsh/${PKGVERSION}/functions/_bind_addresses
 share/zsh/${PKGVERSION}/functions/_bindkey
 share/zsh/${PKGVERSION}/functions/_bison
@@ -182,6 +183,7 @@ share/zsh/${PKGVERSION}/functions/_comm
 share/zsh/${PKGVERSION}/functions/_command
 share/zsh/${PKGVERSION}/functions/_command_names
 share/zsh/${PKGVERSION}/functions/_comp_locale
+share/zsh/${PKGVERSION}/functions/_compadd
 share/zsh/${PKGVERSION}/functions/_compdef
 share/zsh/${PKGVERSION}/functions/_complete
 share/zsh/${PKGVERSION}/functions/_complete_debug
@@ -214,6 +216,8 @@ share/zsh/${PKGVERSION}/functions/_cygstart
 share/zsh/${PKGVERSION}/functions/_dak
 share/zsh/${PKGVERSION}/functions/_darcs
 share/zsh/${PKGVERSION}/functions/_date
+share/zsh/${PKGVERSION}/functions/_date_formats
+share/zsh/${PKGVERSION}/functions/_dates
 share/zsh/${PKGVERSION}/functions/_dbus
 share/zsh/${PKGVERSION}/functions/_dchroot
 share/zsh/${PKGVERSION}/functions/_dchroot-dsa
@@ -223,6 +227,7 @@ share/zsh/${PKGVERSION}/functions/_dd
 share/zsh/${PKGVERSION}/functions/_deb_architectures
 share/zsh/${PKGVERSION}/functions/_deb_packages
 share/zsh/${PKGVERSION}/functions/_debchange
+share/zsh/${PKGVERSION}/functions/_debcheckout
 share/zsh/${PKGVERSION}/functions/_debdiff
 share/zsh/${PKGVERSION}/functions/_debfoster
 share/zsh/${PKGVERSION}/functions/_debsign
@@ -250,6 +255,7 @@ share/zsh/${PKGVERSION}/functions/_django
 share/zsh/${PKGVERSION}/functions/_dladm
 share/zsh/${PKGVERSION}/functions/_dlocate
 share/zsh/${PKGVERSION}/functions/_dmidecode
+share/zsh/${PKGVERSION}/functions/_dnf
 share/zsh/${PKGVERSION}/functions/_domains
 share/zsh/${PKGVERSION}/functions/_dpatch-edit-patch
 share/zsh/${PKGVERSION}/functions/_dpkg
@@ -513,6 +519,7 @@ share/zsh/${PKGVERSION}/functions/_pack
 share/zsh/${PKGVERSION}/functions/_parameter
 share/zsh/${PKGVERSION}/functions/_parameters
 share/zsh/${PKGVERSION}/functions/_patch
+share/zsh/${PKGVERSION}/functions/_patchutils
 share/zsh/${PKGVERSION}/functions/_path_commands
 share/zsh/${PKGVERSION}/functions/_path_files
 share/zsh/${PKGVERSION}/functions/_pax
@@ -649,6 +656,7 @@ share/zsh/${PKGVERSION}/functions/_stat
 share/zsh/${PKGVERSION}/functions/_stgit
 share/zsh/${PKGVERSION}/functions/_store_cache
 share/zsh/${PKGVERSION}/functions/_strace
+share/zsh/${PKGVERSION}/functions/_strftime
 share/zsh/${PKGVERSION}/functions/_strip
 share/zsh/${PKGVERSION}/functions/_stty
 share/zsh/${PKGVERSION}/functions/_su
@@ -666,6 +674,7 @@ share/zsh/${PKGVERSION}/functions/_svcs_fmri
 share/zsh/${PKGVERSION}/functions/_svn-buildpackage
 share/zsh/${PKGVERSION}/functions/_sysctl
 share/zsh/${PKGVERSION}/functions/_sysstat
+share/zsh/${PKGVERSION}/functions/_systat
 share/zsh/${PKGVERSION}/functions/_system_profiler
 share/zsh/${PKGVERSION}/functions/_systemd
 share/zsh/${PKGVERSION}/functions/_tags
@@ -699,6 +708,7 @@ share/zsh/${PKGVERSION}/functions/_tracepath
 share/zsh/${PKGVERSION}/functions/_trap
 share/zsh/${PKGVERSION}/functions/_tree
 share/zsh/${PKGVERSION}/functions/_ttyctl
+share/zsh/${PKGVERSION}/functions/_ttys
 share/zsh/${PKGVERSION}/functions/_tune2fs
 share/zsh/${PKGVERSION}/functions/_twidge
 share/zsh/${PKGVERSION}/functions/_twisted
@@ -733,6 +743,7 @@ share/zsh/${PKGVERSION}/functions/_vars
 share/zsh/${PKGVERSION}/functions/_vcsh
 share/zsh/${PKGVERSION}/functions/_vim
 share/zsh/${PKGVERSION}/functions/_vim-addons
+share/zsh/${PKGVERSION}/functions/_vmstat
 share/zsh/${PKGVERSION}/functions/_vnc
 share/zsh/${PKGVERSION}/functions/_volume_groups
 share/zsh/${PKGVERSION}/functions/_vorbis
@@ -745,6 +756,8 @@ share/zsh/${PKGVERSION}/functions/_wajig
 share/zsh/${PKGVERSION}/functions/_wakeup_capable_devices
 share/zsh/${PKGVERSION}/functions/_wanna-build
 share/zsh/${PKGVERSION}/functions/_wanted
+share/zsh/${PKGVERSION}/functions/_watch
+share/zsh/${PKGVERSION}/functions/_watch-snoop
 share/zsh/${PKGVERSION}/functions/_wc
 share/zsh/${PKGVERSION}/functions/_webbrowser
 share/zsh/${PKGVERSION}/functions/_wget
@@ -834,6 +847,7 @@ share/zsh/${PKGVERSION}/functions/backward-kill-word-match
 share/zsh/${PKGVERSION}/functions/backward-word-match
 share/zsh/${PKGVERSION}/functions/bashcompinit
 share/zsh/${PKGVERSION}/functions/before
+share/zsh/${PKGVERSION}/functions/bracketed-paste-magic
 share/zsh/${PKGVERSION}/functions/calendar
 share/zsh/${PKGVERSION}/functions/calendar_add
 share/zsh/${PKGVERSION}/functions/calendar_edit

shells/zsh/distinfo

@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.52 2015/06/13 12:57:28 ryoon Exp $
+$NetBSD: distinfo,v 1.54 2015/09/02 10:54:29 szptvlfn Exp $
 
-SHA1 (zsh-5.0.8.tar.bz2) = e15e00bd4b80e96e87301bf682d86fdf56929989
-RMD160 (zsh-5.0.8.tar.bz2) = 2c831d5dee22d79b6e2fd6ad7b8392c1d201f017
-Size (zsh-5.0.8.tar.bz2) = 3250542 bytes
-SHA1 (patch-Src_builtin.c) = 500ad7e79c38ba35055e39c3879e8d72f2f4a59d
-SHA1 (patch-Test_B03print.ztst) = 5e534fbacf1648faa6deeaae8af57f37498a98c4
-SHA1 (patch-ac) = 75c1b9e56858289adf9f1d9c58d2319bb6df7abc
+SHA1 (zsh-5.1.tar.xz) = 5461213760341a9010a90cd7a3c48e27804879b0
+RMD160 (zsh-5.1.tar.xz) = 3d66abaad114be7d90969f8f1bd4a90b3b3d0f22
+Size (zsh-5.1.tar.xz) = 2785404 bytes
 SHA1 (patch-aczsh.m4) = 36c270d8d7cf727f48787ef889b2bd89cbf065e2
 SHA1 (patch-configure.ac) = e34bbae6385442b51a7263b22681898203d0c013

shells/zsh/files/patch-ac

@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.31 2015/03/19 12:34:37 jperkin Exp $
+$NetBSD: patch-ac,v 1.1 2015/09/02 10:54:29 szptvlfn Exp $
 
 First chunk:
 Don't use _POSIX_C_SOURCE on SunOS with c99.

shells/zsh/patches/patch-Src_builtin.c

@@ -1,15 +0,0 @@
-$NetBSD: patch-Src_builtin.c,v 1.1 2015/06/13 12:57:28 ryoon Exp $
-
-https://sourceforge.net/p/zsh/code/ci/ac26fafa03c30e8c79e4bd70bdbb68d025643ee7/
-
---- Src/builtin.c.orig	2015-05-31 15:39:40.000000000 +0000
-+++ Src/builtin.c
-@@ -4461,7 +4461,7 @@ bin_print(char *name, char **args, Optio
- 			lleft -= chars;
- 			ptr += chars;
- 		    }
--		    if (width > 0 && flags[2]) width = -width;
-+		    if (width > 0 && flags[3]) width = -width;
- 		    if (width > 0 && lchars < width)
- 		    	count += fprintf(fout, "%*c", width - lchars, ' ');
- 		    count += fwrite(b, 1, lbytes, fout);

shells/zsh/patches/patch-Test_B03print.ztst

@@ -1,24 +0,0 @@
-$NetBSD: patch-Test_B03print.ztst,v 1.1 2015/06/13 12:57:28 ryoon Exp $
-
-https://sourceforge.net/p/zsh/code/ci/ac26fafa03c30e8c79e4bd70bdbb68d025643ee7/
-
---- Test/B03print.ztst.orig	2014-12-13 23:55:54.000000000 +0000
-+++ Test/B03print.ztst
-@@ -169,11 +169,15 @@
- 0:%n count zeroed on format reuse
- >1
- 
--# this may fill spec string with '%0+- #*.*lld\0' - 13 characters
-- printf '%1$0+- #-08.5dx\n' 123
-+# this may fill spec string with '%0'+- #*.*lld\0' - 14 characters
-+ printf '%1$0'"'+- #-08.5dx\n" 123
- 0:maximal length format specification
- >+00123  x
- 
-+ printf "x:%-20s:y\n" fubar
-+0:left-justification of string
-+>x:fubar               :y
-+
-  printf '%*smorning\n' -5 good
- 0:negative width specified
- >good morning