[csw-devel] SF.net SVN: gar:[5842] csw/mgar/pkg/patchutils/trunk

[dmichelsen at users.sourceforge.net]

Revision: 5842
          http://gar.svn.sourceforge.net/gar/?rev=5842&view=rev
Author:   dmichelsen
Date:     2009-08-04 09:38:48 +0000 (Tue, 04 Aug 2009)

Log Message:
-----------
patchutils: Force use of csw bash and perl

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

Added Paths:
-----------
    csw/mgar/pkg/patchutils/trunk/files/patch-use-csw-bash.diff

Modified: csw/mgar/pkg/patchutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/patchutils/trunk/Makefile	2009-08-04 09:35:51 UTC (rev 5841)
+++ csw/mgar/pkg/patchutils/trunk/Makefile	2009-08-04 09:38:48 UTC (rev 5842)
@@ -13,11 +13,15 @@
 # gendiff is needed for the tests
 DISTFILES += gendiff
 
+PATCHFILES = patch-use-csw-bash.diff
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
 
 PREREQUISITE_PKGS = CSWgnulinks CSWbash CSWdiffutils
 
+REQUIRED_PKGS = CSWbash CSWperl
+
 SPKG_SOURCEURL = http://cyberelk.net/tim/software/patchutils/
 
 CONFIGURE_ARGS = $(DIRPATHS)
@@ -36,7 +40,5 @@
 # /bin/bash is too old
 post-configure-modulated:
 	find $(WORKSRC) -type f | grep -v '\.in$$' | grep /tests/ | \
-		xargs perl -pi -e 's,#!/bin/bash,#!/opt/csw/bin/bash,'
-	find $(WORKSRC) -type f | fgrep -v .in | fgrep tests | \
-		xargs perl -pi -e 's,/bin/sh,/opt/csw/bin/bash,'
+		xargs perl -pi.orig -e 's,/bin/sh,/opt/csw/bin/bash,'
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/patchutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/patchutils/trunk/checksums	2009-08-04 09:35:51 UTC (rev 5841)
+++ csw/mgar/pkg/patchutils/trunk/checksums	2009-08-04 09:38:48 UTC (rev 5842)
@@ -1,2 +1,3 @@
 b68be92ed1e8b917c9ac27833ee1b803  download/gendiff
+e104b1464e33eb61f6b7cdf2ce9a89a5  download/patch-use-csw-bash.diff
 3fd9bca58a429fbbb1c2126f1b72aa23  download/patchutils-0.3.1.tar.bz2

Added: csw/mgar/pkg/patchutils/trunk/files/patch-use-csw-bash.diff
===================================================================
--- csw/mgar/pkg/patchutils/trunk/files/patch-use-csw-bash.diff	                        (rev 0)
+++ csw/mgar/pkg/patchutils/trunk/files/patch-use-csw-bash.diff	2009-08-04 09:38:48 UTC (rev 5842)
@@ -0,0 +1,45 @@
+diff -Naur patchutils-0.3.1.orig/editdiff.in patchutils-0.3.1.patched/editdiff.in
+--- patchutils-0.3.1.orig/editdiff.in	2008-06-11 12:01:28.000000000 +0200
++++ patchutils-0.3.1.patched/editdiff.in	2009-08-04 11:32:58.435884523 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/opt/csw/bin/bash
+ #
+ # editdiff - simple wrapper around rediff
+ # Copyright (C) 2001-2002 Tim Waugh <twaugh at redhat.com>
+diff -Naur patchutils-0.3.1.orig/espdiff.in patchutils-0.3.1.patched/espdiff.in
+--- patchutils-0.3.1.orig/espdiff.in	2008-06-11 12:01:28.000000000 +0200
++++ patchutils-0.3.1.patched/espdiff.in	2009-08-04 11:33:03.660183257 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/opt/csw/bin/bash
+ #
+ # espdiff - do whatever it was you wanted
+ # Copyright (C) 2003 Tim Waugh <twaugh at redhat.com>
+diff -Naur patchutils-0.3.1.orig/move-to-front patchutils-0.3.1.patched/move-to-front
+--- patchutils-0.3.1.orig/move-to-front	2008-06-11 12:01:28.000000000 +0200
++++ patchutils-0.3.1.patched/move-to-front	2009-08-04 11:33:39.577510591 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/opt/csw/bin/bash
+ if [ "$#" -eq 0 ] || [ "x$1" == "x--help" ]
+ then
+   echo "usage: move-to-front [PATCHES..] PATCH"
+diff -Naur patchutils-0.3.1.orig/tests/combine2/run-test patchutils-0.3.1.patched/tests/combine2/run-test
+--- patchutils-0.3.1.orig/tests/combine2/run-test	2008-07-02 13:11:08.000000000 +0200
++++ patchutils-0.3.1.patched/tests/combine2/run-test	2009-08-04 11:33:42.536530871 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/opt/csw/bin/bash
+ 
+ # This is a combinediff(1) testcase.
+ 
+diff -Naur patchutils-0.3.1.orig/tests/combine3/run-test patchutils-0.3.1.patched/tests/combine3/run-test
+--- patchutils-0.3.1.orig/tests/combine3/run-test	2008-07-02 13:11:08.000000000 +0200
++++ patchutils-0.3.1.patched/tests/combine3/run-test	2009-08-04 11:33:45.008706797 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/opt/csw/bin/bash
+ 
+ # This is a combinediff(1) testcase.
+ 


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