SF.net SVN: gar:[23297] csw/mgar/pkg/rcs/trunk

[dmichelsen at users.sourceforge.net]

Revision: 23297
          http://sourceforge.net/p/gar/code/23297
Author:   dmichelsen
Date:     2014-03-30 19:53:22 +0000 (Sun, 30 Mar 2014)
Log Message:
-----------
rcs/trunk: Update to 5.9.2, get rid of patches now integrated upstream

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

Removed Paths:
-------------
    csw/mgar/pkg/rcs/trunk/files/0001-Do-not-halt-on-errors.patch
    csw/mgar/pkg/rcs/trunk/files/0001-sh-bails-out-if-returncode-of-grep-is-1.patch

Modified: csw/mgar/pkg/rcs/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rcs/trunk/Makefile	2014-03-30 19:43:20 UTC (rev 23296)
+++ csw/mgar/pkg/rcs/trunk/Makefile	2014-03-30 19:53:22 UTC (rev 23297)
@@ -1,5 +1,5 @@
 NAME = rcs
-VERSION = 5.9.1
+VERSION = 5.9.2
 GARTYPE = v2
 
 DESCRIPTION = GNU Revision Control System
@@ -9,8 +9,6 @@
 MASTER_SITES = $(GNU_MIRROR)
 DISTFILES  = $(DISTNAME).tar.xz
 
-PATCHFILES += 0001-Do-not-halt-on-errors.patch
-
 VENDOR_URL = http://www.gnu.org/software/rcs/
 
 # Make extra package for Solaris 11 as the Solaris 10 package dumps core:

Modified: csw/mgar/pkg/rcs/trunk/checksums
===================================================================
--- csw/mgar/pkg/rcs/trunk/checksums	2014-03-30 19:43:20 UTC (rev 23296)
+++ csw/mgar/pkg/rcs/trunk/checksums	2014-03-30 19:53:22 UTC (rev 23297)
@@ -1 +1 @@
-43af6f4cce2c42bb4572691bb97e4396  rcs-5.9.1.tar.xz
+2af60f0baa0262888d229c2f0f5b8390  rcs-5.9.2.tar.xz

Deleted: csw/mgar/pkg/rcs/trunk/files/0001-Do-not-halt-on-errors.patch
===================================================================
--- csw/mgar/pkg/rcs/trunk/files/0001-Do-not-halt-on-errors.patch	2014-03-30 19:43:20 UTC (rev 23296)
+++ csw/mgar/pkg/rcs/trunk/files/0001-Do-not-halt-on-errors.patch	2014-03-30 19:53:22 UTC (rev 23297)
@@ -1,25 +0,0 @@
-From 52e5fc9a17ef1223124eabb24c7e9dde682059e6 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Sun, 20 Oct 2013 17:50:42 +0200
-Subject: [PATCH] Do not halt on errors
-
----
- build-aux/extract-help | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/build-aux/extract-help b/build-aux/extract-help
-index a360e1c..1c76319 100755
---- a/build-aux/extract-help
-+++ b/build-aux/extract-help
-@@ -30,7 +30,7 @@
- 
- version='1.0'
- 
--set -e
-+# set -e
- 
- usage ()
- {
--- 
-1.8.3.4
-

Deleted: csw/mgar/pkg/rcs/trunk/files/0001-sh-bails-out-if-returncode-of-grep-is-1.patch
===================================================================
--- csw/mgar/pkg/rcs/trunk/files/0001-sh-bails-out-if-returncode-of-grep-is-1.patch	2014-03-30 19:43:20 UTC (rev 23296)
+++ csw/mgar/pkg/rcs/trunk/files/0001-sh-bails-out-if-returncode-of-grep-is-1.patch	2014-03-30 19:53:22 UTC (rev 23297)
@@ -1,26 +0,0 @@
-From 8b9b824d11f30e7944dc664e7f3d4cbace871196 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Sat, 19 Oct 2013 12:22:27 +0200
-Subject: [PATCH] sh bails out if returncode of grep is 1
-
----
- build-aux/extract-help | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
- mode change 100755 => 100644 build-aux/extract-help
-
-diff --git a/build-aux/extract-help b/build-aux/extract-help
-index a360e1c..7a2d33d
---- a/build-aux/extract-help
-+++ b/build-aux/extract-help
-@@ -87,7 +87,7 @@ echo 'static char const' $vprefix'help[] = ""'
- echo ';'
- 
- # Pull in command support only if needed.
--if [ 0 = `grep -c 'CHECK_HV (".*")' "$in"` ] ; then
-+if [ 0 = `grep -c 'CHECK_HV (".*")' "$in";true` ] ; then
-     echo '#include "b-yacmd.h"'
- fi
- 
--- 
-1.8.3.4
-

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