CVS commit: pkgsrc/shells/zsh

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/shells/zsh
From: "Jonathan Perkin" <jperkin%netbsd.org@localhost>
Date: Thu, 11 May 2017 13:49:06 +0000

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu May 11 13:49:06 UTC 2017

Modified Files:
        pkgsrc/shells/zsh: Makefile PLIST distinfo
        pkgsrc/shells/zsh/patches: patch-configure.ac
Removed Files:
        pkgsrc/shells/zsh: Makefile.common hacks.mk
        pkgsrc/shells/zsh/files: patch-ac

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 pkgsrc/shells/zsh/Makefile
cvs rdiff -u -r1.80 -r0 pkgsrc/shells/zsh/Makefile.common
cvs rdiff -u -r1.35 -r1.36 pkgsrc/shells/zsh/PLIST
cvs rdiff -u -r1.58 -r1.59 pkgsrc/shells/zsh/distinfo
cvs rdiff -u -r1.4 -r0 pkgsrc/shells/zsh/hacks.mk
cvs rdiff -u -r1.1 -r0 pkgsrc/shells/zsh/files/patch-ac
cvs rdiff -u -r1.4 -r1.5 pkgsrc/shells/zsh/patches/patch-configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/shells/zsh/Makefile
diff -u pkgsrc/shells/zsh/Makefile:1.78 pkgsrc/shells/zsh/Makefile:1.79
--- pkgsrc/shells/zsh/Makefile:1.78     Thu Apr 20 09:12:05 2017
+++ pkgsrc/shells/zsh/Makefile  Thu May 11 13:49:06 2017
@@ -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@localhost
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+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"

Index: pkgsrc/shells/zsh/PLIST
diff -u pkgsrc/shells/zsh/PLIST:1.35 pkgsrc/shells/zsh/PLIST:1.36
--- pkgsrc/shells/zsh/PLIST:1.35        Sun Dec 25 12:01:44 2016
+++ pkgsrc/shells/zsh/PLIST     Thu May 11 13:49:06 2017
@@ -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}/zs
 ${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}/zs
 ${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

Index: pkgsrc/shells/zsh/distinfo
diff -u pkgsrc/shells/zsh/distinfo:1.58 pkgsrc/shells/zsh/distinfo:1.59
--- pkgsrc/shells/zsh/distinfo:1.58     Sun Jan 29 05:31:13 2017
+++ pkgsrc/shells/zsh/distinfo  Thu May 11 13:49:06 2017
@@ -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

Index: pkgsrc/shells/zsh/patches/patch-configure.ac
diff -u pkgsrc/shells/zsh/patches/patch-configure.ac:1.4 pkgsrc/shells/zsh/patches/patch-configure.ac:1.5
--- pkgsrc/shells/zsh/patches/patch-configure.ac:1.4    Wed Jan  8 16:30:01 2014
+++ pkgsrc/shells/zsh/patches/patch-configure.ac        Thu May 11 13:49:06 2017
@@ -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*)

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/shells/zsh
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/shells/zsh
Indexes:

Home | Main Index | Thread Index | Old Index