From owner-svn-ports-head@FreeBSD.ORG  Sun Apr 26 14:29:36 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 14931766;
 Sun, 26 Apr 2015 14:29:36 +0000 (UTC)
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 02A101C6A;
 Sun, 26 Apr 2015 14:29:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3QETZnj062609;
 Sun, 26 Apr 2015 14:29:35 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3QETZBW062608;
 Sun, 26 Apr 2015 14:29:35 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201504261429.t3QETZBW062608@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: Sun, 26 Apr 2015 14:29:35 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r384799 - 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-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Apr 2015 14:29:36 -0000

Author: marino
Date: Sun Apr 26 14:29:35 2015
New Revision: 384799
URL: https://svnweb.freebsd.org/changeset/ports/384799

Log:
  shells/zsh: Fix runtime error when built by gcc-5 with upstream patch
  
  ZSH was misbuilt on gcc-5 due to an intentional change in behavior of
  gcc5's cpp.  This patch to execute cpp with the -P switch comes from
  upstream.  No revbump necessary as GCC5 isn't used by default on FreeBSD.
  
  Reported by:	DragonFly ZSH users
  Approved by:	maintainer (bapt, IRC)

Added:
  head/shells/zsh/files/patch-Src_zsh.mdd   (contents, props changed)

Added: head/shells/zsh/files/patch-Src_zsh.mdd
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/shells/zsh/files/patch-Src_zsh.mdd	Sun Apr 26 14:29:35 2015	(r384799)
@@ -0,0 +1,22 @@
+--- Src/zsh.mdd.orig	2014-09-20 19:01:46 UTC
++++ Src/zsh.mdd
+@@ -21,9 +21,18 @@ hdrdeps="zshcurses.h zshterm.h"
+ :<<\Make
+ @CONFIG_MK@
+ 
++# If we're using gcc as the preprocessor, get rid of the additional
++# lines generated by the preprocessor as they can confuse the script.
++# We don't need these in other cases either, but can't necessarily rely
++# on the option to remove them being the same.
+ 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*) \
++	$(CPP) -P sigtmp.c >sigtmp.out;; \
++	*) \
++	$(CPP) sigtmp.c >sigtmp.out;; \
++	esac
+ 	$(AWK) -f $(sdir)/signames2.awk sigtmp.out > $@
+ 	rm -f sigtmp.c sigtmp.out
+