[csw-devel] SF.net SVN: gar:[5613] csw/mgar/pkg/siege/trunk

[bensons at users.sourceforge.net]

Revision: 5613
          http://gar.svn.sourceforge.net/gar/?rev=5613&view=rev
Author:   bensons
Date:     2009-07-21 15:15:13 +0000 (Tue, 21 Jul 2009)

Log Message:
-----------
siege: fixed location of urls.txt, patched bombardment

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

Added Paths:
-----------
    csw/mgar/pkg/siege/trunk/files/patch-bombardment.in
    csw/mgar/pkg/siege/trunk/files/patch-configure

Modified: csw/mgar/pkg/siege/trunk/Makefile
===================================================================
--- csw/mgar/pkg/siege/trunk/Makefile	2009-07-21 12:39:10 UTC (rev 5612)
+++ csw/mgar/pkg/siege/trunk/Makefile	2009-07-21 15:15:13 UTC (rev 5613)
@@ -18,14 +18,21 @@
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
 # we require
-REQUIRED_PKGS = CSWosslrt
+REQUIRED_PKGS = CSWcswclassutils CSWosslrt
 
+# handle config file
+PRESERVECONF = $(sysconfdir)/urls.txt.CSW
+
+# patch bombardment
+PATCHFILES  = patch-bombardment.in
+PATCHFILES += patch-configure
+
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-ssl=$(prefix)
 
 TEST_SCRIPTS =
 
-INSTALL_SCRIPTS = bin conf man
+INSTALL_SCRIPTS = bin man additional
 
 include gar/category.mk
 
@@ -34,8 +41,8 @@
 bin-list += $(WORKSRC)/utils/bombardment
 bin-list += $(WORKSRC)/utils/siege2csv.pl
 bin-list += $(WORKSRC)/utils/siege.config
-conf-list  = $(WORKSRC)/doc/urls.txt
-conf-list += $(WORKSRC)/doc/siegerc
+share-list  = $(WORKSRC)/doc/urls.txt
+share-list += $(WORKSRC)/doc/siegerc
 
 install-bin:
 	ginstall -d $(DESTDIR)$(bindir)
@@ -43,11 +50,13 @@
 		ginstall -m 751 $$file $(DESTDIR)$(bindir) ; \
 			done )
 
-install-conf:
-	ginstall -d $(DESTDIR)$(sysconfdir)/$(GARNAME)
-	@( for file in $(conf-list) ; do \
-		ginstall -m 644 $$file $(DESTDIR)$(sysconfdir)/$(GARNAME) ; \
-			done )
+install-additional:
+	ginstall -d $(DESTDIR)$(sysconfdir)
+	ginstall -m 644 $(WORKSRC)/doc/urls.txt \
+		$(DESTDIR)$(sysconfdir)/urls.txt.CSW
+	ginstall -d $(DESTDIR)$(sharedstatedir)/$(GARNAME)
+	ginstall -m 644 $(WORKSRC)/doc/siegerc \
+		$(DESTDIR)$(sharedstatedir)/$(GARNAME)
 
 install-man:
 	ginstall -d $(DESTDIR)$(mandir)/man1

Modified: csw/mgar/pkg/siege/trunk/checksums
===================================================================
--- csw/mgar/pkg/siege/trunk/checksums	2009-07-21 12:39:10 UTC (rev 5612)
+++ csw/mgar/pkg/siege/trunk/checksums	2009-07-21 15:15:13 UTC (rev 5613)
@@ -1 +1,3 @@
+4acf8817dc68474af49acd8a73353559  download/patch-bombardment.in
+90d897e1b35b25293def46327ae3bc2d  download/patch-configure
 a5592e42d4217572d8035dec000f479c  download/siege-2.66.tar.gz

Added: csw/mgar/pkg/siege/trunk/files/patch-bombardment.in
===================================================================
--- csw/mgar/pkg/siege/trunk/files/patch-bombardment.in	                        (rev 0)
+++ csw/mgar/pkg/siege/trunk/files/patch-bombardment.in	2009-07-21 15:15:13 UTC (rev 5613)
@@ -0,0 +1,20 @@
+--- siege-2.66.orig/utils/bombardment.in	2006-04-17 20:37:35.000000000 +0200
++++ siege-2.66/utils/bombardment.in	2009-07-21 16:58:09.089590445 +0200
+@@ -21,7 +21,7 @@
+ 
+ 
+ # Display help if no options or --help specified.
+-if [ -z $1 ] || [ $1 = --help ]
++if [ -z $1 ] || [ $1 = --help ] || [ $# -ne 5 ] || [ ! -r $1 ]
+ 	then 	
+ 		echo ""
+ 		echo "usage:"
+@@ -40,7 +40,7 @@
+ inc=$3
+ numruns=$4
+ delay=$5
+-serial=`date --iso-8601=minutes`
++serial=`od -X -N 4 -A n /dev/random | awk '{ print $1 }'`
+ 
+ # This script can easily be made to overwhelm system resources (processes
+ # and filehandles.  This bit calculates how many processes it will spawn

Added: csw/mgar/pkg/siege/trunk/files/patch-configure
===================================================================
--- csw/mgar/pkg/siege/trunk/files/patch-configure	                        (rev 0)
+++ csw/mgar/pkg/siege/trunk/files/patch-configure	2009-07-21 15:15:13 UTC (rev 5613)
@@ -0,0 +1,15 @@
+--- siege-2.66.orig/configure	2007-03-29 20:07:30.000000000 +0200
++++ siege-2.66/configure	2009-07-21 15:55:38.296970184 +0200
+@@ -26980,9 +26980,9 @@
+ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+  prefix=$prefix sysconfdir=$sysconfdir localstatedir=$localstatedir
+  VERSION=$VERSION DATE="$DATE" PROGRAM="$PROGRAM" AUTHOR="$AUTHOR" EMAIL="$EMAIL"
+- bindir=$exec_prefix$bindir sh=$SHELL
+- bindir=$exec_prefix$bindir sh=$SHELL
+- bindir=$exec_prefix$bindir LREP=$PERL
++ sh=$SHELL
++ sh=$SHELL
++ LREP=$PERL
+ PLATFORM=$PLATFORM
+ 
+ _ACEOF


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