From owner-svn-ports-all@FreeBSD.ORG  Tue May 26 10:54:37 2015
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E04703E3;
 Tue, 26 May 2015 10:54:37 +0000 (UTC)
 (envelope-from marino@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id CE39AB14;
 Tue, 26 May 2015 10:54:37 +0000 (UTC)
 (envelope-from marino@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4QAsblH074568;
 Tue, 26 May 2015 10:54:37 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4QAsbBg074565;
 Tue, 26 May 2015 10:54:37 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201505261054.t4QAsbBg074565@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: marino set sender to
 marino@FreeBSD.org using -f
From: John Marino <marino@FreeBSD.org>
Date: Tue, 26 May 2015 10:54:37 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r387463 - in head/shells/zsh: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 May 2015 10:54:38 -0000

Author: marino
Date: Tue May 26 10:54:36 2015
New Revision: 387463
URL: https://svnweb.freebsd.org/changeset/ports/387463

Log:
  shells/zsh: Fix runtime error when built by gcc-5 with upstream patch
  
  The previous approved fix for building with gcc5 still didn't work right.
  Sure enough, upstream updated their patch.  When we take that update,
  zshell finally behaves.  Piggybacking on previous approval.

Modified:
  head/shells/zsh/Makefile
  head/shells/zsh/files/patch-Src_zsh.mdd

Modified: head/shells/zsh/Makefile
==============================================================================
--- head/shells/zsh/Makefile	Tue May 26 09:08:58 2015	(r387462)
+++ head/shells/zsh/Makefile	Tue May 26 10:54:36 2015	(r387463)
@@ -3,7 +3,7 @@
 
 PORTNAME=	zsh
 PORTVERSION=	5.0.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	shells
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \
 		SF/${PORTNAME}/${PORTNAME}-doc/${PORTVERSION}:doc

Modified: head/shells/zsh/files/patch-Src_zsh.mdd
==============================================================================
--- head/shells/zsh/files/patch-Src_zsh.mdd	Tue May 26 09:08:58 2015	(r387462)
+++ head/shells/zsh/files/patch-Src_zsh.mdd	Tue May 26 10:54:36 2015	(r387463)
@@ -11,8 +11,8 @@
  signames.c: signames1.awk signames2.awk ../config.h @SIGNAL_H@
  	$(AWK) -f $(sdir)/signames1.awk @SIGNAL_H@ >sigtmp.c
 -	$(CPP) sigtmp.c >sigtmp.out
-+	case "$(CPP)" in \
-+	gcc*) \
++	case "`$(CPP) --version </dev/null 2>&1`" in \
++	*"Free Software Foundation"*) \
 +	$(CPP) -P sigtmp.c >sigtmp.out;; \
 +	*) \
 +	$(CPP) sigtmp.c >sigtmp.out;; \