[Midnightbsd-cvs] mports: shells/zsh: update to 4.3.9
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Nov 10 15:36:02 EST 2008
Log Message:
-----------
update to 4.3.9
Modified Files:
--------------
mports/shells/zsh:
Makefile (r1.9 -> r1.10)
distinfo (r1.3 -> r1.4)
Removed Files:
-------------
mports/shells/zsh/files:
patch-Completion-Unix-Command-_locate
patch-Src_Zle_compresult.c
patch-ncurses
-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/shells/zsh/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -L shells/zsh/Makefile -L shells/zsh/Makefile -u -r1.9 -r1.10
--- shells/zsh/Makefile
+++ shells/zsh/Makefile
@@ -1,14 +1,10 @@
# New ports collection makefile for: zsh
-# Date created: 11 Feb. 1995
-# Whom: torstenb
#
# $MidnightBSD$
# $FreeBSD: ports/shells/zsh/Makefile,v 1.81 2006/05/02 09:03:06 sergei Exp $
#
# The following compile-time options are available:
-# NO_SHARED=yes compile a static version of zsh
-# (default: use dynamically loadable modules)
# ZSH_ETCDIR=<dir> directory for zsh system-wide configuration files:
# zshenv, zlogin, zprofile, zshrc, zlogout.
# (default: /etc)
@@ -21,7 +17,7 @@
# NOTE: does NOT have to be inside ${PREFIX} tree
PORTNAME= zsh
-PORTVERSION= 4.3.6
+PORTVERSION= 4.3.9
CATEGORIES= shells
MASTER_SITES= SF
.if !defined(NOPORTDOCS)
@@ -34,7 +30,7 @@
ZSH_VER= ${PORTVERSION}
-USE_AUTOTOOLS= autoconf:261 autoheader:261
+USE_AUTOTOOLS= autoconf:262 autoheader:262
USE_BZIP2= yes
USE_ICONV= yes
GNU_CONFIGURE= yes
@@ -51,7 +47,8 @@
OPTIONS= ZSH_MEM "Enable zsh-mem and zsh-secure-free options" on \
ZSH_MAILDIR "Enable support for Maildirs in MAIL(PATH)" on \
ZSH_MULTIBYTE "Enable multibyte character support" on \
- ZSH_PCRE "Enable PCRE support" off
+ ZSH_PCRE "Enable PCRE support" off \
+ ZSH_STATIC "Enable static zsh" off
# These variables can be overriden by user
ZSH_ETCDIR?= /etc
@@ -89,7 +86,7 @@
CONFIGURE_ARGS+= --enable-maildir-support
.endif
-.if defined(NO_SHARED)
+.if defined(WITH_ZSH_STATIC)
CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -static"
CONFIGURE_ARGS+= --disable-dynamic
PLIST_SUB+= NO_STATIC="@comment "
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/shells/zsh/distinfo,v
retrieving revision 1.3
retrieving revision 1.4
diff -L shells/zsh/distinfo -L shells/zsh/distinfo -u -r1.3 -r1.4
--- shells/zsh/distinfo
+++ shells/zsh/distinfo
@@ -1,6 +1,6 @@
-MD5 (zsh-4.3.6.tar.bz2) = 16f399af1081ad3c303a794c9c7dc47e
-SHA256 (zsh-4.3.6.tar.bz2) = 5a253d107533ff60ab9edb74de9425f2ca93bc5a3ddb5c1b5bfd488a794dc873
-SIZE (zsh-4.3.6.tar.bz2) = 2527972
-MD5 (zsh-4.3.6-doc.tar.bz2) = cab29228a90f58b1431a66ab24a0a0c2
-SHA256 (zsh-4.3.6-doc.tar.bz2) = a82cf4e55d6bcf1ea40c23ef5f99002d504c441a8f6d14af0ed4d574c6ffbcc6
-SIZE (zsh-4.3.6-doc.tar.bz2) = 2473544
+MD5 (zsh-4.3.9.tar.bz2) = 0539d0a590e545ad8c40ff8c97e94538
+SHA256 (zsh-4.3.9.tar.bz2) = 8fdd6d6c6dc3a061b0c9a1b26eb367d10c0d8094d4b8bd2613740fc40b4382ab
+SIZE (zsh-4.3.9.tar.bz2) = 2659602
+MD5 (zsh-4.3.9-doc.tar.bz2) = b3a026cf02471b66454a2b241a4d92a4
+SHA256 (zsh-4.3.9-doc.tar.bz2) = 15ae762a228c2b2d410cecdddca279e49dfa6cfff85aaf8fa55e74940b4e8165
+SIZE (zsh-4.3.9-doc.tar.bz2) = 2570995
--- shells/zsh/files/patch-Src_Zle_compresult.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- Src/Zle/compresult.c.orig 2008-05-07 10:19:11.000000000 -0300
-+++ Src/Zle/compresult.c 2008-05-07 10:19:35.000000000 -0300
-@@ -1188,6 +1188,12 @@
- {
- int was_meta;
-
-+ /* Just list the matches if the list was requested. */
-+ if (lst == COMP_LIST_COMPLETE) {
-+ showinglist = -2;
-+ return;
-+ }
-+
- /* Already metafied when called from domenuselect already */
- if (zlemetaline == NULL) {
- was_meta = 0;
-@@ -1195,12 +1201,6 @@
- } else
- was_meta = 1;
-
-- /* Just list the matches if the list was requested. */
-- if (lst == COMP_LIST_COMPLETE) {
-- showinglist = -2;
-- return;
-- }
--
- /* Otherwise go to the next match in the array... */
- do {
- if (!*++(minfo.cur)) {
--- shells/zsh/files/patch-Completion-Unix-Command-_locate
+++ /dev/null
@@ -1,11 +0,0 @@
---- Completion/Unix/Command/_locate.orig 2006-09-27 09:50:25.000000000 -0500
-+++ Completion/Unix/Command/_locate 2007-08-20 22:08:08.000000000 -0500
-@@ -11,7 +11,7 @@
- ;;
-
- (locate)
-- input="$(_call_program locate $words[1] -V)"
-+ input="$(_call_program locate $words[1] -V 2>&1)"
- case $input in
- (*mlocate*)
- ltype=mlocate
--- shells/zsh/files/patch-ncurses
+++ /dev/null
@@ -1,60 +0,0 @@
---- configure.ac.orig 2008-03-28 12:49:32.000000000 +0100
-+++ configure.ac 2008-05-05 09:47:30.860369561 +0200
-@@ -669,20 +669,20 @@
- termcap_curses_order="$ncursesw_test tinfo termcap $ncurses_test curses" ;;
- esac])dnl
-
--AH_TEMPLATE([ZSH_CURSES_NEEDS_XOPEN],
--[Define if the curses libraries need _XOPEN_SOURCE_EXTENDED defined])
--AC_CACHE_CHECK(if the curses library needs _XOPEN_SOURCE_EXTENDED,
--zsh_cv_curses_needs_xopen,
-+AH_TEMPLATE([ZSH_NO_XOPEN],
-+[Define if _XOPEN_SOURCE_EXTENDED should not be defined to avoid clashes])
-+AC_CACHE_CHECK(if _XOPEN_SOURCE_EXTENDED should not be defined,
-+zsh_cv_no_xopen,
--[case "$host_os" in
-- *openbsd*)
-- zsh_cv_curses_needs_xopen=no
-+[[case "$host_os" in
-+ *openbsd*|*freebsd5*|*freebsd6.[012]*)
-+ zsh_cv_no_xopen=yes
- ;;
- *)
-- zsh_cv_curses_needs_xopen=yes
-+ zsh_cv_no_xopen=no
- ;;
--esac])
-+esac]])
--if test x$zsh_cv_curses_needs_xopen = xyes; then
-- AC_DEFINE(ZSH_CURSES_NEEDS_XOPEN)
-+if test x$zsh_cv_no_xopen = xyes; then
-+ AC_DEFINE(ZSH_NO_XOPEN)
- fi
-
- dnl Check for tigetflag (terminfo) before tgetent (termcap).
---- Src/system.h.orig 2007-12-14 13:43:33.000000000 +0100
-+++ Src/system.h 2008-05-05 09:50:17.333164563 +0200
-@@ -52,9 +52,20 @@
- # undef HAVE_SYS_UTSNAME_H
- #endif
-
--#if defined(ZSH_CURSES_SOURCE) && defined(ZSH_CURSES_NEEDS_XOPEN)
--#define _XOPEN_SOURCE_EXTENDED 1
--#endif
-+#ifndef ZSH_NO_XOPEN
-+# ifdef ZSH_CURSES_SOURCE
-+# define _XOPEN_SOURCE_EXTENDED 1
-+# else
-+# ifdef MULTIBYTE_SUPPORT
-+/*
-+ * Needed for wcwidth() which is part of XSI.
-+ * Various other uses of the interface mean we can't get away with just
-+ * _XOPEN_SOURCE.
-+ */
-+# define _XOPEN_SOURCE_EXTENDED 1
-+# endif /* MULTIBYTE_SUPPORT */
-+# endif /* ZSH_CURSES_SOURCE */
-+#endif /* ZSH_NO_XOPEN */
-
- /*
- * Solaris by default zeroes all elements of the tm structure in
More information about the Midnightbsd-cvs
mailing list