From 2da652a15b01dfb6aa795f56c2be3647d7566695 Mon Sep 17 00:00:00 2001
From: uebayasi <uebayasi@pkgsrc.org>
Date: Tue, 18 Jan 2005 12:44:53 +0000
Subject: Fix build on Interix.  PR26847, from Hiramatsu Yoshifumi.

---
 shells/zsh/Makefile.common  |  6 +++++-
 shells/zsh/distinfo         |  4 ++--
 shells/zsh/patches/patch-ac | 16 ++++++++--------
 3 files changed, 15 insertions(+), 11 deletions(-)

(limited to 'shells')

diff --git a/shells/zsh/Makefile.common b/shells/zsh/Makefile.common
index ff85f236d81..9487126b23f 100644
--- a/shells/zsh/Makefile.common
+++ b/shells/zsh/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2004/11/25 16:12:54 taca Exp $
+# $NetBSD: Makefile.common,v 1.19 2005/01/18 12:44:53 uebayasi Exp $
 
 DISTNAME=       zsh-${ZSH_VERSION}
 CATEGORIES=	shells
@@ -59,6 +59,10 @@ PLIST_SRC=	${PKGDIR}/PLIST.shlibs ${PKGDIR}/PLIST.dynamic ${PKGDIR}/PLIST
 .  endif
 .endif
 
+.if ${OPSYS} == "Interix"
+CONFIGURE_ARGS+=	--without-tcsetpgrp
+.endif
+
 .undef MANZ
 
 PKG_SHELL=	${PREFIX}/bin/zsh
diff --git a/shells/zsh/distinfo b/shells/zsh/distinfo
index 7957016283d..c4ed98d9ac6 100644
--- a/shells/zsh/distinfo
+++ b/shells/zsh/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.17 2004/08/16 16:17:39 recht Exp $
+$NetBSD: distinfo,v 1.18 2005/01/18 12:44:53 uebayasi Exp $
 
 SHA1 (zsh-4.2.1.tar.bz2) = fadf64908fbb62572b11ec79f7c42960c4e71292
 Size (zsh-4.2.1.tar.bz2) = 2039188 bytes
 SHA1 (patch-aa) = 5e5fde0f21a64c2e0579958868b05737ef0c6afb
 SHA1 (patch-ab) = 65e7343fcea23aa516975521d0b92a67c06d1bda
-SHA1 (patch-ac) = 45edc3320e6347e170173966e38008767c7f374c
+SHA1 (patch-ac) = a9409a63f5d09c9449636cb277f73eb7da650bcb
 SHA1 (patch-ae) = 7d4514d0bad6553d3c0cf115874bf50ed0da3d48
diff --git a/shells/zsh/patches/patch-ac b/shells/zsh/patches/patch-ac
index a68556c7dc3..2d78ba95f32 100644
--- a/shells/zsh/patches/patch-ac
+++ b/shells/zsh/patches/patch-ac
@@ -1,18 +1,18 @@
-$NetBSD: patch-ac,v 1.14 2004/08/16 16:17:39 recht Exp $
+$NetBSD: patch-ac,v 1.15 2005/01/18 12:44:53 uebayasi Exp $
 
---- configure.orig	2004-08-13 12:24:24.000000000 +0200
-+++ configure	2004-08-16 11:54:09.000000000 +0200
-@@ -13691,6 +13691,10 @@
- 	DLLD="${DLLD=/usr/ccs/bin/cc}"
- 	DLLDARG="${LDARG}"
+--- configure.orig	Fri Aug 13 19:24:24 2004
++++ configure	Sun Aug 29 06:06:03 2004
+@@ -13713,6 +13713,10 @@
+         DLLD="${DLLD=$CC}"
+         DLLDARG=""
        ;;
 +      *interix*)
 +	DLLD="${DLLD=$CC}"
 +	DLLDARG=""
 +      ;;
        * )
- 	DLLD="${DLLD=$CC}"
- 	DLLDARG="${LDARG}"
+ 	DLLD="${DLLD=ld}"
+ 	DLLDARG=""
 @@ -13736,7 +13740,7 @@
      esac
    fi
-- 
cgit v1.2.3