SF.net SVN: gar:[22863] csw/mgar/pkg/zsh/trunk

[opk at users.sourceforge.net]

Revision: 22863
          http://sourceforge.net/p/gar/code/22863
Author:   opk
Date:     2014-01-21 21:50:56 +0000 (Tue, 21 Jan 2014)
Log Message:
-----------
/tmp/opk-mgar/zsh/trunk: update zsh to 5.0.5

Modified Paths:
--------------
    csw/mgar/pkg/zsh/trunk/Makefile
    csw/mgar/pkg/zsh/trunk/checksums

Modified: csw/mgar/pkg/zsh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/zsh/trunk/Makefile	2014-01-20 06:53:56 UTC (rev 22862)
+++ csw/mgar/pkg/zsh/trunk/Makefile	2014-01-21 21:50:56 UTC (rev 22863)
@@ -1,5 +1,5 @@
 NAME = zsh
-VERSION = 5.0.4
+VERSION = 5.0.5
 GARTYPE = v2
 
 DESCRIPTION = Powerful UNIX shell
@@ -30,8 +30,8 @@
 CONFIGURE_ARGS += --enable-pcre
 CONFIGURE_ARGS += --enable-etcdir=$(sysconfdir)
 
-CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/bin/zsh-$(VERSION)
-
+CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/bin/zsh
+EXTRA_MERGE_EXCLUDE_FILES = /opt/csw/bin/zsh-$(VERSION)
 ETCSHELLS = /opt/csw/bin/zsh
 
 include gar/category.mk

Modified: csw/mgar/pkg/zsh/trunk/checksums
===================================================================
--- csw/mgar/pkg/zsh/trunk/checksums	2014-01-20 06:53:56 UTC (rev 22862)
+++ csw/mgar/pkg/zsh/trunk/checksums	2014-01-21 21:50:56 UTC (rev 22863)
@@ -1 +1 @@
-9829fe8932c25740173a272e8959cf8c  zsh-5.0.4.tar.bz2
+6156dc2f19b0a067bdbc0fb7f81e2017  zsh-5.0.5.tar.bz2

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.