svn commit: r387463 - in head/shells/zsh: . files

[John Marino]

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;; \