>From 3d80a96ac1803a72ea1fe7ab6ac28b5f79aad684 Mon Sep 17 00:00:00 2001 From: Greg Steuck <[email protected]> Date: Mon, 24 Aug 2020 19:23:42 -0700 Subject: [PATCH 5/7] Use devel/cabal module for devel/darcs and upgrade to 2.16.3
--- devel/darcs/Makefile | 156 +++++++----- devel/darcs/distinfo | 230 +++++++++++++++++- devel/darcs/patches/patch-darcs_cabal | 38 ++- ...tch-tests_issue1857-pristine-conversion_sh | 12 - ...ch-tests_issue1875-honor-no-set-default_sh | 15 -- devel/darcs/pkg/PLIST | 4 +- 6 files changed, 356 insertions(+), 99 deletions(-) delete mode 100644 devel/darcs/patches/patch-tests_issue1857-pristine-conversion_sh delete mode 100644 devel/darcs/patches/patch-tests_issue1875-honor-no-set-default_sh diff --git a/devel/darcs/Makefile b/devel/darcs/Makefile index 977cc186963..fe1f69a8c15 100644 --- a/devel/darcs/Makefile +++ b/devel/darcs/Makefile @@ -1,77 +1,117 @@ # $OpenBSD: Makefile,v 1.71 2019/09/30 11:54:43 kili Exp $ -USE_WXNEEDED = Yes - COMMENT = advanced revision control system written in Haskell -DISTNAME = darcs-2.14.2 +MODCABAL_STEM = darcs +MODCABAL_VERSION = 2.16.3 CATEGORIES = devel HOMEPAGE = http://www.darcs.net/ WANTLIB = c charset curl>=2 curses ffi gmp iconv m \ pthread util z -MODULES = lang/ghc -MODGHC_BUILD = cabal hackage nort -MODGHC_SETUP_CONF_ARGS =-f 'curl -library' --enable-tests + +MODULES = devel/cabal +MODCABAL_FLAGS = curl -library +MODCABAL_MANIFEST = \ + aeson 1.5.6.0 0 \ + asn1-encoding 0.9.6 2 \ + asn1-parse 0.9.5 0 \ + asn1-types 0.3.4 0 \ + assoc 1.0.2 1 \ + async 2.2.3 0 \ + attoparsec 0.13.2.5 0 \ + base-compat 0.11.2 0 \ + base-compat-batteries 0.11.2 0 \ + base-orphans 0.8.4 0 \ + base16-bytestring 1.0.1.0 0 \ + base64-bytestring 1.2.0.1 0 \ + basement 0.0.11 2 \ + bifunctors 5.5.10 0 \ + blaze-builder 0.4.2.1 0 \ + case-insensitive 1.2.1.0 0 \ + cereal 0.5.8.1 0 \ + comonad 5.0.8 0 \ + conduit 1.3.4 0 \ + conduit-extra 1.3.5 0 \ + connection 0.3.1 1 \ + constraints 0.12 0 \ + cookie 0.4.5 0 \ + cryptonite 0.27 0 \ + data-default-class 0.1.2.0 0 \ + data-fix 0.3.1 0 \ + data-ordlist 0.4.7.0 0 \ + digest 0.0.1.2 0 \ + distributive 0.6.2.1 0 \ + dlist 1.0 0 \ + exceptions 0.10.4 1 \ + fgl 5.7.0.3 0 \ + filtrable 0.1.6.0 0 \ + hashable 1.3.1.0 0 \ + hourglass 0.2.12 0 \ + hsc2hs 0.68.7 1 \ + html 1.0.1.2 0 \ + http-client 0.7.6 0 \ + http-client-tls 0.3.5.3 1 \ + http-conduit 2.3.8 0 \ + http-types 0.12.3 0 \ + indexed-traversable 0.1.1 0 \ + integer-logarithms 1.0.3.1 0 \ + memory 0.15.0 1 \ + mime-types 0.1.0.9 0 \ + mmap 0.5.9 0 \ + mono-traversable 1.0.15.1 0 \ + network 3.1.2.1 1 \ + network-uri 2.6.4.1 0 \ + old-locale 1.0.0.7 2 \ + old-time 1.1.0.3 2 \ + pem 0.2.4 0 \ + primitive 0.7.1.0 2 \ + random 1.2.0 5 \ + regex-applicative 0.3.4 0 \ + regex-base 0.94.0.1 0 \ + regex-compat-tdfa 0.95.1.4 0 \ + regex-tdfa 1.3.1.0 2 \ + resourcet 1.2.4.2 0 \ + scientific 0.3.6.2 0 \ + semigroups 0.19.1 0 \ + socks 0.6.1 0 \ + split 0.2.3.4 0 \ + splitmix 0.1.0.3 0 \ + streaming-commons 0.2.2.1 0 \ + strict 0.4.0.1 0 \ + tagged 0.8.6.1 0 \ + tar 0.5.1.1 3 \ + temporary 1.3 0 \ + th-abstraction 0.4.2.0 0 \ + th-compat 0.1.1 0 \ + these 1.1.1.1 1 \ + time-compat 1.9.5 1 \ + tls 1.5.5 0 \ + transformers-compat 0.6.6 0 \ + type-equality 1 2 \ + typed-process 0.2.6.0 0 \ + unix-compat 0.5.3 0 \ + unliftio-core 0.2.0.1 1 \ + unordered-containers 0.2.13.0 0 \ + utf8-string 1.0.2 0 \ + uuid-types 1.0.4 0 \ + vector 0.12.2.0 0 \ + vector-algorithms 0.8.0.4 1 \ + x509 1.7.5 1 \ + x509-store 1.6.7 1 \ + x509-system 1.6.6 0 \ + x509-validation 1.6.11 0 \ + zip-archive 0.4.1 1 \ + zlib 0.6.2.2 0 \ + LIB_DEPENDS = converters/libiconv \ devel/gmp \ devel/libffi \ net/curl -# Yes, build dependencies, because GHC libs are still static and we -# don't want to pull in all of ghc. -BUILD_DEPENDS = archivers/hs-zip-archive>=0.2.3,<0.4 \ - archivers/hs-zlib>=0.6.1.2,<0.7.0.0 \ - devel/hs-async>=2.0.1.4,<2.3 \ - devel/hs-base16-bytestring>=0.1,<0.2 \ - devel/hs-data-ordlist>=0.4,<0.5 \ - devel/hs-fgl>=5.7.0.1,<5.8 \ - devel/hs-hashable>=1.1.2.5,<1.3 \ - devel/hs-mmap>=0.5.9,<0.6 \ - devel/hs-old-time>=1.1,<1.2 \ - devel/hs-random>=1.0.1.1,<1.2 \ - devel/hs-regex-applicative>=0.2,<0.4 \ - devel/hs-regex-compat-tdfa>=0.95.1,<0.96 \ - devel/hs-sandi>=0.5,<0.6 \ - devel/hs-tar>=0.4,<0.6 \ - devel/hs-transformers-compat>=0.4,<0.6 \ - devel/hs-unix-compat>=0.4.2,<0.6\ - devel/hs-utf8-string>=0.3.6,<1.1 \ - devel/hs-vector>=0.10.0.1,<0.13 \ - graphics/hs-graphviz>=2999.20.0.3,<2999.21 \ - net/hs-HTTP>=4000.2.8,<4000.4 \ - security/hs-cryptohash>=0.11,<0.12 \ - textproc/hs-attoparsec>=0.11,<0.14 \ - www/hs-html>=1.0.1.2,<1.1 \ - ${RUN_DEPENDS} - -# Used for building the test suite (which is done during normal -# build time, not during regress time). -BUILD_DEPENDS += devel/hs-cmdargs>=0.10,<0.11 \ - devel/hs-shelly>=1.8,<1.9 \ - devel/hs-split>=0.2.2,<0.3 \ - devel/hs-FindBin>=0.0,<0.1 \ - devel/hs-QuickCheck>=2.6,<2.10 \ - devel/hs-HUnit>=1.2.5.2,<1.6 \ - devel/hs-test-framework>=0.4.0,<0.9 \ - devel/hs-test-framework-hunit>=0.2.2,<0.4 \ - devel/hs-test-framework-quickcheck2>=0.3,<0.4 - -TEST_DEPENDS = shells/bash - post-install: - # 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: - ln -fs ${LOCALBASE}/bin/gdate ${WRKDIR}/bin/date + ${INSTALL_MAN} $$(find ${WRKBUILD} -name darcs.1 -print) ${PREFIX}/man/man1 # GPLv2 PERMIT_PACKAGE = Yes diff --git a/devel/darcs/distinfo b/devel/darcs/distinfo index c36e82a9b33..6dc565fae06 100644 --- a/devel/darcs/distinfo +++ b/devel/darcs/distinfo @@ -1,2 +1,228 @@ -SHA256 (ghc/darcs-2.14.2.tar.gz) = ZdFgpDh0lg3LoRTAt02ceyXQmEhvUVZVUC9C/wwion4= -SIZE (ghc/darcs-2.14.2.tar.gz) = 1067578 +SHA256 (hackage/aeson-1.5.6.0.tar.gz) = A2HDS+PS7JRSAfAlAWk0NvvaENzFSUaUgaCEst4iv+g= +SHA256 (hackage/asn1-encoding-0.9.6.tar.gz) = 2fjeq9O5COXPg8DYE8CNwBQ7PsHA2X9mDSz6AsHI2go= +SHA256 (hackage/asn1-encoding-0.9.6_2.cabal) = J+2PYEOu15YwMTu5MffI4rUQ8LRYbNVcFq4EDH0eoJg= +SHA256 (hackage/asn1-parse-0.9.5.tar.gz) = jx/hNE0ws53FlNdN8sVSCVd3Iq8UlyBLTCttbodH854= +SHA256 (hackage/asn1-types-0.3.4.tar.gz) = eO6SolE3kpjKgg+lPtv0szxTm5/NiHyG9SDDDjtOIag= +SHA256 (hackage/assoc-1.0.2.tar.gz) = 2JiNxuhxjHo0VlFbdpyTNq7uxzDPhvxRdSR5af+PFE8= +SHA256 (hackage/assoc-1.0.2_1.cabal) = qCTk9hVGmietlJ2/SQe6JYvWtFne6+wAUkx7yz9lzJ8= +SHA256 (hackage/async-2.2.3.tar.gz) = RnrzoAN5R6UjLs9fTvvUzyEYqqIxBWbX9ArIKw4yk1w= +SHA256 (hackage/attoparsec-0.13.2.5.tar.gz) = IeDzjqoZV79HEnavoXZRwSWjiSRXXxLCy9L6U0tFaG8= +SHA256 (hackage/base-compat-0.11.2.tar.gz) = U6a1FFRC+6WkutbbK83t4X8WRkK0i8OblQFUIqOa29s= +SHA256 (hackage/base-compat-batteries-0.11.2.tar.gz) = MeBmpaqWr5T+ZGWtuVnDjWOkngE1dkGqQyLHVKlNMCM= +SHA256 (hackage/base-orphans-0.8.4.tar.gz) = N7K1k1bANACi1QmGJnc5PF/3BqCqv4JsEE9v4D2Tu7M= +SHA256 (hackage/base16-bytestring-1.0.1.0.tar.gz) = wMcKS1i+U9Npcb1zYbowD4Kl1ev39Q4aLXv8iDi91vo= +SHA256 (hackage/base64-bytestring-1.2.0.1.tar.gz) = rwmxfQcusTkdkeMLQYbdF5czBkfveSaOzX/M6PWvxjg= +SHA256 (hackage/basement-0.0.11.tar.gz) = Z1grNHWlVHklOZ9xnfIfi7vQyk1NsneVwipHT47mNGs= +SHA256 (hackage/basement-0.0.11_2.cabal) = r0Pi4zTlFbUsowmRmxNcUbXpQR5tTGjQ6JUNYetfJdE= +SHA256 (hackage/bifunctors-5.5.10.tar.gz) = 53Kc/Ytq9c7NfdUJ5OST7sDxUih2zAzPT1gFSVwzqQ0= +SHA256 (hackage/blaze-builder-0.4.2.1.tar.gz) = bmiJvJw/+SBioX84JdzBsoUQ0mEzTU1OF3Iy2QTqCwY= +SHA256 (hackage/case-insensitive-1.2.1.0.tar.gz) = KW3BfgxfPfs9gs7YPkycRMM47N50myeLbq5RLx0E5AY= +SHA256 (hackage/cereal-0.5.8.1.tar.gz) = LZ6IrJNLnrwFgJfHIBH/WfPxRhdjEOHJV6Dkz2NoG9c= +SHA256 (hackage/comonad-5.0.8.tar.gz) = 72zfLMKSzEPuaqlsWBsjX96oq0Sgv/sk3HmuKy7zPRM= +SHA256 (hackage/conduit-1.3.4.tar.gz) = nwKDGq3qJEicHRggAY7a3W2XAA4R810F2hP6jCFkYPA= +SHA256 (hackage/conduit-extra-1.3.5.tar.gz) = imSN7iA8AeZH+jhr/npbKTzlUvi1yrnA3Vy3HHzQEtk= +SHA256 (hackage/connection-0.3.1.tar.gz) = XXWVicUyw02Hv8T2/Lcyv1W1WpNVnTuUIp6DR6FTddk= +SHA256 (hackage/connection-0.3.1_1.cabal) = ZdocBVYQCVczvNIo2F3/gIBLI6XRj+3plKD5/NGwwSE= +SHA256 (hackage/constraints-0.12.tar.gz) = 8mtTGhXwE/FbS130bE+JsTknJTpBlUlMUDIK3wV2AiM= +SHA256 (hackage/cookie-0.4.5.tar.gz) = cH+U0bMQGLkdah6eGe9UE+INAsqwCtk6X9fXs7RqNYM= +SHA256 (hackage/cryptonite-0.27.tar.gz) = yCdFqJMMNqgaB3LcGMhvi3UF4l/Cq5awjC+RJezmyLA= +SHA256 (hackage/darcs-2.16.3.tar.gz) = iSXuh+KntPPYezhn3d9oNE+Hm6GEhrFW6u5M85sNwa0= +SHA256 (hackage/data-default-class-0.1.2.0.tar.gz) = TwG0I/AAw+BpqvUqNIVkplNnl/MUmLuFw9tL0tCXPlY= +SHA256 (hackage/data-fix-0.3.1.tar.gz) = m0XAQEcpIsGXuzMZAZe1iVr6xjGCA7KvswJR1N+LzHk= +SHA256 (hackage/data-ordlist-0.4.7.0.tar.gz) = b2weepqRVa14ynjLmr1vfi4ceLPlSbF53Ah05kKPSQ0= +SHA256 (hackage/digest-0.0.1.2.tar.gz) = ZBcX6xY5Kr+JZZhqno3CHuvx2Xd1u7aSPHt/j+4X/hE= +SHA256 (hackage/distributive-0.6.2.1.tar.gz) = 1zUTkuB49YyqRmMKS5xkPh4und3uRYSMXINY57Exa5E= +SHA256 (hackage/dlist-1.0.tar.gz) = Fz1jcyi7Fz/MNl8w0p/0qUKSoeDlVYrrPfwR3oFRARU= +SHA256 (hackage/exceptions-0.10.4.tar.gz) = TQv7Q1XP/NZ9MAgR351f5E6jWU7WN1B5W/wfeXq9hM8= +SHA256 (hackage/exceptions-0.10.4_1.cabal) = FynvJqYRrniqWM3TQZKv9xDLqm1jHdBC3ftjVW0AtSw= +SHA256 (hackage/fgl-5.7.0.3.tar.gz) = KWm4E7kGfrgHCLBWQ02ldvzRNKDsdX3Y5AGNVm5+ZRI= +SHA256 (hackage/filtrable-0.1.6.0.tar.gz) = vkC3mr2bZWOgFGBpsiMTpKe4+4z348S8Yvt3JfmhEhU= +SHA256 (hackage/hashable-1.3.1.0.tar.gz) = gGGCOkrFIbU5Eu3Lo2uVbzFZy4hbB+wRmvKVplaMp8Q= +SHA256 (hackage/hourglass-0.2.12.tar.gz) = RDNbXEAugMYPHbanRGK+TqKdGpBDqplDNP/uEWTxyko= +SHA256 (hackage/hsc2hs-0.68.7.tar.gz) = /XkV5B4+07x3UP7g6K3StPMtysi3xUTP31VCKTIjiUo= +SHA256 (hackage/hsc2hs-0.68.7_1.cabal) = Sg9oYKF+fCRWRpdePCmBQWr9y2p7NVPDEAXrNkGn9Vs= +SHA256 (hackage/html-1.0.1.2.tar.gz) = DDVJXqM9Zeacabx0QeyOGvafu0NDPCqjQGwKE6OrMGE= +SHA256 (hackage/http-client-0.7.6.tar.gz) = M/N4l2EY+dgA+lJkUq2gYxTDtPnqsTThpNIVOAuuqJA= +SHA256 (hackage/http-client-tls-0.3.5.3.tar.gz) = Rxq/jympCfQLIeqyakEMDhIK4SzjN1EqYdrp9S67Q2I= +SHA256 (hackage/http-client-tls-0.3.5.3_1.cabal) = yXw9iOYxijBW5C4s0JE9XEv/OB+DNBu2/waGX9Esi1I= +SHA256 (hackage/http-conduit-2.3.8.tar.gz) = z77yk4Vv3M5YYYcm/5Ecoo4q0HyFIrLNHPostuAlQq4= +SHA256 (hackage/http-types-0.12.3.tar.gz) = TopKZkd0WfpDajMcdeRoV+yAJig9+YTVT5BXbNMCQBY= +SHA256 (hackage/indexed-traversable-0.1.1.tar.gz) = esNq4xU8vnqOmerP/QZTZ7h1RJU8ySmX9CShUNtGgTk= +SHA256 (hackage/integer-logarithms-1.0.3.1.tar.gz) = mwqfn6tgmxXNAVhlch+wX3RKG8d66S/RM4ct5Si76n8= +SHA256 (hackage/memory-0.15.0.tar.gz) = 4/+JLBqUcIlU0LssT0q4G8D1BTUtlQlTGcRi2xrrNSk= +SHA256 (hackage/memory-0.15.0_1.cabal) = vnAktQ6Hapw7f+uu/dgdXcZyaMWKe05rOCW9xYJ02Iw= +SHA256 (hackage/mime-types-0.1.0.9.tar.gz) = CjJDUWnvS6WfSkuK3f0MBEeUEIVNG41poeOPs4m6cdI= +SHA256 (hackage/mmap-0.5.9.tar.gz) = WPy7BOHLjnw2wFgjsC3OL6qpicU9dFp/Nhkt4vyYtfg= +SHA256 (hackage/mono-traversable-1.0.15.1.tar.gz) = wt9bee0viPLuMT5XwdWR1EY3iOINOeQ5KX7sW6WDXd8= +SHA256 (hackage/network-3.1.2.1.tar.gz) = /KqVREXLV1/wTQiOcZRS41YyS2rLmMWu/SVBoGlDnUo= +SHA256 (hackage/network-3.1.2.1_1.cabal) = GI1trqjNkbw1U+/VqQoefG0EJfpmpTuqdNtbbZ/XXIs= +SHA256 (hackage/network-uri-2.6.4.1.tar.gz) = V4VtuTYIpNQZ9oG4gcm41ESIANWmh1h9w36KngsiNYQ= +SHA256 (hackage/old-locale-1.0.0.7.tar.gz) = 26+L9riI+5iEVwUHkpaiPD9A7i9EnfcxL39/HeGNe1A= +SHA256 (hackage/old-locale-1.0.0.7_2.cabal) = +pmL4sfgDNJqbpB1vqeQyq85Msqj6Ul61pvCA4DdaRE= +SHA256 (hackage/old-time-1.1.0.3.tar.gz) = HMsViw94UXFdNrdXxSOwJsoVQeIDDQIjmAK6ObQRK8E= +SHA256 (hackage/old-time-1.1.0.3_2.cabal) = yR+7Puc9IMzQFYQrMPHymjBIk+vgrjEot7vBPVuw1Mg= +SHA256 (hackage/pem-0.2.4.tar.gz) = dwxMG5zSSz239RH4pIQEoNCYmZ4oVzw3Q6iilruW+NQ= +SHA256 (hackage/primitive-0.7.1.0.tar.gz) = a+vs/fKld4fZ/VIxv9YStlqS7dezOpc7Kg8RMSuJo/A= +SHA256 (hackage/primitive-0.7.1.0_2.cabal) = 9jV9VyDBxmUJbD4BFGfa9EMZi3hqcI0v+SaViiTVCNQ= +SHA256 (hackage/random-1.2.0.tar.gz) = 5FGc98BYv9W9vkrMeCKErMniXnRIcghhnKg8vNY/ud4= +SHA256 (hackage/random-1.2.0_5.cabal) = MNct9MwdL+LURciPDunSGWWvfOhmYMQ6bDKmodkNUck= +SHA256 (hackage/regex-applicative-0.3.4.tar.gz) = F2mkecP/lTvFqZqJ5WSKbwHF/1T8mgmszrngKeI1JjY= +SHA256 (hackage/regex-base-0.94.0.1.tar.gz) = cbHZb/8gHzH+jNRTLwVqygOiHNSGiQJW3DAH3XOt7dk= +SHA256 (hackage/regex-compat-tdfa-0.95.1.4.tar.gz) = T6OO0krjkO7/5u7wS75jLX7NArkSNynpdudCD5J1IN0= +SHA256 (hackage/regex-tdfa-1.3.1.0.tar.gz) = FcN2eD05ezuZM881mAgI/t3eJzvW8kRbq7zLL3akLsA= +SHA256 (hackage/regex-tdfa-1.3.1.0_2.cabal) = 640PAHz0X6yoV09W8NGcmwK8Up7xaI2PipdRzn3DbMM= +SHA256 (hackage/resourcet-1.2.4.2.tar.gz) = F/IIQgQ60ZmWGoAbbvsSM7kJjrNTf4OVhEJo9qIj64c= +SHA256 (hackage/scientific-0.3.6.2.tar.gz) = J40K/IdFAlT4p26rIbVYOvY5VO/Jt0hEoXohpoATFA8= +SHA256 (hackage/semigroups-0.19.1.tar.gz) = eedh5kuGJWSjRw1dNWy2sGCxRFLWdYWa7TstHhRkZkg= +SHA256 (hackage/socks-0.6.1.tar.gz) = c0RHVYuwYc52j1Og3x8kAZAsa+45bMls5ift2YbvanM= +SHA256 (hackage/split-0.2.3.4.tar.gz) = Jx/lEEyfQANKqaGq1iabzsyUVLxaV8JH5p4X3plsHyo= +SHA256 (hackage/splitmix-0.1.0.3.tar.gz) = RgCfSwAMnmYTN3dnuHGL84R2Rp8qjiFi2YzCRogtWjU= +SHA256 (hackage/streaming-commons-0.2.2.1.tar.gz) = MGlAv0h4oLcU5nRqf5NNAYEA78hjMsF2pkgBS/4egd0= +SHA256 (hackage/strict-0.4.0.1.tar.gz) = 3/arwIrWN+UYkbuLR1d4xAkmxRIZ7aYP1k8NloAiYkE= +SHA256 (hackage/tagged-0.8.6.1.tar.gz) = 9eD8+V8LtKpj9CjywBlVpB6hpCz885FF7WMfWalhbAI= +SHA256 (hackage/tar-0.5.1.1.tar.gz) = s4REn2KysKo+bSyxAEuAYLAfIeyT57Y+evbY+tip8d4= +SHA256 (hackage/tar-0.5.1.1_3.cabal) = lN7QVxj+dbiMmOcRP+65/KUGiKflm2rv2ApvSEOMUGI= +SHA256 (hackage/temporary-1.3.tar.gz) = jEQpk2lLX/yoI86GSvlb0oQftSZO5RHGHPSMxx2HmJA= +SHA256 (hackage/th-abstraction-0.4.2.0.tar.gz) = 6gayzaJfxLUtrEjMI+WnVvmX34mF7K7lpVQgJQihHEA= +SHA256 (hackage/th-compat-0.1.1.tar.gz) = lfogWDrCNryexroBNQSD6HoSGniTtBWGUccApgr2A/k= +SHA256 (hackage/these-1.1.1.1.tar.gz) = 15jJ9W4X3vRB6PUeVMwRr9s+dsap0enuFU6aeNoL9Qg= +SHA256 (hackage/these-1.1.1.1_1.cabal) = 6YHGUijbWud6BDYx90oeSkt3D3IThm9YTjR2tSUS8a8= +SHA256 (hackage/time-compat-1.9.5.tar.gz) = MSayZ9GfMdUqPDbxOoeIvgMkL4KaW93YowhOE00B46Y= +SHA256 (hackage/time-compat-1.9.5_1.cabal) = pYa9Wlm0fqDJ6vxVxpNu3hESb0puYZ1teu7+5zxD2bg= +SHA256 (hackage/tls-1.5.5.tar.gz) = iki1ztQ/rBXJkVjw7t7EWNd6ZgXBpDAtQUV/WnDvOUg= +SHA256 (hackage/transformers-compat-0.6.6.tar.gz) = fi4CUeXm0oFCYVpLlQo/q6ycC3gEsexKSumF8ZUZqfk= +SHA256 (hackage/type-equality-1.tar.gz) = Ryi1AqIRRU72gqENej6BfCLQa6UJ3xFLsmfvnUOgjOg= +SHA256 (hackage/type-equality-1_2.cabal) = 8qiVp7IjhNm0OpxmCHJbLedYHnflsgq5z+P5WfbNcag= +SHA256 (hackage/typed-process-0.2.6.0.tar.gz) = MaKoHzNGP+3DPMUZrVuWeXh+ZI/i7H783r19VL27wrE= +SHA256 (hackage/unix-compat-0.5.3.tar.gz) = CJO1l+oNtAZCnQ1WNQavZ1VyjvrODhmB+TkhItuI5cg= +SHA256 (hackage/unliftio-core-0.2.0.1.tar.gz) = kZ8NEpfqL1NzEYVTwd8qlAXYueMagwfoKdpn1JU8KZo= +SHA256 (hackage/unliftio-core-0.2.0.1_1.cabal) = mz5E6pqsrL/DWztUAVr0UAkZFqw2GKQYaOv2VGl3ZZo= +SHA256 (hackage/unordered-containers-0.2.13.0.tar.gz) = hrATaauOsxE4OgUtOJM34s1xpjCIMj8CkydU30qje1U= +SHA256 (hackage/utf8-string-1.0.2.tar.gz) = 7kjeradgA3ByjEFWywAkQd53DQEhrjOmgTmp7ZwZsJo= +SHA256 (hackage/uuid-types-1.0.4.tar.gz) = wqosyqOnQlmsofV8wcJ3giCGQwgUzl5POM/YaP5I7AY= +SHA256 (hackage/vector-0.12.2.0.tar.gz) = F6sLhMh4WTM/9oG7n3aDaHeWd5Jb1Yn/S6oFvj/Sa1A= +SHA256 (hackage/vector-algorithms-0.8.0.4.tar.gz) = dhdqVneL8wonWxCJ7m2yTsbGfZJSUUX43+IVuAE3rzs= +SHA256 (hackage/vector-algorithms-0.8.0.4_1.cabal) = v0dgsjoP7gmruMnjyVLIcPXcl4CHbp1+OKsr3ZjI8oM= +SHA256 (hackage/x509-1.7.5.tar.gz) = sbD8u0qg10ntK1RxDC69bZAMuTIQitFPl2QM9Mpgx8g= +SHA256 (hackage/x509-1.7.5_1.cabal) = ARhamhe+5OiSh9njK/qmcxM88rCaOXWWJ77R9y6lKP0= +SHA256 (hackage/x509-store-1.6.7.tar.gz) = l4Y1bIv99jHqAYwyRNCFTG2yyyTlg4kepVOWFEP2Hvk= +SHA256 (hackage/x509-store-1.6.7_1.cabal) = pwey9Lo8Auus1+zRnp8MCyEbWCcDKcLHdaLB3yaCAhI= +SHA256 (hackage/x509-system-1.6.6.tar.gz) = QNzarj7GfzjAjZbUNluQHrisDFkL15cutCnTfViqRBk= +SHA256 (hackage/x509-validation-1.6.11.tar.gz) = +UMhy8xKU0rfWImuaVDzZz44tiuJtpcLR39QLOmH0Zs= +SHA256 (hackage/zip-archive-0.4.1.tar.gz) = xdXJl2JB3MJbDYdT3FJrsb/vYPMN7jjFOnrlbmvpsbE= +SHA256 (hackage/zip-archive-0.4.1_1.cabal) = UXdL3HR9ILjyMXIxX5w/3WwR3gFgfpjpiQ64f7SVZtc= +SHA256 (hackage/zlib-0.6.2.2.tar.gz) = BLWJDdaemS+M0JVw2B6dXsqxnbjoLL5Huo4CwxwGMbo= +SIZE (hackage/aeson-1.5.6.0.tar.gz) = 286364 +SIZE (hackage/asn1-encoding-0.9.6.tar.gz) = 17343 +SIZE (hackage/asn1-encoding-0.9.6_2.cabal) = 2060 +SIZE (hackage/asn1-parse-0.9.5.tar.gz) = 2951 +SIZE (hackage/asn1-types-0.3.4.tar.gz) = 6472 +SIZE (hackage/assoc-1.0.2.tar.gz) = 3047 +SIZE (hackage/assoc-1.0.2_1.cabal) = 1205 +SIZE (hackage/async-2.2.3.tar.gz) = 14056 +SIZE (hackage/attoparsec-0.13.2.5.tar.gz) = 163876 +SIZE (hackage/base-compat-0.11.2.tar.gz) = 34625 +SIZE (hackage/base-compat-batteries-0.11.2.tar.gz) = 16902 +SIZE (hackage/base-orphans-0.8.4.tar.gz) = 22573 +SIZE (hackage/base16-bytestring-1.0.1.0.tar.gz) = 7256 +SIZE (hackage/base64-bytestring-1.2.0.1.tar.gz) = 13650 +SIZE (hackage/basement-0.0.11.tar.gz) = 134032 +SIZE (hackage/basement-0.0.11_2.cabal) = 5711 +SIZE (hackage/bifunctors-5.5.10.tar.gz) = 45810 +SIZE (hackage/blaze-builder-0.4.2.1.tar.gz) = 60704 +SIZE (hackage/case-insensitive-1.2.1.0.tar.gz) = 53609 +SIZE (hackage/cereal-0.5.8.1.tar.gz) = 20114 +SIZE (hackage/comonad-5.0.8.tar.gz) = 15227 +SIZE (hackage/conduit-1.3.4.tar.gz) = 88861 +SIZE (hackage/conduit-extra-1.3.5.tar.gz) = 33189 +SIZE (hackage/connection-0.3.1.tar.gz) = 9051 +SIZE (hackage/connection-0.3.1_1.cabal) = 1554 +SIZE (hackage/constraints-0.12.tar.gz) = 20950 +SIZE (hackage/cookie-0.4.5.tar.gz) = 6048 +SIZE (hackage/cryptonite-0.27.tar.gz) = 611768 +SIZE (hackage/darcs-2.16.3.tar.gz) = 1244848 +SIZE (hackage/data-default-class-0.1.2.0.tar.gz) = 2522 +SIZE (hackage/data-fix-0.3.1.tar.gz) = 5520 +SIZE (hackage/data-ordlist-0.4.7.0.tar.gz) = 8906 +SIZE (hackage/digest-0.0.1.2.tar.gz) = 3790 +SIZE (hackage/distributive-0.6.2.1.tar.gz) = 8140 +SIZE (hackage/dlist-1.0.tar.gz) = 18667 +SIZE (hackage/exceptions-0.10.4.tar.gz) = 20819 +SIZE (hackage/exceptions-0.10.4_1.cabal) = 2796 +SIZE (hackage/fgl-5.7.0.3.tar.gz) = 56415 +SIZE (hackage/filtrable-0.1.6.0.tar.gz) = 7881 +SIZE (hackage/hashable-1.3.1.0.tar.gz) = 21424 +SIZE (hackage/hourglass-0.2.12.tar.gz) = 25797 +SIZE (hackage/hsc2hs-0.68.7.tar.gz) = 38630 +SIZE (hackage/hsc2hs-0.68.7_1.cabal) = 2794 +SIZE (hackage/html-1.0.1.2.tar.gz) = 11021 +SIZE (hackage/http-client-0.7.6.tar.gz) = 91628 +SIZE (hackage/http-client-tls-0.3.5.3.tar.gz) = 7679 +SIZE (hackage/http-client-tls-0.3.5.3_1.cabal) = 2066 +SIZE (hackage/http-conduit-2.3.8.tar.gz) = 28858 +SIZE (hackage/http-types-0.12.3.tar.gz) = 13547 +SIZE (hackage/indexed-traversable-0.1.1.tar.gz) = 8424 +SIZE (hackage/integer-logarithms-1.0.3.1.tar.gz) = 9023 +SIZE (hackage/memory-0.15.0.tar.gz) = 42299 +SIZE (hackage/memory-0.15.0_1.cabal) = 5002 +SIZE (hackage/mime-types-0.1.0.9.tar.gz) = 11384 +SIZE (hackage/mmap-0.5.9.tar.gz) = 11731 +SIZE (hackage/mono-traversable-1.0.15.1.tar.gz) = 40815 +SIZE (hackage/network-3.1.2.1.tar.gz) = 136889 +SIZE (hackage/network-3.1.2.1_1.cabal) = 4968 +SIZE (hackage/network-uri-2.6.4.1.tar.gz) = 32373 +SIZE (hackage/old-locale-1.0.0.7.tar.gz) = 3384 +SIZE (hackage/old-locale-1.0.0.7_2.cabal) = 1071 +SIZE (hackage/old-time-1.1.0.3.tar.gz) = 74219 +SIZE (hackage/old-time-1.1.0.3_2.cabal) = 1328 +SIZE (hackage/pem-0.2.4.tar.gz) = 4717 +SIZE (hackage/primitive-0.7.1.0.tar.gz) = 52184 +SIZE (hackage/primitive-0.7.1.0_2.cabal) = 2728 +SIZE (hackage/random-1.2.0.tar.gz) = 37889 +SIZE (hackage/random-1.2.0_5.cabal) = 6094 +SIZE (hackage/regex-applicative-0.3.4.tar.gz) = 15924 +SIZE (hackage/regex-base-0.94.0.1.tar.gz) = 10095 +SIZE (hackage/regex-compat-tdfa-0.95.1.4.tar.gz) = 4146 +SIZE (hackage/regex-tdfa-1.3.1.0.tar.gz) = 77767 +SIZE (hackage/regex-tdfa-1.3.1.0_2.cabal) = 6483 +SIZE (hackage/resourcet-1.2.4.2.tar.gz) = 16862 +SIZE (hackage/scientific-0.3.6.2.tar.gz) = 23510 +SIZE (hackage/semigroups-0.19.1.tar.gz) = 21124 +SIZE (hackage/socks-0.6.1.tar.gz) = 9759 +SIZE (hackage/split-0.2.3.4.tar.gz) = 15942 +SIZE (hackage/splitmix-0.1.0.3.tar.gz) = 20754 +SIZE (hackage/streaming-commons-0.2.2.1.tar.gz) = 86559 +SIZE (hackage/strict-0.4.0.1.tar.gz) = 12488 +SIZE (hackage/tagged-0.8.6.1.tar.gz) = 9842 +SIZE (hackage/tar-0.5.1.1.tar.gz) = 39155 +SIZE (hackage/tar-0.5.1.1_3.cabal) = 5464 +SIZE (hackage/temporary-1.3.tar.gz) = 5686 +SIZE (hackage/th-abstraction-0.4.2.0.tar.gz) = 37848 +SIZE (hackage/th-compat-0.1.1.tar.gz) = 10903 +SIZE (hackage/these-1.1.1.1.tar.gz) = 9804 +SIZE (hackage/these-1.1.1.1_1.cabal) = 2631 +SIZE (hackage/time-compat-1.9.5.tar.gz) = 59336 +SIZE (hackage/time-compat-1.9.5_1.cabal) = 4954 +SIZE (hackage/tls-1.5.5.tar.gz) = 158700 +SIZE (hackage/transformers-compat-0.6.6.tar.gz) = 41347 +SIZE (hackage/type-equality-1.tar.gz) = 4525 +SIZE (hackage/type-equality-1_2.cabal) = 1569 +SIZE (hackage/typed-process-0.2.6.0.tar.gz) = 17363 +SIZE (hackage/unix-compat-0.5.3.tar.gz) = 13582 +SIZE (hackage/unliftio-core-0.2.0.1.tar.gz) = 3696 +SIZE (hackage/unliftio-core-0.2.0.1_1.cabal) = 1082 +SIZE (hackage/unordered-containers-0.2.13.0.tar.gz) = 53379 +SIZE (hackage/utf8-string-1.0.2.tar.gz) = 10726 +SIZE (hackage/uuid-types-1.0.4.tar.gz) = 11537 +SIZE (hackage/vector-0.12.2.0.tar.gz) = 142213 +SIZE (hackage/vector-algorithms-0.8.0.4.tar.gz) = 26681 +SIZE (hackage/vector-algorithms-0.8.0.4_1.cabal) = 3752 +SIZE (hackage/x509-1.7.5.tar.gz) = 21457 +SIZE (hackage/x509-1.7.5_1.cabal) = 2305 +SIZE (hackage/x509-store-1.6.7.tar.gz) = 12689 +SIZE (hackage/x509-store-1.6.7_1.cabal) = 1781 +SIZE (hackage/x509-system-1.6.6.tar.gz) = 3419 +SIZE (hackage/x509-validation-1.6.11.tar.gz) = 19752 +SIZE (hackage/zip-archive-0.4.1.tar.gz) = 20967 +SIZE (hackage/zip-archive-0.4.1_1.cabal) = 4055 +SIZE (hackage/zlib-0.6.2.2.tar.gz) = 148178 diff --git a/devel/darcs/patches/patch-darcs_cabal b/devel/darcs/patches/patch-darcs_cabal index a95a11f1127..cf147aca0b3 100644 --- a/devel/darcs/patches/patch-darcs_cabal +++ b/devel/darcs/patches/patch-darcs_cabal @@ -1,14 +1,32 @@ -$OpenBSD: patch-darcs_cabal,v 1.11 2019/09/30 11:54:44 kili Exp $ +$OpenBSD$ + +Workaround +src/hscurl.c:50:11: error: + error: expected ';' after top level declarator + "darcs/" PACKAGE_VERSION " libcurl/" LIBCURL_VERSION; + ^ + ; + | +50 | "darcs/" PACKAGE_VERSION " libcurl/" LIBCURL_VERSION; + | ^ +1 error generated. +`cc' failed in phase `C Compiler'. (Exit code: 1) + +This seems related to a long closed http://bugs.darcs.net/issue1824 +titled "PACKAGE_VERSION is not a string" + +I don't see any value in reporting the version of darcs to the server +anyway, so implement the current effective behavior of darcs on Windows. Index: darcs.cabal --- darcs.cabal.orig +++ darcs.cabal -@@ -403,7 +403,7 @@ Library - attoparsec >= 0.13.0.1 && < 0.14, - zip-archive >= 0.3 && < 0.5, - async >= 2.0.2 && < 2.3, -- sandi >= 0.4 && < 0.5, -+ sandi >= 0.4 && < 0.6, - unix-compat >= 0.4.2 && < 0.6, - bytestring >= 0.10.6 && < 0.11, - old-time >= 1.1.0.3 && < 1.2, +@@ -467,7 +467,7 @@ Library + other-modules: Darcs.Util.Download.Curl + cpp-options: -DHAVE_CURL + c-sources: src/hscurl.c +- cc-options: -DHAVE_CURL ++ cc-options: -DHAVE_CURL -DPACKAGE_VERSION="unknown" + if flag(pkgconfig) + pkgconfig-depends: libcurl + else diff --git a/devel/darcs/patches/patch-tests_issue1857-pristine-conversion_sh b/devel/darcs/patches/patch-tests_issue1857-pristine-conversion_sh deleted file mode 100644 index 4322bb5ca57..00000000000 --- a/devel/darcs/patches/patch-tests_issue1857-pristine-conversion_sh +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-tests_issue1857-pristine-conversion_sh,v 1.1 2012/05/09 21:00:20 kili Exp $ ---- tests/issue1857-pristine-conversion.sh.orig Sun Apr 22 17:14:14 2012 -+++ tests/issue1857-pristine-conversion.sh Wed May 2 14:10:49 2012 -@@ -26,7 +26,7 @@ - - . lib # Load some portability helpers. - rm -rf minimal-darcs-2.4 --tar zx < $TESTDATA/minimal-darcs-2_4.tgz -+tar zxf - < $TESTDATA/minimal-darcs-2_4.tgz - - cd minimal-darcs-2.4 - darcs check diff --git a/devel/darcs/patches/patch-tests_issue1875-honor-no-set-default_sh b/devel/darcs/patches/patch-tests_issue1875-honor-no-set-default_sh deleted file mode 100644 index 364ccc889ea..00000000000 --- a/devel/darcs/patches/patch-tests_issue1875-honor-no-set-default_sh +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-tests_issue1875-honor-no-set-default_sh,v 1.1 2010/11/02 20:22:35 kili Exp $ - -Our find(1) doesn't exit(1) if a path operand couldn't be traversed, - ---- tests/issue1875-honor-no-set-default.sh.orig Mon Aug 23 20:35:23 2010 -+++ tests/issue1875-honor-no-set-default.sh Sat Aug 28 20:27:21 2010 -@@ -28,7 +28,7 @@ - rm -rf R S # Another script may have left a mess. - darcs init --repo R # Create our test repos. - darcs get R S --no-set-default --not find S/_darcs/prefs/defaultrepo -+test ! -e S/_darcs/prefs/defaultrepo - rm -rf S - - darcs init --repo S diff --git a/devel/darcs/pkg/PLIST b/devel/darcs/pkg/PLIST index 8701b0ab268..b8e148e5483 100644 --- a/devel/darcs/pkg/PLIST +++ b/devel/darcs/pkg/PLIST @@ -1,3 +1,3 @@ @comment $OpenBSD: PLIST,v 1.15 2015/12/29 12:54:38 kili Exp $ -@bin bin/darcs -@man man/man1/darcs.1 +@bin bin/${MODCABAL_STEM} +@man man/man1/${MODCABAL_STEM}.1 -- 2.30.1
