[csw-devel] SF.net SVN: gar:[13153] csw/mgar/pkg/clusterssh/trunk

wahwah at users.sourceforge.net wahwah at users.sourceforge.net
Tue Feb 1 01:15:08 CET 2011


Revision: 13153
          http://gar.svn.sourceforge.net/gar/?rev=13153&view=rev
Author:   wahwah
Date:     2011-02-01 00:15:08 +0000 (Tue, 01 Feb 2011)

Log Message:
-----------
clusterssh: Upstream watch regex update, and other small fixes

Modified Paths:
--------------
    csw/mgar/pkg/clusterssh/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/clusterssh/trunk/files/0001-Search-opt-csw-bin-instead-of-usr-local.patch

Property Changed:
----------------
    csw/mgar/pkg/clusterssh/trunk/Makefile

Modified: csw/mgar/pkg/clusterssh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/clusterssh/trunk/Makefile	2011-02-01 00:13:20 UTC (rev 13152)
+++ csw/mgar/pkg/clusterssh/trunk/Makefile	2011-02-01 00:15:08 UTC (rev 13153)
@@ -1,3 +1,5 @@
+# $Id$
+
 NAME = clusterssh
 VERSION = 3.28
 CATEGORIES = net
@@ -13,15 +15,21 @@
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES = $(NAME)-$(VERSION).tar.gz
 
+PATCHFILES += 0001-Search-opt-csw-bin-instead-of-usr-local.patch
+
 UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=89139
 UPSTREAM_USE_SF = 1
-UFILES_REGEX = (\d+(?:\.\d+)*)
+UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
-RUNTIME_DEP_PKGS  = CSWperl
+RUNTIME_DEP_PKGS += CSWperl
 RUNTIME_DEP_PKGS += CSWpmtk
 RUNTIME_DEP_PKGS += CSWpmx11protocol
 # RUNTIME_DEP_PKGS += CSWossh
 
+CHECKPKG_OVERRIDES_CSWclusterssh += surplus-dependency|CSWperl
+CHECKPKG_OVERRIDES_CSWclusterssh += surplus-dependency|CSWpmtk
+CHECKPKG_OVERRIDES_CSWclusterssh += surplus-dependency|CSWpmx11protocol
+
 ARCHALL = 1
 
 CONFIGURE_ARGS = $(DIRPATHS)


Property changes on: csw/mgar/pkg/clusterssh/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
   + Id

Added: csw/mgar/pkg/clusterssh/trunk/files/0001-Search-opt-csw-bin-instead-of-usr-local.patch
===================================================================
--- csw/mgar/pkg/clusterssh/trunk/files/0001-Search-opt-csw-bin-instead-of-usr-local.patch	                        (rev 0)
+++ csw/mgar/pkg/clusterssh/trunk/files/0001-Search-opt-csw-bin-instead-of-usr-local.patch	2011-02-01 00:15:08 UTC (rev 13153)
@@ -0,0 +1,31 @@
+From 1faa1bf6871dba55a4cbd23f38dec1d190d3edea Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Tue, 1 Feb 2011 01:09:40 +0100
+Subject: [PATCH] Search /opt/csw/bin instead of /usr/local
+
+When looking for binaries, search the /opt/csw/bin directory, and not
+/usr/local.
+---
+ src/cssh.pl |    6 ++----
+ 1 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/src/cssh.pl b/src/cssh.pl
+index f714906..98ace0f 100755
+--- a/src/cssh.pl
++++ b/src/cssh.pl
+@@ -317,10 +317,8 @@ sub find_binary($) {
+             /sbin
+             /usr/sbin
+             /usr/bin
+-            /usr/local/bin
+-            /usr/local/sbin
+-            /opt/local/bin
+-            /opt/local/sbin
++            /opt/csw/bin
++            /opt/csw/sbin
+             !
+             )
+         {
+-- 
+1.7.3.2
+


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


More information about the devel mailing list