[csw-devel] SF.net SVN: gar:[17965] csw/mgar/pkg/mbuffer/trunk

[dmichelsen at users.sourceforge.net]

Revision: 17965
          http://gar.svn.sourceforge.net/gar/?rev=17965&view=rev
Author:   dmichelsen
Date:     2012-05-07 07:51:10 +0000 (Mon, 07 May 2012)
Log Message:
-----------
mbuffer/trunk: Update to 20120505

Modified Paths:
--------------
    csw/mgar/pkg/mbuffer/trunk/Makefile
    csw/mgar/pkg/mbuffer/trunk/checksums
    csw/mgar/pkg/mbuffer/trunk/files/changelog.CSW

Added Paths:
-----------
    csw/mgar/pkg/mbuffer/trunk/files/0001-Fallback-for-DBL_EPSILON-only-in-Solaris-10.patch

Removed Paths:
-------------
    csw/mgar/pkg/mbuffer/trunk/files/0001-Makefile-put-background-jobs-in-same-shell-as-the-wa.patch

Modified: csw/mgar/pkg/mbuffer/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mbuffer/trunk/Makefile	2012-05-06 21:27:13 UTC (rev 17964)
+++ csw/mgar/pkg/mbuffer/trunk/Makefile	2012-05-07 07:51:10 UTC (rev 17965)
@@ -1,5 +1,5 @@
 NAME = mbuffer
-VERSION = 20110724
+VERSION = 20120505
 CATEGORIES = utils
 GARTYPE = v2
 
@@ -16,6 +16,8 @@
 MASTER_SITES = http://www.maier-komor.de/software/mbuffer/
 DISTFILES = $(DISTNAME).tgz
 
+PATCHFILES += 0001-Fallback-for-DBL_EPSILON-only-in-Solaris-10.patch
+
 VENDOR_URL = http://www.maier-komor.de/mbuffer.html
 
 LICENSE = LICENSE
@@ -27,7 +29,8 @@
 RUNTIME_DEP_PKGS = CSWlibmhash
 
 # 64-bit build enables buffers >= 2GB (see README).
-BUILD64_LIBS_ONLY = 1
+BUILD64 = 1
+ISAEXEC = 1
 
 # Required for updated libmhash (mbuffer builds against it) which allows for
 # flexible const/non-const definitions.  There should be a more intelligent 

Modified: csw/mgar/pkg/mbuffer/trunk/checksums
===================================================================
--- csw/mgar/pkg/mbuffer/trunk/checksums	2012-05-06 21:27:13 UTC (rev 17964)
+++ csw/mgar/pkg/mbuffer/trunk/checksums	2012-05-07 07:51:10 UTC (rev 17965)
@@ -1 +1 @@
-fc183b787f33011b42c9814029c69054  mbuffer-20110724.tgz
+f7fec4cb7525fd403a09a263b9c84934  mbuffer-20120505.tgz

Added: csw/mgar/pkg/mbuffer/trunk/files/0001-Fallback-for-DBL_EPSILON-only-in-Solaris-10.patch
===================================================================
--- csw/mgar/pkg/mbuffer/trunk/files/0001-Fallback-for-DBL_EPSILON-only-in-Solaris-10.patch	                        (rev 0)
+++ csw/mgar/pkg/mbuffer/trunk/files/0001-Fallback-for-DBL_EPSILON-only-in-Solaris-10.patch	2012-05-07 07:51:10 UTC (rev 17965)
@@ -0,0 +1,27 @@
+From 64b05d75cf2cb062990a3efae1b1c982132fe77c Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <da\xC2m at opencsw.org>
+Date: Mon, 7 May 2012 09:42:05 +0200
+Subject: [PATCH] Fallback for DBL_EPSILON only in Solaris 10
+
+---
+ mbuffer.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/mbuffer.c b/mbuffer.c
+index fd8c2e2..ab36575 100644
+--- a/mbuffer.c
++++ b/mbuffer.c
+@@ -53,6 +53,10 @@ typedef int caddr_t;
+ #include <sys/sysctl.h>
+ #endif
+ 
++#ifndef DBL_EPSILON
++#define    DBL_EPSILON     2.2204460492503130808473E-16
++#endif
++
+ #ifdef HAVE_SENDFILE
+ #ifdef HAVE_SENDFILE_H
+ #include <sys/sendfile.h>
+-- 
+1.7.10
+

Deleted: csw/mgar/pkg/mbuffer/trunk/files/0001-Makefile-put-background-jobs-in-same-shell-as-the-wa.patch
===================================================================
--- csw/mgar/pkg/mbuffer/trunk/files/0001-Makefile-put-background-jobs-in-same-shell-as-the-wa.patch	2012-05-06 21:27:13 UTC (rev 17964)
+++ csw/mgar/pkg/mbuffer/trunk/files/0001-Makefile-put-background-jobs-in-same-shell-as-the-wa.patch	2012-05-07 07:51:10 UTC (rev 17965)
@@ -1,50 +0,0 @@
-From 280c3806583428f2d20718839129ea0758e8cdbc Mon Sep 17 00:00:00 2001
-From: Sebastian Kayser <skayser at opencsw.org>
-Date: Tue, 5 Jan 2010 23:19:33 +0100
-Subject: [PATCH] Makefile: put background jobs in same shell as the wait call
-
----
- Makefile.in |   20 ++++++++++----------
- 1 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index b381ade..bf9953f 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -73,11 +73,11 @@ test1: test.md5
- 	touch $@
- 
- test2: test.md5
--	./mbuffer -q -I :8000 -o $@.tar -o - | openssl md5 > $@.md5 &
--	sleep 1
--	-rm -f $@.tar
--	./mbuffer -i test.tar -o /dev/null -O localhost:8000 -H
--	wait
-+	./mbuffer -q -I :8000 -o $@.tar -o - | openssl md5 > $@.md5 & \
-+		sleep 1; \
-+		rm -f $@.tar; \
-+		./mbuffer -i test.tar -o /dev/null -O localhost:8000 -H; \
-+		wait
- 	sync
- 	diff $@.md5 test.md5
- 	rm $@.md5
-@@ -88,11 +88,11 @@ test2: test.md5
- 	touch $@
- 
- test3: test.md5
--	./mbuffer -q -6 -I :8000 | openssl md5 > $@.md5 &
--	sleep 1
--	-rm -f $@.tar
--	./mbuffer -i test.tar -o /dev/null -6 -O localhost:8000 -o $@.tar -H
--	wait
-+	./mbuffer -q -6 -I :8000 | openssl md5 > $@.md5 & \
-+		sleep 1; \
-+		rm -f $@.tar; \
-+		./mbuffer -i test.tar -o /dev/null -6 -O localhost:8000 -o $@.tar -H; \
-+		wait
- 	sync
- 	diff $@.md5 test.md5
- 	rm $@.md5
--- 
-1.6.5.1
-

Modified: csw/mgar/pkg/mbuffer/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/mbuffer/trunk/files/changelog.CSW	2012-05-06 21:27:13 UTC (rev 17964)
+++ csw/mgar/pkg/mbuffer/trunk/files/changelog.CSW	2012-05-07 07:51:10 UTC (rev 17965)
@@ -1,3 +1,9 @@
+mbuffer (20120505,REV=2012.05.27)
+
+  * Version update to 20120505
+
+ -- Dagobert Michelsen <dam at opencsw.org>  Mon, 07 May 2012 09:32:00 +0100
+
 mbuffer (20110724,REV=2011.11.27)
 
   * Version update to 20110724 (Closes #4665).

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