From e60ad7dcda8bfab3a5ac7b894ba877db4c635094 Mon Sep 17 00:00:00 2001 From: Ryosuke Moro Date: Wed, 28 May 2014 22:05:59 +0000 Subject: [PATCH] Remove hs-nats, imported to pkgsrc/math. Remove hs-tf-random, imported to pkgsrc/devel. --- Makefile | 4 +--- hs-QuickCheck/Makefile | 4 ++-- hs-QuickCheck/buildlink3.mk | 4 ++-- hs-nats/DESCR | 1 - hs-nats/Makefile | 11 ----------- hs-nats/PLIST | 22 ---------------------- hs-nats/buildlink3.mk | 12 ------------ hs-nats/distinfo | 5 ----- hs-semigroups/Makefile | 4 ++-- hs-semigroups/buildlink3.mk | 4 ++-- hs-tf-random/DESCR | 24 ------------------------ hs-tf-random/Makefile | 13 ------------- hs-tf-random/PLIST | 33 --------------------------------- hs-tf-random/buildlink3.mk | 15 --------------- hs-tf-random/distinfo | 5 ----- 15 files changed, 9 insertions(+), 152 deletions(-) delete mode 100644 hs-nats/DESCR delete mode 100644 hs-nats/Makefile delete mode 100644 hs-nats/PLIST delete mode 100644 hs-nats/buildlink3.mk delete mode 100644 hs-nats/distinfo delete mode 100644 hs-tf-random/DESCR delete mode 100644 hs-tf-random/Makefile delete mode 100644 hs-tf-random/PLIST delete mode 100644 hs-tf-random/buildlink3.mk delete mode 100644 hs-tf-random/distinfo diff --git a/Makefile b/Makefile index 1a458697fc..5833ad7d49 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.5777 2014/05/27 21:38:22 szptvlfn Exp $ +# $Id: Makefile,v 1.5778 2014/05/28 22:05:59 szptvlfn Exp $ COMMENT= WIP pkgsrc packages @@ -1079,7 +1079,6 @@ SUBDIR+= hs-monads-fd SUBDIR+= hs-monads-tf SUBDIR+= hs-monoid-transformer SUBDIR+= hs-mwc-random -SUBDIR+= hs-nats SUBDIR+= hs-network-bytestring SUBDIR+= hs-network-conduit SUBDIR+= hs-newtype @@ -1139,7 +1138,6 @@ SUBDIR+= hs-test-framework-hunit SUBDIR+= hs-test-framework-quickcheck2 SUBDIR+= hs-texmath SUBDIR+= hs-text-icu -SUBDIR+= hs-tf-random SUBDIR+= hs-tfp SUBDIR+= hs-time-http SUBDIR+= hs-time-w3c diff --git a/hs-QuickCheck/Makefile b/hs-QuickCheck/Makefile index b96d3bf5d1..b521a77d60 100644 --- a/hs-QuickCheck/Makefile +++ b/hs-QuickCheck/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2014/05/21 21:04:43 szptvlfn Exp $ +# $NetBSD: Makefile,v 1.11 2014/05/28 22:05:59 szptvlfn Exp $ DISTNAME= QuickCheck-2.7.3 CATEGORIES= devel @@ -9,5 +9,5 @@ LICENSE= modified-bsd .include "../../wip/mk/haskell.mk" .include "../../devel/hs-random/buildlink3.mk" -.include "../../wip/hs-tf-random/buildlink3.mk" +.include "../../devel/hs-tf-random/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/hs-QuickCheck/buildlink3.mk b/hs-QuickCheck/buildlink3.mk index 8a7701422e..d179275723 100644 --- a/hs-QuickCheck/buildlink3.mk +++ b/hs-QuickCheck/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2014/05/21 21:04:43 szptvlfn Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2014/05/28 22:06:00 szptvlfn Exp $ BUILDLINK_TREE+= hs-QuickCheck @@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.hs-QuickCheck+= hs-QuickCheck>=2.7.3 BUILDLINK_PKGSRCDIR.hs-QuickCheck?= ../../wip/hs-QuickCheck .include "../../devel/hs-random/buildlink3.mk" -.include "../../wip/hs-tf-random/buildlink3.mk" +.include "../../devel/hs-tf-random/buildlink3.mk" .endif # HS_QUICKCHECK_BUILDLINK3_MK BUILDLINK_TREE+= -hs-QuickCheck diff --git a/hs-nats/DESCR b/hs-nats/DESCR deleted file mode 100644 index 44f95768c2..0000000000 --- a/hs-nats/DESCR +++ /dev/null @@ -1 +0,0 @@ -Natural numbers. diff --git a/hs-nats/Makefile b/hs-nats/Makefile deleted file mode 100644 index 55dcee5aa0..0000000000 --- a/hs-nats/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $NetBSD: Makefile,v 1.3 2014/05/08 00:39:25 szptvlfn Exp $ - -DISTNAME= nats-0.1.3 -CATEGORIES= math - -MAINTAINER= pho@cielonegro.org -COMMENT= Haskell 98 natural numbers -LICENSE= modified-bsd - -.include "../../mk/haskell.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/hs-nats/PLIST b/hs-nats/PLIST deleted file mode 100644 index 094c8fb614..0000000000 --- a/hs-nats/PLIST +++ /dev/null @@ -1,22 +0,0 @@ -@comment $NetBSD: PLIST,v 1.3 2014/05/08 00:39:25 szptvlfn Exp $ -lib/nats-${PKGVERSION}/${HASKELL_VERSION}/HSnats-${PKGVERSION}.o -lib/nats-${PKGVERSION}/${HASKELL_VERSION}/Numeric/Natural.hi -lib/nats-${PKGVERSION}/${HASKELL_VERSION}/Numeric/Natural/Internal.hi -lib/nats-${PKGVERSION}/${HASKELL_VERSION}/libHSnats-${PKGVERSION}.a -lib/nats-${PKGVERSION}/${HASKELL_VERSION}/package-description -share/doc/nats-${PKGVERSION}/LICENSE -${PLIST.doc}share/doc/nats-${PKGVERSION}/html/Numeric-Natural-Internal.html -${PLIST.doc}share/doc/nats-${PKGVERSION}/html/Numeric-Natural.html -${PLIST.doc}share/doc/nats-${PKGVERSION}/html/doc-index.html -${PLIST.doc}share/doc/nats-${PKGVERSION}/html/frames.html -${PLIST.doc}share/doc/nats-${PKGVERSION}/html/haddock-util.js -${PLIST.doc}share/doc/nats-${PKGVERSION}/html/hslogo-16.png -${PLIST.doc}share/doc/nats-${PKGVERSION}/html/index-frames.html -${PLIST.doc}share/doc/nats-${PKGVERSION}/html/index.html -${PLIST.doc}share/doc/nats-${PKGVERSION}/html/mini_Numeric-Natural-Internal.html -${PLIST.doc}share/doc/nats-${PKGVERSION}/html/mini_Numeric-Natural.html -${PLIST.doc}share/doc/nats-${PKGVERSION}/html/minus.gif -${PLIST.doc}share/doc/nats-${PKGVERSION}/html/nats.haddock -${PLIST.doc}share/doc/nats-${PKGVERSION}/html/ocean.css -${PLIST.doc}share/doc/nats-${PKGVERSION}/html/plus.gif -${PLIST.doc}share/doc/nats-${PKGVERSION}/html/synopsis.png diff --git a/hs-nats/buildlink3.mk b/hs-nats/buildlink3.mk deleted file mode 100644 index 22151b67c9..0000000000 --- a/hs-nats/buildlink3.mk +++ /dev/null @@ -1,12 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.3 2014/05/08 00:39:25 szptvlfn Exp $ - -BUILDLINK_TREE+= hs-nats - -.if !defined(HS_NATS_BUILDLINK3_MK) -HS_NATS_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.hs-nats+= hs-nats>=0.1.3 -BUILDLINK_PKGSRCDIR.hs-nats?= ../../wip/hs-nats -.endif # HS_NATS_BUILDLINK3_MK - -BUILDLINK_TREE+= -hs-nats diff --git a/hs-nats/distinfo b/hs-nats/distinfo deleted file mode 100644 index 25064778ba..0000000000 --- a/hs-nats/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -$NetBSD: distinfo,v 1.3 2014/05/08 00:39:26 szptvlfn Exp $ - -SHA1 (nats-0.1.3.tar.gz) = 1df860cf4ae1ee6def18afbb5fb049d412a2f0c5 -RMD160 (nats-0.1.3.tar.gz) = 0a1e4af51727e4fddadaf3262c8e2ccf643e8565 -Size (nats-0.1.3.tar.gz) = 4047 bytes diff --git a/hs-semigroups/Makefile b/hs-semigroups/Makefile index 410561534c..ac710cb98a 100644 --- a/hs-semigroups/Makefile +++ b/hs-semigroups/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2014/05/27 21:38:23 szptvlfn Exp $ +# $NetBSD: Makefile,v 1.15 2014/05/28 22:06:01 szptvlfn Exp $ DISTNAME= semigroups-0.13.0.1 CATEGORIES= math @@ -9,7 +9,7 @@ LICENSE= 2-clause-bsd .include "../../mk/haskell.mk" .include "../../devel/hs-hashable/buildlink3.mk" -.include "../../wip/hs-nats/buildlink3.mk" +.include "../../math/hs-nats/buildlink3.mk" .include "../../devel/hs-text/buildlink3.mk" .include "../../devel/hs-unordered-containers/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/hs-semigroups/buildlink3.mk b/hs-semigroups/buildlink3.mk index 4ae7cdc4f8..50de7202d4 100644 --- a/hs-semigroups/buildlink3.mk +++ b/hs-semigroups/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2014/05/27 21:38:23 szptvlfn Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2014/05/28 22:06:01 szptvlfn Exp $ BUILDLINK_TREE+= hs-semigroups @@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.hs-semigroups+= hs-semigroups>=0.13.0 BUILDLINK_PKGSRCDIR.hs-semigroups?= ../../wip/hs-semigroups .include "../../devel/hs-hashable/buildlink3.mk" -.include "../../wip/hs-nats/buildlink3.mk" +.include "../../math/hs-nats/buildlink3.mk" .include "../../devel/hs-text/buildlink3.mk" .include "../../devel/hs-unordered-containers/buildlink3.mk" .endif # HS_SEMIGROUPS_BUILDLINK3_MK diff --git a/hs-tf-random/DESCR b/hs-tf-random/DESCR deleted file mode 100644 index 2f059dbb83..0000000000 --- a/hs-tf-random/DESCR +++ /dev/null @@ -1,24 +0,0 @@ -This package contains an implementation of a high-quality splittable -pseudorandom number generator. The generator is based on a cryptographic hash -function built on top of the ThreeFish block cipher. See the paper Splittable -Pseudorandom Number Generators Using Cryptographic Hashing by Claessen, -Pałka for details and the rationale of the design. - -The package provides the following: - - A splittable PRNG that implements the standard System.Random.RandomGen class. - - The generator also implements an alternative version of the - System.Random.TF.Gen.RandomGen class (exported from System.Random.TF.Gen), - which requires the generator to return pseudorandom integers from the full - 32-bit range, and contains an n-way split function. - - An alternative version of the Random class is provided, which is linked to the - new RandomGen class, together with Random instances for some integral types. - - Two functions for initialising the generator with a non-deterministic seed: - one using the system time, and one using the /dev/urandom UNIX special file. - -The package uses an adapted version of the reference C implementation of -ThreeFish from the reference package of the Skein hash function -(https://www.schneier.com/skein.html), originally written by Doug Whiting. diff --git a/hs-tf-random/Makefile b/hs-tf-random/Makefile deleted file mode 100644 index f073c44074..0000000000 --- a/hs-tf-random/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: Makefile,v 1.3 2014/05/25 21:59:30 szptvlfn Exp $ - -DISTNAME= tf-random-0.5 -CATEGORIES= devel - -MAINTAINER= szptvlfn@NetBSD.org -COMMENT= High-quality splittable pseudorandom number generator -LICENSE= modified-bsd - -.include "../../wip/mk/haskell.mk" -.include "../../devel/hs-primitive/buildlink3.mk" -.include "../../devel/hs-random/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/hs-tf-random/PLIST b/hs-tf-random/PLIST deleted file mode 100644 index 535cd8e5a3..0000000000 --- a/hs-tf-random/PLIST +++ /dev/null @@ -1,33 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1 2014/05/06 23:47:22 szptvlfn Exp $ -lib/tf-random-${PKGVERSION}/${HASKELL_VERSION}/HStf-random-${PKGVERSION}.o -lib/tf-random-${PKGVERSION}/${HASKELL_VERSION}/System/Random/TF.hi -lib/tf-random-${PKGVERSION}/${HASKELL_VERSION}/System/Random/TF.p_hi -lib/tf-random-${PKGVERSION}/${HASKELL_VERSION}/System/Random/TF/Gen.hi -lib/tf-random-${PKGVERSION}/${HASKELL_VERSION}/System/Random/TF/Gen.p_hi -lib/tf-random-${PKGVERSION}/${HASKELL_VERSION}/System/Random/TF/Init.hi -lib/tf-random-${PKGVERSION}/${HASKELL_VERSION}/System/Random/TF/Init.p_hi -lib/tf-random-${PKGVERSION}/${HASKELL_VERSION}/System/Random/TF/Instances.hi -lib/tf-random-${PKGVERSION}/${HASKELL_VERSION}/System/Random/TF/Instances.p_hi -lib/tf-random-${PKGVERSION}/${HASKELL_VERSION}/libHStf-random-${PKGVERSION}.a -lib/tf-random-${PKGVERSION}/${HASKELL_VERSION}/libHStf-random-${PKGVERSION}_p.a -lib/tf-random-${PKGVERSION}/${HASKELL_VERSION}/package-description -share/doc/tf-random-${PKGVERSION}/LICENSE -share/doc/tf-random-${PKGVERSION}/html/System-Random-TF-Gen.html -share/doc/tf-random-${PKGVERSION}/html/System-Random-TF-Init.html -share/doc/tf-random-${PKGVERSION}/html/System-Random-TF-Instances.html -share/doc/tf-random-${PKGVERSION}/html/System-Random-TF.html -share/doc/tf-random-${PKGVERSION}/html/doc-index.html -share/doc/tf-random-${PKGVERSION}/html/frames.html -share/doc/tf-random-${PKGVERSION}/html/haddock-util.js -share/doc/tf-random-${PKGVERSION}/html/hslogo-16.png -share/doc/tf-random-${PKGVERSION}/html/index-frames.html -share/doc/tf-random-${PKGVERSION}/html/index.html -share/doc/tf-random-${PKGVERSION}/html/mini_System-Random-TF-Gen.html -share/doc/tf-random-${PKGVERSION}/html/mini_System-Random-TF-Init.html -share/doc/tf-random-${PKGVERSION}/html/mini_System-Random-TF-Instances.html -share/doc/tf-random-${PKGVERSION}/html/mini_System-Random-TF.html -share/doc/tf-random-${PKGVERSION}/html/minus.gif -share/doc/tf-random-${PKGVERSION}/html/ocean.css -share/doc/tf-random-${PKGVERSION}/html/plus.gif -share/doc/tf-random-${PKGVERSION}/html/synopsis.png -share/doc/tf-random-${PKGVERSION}/html/tf-random.haddock diff --git a/hs-tf-random/buildlink3.mk b/hs-tf-random/buildlink3.mk deleted file mode 100644 index f794dd1112..0000000000 --- a/hs-tf-random/buildlink3.mk +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.3 2014/05/25 21:59:30 szptvlfn Exp $ - -BUILDLINK_TREE+= hs-tf-random - -.if !defined(HS_TF_RANDOM_BUILDLINK3_MK) -HS_TF_RANDOM_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.hs-tf-random+= hs-tf-random>=0.5 -BUILDLINK_PKGSRCDIR.hs-tf-random?= ../../wip/hs-tf-random - -.include "../../devel/hs-primitive/buildlink3.mk" -.include "../../devel/hs-random/buildlink3.mk" -.endif # HS_TF_RANDOM_BUILDLINK3_MK - -BUILDLINK_TREE+= -hs-tf-random diff --git a/hs-tf-random/distinfo b/hs-tf-random/distinfo deleted file mode 100644 index 3b29fda093..0000000000 --- a/hs-tf-random/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -$NetBSD: distinfo,v 1.1 2014/05/06 23:47:22 szptvlfn Exp $ - -SHA1 (tf-random-0.5.tar.gz) = 27eeae9eeeee8d4162a2646eeee0fd715f76cead -RMD160 (tf-random-0.5.tar.gz) = bd58a02f7e68c4fd4e51591fa4ddad93d416d717 -Size (tf-random-0.5.tar.gz) = 18483 bytes