pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
hs-conduit: remove; It is already in the main pkgsrc tree
Module Name: pkgsrc-wip
Committed By: PHO <pho%cielonegro.org@localhost>
Pushed By: pho
Date: Wed Feb 1 13:39:52 2023 +0900
Changeset: bc4eaca9f3f608c85f3527840e989d1dea46d89b
Modified Files:
Makefile
hoogle/Makefile
hs-blaze-builder-conduit/Makefile
hs-blaze-builder-conduit/buildlink3.mk
hs-network-conduit/Makefile
hs-network-conduit/buildlink3.mk
hs-simple-sendfile/Makefile
hs-simple-sendfile/buildlink3.mk
Removed Files:
hs-conduit/DESCR
hs-conduit/Makefile
hs-conduit/PLIST
hs-conduit/buildlink3.mk
hs-conduit/distinfo
Log Message:
hs-conduit: remove; It is already in the main pkgsrc tree
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=bc4eaca9f3f608c85f3527840e989d1dea46d89b
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 1 -
hoogle/Makefile | 2 +-
hs-blaze-builder-conduit/Makefile | 2 +-
hs-blaze-builder-conduit/buildlink3.mk | 2 +-
hs-conduit/DESCR | 6 -----
hs-conduit/Makefile | 20 ---------------
hs-conduit/PLIST | 47 ----------------------------------
hs-conduit/buildlink3.mk | 23 -----------------
hs-conduit/distinfo | 4 ---
hs-network-conduit/Makefile | 2 +-
hs-network-conduit/buildlink3.mk | 2 +-
hs-simple-sendfile/Makefile | 2 +-
hs-simple-sendfile/buildlink3.mk | 2 +-
13 files changed, 7 insertions(+), 108 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index 6c0e7edd24..ed02b9c3ea 100644
--- a/Makefile
+++ b/Makefile
@@ -1581,7 +1581,6 @@ SUBDIR+= hs-colorize-haskell
SUBDIR+= hs-comonad-transformers
SUBDIR+= hs-comonads-fd
SUBDIR+= hs-concrete-typerep
-SUBDIR+= hs-conduit
SUBDIR+= hs-constraints
SUBDIR+= hs-containers-unicode-symbols
SUBDIR+= hs-contravariant
diff --git a/hoogle/Makefile b/hoogle/Makefile
index 62b9917f99..732f40aef3 100644
--- a/hoogle/Makefile
+++ b/hoogle/Makefile
@@ -14,7 +14,7 @@ LICENSE= modified-bsd
.include "../../devel/hs-blaze-builder/buildlink3.mk"
.include "../../textproc/hs-case-insensitive/buildlink3.mk"
.include "../../devel/hs-cmdargs/buildlink3.mk"
-.include "../../wip/hs-conduit/buildlink3.mk"
+.include "../../devel/hs-conduit/buildlink3.mk"
.include "../../devel/hs-haskell-src-exts/buildlink3.mk"
.include "../../wip/hs-http-types/buildlink3.mk"
.include "../../textproc/hs-parsec/buildlink3.mk"
diff --git a/hs-blaze-builder-conduit/Makefile b/hs-blaze-builder-conduit/Makefile
index 40d4ebe770..a6f0c749c4 100644
--- a/hs-blaze-builder-conduit/Makefile
+++ b/hs-blaze-builder-conduit/Makefile
@@ -9,7 +9,7 @@ LICENSE= modified-bsd
.include "../../wip/mk/haskell.mk"
.include "../../devel/hs-blaze-builder/buildlink3.mk"
-.include "../../wip/hs-conduit/buildlink3.mk"
+.include "../../devel/hs-conduit/buildlink3.mk"
.include "../../devel/hs-text/buildlink3.mk"
.include "../../devel/hs-transformers/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/hs-blaze-builder-conduit/buildlink3.mk b/hs-blaze-builder-conduit/buildlink3.mk
index 28ecb81abf..9b6a62ed3c 100644
--- a/hs-blaze-builder-conduit/buildlink3.mk
+++ b/hs-blaze-builder-conduit/buildlink3.mk
@@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.hs-blaze-builder-conduit+= hs-blaze-builder-conduit>=1.0.0
BUILDLINK_PKGSRCDIR.hs-blaze-builder-conduit?= ../../wip/hs-blaze-builder-conduit
.include "../../devel/hs-blaze-builder/buildlink3.mk"
-.include "../../wip/hs-conduit/buildlink3.mk"
+.include "../../devel/hs-conduit/buildlink3.mk"
.include "../../devel/hs-text/buildlink3.mk"
.include "../../devel/hs-transformers/buildlink3.mk"
.endif # HS_BLAZE_BUILDER_CONDUIT_BUILDLINK3_MK
diff --git a/hs-conduit/DESCR b/hs-conduit/DESCR
deleted file mode 100644
index bc8cee76db..0000000000
--- a/hs-conduit/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-conduit is a solution to the streaming data problem, allowing for
-production, transformation, and consumption of streams of data in constant
-memory. It is an alternative to lazy I/O which guarantees deterministic
-resource handling, and fits in the same general solution space as
-enumerator/iteratee and pipes. For a tutorial, please visit
-https://haskell.fpcomplete.com/user/snoyberg/library-documentation/conduit-overview
diff --git a/hs-conduit/Makefile b/hs-conduit/Makefile
deleted file mode 100644
index ab467e062f..0000000000
--- a/hs-conduit/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2014/09/12 21:13:28 szptvlfn Exp $
-
-DISTNAME= conduit-1.0.9.3
-CATEGORIES= devel
-
-MAINTAINER= szptvlfn%NetBSD.org@localhost
-COMMENT= Streaming data processing library
-LICENSE= mit
-
-.include "../../wip/mk/haskell.mk"
-.include "../../devel/hs-lifted-base/buildlink3.mk"
-.include "../../devel/hs-mmorph/buildlink3.mk"
-.include "../../devel/hs-monad-control/buildlink3.mk"
-.include "../../devel/hs-mtl/buildlink3.mk"
-.include "../../devel/hs-resourcet/buildlink3.mk"
-.include "../../devel/hs-text/buildlink3.mk"
-.include "../../devel/hs-transformers/buildlink3.mk"
-.include "../../devel/hs-transformers-base/buildlink3.mk"
-.include "../../devel/hs-void/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/hs-conduit/PLIST b/hs-conduit/PLIST
deleted file mode 100644
index feaf9a5bb1..0000000000
--- a/hs-conduit/PLIST
+++ /dev/null
@@ -1,47 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2014/04/15 10:59:40 szptvlfn Exp $
-lib/conduit-${PKGVERSION}/${HASKELL_VERSION}/Data/Conduit.hi
-lib/conduit-${PKGVERSION}/${HASKELL_VERSION}/Data/Conduit.p_hi
-lib/conduit-${PKGVERSION}/${HASKELL_VERSION}/Data/Conduit/Binary.hi
-lib/conduit-${PKGVERSION}/${HASKELL_VERSION}/Data/Conduit/Binary.p_hi
-lib/conduit-${PKGVERSION}/${HASKELL_VERSION}/Data/Conduit/Internal.hi
-lib/conduit-${PKGVERSION}/${HASKELL_VERSION}/Data/Conduit/Internal.p_hi
-lib/conduit-${PKGVERSION}/${HASKELL_VERSION}/Data/Conduit/Lazy.hi
-lib/conduit-${PKGVERSION}/${HASKELL_VERSION}/Data/Conduit/Lazy.p_hi
-lib/conduit-${PKGVERSION}/${HASKELL_VERSION}/Data/Conduit/List.hi
-lib/conduit-${PKGVERSION}/${HASKELL_VERSION}/Data/Conduit/List.p_hi
-lib/conduit-${PKGVERSION}/${HASKELL_VERSION}/Data/Conduit/Text.hi
-lib/conduit-${PKGVERSION}/${HASKELL_VERSION}/Data/Conduit/Text.p_hi
-lib/conduit-${PKGVERSION}/${HASKELL_VERSION}/Data/Conduit/Util.hi
-lib/conduit-${PKGVERSION}/${HASKELL_VERSION}/Data/Conduit/Util.p_hi
-lib/conduit-${PKGVERSION}/${HASKELL_VERSION}/HSconduit-${PKGVERSION}.o
-lib/conduit-${PKGVERSION}/${HASKELL_VERSION}/System/PosixFile.hi
-lib/conduit-${PKGVERSION}/${HASKELL_VERSION}/System/PosixFile.p_hi
-lib/conduit-${PKGVERSION}/${HASKELL_VERSION}/libHSconduit-${PKGVERSION}.a
-lib/conduit-${PKGVERSION}/${HASKELL_VERSION}/libHSconduit-${PKGVERSION}_p.a
-lib/conduit-${PKGVERSION}/${HASKELL_VERSION}/package-description
-share/doc/conduit-${PKGVERSION}/LICENSE
-${PLIST.doc}share/doc/conduit-${PKGVERSION}/html/Data-Conduit-Binary.html
-${PLIST.doc}share/doc/conduit-${PKGVERSION}/html/Data-Conduit-Internal.html
-${PLIST.doc}share/doc/conduit-${PKGVERSION}/html/Data-Conduit-Lazy.html
-${PLIST.doc}share/doc/conduit-${PKGVERSION}/html/Data-Conduit-List.html
-${PLIST.doc}share/doc/conduit-${PKGVERSION}/html/Data-Conduit-Text.html
-${PLIST.doc}share/doc/conduit-${PKGVERSION}/html/Data-Conduit-Util.html
-${PLIST.doc}share/doc/conduit-${PKGVERSION}/html/Data-Conduit.html
-${PLIST.doc}share/doc/conduit-${PKGVERSION}/html/conduit.haddock
-${PLIST.doc}share/doc/conduit-${PKGVERSION}/html/doc-index.html
-${PLIST.doc}share/doc/conduit-${PKGVERSION}/html/frames.html
-${PLIST.doc}share/doc/conduit-${PKGVERSION}/html/haddock-util.js
-${PLIST.doc}share/doc/conduit-${PKGVERSION}/html/hslogo-16.png
-${PLIST.doc}share/doc/conduit-${PKGVERSION}/html/index-frames.html
-${PLIST.doc}share/doc/conduit-${PKGVERSION}/html/index.html
-${PLIST.doc}share/doc/conduit-${PKGVERSION}/html/mini_Data-Conduit-Binary.html
-${PLIST.doc}share/doc/conduit-${PKGVERSION}/html/mini_Data-Conduit-Internal.html
-${PLIST.doc}share/doc/conduit-${PKGVERSION}/html/mini_Data-Conduit-Lazy.html
-${PLIST.doc}share/doc/conduit-${PKGVERSION}/html/mini_Data-Conduit-List.html
-${PLIST.doc}share/doc/conduit-${PKGVERSION}/html/mini_Data-Conduit-Text.html
-${PLIST.doc}share/doc/conduit-${PKGVERSION}/html/mini_Data-Conduit-Util.html
-${PLIST.doc}share/doc/conduit-${PKGVERSION}/html/mini_Data-Conduit.html
-${PLIST.doc}share/doc/conduit-${PKGVERSION}/html/minus.gif
-${PLIST.doc}share/doc/conduit-${PKGVERSION}/html/ocean.css
-${PLIST.doc}share/doc/conduit-${PKGVERSION}/html/plus.gif
-${PLIST.doc}share/doc/conduit-${PKGVERSION}/html/synopsis.png
diff --git a/hs-conduit/buildlink3.mk b/hs-conduit/buildlink3.mk
deleted file mode 100644
index efd6377b79..0000000000
--- a/hs-conduit/buildlink3.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.12 2014/09/12 21:13:28 szptvlfn Exp $
-
-BUILDLINK_TREE+= hs-conduit
-
-.if !defined(HS_CONDUIT_BUILDLINK3_MK)
-HS_CONDUIT_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.hs-conduit+= hs-conduit>=1.0.9
-BUILDLINK_ABI_DEPENDS.hs-conduit+= hs-conduit>=1.0.9.3
-BUILDLINK_PKGSRCDIR.hs-conduit?= ../../wip/hs-conduit
-
-.include "../../devel/hs-lifted-base/buildlink3.mk"
-.include "../../devel/hs-mmorph/buildlink3.mk"
-.include "../../devel/hs-monad-control/buildlink3.mk"
-.include "../../devel/hs-mtl/buildlink3.mk"
-.include "../../devel/hs-resourcet/buildlink3.mk"
-.include "../../devel/hs-text/buildlink3.mk"
-.include "../../devel/hs-transformers/buildlink3.mk"
-.include "../../devel/hs-transformers-base/buildlink3.mk"
-.include "../../devel/hs-void/buildlink3.mk"
-.endif # HS_CONDUIT_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -hs-conduit
diff --git a/hs-conduit/distinfo b/hs-conduit/distinfo
deleted file mode 100644
index 497971ee3d..0000000000
--- a/hs-conduit/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.6 2013/11/26 11:43:40 szptvlfn Exp $
-
-RMD160 (conduit-1.0.9.3.tar.gz) = 9525b7a17245c7fdd4b6c4257f7b42fb4eff19bf
-Size (conduit-1.0.9.3.tar.gz) = 33958 bytes
diff --git a/hs-network-conduit/Makefile b/hs-network-conduit/Makefile
index c226c6dddf..aa31685856 100644
--- a/hs-network-conduit/Makefile
+++ b/hs-network-conduit/Makefile
@@ -8,7 +8,7 @@ COMMENT= Stream socket data using conduits
LICENSE= modified-bsd
.include "../../wip/mk/haskell.mk"
-.include "../../wip/hs-conduit/buildlink3.mk"
+.include "../../devel/hs-conduit/buildlink3.mk"
.include "../../devel/hs-lifted-base/buildlink3.mk"
.include "../../devel/hs-monad-control/buildlink3.mk"
.include "../../net/hs-network/buildlink3.mk"
diff --git a/hs-network-conduit/buildlink3.mk b/hs-network-conduit/buildlink3.mk
index 0b03e2c2b4..c6a54e68ed 100644
--- a/hs-network-conduit/buildlink3.mk
+++ b/hs-network-conduit/buildlink3.mk
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.hs-network-conduit+= hs-network-conduit>=1.0.0
BUILDLINK_ABI_DEPENDS.hs-network-conduit+= hs-network-conduit>=1.0.0
BUILDLINK_PKGSRCDIR.hs-network-conduit?= ../../wip/hs-network-conduit
-.include "../../wip/hs-conduit/buildlink3.mk"
+.include "../../devel/hs-conduit/buildlink3.mk"
.include "../../devel/hs-lifted-base/buildlink3.mk"
.include "../../devel/hs-monad-control/buildlink3.mk"
.include "../../net/hs-network/buildlink3.mk"
diff --git a/hs-simple-sendfile/Makefile b/hs-simple-sendfile/Makefile
index 3562588f4a..d509ccb3fd 100644
--- a/hs-simple-sendfile/Makefile
+++ b/hs-simple-sendfile/Makefile
@@ -8,7 +8,7 @@ COMMENT= Cross platform library for the sendfile system call
LICENSE= modified-bsd
.include "../../wip/mk/haskell.mk"
-.include "../../wip/hs-conduit/buildlink3.mk"
+.include "../../devel/hs-conduit/buildlink3.mk"
.include "../../net/hs-network/buildlink3.mk"
.include "../../devel/hs-transformers/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/hs-simple-sendfile/buildlink3.mk b/hs-simple-sendfile/buildlink3.mk
index 402d2e2031..3853910aa1 100644
--- a/hs-simple-sendfile/buildlink3.mk
+++ b/hs-simple-sendfile/buildlink3.mk
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.hs-simple-sendfile+= hs-simple-sendfile>=0.2.13
BUILDLINK_ABI_DEPENDS.hs-simple-sendfile+= hs-simple-sendfile>=0.2.13
BUILDLINK_PKGSRCDIR.hs-simple-sendfile?= ../../wip/hs-simple-sendfile
-.include "../../wip/hs-conduit/buildlink3.mk"
+.include "../../devel/hs-conduit/buildlink3.mk"
.include "../../net/hs-network/buildlink3.mk"
.include "../../devel/hs-transformers/buildlink3.mk"
.endif # HS_SIMPLE_SENDFILE_BUILDLINK3_MK
Home |
Main Index |
Thread Index |
Old Index