SF.net SVN: gar:[25243] csw/mgar/pkg/guilt/trunk

[opk at users.sourceforge.net]

Revision: 25243
          http://sourceforge.net/p/gar/code/25243
Author:   opk
Date:     2015-09-16 14:58:29 +0000 (Wed, 16 Sep 2015)
Log Message:
-----------
guilt/trunk: update to 0.36

Modified Paths:
--------------
    csw/mgar/pkg/guilt/trunk/Makefile
    csw/mgar/pkg/guilt/trunk/checksums
    csw/mgar/pkg/guilt/trunk/files/0001-use-bash-for-scripts.patch

Removed Paths:
-------------
    csw/mgar/pkg/guilt/trunk/files/0002-don-t-rebuild-man-pages.patch

Modified: csw/mgar/pkg/guilt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/guilt/trunk/Makefile	2015-09-16 14:41:03 UTC (rev 25242)
+++ csw/mgar/pkg/guilt/trunk/Makefile	2015-09-16 14:58:29 UTC (rev 25243)
@@ -1,5 +1,5 @@
 NAME = guilt
-VERSION = 0.35
+VERSION = 0.36
 GARTYPE = v2
 
 DESCRIPTION = Manipulate quilt like patches on top of git
@@ -12,14 +12,16 @@
   patches using git or whatever other SCM.
 endef
 
-MASTER_SITES = http://www.kernel.org/pub/linux/kernel/people/jsipek/guilt/
-DISTFILES  = $(DISTNAME).tar.bz2
+MASTER_SITES = http://guilt.31bits.net/src/
+DISTFILES  = $(DISTNAME).tar.gz
+VENDOR_URL = http://repo.or.cz/w/guilt.git
 
+BUILD_DEP_PKGS += CSWasciidoc CSWxmlto
 CONFIGURE_SCRIPTS =
-BUILD_SCRIPTS =
+BUILD_SCRIPTS = $(WORKSRC)/Documentation/Makefile
 TEST_SCRIPTS =
 INSTALL_SCRIPTS = custom
-PATCHFILES += 0001-use-bash-for-scripts.patch 0002-don-t-rebuild-man-pages.patch
+PATCHFILES += 0001-use-bash-for-scripts.patch
 
 LICENSE = COPYING
 ARCHALL = 1

Modified: csw/mgar/pkg/guilt/trunk/checksums
===================================================================
--- csw/mgar/pkg/guilt/trunk/checksums	2015-09-16 14:41:03 UTC (rev 25242)
+++ csw/mgar/pkg/guilt/trunk/checksums	2015-09-16 14:58:29 UTC (rev 25243)
@@ -1 +1 @@
-974e863ceba36980a6b5429eb9708703  guilt-0.35.tar.bz2
+360b9d8354a7bb989c73a6f069146ccf  guilt-0.36.tar.gz

Modified: csw/mgar/pkg/guilt/trunk/files/0001-use-bash-for-scripts.patch
===================================================================
--- csw/mgar/pkg/guilt/trunk/files/0001-use-bash-for-scripts.patch	2015-09-16 14:41:03 UTC (rev 25242)
+++ csw/mgar/pkg/guilt/trunk/files/0001-use-bash-for-scripts.patch	2015-09-16 14:58:29 UTC (rev 25243)
@@ -1,22 +1,61 @@
-From 13f7765ede23c6f4bc201d36ae80a31f9f52b57c Mon Sep 17 00:00:00 2001
-From: Oliver Kiddle <oliver.kiddle at esa.int>
-Date: Tue, 9 Aug 2011 16:54:14 +0200
-Subject: [PATCH 2/3] use bash for scripts
+From 5650d79f0b65efdad9670f1628cf8c9add475119 Mon Sep 17 00:00:00 2001
+From: Oliver Kiddle <opk at opencsw.org>
+Date: Wed, 16 Sep 2015 14:56:57 +0200
+Subject: [PATCH] use bash for scripts
 
 ---
- guilt |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ Documentation/Makefile    | 2 +-
+ Documentation/cmd-list.sh | 2 +-
+ Documentation/usage.sh    | 2 +-
+ guilt                     | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
 
+diff --git a/Documentation/Makefile b/Documentation/Makefile
+index eb9c2b7..ea54e9d 100644
+--- a/Documentation/Makefile
++++ b/Documentation/Makefile
+@@ -70,7 +70,7 @@ clean:
+ 	rm -f version.txt
+ 
+ usage-guilt-%.txt: ../guilt-% usage.sh
+-	sh ./usage.sh $<
++	bash ./usage.sh $<
+ 
+ %.html : %.txt footer.txt version.txt
+ 	$(ASCIIDOC) -b xhtml11 -d manpage -f asciidoc.conf $(ASCIIDOC_EXTRA) $<
+diff --git a/Documentation/cmd-list.sh b/Documentation/cmd-list.sh
+index 4ede8f9..cc7c271 100644
+--- a/Documentation/cmd-list.sh
++++ b/Documentation/cmd-list.sh
+@@ -11,7 +11,7 @@ BEGIN{state=0}
+ {print $0; exit}
+ '`
+ 
+-	len=`expr length "${cmd}"`
++	len=`gexpr length "${cmd}"`
+ 
+ 	if [ -z "$desc" ]; then
+ 		echo "No description found in $cmd.txt" >&2
+diff --git a/Documentation/usage.sh b/Documentation/usage.sh
+index c208b68..c8429d5 100644
+--- a/Documentation/usage.sh
++++ b/Documentation/usage.sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ name=$(basename $1)
+ u=$(grep USAGE $1 |  sed 's/USAGE="//' | sed 's/"$//') 
 diff --git a/guilt b/guilt
-index d1e17d4..07fc4fd 100755
+index 35177b9..5b2deb9 100755
 --- a/guilt
 +++ b/guilt
 @@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!/bin/bash
  #
- # Copyright (c) Josef "Jeff" Sipek, 2006-2011
+ # Copyright (c) Josef "Jeff" Sipek, 2006-2015
  #
 -- 
-1.7.6
+2.4.0
 

Deleted: csw/mgar/pkg/guilt/trunk/files/0002-don-t-rebuild-man-pages.patch
===================================================================
--- csw/mgar/pkg/guilt/trunk/files/0002-don-t-rebuild-man-pages.patch	2015-09-16 14:41:03 UTC (rev 25242)
+++ csw/mgar/pkg/guilt/trunk/files/0002-don-t-rebuild-man-pages.patch	2015-09-16 14:58:29 UTC (rev 25243)
@@ -1,25 +0,0 @@
-From 83c1dd03e66ca9a9cc2d178ce815283e846694cb Mon Sep 17 00:00:00 2001
-From: Oliver Kiddle <oliver.kiddle at esa.int>
-Date: Tue, 9 Aug 2011 16:54:41 +0200
-Subject: [PATCH 3/3] don't rebuild man pages
-
----
- Documentation/Makefile |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Documentation/Makefile b/Documentation/Makefile
-index 9fc1165..49ec4fa 100644
---- a/Documentation/Makefile
-+++ b/Documentation/Makefile
-@@ -32,7 +32,7 @@ man: man1 man7
- man1: $(DOC_MAN1)
- man7: $(DOC_MAN7)
- 
--install: man
-+install:
- 	$(INSTALL) -d -m755 $(DESTDIR)$(man1dir) $(DESTDIR)$(man7dir)
- 	$(INSTALL) -m644 $(DOC_MAN1) $(DESTDIR)$(man1dir)
- 	$(INSTALL) -m644 $(DOC_MAN7) $(DESTDIR)$(man7dir)
--- 
-1.7.6
-

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