Completely overhaul the zsh package.

 - Get rid of useless Makefile.common and pointless variables since there is
   no longer a zsh-current package.

 - Remove non-standard per-OS non-checksummed patch file in FILESDIR.
   Integrate it correctly in the normal way.

 - Ensure our patched configure.ac is actually regenerated.

 - Use REPLACE_INTERPRETER instead of homegrown subst replacements.

 - Remove esoteric and fragile configuration variables, a bunch of legacy OS
   based options, and simply depend correctly on terminfo and curses.

 - Remove custom test targets and requirements for root access, the test suite
   works fine as a non-root user and can be done in the normal way.

 - Use options.mk

 - Set maintainer to pkgsrc-users, uebayasi resigned.

Fixes build on at least SunOS.  Tested on SunOS, Darwin, NetBSD (with and
without the "static" option), and Linux.

7 files changed, 81 insertions, 418 deletions

diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index c4eb00ca380..8fe3f457ac7 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -1,35 +1,70 @@
-# $NetBSD: Makefile,v 1.78 2017/04/20 09:12:05 jperkin Exp $
+# $NetBSD: Makefile,v 1.79 2017/05/11 13:49:06 jperkin Exp $
 
-.include "../../shells/zsh/Makefile.common"
+DISTNAME=	zsh-5.3.1
+CATEGORIES=	shells
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=zsh/}
+EXTRACT_SUFX=	.tar.xz
 
-ZSH_VERSION=	5.3.1
-ZSH_MAINTAINER=	uebayasi@NetBSD.org
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://zsh.sourceforge.net/
+COMMENT=	The Z shell
+LICENSE=	gnu-gpl-v2 AND zsh
+
+USE_LANGUAGES=		c c99
+USE_TOOLS+=		automake autoconf makeinfo
+GNU_CONFIGURE=		yes
+INFO_FILES=		yes
+TEXINFO_REQD=		4.0
 
 CONFIGURE_ARGS+=	--disable-gdbm
+CONFIGURE_ARGS+=	--enable-etcdir=${PKG_SYSCONFDIR:Q}
+
+# Ensure we can find initscr(3) otherwise the curses module will not be built.
+CONFIGURE_ARGS+=        --with-term-lib="${BUILDLINK_LIBNAME.curses} ${BUILDLINK_LIBNAME.terminfo}"
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${USE_CROSS_COMPILE:U:tl} == "yes"
+# These can't be detected automagically in cross-builds.
+CONFIGURE_ENV.NetBSD+=	zsh_cv_shared_environ=yes
+CONFIGURE_ENV.NetBSD+=	zsh_cv_shared_tgetent=yes
+CONFIGURE_ENV.NetBSD+=	zsh_cv_shared_tigetstr=yes
+CONFIGURE_ENV.NetBSD+=	zsh_cv_sys_dynamic_execsyms=yes
+.endif
+
+INSTALLATION_DIRS+=	share/doc/zsh
+
+PLIST_VARS+=	xattr
+.if exists(/usr/include/sys/xattr.h)
+PLIST.xattr=	yes
+.endif
+
+MAKE_JOBS_SAFE=		no
+INSTALL_TARGET=		install install.info
+TEST_TARGET=		check
+PKG_SHELL=		bin/zsh
+
+REPLACE_INTERPRETER+=	zsh
+REPLACE.zsh.old=	.*zsh
+REPLACE.zsh.new=	${PREFIX}/bin/zsh
+REPLACE_FILES.zsh=	Functions/Calendar/*
+REPLACE_FILES.zsh+=	Functions/Example/*
+REPLACE_FILES.zsh+=	Functions/Misc/*
+REPLACE_FILES.zsh+=	Misc/globtests*
+REPLACE_FILES.zsh+=	Test/runtests.zsh Test/ztst.zsh
+REPLACE_FILES.zsh+=	Util/check-tmux-state Util/reporter
+
+.include "options.mk"
+
+pre-configure:
+	cd ${WRKSRC};  autoreconf -fiv
 
-SUBST_CLASSES+=			prefix-fixup
-SUBST_STAGE.prefix-fixup=	pre-configure
-SUBST_FILES.prefix-fixup= \
-	Misc/globtests \
-	Misc/globtests.ksh \
-	Test/ztst.zsh \
-	Test/runtests.zsh \
-	Util/reporter \
-	Functions/Calendar/calendar_add \
-	Functions/Misc/run-help \
-	Functions/Misc/run-help-ip \
-	Functions/Misc/checkmail \
-	Functions/Misc/sticky-note \
-	Functions/Misc/zcalc \
-	Functions/Misc/zkbd \
-	Functions/Misc/zed \
-	Functions/Example/cat \
-	Functions/Example/zless
-SUBST_SED.prefix-fixup=		-e 's|^\#\!/bin/zsh|\#\!${PREFIX}/bin/zsh|g'
-SUBST_SED.prefix-fixup+=	-e 's|^\#\! /bin/zsh|\#\! ${PREFIX}/bin/zsh|g'
-SUBST_SED.prefix-fixup+=	-e 's|^\#\!/usr/local/bin/zsh|\#\!${PREFIX}/bin/zsh|g'
-SUBST_SED.prefix-fixup+=	-e 's|^\#\! /usr/local/bin/zsh|\#\! ${PREFIX}/bin/zsh|g'
-SUBST_SED.prefix-fixup+=	-e 's|^\#\! zsh|\#\! ${PREFIX}/bin/zsh|g'
+post-install:
+.for f in FEATURES NEWS Etc/BUGS Etc/FAQ
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/doc/zsh
+.endfor
 
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
+.include "../../mk/terminfo.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/shells/zsh/Makefile.common b/shells/zsh/Makefile.common
deleted file mode 100644
index 98b747c97f6..00000000000
--- a/shells/zsh/Makefile.common
+++ /dev/null
@@ -1,160 +0,0 @@
-# $NetBSD: Makefile.common,v 1.80 2016/06/11 23:34:07 dholland Exp $
-# used by shells/zsh/Makefile
-
-DISTNAME=	zsh-${ZSH_VERSION}
-CATEGORIES=	shells
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=zsh/}
-EXTRACT_SUFX=	.tar.xz
-
-MAINTAINER=	${ZSH_MAINTAINER}
-HOMEPAGE=	http://zsh.sourceforge.net/
-COMMENT=	The Z shell
-
-GNU_CONFIGURE=		yes
-
-CONFIGURE_ARGS+=	--enable-etcdir=${PKG_SYSCONFDIR:Q}
-
-USE_LANGUAGES=		c c99
-USE_TOOLS+=		awk makeinfo
-INFO_FILES=		yes
-TEXINFO_REQD=		4.0
-
-.include "../../mk/bsd.prefs.mk"
-
-.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
-CONFIGURE_ENV+=		zsh_cv_shared_tgetent=yes
-CONFIGURE_ENV+=		zsh_cv_shared_tigetstr=yes
-CONFIGURE_ENV+=		zsh_cv_sys_dynamic_execsyms=yes
-.endif
-
-PLIST_VARS+=	xattr
-.if exists(/usr/include/sys/xattr.h)
-PLIST.xattr=	yes
-.endif
-
-PKG_OPTIONS_VAR=		PKG_OPTIONS.zsh
-PKG_SUPPORTED_OPTIONS=		static
-
-.include "../../mk/bsd.options.mk"
-
-MAKE_JOBS_SAFE=	no
-INSTALL_TARGET=	install install.info
-PKG_SHELL=	bin/zsh
-PLIST_VARS+=	dynamic terminfo curses
-
-################################################################################
-
-_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.${OPSYS}?=		ldflags tcsetpgrp
-
-################################################################################
-
-### static
-
-_ZSH_LINKAGE.static.CONFIGURE_ARGS=			--disable-dynamic
-_ZSH_LINKAGE.static.BUILDLINK_PASSTHRU_RPATHDIRS?=
-_ZSH_LINKAGE.static.LDFLAGS?=				-static
-
-### dynamic
-
-_ZSH_DYNAMIC_VARS.ldflags=	${COMPILER_RPATH_FLAG}${PREFIX}/lib/zsh
-
-_ZSH_LINKAGE.dynamic.CONFIGURE_ARGS=
-_ZSH_LINKAGE.dynamic.BUILDLINK_PASSTHRU_RPATHDIRS=
-# XXXUEBAYASI old make(1) has problems to handle :?true_str:false_str
-#_ZSH_LINKAGE.dynamic.LDFLAGS= \
-#	${_ZSH_OPSYS.${OPSYS}:Mldflags:?${_ZSH_DYNAMIC_VARS.ldflags}:}
-.if !empty(_ZSH_OPSYS.${OPSYS}:Mldflags)
-_ZSH_LINKAGE.dynamic.LDFLAGS=	${_ZSH_DYNAMIC_VARS.ldflags}
-.endif
-
-### tcsetpgrp
-
-_ZSH_OPSYS_VARS.tcsetpgrp=	--with-tcsetpgrp
-_ZSH_OPSYS_VARS.notcsetpgrp=	--without-tcsetpgrp
-
-### terminfo
-CHECK_BUILTIN.terminfo=	yes
-.include "../../mk/terminfo.builtin.mk"
-.if !empty(USE_BUILTIN.terminfo:M[Yy][Ee][Ss]) || ${OPSYS} == "SunOS" || ${OPSYS} == "Linux"
-PLIST.terminfo=	yes
-.endif
-
-### curses
-.if empty(MACHINE_PLATFORM:MNetBSD-[0-9]*) && empty(MACHINE_PLATFORM:MGNUkFreeBSD-[0-9]*)
-CHECK_BUILTIN.curses=	yes
-.include "../../mk/curses.builtin.mk"
-.  if !empty(USE_BUILTIN.curses:M[Yy][Ee][Ss]) || ${OPSYS} == "SunOS" || ${OPSYS} == "Linux"
-PLIST.curses=	yes
-.  endif
-.endif
-
-################################################################################
-
-# XXXUEBAYASI old make(1) has problems to handle :?true_str:false_str
-#_ZSH_LINKAGE=	${ZSH_STATIC:M[Yy][Ee][Ss]:?static:dynamic}	# static / dynamic
-.if !empty(PKG_OPTIONS:Mstatic)
-_ZSH_LINKAGE=	static
-.else
-_ZSH_LINKAGE=	dynamic
-.endif
-
-CONFIGURE_ARGS+=		${_ZSH_LINKAGE.${_ZSH_LINKAGE}.CONFIGURE_ARGS} \
-				${_ZSH_OPSYS_VARS.${_ZSH_OPSYS.${OPSYS}:Mtcsetpgrp}} \
-				${_ZSH_OPSYS_VARS.${_ZSH_OPSYS.${OPSYS}:Mnotcsetpgrp}}
-BUILDLINK_PASSTHRU_RPATHDIRS+=	${_ZSH_LINKAGE.${_ZSH_LINKAGE}.BUILDLINK_PASSTHRU_RPATHDIRS}
-LDFLAGS+=			${_ZSH_LINKAGE.${_ZSH_LINKAGE}.LDFLAGS}
-.if ${_ZSH_LINKAGE} == dynamic
-PLIST.dynamic=			yes
-.endif
-
-################################################################################
-
-.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} \{\} \;
-
-INSTALLATION_DIRS+=	share/doc/zsh
-post-install:
-	cd ${WRKSRC}/Etc && ${INSTALL_DATA} BUGS FAQ 	\
-		${DESTDIR}${PREFIX}/share/doc/zsh
-	cd ${WRKSRC} && ${INSTALL_DATA} FEATURES NEWS	\
-		${DESTDIR}${PREFIX}/share/doc/zsh
-
-# Utilize Zsh's test framework.
-# Testing of dynamic shell only works after install has been done
-#
-.PHONY: do-test do-su-test real-su-test
-
-do-test: do-su-test
-
-do-su-test:
-	${RUN}								\
-	${ECHO_MSG} "*** Warning: This test needs to be run as root"
-	${RUN}								\
-	realtarget="real-su-test";					\
-	action="install";						\
-	${_SU_TARGET}
-
-real-su-test:
-	${RUN}								\
-	${ECHO_MSG} "${_PKGSRC_IN}> Testing for ${PKGNAME}"
-	cd ${WRKSRC} && ${MAKE} check
-	cd ${WRKSRC}/Test && ${MAKE} clean
diff --git a/shells/zsh/PLIST b/shells/zsh/PLIST
index d417fe635e7..f205e9e003e 100644
--- a/shells/zsh/PLIST
+++ b/shells/zsh/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.35 2016/12/25 12:01:44 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.36 2017/05/11 13:49:06 jperkin Exp $
 bin/zsh
 bin/${PKGNAME}
 info/zsh.info
@@ -9,6 +9,7 @@ ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/compctl.so
 ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/complete.so
 ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/complist.so
 ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/computil.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/curses.so
 ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/datetime.so
 ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/deltochar.so
 ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/example.so
@@ -27,8 +28,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.curses}lib/zsh/${PKGVERSION}/zsh/curses.so
-${PLIST.dynamic}${PLIST.terminfo}lib/zsh/${PKGVERSION}/zsh/terminfo.so
+${PLIST.dynamic}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
diff --git a/shells/zsh/distinfo b/shells/zsh/distinfo
index 1a582e1099f..274a608adb0 100644
--- a/shells/zsh/distinfo
+++ b/shells/zsh/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.58 2017/01/29 05:31:13 mef Exp $
+$NetBSD: distinfo,v 1.59 2017/05/11 13:49:06 jperkin Exp $
 
 SHA1 (zsh-5.3.1.tar.xz) = ec2a98c080f213c1c6c465c0c64662b5eae6818f
 RMD160 (zsh-5.3.1.tar.xz) = 6599472c943d6ea5b8137dd49df80cb02a121e2c
 SHA512 (zsh-5.3.1.tar.xz) = 25f723c76d2779c3cb53de2e0dbb1163ec289f76282bec49757880d0ce32bf64a001a6b40c54c290d342aa09f92319af5c597bff99de8dbd1fc895c11836f304
 Size (zsh-5.3.1.tar.xz) = 2928832 bytes
 SHA1 (patch-aczsh.m4) = 36c270d8d7cf727f48787ef889b2bd89cbf065e2
-SHA1 (patch-configure.ac) = e34bbae6385442b51a7263b22681898203d0c013
+SHA1 (patch-configure.ac) = 87ae3604e09948cd7b360f08031ef9c3f91f0aae
diff --git a/shells/zsh/files/patch-ac b/shells/zsh/files/patch-ac
deleted file mode 100644
index d7010caa1df..00000000000
--- a/shells/zsh/files/patch-ac
+++ /dev/null
@@ -1,199 +0,0 @@
-$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.
-
-Next chunks:
-Use a compile test, not a run test, for whether various rlimit values
-are equivalent.  A compile test is sufficient because zsh uses these
-values in switch cases, so they must be compile-time, if not
-preprocessor-time, constants.
-
-Last-but-one chunk:
-Make this package build on Interix.  Patches provided by Hiramatsu
-Yoshifumi in PR pkg/25946.
-
-Last chunk:
-Use -shared instead of -G on SunOS.
-Fixes 64-bit package.
-
---- configure.orig	2014-09-23 18:56:57.000000000 +0000
-+++ configure
-@@ -7645,7 +7645,9 @@ if ${zsh_cv_type_sigset_t+:} false; then
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
-+#ifndef __sun
- #define _POSIX_C_SOURCE 200809L
-+#endif
- #include <sys/types.h>
- #include <signal.h>
- int
-@@ -10233,9 +10235,6 @@ $as_echo_n "checking if RLIMIT_VMEM and
- if ${zsh_cv_rlimit_vmem_is_rss+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
--  if test "$cross_compiling" = yes; then :
--  zsh_cv_rlimit_vmem_is_rss=no
--else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -10244,43 +10243,33 @@ else
- #include <sys/time.h>
- #endif
- #include <sys/resource.h>
--int main()
-+int
-+main ()
- {
--int ret = 1;
--#if defined(HAVE_RLIMIT_VMEM) && defined(HAVE_RLIMIT_RSS)
--if (RLIMIT_RSS == RLIMIT_VMEM) ret = 0;
--#endif
--return ret;
-+static char x[(RLIMIT_VMEM == RLIMIT_RSS)? 1 : -1]
-+  ;
-+  return 0;
- }
- _ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
-+if ac_fn_c_try_compile "$LINENO"; then :
-   zsh_cv_rlimit_vmem_is_rss=yes
- else
-   zsh_cv_rlimit_vmem_is_rss=no
- fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
--
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_rlimit_vmem_is_rss" >&5
- $as_echo "$zsh_cv_rlimit_vmem_is_rss" >&6; }
--
- if test x$zsh_cv_rlimit_vmem_is_rss = xyes; then
-   $as_echo "#define RLIMIT_VMEM_IS_RSS 1" >>confdefs.h
- 
- fi
- 
--
--
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if RLIMIT_VMEM and RLIMIT_AS are the same" >&5
- $as_echo_n "checking if RLIMIT_VMEM and RLIMIT_AS are the same... " >&6; }
- if ${zsh_cv_rlimit_vmem_is_as+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
--  if test "$cross_compiling" = yes; then :
--  zsh_cv_rlimit_vmem_is_as=no
--else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -10289,43 +10278,33 @@ else
- #include <sys/time.h>
- #endif
- #include <sys/resource.h>
--int main()
-+int
-+main ()
- {
--int ret = 1;
--#if defined(HAVE_RLIMIT_VMEM) && defined(HAVE_RLIMIT_AS)
--if (RLIMIT_AS == RLIMIT_VMEM) ret = 0;
--#endif
--return ret;
-+static char x[(RLIMIT_VMEM == RLIMIT_AS)? 1 : -1]
-+  ;
-+  return 0;
- }
- _ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
-+if ac_fn_c_try_compile "$LINENO"; then :
-   zsh_cv_rlimit_vmem_is_as=yes
- else
-   zsh_cv_rlimit_vmem_is_as=no
- fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
--
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_rlimit_vmem_is_as" >&5
- $as_echo "$zsh_cv_rlimit_vmem_is_as" >&6; }
--
- if test x$zsh_cv_rlimit_vmem_is_as = xyes; then
-   $as_echo "#define RLIMIT_VMEM_IS_AS 1" >>confdefs.h
- 
- fi
- 
--
--
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if RLIMIT_RSS and RLIMIT_AS are the same" >&5
- $as_echo_n "checking if RLIMIT_RSS and RLIMIT_AS are the same... " >&6; }
- if ${zsh_cv_rlimit_rss_is_as+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
--  if test "$cross_compiling" = yes; then :
--  zsh_cv_rlimit_rss_is_as=no
--else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -10334,28 +10313,23 @@ else
- #include <sys/time.h>
- #endif
- #include <sys/resource.h>
--int main()
-+int
-+main ()
- {
--int ret = 1;
--#if defined(HAVE_RLIMIT_RSS) && defined(HAVE_RLIMIT_AS)
--if (RLIMIT_AS == RLIMIT_RSS) ret = 0;
--#endif
--return ret;
-+static char x[(RLIMIT_RSS == RLIMIT_AS)? 1 : -1]
-+  ;
-+  return 0;
- }
- _ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
-+if ac_fn_c_try_compile "$LINENO"; then :
-   zsh_cv_rlimit_rss_is_as=yes
- else
-   zsh_cv_rlimit_rss_is_as=no
- fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
--
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_rlimit_rss_is_as" >&5
- $as_echo "$zsh_cv_rlimit_rss_is_as" >&6; }
--
- if test x$zsh_cv_rlimit_rss_is_as = xyes; then
-   $as_echo "#define RLIMIT_RSS_IS_AS 1" >>confdefs.h
- 
-@@ -11852,6 +11826,10 @@ $as_echo "$zsh_cv_sys_elf" >&6; }
-         DLLD="${DLLD=$CC}"
-         DLLDARG=""
-       ;;
-+      *interix*)
-+        DLLD="${DLLD=$CC}"
-+        DLLDARG=""
-+      ;;
-       * )
- 	DLLD="${DLLD=ld}"
- 	DLLDARG=""
-@@ -11881,7 +11859,7 @@ $as_echo "$zsh_cv_sys_elf" >&6; }
-     sunos*)       DLLDFLAGS="${DLLDFLAGS=-assert nodefinitions}" ;;
-     sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G $ldflags}" ;;
-     aix*)         DLLDFLAGS="${DLLDFLAGS=-G -bexpall -lc}" ;;
--    solaris*|sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G}" ;;
-+    solaris*|sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
-     darwin*)      DLLDFLAGS="${DLLDFLAGS=-bundle -flat_namespace -undefined suppress}" ;;
-     beos*|haiku*) DLLDFLAGS="${DLLDFLAGS=-nostart}" ;;
-     openbsd*)
diff --git a/shells/zsh/hacks.mk b/shells/zsh/hacks.mk
deleted file mode 100644
index a6f3438e494..00000000000
--- a/shells/zsh/hacks.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: hacks.mk,v 1.4 2016/06/11 23:34:07 dholland Exp $
-
-.if !defined(ZSH_HACKS_MK)
-ZSH_HACKS_MK=	defined
-
-### [Sun Dec 21 02:00:19 JST 2008 : uebayasi]
-### Built a dynamically linked "zsh" binary on NetBSD systems which use
-### dynamically linked binaries on the root filesystem. The binary will
-### only depend on the run-time link-editor and shared libraries on the
-### root filesystem. We use "-rpath" below by purpose because the
-### buildlink 3 framework won't filter it out.
-NETBSD_SHLINKER=	/libexec/ld.elf_so	# XXX move elsewhere
-NETBSD_SHLIBDIR=	/lib			# XXX move elsewhere
-.if ${OPSYS} == "NetBSD" && \
-      defined(OBJECT_FMT) && ${OBJECT_FMT} == "ELF" && \
-      defined(MKDYNAMICROOT) && ${MKDYNAMICROOT} != "no" && \
-      defined(NETBSD_SHLINKER) && exists(${NETBSD_SHLINKER}) && \
-      defined(NETBSD_SHLIBDIR) && exists(${NETBSD_SHLIBDIR})
-PKG_HACKS+=	static-dynamic
-_ZSH_LINKAGE.static.BUILDLINK_PASSTHRU_RPATHDIRS=	${NETBSD_SHLIBDIR}
-_ZSH_LINKAGE.static.LDFLAGS=	-Wl,-dynamic-linker=${NETBSD_SHLINKER} -Wl,-R${NETBSD_SHLIBDIR}
-.endif
-
-.endif  # ZSH_HACKS_MK
diff --git a/shells/zsh/patches/patch-configure.ac b/shells/zsh/patches/patch-configure.ac
index 1f02989fe5b..5dd26c32231 100644
--- a/shells/zsh/patches/patch-configure.ac
+++ b/shells/zsh/patches/patch-configure.ac
@@ -1,13 +1,15 @@
-$NetBSD: patch-configure.ac,v 1.4 2014/01/08 16:30:01 ryoon Exp $
+$NetBSD: patch-configure.ac,v 1.5 2017/05/11 13:49:06 jperkin Exp $
 
 Use a compile test, not a run test, for whether various rlimit values
 are equivalent.  A compile test is sufficient because zsh uses these
 values in switch cases, so they must be compile-time, if not
 preprocessor-time, constants.
 
---- configure.ac.orig	2013-11-27 19:00:20.000000000 +0000
+Fix SunOS flags.
+
+--- configure.ac.orig	2016-12-12 21:35:28.000000000 +0000
 +++ configure.ac
-@@ -1837,85 +1837,9 @@ zsh_LIMIT_PRESENT(RLIMIT_NPTS)
+@@ -1920,85 +1920,9 @@ zsh_LIMIT_PRESENT(RLIMIT_NPTS)
  zsh_LIMIT_PRESENT(RLIMIT_SWAP)
  zsh_LIMIT_PRESENT(RLIMIT_KQUEUES)
  
@@ -96,3 +98,12 @@ preprocessor-time, constants.
  
  
  dnl --------------------------------------------
+@@ -2900,7 +2824,7 @@ char *argv[];
+     sunos*)       DLLDFLAGS="${DLLDFLAGS=-assert nodefinitions}" ;;
+     sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G $ldflags}" ;;
+     aix*)         DLLDFLAGS="${DLLDFLAGS=-G -bexpall -lc}" ;;
+-    solaris*|sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G}" ;;
++    solaris*|sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
+     darwin*)      DLLDFLAGS="${DLLDFLAGS=-bundle -flat_namespace -undefined suppress}" ;;
+     beos*|haiku*) DLLDFLAGS="${DLLDFLAGS=-nostart}" ;;
+     openbsd*)