From c4ae2a6bed4a7e639d63f8efe7f7fa7cbc54ad84 Mon Sep 17 00:00:00 2001
From: adam <adam>
Date: Thu, 7 Apr 2005 14:16:41 +0000
Subject: Changes 4.2.5: * Bug-fix release * Fixes few configuration problems,
 notably on MacOSX

---
 shells/zsh/Makefile         |  4 ++--
 shells/zsh/Makefile.common  | 12 ++++++------
 shells/zsh/PLIST            |  7 ++++---
 shells/zsh/distinfo         | 10 +++++-----
 shells/zsh/patches/patch-ac | 10 +++++-----
 5 files changed, 22 insertions(+), 21 deletions(-)

(limited to 'shells')

diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index 2d008bc3cdb..100e3178d28 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.47 2005/02/21 11:07:37 adam Exp $
+# $NetBSD: Makefile,v 1.48 2005/04/07 14:16:41 adam Exp $
 
 .include "../../shells/zsh/Makefile.common"
 
-ZSH_VERSION=	4.2.4
+ZSH_VERSION=	4.2.5
 ZSH_MAINTAINER=	uebayasi@NetBSD.org
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/shells/zsh/Makefile.common b/shells/zsh/Makefile.common
index 8a215267dce..f6504489440 100644
--- a/shells/zsh/Makefile.common
+++ b/shells/zsh/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2005/03/04 03:59:32 jschauma Exp $
+# $NetBSD: Makefile.common,v 1.22 2005/04/07 14:16:41 adam Exp $
 
 DISTNAME=       zsh-${ZSH_VERSION}
 CATEGORIES=	shells
@@ -14,11 +14,11 @@ MAINTAINER=	${ZSH_MAINTAINER}
 HOMEPAGE=	http://sunsite.dk/zsh/
 COMMENT=	The Z shell
 
-USE_BUILDLINK3=		YES
-USE_PKGINSTALL=		YES
-GNU_CONFIGURE=		YES
+USE_BUILDLINK3=		yes
+USE_PKGINSTALL=		yes
+GNU_CONFIGURE=		yes
 
-USE_MAKEINFO=		YES
+USE_MAKEINFO=		yes
 INFO_FILES=		zsh.info
 TEXINFO_REQD=		4.0
 
@@ -61,7 +61,7 @@ PLIST_SRC=	${PKGDIR}/PLIST.${OPSYS}
 PLIST_SRC=	# empty
 .    endif
 .    if ${OPSYS} != "IRIX"
-PLIST_SRC+=	${PKGDIR}/PLIST.shlibs 
+PLIST_SRC+=	${PKGDIR}/PLIST.shlibs
 .    endif
 PLIST_SRC+=	${PKGDIR}/PLIST.dynamic ${PKGDIR}/PLIST
 .  endif
diff --git a/shells/zsh/PLIST b/shells/zsh/PLIST
index 4dcb1aea853..13a8a233adb 100644
--- a/shells/zsh/PLIST
+++ b/shells/zsh/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.15 2005/02/21 11:07:37 adam Exp $
-bin/zsh
+@comment $NetBSD: PLIST,v 1.16 2005/04/07 14:16:41 adam Exp $
 bin/${PKGNAME}
+bin/zsh
 man/man1/zsh.1
 man/man1/zshall.1
 man/man1/zshbuiltins.1
@@ -194,7 +194,6 @@ share/zsh/${PKGVERSION}/functions/_kfmclient
 share/zsh/${PKGVERSION}/functions/_kill
 share/zsh/${PKGVERSION}/functions/_killall
 share/zsh/${PKGVERSION}/functions/_kld
-share/zsh/${PKGVERSION}/functions/_larch
 share/zsh/${PKGVERSION}/functions/_last
 share/zsh/${PKGVERSION}/functions/_less
 share/zsh/${PKGVERSION}/functions/_limit
@@ -240,6 +239,7 @@ share/zsh/${PKGVERSION}/functions/_mondo
 share/zsh/${PKGVERSION}/functions/_most_recent_file
 share/zsh/${PKGVERSION}/functions/_mount
 share/zsh/${PKGVERSION}/functions/_mozilla
+share/zsh/${PKGVERSION}/functions/_mpc
 share/zsh/${PKGVERSION}/functions/_mplayer
 share/zsh/${PKGVERSION}/functions/_mt
 share/zsh/${PKGVERSION}/functions/_mtools
@@ -369,6 +369,7 @@ share/zsh/${PKGVERSION}/functions/_ttyctl
 share/zsh/${PKGVERSION}/functions/_typeset
 share/zsh/${PKGVERSION}/functions/_ulimit
 share/zsh/${PKGVERSION}/functions/_uml
+share/zsh/${PKGVERSION}/functions/_unace
 share/zsh/${PKGVERSION}/functions/_unhash
 share/zsh/${PKGVERSION}/functions/_uniq
 share/zsh/${PKGVERSION}/functions/_unsetopt
diff --git a/shells/zsh/distinfo b/shells/zsh/distinfo
index d5c22646f58..1eff04bd505 100644
--- a/shells/zsh/distinfo
+++ b/shells/zsh/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.21 2005/02/24 13:14:42 agc Exp $
+$NetBSD: distinfo,v 1.22 2005/04/07 14:16:41 adam Exp $
 
-SHA1 (zsh-4.2.4.tar.bz2) = 5bd2a12cc9b663ac0c6aed8a619930a233640d7e
-RMD160 (zsh-4.2.4.tar.bz2) = 15102991181b4bf39dd6413f298388b6a8058ee4
-Size (zsh-4.2.4.tar.bz2) = 2089657 bytes
+SHA1 (zsh-4.2.5.tar.bz2) = 4dc142eb37c4dadae29ed7fb51756ed89ba64263
+RMD160 (zsh-4.2.5.tar.bz2) = 10e2319b30d5791d39c0a4488e297d451adbdbe5
+Size (zsh-4.2.5.tar.bz2) = 2074535 bytes
 SHA1 (patch-aa) = 5e5fde0f21a64c2e0579958868b05737ef0c6afb
 SHA1 (patch-ab) = 815de90c379035dbc02b251cee148f6df47f9a65
-SHA1 (patch-ac) = 1335bb9c153fba14d7cf09d47eb87a0ed057e1f5
+SHA1 (patch-ac) = fdcdd3996008a6ce61352251e652d6223fc0b400
 SHA1 (patch-ae) = 7d4514d0bad6553d3c0cf115874bf50ed0da3d48
diff --git a/shells/zsh/patches/patch-ac b/shells/zsh/patches/patch-ac
index 1b1748f5f27..bb4d589bc4a 100644
--- a/shells/zsh/patches/patch-ac
+++ b/shells/zsh/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.17 2005/02/21 11:07:37 adam Exp $
+$NetBSD: patch-ac,v 1.18 2005/04/07 14:16:41 adam Exp $
 
---- configure.orig	2005-02-01 17:53:21.000000000 +0000
+--- configure.orig	2005-04-04 09:49:26.000000000 +0000
 +++ configure
-@@ -15476,6 +15476,10 @@ echo "${ECHO_T}$zsh_cv_sys_elf" >&6
+@@ -15724,6 +15724,10 @@ echo "${ECHO_T}$zsh_cv_sys_elf" >&6
          DLLD="${DLLD=$CC}"
          DLLDARG=""
        ;;
@@ -13,7 +13,7 @@ $NetBSD: patch-ac,v 1.17 2005/02/21 11:07:37 adam Exp $
        * )
  	DLLD="${DLLD=ld}"
  	DLLDARG=""
-@@ -15486,6 +15490,7 @@ echo "${ECHO_T}$zsh_cv_sys_elf" >&6
+@@ -15734,6 +15738,7 @@ echo "${ECHO_T}$zsh_cv_sys_elf" >&6
      case "$host_os" in
        hpux*)   DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
        darwin*) DLCFLAGS="${DLCFLAGS=-fno-common}" ;;
@@ -21,7 +21,7 @@ $NetBSD: patch-ac,v 1.17 2005/02/21 11:07:37 adam Exp $
        *)       DLCFLAGS="${DLCFLAGS=-fPIC}" ;;
      esac
    else
-@@ -15499,7 +15504,7 @@ echo "${ECHO_T}$zsh_cv_sys_elf" >&6
+@@ -15747,7 +15752,7 @@ echo "${ECHO_T}$zsh_cv_sys_elf" >&6
      esac
    fi
    case "$host_os" in
-- 
cgit v1.2.3