Hi, here are seven new ports which are required to unbreak devel/darcs and update it to the latest version. Also appended is the diff for devel/darcs itself. The diff below and the attached new ports are all relative to /usr/ports.
ok's (especially for the new ports) are welcome. Tests and comments,
too, of course ;-)
Unfortunately, the Setup.lhs of devel/darcs uses template Haskell,
which is still broken on i386, so at the moment it will only build
on amd64.
Ciao,
Kili
DESCRs of the new ports:
archivers/hs-zip-archive:
The zip-archive library provides functions for creating, modifying,
and extracting files from zip archives.
devel/hs-data-ordlist:
This module implements bag and set operations on ordered lists. For
the purposes of this module, a "bag" (or "multiset") is a non-decreasing
list, whereas a "set" is a strictly ascending list. Bags are sorted
lists that may contain duplicates, whereas sets are sorted lists
that do not contain duplicates.
devel/hs-regex-applicative:
regex-applicative is aimed to be an efficient and easy to use parsing
combinator library for Haskell based on regular expressions.
devel/hs-regex-compat-tdfa:
One module layer over regex-tdfa to replace Text.Regex. regex-compat
can't use Unicode characters correctly because of using regex-posix.
This is not good for Unicode users.
devel/hs-regex-tdfa:
A new all Haskell tagged DFA regex engine, inspired by libtre.
devel/hs-sandi:
Reasonably fast data encoding library that handles base16, base32,
base32-hex, base64, base64-uri, base85, quoted-printable, uu-encoding,
xx-encoding and y-encoding.
security/hs-digest:
This package provides efficient cryptographic hash implementations
for strict and lazy bytestrings. For now, CRC32 and Adler32 are
supported; they are implemented as FFI bindings to efficient code
from zlib.
Index: devel/darcs/Makefile
===================================================================
RCS file: /cvs/ports/devel/darcs/Makefile,v
retrieving revision 1.60
diff -u -p -r1.60 Makefile
--- devel/darcs/Makefile 23 Dec 2015 20:06:28 -0000 1.60
+++ devel/darcs/Makefile 28 Dec 2015 19:51:55 -0000
@@ -1,11 +1,8 @@
# $OpenBSD: Makefile,v 1.60 2015/12/23 20:06:28 kili Exp $
-BROKEN = needs an update
-
COMMENT = advanced revision control system written in Haskell
-DISTNAME = darcs-2.8.5
-REVISION = 0
+DISTNAME = darcs-2.10.2
CATEGORIES = devel
HOMEPAGE = http://www.darcs.net/
@@ -13,61 +10,47 @@ HOMEPAGE = http://www.darcs.net/
WANTLIB = c curl>=2 m ncursesw pthread util z
MODULES = lang/ghc converters/libiconv
MODGHC_BUILD = cabal hackage nort
-MODGHC_SETUP_CONF_ARGS =-f 'curl -http -library test'
+MODGHC_SETUP_CONF_ARGS =-f 'curl -http -library use-time-1point5 -test'
LIB_DEPENDS = net/curl
# Yes, build dependencies, because GHC libs are still static and we
# don't want to pull in all of ghc.
-#
-# Commented out because I want to mop up a little bit before the update.
-#
-# BUILD_DEPENDS = archivers/hs-zlib>=0.5.1.0,<0.6.0.0 \
-# devel/hs-extensible-exceptions>=0.1,<0.2 \
-# devel/hs-hashed-storage>=0.5.6,<0.6 \
-# devel/hs-mmap>=0.5,<0.6 \
-# devel/hs-mtl>=1.0,<2.3 \
-# devel/hs-network>=2.2,<2.5 \
-# devel/hs-parsec>=2.0,<3.2 \
-# devel/hs-random>=1.0,<1.1 \
-# devel/hs-regex-compat>=0.95.1 \
-# devel/hs-tar>=0.3,<0.5 \
-# devel/hs-text>=0.11.0.6,<1.2 \
-# devel/hs-utf8-string>=0.3.6,<0.4 \
-# devel/hs-vector>=0.7 \
-# www/hs-html>=1.0,<1.1 \
-# print/texlive/base \
-# textproc/latex2html \
-# ${RUN_DEPENDS}
-
-# Used for building the test suite (which is done during normal
-# build time, not during regress time).
-# BUILD_DEPENDS += devel/hs-FindBin>=0.0,<0.1 \
-# devel/hs-QuickCheck>=2.3 \
-# devel/hs-HUnit>=1.0 \
-# devel/hs-cmdlib>=0.2.1,<0.4 \
-# devel/hs-shellish>=0.1.3,<0.2 \
-# devel/hs-test-framework>=0.4.0 \
-# devel/hs-test-framework-hunit>=0.2.2 \
-# devel/hs-test-framework-quickcheck2>=0.2.8
-
-# TEST_DEPENDS = devel/hs-hlint \
-# shells/bash \
-# sysutils/coreutils
-
-# For the documentation
-USE_GMAKE = Yes
-PORTHOME = ${WRKDIR}
+BUILD_DEPENDS = archivers/hs-zip-archive>=0.2.3,<0.3 \
+ archivers/hs-zlib>=0.5.3.0,<0.7.0.0 \
+ devel/hs-base16-bytestring>=0.1,<0.2 \
+ devel/hs-data-ordlist>=0.4,<0.5 \
+ devel/hs-hashable>=1.0,<1.3 \
+ devel/hs-mmap>=0.5,<0.6 \
+ devel/hs-mtl>=2.1,<2.3 \
+ devel/hs-old-time>=1.1,<1.2 \
+ devel/hs-parsec>=3.1,<3.2 \
+ devel/hs-random>=1.0,<1.2 \
+ devel/hs-regex-applicative>=0.2,<0.4 \
+ devel/hs-regex-compat-tdfa>=0.95.1,<0.96 \
+ devel/hs-sandi>=0.2,<0.4 \
+ devel/hs-tar>=0.4,<0.5 \
+ devel/hs-text>=0.11.2.0,<1.3 \
+ devel/hs-transformers-compat>=0.4,<0.5 \
+ devel/hs-unix-compat>=0.1.2,<0.5 \
+ devel/hs-utf8-string>=0.3.6,<1.1 \
+ devel/hs-vector>=0.7,<0.12 \
+ security/hs-cryptohash>=0.4,<0.12 \
+ textproc/hs-attoparsec>=0.11,<0.14 \
+ www/hs-html>=1.0.1.1 \
+ ${RUN_DEPENDS}
-post-build:
- @cd ${WRKBUILD} && exec ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} html
+# Tests Disabled for now, because of additional dependencies.
+NO_TEST = Yes
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/darcs
- cd ${WRKBUILD}/doc/manual && umask 022 && pax -rw .
${PREFIX}/share/doc/darcs
# Wrong directory, and wrong permissions (600):
rm -rf ${PREFIX}/share/man
${INSTALL_MAN_DIR} ${PREFIX}/man/man1
${INSTALL_MAN} ${WRKBUILD}/dist/build/darcs/darcs.1 ${PREFIX}/man/man1
+
+ # We don't want the library nor yet another copy of the GPL
+ rm -rf ${PREFIX}/lib/${DISTNAME}
+ rm -rf ${PREFIX}/share/doc/${DISTNAME}
# Some of the tests rely on GNU functionality.
pre-test:
Index: devel/darcs/distinfo
===================================================================
RCS file: /cvs/ports/devel/darcs/distinfo,v
retrieving revision 1.28
diff -u -p -r1.28 distinfo
--- devel/darcs/distinfo 14 Oct 2014 12:28:14 -0000 1.28
+++ devel/darcs/distinfo 28 Dec 2015 19:51:55 -0000
@@ -1,2 +1,2 @@
-SHA256 (ghc/darcs-2.8.5.tar.gz) = BkMQ7ViciVAOIkrVJUq4jegVw0nxT5rvlRNyDrhX45k=
-SIZE (ghc/darcs-2.8.5.tar.gz) = 1306525
+SHA256 (ghc/darcs-2.10.2.tar.gz) = YzfT+sBHEfou9YE1WLQJxZFmxVmbDJ1oxBjSHNzPsyc=
+SIZE (ghc/darcs-2.10.2.tar.gz) = 1512858
Index: devel/darcs/patches/patch-darcs_cabal
===================================================================
RCS file: devel/darcs/patches/patch-darcs_cabal
diff -N devel/darcs/patches/patch-darcs_cabal
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/darcs/patches/patch-darcs_cabal 28 Dec 2015 19:51:55 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- darcs.cabal.orig Mon Nov 9 14:53:00 2015
++++ darcs.cabal Wed Dec 23 12:49:19 2015
+@@ -438,7 +438,7 @@ Library
+ cryptohash >= 0.4 && < 0.12,
+ base16-bytestring >= 0.1 && < 0.2,
+ utf8-string >= 0.3.6 && < 1.1,
+- vector >= 0.7 && < 0.11,
++ vector >= 0.7 && < 0.12,
+ tar == 0.4.*,
+ data-ordlist == 0.4.*,
+ attoparsec >= 0.11 && < 0.14,
Index: devel/darcs/patches/patch-src_Darcs_Util_Encoding_IConv_hsc
===================================================================
RCS file: devel/darcs/patches/patch-src_Darcs_Util_Encoding_IConv_hsc
diff -N devel/darcs/patches/patch-src_Darcs_Util_Encoding_IConv_hsc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/darcs/patches/patch-src_Darcs_Util_Encoding_IConv_hsc 28 Dec 2015
19:51:55 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+nl_items (from nl_types.h) appears to be an int on Linux (and mapped
+to Int32) but a long on OpenBSD.
+
+--- src/Darcs/Util/Encoding/IConv.hsc.orig Mon Nov 9 14:53:00 2015
++++ src/Darcs/Util/Encoding/IConv.hsc Wed Dec 23 19:22:59 2015
+@@ -37,7 +37,7 @@ import Foreign
+ , with, maybeWith
+ , ForeignPtr, withForeignPtr, newForeignPtr
+ , FunPtr
+- , Int32, Word8
++ , Int64, Word8
+ )
+ import Control.Exception ( bracket )
+ import Data.ByteString ( ByteString, useAsCStringLen, append )
Index: devel/darcs/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/darcs/pkg/PLIST,v
retrieving revision 1.14
diff -u -p -r1.14 PLIST
--- devel/darcs/pkg/PLIST 9 May 2012 21:00:20 -0000 1.14
+++ devel/darcs/pkg/PLIST 28 Dec 2015 19:51:55 -0000
@@ -1,32 +1,3 @@
@comment $OpenBSD: PLIST,v 1.14 2012/05/09 21:00:20 kili Exp $
@bin bin/darcs
-@comment bin/darcs-test
@man man/man1/darcs.1
-share/doc/darcs/
-@comment share/doc/${DISTNAME}/
-@comment share/doc/${DISTNAME}/COPYING
-share/doc/darcs/About_this.html
-share/doc/darcs/Best_practices.html
-share/doc/darcs/Building_darcs.html
-share/doc/darcs/Configuring_darcs.html
-share/doc/darcs/Contents.html
-share/doc/darcs/Darcs_commands.html
-share/doc/darcs/Getting_started.html
-share/doc/darcs/Introduction.html
-share/doc/darcs/License.html
-@comment share/doc/darcs/WARNINGS
-share/doc/darcs/darcs.css
-share/doc/darcs/darcs.html
-@comment share/doc/darcs/darcs.tex
-share/doc/darcs/footnode.html
-@comment share/doc/darcs/images.aux
-@comment share/doc/darcs/images.log
-@comment share/doc/darcs/images.out
-@comment share/doc/darcs/images.pl
-@comment share/doc/darcs/images.tex
-share/doc/darcs/img1.png
-share/doc/darcs/img2.png
-share/doc/darcs/img3.png
-share/doc/darcs/index.html
-@comment share/doc/darcs/internals.pl
-@comment share/doc/darcs/labels.pl
archivers_hs-zip-archive.tgz
Description: application/tar-gz
devel_hs-data-ordlist.tgz
Description: application/tar-gz
devel_hs-regex-applicative.tgz
Description: application/tar-gz
devel_hs-regex-compat-tdfa.tgz
Description: application/tar-gz
devel_hs-regex-tdfa.tgz
Description: application/tar-gz
devel_hs-sandi.tgz
Description: application/tar-gz
security_hs-digest.tgz
Description: application/tar-gz
