From nobody@FreeBSD.org  Tue Jan 12 19:43:06 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 648FF106566B
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 12 Jan 2010 19:43:06 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 531438FC08
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 12 Jan 2010 19:43:06 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o0CJh6Jq086500
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 12 Jan 2010 19:43:06 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o0CJh6b2086499;
	Tue, 12 Jan 2010 19:43:06 GMT
	(envelope-from nobody)
Message-Id: <201001121943.o0CJh6b2086499@www.freebsd.org>
Date: Tue, 12 Jan 2010 19:43:06 GMT
From: bf <bf1783@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH]math/dieharder: update to 3.29.4beta
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         142752
>Category:       ports
>Synopsis:       [PATCH]math/dieharder: update to 3.29.4beta
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pgollucci
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jan 12 19:50:01 UTC 2010
>Closed-Date:    Fri Feb 05 03:39:14 UTC 2010
>Last-Modified:  Fri Feb  5 03:40:05 UTC 2010
>Originator:     bf
>Release:        9-CURRENT amd64
>Organization:
-
>Environment:
>Description:

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN dieharder.orig/Makefile dieharder/Makefile
--- dieharder.orig/Makefile	2010-01-12 14:22:07.000000000 -0500
+++ dieharder/Makefile	2009-12-27 15:03:19.000000000 -0500
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	dieharder
-PORTVERSION=	2.28.1
-PORTREVISION=	1
+DISTVERSION=	3.29.4beta
 CATEGORIES=	math
 MASTER_SITES=	http://www.phy.duke.edu/~rgb/General/dieharder/
 EXTRACT_SUFX=	.tgz
@@ -18,7 +17,9 @@
 LIB_DEPENDS=	gsl:${PORTSDIR}/math/gsl
 
 USE_AUTOTOOLS=	aclocal:110 autoheader:262 libtool:22
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 MAN1=		dieharder.1
 MAN3=		libdieharder.3
@@ -33,4 +34,7 @@
 		-e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \
 			${WRKSRC}/configure
 
+test: build
+	${WRKSRC}/dieharder/dieharder -a
+
 .include <bsd.port.mk>
diff -ruN dieharder.orig/distinfo dieharder/distinfo
--- dieharder.orig/distinfo	2010-01-12 14:22:07.000000000 -0500
+++ dieharder/distinfo	2009-12-27 09:17:20.000000000 -0500
@@ -1,3 +1,3 @@
-MD5 (dieharder-2.28.1.tgz) = 47819cd609648f506a40ec9110c4463c
-SHA256 (dieharder-2.28.1.tgz) = 748ec4716e64de38807e126f10335e45136fa789056e9f647a6bf73698205286
-SIZE (dieharder-2.28.1.tgz) = 766985
+MD5 (dieharder-3.29.4beta.tgz) = eba447e1918d9ef3d70da11f14149a21
+SHA256 (dieharder-3.29.4beta.tgz) = 7bdaf3f942908c5dd3063abd79d8e1ad242b59f6e6bf3f87c0d96434e3e113ff
+SIZE (dieharder-3.29.4beta.tgz) = 995969
diff -ruN dieharder.orig/files/patch-dieharder__output.c dieharder/files/patch-dieharder__output.c
--- dieharder.orig/files/patch-dieharder__output.c	1969-12-31 19:00:00.000000000 -0500
+++ dieharder/files/patch-dieharder__output.c	2009-12-27 14:32:58.000000000 -0500
@@ -0,0 +1,10 @@
+--- dieharder/output.c.orig	2009-12-27 13:32:54.000000000 -0500
++++ dieharder/output.c	2009-12-27 14:32:35.000000000 -0500
+@@ -614,6 +614,7 @@
+  printf("\n");
+  printf("#=============================================================================#\n");
+  fflush(stdout);
++ free(bin);
+ 
+ }
+ 
diff -ruN dieharder.orig/files/patch-dieharder_dieharder.1 dieharder/files/patch-dieharder_dieharder.1
--- dieharder.orig/files/patch-dieharder_dieharder.1	2010-01-12 14:22:07.000000000 -0500
+++ dieharder/files/patch-dieharder_dieharder.1	1969-12-31 19:00:00.000000000 -0500
@@ -1,54 +0,0 @@
---- dieharder/dieharder.1.orig	2008-09-08 08:37:19.000000000 -0400
-+++ dieharder/dieharder.1	2008-11-14 20:05:01.794803058 -0500
-@@ -1,6 +1,6 @@
- .\" $Id: dieharder.1 425 2008-08-19 10:01:36Z rgb $
--.TH DieHarder 1 "Copyright 2004 Robert G. Brown" "DieHarder"
-+.TH dieharder 1 "Copyright 2004 Robert G. Brown" "DieHarder"
- .SH NAME
--rand_rate \- A testing and benchmarking tool for GSL random number 
-+dieharder \- A testing and benchmarking tool for GSL random number 
- generators
- 
-@@ -13,5 +13,5 @@
-           [-v verbose flag] [-x xvalue] [-y yvalue] [-z zvalue]
- 
--.SH DieHarder OPTIONS
-+.SH OPTIONS
- 
- .TP
-@@ -40,6 +40,6 @@
- -l list all known tests.
- .TP
---n ntuple - set ntuple length for tests on short bit strings that permit
--the length to be varied (e.g. rgb bitdist).
-+-n ntuple - set ntuple length for tests on short bit strings that 
-+permit the length to be varied (e.g. rgb bitdist).
- .TP
- -p count - sets the number of p-value samples per test (default 100).
-@@ -93,5 +93,4 @@
- 
- .SH DESCRIPTION
--.B DieHarder
- This is the current snapshot of the dieharder random number
- tester.  It encapsulates all of the Gnu Scientific Library random number
-@@ -123,5 +122,5 @@
- 
- .SH P-VALUES AND THE NULL HYPOTHESIS
--.B DieHarder returns "p-values".  To understand what a p-value is and
-+dieharder returns "p-values".  To understand what a p-value is and
- how to use it, it is essential to understand the
- .I null hypothesis.
-@@ -405,5 +404,5 @@
- as prototypes, and can likely be submitted to the GSL for inclusion if
- they pass the tests as well or better than the generators that are already
--there.  Dieharder is designed to (ultimately) be a
-+there.  dieharder is designed to (ultimately) be a
- .I very convenient tool
- for testing new software RNGs.
-@@ -535,5 +534,5 @@
- 
- .SH PUBLICATION RULES
--.B DieHarder
-+dieharder
- is entirely original code and can be modified and used at will by any 
- user, provided that:
diff -ruN dieharder.orig/files/patch-libdieharder__countx.c dieharder/files/patch-libdieharder__countx.c
--- dieharder.orig/files/patch-libdieharder__countx.c	1969-12-31 19:00:00.000000000 -0500
+++ dieharder/files/patch-libdieharder__countx.c	2009-12-27 13:37:18.000000000 -0500
@@ -0,0 +1,10 @@
+--- libdieharder/countx.c.orig	2009-12-27 13:35:32.000000000 -0500
++++ libdieharder/countx.c	2009-12-27 13:36:18.000000000 -0500
+@@ -219,6 +219,7 @@
+   for (i=0; i<=MAXBITS; ++i) {
+     if (ftab[i] > BUCKETS) {
+       fprintf(stderr, "ftab[%lu]=%lu needs a bigger LOGBUCKETS\n", i, ftab[i]);
++      free(data);
+       return 1;
+     }
+   }
diff -ruN dieharder.orig/files/patch-libdieharder__histogram.c dieharder/files/patch-libdieharder__histogram.c
--- dieharder.orig/files/patch-libdieharder__histogram.c	1969-12-31 19:00:00.000000000 -0500
+++ dieharder/files/patch-libdieharder__histogram.c	2009-12-27 14:31:46.000000000 -0500
@@ -0,0 +1,10 @@
+--- libdieharder/histogram.c.orig	2009-12-27 13:37:57.000000000 -0500
++++ libdieharder/histogram.c	2009-12-27 14:31:11.000000000 -0500
+@@ -95,6 +95,7 @@
+  for(i=0;i<nbins;i++) printf("%4.1f|",(i+1)*binscale);
+  printf("\n");
+  printf("#==================================================================\n");
++ free(bin);
+ 
+ }
+ 
diff -ruN dieharder.orig/pkg-plist dieharder/pkg-plist
--- dieharder.orig/pkg-plist	2010-01-12 14:24:13.000000000 -0500
+++ dieharder/pkg-plist	2009-12-27 14:57:25.000000000 -0500
@@ -20,12 +20,15 @@
 include/dieharder/diehard_runs.h
 include/dieharder/diehard_squeeze.h
 include/dieharder/diehard_sums.h
-include/dieharder/dieharder_types.h
+include/dieharder/dieharder_rng_types.h
+include/dieharder/dieharder_test_types.h
 include/dieharder/libdieharder.h
 include/dieharder/marsaglia_tsang_gcd.h
 include/dieharder/marsaglia_tsang_gorilla.h
 include/dieharder/parse.h
 include/dieharder/rgb_bitdist.h
+include/dieharder/rgb_kstest_test.h
+include/dieharder/rgb_lagged_sums.h
 include/dieharder/rgb_lmn.h
 include/dieharder/rgb_minimum_distance.h
 include/dieharder/rgb_operm.h
@@ -41,5 +44,5 @@
 lib/libdieharder.a
 lib/libdieharder.la
 lib/libdieharder.so
-lib/libdieharder.so.2
+lib/libdieharder.so.3
 @dirrm include/dieharder


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->pgollucci 
Responsible-Changed-By: pgollucci 
Responsible-Changed-When: Wed Jan 13 04:38:17 UTC 2010 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142752 

From: "b. f." <bf1783@googlemail.com>
To: bug-followup@FreeBSD.org
Cc: pgollucci@FreeBSD.org
Subject: Re: ports/142752: [PATCH]math/dieharder: update to 3.29.4beta
Date: Wed, 3 Feb 2010 15:24:45 -0500

 Any progress on this?
 
 b.
State-Changed-From-To: open->feedback 
State-Changed-By: pgollucci 
State-Changed-When: Thu Feb 4 15:45:39 UTC 2010 
State-Changed-Why:  
http://tb.p6m7g8.net//errors/9-CURRENT-amd64/proftpd-devel-1.3.3.r2,2.log 
needs a utmpx fix 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142752 

From: "b. f." <bf1783@googlemail.com>
To: bug-followup@FreeBSD.org
Cc: pgollucci@freebsd.org
Subject: Re: ports/142752: [PATCH]math/dieharder: update to 3.29.4beta
Date: Thu, 4 Feb 2010 12:19:02 -0500

 On 2/4/10, pgollucci@freebsd.org <pgollucci@freebsd.org> wrote:
 > Synopsis: [PATCH]math/dieharder: update to 3.29.4beta
 >
 > State-Changed-From-To: open->feedback
 > State-Changed-By: pgollucci
 > State-Changed-When: Thu Feb 4 15:45:39 UTC 2010
 > State-Changed-Why:
 > http://tb.p6m7g8.net//errors/9-CURRENT-amd64/proftpd-devel-1.3.3.r2,2.log
 > needs a utmpx fix
 >
 > http://www.freebsd.org/cgi/query-pr.cgi?pr=142752
 >
 
 The log, and your comment, seem to refer to a another port -- I'm
 inquiring about math/dieharder.  A cursory examination of the log for
 that port at:
 
 http://tb.p6m7g8.net/errors/9-CURRENT-amd64/dieharder-3.29.4.b.log
 
 doesn't show any obvious errors, and it works for me on the latest
 9-CURRENT amd64.  Could you clarify?
 
 Regards,
                  b.

From: "Philip M. Gollucci" <pgollucci@p6m7g8.com>
To: "b. f." <bf1783@googlemail.com>
Cc: bug-followup@FreeBSD.org, pgollucci@FreeBSD.org
Subject: Re: ports/142752: [PATCH]math/dieharder: update to 3.29.4beta
Date: Thu, 4 Feb 2010 17:21:45 +0000

 b. f. wrote:
 > http://tb.p6m7g8.net/errors/9-CURRENT-amd64/dieharder-3.29.4.b.log
 > 
 > doesn't show any obvious errors, and it works for me on the latest
 > 9-CURRENT amd64.  Could you clarify?
 yes, I put the wrong url.
 
 I just built it today.  It should be okay, I should commit it soon.
 -- 
 ------------------------------------------------------------------------
 1024D/DB9B8C1C B90B FBC3 A3A1 C71A 8E70  3F8C 75B8 8FFB DB9B 8C1C
 Philip M. Gollucci (pgollucci@p6m7g8.com) c: 703.336.9354
 VP Apache Infrastructure; Member, Apache Software Foundation
 Committer,                        FreeBSD Foundation
 Consultant,                       P6M7G8 Inc.
 Sr. System Admin,                 Ridecharge Inc.
 
 Work like you don't need the money,
 love like you'll never get hurt,
 and dance like nobody's watching.
State-Changed-From-To: feedback->closed 
State-Changed-By: pgollucci 
State-Changed-When: Fri Feb 5 03:39:13 UTC 2010 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142752 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/142752: commit references a PR
Date: Fri,  5 Feb 2010 03:35:40 +0000 (UTC)

 pgollucci    2010-02-05 03:35:33 UTC
 
   FreeBSD ports repository
 
   Modified files:
     math/dieharder       Makefile distinfo pkg-plist 
   Added files:
     math/dieharder/files patch-dieharder__output.c 
                          patch-libdieharder__countx.c 
                          patch-libdieharder__histogram.c 
   Removed files:
     math/dieharder/files patch-dieharder_dieharder.1 
   Log:
   - Update to 3.29.4beta
   
   PR:             ports/142752
   Submitted by:   bf <bf1783@gmail.com> (maintainer)
   
   Revision  Changes    Path
   1.5       +9 -3      ports/math/dieharder/Makefile
   1.2       +3 -3      ports/math/dieharder/distinfo
   1.1       +10 -0     ports/math/dieharder/files/patch-dieharder__output.c (new)
   1.2       +0 -54     ports/math/dieharder/files/patch-dieharder_dieharder.1 (dead)
   1.1       +10 -0     ports/math/dieharder/files/patch-libdieharder__countx.c (new)
   1.1       +10 -0     ports/math/dieharder/files/patch-libdieharder__histogram.c (new)
   1.2       +5 -2      ports/math/dieharder/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
