summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--math/dieharder/Makefile8
-rw-r--r--math/dieharder/PLIST15
-rw-r--r--math/dieharder/distinfo11
-rw-r--r--math/dieharder/patches/patch-aa23
-rw-r--r--math/dieharder/patches/patch-ac73
-rw-r--r--math/dieharder/patches/patch-ad94
6 files changed, 22 insertions, 202 deletions
diff --git a/math/dieharder/Makefile b/math/dieharder/Makefile
index 702f594e74e..098c40d0bc8 100644
--- a/math/dieharder/Makefile
+++ b/math/dieharder/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2012/09/11 23:04:18 asau Exp $
+# $NetBSD: Makefile,v 1.5 2015/10/26 05:52:06 agc Exp $
#
-DISTNAME= dieharder-2.24.4
+DISTNAME= dieharder-3.31.1
CATEGORIES= math
MASTER_SITES= http://www.phy.duke.edu/~rgb/General/dieharder/
EXTRACT_SUFX= .tgz
@@ -9,6 +9,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= gson@NetBSD.org
HOMEPAGE= http://www.phy.duke.edu/~rgb/General/dieharder.php
COMMENT= Random number generator test suite
+LICENSE= gnu-gpl-v2
MAKE_JOBS_SAFE= no
@@ -17,8 +18,7 @@ USE_TOOLS+= automake gmake
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
MANCOMPRESSED= yes
-
-INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
+AUTO_MKDIRS= yes
pre-configure:
cd ${WRKSRC}; ${SH} ./autogen.sh
diff --git a/math/dieharder/PLIST b/math/dieharder/PLIST
index 34b383d4927..08e515b1388 100644
--- a/math/dieharder/PLIST
+++ b/math/dieharder/PLIST
@@ -1,9 +1,14 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:05:42 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/10/26 05:52:06 agc Exp $
bin/dieharder
include/dieharder/Dtest.h
include/dieharder/Vtest.h
include/dieharder/Xtest.h
include/dieharder/copyright.h
+include/dieharder/dab_bytedistrib.h
+include/dieharder/dab_dct.h
+include/dieharder/dab_filltree.h
+include/dieharder/dab_filltree2.h
+include/dieharder/dab_monobit2.h
include/dieharder/diehard_2dsphere.h
include/dieharder/diehard_3dsphere.h
include/dieharder/diehard_birthdays.h
@@ -21,17 +26,25 @@ include/dieharder/diehard_rank_6x8.h
include/dieharder/diehard_runs.h
include/dieharder/diehard_squeeze.h
include/dieharder/diehard_sums.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
+include/dieharder/rgb_permutations.h
include/dieharder/rgb_persist.h
include/dieharder/rgb_timing.h
include/dieharder/std_test.h
include/dieharder/sts_monobit.h
include/dieharder/sts_runs.h
+include/dieharder/sts_serial.h
include/dieharder/tests.h
include/dieharder/verbose.h
lib/libdieharder.la
diff --git a/math/dieharder/distinfo b/math/dieharder/distinfo
index 7186f197320..9a7a3f68235 100644
--- a/math/dieharder/distinfo
+++ b/math/dieharder/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.2 2009/11/30 17:25:08 joerg Exp $
+$NetBSD: distinfo,v 1.3 2015/10/26 05:52:06 agc Exp $
-SHA1 (dieharder-2.24.4.tgz) = 09db7de25b024afad242a0aeb38d303c26226c93
-RMD160 (dieharder-2.24.4.tgz) = 005e318ae277f331884e183876c2a62095943a50
-Size (dieharder-2.24.4.tgz) = 796175 bytes
-SHA1 (patch-aa) = a710122b5053d5553115e9d2bcecebfc9e2c2486
-SHA1 (patch-ac) = 6e284ac366193a681d9409a22d85381d4091815f
-SHA1 (patch-ad) = db139fd1c1067cc005bee1310302b2d183b99aa4
+SHA1 (dieharder-3.31.1.tgz) = 506b1380c780f90372d9d4adcb5cfcc96234f2a8
+RMD160 (dieharder-3.31.1.tgz) = 77cb8341ea7555850b361f091562844445f37fba
+Size (dieharder-3.31.1.tgz) = 1149780 bytes
diff --git a/math/dieharder/patches/patch-aa b/math/dieharder/patches/patch-aa
deleted file mode 100644
index faa19a40f9d..00000000000
--- a/math/dieharder/patches/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/09/13 10:07:36 gson Exp $
-
---- dieharder/gnu_r_rngs.c.orig 2007-05-22 03:34:27.000000000 +0300
-+++ dieharder/gnu_r_rngs.c
-@@ -58,7 +58,17 @@ typedef unsigned long int Int32;
-
- typedef void * (*DL_FUNC)();
-
--void error(const char *txt, ...);
-+void error(const char *fmt, ...) {
-+ va_list args;
-+ va_start(args, fmt);
-+ fflush(stdout);
-+ fprintf(stderr, "error: ");
-+ vfprintf(stderr, fmt, args);
-+ va_end(args);
-+ fprintf(stderr, "\n");
-+ exit(1);
-+}
-+
- char *_(char *txt) { return(txt); };
-
- /* UINT_MAX from limits.h */
diff --git a/math/dieharder/patches/patch-ac b/math/dieharder/patches/patch-ac
deleted file mode 100644
index 189b089943a..00000000000
--- a/math/dieharder/patches/patch-ac
+++ /dev/null
@@ -1,73 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2009/11/30 17:25:08 joerg Exp $
-
---- dieharder/Makefile.am.orig 2007-05-22 02:34:27.000000000 +0200
-+++ dieharder/Makefile.am
-@@ -46,7 +46,6 @@ SRCINCLUDES = $(shell ls *.h 2>&1 | sed
- # see how to force a consistent build when working on the UI
- # and library at the same time. Maybe with particular make targets...
- LIBINCLUDES = $(shell ls ../include/dieharder/*.h 2>&1 | sed -e "/\/bin\/ls:/d")
--PROGLIB_SONAME = $(LIBDIR)/libdieharder.so.$(VERSION)
-
- SOURCES = $(LIBSOURCES) $(SRCSOURCES)
- INCLUDES = $(LIBINCLUDES) $(SRCINCLUDES)
-@@ -57,17 +56,11 @@ DEFINES = -DVERSION=$(VERSION)
- #========================================================================
- # Define parameters and directives needed in compile/link steps.
- #========================================================================
--# C Compiler
--CC = gcc
--
- # Compile flags (use fairly standard -O3 as default)
--CFLAGS = -O3 -I ../include $(DEFINES)
--
--# Linker flags.
--LDFLAGS =
-+CFLAGS += -I ../include $(DEFINES)
-
- # Libraries
--LIBS = -L ../libdieharder -ldieharder -lgsl -lgslcblas -lm
-+LIBS = ../libdieharder/libdieharder.la -lgsl -lgslcblas -lm
-
- #========================================================================
- # List of variants one can make. all is the default. We always
-@@ -76,18 +69,8 @@ LIBS = -L ../libdieharder -ldieharder -l
- #========================================================================
- all: $(PROGRAM)
-
--$(PROGRAM): $(OBJECTS) $(PROGLIB_SONAME)
-- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBS)
--
--#========================================================================
--# This is cautiously permitted. REALLY, though, we need a conditional
--# that punts with a warning if we try this during an rpm build and
--# the library is not found -- the right solution then is to install
--# the library first!
--#========================================================================
--$(PROGLIB_SONAME):
-- - (cd ../libdieharder ;\
-- $(MAKE))
-+$(PROGRAM): $(OBJECTS) ../libdieharder/libdieharder.la
-+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBS)
-
- #========================================================================
- # The only safe place to do commits is in the toplevel directory
-@@ -123,15 +106,15 @@ clean :
- install : $(PROGRAM)
- (strip $(PROGRAM);\
- install -d $(prefix)/bin; \
-- install -m 755 $(PROGRAM) $(prefix)/bin; \
-- install -d $(prefix)/share/man/man1; \
-+ $(LIBTOOL) --mode=install install -m 755 $(PROGRAM) $(prefix)/bin; \
-+ install -d $(mandir)/man1; \
- gzip -c -9 $(PROGRAM).1 > $(PROGRAM).1.gz; \
-- install -m 644 $(PROGRAM).1.gz $(prefix)/share/man/man1)
-+ install -m 644 $(PROGRAM).1.gz $(mandir)/man1)
-
- #========================================================================
- # We give all generic rules below. Currently we only need a rule for
- # objects.
- #========================================================================
- %.o:%.c
-- $(CC) -c $(CFLAGS) $<
-+ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $<
-
diff --git a/math/dieharder/patches/patch-ad b/math/dieharder/patches/patch-ad
deleted file mode 100644
index 4b755365c19..00000000000
--- a/math/dieharder/patches/patch-ad
+++ /dev/null
@@ -1,94 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2009/11/30 17:25:08 joerg Exp $
-
---- libdieharder/Makefile.am.orig 2007-05-22 02:34:27.000000000 +0200
-+++ libdieharder/Makefile.am
-@@ -38,10 +38,7 @@ RELEASE=0
- # other stuff in the future) is built.
- PROGMAN = libdieharder.3
- # (FC "requires" no static library build)
--# PROGLIB_A = libdieharder.a
--PROGLIB_SO = libdieharder.so
--PROGLIB_SONAME = libdieharder.so.$(VERSION_MAJOR)
--PROGLIB_SO_VERSION = libdieharder.so.$(VERSION)
-+PROGLIB_A = libdieharder.a
-
- #========================================================================
- # Define all sources. Note that we choose to depend on ALL the includes
-@@ -55,14 +52,8 @@ DEFINES = -DVERSION=$(VERSION)
- #========================================================================
- # Define parameters and directives needed in compile/link steps.
- #========================================================================
--# C Compiler
--CC = gcc
--
- # Compile flags (use fairly standard -O3 as default)
--CFLAGS = -O3 $(DEFINES) -I ../include
--
--# Linker flags
--LDFLAGS = -g -fpic -shared -Wl,-soname,$(PROGLIB_SONAME)
-+CFLAGS += $(DEFINES) -I ../include
-
- # Libraries
- LIBS = -lgsl -lgslcblas -lm
-@@ -72,22 +63,11 @@ LIBS = -lgsl -lgslcblas -lm
- # presume the simplest of dependencies and remake if includes change
- # for example.
- #========================================================================
--all: $(INCTIME) $(PROGLIB_SO_VERSION) # $(PROGLIB_A)
-
--# This has to ALWAYS run before a build.
--$(INCTIME):
-- (install -d $(includedir)/dieharder; \
-- install -m 644 ../include/dieharder/*.h $(includedir)/dieharder;)
--
--# FC "requires" no static lib build/install
--# $(PROGLIB_A): $(INCTIME) $(LIBOBJECTS) $(LIBINCLUDES)
--# ar r $(PROGLIB_A) $(LIBOBJECTS)
--# ranlib $(PROGLIB_A)
--
--$(PROGLIB_SO_VERSION): $(INCTIME) $(LIBOBJECTS) $(LIBINCLUDES)
-- gcc $(LDFLAGS) -o $(PROGLIB_SO_VERSION) $(LIBOBJECTS)
-- ldconfig -n .
-- ln -sf $(PROGLIB_SO_VERSION) $(PROGLIB_SO)
-+all: $(PROGLIB_A)
-+
-+$(PROGLIB_A): $(LIBOBJECTS)
-+ $(LIBTOOL) --mode=link $(CC) -o $(PROGLIB_A:.a=.la) $(LIBOBJECTS:.o=.lo) -rpath ${PREFIX}/lib -version-info 0:0
-
- #========================================================================
- # The only safe place to do commits is in the toplevel directory
-@@ -111,7 +91,7 @@ printout:
- # A standard cleanup target
- #========================================================================
- clean:
-- rm -f core $(PROGLIB_SO)* $(LIBOBJECTS) $(PROGMAN).gz
-+ rm -f core $(PROGLIB_A) $(LIBOBJECTS) $(PROGMAN).gz
-
- #========================================================================
- # This is critical. For the toplevel rpm build to succeed,
-@@ -120,15 +100,13 @@ clean:
- # This target has to install precisely the files required by the
- # specfile for the dieharder package, in precisely the right locations.
- #========================================================================
--install: $(PROGLIB_SO_VERSION) $(PROGLIB_A) $(PROGMAN)
-+install: $(PROGLIB_A) $(PROGMAN)
- (install -d $(libdir); \
-- install -m 755 $(PROGLIB_SO_VERSION) $(libdir)/$(PROGLIB_SO_VERSION); \
-- ln -sf $(libdir)/$(PROGLIB_SO_VERSION) $(libdir)/$(PROGLIB_SO); \
-+ $(LIBTOOL) --mode=install install -m 755 $(PROGLIB_A:.a=.la) $(libdir); \
- install -d $(includedir)/dieharder; \
- install -m 644 ../include/dieharder/*.h $(includedir)/dieharder; \
-- install -d $(prefix)/share/man/man3; \
-- gzip -c -9 $(PROGMAN) > $(PROGMAN).gz; \
-- install -m 644 $(DIR).3.gz $(prefix)/share/man/man3)
-+ install -d $(mandir)/man3; \
-+ install -m 644 $(DIR).3 $(mandir)/man3)
-
- # FC requires no static lib install
- # install -m 755 $(PROGLIB_A) $(libdir)/$(PROGLIB_A); \
-@@ -138,4 +116,4 @@ install: $(PROGLIB_SO_VERSION) $(PROGLIB
- # objects.
- #========================================================================
- %.o:%.c $(LIBINCLUDES) Makefile
-- $(CC) -fpic -c $(CFLAGS) $<
-+ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $<
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-30 04:36:59 +0000