[csw-devel] SF.net SVN: gar:[19299] csw/mgar/pkg/dsh/trunk

[dmichelsen at users.sourceforge.net]

Revision: 19299
          http://gar.svn.sourceforge.net/gar/?rev=19299&view=rev
Author:   dmichelsen
Date:     2012-09-27 09:26:12 +0000 (Thu, 27 Sep 2012)
Log Message:
-----------
dsh/trunk: Rework build recipe

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

Added Paths:
-----------
    csw/mgar/pkg/dsh/trunk/files/0001-Use-bash-where-applicable.patch

Modified: csw/mgar/pkg/dsh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dsh/trunk/Makefile	2012-09-27 08:43:36 UTC (rev 19298)
+++ csw/mgar/pkg/dsh/trunk/Makefile	2012-09-27 09:26:12 UTC (rev 19299)
@@ -5,22 +5,35 @@
 VERSION = 0.25.9
 GARTYPE = v2
 CATEGORIES = devel
-RUNTIME_DEP_PKGS_CSWdsh = CSWlibdshconfig
-BUILD_DEP_PKGS = CSWlibdshconfig
 
-DESCRIPTION = Distributed shell. Runs command through rsh or ssh on a cluster of machines.
+DESCRIPTION = Distributed shell which command through rsh or ssh on a cluster of machines
 
-MASTER_SITES = http://www.netfort.gr.jp/~dancer/software/downloads/dsh-0.25.9.tar.gz
-DISTFILES  = $(DISTNAME).tar.gz
+MASTER_SITES = http://www.netfort.gr.jp/~dancer/software/downloads/
+DISTFILES += $(DISTNAME).tar.gz
 
+PATCHFILES += 0001-Use-bash-where-applicable.patch
+
+VENDOR_URL = http://www.netfort.gr.jp/~dancer/software/dsh.html.en
+
+BUILD_DEP_PKGS += CSWlibdshconfig-dev
+
+PACKAGES += CSWdsh
+SPKG_DESC_CSWdsh = Distributed shell which command through rsh or ssh on a cluster of machines
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWdsh += CSWlibdshconfig1
+RUNTIME_DEP_PKGS_CSWdsh += CSWlibintl8
+
 # for libintl_gettext, libintl_textdomain, libintl_bindtextdomain
 EXTRA_LINKER_FLAGS = -lintl
 
+BUILD64 = 1
+ISAEXEC = 1
 CONFIGURE_ARGS = $(DIRPATHS) 
 
-TEST_SCRIPTS = 
+PRESERVECONF += $(sysconfdir)/dsh.conf
 
-TEST_TARGET = 
+# There are still some tests sporadically failing, disable for now
+SKIPTEST ?= 1
 
 include gar/category.mk
 

Added: csw/mgar/pkg/dsh/trunk/files/0001-Use-bash-where-applicable.patch
===================================================================
--- csw/mgar/pkg/dsh/trunk/files/0001-Use-bash-where-applicable.patch	                        (rev 0)
+++ csw/mgar/pkg/dsh/trunk/files/0001-Use-bash-where-applicable.patch	2012-09-27 09:26:12 UTC (rev 19299)
@@ -0,0 +1,44 @@
+From 749371b5f5ff26b3cfa3a5a6e13d02f5fe0ebe7d Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 27 Sep 2012 10:26:58 +0200
+Subject: [PATCH] Use bash where applicable
+
+---
+ tests/news-okay.sh       |    2 +-
+ tests/param-F-invalid.sh |    2 +-
+ tests/param-i.sh         |    2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tests/news-okay.sh b/tests/news-okay.sh
+index 5592f07..e2c7a7a 100755
+--- a/tests/news-okay.sh
++++ b/tests/news-okay.sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ # check if NEWS is updated
+ set -e 
+ 
+diff --git a/tests/param-F-invalid.sh b/tests/param-F-invalid.sh
+index 74c0bff..a0e0773 100755
+--- a/tests/param-F-invalid.sh
++++ b/tests/param-F-invalid.sh
+@@ -1,4 +1,4 @@
+-#! /bin/sh
++#! /bin/bash
+ # test to check that -F parameter fails properly.
+ ./dsh -recho -M -m 1,2 -F 10 -c
+ case $? in
+diff --git a/tests/param-i.sh b/tests/param-i.sh
+index 89b4085..e0d6543 100755
+--- a/tests/param-i.sh
++++ b/tests/param-i.sh
+@@ -1,4 +1,4 @@
+-#! /bin/sh
++#! /bin/bash
+ # test whether the -i option works.
+ 
+ set -e 
+-- 
+1.7.10.3
+

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