CVS commit: pkgsrc/shells/zsh

["Rin Okuyama" <rin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rin
Date:           Fri Jul  1 23:31:49 UTC 2022

Modified Files:
        pkgsrc/shells/zsh: Makefile distinfo
Added Files:
        pkgsrc/shells/zsh/patches: patch-configure
Removed Files:
        pkgsrc/shells/zsh/patches: patch-configure.ac

Log Message:
shells/zsh: Stop regen configure, drop dependencies to auto{conf,make}.

Our local patch for aczsh.m4, introduced to 5.0.2nb1:

http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/shells/zsh/Makefile#rev1.63

has been upstreamed. There is no longer a point to regen configure;
tiny patch to configure.ac can be directly applied to configure itself.

Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 pkgsrc/shells/zsh/Makefile
cvs rdiff -u -r1.77 -r1.78 pkgsrc/shells/zsh/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/shells/zsh/patches/patch-configure
cvs rdiff -u -r1.9 -r0 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.103 pkgsrc/shells/zsh/Makefile:1.104
--- pkgsrc/shells/zsh/Makefile:1.103    Mon May 16 14:58:30 2022
+++ pkgsrc/shells/zsh/Makefile  Fri Jul  1 23:31:49 2022
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.103 2022/05/16 14:58:30 ryoon Exp $
+# $NetBSD: Makefile,v 1.104 2022/07/01 23:31:49 rin Exp $
 
 DISTNAME=      zsh-5.9
+PKGREVISION=   1
 CATEGORIES=    shells
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=zsh/}
 EXTRACT_SUFX=  .tar.xz
@@ -11,7 +12,7 @@ COMMENT=      The Z shell
 LICENSE=       gnu-gpl-v2 AND zsh
 
 USE_LANGUAGES=         c c99
-USE_TOOLS+=            automake autoconf makeinfo
+USE_TOOLS+=            makeinfo
 GNU_CONFIGURE=         yes
 INFO_FILES=            yes
 TEXINFO_REQD=          4.0
@@ -76,9 +77,6 @@ SUBST_VARS.pkgdb=     PKG_DBDIR
 
 .include "options.mk"
 
-pre-configure:
-       cd ${WRKSRC};  autoreconf -fiv
-
 post-install:
 .for f in FEATURES NEWS Etc/BUGS Etc/FAQ
        ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/doc/zsh

Index: pkgsrc/shells/zsh/distinfo
diff -u pkgsrc/shells/zsh/distinfo:1.77 pkgsrc/shells/zsh/distinfo:1.78
--- pkgsrc/shells/zsh/distinfo:1.77     Mon May 16 14:58:30 2022
+++ pkgsrc/shells/zsh/distinfo  Fri Jul  1 23:31:49 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.77 2022/05/16 14:58:30 ryoon Exp $
+$NetBSD: distinfo,v 1.78 2022/07/01 23:31:49 rin Exp $
 
 BLAKE2s (zsh-5.9.tar.xz) = 1ab2ab9dd0debc176bdefd661b62e102153c26f591e35916ccc7527c337d0530
 SHA512 (zsh-5.9.tar.xz) = d9138b7f379ad942a5f46819d2dd52d31f3a1129f2a0d1b53d4c5cd43c318b60396da6d37c57c477b8e958fb750209aca0ae93f8c9dd42ac958de006a0ff067e
@@ -6,4 +6,4 @@ Size (zsh-5.9.tar.xz) = 3332400 bytes
 SHA1 (patch-Completion_BSD_Command___bsd__pkg) = fe0d9cc399fe185ce71a64431e4086ed07920cb8
 SHA1 (patch-Completion_Unix_Command___gpg) = 8eba031838b1cfb0bfadf0fa539e760fd1cb539c
 SHA1 (patch-Config_installfns.sh) = ef0b250a0121c0e4925022e02553aefa23e6cc8d
-SHA1 (patch-configure.ac) = 450c4cee0ec8e4cba959b978d83e20a5ed9cc70c
+SHA1 (patch-configure) = 1b757f0ba6611a206f2e9c4d3de5c11fc629a364

Added files:

Index: pkgsrc/shells/zsh/patches/patch-configure
diff -u /dev/null pkgsrc/shells/zsh/patches/patch-configure:1.1
--- /dev/null   Fri Jul  1 23:31:49 2022
+++ pkgsrc/shells/zsh/patches/patch-configure   Fri Jul  1 23:31:49 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2022/07/01 23:31:49 rin Exp $
+
+Fix SunOS flags.
+
+--- configure.orig     2022-07-02 08:12:29.625197786 +0900
++++ configure  2022-07-02 08:12:43.989244826 +0900
+@@ -14101,7 +14101,7 @@
+     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*)