From 5ae89bfa21620112009909fd51e2374521cf512d Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Sun, 27 May 2018 12:33:45 +0200 Subject: [PATCH] */*: sync with upstream Taken from: HardenedBSD --- archivers/hs-tar/Makefile | 3 +- archivers/hs-tar/distinfo | 6 +- archivers/hs-zip-archive/Makefile | 5 +- archivers/hs-zip-archive/distinfo | 6 +- archivers/hs-zlib-bindings/Makefile | 2 +- archivers/hs-zlib-enum/Makefile | 2 +- archivers/hs-zlib/Makefile | 2 +- archivers/peazip/Makefile | 58 +- archivers/peazip/distinfo | 6 +- archivers/py-bup/Makefile | 6 +- audio/hs-ALUT/Makefile | 2 +- audio/hs-OpenAL/Makefile | 2 +- audio/hs-libmpd/Makefile | 5 +- audio/hs-libmpd/distinfo | 6 +- audio/musicpd/Makefile | 3 +- audio/musicpd/distinfo | 6 +- audio/soundconverter/Makefile | 3 +- benchmarks/hs-criterion/Makefile | 11 +- benchmarks/hs-criterion/distinfo | 6 +- benchmarks/iperf/Makefile | 5 +- benchmarks/iperf/distinfo | 6 +- benchmarks/iperf/files/patch-src-Client.cpp | 11 - cad/zcad/Makefile | 51 +- cad/zcad/files/makefile | 2 +- chinese/auto-tw-l10n/Makefile | 2 +- chinese/auto-tw-l10n/files/patch-dot.xinitrc | 28 +- comms/cqrlog/Makefile | 31 +- comms/cqrlog/files/patch-Makefile | 4 +- comms/cqrlog/files/patch-src_cqrlog.lpi | 17 +- comms/librs232/Makefile | 4 +- comms/librs232/distinfo | 6 +- comms/librs232/files/Makefile | 1 - comms/librs232/pkg-plist | 1 + converters/hs-aeson-compat/Makefile | 5 +- converters/hs-aeson-compat/distinfo | 6 +- .../files/patch-aeson-compat.cabal | 29 +- converters/hs-aeson-pretty/Makefile | 5 +- converters/hs-aeson-pretty/distinfo | 6 +- converters/hs-aeson/Makefile | 5 +- converters/hs-aeson/distinfo | 6 +- converters/hs-dataenc/Makefile | 2 +- converters/hs-json/Makefile | 5 +- converters/hs-json/distinfo | 5 +- converters/hs-sandi/Makefile | 3 +- converters/hs-sandi/distinfo | 6 +- databases/hs-esqueleto/Makefile | 6 +- databases/hs-hedis/Makefile | 6 +- databases/hs-hedis/distinfo | 6 +- databases/hs-mysql/Makefile | 5 +- databases/hs-mysql/distinfo | 6 +- databases/hs-persistent-sqlite/Makefile | 5 +- databases/hs-persistent-sqlite/distinfo | 6 +- databases/hs-persistent-template/Makefile | 5 +- databases/hs-persistent-template/distinfo | 6 +- .../files/patch-persistent-template.cabal | 6 +- databases/hs-persistent/Makefile | 11 +- databases/hs-persistent/distinfo | 6 +- databases/memcached/Makefile | 2 +- databases/memcached/distinfo | 6 +- databases/p5-BSON/Makefile | 2 +- databases/p5-BSON/distinfo | 6 +- databases/pgbarman/Makefile | 10 +- databases/pgbarman/distinfo | 6 +- databases/pgmetrics/Makefile | 2 +- databases/pgmetrics/distinfo | 6 +- databases/phpmyadmin/Makefile | 3 +- databases/phpmyadmin/distinfo | 6 +- databases/rocksdb/Makefile | 2 +- databases/rocksdb/distinfo | 6 +- deskutils/calibre/Makefile | 2 +- deskutils/calibre/distinfo | 6 +- deskutils/horde-mnemo/Makefile | 2 +- deskutils/horde-mnemo/pkg-descr | 2 +- deskutils/hs-fdo-notify/Makefile | 2 +- devel/Makefile | 19 +- devel/apache-ant/Makefile | 2 +- devel/apache-ant/distinfo | 10 +- devel/apache-ant/pkg-plist | 2 + devel/aphpbreakdown/Makefile | 5 +- devel/aphpbreakdown/distinfo | 6 +- devel/bmake/Makefile | 2 +- devel/bmake/distinfo | 6 +- devel/byacc/Makefile | 2 +- devel/byacc/distinfo | 6 +- devel/erlang-gpb/Makefile | 2 +- devel/erlang-gpb/distinfo | 6 +- devel/fb303/Makefile | 2 - devel/fb303/files/patch-cpp_FacebookBase.h | 10 + devel/gitphp/Makefile | 11 +- devel/hs-BNFC/Makefile | 21 - devel/hs-BNFC/distinfo | 3 - devel/hs-BNFC/pkg-descr | 11 - devel/hs-Boolean/Makefile | 2 +- devel/hs-BoundedChan/Makefile | 2 +- devel/hs-ConfigFile/Makefile | 4 +- devel/hs-DrIFT/distinfo | 3 - devel/hs-DrIFT/files/patch-src_ParseLib2.hs | 25 - devel/hs-DrIFT/pkg-descr | 13 - devel/hs-EdisonAPI/Makefile | 2 +- devel/hs-EdisonCore/Makefile | 7 +- devel/hs-EdisonCore/distinfo | 6 +- devel/hs-Glob/Makefile | 2 +- devel/hs-HUnit/Makefile | 2 +- devel/hs-IfElse/Makefile | 2 +- devel/hs-List/Makefile | 3 +- devel/hs-List/distinfo | 6 +- devel/hs-ListLike/Makefile | 5 +- devel/hs-ListLike/distinfo | 6 +- devel/hs-MemoTrie/Makefile | 3 +- devel/hs-MemoTrie/distinfo | 6 +- devel/hs-MissingH/Makefile | 4 +- devel/hs-MonadRandom/Makefile | 2 +- devel/hs-ObjectName/Makefile | 2 +- devel/hs-Only/Makefile | 2 +- devel/hs-PSQueue/Makefile | 2 + devel/hs-PSQueue/files/patch-Data_PSQueue.hs | 11 + devel/hs-QuickCheck/Makefile | 2 +- devel/hs-ReadArgs/Makefile | 4 +- devel/hs-STMonadTrans/Makefile | 2 +- devel/hs-SafeSemaphore/Makefile | 4 +- devel/hs-ShellCheck/Makefile | 4 +- devel/hs-StateVar/Makefile | 4 +- devel/hs-Stream/Makefile | 2 +- devel/hs-TypeCompose/Makefile | 2 + devel/hs-abstract-deque/Makefile | 2 +- devel/hs-abstract-par/Makefile | 2 +- devel/hs-activehs-base/Makefile | 2 +- .../files/patch-activehs-base.cabal | 3 +- devel/hs-alex/Makefile | 2 +- devel/hs-ansi-terminal/Makefile | 5 +- devel/hs-ansi-terminal/distinfo | 6 +- devel/hs-ansi-wl-pprint/Makefile | 5 +- devel/hs-ansi-wl-pprint/distinfo | 6 +- devel/hs-arrows/Makefile | 3 +- devel/hs-arrows/distinfo | 6 +- devel/hs-asn1-data/Makefile | 4 +- devel/hs-asn1-encoding/Makefile | 2 +- devel/hs-asn1-parse/Makefile | 2 +- devel/hs-asn1-types/Makefile | 2 +- devel/hs-async/Makefile | 4 +- devel/hs-async/distinfo | 6 +- devel/hs-atomic-primops/Makefile | 3 +- devel/hs-atomic-primops/distinfo | 6 +- devel/hs-auto-update/Makefile | 2 +- devel/hs-base-compat-batteries/Makefile | 15 + devel/hs-base-compat-batteries/distinfo | 3 + devel/hs-base-compat-batteries/pkg-descr | 11 + devel/hs-base-compat/Makefile | 3 +- devel/hs-base-compat/distinfo | 6 +- devel/hs-base-orphans/Makefile | 2 +- devel/hs-base-unicode-symbols/Makefile | 2 +- devel/hs-base16-bytestring/Makefile | 2 +- devel/hs-base64-bytestring/Makefile | 2 +- devel/{hs-text => hs-basement}/Makefile | 7 +- devel/hs-basement/distinfo | 3 + devel/hs-basement/pkg-descr | 12 + devel/hs-basic-prelude/Makefile | 7 +- devel/hs-basic-prelude/distinfo | 6 +- devel/hs-bifunctors/Makefile | 6 +- devel/hs-bifunctors/distinfo | 6 +- .../files/patch-bifunctors.cabal | 11 + devel/hs-bits-atomic/Makefile | 2 +- devel/hs-blaze-builder-enumerator/Makefile | 2 +- devel/hs-blaze-builder/Makefile | 5 +- devel/hs-blaze-builder/distinfo | 6 +- devel/hs-blaze-textual/Makefile | 4 +- devel/hs-bloomfilter/Makefile | 2 +- devel/hs-boxes/Makefile | 3 +- devel/hs-boxes/distinfo | 6 +- devel/hs-bsd-sysctl/Makefile | 2 +- devel/hs-byteable/Makefile | 2 +- devel/hs-byteorder/Makefile | 2 +- devel/hs-bytestring-lexing/Makefile | 2 +- devel/hs-bytestring-mmap/Makefile | 2 +- devel/hs-bytestring-nums/Makefile | 2 +- devel/hs-bytestring-show/Makefile | 2 +- devel/hs-c2hs/Makefile | 4 +- devel/hs-cabal-install/Makefile | 9 +- devel/hs-cabal-install/distinfo | 6 +- devel/hs-call-stack/Makefile | 2 +- devel/hs-cereal/Makefile | 3 +- devel/hs-cereal/distinfo | 6 +- devel/hs-checkers/Makefile | 2 +- devel/hs-chunked-data/Makefile | 6 +- devel/hs-chunked-data/distinfo | 6 +- devel/hs-classy-prelude-conduit/Makefile | 3 +- devel/hs-classy-prelude-conduit/distinfo | 6 +- devel/hs-classy-prelude/Makefile | 5 +- devel/hs-classy-prelude/distinfo | 6 +- devel/hs-clock/Makefile | 2 +- devel/hs-cmdargs/Makefile | 3 +- devel/hs-cmdargs/distinfo | 6 +- devel/hs-code-page/Makefile | 2 +- devel/hs-colour/Makefile | 3 +- devel/hs-colour/distinfo | 6 +- devel/hs-concurrent-output/Makefile | 4 +- devel/hs-concurrent-output/distinfo | 6 +- .../files/patch-concurrent-output.cabal | 11 - devel/hs-conduit-combinators/Makefile | 5 +- devel/hs-conduit-combinators/distinfo | 6 +- devel/hs-conduit-extra/Makefile | 4 +- devel/hs-conduit-extra/distinfo | 6 +- devel/hs-conduit/Makefile | 7 +- devel/hs-conduit/distinfo | 6 +- devel/hs-configurator/Makefile | 5 +- devel/hs-constraints/Makefile | 5 +- devel/hs-constraints/distinfo | 6 +- devel/hs-convertible/Makefile | 4 +- devel/hs-cpphs/Makefile | 2 +- devel/hs-darcs/Makefile | 9 +- devel/hs-darcs/distinfo | 6 +- devel/hs-darcs/files/patch-darcs.cabal | 11 - devel/hs-data-default-class/Makefile | 2 +- devel/hs-data-default-instances-base/Makefile | 2 +- .../Makefile | 2 +- .../hs-data-default-instances-dlist/Makefile | 2 +- .../Makefile | 2 +- devel/hs-data-default/Makefile | 2 +- devel/hs-data-endian/Makefile | 2 +- devel/hs-data-hash/Makefile | 2 +- devel/hs-data-ordlist/Makefile | 2 +- .../hs-data-pprint/files/patch-Data_PPrint.hs | 9 + .../files/patch-data-pprint.cabal | 12 +- devel/hs-date-cache/Makefile | 2 +- devel/hs-datetime/Makefile | 2 +- devel/hs-dbus/Makefile | 6 +- devel/hs-dbus/distinfo | 6 +- devel/hs-deepseq-generics/Makefile | 14 +- .../files/patch-deepseq-generics.cabal | 10 + devel/hs-directory-tree/Makefile | 2 +- devel/hs-dlist-instances/Makefile | 2 +- devel/hs-dlist/Makefile | 2 +- devel/hs-easy-file/Makefile | 2 +- devel/hs-echo/Makefile | 13 + devel/hs-echo/distinfo | 3 + devel/hs-echo/files/patch-echo.cabal | 11 + devel/hs-echo/pkg-descr | 6 + devel/hs-edit-distance/Makefile | 2 +- devel/hs-either/Makefile | 3 +- devel/hs-either/distinfo | 6 +- devel/hs-either/files/patch-either.cabal | 14 - devel/hs-enclosed-exceptions/Makefile | 2 +- devel/hs-enumerator/Makefile | 4 +- devel/hs-equivalence/Makefile | 2 +- devel/hs-errors/Makefile | 5 +- devel/hs-errors/distinfo | 6 +- devel/hs-exceptions/Makefile | 4 +- devel/hs-exceptions/distinfo | 6 +- devel/hs-extensible-exceptions/Makefile | 2 +- devel/hs-extra/Makefile | 3 +- devel/hs-extra/distinfo | 6 +- devel/hs-fast-logger/Makefile | 5 +- devel/hs-fast-logger/distinfo | 6 +- devel/hs-fgl/Makefile | 2 +- devel/hs-file-embed/Makefile | 2 +- devel/hs-filemanip/Makefile | 2 +- devel/hs-filestore/Makefile | 6 +- devel/hs-filestore/distinfo | 6 +- devel/hs-fmlist/Makefile | 3 +- devel/hs-fmlist/distinfo | 6 +- devel/hs-foundation/Makefile | 5 +- devel/hs-foundation/distinfo | 6 +- devel/hs-free/Makefile | 5 +- devel/hs-free/distinfo | 6 +- devel/hs-free/files/patch-free.cabal | 11 + devel/hs-fsnotify/Makefile | 5 +- devel/hs-fsnotify/distinfo | 6 +- devel/hs-gconf/Makefile | 4 +- devel/hs-generic-deriving/Makefile | 3 +- devel/hs-generic-deriving/distinfo | 6 +- .../files/patch-generic-deriving.cabal | 11 + devel/hs-geniplate-mirror/Makefile | 3 +- devel/hs-geniplate-mirror/distinfo | 6 +- devel/hs-ghc-events/Makefile | 5 +- devel/hs-ghc-events/distinfo | 6 +- devel/hs-ghc-mtl/Makefile | 2 +- devel/hs-ghc-paths/Makefile | 2 +- devel/hs-gio/Makefile | 2 +- devel/hs-git-annex/Makefile | 2 +- devel/hs-gitrev/Makefile | 2 +- devel/hs-glib/Makefile | 5 +- devel/hs-glib/distinfo | 6 +- devel/hs-gtk2hs-buildtools/Makefile | 3 +- devel/hs-gtk2hs-buildtools/distinfo | 6 +- .../files/patch-c2hs_c_CPretty.hs | 10 + .../files/patch-gtk2hs-buildtools.cabal | 11 + devel/hs-haddock-api/Makefile | 3 +- devel/hs-haddock-api/distinfo | 6 +- devel/hs-haddock-library/Makefile | 5 +- devel/hs-haddock-library/distinfo | 6 +- .../files/patch-haddock-library.cabal | 45 ++ devel/hs-haddock/Makefile | 3 +- devel/hs-haddock/distinfo | 6 +- devel/hs-happy/Makefile | 2 +- devel/hs-hashable/Makefile | 5 +- devel/hs-hashable/distinfo | 6 +- devel/hs-hashed-storage/Makefile | 2 +- devel/hs-hashtables/Makefile | 3 +- devel/hs-hashtables/distinfo | 6 +- devel/hs-haskell-lexer/Makefile | 2 +- devel/hs-haskell-src-exts/Makefile | 3 +- devel/hs-haskell-src-exts/distinfo | 6 +- .../Makefile | 11 +- devel/hs-haskell-src-meta/distinfo | 3 + .../files/patch-haskell-src-meta.cabal | 16 + devel/hs-haskell-src-meta/pkg-descr | 4 + devel/hs-haskell-src/Makefile | 3 +- devel/hs-haskell-src/distinfo | 6 +- devel/hs-hasktags/Makefile | 2 +- devel/hs-hastache/Makefile | 20 - devel/hs-hastache/distinfo | 3 - devel/hs-hastache/files/patch-hastache.cabal | 29 - devel/hs-hastache/pkg-descr | 5 - devel/hs-hex/Makefile | 2 +- devel/hs-hinotify/Makefile | 4 +- devel/hs-hinotify/distinfo | 6 +- devel/hs-hint/Makefile | 2 + devel/hs-hlibev/Makefile | 2 +- devel/hs-hlint/Makefile | 2 + devel/hs-hoogle/Makefile | 7 +- devel/hs-hoogle/distinfo | 6 +- devel/hs-hourglass/Makefile | 3 +- devel/hs-hourglass/distinfo | 6 +- devel/hs-hsb2hs/Makefile | 2 +- devel/hs-hslogger/Makefile | 2 +- .../Makefile | 11 +- devel/hs-hslua-module-text/distinfo | 3 + .../files/patch-hslua-module-text.cabal | 18 + devel/hs-hslua-module-text/pkg-descr | 3 + devel/hs-hslua/Makefile | 5 +- devel/hs-hslua/distinfo | 6 +- devel/hs-hslua/files/patch-hslua.cabal | 12 + devel/hs-hspec-core/Makefile | 5 +- devel/hs-hspec-core/distinfo | 6 +- devel/hs-hspec-discover/Makefile | 3 +- devel/hs-hspec-discover/distinfo | 6 +- devel/hs-hspec-expectations/Makefile | 2 +- devel/hs-hspec/Makefile | 3 +- devel/hs-hspec/distinfo | 6 +- devel/hs-io-streams-haproxy/Makefile | 3 +- devel/hs-io-streams-haproxy/distinfo | 6 +- .../files/patch-io-streams-haproxy.cabal | 16 +- devel/hs-io-streams/Makefile | 5 +- devel/hs-io-streams/distinfo | 6 +- .../files/patch-io-streams.cabal | 10 +- devel/hs-js-flot/Makefile | 2 +- devel/hs-js-jquery/Makefile | 2 +- devel/hs-keys/Makefile | 3 +- devel/hs-keys/distinfo | 6 +- devel/hs-kqueue/files/patch-kqueue.cabal | 16 + devel/hs-language-c/Makefile | 3 +- devel/hs-language-c/distinfo | 6 +- devel/hs-language-javascript/Makefile | 3 +- devel/hs-language-javascript/distinfo | 6 +- devel/hs-largeword/Makefile | 2 +- devel/hs-lazysmallcheck/Makefile | 2 +- devel/hs-lens/Makefile | 7 +- devel/hs-lens/distinfo | 6 +- devel/hs-lifted-async/Makefile | 3 +- devel/hs-lifted-async/distinfo | 6 +- devel/hs-lifted-base/Makefile | 2 +- devel/hs-logict/Makefile | 2 +- devel/hs-map-syntax/Makefile | 3 +- devel/hs-map-syntax/distinfo | 6 +- devel/hs-memory/Makefile | 5 +- devel/hs-memory/distinfo | 6 +- devel/hs-microlens-th/Makefile | 5 +- devel/hs-microlens-th/distinfo | 6 +- devel/hs-microlens/Makefile | 3 +- devel/hs-microlens/distinfo | 6 +- devel/hs-microstache/Makefile | 5 +- devel/hs-microstache/distinfo | 6 +- .../files/patch-microstache.cabal | 11 + devel/hs-mmap/Makefile | 2 +- devel/hs-mmorph/Makefile | 2 +- devel/hs-monad-control/Makefile | 2 +- devel/hs-monad-logger/Makefile | 4 +- devel/hs-monad-logger/distinfo | 6 +- devel/hs-monad-loops/Makefile | 2 +- devel/hs-monad-par-extras/Makefile | 2 +- devel/hs-monad-par/Makefile | 2 +- devel/hs-monad-unlift/Makefile | 2 +- devel/hs-monadplus/distinfo | 3 - devel/hs-monadplus/pkg-descr | 5 - devel/hs-monads-tf/Makefile | 2 +- devel/hs-mono-traversable-instances/Makefile | 2 +- devel/hs-mono-traversable/Makefile | 5 +- devel/hs-mono-traversable/distinfo | 6 +- devel/hs-mtl/Makefile | 2 +- devel/hs-mueval/Makefile | 2 +- devel/hs-murmur-hash/Makefile | 2 +- devel/hs-mutable-containers/Makefile | 2 +- devel/hs-ncurses/Makefile | 3 +- devel/hs-newtype-generics/Makefile | 3 +- devel/hs-newtype-generics/distinfo | 6 +- devel/hs-newtype/Makefile | 2 +- devel/hs-old-locale/Makefile | 2 +- devel/hs-old-locale/files/patch-git_15fea2d | 2 +- devel/hs-old-time/Makefile | 2 +- devel/hs-old-time/files/patch-git_82790af | 2 +- devel/hs-optparse-applicative/Makefile | 2 +- devel/hs-parallel/files/patch-parallel.cabal | 10 + devel/hs-pcre-light/Makefile | 2 +- devel/hs-prelude-extras/Makefile | 2 +- devel/hs-preprocessor-tools/Makefile | 4 +- devel/hs-prettyclass/Makefile | 2 +- devel/hs-primitive/Makefile | 3 +- devel/hs-primitive/distinfo | 6 +- devel/hs-process-extras/Makefile | 5 +- devel/hs-process-extras/distinfo | 6 +- devel/hs-profunctors/Makefile | 3 +- devel/hs-profunctors/distinfo | 6 +- devel/hs-profunctors/files/patch-git_c0574c | 22 - devel/hs-project-template/Makefile | 5 +- devel/hs-project-template/distinfo | 6 +- devel/hs-psqueues/Makefile | 3 +- devel/hs-psqueues/distinfo | 6 +- devel/hs-quickcheck-io/Makefile | 2 +- devel/hs-random/Makefile | 2 +- devel/hs-readable/Makefile | 4 +- devel/hs-readline/Makefile | 2 +- devel/hs-refact/Makefile | 2 +- devel/hs-reflection/Makefile | 3 +- devel/hs-reflection/distinfo | 6 +- devel/hs-resource-pool/Makefile | 6 +- devel/hs-resourcet/Makefile | 6 +- devel/hs-resourcet/distinfo | 6 +- devel/hs-safe-exceptions/Makefile | 3 +- devel/hs-safe-exceptions/distinfo | 6 +- .../files/patch-safe-exceptions.cabal | 13 + devel/hs-safe/Makefile | 2 +- devel/hs-say/Makefile | 4 +- devel/hs-scientific/Makefile | 5 +- devel/hs-scientific/distinfo | 6 +- devel/hs-securemem/Makefile | 5 +- devel/hs-securemem/distinfo | 6 +- devel/hs-setenv/Makefile | 2 +- devel/hs-setlocale/Makefile | 3 +- devel/hs-setlocale/distinfo | 6 +- devel/hs-shake/Makefile | 5 +- devel/hs-shake/distinfo | 6 +- devel/hs-show/Makefile | 2 +- devel/hs-silently/Makefile | 2 +- devel/hs-simple-reflect/Makefile | 3 +- devel/hs-simple-reflect/distinfo | 6 +- devel/hs-smallcheck/Makefile | 2 +- devel/hs-split/Makefile | 3 +- devel/hs-split/distinfo | 6 +- devel/hs-stm-chans/Makefile | 4 +- devel/hs-stm/distinfo | 3 - devel/hs-stm/pkg-descr | 3 - devel/hs-storable-record/Makefile | 15 + devel/hs-storable-record/distinfo | 3 + devel/hs-storable-record/pkg-descr | 6 + devel/hs-storable-tuple/Makefile | 15 + devel/hs-storable-tuple/distinfo | 3 + devel/hs-storable-tuple/pkg-descr | 6 + devel/hs-streaming-commons/Makefile | 4 +- devel/hs-streaming-commons/distinfo | 6 +- devel/hs-strict/Makefile | 2 +- devel/hs-syb-with-class/Makefile | 3 +- devel/hs-syb-with-class/distinfo | 6 +- devel/hs-syb/Makefile | 2 +- devel/hs-system-fileio/Makefile | 4 +- devel/hs-system-filepath/Makefile | 5 +- devel/hs-system-filepath/distinfo | 6 +- devel/hs-tagged/Makefile | 2 +- devel/hs-tagged/files/patch-tagged.cabal | 2 +- devel/hs-temporary/Makefile | 2 +- devel/hs-terminal-size/Makefile | 2 +- devel/hs-test-framework-hunit/Makefile | 2 +- devel/hs-test-framework-quickcheck2/Makefile | 2 +- devel/hs-test-framework/Makefile | 3 +- devel/hs-test-framework/distinfo | 6 +- .../files/patch-test-framework.cabal | 11 - devel/hs-text-icu/Makefile | 4 +- devel/hs-text-short/Makefile | 5 +- devel/hs-text-short/distinfo | 6 +- devel/hs-text/distinfo | 3 - devel/hs-text/pkg-descr | 16 - devel/hs-tf-random/Makefile | 2 +- devel/hs-th-abstraction/Makefile | 3 +- devel/hs-th-abstraction/distinfo | 6 +- .../files/patch-th-abstraction.cabal | 11 + devel/hs-th-expand-syns/Makefile | 15 + devel/hs-th-expand-syns/distinfo | 3 + devel/hs-th-expand-syns/pkg-descr | 3 + devel/hs-th-lift-instances/Makefile | 4 +- devel/hs-th-lift/Makefile | 3 +- devel/hs-th-lift/distinfo | 6 +- devel/hs-th-orphans/Makefile | 15 + devel/hs-th-orphans/distinfo | 3 + devel/hs-th-orphans/pkg-descr | 5 + devel/hs-th-reify-many/Makefile | 15 + devel/hs-th-reify-many/distinfo | 3 + devel/hs-th-reify-many/pkg-descr | 6 + devel/hs-threads/Makefile | 4 +- devel/hs-threads/distinfo | 6 +- devel/hs-threadscope/Makefile | 6 +- devel/hs-time-compat/Makefile | 2 +- devel/hs-time-locale-compat/Makefile | 2 +- devel/hs-timezone-olson/Makefile | 3 +- devel/hs-timezone-olson/distinfo | 6 +- devel/hs-timezone-series/Makefile | 2 +- devel/hs-transformers-base/Makefile | 4 +- devel/hs-transformers-compat/Makefile | 2 +- devel/hs-typed-process/Makefile | 4 +- devel/hs-typed-process/distinfo | 6 +- devel/hs-unamb/Makefile | 2 +- devel/hs-unexceptionalio/Makefile | 2 +- devel/{hs-stm => hs-unicode-show}/Makefile | 7 +- devel/hs-unicode-show/distinfo | 3 + devel/hs-unicode-show/pkg-descr | 4 + devel/hs-uniplate/Makefile | 2 +- devel/hs-unix-compat/Makefile | 2 +- devel/hs-unix-time/Makefile | 3 +- devel/hs-unix-time/distinfo | 6 +- devel/hs-unliftio-core/Makefile | 13 + devel/hs-unliftio-core/distinfo | 3 + .../files/patch-unliftio-core.cabal | 11 + devel/hs-unliftio-core/pkg-descr | 4 + devel/hs-unliftio/Makefile | 15 + devel/hs-unliftio/distinfo | 3 + devel/hs-unliftio/pkg-descr | 4 + devel/hs-unordered-containers/Makefile | 3 +- devel/hs-unordered-containers/distinfo | 6 +- devel/hs-utf8-light/Makefile | 2 +- devel/hs-utf8-string/Makefile | 2 +- devel/hs-utility-ht/Makefile | 2 +- devel/hs-uuagc-bootstrap/Makefile | 2 +- devel/hs-uuagc-cabal/Makefile | 3 +- devel/hs-uuagc-cabal/distinfo | 6 +- devel/hs-uuagc/Makefile | 2 +- devel/hs-uuid-types/Makefile | 4 +- devel/hs-uuid/Makefile | 4 +- devel/hs-uuid/files/patch-uuid.cabal | 10 + devel/hs-uulib/Makefile | 3 +- devel/hs-uulib/distinfo | 6 +- devel/hs-uulib/files/patch-src_UU_PPrint.hs | 11 + devel/hs-vault/Makefile | 5 +- devel/hs-vault/distinfo | 6 +- devel/hs-vector-algorithms/Makefile | 2 +- devel/hs-vector-binary-instances/Makefile | 5 +- devel/hs-vector-binary-instances/distinfo | 6 +- .../files/patch-vector-binary-instances.cabal | 10 + devel/hs-vector-instances/Makefile | 2 +- devel/hs-vector-th-unbox/Makefile | 2 +- devel/hs-vector/files/patch-vector.cabal | 11 + devel/hs-void/Makefile | 2 +- devel/hs-wl-pprint-text/Makefile | 5 +- devel/hs-wl-pprint-text/distinfo | 6 +- devel/hs-word8/Makefile | 2 +- devel/jenkins/Makefile | 2 +- devel/jenkins/distinfo | 6 +- devel/libappindicator/Makefile | 2 +- devel/p5-Class-Generate/Makefile | 3 +- devel/p5-Class-Generate/distinfo | 5 +- devel/p5-Class-Generate/pkg-plist | 1 - devel/p5-Config-INI-Simple/Makefile | 7 +- devel/p5-Config-INI-Simple/distinfo | 5 +- devel/p5-Config-INI-Simple/pkg-descr | 2 +- devel/p5-Data-Types/Makefile | 3 +- devel/p5-Data-Types/distinfo | 6 +- devel/p5-Data-Types/pkg-plist | 2 +- devel/p5-IO-KQueue/Makefile | 7 +- devel/p5-System-Info/Makefile | 2 +- devel/p5-System-Info/distinfo | 6 +- devel/py-noseofyeti/Makefile | 2 +- devel/py-twilio/Makefile | 2 +- devel/py-twilio/distinfo | 6 +- devel/pycharm-ce/Makefile | 2 +- devel/pycharm-ce/distinfo | 6 +- devel/pycharm-ce/pkg-plist | 16 +- devel/qgit/Makefile | 2 +- devel/qgit/distinfo | 6 +- devel/qgit/files/patch-src_config.h | 12 + devel/rubygem-authlogic/Makefile | 2 +- devel/rubygem-authlogic/distinfo | 6 +- devel/rubygem-aws-sdk-core/Makefile | 2 +- devel/rubygem-aws-sdk-core/distinfo | 6 +- devel/rubygem-aws-sdk-resources/Makefile | 2 +- devel/rubygem-aws-sdk-resources/distinfo | 6 +- devel/rubygem-aws-sdk/Makefile | 2 +- devel/rubygem-aws-sdk/distinfo | 6 +- devel/rubygem-docile/Makefile | 2 +- devel/rubygem-docile/distinfo | 6 +- devel/rubygem-et-orbi/Makefile | 2 +- devel/rubygem-et-orbi/distinfo | 6 +- devel/rubygem-statsd-instrument/Makefile | 2 +- devel/rubygem-statsd-instrument/distinfo | 6 +- devel/stack/Makefile | 15 +- devel/stack/distinfo | 10 +- devel/umem/Makefile | 7 +- dns/Makefile | 1 + dns/bind9-devel/Makefile | 2 +- dns/bind9-devel/files/pkg-message.in | 2 +- dns/bind910/Makefile | 2 +- dns/bind912/Makefile | 2 +- dns/bind913/Makefile | 283 +++++++++ dns/bind913/distinfo | 3 + dns/bind913/files/BIND.chroot.dist | 24 + dns/bind913/files/BIND.chroot.local.dist | 20 + dns/bind913/files/empty.db | 11 + .../files/extrapatch-bind-min-override-ttl | 79 +++ dns/bind913/files/localhost-forward.db | 11 + dns/bind913/files/localhost-reverse.db | 13 + dns/bind913/files/named.conf.in | 380 +++++++++++ dns/bind913/files/named.in | 435 +++++++++++++ dns/bind913/files/named.root | 96 +++ .../patch-bin_named_include_named_globals.h | 13 + ...h-bin_tests_system_dlzexternal_Makefile.in | 11 + dns/bind913/files/patch-configure | 90 +++ .../patch-lib_isc_include_isc_Makefile.in | 11 + dns/bind913/files/pkg-message.in | 28 + dns/bind913/pkg-descr | 15 + dns/bind913/pkg-help | 38 ++ dns/bind913/pkg-plist | 356 +++++++++++ dns/bind99/Makefile | 2 +- dns/dnsproxy/pkg-descr | 2 +- dns/hs-dns/Makefile | 8 +- dns/hs-dns/distinfo | 6 +- dns/hs-dns/files/patch-dns.cabal | 34 - dns/hs-gnuidn/Makefile | 3 +- editors/Makefile | 8 +- editors/coedit/Makefile | 65 +- editors/coedit/distinfo | 6 +- editors/coedit/files/patch-dastworx_build.sh | 24 +- editors/gomate/Makefile | 20 + editors/gomate/distinfo | 3 + editors/gomate/pkg-descr | 5 + editors/gomate/pkg-message | 5 + editors/lazarus-lcl-gtk2/Makefile | 18 - editors/lazarus-lcl-nogui/Makefile | 18 - editors/lazarus-lcl-qt/Makefile | 17 - .../files/patch-interfaces_qt_qt45.pas | 11 - editors/lazarus-lcl-qt5/Makefile | 17 - .../files/patch-interfaces_qt_qt45.pas | 11 - editors/lazarus-lcl-units/Makefile | 17 - editors/lazarus-qt4/Makefile | 15 + editors/lazarus-qt5/Makefile | 16 + editors/lazarus/Makefile | 80 +-- editors/lazarus/Makefile.common | 104 --- editors/lazarus/distinfo | 6 +- editors/lazarus/files/patch-Makefile | 15 +- .../files/patch-components-synedit_synedit.pp | 20 - editors/lazarus/files/pkg-message.in | 9 +- emulators/citra/Makefile | 6 +- emulators/citra/distinfo | 10 +- emulators/ppsspp-qt5/Makefile | 2 +- emulators/ppsspp/Makefile | 22 +- emulators/ppsspp/distinfo | 12 +- emulators/ppsspp/files/extra-patch-old-joy | 11 - emulators/rpcs3/Makefile | 8 +- emulators/rpcs3/distinfo | 8 +- emulators/wine-devel/Makefile | 4 +- emulators/wine-devel/distinfo | 10 +- emulators/wine-devel/pkg-plist | 14 +- emulators/wxmupen64plus/Makefile | 2 +- french/wordpress/Makefile | 2 +- french/wordpress/distinfo | 6 +- ftp/hs-curl/Makefile | 2 +- games/bsdgames/Makefile | 2 +- games/hs-scroll/Makefile | 5 +- games/hs-scroll/distinfo | 6 +- games/nethack34/Makefile | 2 +- games/tome4/Makefile | 2 +- games/tome4/distinfo | 6 +- games/vegastrike/Makefile | 2 +- games/wtf/Makefile | 2 +- games/wtf/distinfo | 6 +- german/wordpress/Makefile | 2 +- german/wordpress/distinfo | 6 +- graphics/Makefile | 1 - graphics/alembic/Makefile | 2 +- graphics/alembic/distinfo | 6 +- graphics/bmeps/Makefile | 2 +- graphics/bmeps/distinfo | 6 +- graphics/hs-HGL/Makefile | 17 - graphics/hs-HGL/distinfo | 2 - .../patch-Graphics_HGL_Internals_Draw.hs | 22 - graphics/hs-HGL/pkg-descr | 8 - graphics/hs-JuicyPixels/Makefile | 3 +- graphics/hs-JuicyPixels/distinfo | 6 +- graphics/hs-cairo/Makefile | 5 +- graphics/hs-cairo/distinfo | 6 +- graphics/hs-dia-base/Makefile | 2 +- .../hs-dia-base/files/patch-dia-base.cabal | 10 + graphics/hs-dia-functions/Makefile | 2 +- graphics/hs-graphviz/Makefile | 4 +- graphics/hs-svgcairo/Makefile | 4 +- graphics/maim/Makefile | 20 +- graphics/maim/distinfo | 5 +- graphics/py-mayavi/Makefile | 12 +- graphics/py-sorl-thumbnail/Makefile | 48 +- graphics/py-sorl-thumbnail/distinfo | 5 +- .../files/patch-docs_conf.py | 17 + graphics/py-sorl-thumbnail/pkg-descr | 18 +- graphics/seexpr/Makefile | 3 +- japanese/wordpress/Makefile | 2 +- japanese/wordpress/distinfo | 6 +- java/intellij-rubymine/pkg-plist | 4 +- java/intellij/Makefile | 4 +- java/intellij/distinfo | 6 +- java/intellij/pkg-plist | 11 +- java/linux-oracle-jdk18/Makefile | 2 +- java/linux-oracle-jdk18/distinfo | 18 +- java/linux-oracle-jdk18/pkg-plist | 333 +++++----- java/linux-oracle-jre18/Makefile | 2 +- java/linux-oracle-jre18/distinfo | 10 +- lang/ghc/Makefile | 57 +- lang/ghc/bsd.cabal.options.mk | 4 +- lang/ghc/bsd.hackage.mk | 27 +- lang/ghc/distinfo | 18 +- .../ghc/files/patch-compiler_main_SysTools.hs | 12 - lang/ghc/files/patch-configure.ac | 22 +- lang/ghc/files/patch-ghc.mk | 10 +- ...patch-includes_rts_storage_ClosureMacros.h | 22 - ...ies_Cabal_Cabal_Distribution_Simple_GHC.hs | 11 - ..._Distribution__Simple__Program__Builtin.hs | 12 +- lang/ghc/files/patch-rts_Linker.c | 11 - lang/hs-brainfuck/Makefile | 2 +- lang/hs-unlambda/Makefile | 2 +- mail/hs-email-validate/Makefile | 3 +- mail/hs-email-validate/distinfo | 6 +- mail/hs-mime-mail/Makefile | 6 +- mail/hs-mime-mail/distinfo | 6 +- mail/hs-mime-types/Makefile | 4 +- mail/hs-mime/Makefile | 4 +- mail/p5-Sisimai/Makefile | 9 +- mail/p5-Sisimai/distinfo | 6 +- mail/p5-Sisimai/pkg-plist | 2 + mail/py-dkimpy/Makefile | 3 +- mail/py-dkimpy/distinfo | 6 +- mail/py-dkimpy/files/patch-setup.py | 10 +- math/hs-Agda-stdlib/Makefile | 2 +- math/hs-Agda/Makefile | 6 +- math/hs-NumInstances/Makefile | 2 +- math/hs-adjunctions/Makefile | 3 +- math/hs-adjunctions/distinfo | 6 +- math/hs-categories/Makefile | 2 +- math/hs-comonad/Makefile | 3 +- math/hs-comonad/distinfo | 6 +- math/hs-contravariant/Makefile | 2 +- .../files/patch-data-lens-template.cabal | 11 + math/hs-data-lens/Makefile | 2 +- math/hs-distributive/Makefile | 3 +- math/hs-distributive/distinfo | 6 +- math/hs-erf/Makefile | 2 +- math/hs-fixed/Makefile | 2 +- math/hs-half/Makefile | 2 +- math/hs-ieee754/Makefile | 2 +- math/hs-integer-logarithms/Makefile | 3 +- math/hs-integer-logarithms/distinfo | 6 +- math/hs-kan-extensions/Makefile | 3 +- math/hs-kan-extensions/distinfo | 6 +- .../files/patch-kan-extensions.cabal | 8 +- math/hs-math-functions/Makefile | 2 +- math/hs-mwc-random/Makefile | 2 +- math/hs-pointed/Makefile | 7 +- math/hs-probability/Makefile | 2 +- math/hs-semigroupoids/Makefile | 3 +- math/hs-semigroupoids/distinfo | 6 +- math/hs-semigroups/Makefile | 5 +- math/hs-semigroups/distinfo | 6 +- math/hs-statistics/Makefile | 2 +- math/hs-vector-space/Makefile | 3 +- math/hs-vector-space/distinfo | 6 +- misc/freebsd-release-manifests/Makefile | 2 +- .../files/MANIFESTS/amd64-amd64-11.2-BETA3 | 10 + .../files/MANIFESTS/arm64-aarch64-11.2-BETA3 | 8 + .../files/MANIFESTS/i386-i386-11.2-BETA3 | 8 + .../MANIFESTS/powerpc-powerpc-11.2-BETA3 | 8 + .../MANIFESTS/powerpc-powerpc64-11.2-BETA3 | 10 + .../MANIFESTS/sparc64-sparc64-11.2-BETA3 | 8 + misc/freebsd-release-manifests/pkg-plist | 6 + misc/py-tqdm/Makefile | 2 +- misc/py-tqdm/distinfo | 6 +- multimedia/plexmediaserver-plexpass/Makefile | 4 +- multimedia/plexmediaserver-plexpass/distinfo | 6 +- multimedia/vdr-plugin-eepg/Makefile | 1 + multimedia/vdr-plugin-epgsearch/Makefile | 1 + multimedia/vdr-plugin-extrecmenu/Makefile | 1 + multimedia/vdr-plugin-osdpip/Makefile | 1 + multimedia/vdr-plugin-sleeptimer/Makefile | 2 + multimedia/vdr-plugin-ttxtsubs/Makefile | 1 + multimedia/vdr-plugin-vdrmanager/Makefile | 1 + multimedia/vdr-plugin-vnsiserver/Makefile | 1 + multimedia/vdr-plugin-xineliboutput/Makefile | 1 + multimedia/winff/Makefile | 51 +- multimedia/winff/files/patch-winff_unit1.pas | 19 +- net-im/hs-haskell-xmpp/Makefile | 4 +- net-im/py-matrix-synapse/Makefile | 4 +- net-im/py-matrix-synapse/distinfo | 6 +- net-mgmt/Makefile | 1 + net-mgmt/netbox/Makefile | 70 ++ net-mgmt/netbox/distinfo | 3 + net-mgmt/netbox/files/pkg-message.in | 112 ++++ net-mgmt/netbox/pkg-descr | 15 + net-mgmt/netbox/pkg-plist | 598 ++++++++++++++++++ net-mgmt/resource-agents/pkg-plist | 4 +- net-p2p/hs-torrent/Makefile | 2 +- net-p2p/transmission-remote-gui/Makefile | 65 +- net-p2p/transmission-remote-gui/distinfo | 5 +- net-p2p/transmission-remote-gui/pkg-descr | 2 +- net/Makefile | 4 +- net/{bird-devel => bird2}/Makefile | 8 +- net/{bird-devel => bird2}/distinfo | 0 net/{bird-devel => bird2}/files/bird.in | 0 .../files/patch-Makefile.in | 0 .../files/patch-sysdep_bsd_setkey.h | 0 .../files/pkg-message.in | 0 net/{bird-devel => bird2}/pkg-descr | 0 net/{bird-devel => bird2}/pkg-plist | 0 net/bwi-firmware-kmod/Makefile | 3 + net/bwn-firmware-kmod/Makefile | 3 + net/dhcpd/Makefile | 5 + net/dhcpd/files/dhcpd.in | 5 +- net/hs-aws/Makefile | 7 +- net/hs-aws/distinfo | 6 +- net/hs-aws/files/patch-aws.cabal | 11 - net/hs-bsb-http-chunked/Makefile | 13 + net/hs-bsb-http-chunked/distinfo | 3 + .../files/patch-bsb-http-chunked.cabal | 9 + net/hs-bsb-http-chunked/pkg-descr | 4 + net/hs-connection/Makefile | 2 +- net/hs-gsasl/Makefile | 2 +- net/hs-hoauth2/Makefile | 7 +- net/hs-hoauth2/distinfo | 6 +- net/hs-hoauth2/files/patch-hoauth2.cabal | 97 +-- net/hs-hostname/Makefile | 2 +- net/hs-iproute/Makefile | 2 +- net/hs-maccatcher/Makefile | 4 +- net/hs-network-info/Makefile | 2 +- net/hs-network-multicast/Makefile | 2 +- net/hs-network-protocol-xmpp/Makefile | 4 +- net/hs-network-uri/Makefile | 4 +- net/hs-network/Makefile | 2 +- net/hs-pcap/Makefile | 2 +- net/hs-publicsuffixlist/Makefile | 4 +- net/hs-resolv/Makefile | 15 + net/hs-resolv/distinfo | 3 + net/hs-resolv/files/patch-resolv.cabal | 11 + net/hs-resolv/pkg-descr | 5 + net/hs-sendfile/Makefile | 2 +- net/hs-simple-sendfile/Makefile | 2 +- net/hs-socks/Makefile | 2 +- net/malo-firmware-kmod/Makefile | 3 + net/p5-POE-Component-PubSub/Makefile | 18 +- net/p5-POE-Component-PubSub/distinfo | 5 +- net/p5-POE-Component-PubSub/pkg-descr | 2 +- net/p5-POE-Component-PubSub/pkg-plist | 6 +- net/rubygem-connection_pool/Makefile | 2 +- net/rubygem-connection_pool/distinfo | 6 +- net/rubygem-omniauth-authentiq/Makefile | 5 +- net/rubygem-omniauth-authentiq/distinfo | 6 +- ports-mgmt/hs-porte/Makefile | 2 +- print/hs-hscolour/Makefile | 1 - print/hs-hscolour/distinfo | 6 +- print/scribus/Makefile | 3 +- print/scribus/distinfo | 5 +- print/scribus/files/patch-CMakeLists | 24 - .../patch-cmake_modules_FindHUNSPELL.cmake | 2 +- print/scribus/pkg-plist | 23 +- russian/emkatic/Makefile | 46 +- russian/emkatic/distinfo | 6 +- russian/wordpress/Makefile | 3 +- russian/wordpress/distinfo | 6 +- science/Makefile | 1 - science/hs-bio/Makefile | 19 - science/hs-bio/distinfo | 2 - .../files/patch-Bio_Alignment_Bowtie.hs | 7 - science/hs-bio/files/patch-bio.cabal | 11 - science/hs-bio/pkg-descr | 13 - security/Makefile | 1 + security/hs-Crypto/Makefile | 2 +- security/hs-DRBG/Makefile | 2 +- security/hs-HsOpenSSL/Makefile | 3 +- security/hs-HsOpenSSL/distinfo | 6 +- security/hs-RSA/Makefile | 2 +- security/hs-SHA/Makefile | 2 +- security/hs-certificate/Makefile | 2 + security/hs-cipher-aes/Makefile | 2 +- security/hs-cipher-aes128/Makefile | 2 +- security/hs-cipher-blowfish/Makefile | 2 +- security/hs-cipher-camellia/Makefile | 2 +- security/hs-cipher-des/Makefile | 2 +- security/hs-cipher-rc4/Makefile | 2 +- security/hs-clientsession/Makefile | 2 +- security/hs-cprng-aes/Makefile | 2 +- security/hs-crypto-api/Makefile | 2 +- security/hs-crypto-cipher-types/Makefile | 2 +- .../files/patch-crypto-conduit.cabal | 7 +- security/hs-crypto-numbers/Makefile | 2 +- security/hs-crypto-pubkey-types/Makefile | 2 +- security/hs-crypto-pubkey/Makefile | 2 +- security/hs-crypto-random-api/Makefile | 2 +- security/hs-crypto-random/Makefile | 2 +- security/hs-cryptocipher/Makefile | 2 +- security/hs-cryptohash-conduit/Makefile | 2 +- security/hs-cryptohash-cryptoapi/Makefile | 2 +- security/hs-cryptohash-md5/Makefile | 2 +- .../files/patch-cryptohash-md5.cabal | 11 + security/hs-cryptohash-sha1/Makefile | 14 +- .../files/patch-cryptohash-sha1.cabal | 11 + security/hs-cryptohash-sha256/Makefile | 13 +- security/hs-cryptohash-sha256/distinfo | 6 +- .../files/patch-cryptohash-sha256.cabal | 11 + security/hs-cryptohash/Makefile | 2 +- security/hs-cryptonite-conduit/Makefile | 15 + security/hs-cryptonite-conduit/distinfo | 3 + security/hs-cryptonite-conduit/pkg-descr | 5 + security/hs-cryptonite/Makefile | 2 +- security/hs-digest/Makefile | 2 +- security/hs-ed25519/Makefile | 2 +- security/hs-entropy/Makefile | 2 +- security/hs-gnutls/Makefile | 2 +- security/hs-hackage-security/Makefile | 5 +- security/hs-hackage-security/distinfo | 6 +- .../files/patch-hackage-security.cabal | 10 - security/hs-monadcryptorandom/Makefile | 3 +- security/hs-monadcryptorandom/distinfo | 6 +- security/hs-nonce/Makefile | 6 +- security/hs-nonce/distinfo | 6 +- security/hs-pem/Makefile | 2 +- security/hs-pureMD5/Makefile | 2 +- security/hs-pwstore-fast/Makefile | 2 +- security/hs-skein/Makefile | 2 +- security/hs-tls-session-manager/Makefile | 2 +- security/hs-tls/Makefile | 3 +- security/hs-tls/distinfo | 6 +- security/hs-x509-store/Makefile | 3 +- security/hs-x509-store/distinfo | 6 +- security/hs-x509-system/Makefile | 3 +- security/hs-x509-system/distinfo | 6 +- security/hs-x509-validation/Makefile | 3 +- security/hs-x509-validation/distinfo | 6 +- security/hs-x509/Makefile | 3 +- security/hs-x509/distinfo | 6 +- security/nss/Makefile | 2 +- security/nss/distinfo | 6 +- security/rubygem-webpush/Makefile | 2 +- security/rubygem-webpush/distinfo | 6 +- shells/hs-shelly/Makefile | 5 +- shells/hs-shelly/distinfo | 6 +- sysutils/debhelper/Makefile | 2 +- sysutils/debhelper/distinfo | 6 +- sysutils/hs-angel/Makefile | 4 +- sysutils/hs-cpu/Makefile | 2 +- sysutils/hs-disk-free-space/Makefile | 2 +- sysutils/hs-ekg-core/Makefile | 5 +- sysutils/hs-ekg-core/distinfo | 6 +- .../hs-ekg-core/files/patch-ekg-core.cabal | 11 + sysutils/hs-ekg-json/Makefile | 5 +- sysutils/hs-ekg-json/distinfo | 6 +- .../hs-ekg-json/files/patch-ekg-json.cabal | 13 + sysutils/hs-ekg/Makefile | 5 +- sysutils/hs-ekg/distinfo | 6 +- sysutils/hs-ekg/files/patch-ekg.cabal | 11 + sysutils/hs-mountpoints/Makefile | 2 +- sysutils/mcelog/Makefile | 2 +- sysutils/mcelog/distinfo | 6 +- sysutils/mcelog/files/patch-memdb.c | 8 +- sysutils/munin-node/Makefile | 3 +- sysutils/plasma5-kde-cli-tools/Makefile | 4 +- sysutils/pslist/Makefile | 2 +- sysutils/pslist/distinfo | 6 +- sysutils/rsyslog8/Makefile | 6 +- sysutils/rsyslog8/distinfo | 6 +- sysutils/rsyslog8/pkg-plist | 1 + sysutils/smenu/Makefile | 3 +- sysutils/smenu/distinfo | 6 +- sysutils/xin/Makefile | 3 + sysutils/xin/pkg-descr | 2 +- textproc/Makefile | 4 +- textproc/cgrep/Makefile | 33 +- textproc/cgrep/distinfo | 5 +- textproc/cgrep/files/patch-src_Main.hs | 32 - textproc/cgrep/pkg-plist | 2 - textproc/hs-Diff/Makefile | 2 +- textproc/hs-HStringTemplate/Makefile | 5 +- textproc/hs-HStringTemplate/distinfo | 6 +- textproc/hs-HaXml/Makefile | 2 + textproc/hs-appar/Makefile | 2 +- textproc/hs-attoparsec-enumerator/Makefile | 4 +- textproc/hs-attoparsec-iso8601/Makefile | 4 +- .../files/patch-attoparsec-iso8601.cabal | 10 + textproc/hs-attoparsec/Makefile | 5 +- textproc/hs-attoparsec/distinfo | 6 +- textproc/hs-bencode/Makefile | 4 +- textproc/hs-blaze-html/Makefile | 4 +- textproc/hs-blaze-markup/Makefile | 5 +- textproc/hs-blaze-markup/distinfo | 6 +- textproc/hs-bytestring-csv/Makefile | 2 +- textproc/hs-case-insensitive/Makefile | 5 +- textproc/hs-case-insensitive/distinfo | 6 +- textproc/hs-cassava/Makefile | 5 +- textproc/hs-cassava/distinfo | 6 +- textproc/hs-cmark-gfm/Makefile | 13 + textproc/hs-cmark-gfm/distinfo | 3 + textproc/hs-cmark-gfm/pkg-descr | 6 + textproc/hs-cmark/Makefile | 5 +- textproc/hs-cmark/distinfo | 6 +- textproc/hs-csv/Makefile | 4 +- textproc/hs-doctemplates/Makefile | 7 +- textproc/hs-doctemplates/distinfo | 6 +- textproc/hs-double-conversion/Makefile | 9 +- .../files/extra-patch-double-conversion.cabal | 12 - textproc/hs-feed/Makefile | 8 +- textproc/hs-feed/distinfo | 6 +- textproc/hs-feed/files/patch-feed.cabal | 31 + textproc/hs-hexpat/Makefile | 4 +- textproc/hs-highlighting-kate/Makefile | 6 +- textproc/hs-hs-bibutils/Makefile | 3 +- textproc/hs-hs-bibutils/distinfo | 6 +- textproc/hs-html-conduit/Makefile | 5 +- textproc/hs-html-conduit/distinfo | 6 +- .../files/patch-html-conduit.cabal | 11 - textproc/hs-html/Makefile | 2 +- textproc/hs-hxt-charproperties/Makefile | 2 +- textproc/hs-hxt-regex-xmlschema/Makefile | 4 +- textproc/hs-hxt-unicode/Makefile | 2 +- textproc/hs-hxt/Makefile | 5 +- textproc/hs-lhs2tex/Makefile | 3 +- textproc/hs-lhs2tex/distinfo | 6 +- textproc/hs-lhs2tex/files/patch-Setup.hs | 8 +- .../hs-lhs2tex/files/patch-src_Document.lhs | 10 + textproc/hs-lhs2tex/files/patch-src_Main.lhs | 11 + textproc/hs-lhs2tex/files/patch-src_Math.lhs | 11 + .../hs-lhs2tex/files/patch-src_MathPoly.lhs | 11 + .../hs-lhs2tex/files/patch-src_NewCode.lhs | 10 + .../hs-lhs2tex/files/patch-src_Typewriter.lhs | 10 + .../hs-lhs2tex/files/patch-src_Verbatim.lhs | 10 + textproc/hs-libxml-sax/Makefile | 4 +- textproc/hs-libxml/Makefile | 2 +- textproc/hs-magic/Makefile | 2 +- textproc/hs-pandoc-citeproc/Makefile | 7 +- textproc/hs-pandoc-citeproc/distinfo | 6 +- .../files/patch-pandoc-citeproc.cabal | 38 -- textproc/hs-pandoc-types/Makefile | 4 +- textproc/hs-pandoc-types/distinfo | 6 +- .../files/patch-pandoc-types.cabal | 24 - textproc/hs-pandoc/Makefile | 17 +- textproc/hs-pandoc/distinfo | 6 +- textproc/hs-pandoc/files/patch-pandoc.cabal | 83 --- .../patch-src_Text_Pandoc_Writers_Custom.hs | 14 - textproc/hs-parsec/distinfo | 3 - textproc/hs-parsec/pkg-descr | 7 - textproc/hs-polyparse/Makefile | 4 +- textproc/hs-pretty-show/Makefile | 3 +- textproc/hs-pretty-show/distinfo | 6 +- textproc/hs-regex-applicative/Makefile | 2 +- textproc/hs-regex-base/Makefile | 2 +- textproc/hs-regex-compat-tdfa/Makefile | 2 +- textproc/hs-regex-compat/Makefile | 2 +- textproc/hs-regex-pcre-builtin/Makefile | 2 +- textproc/hs-regex-pcre/Makefile | 2 +- textproc/hs-regex-posix/Makefile | 2 +- textproc/hs-regex-tdfa/Makefile | 5 +- textproc/hs-regex-tdfa/distinfo | 6 +- textproc/hs-rfc5051/Makefile | 2 +- textproc/hs-scanner/Makefile | 2 +- textproc/hs-skylighting-core/Makefile | 16 + textproc/hs-skylighting-core/distinfo | 3 + textproc/hs-skylighting-core/pkg-descr | 7 + textproc/hs-skylighting/Makefile | 8 +- textproc/hs-skylighting/distinfo | 6 +- textproc/hs-stringsearch/Makefile | 2 +- textproc/hs-tagsoup/Makefile | 5 +- textproc/hs-tagsoup/distinfo | 6 +- textproc/hs-tagstream-conduit/Makefile | 4 +- textproc/hs-texmath/Makefile | 6 +- textproc/hs-texmath/distinfo | 6 +- textproc/hs-texmath/files/patch-texmath.cabal | 20 - textproc/hs-uri-bytestring-aeson/Makefile | 5 +- textproc/hs-uri-bytestring-aeson/distinfo | 6 +- textproc/hs-uri-bytestring/Makefile | 3 +- textproc/hs-uri-bytestring/distinfo | 6 +- .../files/patch-uri-bytestring.cabal | 10 + .../{hs-parsec => hs-uri-encode}/Makefile | 9 +- textproc/hs-uri-encode/distinfo | 3 + textproc/hs-uri-encode/pkg-descr | 3 + textproc/hs-uri/Makefile | 4 +- textproc/hs-xml-conduit/Makefile | 5 +- textproc/hs-xml-conduit/distinfo | 6 +- textproc/hs-xml-hamlet/Makefile | 5 +- textproc/hs-xml-hamlet/distinfo | 6 +- .../files/patch-xml-hamlet.cabal | 11 - textproc/hs-xml-types/Makefile | 4 +- textproc/hs-xml/Makefile | 4 +- textproc/hs-xmlhtml/Makefile | 6 +- textproc/hs-xmlhtml/distinfo | 6 +- .../patch-src_Text_Blaze_Renderer_XmlHtml.hs | 30 - textproc/hs-xmlhtml/files/patch-xmlhtml.cabal | 17 +- textproc/hs-yaml/Makefile | 7 +- textproc/hs-yaml/distinfo | 6 +- textproc/p5-SGMLSpm/Makefile | 7 +- textproc/py-Chameleon/Makefile | 2 +- textproc/py-Chameleon/distinfo | 6 +- textproc/py-parso/Makefile | 2 +- textproc/py-parso/distinfo | 6 +- textproc/py-zope.i18nmessageid/Makefile | 3 + textproc/rubygem-autoprefixer-rails/Makefile | 2 +- textproc/rubygem-autoprefixer-rails/distinfo | 6 +- www/Makefile | 2 + www/fabio/Makefile | 2 +- www/fabio/distinfo | 6 +- www/gohugo/Makefile | 2 +- www/gohugo/distinfo | 6 +- www/horde-ansel/Makefile | 2 +- www/horde-ansel/pkg-descr | 2 +- www/hs-DAV/Makefile | 3 +- www/hs-DAV/distinfo | 6 +- www/hs-HTTP/Makefile | 6 +- www/hs-HTTP/distinfo | 6 +- www/hs-activehs/Makefile | 4 +- www/hs-authenticate/Makefile | 5 +- www/hs-authenticate/distinfo | 6 +- www/hs-cgi/Makefile | 4 +- www/hs-cgi/files/patch-cgi.cabal | 16 + www/hs-cookie/Makefile | 5 +- www/hs-cookie/distinfo | 6 +- www/hs-css-text/Makefile | 5 +- www/hs-css-text/distinfo | 6 +- www/hs-fastcgi/Makefile | 2 +- www/hs-gitit/Makefile | 8 +- www/hs-hS3/Makefile | 2 +- www/hs-happstack-server/Makefile | 9 +- www/hs-happstack-server/distinfo | 6 +- www/hs-happstack/Makefile | 2 + www/hs-heist/Makefile | 5 +- www/hs-heist/distinfo | 6 +- www/hs-heist/files/patch-heist.cabal | 29 - www/hs-hjsmin/Makefile | 4 +- www/hs-http-api-data/Makefile | 7 +- www/hs-http-api-data/distinfo | 6 +- www/hs-http-client-tls/Makefile | 2 +- www/hs-http-client/Makefile | 7 +- www/hs-http-client/distinfo | 6 +- www/hs-http-conduit/Makefile | 3 +- www/hs-http-conduit/distinfo | 6 +- www/hs-http-date/Makefile | 2 +- www/hs-http-reverse-proxy/Makefile | 5 +- www/hs-http-reverse-proxy/distinfo | 6 +- www/hs-http-server/Makefile | 4 +- www/hs-http-types/Makefile | 5 +- www/hs-http-types/distinfo | 6 +- www/hs-http2/Makefile | 4 +- www/hs-multipart/Makefile | 4 +- www/hs-oeis/Makefile | 2 +- www/hs-path-pieces/Makefile | 4 +- www/hs-recaptcha/Makefile | 2 +- www/hs-shakespeare/Makefile | 5 +- www/hs-shakespeare/distinfo | 6 +- www/hs-snap-core/Makefile | 5 +- www/hs-snap-core/distinfo | 6 +- www/hs-snap-server/Makefile | 5 +- www/hs-snap-server/distinfo | 6 +- www/hs-snap/Makefile | 6 +- www/hs-url/Makefile | 2 +- www/hs-wai-app-static/Makefile | 5 +- www/hs-wai-app-static/distinfo | 6 +- www/hs-wai-extra/Makefile | 5 +- www/hs-wai-extra/distinfo | 6 +- www/hs-wai-logger/Makefile | 3 +- www/hs-wai-logger/distinfo | 6 +- www/hs-wai/Makefile | 5 +- www/hs-wai/distinfo | 6 +- www/hs-wai/files/patch-wai.cabal | 10 - www/hs-warp-tls/Makefile | 2 +- www/hs-warp/Makefile | 9 +- www/hs-warp/distinfo | 6 +- www/hs-warp/files/patch-warp.cabal | 18 - www/hs-webkit/Makefile | 4 +- www/hs-xss-sanitize/Makefile | 4 +- www/hs-yesod-auth-hashdb/Makefile | 5 +- www/hs-yesod-auth-hashdb/distinfo | 6 +- www/hs-yesod-auth/Makefile | 5 +- www/hs-yesod-auth/distinfo | 6 +- www/hs-yesod-bin/Makefile | 8 +- www/hs-yesod-core/Makefile | 7 +- www/hs-yesod-core/distinfo | 6 +- www/hs-yesod-form/Makefile | 5 +- www/hs-yesod-form/distinfo | 6 +- www/hs-yesod-persistent/Makefile | 3 +- www/hs-yesod-persistent/distinfo | 6 +- .../files/patch-yesod-persistent.cabal | 13 - www/hs-yesod-static/Makefile | 13 +- www/hs-yesod-static/distinfo | 6 +- www/hs-yesod-test/Makefile | 5 +- www/hs-yesod-test/distinfo | 6 +- www/hs-yesod/Makefile | 5 +- www/hs-yesod/distinfo | 6 +- .../Makefile | 8 +- .../distinfo | 5 +- www/palemoon/Makefile | 1 + www/palemoon/files/patch-bug1153151 | 13 - www/palemoon/files/patch-bug1153179 | 40 -- www/palemoon/files/patch-cubeb5ffce9e91b | 41 -- www/palemoon/files/patch-sndio | 145 +++++ www/py-branca/Makefile | 22 + www/py-branca/distinfo | 3 + www/py-branca/pkg-descr | 5 + www/py-django-annoying/Makefile | 8 +- www/py-django-annoying/distinfo | 6 +- www/py-django-auth-ldap/Makefile | 24 +- www/py-django-auth-ldap/distinfo | 5 +- www/py-django-auth-ldap/pkg-descr | 2 +- www/py-django-haystack/Makefile | 20 +- www/py-django-haystack/distinfo | 6 +- www/py-django-ldapdb/Makefile | 22 +- www/py-django-ldapdb/distinfo | 5 +- www/py-django-ldapdb/pkg-descr | 15 +- www/py-django-markdownx/Makefile | 13 +- www/py-django-markdownx/distinfo | 6 +- www/py-django-markdownx/pkg-descr | 2 +- www/py-django-simple-history/Makefile | 19 +- www/py-django-simple-history/distinfo | 6 +- www/py-feedgenerator/Makefile | 2 +- www/py-folium/Makefile | 26 + www/py-folium/distinfo | 3 + www/py-folium/pkg-descr | 6 + www/py-google-api-core/Makefile | 2 +- www/py-google-api-core/distinfo | 6 +- www/py-searx/Makefile | 4 +- www/rubygem-faraday/Makefile | 2 +- www/rubygem-faraday/distinfo | 6 +- www/waterfox/Makefile | 2 +- www/waterfox/files/patch-bug1462682 | 32 + www/waterfox/files/patch-bug1463244 | 161 +++++ www/wordpress/Makefile | 2 +- www/wordpress/distinfo | 6 +- www/zenphoto/Makefile | 27 +- www/zenphoto/distinfo | 6 +- www/zenphoto/pkg-plist | 295 ++------- x11-fm/doublecmd/Makefile | 197 +++--- x11-fm/doublecmd/distinfo | 6 +- x11-toolkits/girara/Makefile | 2 +- x11-toolkits/girara/distinfo | 6 +- x11-toolkits/hs-GLURaw/Makefile | 3 +- x11-toolkits/hs-GLURaw/distinfo | 6 +- x11-toolkits/hs-GLUT/Makefile | 2 +- x11-toolkits/hs-OpenGL/Makefile | 6 +- x11-toolkits/hs-OpenGL/distinfo | 6 +- x11-toolkits/hs-OpenGLRaw/Makefile | 5 +- x11-toolkits/hs-OpenGLRaw/distinfo | 6 +- x11-toolkits/hs-gtk/Makefile | 5 +- x11-toolkits/hs-gtk/distinfo | 6 +- x11-toolkits/hs-gtk2hs/Makefile | 2 +- x11-toolkits/hs-gtksourceview2/Makefile | 4 +- x11-toolkits/hs-pango/Makefile | 5 +- x11-toolkits/hs-pango/distinfo | 6 +- x11-toolkits/hs-vte/Makefile | 2 +- x11-toolkits/hs-wx/Makefile | 4 +- x11-toolkits/hs-wxc/Makefile | 2 + x11-toolkits/hs-wxcore/Makefile | 4 +- x11-toolkits/hs-wxdirect/Makefile | 4 +- .../hs-wxdirect/files/patch-wxdirect.cabal | 11 + x11-toolkits/libXt/Makefile | 7 +- x11-toolkits/libXt/pkg-descr | 2 +- x11-wm/hs-xmonad-contrib/Makefile | 4 +- .../files/patch-8.4.2-support | 95 +++ x11-wm/hs-xmonad/Makefile | 4 +- x11-wm/hs-xmonad/files/patch-8.4.1-support | 61 ++ x11/hs-X11-xft/Makefile | 2 +- x11/hs-X11/Makefile | 2 +- x11/hs-xmobar/Makefile | 5 +- x11/hs-xmobar/distinfo | 6 +- x11/kde-runtime-kde4/Makefile | 2 + x11/nvidia-driver/Makefile | 2 +- x11/nvidia-driver/distinfo | 8 +- x11/xorg-minimal/Makefile | 10 +- 1271 files changed, 7266 insertions(+), 4571 deletions(-) delete mode 100644 benchmarks/iperf/files/patch-src-Client.cpp create mode 100644 devel/fb303/files/patch-cpp_FacebookBase.h delete mode 100644 devel/hs-BNFC/Makefile delete mode 100644 devel/hs-BNFC/distinfo delete mode 100644 devel/hs-BNFC/pkg-descr delete mode 100644 devel/hs-DrIFT/distinfo delete mode 100644 devel/hs-DrIFT/files/patch-src_ParseLib2.hs delete mode 100644 devel/hs-DrIFT/pkg-descr create mode 100644 devel/hs-PSQueue/files/patch-Data_PSQueue.hs create mode 100644 devel/hs-base-compat-batteries/Makefile create mode 100644 devel/hs-base-compat-batteries/distinfo create mode 100644 devel/hs-base-compat-batteries/pkg-descr rename devel/{hs-text => hs-basement}/Makefile (61%) create mode 100644 devel/hs-basement/distinfo create mode 100644 devel/hs-basement/pkg-descr create mode 100644 devel/hs-bifunctors/files/patch-bifunctors.cabal delete mode 100644 devel/hs-concurrent-output/files/patch-concurrent-output.cabal delete mode 100644 devel/hs-darcs/files/patch-darcs.cabal create mode 100644 devel/hs-data-pprint/files/patch-Data_PPrint.hs create mode 100644 devel/hs-deepseq-generics/files/patch-deepseq-generics.cabal create mode 100644 devel/hs-echo/Makefile create mode 100644 devel/hs-echo/distinfo create mode 100644 devel/hs-echo/files/patch-echo.cabal create mode 100644 devel/hs-echo/pkg-descr delete mode 100644 devel/hs-either/files/patch-either.cabal create mode 100644 devel/hs-free/files/patch-free.cabal create mode 100644 devel/hs-generic-deriving/files/patch-generic-deriving.cabal create mode 100644 devel/hs-gtk2hs-buildtools/files/patch-c2hs_c_CPretty.hs create mode 100644 devel/hs-gtk2hs-buildtools/files/patch-gtk2hs-buildtools.cabal create mode 100644 devel/hs-haddock-library/files/patch-haddock-library.cabal rename devel/{hs-DrIFT => hs-haskell-src-meta}/Makefile (52%) create mode 100644 devel/hs-haskell-src-meta/distinfo create mode 100644 devel/hs-haskell-src-meta/files/patch-haskell-src-meta.cabal create mode 100644 devel/hs-haskell-src-meta/pkg-descr delete mode 100644 devel/hs-hastache/Makefile delete mode 100644 devel/hs-hastache/distinfo delete mode 100644 devel/hs-hastache/files/patch-hastache.cabal delete mode 100644 devel/hs-hastache/pkg-descr rename devel/{hs-monadplus => hs-hslua-module-text}/Makefile (56%) create mode 100644 devel/hs-hslua-module-text/distinfo create mode 100644 devel/hs-hslua-module-text/files/patch-hslua-module-text.cabal create mode 100644 devel/hs-hslua-module-text/pkg-descr create mode 100644 devel/hs-hslua/files/patch-hslua.cabal create mode 100644 devel/hs-kqueue/files/patch-kqueue.cabal create mode 100644 devel/hs-microstache/files/patch-microstache.cabal delete mode 100644 devel/hs-monadplus/distinfo delete mode 100644 devel/hs-monadplus/pkg-descr create mode 100644 devel/hs-parallel/files/patch-parallel.cabal delete mode 100644 devel/hs-profunctors/files/patch-git_c0574c create mode 100644 devel/hs-safe-exceptions/files/patch-safe-exceptions.cabal delete mode 100644 devel/hs-stm/distinfo delete mode 100644 devel/hs-stm/pkg-descr create mode 100644 devel/hs-storable-record/Makefile create mode 100644 devel/hs-storable-record/distinfo create mode 100644 devel/hs-storable-record/pkg-descr create mode 100644 devel/hs-storable-tuple/Makefile create mode 100644 devel/hs-storable-tuple/distinfo create mode 100644 devel/hs-storable-tuple/pkg-descr delete mode 100644 devel/hs-test-framework/files/patch-test-framework.cabal delete mode 100644 devel/hs-text/distinfo delete mode 100644 devel/hs-text/pkg-descr create mode 100644 devel/hs-th-abstraction/files/patch-th-abstraction.cabal create mode 100644 devel/hs-th-expand-syns/Makefile create mode 100644 devel/hs-th-expand-syns/distinfo create mode 100644 devel/hs-th-expand-syns/pkg-descr create mode 100644 devel/hs-th-orphans/Makefile create mode 100644 devel/hs-th-orphans/distinfo create mode 100644 devel/hs-th-orphans/pkg-descr create mode 100644 devel/hs-th-reify-many/Makefile create mode 100644 devel/hs-th-reify-many/distinfo create mode 100644 devel/hs-th-reify-many/pkg-descr rename devel/{hs-stm => hs-unicode-show}/Makefile (64%) create mode 100644 devel/hs-unicode-show/distinfo create mode 100644 devel/hs-unicode-show/pkg-descr create mode 100644 devel/hs-unliftio-core/Makefile create mode 100644 devel/hs-unliftio-core/distinfo create mode 100644 devel/hs-unliftio-core/files/patch-unliftio-core.cabal create mode 100644 devel/hs-unliftio-core/pkg-descr create mode 100644 devel/hs-unliftio/Makefile create mode 100644 devel/hs-unliftio/distinfo create mode 100644 devel/hs-unliftio/pkg-descr create mode 100644 devel/hs-uuid/files/patch-uuid.cabal create mode 100644 devel/hs-uulib/files/patch-src_UU_PPrint.hs create mode 100644 devel/hs-vector-binary-instances/files/patch-vector-binary-instances.cabal create mode 100644 devel/hs-vector/files/patch-vector.cabal create mode 100644 devel/qgit/files/patch-src_config.h create mode 100644 dns/bind913/Makefile create mode 100644 dns/bind913/distinfo create mode 100644 dns/bind913/files/BIND.chroot.dist create mode 100644 dns/bind913/files/BIND.chroot.local.dist create mode 100644 dns/bind913/files/empty.db create mode 100644 dns/bind913/files/extrapatch-bind-min-override-ttl create mode 100644 dns/bind913/files/localhost-forward.db create mode 100644 dns/bind913/files/localhost-reverse.db create mode 100644 dns/bind913/files/named.conf.in create mode 100644 dns/bind913/files/named.in create mode 100644 dns/bind913/files/named.root create mode 100644 dns/bind913/files/patch-bin_named_include_named_globals.h create mode 100644 dns/bind913/files/patch-bin_tests_system_dlzexternal_Makefile.in create mode 100644 dns/bind913/files/patch-configure create mode 100644 dns/bind913/files/patch-lib_isc_include_isc_Makefile.in create mode 100644 dns/bind913/files/pkg-message.in create mode 100644 dns/bind913/pkg-descr create mode 100644 dns/bind913/pkg-help create mode 100644 dns/bind913/pkg-plist delete mode 100644 dns/hs-dns/files/patch-dns.cabal create mode 100644 editors/gomate/Makefile create mode 100644 editors/gomate/distinfo create mode 100644 editors/gomate/pkg-descr create mode 100644 editors/gomate/pkg-message delete mode 100644 editors/lazarus-lcl-gtk2/Makefile delete mode 100644 editors/lazarus-lcl-nogui/Makefile delete mode 100644 editors/lazarus-lcl-qt/Makefile delete mode 100644 editors/lazarus-lcl-qt/files/patch-interfaces_qt_qt45.pas delete mode 100644 editors/lazarus-lcl-qt5/Makefile delete mode 100644 editors/lazarus-lcl-qt5/files/patch-interfaces_qt_qt45.pas delete mode 100644 editors/lazarus-lcl-units/Makefile create mode 100644 editors/lazarus-qt4/Makefile create mode 100644 editors/lazarus-qt5/Makefile delete mode 100644 editors/lazarus/Makefile.common delete mode 100644 editors/lazarus/files/patch-components-synedit_synedit.pp delete mode 100644 graphics/hs-HGL/Makefile delete mode 100644 graphics/hs-HGL/distinfo delete mode 100644 graphics/hs-HGL/files/patch-Graphics_HGL_Internals_Draw.hs delete mode 100644 graphics/hs-HGL/pkg-descr create mode 100644 graphics/hs-dia-base/files/patch-dia-base.cabal create mode 100644 graphics/py-sorl-thumbnail/files/patch-docs_conf.py delete mode 100644 lang/ghc/files/patch-compiler_main_SysTools.hs delete mode 100644 lang/ghc/files/patch-includes_rts_storage_ClosureMacros.h delete mode 100644 lang/ghc/files/patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs delete mode 100644 lang/ghc/files/patch-rts_Linker.c create mode 100644 math/hs-data-lens-template/files/patch-data-lens-template.cabal create mode 100644 misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-11.2-BETA3 create mode 100644 misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-11.2-BETA3 create mode 100644 misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-11.2-BETA3 create mode 100644 misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-11.2-BETA3 create mode 100644 misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-11.2-BETA3 create mode 100644 misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-11.2-BETA3 create mode 100644 net-mgmt/netbox/Makefile create mode 100644 net-mgmt/netbox/distinfo create mode 100644 net-mgmt/netbox/files/pkg-message.in create mode 100644 net-mgmt/netbox/pkg-descr create mode 100644 net-mgmt/netbox/pkg-plist rename net/{bird-devel => bird2}/Makefile (88%) rename net/{bird-devel => bird2}/distinfo (100%) rename net/{bird-devel => bird2}/files/bird.in (100%) rename net/{bird-devel => bird2}/files/patch-Makefile.in (100%) rename net/{bird-devel => bird2}/files/patch-sysdep_bsd_setkey.h (100%) rename net/{bird-devel => bird2}/files/pkg-message.in (100%) rename net/{bird-devel => bird2}/pkg-descr (100%) rename net/{bird-devel => bird2}/pkg-plist (100%) delete mode 100644 net/hs-aws/files/patch-aws.cabal create mode 100644 net/hs-bsb-http-chunked/Makefile create mode 100644 net/hs-bsb-http-chunked/distinfo create mode 100644 net/hs-bsb-http-chunked/files/patch-bsb-http-chunked.cabal create mode 100644 net/hs-bsb-http-chunked/pkg-descr create mode 100644 net/hs-resolv/Makefile create mode 100644 net/hs-resolv/distinfo create mode 100644 net/hs-resolv/files/patch-resolv.cabal create mode 100644 net/hs-resolv/pkg-descr delete mode 100644 science/hs-bio/Makefile delete mode 100644 science/hs-bio/distinfo delete mode 100644 science/hs-bio/files/patch-Bio_Alignment_Bowtie.hs delete mode 100644 science/hs-bio/files/patch-bio.cabal delete mode 100644 science/hs-bio/pkg-descr create mode 100644 security/hs-cryptohash-md5/files/patch-cryptohash-md5.cabal create mode 100644 security/hs-cryptohash-sha1/files/patch-cryptohash-sha1.cabal create mode 100644 security/hs-cryptohash-sha256/files/patch-cryptohash-sha256.cabal create mode 100644 security/hs-cryptonite-conduit/Makefile create mode 100644 security/hs-cryptonite-conduit/distinfo create mode 100644 security/hs-cryptonite-conduit/pkg-descr delete mode 100644 security/hs-hackage-security/files/patch-hackage-security.cabal create mode 100644 sysutils/hs-ekg-core/files/patch-ekg-core.cabal create mode 100644 sysutils/hs-ekg-json/files/patch-ekg-json.cabal create mode 100644 sysutils/hs-ekg/files/patch-ekg.cabal delete mode 100644 textproc/cgrep/files/patch-src_Main.hs delete mode 100644 textproc/cgrep/pkg-plist create mode 100644 textproc/hs-attoparsec-iso8601/files/patch-attoparsec-iso8601.cabal create mode 100644 textproc/hs-cmark-gfm/Makefile create mode 100644 textproc/hs-cmark-gfm/distinfo create mode 100644 textproc/hs-cmark-gfm/pkg-descr delete mode 100644 textproc/hs-double-conversion/files/extra-patch-double-conversion.cabal create mode 100644 textproc/hs-feed/files/patch-feed.cabal delete mode 100644 textproc/hs-html-conduit/files/patch-html-conduit.cabal create mode 100644 textproc/hs-lhs2tex/files/patch-src_Document.lhs create mode 100644 textproc/hs-lhs2tex/files/patch-src_Main.lhs create mode 100644 textproc/hs-lhs2tex/files/patch-src_Math.lhs create mode 100644 textproc/hs-lhs2tex/files/patch-src_MathPoly.lhs create mode 100644 textproc/hs-lhs2tex/files/patch-src_NewCode.lhs create mode 100644 textproc/hs-lhs2tex/files/patch-src_Typewriter.lhs create mode 100644 textproc/hs-lhs2tex/files/patch-src_Verbatim.lhs delete mode 100644 textproc/hs-pandoc-citeproc/files/patch-pandoc-citeproc.cabal delete mode 100644 textproc/hs-pandoc-types/files/patch-pandoc-types.cabal delete mode 100644 textproc/hs-pandoc/files/patch-pandoc.cabal delete mode 100644 textproc/hs-pandoc/files/patch-src_Text_Pandoc_Writers_Custom.hs delete mode 100644 textproc/hs-parsec/distinfo delete mode 100644 textproc/hs-parsec/pkg-descr create mode 100644 textproc/hs-skylighting-core/Makefile create mode 100644 textproc/hs-skylighting-core/distinfo create mode 100644 textproc/hs-skylighting-core/pkg-descr delete mode 100644 textproc/hs-texmath/files/patch-texmath.cabal create mode 100644 textproc/hs-uri-bytestring/files/patch-uri-bytestring.cabal rename textproc/{hs-parsec => hs-uri-encode}/Makefile (60%) create mode 100644 textproc/hs-uri-encode/distinfo create mode 100644 textproc/hs-uri-encode/pkg-descr delete mode 100644 textproc/hs-xml-hamlet/files/patch-xml-hamlet.cabal delete mode 100644 textproc/hs-xmlhtml/files/patch-src_Text_Blaze_Renderer_XmlHtml.hs create mode 100644 www/hs-cgi/files/patch-cgi.cabal delete mode 100644 www/hs-heist/files/patch-heist.cabal delete mode 100644 www/hs-wai/files/patch-wai.cabal delete mode 100644 www/hs-warp/files/patch-warp.cabal delete mode 100644 www/hs-yesod-persistent/files/patch-yesod-persistent.cabal delete mode 100644 www/palemoon/files/patch-bug1153151 delete mode 100644 www/palemoon/files/patch-bug1153179 delete mode 100644 www/palemoon/files/patch-cubeb5ffce9e91b create mode 100644 www/palemoon/files/patch-sndio create mode 100644 www/py-branca/Makefile create mode 100644 www/py-branca/distinfo create mode 100644 www/py-branca/pkg-descr create mode 100644 www/py-folium/Makefile create mode 100644 www/py-folium/distinfo create mode 100644 www/py-folium/pkg-descr create mode 100644 www/waterfox/files/patch-bug1462682 create mode 100644 www/waterfox/files/patch-bug1463244 create mode 100644 x11-toolkits/hs-wxdirect/files/patch-wxdirect.cabal create mode 100644 x11-wm/hs-xmonad-contrib/files/patch-8.4.2-support create mode 100644 x11-wm/hs-xmonad/files/patch-8.4.1-support diff --git a/archivers/hs-tar/Makefile b/archivers/hs-tar/Makefile index b1d2dcc1281..7cec31e24b9 100644 --- a/archivers/hs-tar/Makefile +++ b/archivers/hs-tar/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= tar -PORTVERSION= 0.5.0.3 -PORTREVISION= 1 +PORTVERSION= 0.5.1.0 CATEGORIES= archivers haskell MAINTAINER= haskell@FreeBSD.org diff --git a/archivers/hs-tar/distinfo b/archivers/hs-tar/distinfo index 9ac9e98c54a..265e3e44990 100644 --- a/archivers/hs-tar/distinfo +++ b/archivers/hs-tar/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499611841 -SHA256 (cabal/tar-0.5.0.3.tar.gz) = d8d9ad876365f88bdccd02073049e58715cd5ba94de06eb98e21d595244918a3 -SIZE (cabal/tar-0.5.0.3.tar.gz) = 38764 +TIMESTAMP = 1523301281 +SHA256 (cabal/tar-0.5.1.0.tar.gz) = c89d697b6472b739db50e61201251fcaf8a8f5b595b1d9a488d395d7d5ce4b68 +SIZE (cabal/tar-0.5.1.0.tar.gz) = 39271 diff --git a/archivers/hs-zip-archive/Makefile b/archivers/hs-zip-archive/Makefile index bb92a4b4bcf..a7ba4930d77 100644 --- a/archivers/hs-zip-archive/Makefile +++ b/archivers/hs-zip-archive/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= zip-archive -PORTVERSION= 0.3.1.1 -PORTREVISION= 1 +PORTVERSION= 0.3.2.4 CATEGORIES= archivers haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= Library for creating and modifying zip archives LICENSE= BSD3CLAUSE -USE_CABAL= digest>=0.0.0.1 mtl old-time text>=0.11 zlib +USE_CABAL= digest>=0.0.0.1 mtl old-time zlib FLAGS_DEFINE= EXECUTABLE diff --git a/archivers/hs-zip-archive/distinfo b/archivers/hs-zip-archive/distinfo index 07ec19cd030..33032289f8d 100644 --- a/archivers/hs-zip-archive/distinfo +++ b/archivers/hs-zip-archive/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499611845 -SHA256 (cabal/zip-archive-0.3.1.1.tar.gz) = 9e868e649e6fd06cf50c2f0f1e480ce36640494449e415abf2509f9347f08325 -SIZE (cabal/zip-archive-0.3.1.1.tar.gz) = 16107 +TIMESTAMP = 1523638345 +SHA256 (cabal/zip-archive-0.3.2.4.tar.gz) = 20612ed34d8d14deef120440c75f951a5c92c9f39f0de1b82ebac6d5923b3785 +SIZE (cabal/zip-archive-0.3.2.4.tar.gz) = 18370 diff --git a/archivers/hs-zlib-bindings/Makefile b/archivers/hs-zlib-bindings/Makefile index 074d319055a..d9af9389521 100644 --- a/archivers/hs-zlib-bindings/Makefile +++ b/archivers/hs-zlib-bindings/Makefile @@ -2,7 +2,7 @@ PORTNAME= zlib-bindings PORTVERSION= 0.1.1.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= archivers haskell MAINTAINER= haskell@FreeBSD.org diff --git a/archivers/hs-zlib-enum/Makefile b/archivers/hs-zlib-enum/Makefile index 9577dc2c655..998024bd12b 100644 --- a/archivers/hs-zlib-enum/Makefile +++ b/archivers/hs-zlib-enum/Makefile @@ -2,7 +2,7 @@ PORTNAME= zlib-enum PORTVERSION= 0.2.3.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= archivers haskell MAINTAINER= haskell@FreeBSD.org diff --git a/archivers/hs-zlib/Makefile b/archivers/hs-zlib/Makefile index f4a7257f59e..e8b011890f5 100644 --- a/archivers/hs-zlib/Makefile +++ b/archivers/hs-zlib/Makefile @@ -3,7 +3,7 @@ PORTNAME= zlib PORTVERSION= 0.6.1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= archivers haskell MAINTAINER= haskell@FreeBSD.org diff --git a/archivers/peazip/Makefile b/archivers/peazip/Makefile index 01de48a9292..e0bd550dbd1 100644 --- a/archivers/peazip/Makefile +++ b/archivers/peazip/Makefile @@ -1,9 +1,9 @@ -# Created by: Alonso Cardenas Marquez # $FreeBSD$ PORTNAME= peazip -PORTVERSION= 6.5.0 +PORTVERSION= 6.5.1 CATEGORIES= archivers +PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX} MASTER_SITES= https://github.com/giorgiotani/PeaZip/releases/download/${PORTVERSION}/ DISTNAME= ${PORTNAME}-${PORTVERSION}.src @@ -12,58 +12,38 @@ COMMENT= Free archiver and file compressor LICENSE= LGPL3 -BUILD_DEPENDS= lazbuild:editors/lazarus \ - fpcres:lang/fpc-utils - -USES= dos2unix fpc zip +USES= dos2unix fpc lazarus:flavors zip USE_FPC= cairo chm fcl-base fcl-image pasjpeg rtl-objpas x11 -USE_GNOME= # +USE_XORG= x11 SUB_FILES= pea pealauncher peazip DOS2UNIX_REGEX= .*\.([txt]|pas|lpi|txt) + LAZARUS_PROJECT_FILES= project_pea.lpi project_peach.lpi project_gwrap.lpi -LAZBUILD_CMD= ${LOCALBASE}/bin/lazbuild -d -LCL_UNITS_DIR= ${LOCALBASE}/share/lazarus-${LAZARUS_VER}/lcl/units/${BUILDNAME} -LAZARUS_VER= 1.8.0 -LAZARUS_DIR= ${LOCALBASE}/share/lazarus-${LAZARUS_VER} +LAZBUILD_ARGS= -d + +gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt4 ${PORTNAME}-qt5 +qt4_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt5 +qt5_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt4 + ARCHIVER_FILES= # OPTIONS_DEFINE= 7Z ARC ZPAQ UNACE -OPTIONS_SINGLE= LCL -OPTIONS_SINGLE_LCL= GTK2 QT4 QT5 7Z_DESC= 7z file archiver support ARC_DESC= Arc file archiver support ZPAQ_DESC= Zpaq file archiver support UNACE_DESC= Unace file archiver support -GTK2_DESC= Use gtk20 interface -QT4_DESC= Use qt4 interface -QT5_DESC= Use qt5 interface -OPTIONS_DEFAULT= GTK2 7Z +OPTIONS_DEFAULT= 7Z + +.if ${FLAVOR:Ugtk2:Mgtk2} +USE_GNOME+= cairo +.endif .include -.if ${PORT_OPTIONS:MGTK2} -USE_FPC+= gtk2 -USE_GNOME= gtk20 -LCL_PLATFORM= gtk2 -BUILD_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-gtk2 -.endif - -.if ${PORT_OPTIONS:MQT4} -LIB_DEPENDS+= libQt4Pas.so:x11-toolkits/qt4pas -LCL_PLATFORM= qt -BUILD_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt -.endif - -.if ${PORT_OPTIONS:MQT5} -LIB_DEPENDS+= libQt5Pas.so:x11-toolkits/qt5pas -LCL_PLATFORM= qt5 -BUILD_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt5 -.endif - .if ${PORT_OPTIONS:M7Z} RUN_DEPENDS+= 7z:archivers/p7zip ARCHIVER_FILES+=7z @@ -99,12 +79,6 @@ PLIST_SUB+= UNACE="@comment " post-patch: ${REINPLACE_CMD} 's|GetSelectedNodePath|Path|g' ${WRKSRC}/peach.pas -do-build: -.for PROJECT_FILE in ${LAZARUS_PROJECT_FILES} - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --ws=${LCL_PLATFORM} --lazarusdir=${LAZARUS_DIR} ${PROJECT_FILE} -.endfor - pre-install: @${ECHO_CMD} "#" > ${WRKSRC}/altconf.txt @${ECHO_CMD} "appdata" >> ${WRKSRC}/altconf.txt diff --git a/archivers/peazip/distinfo b/archivers/peazip/distinfo index 93955b91493..4acf44dfaf8 100644 --- a/archivers/peazip/distinfo +++ b/archivers/peazip/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1513107866 -SHA256 (peazip-6.5.0.src.zip) = 1c19c7d6c346b511c635c95d6ff0277ee0811873133757d3c06c26fec558e7bf -SIZE (peazip-6.5.0.src.zip) = 4181167 +TIMESTAMP = 1520457314 +SHA256 (peazip-6.5.1.src.zip) = b106811311fbaf42ad5374520df2be8b20a545b80e6f8713a1f10e2e5a79d01e +SIZE (peazip-6.5.1.src.zip) = 4289282 diff --git a/archivers/py-bup/Makefile b/archivers/py-bup/Makefile index e1bb64451b8..53b6c0cb1e4 100644 --- a/archivers/py-bup/Makefile +++ b/archivers/py-bup/Makefile @@ -12,8 +12,8 @@ COMMENT= Very efficient backup system based on the git packfile format LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHONPREFIX_SITELIBDIR}/posix1e.so:security/py-pylibacl \ - xattr:devel/py-xattr \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pylibacl>=0:security/py-pylibacl@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xattr>=0:devel/py-xattr@${PY_FLAVOR} \ git>=1.5.3.1:devel/git \ par2cmdline>=0.4:archivers/par2cmdline BUILD_DEPENDS= bash:shells/bash git>=1.5.3.1:devel/git @@ -23,7 +23,7 @@ PLIST_SUB= MANDIR=${PREFIX}/man OPTIONS_DEFINE= TORNADO DOCS OPTIONS_DEFAULT= DOC TORNADO_DESC= Bup web server -TORNADO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tornado>=4:www/py-tornado +TORNADO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tornado>=4:www/py-tornado@${PY_FLAVOR} DOCS_DESC= Build man files and html documentation DOCS_BUILD_DEPENDS= pandoc:textproc/hs-pandoc DOCS_VARS= PANDOC=pandoc diff --git a/audio/hs-ALUT/Makefile b/audio/hs-ALUT/Makefile index b030d6a25cd..b1d6ec6c94e 100644 --- a/audio/hs-ALUT/Makefile +++ b/audio/hs-ALUT/Makefile @@ -3,7 +3,7 @@ PORTNAME= ALUT PORTVERSION= 2.4.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio haskell MAINTAINER= haskell@FreeBSD.org diff --git a/audio/hs-OpenAL/Makefile b/audio/hs-OpenAL/Makefile index a19b94fbd14..8b8dc555c08 100644 --- a/audio/hs-OpenAL/Makefile +++ b/audio/hs-OpenAL/Makefile @@ -3,7 +3,7 @@ PORTNAME= OpenAL PORTVERSION= 1.7.0.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio haskell MAINTAINER= haskell@FreeBSD.org diff --git a/audio/hs-libmpd/Makefile b/audio/hs-libmpd/Makefile index 6f346125578..e83ac6a635c 100644 --- a/audio/hs-libmpd/Makefile +++ b/audio/hs-libmpd/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= libmpd -PORTVERSION= 0.9.0.6 -PORTREVISION= 1 +PORTVERSION= 0.9.0.8 CATEGORIES= audio haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,7 @@ COMMENT= MPD client library LICENSE= MIT USE_CABAL= attoparsec>=0.10.1 data-default-class>=0.0.1 mtl>=2.0 \ - network>=2.1 old-locale>=1.0 text>=0.11 utf8-string>=0.3.1 + network>=2.1 old-locale>=1.0 utf8-string>=0.3.1 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/audio/hs-libmpd/distinfo b/audio/hs-libmpd/distinfo index 6a36eac296b..4a520cedd25 100644 --- a/audio/hs-libmpd/distinfo +++ b/audio/hs-libmpd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499538914 -SHA256 (cabal/libmpd-0.9.0.6.tar.gz) = bdebb946bba078ed85de12d71ef2e7efa7f28c1ed806d9a390a20d5e4590c937 -SIZE (cabal/libmpd-0.9.0.6.tar.gz) = 38707 +TIMESTAMP = 1524150587 +SHA256 (cabal/libmpd-0.9.0.8.tar.gz) = 582b0a405e39148d3a5046e8ad00c9e217688e60c70393eb36cd651e1991ed4e +SIZE (cabal/libmpd-0.9.0.8.tar.gz) = 38932 diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile index c3861bb8937..c5cb9a763d3 100644 --- a/audio/musicpd/Makefile +++ b/audio/musicpd/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= musicpd -PORTVERSION= 0.20.18 -PORTREVISION= 4 +PORTVERSION= 0.20.20 CATEGORIES= audio ipv6 MASTER_SITES= http://www.musicpd.org/download/mpd/${PORTVERSION:R}/ DISTNAME= mpd-${PORTVERSION} diff --git a/audio/musicpd/distinfo b/audio/musicpd/distinfo index 5e0043d80e0..bac61ca849b 100644 --- a/audio/musicpd/distinfo +++ b/audio/musicpd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1519569665 -SHA256 (mpd-0.20.18.tar.xz) = 6a582dc2ae90b94ff3853f9ffd7d80b2c2b5fe2e2c35cb1da0b36f3f3dfad434 -SIZE (mpd-0.20.18.tar.xz) = 792416 +TIMESTAMP = 1527332444 +SHA256 (mpd-0.20.20.tar.xz) = a9e458c6e07cdf62649de7722e1e5a7f13aa82eeb397bfbbebc07cf5cf273584 +SIZE (mpd-0.20.20.tar.xz) = 793776 diff --git a/audio/soundconverter/Makefile b/audio/soundconverter/Makefile index ed9c3f8383d..fcf3bf07748 100644 --- a/audio/soundconverter/Makefile +++ b/audio/soundconverter/Makefile @@ -17,7 +17,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gstreamer>=0.10:multimedia/py-gstreamer@${PY_FLAVOR} NO_ARCH= yes -USES= desktop-file-utils gmake python:2.7 shebangfix tar:xz +USES= desktop-file-utils gettext-tools gmake python:2.7 \ + shebangfix tar:xz SHEBANG_FILES= bin/soundconverter.py diff --git a/benchmarks/hs-criterion/Makefile b/benchmarks/hs-criterion/Makefile index 550b7f6bfc8..c35b25cb3bd 100644 --- a/benchmarks/hs-criterion/Makefile +++ b/benchmarks/hs-criterion/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= criterion -PORTVERSION= 1.2.1.0 -PORTREVISION= 1 +PORTVERSION= 1.4.1.0 CATEGORIES= benchmarks haskell MAINTAINER= haskell@FreeBSD.org @@ -11,10 +10,10 @@ COMMENT= Robust, reliable performance measurement and analysis LICENSE= BSD3CLAUSE -USE_CABAL= aeson ansi-wl-pprint base-compat cassava code-page \ - exceptions Glob js-flot js-jquery microstache mtl mwc-random \ - optparse-applicative parsec statistics text transformers-compat \ - vector vector-algorithms +USE_CABAL= aeson ansi-wl-pprint base-compat base-compat-batteries \ + cassava code-page exceptions Glob js-flot js-jquery \ + microstache mtl mwc-random optparse-applicative statistics \ + transformers-compat vector vector-algorithms INSTALL_PORTEXAMPLES= \ cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR} diff --git a/benchmarks/hs-criterion/distinfo b/benchmarks/hs-criterion/distinfo index c6ecf2f20f2..89a0e29d642 100644 --- a/benchmarks/hs-criterion/distinfo +++ b/benchmarks/hs-criterion/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499613825 -SHA256 (cabal/criterion-1.2.1.0.tar.gz) = d9f4bb88a8762f91ce305896cd7e964d25f007949f7e05514503eec59ca97041 -SIZE (cabal/criterion-1.2.1.0.tar.gz) = 126663 +TIMESTAMP = 1525009665 +SHA256 (cabal/criterion-1.4.1.0.tar.gz) = c49306676aa7927c3ca3c1807b081d1e86771eb8da99c8391f9c4dacb24a826c +SIZE (cabal/criterion-1.4.1.0.tar.gz) = 130976 diff --git a/benchmarks/iperf/Makefile b/benchmarks/iperf/Makefile index 2b7f8c62036..0bb817af161 100644 --- a/benchmarks/iperf/Makefile +++ b/benchmarks/iperf/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= iperf -PORTVERSION= 2.0.10 -PORTREVISION= 1 +PORTVERSION= 2.0.11 CATEGORIES= benchmarks MASTER_SITES= SF/${PORTNAME}2 @@ -26,7 +25,7 @@ IPV6_CONFIGURE_ENABLE= ipv6 THREADS_CONFIGURE_ENABLE= threads THREADS_LDFLAGS= -lpthread -post-install: +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/ cd ${WRKSRC}/ && ${INSTALL_DATA} README doc/*.gif doc/*.html ${STAGEDIR}${DOCSDIR}/ diff --git a/benchmarks/iperf/distinfo b/benchmarks/iperf/distinfo index ae389e12af4..d235baf36f7 100644 --- a/benchmarks/iperf/distinfo +++ b/benchmarks/iperf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1502528492 -SHA256 (iperf-2.0.10.tar.gz) = 7fe4348dcca313b74e0aa9c34a8ccd713b84a5615b8578f4aa94cedce9891ef2 -SIZE (iperf-2.0.10.tar.gz) = 290282 +TIMESTAMP = 1527215082 +SHA256 (iperf-2.0.11.tar.gz) = b7d650d07c6bb0e357b5938a20e4ac33876012fddb952299c5d321e6958da5d2 +SIZE (iperf-2.0.11.tar.gz) = 330923 diff --git a/benchmarks/iperf/files/patch-src-Client.cpp b/benchmarks/iperf/files/patch-src-Client.cpp deleted file mode 100644 index 9e4e2c8355f..00000000000 --- a/benchmarks/iperf/files/patch-src-Client.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Client.cpp.orig 2017-08-09 03:54:14 UTC -+++ src/Client.cpp -@@ -680,7 +680,7 @@ void Client::Run( void ) { - - // store datagram ID into buffer - if (isSeqNo64b(mSettings)) { -- mBuf_UDP->id = htonl((reportstruct->packetID & 0xFFFFFFFFFL)); -+ mBuf_UDP->id = htonl((reportstruct->packetID & 0xFFFFFFFFL)); - mBuf_UDP->id2 = htonl((((reportstruct->packetID & 0xFFFFFFFF00000000LL) >> 32) | 0x80000000L)); - } else { - mBuf_UDP->id = htonl(((reportstruct->packetID & 0xFFFFFFFFL) | 0x80000000L)); diff --git a/cad/zcad/Makefile b/cad/zcad/Makefile index 162e7ca2513..4375686d6ff 100644 --- a/cad/zcad/Makefile +++ b/cad/zcad/Makefile @@ -3,52 +3,51 @@ PORTNAME= zcad PORTVERSION= 0.9.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= cad +PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX} MASTER_SITES= LOCAL/danfe DISTNAME= ${PORTNAME}-trunk-r2259 MAINTAINER= danfe@FreeBSD.org COMMENT= Simple CAD program -BUILD_DEPENDS= lazbuild:editors/lazarus - -USES= fpc tar:xz +USES= fpc lazarus:flavors tar:xz USE_FPC= cairo chm fcl-base fcl-image fcl-json fcl-stl fcl-xml opengl \ pasjpeg rtl-extra rtl-objpas x11 -LAZARUS_VER= 1.8.0 -LAZBUILD_CMD= ${LOCALBASE}/bin/lazbuild -d --pcp=${WRKSRC}/tmppcp \ - --lazarusdir=${LAZARUS_DIR} -LAZARUS_DIR= ${LOCALBASE}/share/lazarus-${LAZARUS_VER} -LCL_UNITS_DIR= ${LAZARUS_DIR}/lcl/units/${BUILDNAME} - EXTRACT_CMD= LC_ALL=en_US.UTF-8 ${TAR} # for non-ASCII filenames -MAKE_ENV= LAZBUILD_CMD="${LAZBUILD_CMD}" +MAKE_ENV= LAZBUILD_CMD="${LAZBUILD_CMD}" \ + LAZBUILD_ARGS="${LAZBUILD_ARGS}" \ + LCL_PLATFORM="${LCL_PLATFORM}" \ + LAZARUS_DIR="${LAZARUS_DIR}" \ + INSTANTFPCCACHE="${WRKSRC}/.cache" +NO_LAZBUILD= yes WRKSRC= ${WRKDIR}/trunk BUILD_WRKSRC= ${WRKSRC}/cad_source INSTALL_WRKSRC= ${WRKSRC}/cad +LAZBUILD_ARGS= -d --pcp=${WRKSRC}/tmppcp +LAZARUS_NO_FLAVORS=qt5 + +gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt4 +qt4_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 + MAKE_JOBS_UNSAFE= yes PORTDOCS= UserGuide.odt UserGuide.pdf OPTIONS_DEFINE= DOCS -OPTIONS_SINGLE= GUI -OPTIONS_SINGLE_GUI= GTK2 QT4 -OPTIONS_DEFAULT= GTK2 -GTK2_BUILD_DEPENDS= ${LCL_UNITS_DIR}/gtk2/interfaces.ppu:editors/lazarus-lcl-gtk2 -GTK2_USE= GNOME=gtk20 FPC=gtk2 -GTK2_MAKE_ENV= GUI=gtk2 -GTK2_VARS= LAZBUILD_CMD+=--ws=gtk2 +.if ${FLAVOR:Ugtk2:Mgtk2} +MAKE_ENV+= GUI=gtk2 +.endif -QT4_BUILD_DEPENDS= ${LCL_UNITS_DIR}/qt/interfaces.ppu:editors/lazarus-lcl-qt -QT4_LIB_DEPENDS= libQt4Pas.so:x11-toolkits/qt4pas -QT4_MAKE_ENV= GUI=qt -QT4_VARS= LAZBUILD_CMD+=--ws=qt +.if ${FLAVOR:Uqt4:Mqt4} +MAKE_ENV+= GUI=qt +.endif post-patch: @${EGREP} -lR 'IFN?DEF LINUX' ${BUILD_WRKSRC} | ${XARGS} \ @@ -74,8 +73,12 @@ pre-build: # copy them locally first for the same reason as above) ${CP} -a ${LAZARUS_DIR}/components/fpvectorial \ ${LAZARUS_DIR}/components/anchordocking ${WRKSRC} - ${LAZBUILD_CMD} ${WRKSRC}/fpvectorial/fpvectorialpkg.lpk - ${LAZBUILD_CMD} ${WRKSRC}/anchordocking/anchordocking.lpk + ${SETENV} ${MAKE_ENV} ${LAZBUILD_CMD} ${LAZBUILD_ARGS} --ws=${LCL_PLATFORM} \ + --lazarusdir=${LAZARUS_DIR} \ + ${WRKSRC}/fpvectorial/fpvectorialpkg.lpk + ${SETENV} ${MAKE_ENV} ${LAZBUILD_CMD} ${LAZBUILD_ARGS} --ws=${LCL_PLATFORM} \ + --lazarusdir=${LAZARUS_DIR} \ + ${WRKSRC}/anchordocking/anchordocking.lpk do-install: # Not ready for hier(7)-conforming installation yet diff --git a/cad/zcad/files/makefile b/cad/zcad/files/makefile index 6e38acab3b0..442eb3ccdb8 100644 --- a/cad/zcad/files/makefile +++ b/cad/zcad/files/makefile @@ -6,7 +6,7 @@ OUTSUFX= lib/$(ARCH)-$(OPSYS:tl) # at $0814EBB3'' message (EAccessViolation: Access violation). It might # be some concurrency issue, but it occurs even with MAKE_JOBS_UNSAFE, so # use the following simple workaround for the time being. -ZEALOUS_BUILD= sh -c 'i=0 ; until $(LAZBUILD_CMD) $$0 ; do \ +ZEALOUS_BUILD= sh -c 'i=0 ; until $(LAZBUILD_CMD) $(LAZBUILD_ARGS) --ws=$(LCL_PLATFORM) --lazarusdir=$(LAZARUS_DIR) $$0 ; do \ test $$i -lt 4 || return ; i=$$((i+1)) ; done' all: ../$(OUTSUFX)/zcad.compiled diff --git a/chinese/auto-tw-l10n/Makefile b/chinese/auto-tw-l10n/Makefile index 39ecc0cc2c4..67df23cd9c9 100644 --- a/chinese/auto-tw-l10n/Makefile +++ b/chinese/auto-tw-l10n/Makefile @@ -3,7 +3,7 @@ PORTNAME= auto-tw-l10n PORTVERSION= 1.15 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= chinese MASTER_SITES= LOCAL/sunpoet diff --git a/chinese/auto-tw-l10n/files/patch-dot.xinitrc b/chinese/auto-tw-l10n/files/patch-dot.xinitrc index dffeabc8112..4308de3b760 100644 --- a/chinese/auto-tw-l10n/files/patch-dot.xinitrc +++ b/chinese/auto-tw-l10n/files/patch-dot.xinitrc @@ -1,33 +1,41 @@ ---- dot.xinitrc.orig 2016-04-30 18:04:47 UTC -+++ dot.xinitrc -@@ -4,19 +4,23 @@ export XMODIFIERS='@im=xcin' +--- dot.xinitrc.orig 2018-05-25 11:12:38.061402000 +0800 ++++ dot.xinitrc 2018-05-25 11:15:12.366127000 +0800 +@@ -1,22 +1,27 @@ + export TERM=xterm + +-export XMODIFIERS='@im=xcin' ++#export XMODIFIERS='@im=xcin' ++export XMODIFIERS='@im=gcin' #export XMODIFIERS='@im=SCIM' #export XMODIFIERS='@im=oxim' #export XMODIFIERS=@im=ibus +#export XMODIFIERS='@im=fcitx' #export GTK_IM_MODULE=xcin -+#export GTK_IM_MODULE=gcin - export GTK_IM_MODULE=xim +-export GTK_IM_MODULE=xim ++export GTK_IM_MODULE=gcin ++#export GTK_IM_MODULE=xim #export GTK_IM_MODULE=scim #export GTK_IM_MODULE=oxim #export GTK_IM_MODULE=ibus +#export GTK_IM_MODULE=fcitx -+#export QT_IM_MODULE=gcin - export QT_IM_MODULE=xim -- --export GCIN_XIM=xcin +-export QT_IM_MODULE=xim ++export QT_IM_MODULE=gcin ++#export QT_IM_MODULE=xim +#export QT_IM_MODULE=fcitx +-export GCIN_XIM=xcin +- # Input Method exec gcin & +#exec fcitx & #exec xcin2.5 & #scim -d & #exec oxim & -@@ -37,3 +41,4 @@ export XLIB_SKIP_ARGB_VISUALS=1 +@@ -37,3 +42,5 @@ #exec wmaker #exec startxfce4 #exec startkde4 +#exec startfluxbox ++#exec ck-launch-session startkde diff --git a/comms/cqrlog/Makefile b/comms/cqrlog/Makefile index 460d3d2736f..10f99a86a79 100644 --- a/comms/cqrlog/Makefile +++ b/comms/cqrlog/Makefile @@ -3,22 +3,22 @@ PORTNAME= cqrlog PORTVERSION= 2.2.0 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= comms hamradio +PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX} MAINTAINER= hamradio@FreeBSD.org COMMENT= Amateur Radio logging application LICENSE= GPLv2 -BUILD_DEPENDS= lazbuild:editors/lazarus -PATCH_DEPENDS= ${LAZARUS_DIR}/tools/lazres:editors/lazarus LIB_DEPENDS= libhamlib.so:comms/hamlib USE_GITHUB= yes GH_ACCOUNT= ok2cqr -USES= fpc shebangfix +USES= fpc lazarus:flavors shebangfix SHEBANG_FILES= tools/cqrlog-apparmor-fix \ voice_keyer/voice_keyer.sh @@ -28,23 +28,18 @@ USE_FPC= cairo fcl-base chm fcl-db fcl-image fcl-json fcl-net fcl-web \ ALL_TARGET= ${PORTNAME} -LAZARUS_VER= 1.8.0 -LAZARUS_DIR= ${LOCALBASE}/share/lazarus-${LAZARUS_VER} - -OPTIONS_SINGLE= LCL -OPTIONS_SINGLE_LCL= GTK2 QT4 -OPTIONS_DEFAULT= GTK2 +MAKE_ENV+= LAZBUILD_CMD="${LAZBUILD_CMD}" \ + LAZBUILD_ARGS="${LAZBUILD_ARGS}" \ + LCL_PLATFORM="${LCL_PLATFORM}" \ + LAZARUS_DIR="${LAZARUS_DIR}" USE_XORG+= x11 -USE_GNOME+= gdkpixbuf2 cairo +NO_LAZBUILD= yes +LAZBUILD_ARGS= -d --pcp=. +LAZARUS_NO_FLAVORS=qt5 -GTK2_USE= fpc=gtk2 gnome=gtk20 -GTK2_BUILD_DEPENDS= ${LAZARUS_DIR}/lcl/units/${BUILDNAME}/gtk2/interfaces.ppu:editors/lazarus-lcl-gtk2 -GTK2_MAKE_ARGS= PLATFORM=gtk2 - -QT4_LIB_DEPENDS= libQt4Pas.so:x11-toolkits/qt4pas -QT4_BUILD_DEPENDS= ${LAZARUS_DIR}/lcl/units/${BUILDNAME}/qt/interfaces.ppu:editors/lazarus-lcl-qt -QT4_MAKE_ARGS= PLATFORM=qt +gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt4 +qt4_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 post-extract: @${RM} -r ${WRKSRC}/src/lnet/lib/openssl.pas @@ -67,8 +62,6 @@ post-patch: ${WRKSRC}/src/dData.pas ${WRKSRC}/src/fGrayline.pas ${REINPLACE_CMD} -e s!Linux!FreeBSD!g \ ${WRKSRC}/src/fMain.lfm - ${REINPLACE_CMD} -e s!%%LAZARUSDIR%%!${LAZARUS_DIR}!g \ - ${WRKSRC}/Makefile ${RM} -r ${WRKSRC}/src/mysql .include diff --git a/comms/cqrlog/files/patch-Makefile b/comms/cqrlog/files/patch-Makefile index ae8aba6e1e3..9a416e65af1 100644 --- a/comms/cqrlog/files/patch-Makefile +++ b/comms/cqrlog/files/patch-Makefile @@ -2,7 +2,7 @@ +++ Makefile 2018-01-05 12:34:28.752177000 -0500 @@ -1,12 +1,13 @@ -CC=lazbuild -+CC=lazbuild -d ++LAZBUILD_CMD?=lazbuild -d ST=strip -datadir = $(DESTDIR)/usr/share/cqrlog -bindir = $(DESTDIR)/usr/bin @@ -15,7 +15,7 @@ cqrlog: src/cqrlog.lpi - $(CC) --ws=gtk2 --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi -+ $(CC) --pcp=. --ws=${PLATFORM} src/cqrlog.lpi --lazarusdir=%%LAZARUSDIR%% ++ $(LAZBUILD_CMD) $(LAZBUILD_ARGS) --ws=$(LCL_PLATFORM) --lazarusdir=$(LAZARUS_DIR) src/cqrlog.lpi $(ST) src/cqrlog gzip tools/cqrlog.1 -c > tools/cqrlog.1.gz diff --git a/comms/cqrlog/files/patch-src_cqrlog.lpi b/comms/cqrlog/files/patch-src_cqrlog.lpi index 9c5f05f4014..a4b488c1815 100644 --- a/comms/cqrlog/files/patch-src_cqrlog.lpi +++ b/comms/cqrlog/files/patch-src_cqrlog.lpi @@ -1,11 +1,20 @@ ---- src/cqrlog.lpi.orig 2016-04-20 16:06:15 UTC -+++ src/cqrlog.lpi -@@ -32,7 +32,7 @@ +--- src/cqrlog.lpi.orig 2017-12-30 02:10:01.000000000 -0500 ++++ src/cqrlog.lpi 2018-04-07 19:17:15.225110000 -0500 +@@ -35,7 +35,7 @@ - -+ ++ +@@ -748,7 +748,7 @@ + + + +- ++ + + + diff --git a/comms/librs232/Makefile b/comms/librs232/Makefile index c0dd5c5af22..94c20721ee2 100644 --- a/comms/librs232/Makefile +++ b/comms/librs232/Makefile @@ -1,12 +1,12 @@ # $FreeBSD$ PORTNAME= librs232 -PORTVERSION= 20170805 +PORTVERSION= 20171122 CATEGORIES= comms DISTNAME= RS-232 MASTER_SITES= http://www.teuniz.net/RS-232/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= kevlo@FreeBSD.org COMMENT= Simple serial library LICENSE= GPLv3 diff --git a/comms/librs232/distinfo b/comms/librs232/distinfo index e51ab509dfd..92fec56b94d 100644 --- a/comms/librs232/distinfo +++ b/comms/librs232/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1507967158 -SHA256 (RS-232.tar.gz) = b209800a9bea83ad6381ed0a62b3f92d4fe11d933ad85dd6d50abd09489cf8ca -SIZE (RS-232.tar.gz) = 31949 +TIMESTAMP = 1527224866 +SHA256 (RS-232.tar.gz) = e7081e3254dae901b6d4dfda7ce5affb1c8a5dadd9708e4e6ed7ad2a9532450c +SIZE (RS-232.tar.gz) = 31467 diff --git a/comms/librs232/files/Makefile b/comms/librs232/files/Makefile index b642ce8fdef..fa4ed49d40e 100644 --- a/comms/librs232/files/Makefile +++ b/comms/librs232/files/Makefile @@ -13,6 +13,5 @@ INCSDIR=${PREFIX}/include LIB= rs232 SHLIB_MAJOR= 1 LIBDIR= ${PREFIX}/lib -NO_PROFILE= YES .include diff --git a/comms/librs232/pkg-plist b/comms/librs232/pkg-plist index 57385db495c..fe3c94808dc 100644 --- a/comms/librs232/pkg-plist +++ b/comms/librs232/pkg-plist @@ -1,4 +1,5 @@ include/rs232.h +lib/librs232_p.a lib/librs232.a lib/librs232.so lib/librs232.so.1 diff --git a/converters/hs-aeson-compat/Makefile b/converters/hs-aeson-compat/Makefile index 4a0a107ae1e..e46500b3aa6 100644 --- a/converters/hs-aeson-compat/Makefile +++ b/converters/hs-aeson-compat/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= aeson-compat -PORTVERSION= 0.3.7 -PORTREVISION= 1 +PORTVERSION= 0.3.7.1 CATEGORIES= converters haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,7 @@ COMMENT= Fast JSON parsing and encoding LICENSE= BSD3CLAUSE USE_CABAL= aeson attoparsec attoparsec-iso8601 base-compat exceptions \ - hashable scientific semigroups tagged text time-locale-compat \ + hashable scientific semigroups tagged time-locale-compat \ unordered-containers vector .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" diff --git a/converters/hs-aeson-compat/distinfo b/converters/hs-aeson-compat/distinfo index e2206260559..c857e836743 100644 --- a/converters/hs-aeson-compat/distinfo +++ b/converters/hs-aeson-compat/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499691052 -SHA256 (cabal/aeson-compat-0.3.7.tar.gz) = 1bf2c2a3d38caba5d3336757f60702afb5dcac6a77aa3d86c9d55f81e4517c14 -SIZE (cabal/aeson-compat-0.3.7.tar.gz) = 6900 +TIMESTAMP = 1524342688 +SHA256 (cabal/aeson-compat-0.3.7.1.tar.gz) = 59740dc1e37b08e60abb47f38b87de5b9805611a1b468cd18294d5982a1dcacb +SIZE (cabal/aeson-compat-0.3.7.1.tar.gz) = 6913 diff --git a/converters/hs-aeson-compat/files/patch-aeson-compat.cabal b/converters/hs-aeson-compat/files/patch-aeson-compat.cabal index 8b11ebe2fea..ece7354ed57 100644 --- a/converters/hs-aeson-compat/files/patch-aeson-compat.cabal +++ b/converters/hs-aeson-compat/files/patch-aeson-compat.cabal @@ -1,18 +1,21 @@ ---- aeson-compat.cabal.orig 2017-06-07 12:52:36 UTC +--- aeson-compat.cabal.orig 2017-07-24 12:29:50 UTC +++ aeson-compat.cabal -@@ -42,7 +42,6 @@ library +@@ -31,14 +31,14 @@ library + src + ghc-options: -Wall + build-depends: +- base >=4.6 && <4.11 +- , base-compat >=0.6.0 && <0.10 +- , aeson >=0.7.0.6 && <1.3 ++ base >=4.6 && <4.12 ++ , base-compat >=0.6.0 && <0.11 ++ , aeson >=0.7.0.6 && <1.4 + , attoparsec >=0.12 && <0.14 + , attoparsec-iso8601 >=1.0.0.0 && <1.1 + , bytestring >=0.10 && <0.11 , containers >=0.5 && <0.6 - , exceptions >=0.8 && <0.9 +- , exceptions >=0.8 && <0.9 ++ , exceptions >=0.8 && <0.11 , hashable >=1.2 && <1.3 -- , nats >=1 && <1.2 , scientific >=0.3 && <0.4 , text >=1.2 && <1.3 - , time >=1.4.2 && <1.9 -@@ -70,7 +69,6 @@ test-suite aeson-compat-test - , containers - , exceptions - , hashable -- , nats - , scientific - , text - , time diff --git a/converters/hs-aeson-pretty/Makefile b/converters/hs-aeson-pretty/Makefile index 99584c0638d..a6ac165ca99 100644 --- a/converters/hs-aeson-pretty/Makefile +++ b/converters/hs-aeson-pretty/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= aeson-pretty -PORTVERSION= 0.8.5 -PORTREVISION= 1 +PORTVERSION= 0.8.7 CATEGORIES= converters haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= JSON pretty-printing library and command-line tool LICENSE= BSD3CLAUSE -USE_CABAL= aeson attoparsec base-compat cmdargs scientific text \ +USE_CABAL= aeson attoparsec base-compat cmdargs scientific \ unordered-containers vector FLAGS_DISABLE= lib-only diff --git a/converters/hs-aeson-pretty/distinfo b/converters/hs-aeson-pretty/distinfo index 1ee8ffeee3c..d47f61e70d9 100644 --- a/converters/hs-aeson-pretty/distinfo +++ b/converters/hs-aeson-pretty/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499545723 -SHA256 (cabal/aeson-pretty-0.8.5.tar.gz) = dd17e86c64b3fe2efb7a855b27b0e5490e42dc58194ae1809d8b662d4e42a9f9 -SIZE (cabal/aeson-pretty-0.8.5.tar.gz) = 5568 +TIMESTAMP = 1524342480 +SHA256 (cabal/aeson-pretty-0.8.7.tar.gz) = c1c1ecc5e3abd004a6c4c256ee6f61da2a43d7f1452ffa391dee250df43b27d5 +SIZE (cabal/aeson-pretty-0.8.7.tar.gz) = 5610 diff --git a/converters/hs-aeson/Makefile b/converters/hs-aeson/Makefile index 9e9e6b74bbf..eeaf65c73b9 100644 --- a/converters/hs-aeson/Makefile +++ b/converters/hs-aeson/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= aeson -PORTVERSION= 1.2.1.0 -PORTREVISION= 1 +PORTVERSION= 1.3.1.0 CATEGORIES= converters haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,7 @@ COMMENT= Fast JSON parsing and encoding LICENSE= BSD3CLAUSE USE_CABAL= attoparsec>=0.13.0.1 base-compat>=0.9.1 dlist>=0.6 hashable>=1.1.2.0 \ - scientific>=0.3.1 syb tagged text>=1.1.1.0 time-locale-compat>=0.1.1 \ + scientific>=0.3.1 tagged th-abstraction time-locale-compat>=0.1.1 \ unordered-containers>=0.2.3.0 uuid-types>=1.0.3 vector>=0.8 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" diff --git a/converters/hs-aeson/distinfo b/converters/hs-aeson/distinfo index 5de020c43d3..b659c49c7de 100644 --- a/converters/hs-aeson/distinfo +++ b/converters/hs-aeson/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499459814 -SHA256 (cabal/aeson-1.2.1.0.tar.gz) = 96170fdbed9bf52357bd6eada0173c4ae8086df01522ed2b8a070f2f51148a73 -SIZE (cabal/aeson-1.2.1.0.tar.gz) = 272206 +TIMESTAMP = 1523782803 +SHA256 (cabal/aeson-1.3.1.0.tar.gz) = 3977f17b1588bd530755e3517d272024229e72d8a110f15b5b78fc15df6c5652 +SIZE (cabal/aeson-1.3.1.0.tar.gz) = 261732 diff --git a/converters/hs-dataenc/Makefile b/converters/hs-dataenc/Makefile index 9157131f964..e259f872443 100644 --- a/converters/hs-dataenc/Makefile +++ b/converters/hs-dataenc/Makefile @@ -2,7 +2,7 @@ PORTNAME= dataenc PORTVERSION= 0.14.0.7 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= converters haskell MAINTAINER= haskell@FreeBSD.org diff --git a/converters/hs-json/Makefile b/converters/hs-json/Makefile index 5940686ca09..246c0dffdb0 100644 --- a/converters/hs-json/Makefile +++ b/converters/hs-json/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= json -PORTVERSION= 0.9.1 -PORTREVISION= 2 +PORTVERSION= 0.9.2 CATEGORIES= converters haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,7 @@ COMMENT= Support for serialising Haskell to and from JSON LICENSE= BSD3CLAUSE -USE_CABAL= mtl parsec syb text +USE_CABAL= mtl syb .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/converters/hs-json/distinfo b/converters/hs-json/distinfo index 81625decc0a..70a6dab8dbe 100644 --- a/converters/hs-json/distinfo +++ b/converters/hs-json/distinfo @@ -1,2 +1,3 @@ -SHA256 (cabal/json-0.9.1.tar.gz) = 96b57e4d167e45dc80aeff872a922ae9cdb953a1ded29ebbb51019b68f0085a2 -SIZE (cabal/json-0.9.1.tar.gz) = 22568 +TIMESTAMP = 1523994029 +SHA256 (cabal/json-0.9.2.tar.gz) = e6bb16fa791cc3833ae7b459b7e7885c1c2b11b0d294b7e095287c54fa73738e +SIZE (cabal/json-0.9.2.tar.gz) = 22650 diff --git a/converters/hs-sandi/Makefile b/converters/hs-sandi/Makefile index c348ef67450..885ca8273b3 100644 --- a/converters/hs-sandi/Makefile +++ b/converters/hs-sandi/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= sandi -PORTVERSION= 0.4.0 -PORTREVISION= 1 +PORTVERSION= 0.4.2 CATEGORIES= converters haskell MAINTAINER= haskell@FreeBSD.org diff --git a/converters/hs-sandi/distinfo b/converters/hs-sandi/distinfo index d21da2d3c0c..81db367b0bc 100644 --- a/converters/hs-sandi/distinfo +++ b/converters/hs-sandi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499619802 -SHA256 (cabal/sandi-0.4.0.tar.gz) = 40c895a4b26904e3a4b4488e93f37225bdb48e6787dffed627d16242f01aaeea -SIZE (cabal/sandi-0.4.0.tar.gz) = 19319 +TIMESTAMP = 1524431120 +SHA256 (cabal/sandi-0.4.2.tar.gz) = 2bc1fc4f8e71009adc9f38304f63684f2795c31077670214147f261bd2bc7337 +SIZE (cabal/sandi-0.4.2.tar.gz) = 19198 diff --git a/databases/hs-esqueleto/Makefile b/databases/hs-esqueleto/Makefile index 3101a60bc2f..9649100342c 100644 --- a/databases/hs-esqueleto/Makefile +++ b/databases/hs-esqueleto/Makefile @@ -2,7 +2,7 @@ PORTNAME= esqueleto PORTVERSION= 2.5.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,9 @@ COMMENT= Type-safe EDSL for SQL queries on persistent backends LICENSE= BSD3CLAUSE USE_CABAL= blaze-html conduit monad-logger persistent \ - resourcet tagged text unordered-containers + resourcet tagged unordered-containers + +IGNORE= Doesn't build with recent Persistent .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/databases/hs-hedis/Makefile b/databases/hs-hedis/Makefile index 25d3d982036..81ecbe4ddf7 100644 --- a/databases/hs-hedis/Makefile +++ b/databases/hs-hedis/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= hedis -PORTVERSION= 0.9.8 +PORTVERSION= 0.10.1 PORTREVISION= 1 CATEGORIES= databases haskell @@ -11,8 +11,8 @@ COMMENT= Client library for the Redis datastore LICENSE= BSD3CLAUSE -USE_CABAL= async bytestring-lexing mtl network resource-pool scanner stm \ - text unordered-containers vector +USE_CABAL= async bytestring-lexing errors HTTP mtl network network-uri \ + resource-pool scanner unordered-containers vector .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/databases/hs-hedis/distinfo b/databases/hs-hedis/distinfo index 45ae6d783f3..399fe1ec2c4 100644 --- a/databases/hs-hedis/distinfo +++ b/databases/hs-hedis/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499619995 -SHA256 (cabal/hedis-0.9.8.tar.gz) = 822e298c2fe55f7edf0e3a005e901fe7b107c4734eb0dd8f1ab6382330d3ae62 -SIZE (cabal/hedis-0.9.8.tar.gz) = 40058 +TIMESTAMP = 1524158122 +SHA256 (cabal/hedis-0.10.1.tar.gz) = 56afcf52d8b32f23a79de7c50bcaf309f0dfd610cceacb6174dfdce0c051f5f7 +SIZE (cabal/hedis-0.10.1.tar.gz) = 42203 diff --git a/databases/hs-mysql/Makefile b/databases/hs-mysql/Makefile index 40396cde5d5..510c8306b02 100644 --- a/databases/hs-mysql/Makefile +++ b/databases/hs-mysql/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= mysql -PORTVERSION= 0.1.4 -PORTREVISION= 1 +PORTVERSION= 0.1.5 CATEGORIES= databases haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,7 @@ COMMENT= Low-level MySQL client library LICENSE= BSD3CLAUSE -USE_MYSQL= yes +USES= mysql ssl .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/databases/hs-mysql/distinfo b/databases/hs-mysql/distinfo index 9df0cddfc53..784ee195e86 100644 --- a/databases/hs-mysql/distinfo +++ b/databases/hs-mysql/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499450806 -SHA256 (cabal/mysql-0.1.4.tar.gz) = 9b8675db208851524a77b6e5c4278e6bc29eab16d970a9dda312ae366bdb668e -SIZE (cabal/mysql-0.1.4.tar.gz) = 16219 +TIMESTAMP = 1524151121 +SHA256 (cabal/mysql-0.1.5.tar.gz) = 49b367d07f6d93fd4cbd08390f83bbf8e40c66156a1d2b0f570b68921e6f3075 +SIZE (cabal/mysql-0.1.5.tar.gz) = 16389 diff --git a/databases/hs-persistent-sqlite/Makefile b/databases/hs-persistent-sqlite/Makefile index 44e8f2f8503..410c0d24542 100644 --- a/databases/hs-persistent-sqlite/Makefile +++ b/databases/hs-persistent-sqlite/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= persistent-sqlite -PORTVERSION= 2.6.2 -PORTREVISION= 1 +PORTVERSION= 2.8.1.2 CATEGORIES= databases haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,7 @@ COMMENT= Backend for the persistent library using sqlite3 LICENSE= MIT USE_CABAL= aeson conduit microlens-th monad-control monad-logger \ - old-locale persistent resource-pool resourcet text \ + old-locale persistent resource-pool resourcet \ unordered-containers .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" diff --git a/databases/hs-persistent-sqlite/distinfo b/databases/hs-persistent-sqlite/distinfo index 18e946c2798..0151970acef 100644 --- a/databases/hs-persistent-sqlite/distinfo +++ b/databases/hs-persistent-sqlite/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499620122 -SHA256 (cabal/persistent-sqlite-2.6.2.tar.gz) = 6136c471fc81869cf0fde2049defb9c82698e3c0048d1321c3eda01046b985bf -SIZE (cabal/persistent-sqlite-2.6.2.tar.gz) = 3568400 +TIMESTAMP = 1525169028 +SHA256 (cabal/persistent-sqlite-2.8.1.2.tar.gz) = 2f7157f3830370f60c7c36490ea49b7c52caf0f2a7349f86cf47970189f9ad0c +SIZE (cabal/persistent-sqlite-2.8.1.2.tar.gz) = 2044695 diff --git a/databases/hs-persistent-template/Makefile b/databases/hs-persistent-template/Makefile index 15460be9208..5094ba53bfc 100644 --- a/databases/hs-persistent-template/Makefile +++ b/databases/hs-persistent-template/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= persistent-template -PORTVERSION= 2.5.2 -PORTREVISION= 1 +PORTVERSION= 2.5.4 CATEGORIES= databases haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,7 @@ COMMENT= Type-safe, non-relational, multi-backend persistence LICENSE= MIT USE_CABAL= aeson aeson-compat http-api-data monad-control monad-logger \ - path-pieces persistent tagged text unordered-containers + path-pieces persistent tagged unordered-containers .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/databases/hs-persistent-template/distinfo b/databases/hs-persistent-template/distinfo index 351c8ead4fb..c2e94a6f3ab 100644 --- a/databases/hs-persistent-template/distinfo +++ b/databases/hs-persistent-template/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499620138 -SHA256 (cabal/persistent-template-2.5.2.tar.gz) = de695b008158f9ae66d103fc33f89c098ebcf59337367063d9f4f816a58b4011 -SIZE (cabal/persistent-template-2.5.2.tar.gz) = 20403 +TIMESTAMP = 1525178560 +SHA256 (cabal/persistent-template-2.5.4.tar.gz) = 4cae740ce92f98cb3ae9e092e740753394d5687b887399ee5f87af7f3c730a01 +SIZE (cabal/persistent-template-2.5.4.tar.gz) = 21079 diff --git a/databases/hs-persistent-template/files/patch-persistent-template.cabal b/databases/hs-persistent-template/files/patch-persistent-template.cabal index 9d1b31b66c2..be71582a807 100644 --- a/databases/hs-persistent-template/files/patch-persistent-template.cabal +++ b/databases/hs-persistent-template/files/patch-persistent-template.cabal @@ -1,11 +1,11 @@ ---- persistent-template.cabal.orig 2017-07-10 13:31:32 UTC +--- persistent-template.cabal.orig 2018-05-01 13:03:22 UTC +++ persistent-template.cabal @@ -23,7 +23,7 @@ library , text >= 0.5 , transformers >= 0.2 && < 0.6 , containers -- , aeson >= 0.7 && < 1.2 -+ , aeson >= 0.7 && < 1.3 +- , aeson >= 0.7 && < 1.3 ++ , aeson >= 0.7 && < 1.4 , aeson-compat >= 0.3.2.0 && < 0.4 , monad-logger , unordered-containers diff --git a/databases/hs-persistent/Makefile b/databases/hs-persistent/Makefile index 3dca5c1299f..e4bff1f9a26 100644 --- a/databases/hs-persistent/Makefile +++ b/databases/hs-persistent/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= persistent -PORTVERSION= 2.7.0 -PORTREVISION= 1 +PORTVERSION= 2.8.2 CATEGORIES= databases haskell MAINTAINER= haskell@FreeBSD.org @@ -12,10 +11,10 @@ LICENSE= MIT USE_CABAL= aeson>=0.5 attoparsec base64-bytestring blaze-html>=0.5 \ blaze-markup>=0.5.1 conduit>=1.0 exceptions>=0.6 \ - fast-logger>=2.1 http-api-data lifted-base>=0.1 monad-control>=0.3 \ - monad-logger>=0.3 mtl old-locale path-pieces>=0.1 resource-pool \ - resourcet>=1.1 scientific silently tagged text>=0.8 \ - transformers-base unordered-containers vector + fast-logger>=2.1 haskell-src-meta http-api-data lifted-base \ + monad-control>=0.3 monad-logger>=0.3 mtl old-locale \ + path-pieces>=0.1 resource-pool resourcet>=1.1 scientific \ + silently tagged transformers-base unordered-containers vector .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/databases/hs-persistent/distinfo b/databases/hs-persistent/distinfo index 2f8e6adf207..95e379803d4 100644 --- a/databases/hs-persistent/distinfo +++ b/databases/hs-persistent/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499620101 -SHA256 (cabal/persistent-2.7.0.tar.gz) = cebc4d51d362ce329cb29cb3873eacc01a1453c54d356c4115a7488543e3deea -SIZE (cabal/persistent-2.7.0.tar.gz) = 69320 +TIMESTAMP = 1524929752 +SHA256 (cabal/persistent-2.8.2.tar.gz) = 696bb279259e307778dc7fbd49565c48a66429f14e793a41a13cfae0968c1ec0 +SIZE (cabal/persistent-2.8.2.tar.gz) = 58648 diff --git a/databases/memcached/Makefile b/databases/memcached/Makefile index 59e1e599a9e..345d1521130 100644 --- a/databases/memcached/Makefile +++ b/databases/memcached/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= memcached -PORTVERSION= 1.5.7 +PORTVERSION= 1.5.8 CATEGORIES= databases MASTER_SITES= http://www.memcached.org/files/ \ GENTOO diff --git a/databases/memcached/distinfo b/databases/memcached/distinfo index 6c6756c523d..3823f206693 100644 --- a/databases/memcached/distinfo +++ b/databases/memcached/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1522358405 -SHA256 (memcached-1.5.7.tar.gz) = 5bb706a8fc7ae7461a6788eaddd85e4a4e84e952d3a80c21926342c2838f4e46 -SIZE (memcached-1.5.7.tar.gz) = 458062 +TIMESTAMP = 1527253938 +SHA256 (memcached-1.5.8.tar.gz) = 7388c3989442a46d7e04e8ac2631464e9ce44d5114d79c41dd8780b4b186f6de +SIZE (memcached-1.5.8.tar.gz) = 459715 diff --git a/databases/p5-BSON/Makefile b/databases/p5-BSON/Makefile index a1b3da9579f..f731d8e86db 100644 --- a/databases/p5-BSON/Makefile +++ b/databases/p5-BSON/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= BSON -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 DISTVERSIONPREFIX= v CATEGORIES= databases perl5 MASTER_SITES= CPAN diff --git a/databases/p5-BSON/distinfo b/databases/p5-BSON/distinfo index e76a7f8eda1..7d291042f3f 100644 --- a/databases/p5-BSON/distinfo +++ b/databases/p5-BSON/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1526673798 -SHA256 (BSON-v1.6.1.tar.gz) = 6bda0b72de9bb2c61bac2ce8db6efe41e6848750d959bd689598d487bfc6c8c1 -SIZE (BSON-v1.6.1.tar.gz) = 103589 +TIMESTAMP = 1527232786 +SHA256 (BSON-v1.6.2.tar.gz) = 342c5f0cf974b86a63008008af6d904df0fb5579f4734bb5fec2fed4af156976 +SIZE (BSON-v1.6.2.tar.gz) = 103658 diff --git a/databases/pgbarman/Makefile b/databases/pgbarman/Makefile index 5c5431d5474..32605b93fe7 100644 --- a/databases/pgbarman/Makefile +++ b/databases/pgbarman/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= barman -DISTVERSION= 2.3 +DISTVERSION= 2.4 CATEGORIES= databases MASTER_SITES= SF/${PKGNAMEPREFIX}${PORTNAME}/${DISTVERSION} PKGNAMEPREFIX= pg @@ -15,10 +15,10 @@ COMMENT= Backup and recovery manager for PostgreSQL LICENSE= GPLv3 RUN_DEPENDS= rsync:net/rsync \ - ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}argh>=0.21.2:devel/py-argh@${FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}argcomplete>0:devel/py-argcomplete@${FLAVOR} + ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}argh>=0.21.2:devel/py-argh@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}argcomplete>0:devel/py-argcomplete@${PY_FLAVOR} NO_ARCH= yes diff --git a/databases/pgbarman/distinfo b/databases/pgbarman/distinfo index 312eeb45bbd..7945bf52743 100644 --- a/databases/pgbarman/distinfo +++ b/databases/pgbarman/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1505888753 -SHA256 (barman-2.3.tar.gz) = 1a4cae3052c00f8401adc7af806df3d11375358d0cbd9ab1c84b5333808ea6cf -SIZE (barman-2.3.tar.gz) = 255500 +TIMESTAMP = 1527372855 +SHA256 (barman-2.4.tar.gz) = 33186f33e351ed52f5e378f7a17876a62b156cc4127ff0b15c727d07e837af7b +SIZE (barman-2.4.tar.gz) = 997651 SHA256 (tutorial.pdf) = 21acf6152b959c55b996fb6479c722d3f416eac3384479498a25911a3912a158 SIZE (tutorial.pdf) = 349394 diff --git a/databases/pgmetrics/Makefile b/databases/pgmetrics/Makefile index f4746dc9138..5be43cdcf91 100644 --- a/databases/pgmetrics/Makefile +++ b/databases/pgmetrics/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pgmetrics -PORTVERSION= 1.2.0 +PORTVERSION= 1.3.0 DISTVERSIONPREFIX=v CATEGORIES= databases diff --git a/databases/pgmetrics/distinfo b/databases/pgmetrics/distinfo index 748a67c8c4d..1aa2ba5faaf 100644 --- a/databases/pgmetrics/distinfo +++ b/databases/pgmetrics/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523285934 -SHA256 (rapidloop-pgmetrics-v1.2.0_GH0.tar.gz) = d4069edb2b722c4c342ce7ab6a971b111157d7769d2a3c02b47e1cf1dd62cf31 -SIZE (rapidloop-pgmetrics-v1.2.0_GH0.tar.gz) = 860244 +TIMESTAMP = 1527348063 +SHA256 (rapidloop-pgmetrics-v1.3.0_GH0.tar.gz) = 9b2f92b93ac0d790e6418e343525e93a99fca61acd17f9581ef5f0ac693ba2f4 +SIZE (rapidloop-pgmetrics-v1.3.0_GH0.tar.gz) = 860505 diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile index b0392f89eac..230922e7aa2 100644 --- a/databases/phpmyadmin/Makefile +++ b/databases/phpmyadmin/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= phpMyAdmin -DISTVERSION= 4.8.0.1 -PORTREVISION= 1 +DISTVERSION= 4.8.1 CATEGORIES= databases www MASTER_SITES= https://files.phpmyadmin.net/${PORTNAME}/${DISTVERSION}/ DISTNAME= ${PORTNAME}-${DISTVERSION}-all-languages diff --git a/databases/phpmyadmin/distinfo b/databases/phpmyadmin/distinfo index 47440294b38..5c26062f205 100644 --- a/databases/phpmyadmin/distinfo +++ b/databases/phpmyadmin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1524165110 -SHA256 (phpMyAdmin-4.8.0.1-all-languages.tar.xz) = 36b586d310374a062244adb919d847379aebf4c41ba0e5d11d6ed3186fa052d5 -SIZE (phpMyAdmin-4.8.0.1-all-languages.tar.xz) = 5926908 +TIMESTAMP = 1527231309 +SHA256 (phpMyAdmin-4.8.1-all-languages.tar.xz) = 3bf228f026899acc0c016446501317bfb58938d6bd3816fe90a702e3f401f913 +SIZE (phpMyAdmin-4.8.1-all-languages.tar.xz) = 5916536 diff --git a/databases/rocksdb/Makefile b/databases/rocksdb/Makefile index 55a7f16ffb2..599e69363e6 100644 --- a/databases/rocksdb/Makefile +++ b/databases/rocksdb/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= rocksdb -PORTVERSION= 5.13.1 +PORTVERSION= 5.13.2 DISTVERSIONPREFIX= v CATEGORIES= databases diff --git a/databases/rocksdb/distinfo b/databases/rocksdb/distinfo index 94ede1b5c8c..69919a60f86 100644 --- a/databases/rocksdb/distinfo +++ b/databases/rocksdb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1526403239 -SHA256 (facebook-rocksdb-v5.13.1_GH0.tar.gz) = a99bf51e1da76d8b6487c1dd694311f4e26031071be7802e76fb926154ff33d2 -SIZE (facebook-rocksdb-v5.13.1_GH0.tar.gz) = 4632297 +TIMESTAMP = 1527334235 +SHA256 (facebook-rocksdb-v5.13.2_GH0.tar.gz) = 3e2846dc360f370249c79e0e0ff9b7e4122b0abdf8f9c1f656ecbdd09bf3bf55 +SIZE (facebook-rocksdb-v5.13.2_GH0.tar.gz) = 4633095 diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile index cf636138eb4..a109e2d12d0 100644 --- a/deskutils/calibre/Makefile +++ b/deskutils/calibre/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= calibre -PORTVERSION= 3.23.0 +PORTVERSION= 3.24.1 CATEGORIES= deskutils python MASTER_SITES= http://download.calibre-ebook.com/${PORTVERSION}/ diff --git a/deskutils/calibre/distinfo b/deskutils/calibre/distinfo index 6dc83858f09..1709a86dbce 100644 --- a/deskutils/calibre/distinfo +++ b/deskutils/calibre/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1525418612 -SHA256 (calibre-3.23.0.tar.xz) = c98564e6b5599a4838c68b8266559a487d15abfc04331ad850fcbe09db884337 -SIZE (calibre-3.23.0.tar.xz) = 38942508 +TIMESTAMP = 1527319044 +SHA256 (calibre-3.24.1.tar.xz) = 0b944e91069fa5f2e921deef16f12d054b4d8a2bdfaa4d7c76ec6eeb11b7f2c1 +SIZE (calibre-3.24.1.tar.xz) = 39131268 diff --git a/deskutils/horde-mnemo/Makefile b/deskutils/horde-mnemo/Makefile index 33baefbd68f..9e5b3ea87dd 100644 --- a/deskutils/horde-mnemo/Makefile +++ b/deskutils/horde-mnemo/Makefile @@ -12,7 +12,7 @@ COMMENT= Horde web based notes manager LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= horde cpe +USES= horde cpe USE_PHP= gettext USE_HORDE_BUILD= Horde_Role USE_HORDE_RUN= Horde_Role \ diff --git a/deskutils/horde-mnemo/pkg-descr b/deskutils/horde-mnemo/pkg-descr index 603ae310787..1b2458a0c0d 100644 --- a/deskutils/horde-mnemo/pkg-descr +++ b/deskutils/horde-mnemo/pkg-descr @@ -3,4 +3,4 @@ to keep web-based notes and freeform text. Notes may be shared with other users via shared notepads. It requires the Horde Application Framework and an SQL database or Kolab server for backend storage. -WWW: http://www.horde.org/apps/mnemo/ +WWW: https://www.horde.org/apps/mnemo/ diff --git a/deskutils/hs-fdo-notify/Makefile b/deskutils/hs-fdo-notify/Makefile index 16b24300025..8415fa9e582 100644 --- a/deskutils/hs-fdo-notify/Makefile +++ b/deskutils/hs-fdo-notify/Makefile @@ -2,7 +2,7 @@ PORTNAME= fdo-notify PORTVERSION= 0.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/Makefile b/devel/Makefile index 01252e0421d..8b4826eb8d7 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -914,11 +914,9 @@ SUBDIR += horde-whups SUBDIR += hp48cc SUBDIR += hp48xgcc - SUBDIR += hs-BNFC SUBDIR += hs-Boolean SUBDIR += hs-BoundedChan SUBDIR += hs-ConfigFile - SUBDIR += hs-DrIFT SUBDIR += hs-EdisonAPI SUBDIR += hs-EdisonCore SUBDIR += hs-Glob @@ -955,10 +953,12 @@ SUBDIR += hs-atomic-primops SUBDIR += hs-auto-update SUBDIR += hs-base-compat + SUBDIR += hs-base-compat-batteries SUBDIR += hs-base-orphans SUBDIR += hs-base-unicode-symbols SUBDIR += hs-base16-bytestring SUBDIR += hs-base64-bytestring + SUBDIR += hs-basement SUBDIR += hs-basic-prelude SUBDIR += hs-bifunctors SUBDIR += hs-bits-atomic @@ -1013,6 +1013,7 @@ SUBDIR += hs-dlist SUBDIR += hs-dlist-instances SUBDIR += hs-easy-file + SUBDIR += hs-echo SUBDIR += hs-edit-distance SUBDIR += hs-either SUBDIR += hs-enclosed-exceptions @@ -1052,8 +1053,8 @@ SUBDIR += hs-haskell-lexer SUBDIR += hs-haskell-src SUBDIR += hs-haskell-src-exts + SUBDIR += hs-haskell-src-meta SUBDIR += hs-hasktags - SUBDIR += hs-hastache SUBDIR += hs-hex SUBDIR += hs-hinotify SUBDIR += hs-hint @@ -1064,6 +1065,7 @@ SUBDIR += hs-hsb2hs SUBDIR += hs-hslogger SUBDIR += hs-hslua + SUBDIR += hs-hslua-module-text SUBDIR += hs-hspec SUBDIR += hs-hspec-core SUBDIR += hs-hspec-discover @@ -1095,7 +1097,6 @@ SUBDIR += hs-monad-par SUBDIR += hs-monad-par-extras SUBDIR += hs-monad-unlift - SUBDIR += hs-monadplus SUBDIR += hs-monads-tf SUBDIR += hs-mono-traversable SUBDIR += hs-mono-traversable-instances @@ -1140,8 +1141,9 @@ SUBDIR += hs-simple-reflect SUBDIR += hs-smallcheck SUBDIR += hs-split - SUBDIR += hs-stm SUBDIR += hs-stm-chans + SUBDIR += hs-storable-record + SUBDIR += hs-storable-tuple SUBDIR += hs-streaming-commons SUBDIR += hs-strict SUBDIR += hs-syb @@ -1154,13 +1156,15 @@ SUBDIR += hs-test-framework SUBDIR += hs-test-framework-hunit SUBDIR += hs-test-framework-quickcheck2 - SUBDIR += hs-text SUBDIR += hs-text-icu SUBDIR += hs-text-short SUBDIR += hs-tf-random SUBDIR += hs-th-abstraction + SUBDIR += hs-th-expand-syns SUBDIR += hs-th-lift SUBDIR += hs-th-lift-instances + SUBDIR += hs-th-orphans + SUBDIR += hs-th-reify-many SUBDIR += hs-threads SUBDIR += hs-threadscope SUBDIR += hs-time-compat @@ -1175,6 +1179,9 @@ SUBDIR += hs-uniplate SUBDIR += hs-unix-compat SUBDIR += hs-unix-time + SUBDIR += hs-unliftio + SUBDIR += hs-unliftio-core + SUBDIR += hs-unicode-show SUBDIR += hs-unordered-containers SUBDIR += hs-utf8-light SUBDIR += hs-utf8-string diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile index 0942057d90b..727e8c841cb 100644 --- a/devel/apache-ant/Makefile +++ b/devel/apache-ant/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= apache-ant -DISTVERSION= 1.10.1 +DISTVERSION= 1.10.3 CATEGORIES= devel java MASTER_SITES= APACHE/ant/binaries/:bin \ LOCAL/hq:man diff --git a/devel/apache-ant/distinfo b/devel/apache-ant/distinfo index 372595b85cc..ab9328e3b53 100644 --- a/devel/apache-ant/distinfo +++ b/devel/apache-ant/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1520367502 -SHA256 (apache-ant-1.10.1-bin.tar.bz2) = 3fa4dfcc2f320f8dc01b443c1cb38e86cb85bcc94cc9460bc194342f55e5495a -SIZE (apache-ant-1.10.1-bin.tar.bz2) = 4582443 +TIMESTAMP = 1527348234 +SHA256 (apache-ant-1.10.3-bin.tar.bz2) = 05694f280e3806cf4237dee263dbccd9eecb80fc6ce9ad6a731ce1f7723962c8 +SIZE (apache-ant-1.10.3-bin.tar.bz2) = 4716369 SHA256 (apache-ant-manpage-20030908.tgz) = 721981f64fae3577c04c527232edab9bfa0755af08319049cec206584dc8830c SIZE (apache-ant-manpage-20030908.tgz) = 9735 -SHA256 (apache-ant-1.10.1-manual.tar.bz2) = f3b7efcc54b5bad53d54d3cdc095cf2c1bc803378cf5d7e9c8ae63f23266ef53 -SIZE (apache-ant-1.10.1-manual.tar.bz2) = 1973534 +SHA256 (apache-ant-1.10.3-manual.tar.bz2) = 27859a7d8d52ed2ef89ae4be092d40b307d89a7534d3af9edc6287766f6cd035 +SIZE (apache-ant-1.10.3-manual.tar.bz2) = 1990575 diff --git a/devel/apache-ant/pkg-plist b/devel/apache-ant/pkg-plist index 944a87d2568..d54d299b42b 100644 --- a/devel/apache-ant/pkg-plist +++ b/devel/apache-ant/pkg-plist @@ -50,6 +50,8 @@ %%DATADIR%%/lib/ant-junit.pom %%DATADIR%%/lib/ant-junit4.jar %%DATADIR%%/lib/ant-junit4.pom +%%DATADIR%%/lib/ant-junitlauncher.jar +%%DATADIR%%/lib/ant-junitlauncher.pom %%DATADIR%%/lib/ant-launcher.jar %%DATADIR%%/lib/ant-launcher.pom %%DATADIR%%/lib/ant-netrexx.jar diff --git a/devel/aphpbreakdown/Makefile b/devel/aphpbreakdown/Makefile index e72fe30fa4a..3c8ade2b83d 100644 --- a/devel/aphpbreakdown/Makefile +++ b/devel/aphpbreakdown/Makefile @@ -1,9 +1,10 @@ # $FreeBSD$ PORTNAME= aphpbreakdown -DISTVERSION= 1.0.0 +DISTVERSION= 2.1.0 CATEGORIES= devel www MASTER_SITES= http://phar.code-mesa.com/ +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} EXTRACT_SUFX= .phar MAINTAINER= freebsd@code-mesa.com @@ -11,7 +12,7 @@ COMMENT= Code-Analyzer for PHP for Compatibility Check-UP LICENSE= BSD2CLAUSE -USES= php +USES= php:flavors USE_PHP= tokenizer phar hash NO_ARCH= yes diff --git a/devel/aphpbreakdown/distinfo b/devel/aphpbreakdown/distinfo index e9a41fdc004..24f0d51eebc 100644 --- a/devel/aphpbreakdown/distinfo +++ b/devel/aphpbreakdown/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1512382399 -SHA256 (aphpbreakdown-1.0.0.phar) = d1162cd8db67b9205e4d53181609439f30f5fd0b8b2f5070c3493878fa9c2b18 -SIZE (aphpbreakdown-1.0.0.phar) = 278480 +TIMESTAMP = 1524129483 +SHA256 (aphpbreakdown-2.1.0.phar) = 8414be3dffc201e9a15fce5b9b8e8925bd391a220eb01fd8c634f86d0f943662 +SIZE (aphpbreakdown-2.1.0.phar) = 283205 diff --git a/devel/bmake/Makefile b/devel/bmake/Makefile index 7ffd81c38ae..876750ddbbc 100644 --- a/devel/bmake/Makefile +++ b/devel/bmake/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= bmake -PORTVERSION= 20180222 +PORTVERSION= 20180512 CATEGORIES= devel MASTER_SITES= ftp://ftp.netbsd.org/pub/NetBSD/misc/sjg/ diff --git a/devel/bmake/distinfo b/devel/bmake/distinfo index 2af6a20edc1..e131b29536f 100644 --- a/devel/bmake/distinfo +++ b/devel/bmake/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1520501256 -SHA256 (bmake-20180222.tar.gz) = 6069ea5e72943fe3f7fb4ac43a189b99a90fd830bf6c84572f631f3aa7f507f9 -SIZE (bmake-20180222.tar.gz) = 555823 +TIMESTAMP = 1527348683 +SHA256 (bmake-20180512.tar.gz) = ac3cd262065fcc20c1dec7c95f06306c8138b3e17025b949343a06a8980a5508 +SIZE (bmake-20180512.tar.gz) = 557479 diff --git a/devel/byacc/Makefile b/devel/byacc/Makefile index 08bb58b4017..9f9b224ce91 100644 --- a/devel/byacc/Makefile +++ b/devel/byacc/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= byacc -PORTVERSION= 20180510 +PORTVERSION= 20180525 CATEGORIES= devel MASTER_SITES= https://invisible-mirror.net/archives/byacc/ \ LOCAL/sunpoet diff --git a/devel/byacc/distinfo b/devel/byacc/distinfo index c53e99a9041..ae0dd2e7c95 100644 --- a/devel/byacc/distinfo +++ b/devel/byacc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1526403247 -SHA256 (byacc-20180510.tgz) = d0940dbffbc7e9c9dd4985c25349c390beede84ae1d9fe86b71c0aa659a6d693 -SIZE (byacc-20180510.tgz) = 744070 +TIMESTAMP = 1527334245 +SHA256 (byacc-20180525.tgz) = 129b8d8be35c2cecb89e4ef434dc512402c0243f485334c5733ddf1e267c2de6 +SIZE (byacc-20180525.tgz) = 745273 diff --git a/devel/erlang-gpb/Makefile b/devel/erlang-gpb/Makefile index bd78287084d..939b4872a59 100644 --- a/devel/erlang-gpb/Makefile +++ b/devel/erlang-gpb/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= gpb -PORTVERSION= 4.1.7 +PORTVERSION= 4.1.8 CATEGORIES= devel PKGNAMEPREFIX= erlang- diff --git a/devel/erlang-gpb/distinfo b/devel/erlang-gpb/distinfo index 2b7b1a8fe4d..f6d9c7f48ff 100644 --- a/devel/erlang-gpb/distinfo +++ b/devel/erlang-gpb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1526232863 -SHA256 (tomas-abrahamsson-gpb-4.1.7_GH0.tar.gz) = 53659fa3c38bf78be1e39e3b111354a50c3b8a8e72909747383ff219992634e3 -SIZE (tomas-abrahamsson-gpb-4.1.7_GH0.tar.gz) = 399626 +TIMESTAMP = 1527230283 +SHA256 (tomas-abrahamsson-gpb-4.1.8_GH0.tar.gz) = 12b41845568a01e4d10248a213c38dfc846c2abb964a8b52946f7a873466addd +SIZE (tomas-abrahamsson-gpb-4.1.8_GH0.tar.gz) = 400231 diff --git a/devel/fb303/Makefile b/devel/fb303/Makefile index 36d3f26d637..7dc483ff22d 100644 --- a/devel/fb303/Makefile +++ b/devel/fb303/Makefile @@ -14,8 +14,6 @@ COMMENT= Facebook Bassline LICENSE= APACHE20 -BROKEN= fails to build - LIB_DEPENDS= libthrift.so:devel/thrift-cpp BUILD_DEPENDS= thrift:devel/thrift diff --git a/devel/fb303/files/patch-cpp_FacebookBase.h b/devel/fb303/files/patch-cpp_FacebookBase.h new file mode 100644 index 00000000000..08fcd57b57c --- /dev/null +++ b/devel/fb303/files/patch-cpp_FacebookBase.h @@ -0,0 +1,10 @@ +--- cpp/FacebookBase.h.orig 2018-05-25 20:03:21 UTC ++++ cpp/FacebookBase.h +@@ -22,6 +22,7 @@ + + #include "FacebookService.h" + ++#include + #include + #include + diff --git a/devel/gitphp/Makefile b/devel/gitphp/Makefile index eaf381f5b0c..847c259fe2a 100644 --- a/devel/gitphp/Makefile +++ b/devel/gitphp/Makefile @@ -2,7 +2,7 @@ PORTNAME= gitphp PORTVERSION= 0.2.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel www MASTER_SITES= https://github.com/xiphux/gitphp/releases/download/${PORTVERSION}/ @@ -13,12 +13,19 @@ LICENSE= GPLv2 USES= gettext php:web tar:bzip2 USE_PHP= bz2 fileinfo mbstring memcache posix simplexml spl zlib +NO_ARCH= yes NO_BUILD= yes PLIST_SUB= WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}" SUB_FILES= pkg-message +.include + +.if (${PHP_VER} < 70) RUN_DEPENDS+= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xdiff.so:textproc/pecl-xdiff@${PHP_FLAVOR} +.else +RUN_DEPENDS+= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xdiff.so:textproc/pecl-xdiff2@${PHP_FLAVOR} +.endif do-install: ${MKDIR} ${STAGEDIR}${WWWDIR} @@ -26,4 +33,4 @@ do-install: && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}) ${FIND} ${STAGEDIR}${WWWDIR} -type f -exec ${CHMOD} 644 {} + -.include +.include diff --git a/devel/hs-BNFC/Makefile b/devel/hs-BNFC/Makefile deleted file mode 100644 index 64d5afacbff..00000000000 --- a/devel/hs-BNFC/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Created by: Kai Wang -# $FreeBSD$ - -PORTNAME= BNFC -PORTVERSION= 2.8.1 -PORTREVISION= 1 -CATEGORIES= devel haskell - -MAINTAINER= haskell@FreeBSD.org -COMMENT= Compiler front-end generator - -LICENSE= GPLv2 - -USE_CABAL= mtl -USE_ALEX= yes -USE_HAPPY= yes - -EXECUTABLE= bnfc - -.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" -.include diff --git a/devel/hs-BNFC/distinfo b/devel/hs-BNFC/distinfo deleted file mode 100644 index 2ef77ad5a36..00000000000 --- a/devel/hs-BNFC/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1499627811 -SHA256 (cabal/BNFC-2.8.1.tar.gz) = 2c1bea5c034483813091eea0ea5c830fdde8fedd31b1fc021ea69823b30a5920 -SIZE (cabal/BNFC-2.8.1.tar.gz) = 225015 diff --git a/devel/hs-BNFC/pkg-descr b/devel/hs-BNFC/pkg-descr deleted file mode 100644 index 52774eaa606..00000000000 --- a/devel/hs-BNFC/pkg-descr +++ /dev/null @@ -1,11 +0,0 @@ -The BNF Converter is a compiler construction tool generating a compiler -front-end from a Labelled BNF grammar. It was originally written to generate -Haskell, but starting from Version 2.0, it can also be used for generating -Java, C++, and C. Given a Labelled BNF grammar the tool produces: an -abstract syntax as a Haskell/C++/C module or Java directory, a case skeleton -for the abstract syntax in the same language, an Alex, JLex, or Flex lexer -generator file, a Happy, CUP, or Bison parser generator file, a pretty-printer -as a Haskell/Java/C++/C module, a Latex file containing a readable -specification of the language. - -WWW: http://bnfc.digitalgrammars.com/ diff --git a/devel/hs-Boolean/Makefile b/devel/hs-Boolean/Makefile index d2ca5c28ff5..ac1967116ea 100644 --- a/devel/hs-Boolean/Makefile +++ b/devel/hs-Boolean/Makefile @@ -2,7 +2,7 @@ PORTNAME= Boolean PORTVERSION= 0.2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-BoundedChan/Makefile b/devel/hs-BoundedChan/Makefile index a8057714c8c..1c76649d13b 100644 --- a/devel/hs-BoundedChan/Makefile +++ b/devel/hs-BoundedChan/Makefile @@ -3,7 +3,7 @@ PORTNAME= BoundedChan PORTVERSION= 1.0.3.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-ConfigFile/Makefile b/devel/hs-ConfigFile/Makefile index 844307c37d4..e2801ff68ee 100644 --- a/devel/hs-ConfigFile/Makefile +++ b/devel/hs-ConfigFile/Makefile @@ -2,7 +2,7 @@ PORTNAME= ConfigFile PORTVERSION= 1.1.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,7 @@ COMMENT= Configuration file reading and writing LICENSE= BSD3CLAUSE -USE_CABAL= MissingH>=1.0.0 mtl parsec +USE_CABAL= MissingH>=1.0.0 mtl .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-DrIFT/distinfo b/devel/hs-DrIFT/distinfo deleted file mode 100644 index bfedcf3f127..00000000000 --- a/devel/hs-DrIFT/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1499627812 -SHA256 (cabal/DrIFT-2.4.2.tar.gz) = 742a0b12f16a9da215a29c8284ae379734a70e7811a5f4b1a02dba2873751cf0 -SIZE (cabal/DrIFT-2.4.2.tar.gz) = 69676 diff --git a/devel/hs-DrIFT/files/patch-src_ParseLib2.hs b/devel/hs-DrIFT/files/patch-src_ParseLib2.hs deleted file mode 100644 index 19cfa80fac8..00000000000 --- a/devel/hs-DrIFT/files/patch-src_ParseLib2.hs +++ /dev/null @@ -1,25 +0,0 @@ ---- src/ParseLib2.hs.orig 2013-11-11 15:22:00 UTC -+++ src/ParseLib2.hs -@@ -32,6 +32,7 @@ module ParseLib2 - opt, skipUntil, skipUntilOff,skipUntilParse,skipNest) where - - import Data.Char -+import Control.Applicative (Alternative, empty, (<|>)) - import Control.Monad - - infixr 5 +++ -@@ -62,6 +63,14 @@ instance MonadPlus Parser where - -- mplus :: Parser a -> Parser a -> Parser a - (P p) `mplus` (P q) = P (\pos inp -> (p pos inp ++ q pos inp)) - -+instance Applicative Parser where -+ pure = return -+ (<*>) = ap -+ -+instance Alternative Parser where -+ empty = mzero -+ (<|>) = mplus -+ - -- bits which donn't fit into Haskell's type classes just yet :-( - - env :: Parser Pos diff --git a/devel/hs-DrIFT/pkg-descr b/devel/hs-DrIFT/pkg-descr deleted file mode 100644 index 74154e989ad..00000000000 --- a/devel/hs-DrIFT/pkg-descr +++ /dev/null @@ -1,13 +0,0 @@ -DrIFT is a type sensitive preprocessor for Haskell. It extracts type -declarations and directives from modules. The directives cause rules to -be fired on the parsed type declarations, generating new code which is -then appended to the bottom of the input file. The rules are expressed -as Haskell code, and it is intended that the user can add new rules as -required. DrIFT automates instance derivation for classes that aren't -supported by the standard compilers. In addition, instances can be -produced in separate modules to that containing the type declaration. -This allows instances to be derived for a type after the original module -has been compiled. As a bonus, simple utility functions can also be -produced from a type. - -WWW: http://repetae.net/computer/haskell/DrIFT/ diff --git a/devel/hs-EdisonAPI/Makefile b/devel/hs-EdisonAPI/Makefile index 706e6c05dd5..3a3fb87e44b 100644 --- a/devel/hs-EdisonAPI/Makefile +++ b/devel/hs-EdisonAPI/Makefile @@ -2,7 +2,7 @@ PORTNAME= EdisonAPI PORTVERSION= 1.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-EdisonCore/Makefile b/devel/hs-EdisonCore/Makefile index 4b6aa5af2ca..c844423fc40 100644 --- a/devel/hs-EdisonCore/Makefile +++ b/devel/hs-EdisonCore/Makefile @@ -1,14 +1,15 @@ # $FreeBSD$ PORTNAME= EdisonCore -PORTVERSION= 1.3.1.1 -PORTREVISION= 1 +PORTVERSION= 1.3.2.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org COMMENT= A library of efficent, purely-functional data structures (Core Implementations) -USE_CABAL= EdisonAPI mtl QuickCheck +LICENSE= MIT + +USE_CABAL= EdisonAPI mtl semigroups QuickCheck .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-EdisonCore/distinfo b/devel/hs-EdisonCore/distinfo index 539ff6b5ab7..fe96dc6c9d4 100644 --- a/devel/hs-EdisonCore/distinfo +++ b/devel/hs-EdisonCore/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1500996696 -SHA256 (cabal/EdisonCore-1.3.1.1.tar.gz) = 3e0720ee3b179304f563b99dd446c1d6911e31ddc4d0f78d6550b18e59ed501b -SIZE (cabal/EdisonCore-1.3.1.1.tar.gz) = 80699 +TIMESTAMP = 1523469795 +SHA256 (cabal/EdisonCore-1.3.2.1.tar.gz) = 73c6014d07107a9ed21df76a59f70c9d68d64ac84cced35f7b628f1d792cf239 +SIZE (cabal/EdisonCore-1.3.2.1.tar.gz) = 82522 diff --git a/devel/hs-Glob/Makefile b/devel/hs-Glob/Makefile index c17b8950f8a..de9b839e8ba 100644 --- a/devel/hs-Glob/Makefile +++ b/devel/hs-Glob/Makefile @@ -2,7 +2,7 @@ PORTNAME= Glob PORTVERSION= 0.8.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-HUnit/Makefile b/devel/hs-HUnit/Makefile index 81f967b0ef9..71f1fde0f14 100644 --- a/devel/hs-HUnit/Makefile +++ b/devel/hs-HUnit/Makefile @@ -2,7 +2,7 @@ PORTNAME= HUnit PORTVERSION= 1.6.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-IfElse/Makefile b/devel/hs-IfElse/Makefile index 7b42733e699..efac3892067 100644 --- a/devel/hs-IfElse/Makefile +++ b/devel/hs-IfElse/Makefile @@ -2,7 +2,7 @@ PORTNAME= IfElse PORTVERSION= 0.85 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-List/Makefile b/devel/hs-List/Makefile index c5ac8d85fde..eca883d0e20 100644 --- a/devel/hs-List/Makefile +++ b/devel/hs-List/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= List -PORTVERSION= 0.6.0 -PORTREVISION= 1 +PORTVERSION= 0.6.2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-List/distinfo b/devel/hs-List/distinfo index c9acc7f2cff..df1c4c11899 100644 --- a/devel/hs-List/distinfo +++ b/devel/hs-List/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627813 -SHA256 (cabal/List-0.6.0.tar.gz) = 03de2236b8802ddc76ff22d6de0037855d00790d0f4071b3467b419521a29889 -SIZE (cabal/List-0.6.0.tar.gz) = 6189 +TIMESTAMP = 1523654714 +SHA256 (cabal/List-0.6.2.tar.gz) = c4b92be1202fc59112018f76d5b17cd3a659ebc36384a46e000ab2fbaf99b878 +SIZE (cabal/List-0.6.2.tar.gz) = 7128 diff --git a/devel/hs-ListLike/Makefile b/devel/hs-ListLike/Makefile index 1bd733adefe..dcd6b5d2a9d 100644 --- a/devel/hs-ListLike/Makefile +++ b/devel/hs-ListLike/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= ListLike -PORTVERSION= 4.5.1 -PORTREVISION= 1 +PORTVERSION= 4.6 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= Generic support for list-like structures in Haskell LICENSE= BSD3CLAUSE -USE_CABAL= dlist fmlist text utf8-string vector +USE_CABAL= dlist fmlist primitive utf8-string vector .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-ListLike/distinfo b/devel/hs-ListLike/distinfo index 010c4cdb2e9..97543316c3d 100644 --- a/devel/hs-ListLike/distinfo +++ b/devel/hs-ListLike/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499719758 -SHA256 (cabal/ListLike-4.5.1.tar.gz) = b70745335b563cd9039bb17a1e2faf7edb1b68febdd19586b28ab67c55562a8d -SIZE (cabal/ListLike-4.5.1.tar.gz) = 29600 +TIMESTAMP = 1523448782 +SHA256 (cabal/ListLike-4.6.tar.gz) = c1cdec79a5f585a5839eea26a2afe6a37aab5ed2f402a16e7d59fe9a4e925a9a +SIZE (cabal/ListLike-4.6.tar.gz) = 30544 diff --git a/devel/hs-MemoTrie/Makefile b/devel/hs-MemoTrie/Makefile index fcb86164a2c..8b79cd4db17 100644 --- a/devel/hs-MemoTrie/Makefile +++ b/devel/hs-MemoTrie/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= MemoTrie -PORTVERSION= 0.6.8 -PORTREVISION= 1 +PORTVERSION= 0.6.9 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-MemoTrie/distinfo b/devel/hs-MemoTrie/distinfo index 1962e7a19fc..496227e9825 100644 --- a/devel/hs-MemoTrie/distinfo +++ b/devel/hs-MemoTrie/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627814 -SHA256 (cabal/MemoTrie-0.6.8.tar.gz) = 5fd9495722d94ff61aa6cde0287fe8222926f5adf929d52fef0532d483429da4 -SIZE (cabal/MemoTrie-0.6.8.tar.gz) = 8399 +TIMESTAMP = 1523960769 +SHA256 (cabal/MemoTrie-0.6.9.tar.gz) = 1d6045b8fdf7b89ed6b495e535613f5091cdfc9cdfe05a862207e76ce205f794 +SIZE (cabal/MemoTrie-0.6.9.tar.gz) = 8436 diff --git a/devel/hs-MissingH/Makefile b/devel/hs-MissingH/Makefile index d2ffed42dbd..15a5d0bb7ac 100644 --- a/devel/hs-MissingH/Makefile +++ b/devel/hs-MissingH/Makefile @@ -3,7 +3,7 @@ PORTNAME= MissingH PORTVERSION= 1.4.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,7 @@ COMMENT= Large utility library LICENSE= BSD3CLAUSE -USE_CABAL= hslogger HUnit mtl network old-time parsec random regex-compat +USE_CABAL= hslogger HUnit mtl network old-time random regex-compat .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-MonadRandom/Makefile b/devel/hs-MonadRandom/Makefile index 8a18b3a2982..52b11fa595a 100644 --- a/devel/hs-MonadRandom/Makefile +++ b/devel/hs-MonadRandom/Makefile @@ -2,7 +2,7 @@ PORTNAME= MonadRandom PORTVERSION= 0.5.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-ObjectName/Makefile b/devel/hs-ObjectName/Makefile index f75557565b7..a5e7989fe8f 100644 --- a/devel/hs-ObjectName/Makefile +++ b/devel/hs-ObjectName/Makefile @@ -3,7 +3,7 @@ PORTNAME= ObjectName PORTVERSION= 1.1.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-Only/Makefile b/devel/hs-Only/Makefile index 5d77163bb39..7dacac79640 100644 --- a/devel/hs-Only/Makefile +++ b/devel/hs-Only/Makefile @@ -2,7 +2,7 @@ PORTNAME= Only PORTVERSION= 0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-PSQueue/Makefile b/devel/hs-PSQueue/Makefile index d6ed60ba858..00886e2e8f8 100644 --- a/devel/hs-PSQueue/Makefile +++ b/devel/hs-PSQueue/Makefile @@ -10,5 +10,7 @@ COMMENT= Priority Search Queue LICENSE= BSD3CLAUSE +IGNORE= Doesn't build with recent GHC version + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-PSQueue/files/patch-Data_PSQueue.hs b/devel/hs-PSQueue/files/patch-Data_PSQueue.hs new file mode 100644 index 00000000000..eee077a2b7b --- /dev/null +++ b/devel/hs-PSQueue/files/patch-Data_PSQueue.hs @@ -0,0 +1,11 @@ +--- Data/PSQueue.hs.orig 2018-04-19 15:27:45 UTC ++++ Data/PSQueue.hs +@@ -62,7 +62,7 @@ module Data.PSQueue + , foldl + ) where + +-import Prelude hiding (lookup,null,foldl,foldr) ++import Prelude hiding (lookup,null,foldl,foldr,(<>)) + import qualified Prelude as P + + {- diff --git a/devel/hs-QuickCheck/Makefile b/devel/hs-QuickCheck/Makefile index ed96cd9d995..51fe870e7b3 100644 --- a/devel/hs-QuickCheck/Makefile +++ b/devel/hs-QuickCheck/Makefile @@ -3,7 +3,7 @@ PORTNAME= QuickCheck PORTVERSION= 2.10.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-ReadArgs/Makefile b/devel/hs-ReadArgs/Makefile index fe5b8982035..fb710a6b8db 100644 --- a/devel/hs-ReadArgs/Makefile +++ b/devel/hs-ReadArgs/Makefile @@ -2,7 +2,7 @@ PORTNAME= ReadArgs PORTVERSION= 1.2.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,7 @@ COMMENT= Simple command line argument parsing LICENSE= BSD3CLAUSE -USE_CABAL= system-filepath>=0.4.7 text>=0.11.1.13 +USE_CABAL= system-filepath>=0.4.7 EXECUTABLE= ReadArgsEx diff --git a/devel/hs-STMonadTrans/Makefile b/devel/hs-STMonadTrans/Makefile index fdee27f9454..f5c6448d4e6 100644 --- a/devel/hs-STMonadTrans/Makefile +++ b/devel/hs-STMonadTrans/Makefile @@ -2,7 +2,7 @@ PORTNAME= STMonadTrans PORTVERSION= 0.4.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-SafeSemaphore/Makefile b/devel/hs-SafeSemaphore/Makefile index 129b6e90b68..b05cdc265db 100644 --- a/devel/hs-SafeSemaphore/Makefile +++ b/devel/hs-SafeSemaphore/Makefile @@ -2,7 +2,7 @@ PORTNAME= SafeSemaphore PORTVERSION= 0.10.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,5 @@ COMMENT= Much safer replacement for QSemN, QSem, and SampleVar LICENSE= BSD3CLAUSE -USE_CABAL= stm - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-ShellCheck/Makefile b/devel/hs-ShellCheck/Makefile index 12d0c0da17b..47f88a148a7 100644 --- a/devel/hs-ShellCheck/Makefile +++ b/devel/hs-ShellCheck/Makefile @@ -11,9 +11,11 @@ COMMENT= Shell script analysis tool LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -USE_CABAL= json mtl>=2.2.1 parsec QuickCheck>=2.7.4 regex-tdfa +USE_CABAL= json mtl>=2.2.1 QuickCheck>=2.7.4 regex-tdfa EXECUTABLE= shellcheck +IGNORE= Doesn't build with recent GHC version + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-StateVar/Makefile b/devel/hs-StateVar/Makefile index 5179dd6cc89..9619f9b5779 100644 --- a/devel/hs-StateVar/Makefile +++ b/devel/hs-StateVar/Makefile @@ -2,7 +2,7 @@ PORTNAME= StateVar PORTVERSION= 1.1.0.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,5 @@ COMMENT= State variables LICENSE= BSD3CLAUSE -USE_CABAL= stm - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-Stream/Makefile b/devel/hs-Stream/Makefile index 540ce0015c1..52c10e10e84 100644 --- a/devel/hs-Stream/Makefile +++ b/devel/hs-Stream/Makefile @@ -3,7 +3,7 @@ PORTNAME= Stream PORTVERSION= 0.4.7.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-TypeCompose/Makefile b/devel/hs-TypeCompose/Makefile index da62bd91791..39b600c47a2 100644 --- a/devel/hs-TypeCompose/Makefile +++ b/devel/hs-TypeCompose/Makefile @@ -13,5 +13,7 @@ LICENSE= BSD3CLAUSE USE_CABAL= base-orphans +IGNORE= Doesn't build with recent GHC version + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-abstract-deque/Makefile b/devel/hs-abstract-deque/Makefile index 878826c8385..07182550c5b 100644 --- a/devel/hs-abstract-deque/Makefile +++ b/devel/hs-abstract-deque/Makefile @@ -2,7 +2,7 @@ PORTNAME= abstract-deque PORTVERSION= 0.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-abstract-par/Makefile b/devel/hs-abstract-par/Makefile index 60be578063b..e367e07a541 100644 --- a/devel/hs-abstract-par/Makefile +++ b/devel/hs-abstract-par/Makefile @@ -2,7 +2,7 @@ PORTNAME= abstract-par PORTVERSION= 0.3.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-activehs-base/Makefile b/devel/hs-activehs-base/Makefile index 35b7242462c..a34f6fc803f 100644 --- a/devel/hs-activehs-base/Makefile +++ b/devel/hs-activehs-base/Makefile @@ -2,7 +2,7 @@ PORTNAME= activehs-base PORTVERSION= 0.3.0.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-activehs-base/files/patch-activehs-base.cabal b/devel/hs-activehs-base/files/patch-activehs-base.cabal index 47ab808ddeb..0dfb929b58a 100644 --- a/devel/hs-activehs-base/files/patch-activehs-base.cabal +++ b/devel/hs-activehs-base/files/patch-activehs-base.cabal @@ -3,8 +3,9 @@ @@ -22,6 +22,6 @@ Library ActiveHs.Base Build-Depends: - base >= 4.0 && < 4.10, +- base >= 4.0 && < 4.10, - QuickCheck >= 2.4 && < 2.9 ++ base >= 4.0 && < 4.12, + QuickCheck >= 2.4 && < 2.11 diff --git a/devel/hs-alex/Makefile b/devel/hs-alex/Makefile index fdd37916c31..8696cdc7891 100644 --- a/devel/hs-alex/Makefile +++ b/devel/hs-alex/Makefile @@ -3,7 +3,7 @@ PORTNAME= alex PORTVERSION= 3.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-ansi-terminal/Makefile b/devel/hs-ansi-terminal/Makefile index b97f2fbab4f..85dc5cf9460 100644 --- a/devel/hs-ansi-terminal/Makefile +++ b/devel/hs-ansi-terminal/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= ansi-terminal -PORTVERSION= 0.6.3.1 -PORTREVISION= 1 +PORTVERSION= 0.8.0.2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,6 +9,8 @@ COMMENT= Simple ANSI terminal support, with Windows compatibility LICENSE= BSD3CLAUSE +USE_CABAL= colour + FLAGS_DISABLE= Example .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" diff --git a/devel/hs-ansi-terminal/distinfo b/devel/hs-ansi-terminal/distinfo index 3455706769c..f7ed0682250 100644 --- a/devel/hs-ansi-terminal/distinfo +++ b/devel/hs-ansi-terminal/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627818 -SHA256 (cabal/ansi-terminal-0.6.3.1.tar.gz) = 458f98e0c9217897f0ff07f730cfc3ed380089936fb31942aec31bb336608095 -SIZE (cabal/ansi-terminal-0.6.3.1.tar.gz) = 30199 +TIMESTAMP = 1524847331 +SHA256 (cabal/ansi-terminal-0.8.0.2.tar.gz) = 891ac933759fee1f6aad8b38ffc718efd685edf35cbe5283cc304d3a290af0fa +SIZE (cabal/ansi-terminal-0.8.0.2.tar.gz) = 29359 diff --git a/devel/hs-ansi-wl-pprint/Makefile b/devel/hs-ansi-wl-pprint/Makefile index ef4f7553697..8f0f65f5f3e 100644 --- a/devel/hs-ansi-wl-pprint/Makefile +++ b/devel/hs-ansi-wl-pprint/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= ansi-wl-pprint -PORTVERSION= 0.6.7.3 -PORTREVISION= 2 +PORTVERSION= 0.6.8.2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= Wadler/Leijen Pretty Printer for colored ANSI terminal output LICENSE= BSD3CLAUSE -USE_CABAL= ansi-terminal>=0.4.0 +USE_CABAL= ansi-terminal>=0.4.0 semigroups>=0.1 FLAGS_DISABLE= Example diff --git a/devel/hs-ansi-wl-pprint/distinfo b/devel/hs-ansi-wl-pprint/distinfo index 2e0a4c19b23..acf94020c75 100644 --- a/devel/hs-ansi-wl-pprint/distinfo +++ b/devel/hs-ansi-wl-pprint/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627819 -SHA256 (cabal/ansi-wl-pprint-0.6.7.3.tar.gz) = 3789ecaa89721eabef58ddc5711f7fd1ff67e262da1659f3b20d38a9e1f5b708 -SIZE (cabal/ansi-wl-pprint-0.6.7.3.tar.gz) = 14983 +TIMESTAMP = 1523129349 +SHA256 (cabal/ansi-wl-pprint-0.6.8.2.tar.gz) = a630721bd57678c3bfeb6c703f8249e434cbf85f40daceec4660fb8c6725cb3e +SIZE (cabal/ansi-wl-pprint-0.6.8.2.tar.gz) = 16491 diff --git a/devel/hs-arrows/Makefile b/devel/hs-arrows/Makefile index c63decd159a..8cd202eba58 100644 --- a/devel/hs-arrows/Makefile +++ b/devel/hs-arrows/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= arrows -PORTVERSION= 0.4.4.1 -PORTREVISION= 11 +PORTVERSION= 0.4.4.2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-arrows/distinfo b/devel/hs-arrows/distinfo index 800754e9656..bfd6dccd876 100644 --- a/devel/hs-arrows/distinfo +++ b/devel/hs-arrows/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627819 -SHA256 (cabal/arrows-0.4.4.1.tar.gz) = 5b104bd8f8fac5ad0fd194088819423302e52c2a796cc99f6d32bbc134bfebe2 -SIZE (cabal/arrows-0.4.4.1.tar.gz) = 12261 +TIMESTAMP = 1524150955 +SHA256 (cabal/arrows-0.4.4.2.tar.gz) = f65ac93306629e70ae0d92914cc04d6ab499de3168036f0623aba3fffd22ab09 +SIZE (cabal/arrows-0.4.4.2.tar.gz) = 12701 diff --git a/devel/hs-asn1-data/Makefile b/devel/hs-asn1-data/Makefile index 4dfa2bcab55..a50de4d1ad2 100644 --- a/devel/hs-asn1-data/Makefile +++ b/devel/hs-asn1-data/Makefile @@ -2,7 +2,7 @@ PORTNAME= asn1-data PORTVERSION= 0.7.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,7 @@ COMMENT= ASN1 data reader and writer in RAW, BER, and DER forms LICENSE= BSD3CLAUSE -USE_CABAL= cereal mtl text>=0.11 +USE_CABAL= cereal mtl .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-asn1-encoding/Makefile b/devel/hs-asn1-encoding/Makefile index 72188e32ca0..36b06bf6817 100644 --- a/devel/hs-asn1-encoding/Makefile +++ b/devel/hs-asn1-encoding/Makefile @@ -2,7 +2,7 @@ PORTNAME= asn1-encoding PORTVERSION= 0.9.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-asn1-parse/Makefile b/devel/hs-asn1-parse/Makefile index 43576f3db3f..07b3ab53aa3 100644 --- a/devel/hs-asn1-parse/Makefile +++ b/devel/hs-asn1-parse/Makefile @@ -2,7 +2,7 @@ PORTNAME= asn1-parse PORTVERSION= 0.9.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-asn1-types/Makefile b/devel/hs-asn1-types/Makefile index 1aba4f4a999..b5eb324b9ed 100644 --- a/devel/hs-asn1-types/Makefile +++ b/devel/hs-asn1-types/Makefile @@ -2,7 +2,7 @@ PORTNAME= asn1-types PORTVERSION= 0.3.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-async/Makefile b/devel/hs-async/Makefile index de15fffb3af..08538d74491 100644 --- a/devel/hs-async/Makefile +++ b/devel/hs-async/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= async -PORTVERSION= 2.1.1.1 +PORTVERSION= 2.2.1 PORTREVISION= 1 CATEGORIES= devel haskell @@ -10,7 +10,7 @@ COMMENT= Run IO operations asynchronously and wait for their results LICENSE= BSD3CLAUSE -USE_CABAL= stm>=2.2 +USE_CABAL= hashable .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-async/distinfo b/devel/hs-async/distinfo index 4955e17e4c1..54880d5fd29 100644 --- a/devel/hs-async/distinfo +++ b/devel/hs-async/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499444628 -SHA256 (cabal/async-2.1.1.1.tar.gz) = cd83e471466ea6885b2e8fb60f452db3ac3fdf3ea2d6370aa1e071ebc37544e2 -SIZE (cabal/async-2.1.1.1.tar.gz) = 10608 +TIMESTAMP = 1523292698 +SHA256 (cabal/async-2.2.1.tar.gz) = 8f0b86022a1319d3c1c68655790da4b7f98017982e27ec3f3dbfe01029d39027 +SIZE (cabal/async-2.2.1.tar.gz) = 12775 diff --git a/devel/hs-atomic-primops/Makefile b/devel/hs-atomic-primops/Makefile index 00e249efebc..617ea80a111 100644 --- a/devel/hs-atomic-primops/Makefile +++ b/devel/hs-atomic-primops/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= atomic-primops -PORTVERSION= 0.8.0.4 -PORTREVISION= 1 +PORTVERSION= 0.8.2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-atomic-primops/distinfo b/devel/hs-atomic-primops/distinfo index b74ee8e8219..4f802a51533 100644 --- a/devel/hs-atomic-primops/distinfo +++ b/devel/hs-atomic-primops/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499450732 -SHA256 (cabal/atomic-primops-0.8.0.4.tar.gz) = 47e1e393848c0538aa1733a90a63bd08a00915ec7499d90014aaecc792db9864 -SIZE (cabal/atomic-primops-0.8.0.4.tar.gz) = 34075 +TIMESTAMP = 1524158958 +SHA256 (cabal/atomic-primops-0.8.2.tar.gz) = 67f8872e0c1e634d819a967365eb4ad514e9b2cde967fbc710da7cdc4d17d933 +SIZE (cabal/atomic-primops-0.8.2.tar.gz) = 36157 diff --git a/devel/hs-auto-update/Makefile b/devel/hs-auto-update/Makefile index 98acb31a237..191a617b2e4 100644 --- a/devel/hs-auto-update/Makefile +++ b/devel/hs-auto-update/Makefile @@ -2,7 +2,7 @@ PORTNAME= auto-update PORTVERSION= 0.1.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-base-compat-batteries/Makefile b/devel/hs-base-compat-batteries/Makefile new file mode 100644 index 00000000000..15b8c4c65d7 --- /dev/null +++ b/devel/hs-base-compat-batteries/Makefile @@ -0,0 +1,15 @@ +# $FreeBSD$ + +PORTNAME= base-compat-batteries +PORTVERSION= 0.10.1 +CATEGORIES= devel haskell + +MAINTAINER= haskell@FreeBSD.org +COMMENT= base-compat with extra batteries + +LICENSE= MIT + +USE_CABAL= base-compat + +.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" +.include diff --git a/devel/hs-base-compat-batteries/distinfo b/devel/hs-base-compat-batteries/distinfo new file mode 100644 index 00000000000..fbe9b386fda --- /dev/null +++ b/devel/hs-base-compat-batteries/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1525010214 +SHA256 (cabal/base-compat-batteries-0.10.1.tar.gz) = 15578bafe45db81f7c7ad33253b2b047dab9b6df4ca7ca57f541d64084f113c9 +SIZE (cabal/base-compat-batteries-0.10.1.tar.gz) = 15813 diff --git a/devel/hs-base-compat-batteries/pkg-descr b/devel/hs-base-compat-batteries/pkg-descr new file mode 100644 index 00000000000..8070cfe9be6 --- /dev/null +++ b/devel/hs-base-compat-batteries/pkg-descr @@ -0,0 +1,11 @@ +Provides functions available in later versions of base to a wider range of +compilers, without requiring you to use CPP pragmas in your code. See the README +for what is covered. Also see the changelog for recent changes. + +Note that base-compat does not add any orphan instances. There is a separate +package, base-orphans, for that. + +In addition, base-compat does not backport any data types or type classes. +See this section of the README for more info. + +WWW: https://github.com/haskell-compat/base-compat diff --git a/devel/hs-base-compat/Makefile b/devel/hs-base-compat/Makefile index 4a8dbb39143..4d90c1fc1b6 100644 --- a/devel/hs-base-compat/Makefile +++ b/devel/hs-base-compat/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= base-compat -PORTVERSION= 0.9.3 -PORTREVISION= 1 +PORTVERSION= 0.10.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-base-compat/distinfo b/devel/hs-base-compat/distinfo index 30eaf35ba24..fc4342052a2 100644 --- a/devel/hs-base-compat/distinfo +++ b/devel/hs-base-compat/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499541026 -SHA256 (cabal/base-compat-0.9.3.tar.gz) = 7d602b0f0543fadbd598a090c738e9ce9b07a1896673dc27f1503ae3bea1a210 -SIZE (cabal/base-compat-0.9.3.tar.gz) = 27632 +TIMESTAMP = 1525011068 +SHA256 (cabal/base-compat-0.10.1.tar.gz) = b2ec2193d4a76a92c0ddcd69bb1b5879d50c98dd38422b0d86f85aea3112bb6d +SIZE (cabal/base-compat-0.10.1.tar.gz) = 31954 diff --git a/devel/hs-base-orphans/Makefile b/devel/hs-base-orphans/Makefile index 9aaa2cc3db2..1ac65969726 100644 --- a/devel/hs-base-orphans/Makefile +++ b/devel/hs-base-orphans/Makefile @@ -2,7 +2,7 @@ PORTNAME= base-orphans PORTVERSION= 0.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-base-unicode-symbols/Makefile b/devel/hs-base-unicode-symbols/Makefile index e93ce1e696f..65afc322681 100644 --- a/devel/hs-base-unicode-symbols/Makefile +++ b/devel/hs-base-unicode-symbols/Makefile @@ -2,7 +2,7 @@ PORTNAME= base-unicode-symbols PORTVERSION= 0.2.2.4 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-base16-bytestring/Makefile b/devel/hs-base16-bytestring/Makefile index 0a3faeab44d..8988e4fa257 100644 --- a/devel/hs-base16-bytestring/Makefile +++ b/devel/hs-base16-bytestring/Makefile @@ -2,7 +2,7 @@ PORTNAME= base16-bytestring PORTVERSION= 0.1.1.6 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-base64-bytestring/Makefile b/devel/hs-base64-bytestring/Makefile index 6fc672adb59..085b9c1298a 100644 --- a/devel/hs-base64-bytestring/Makefile +++ b/devel/hs-base64-bytestring/Makefile @@ -2,7 +2,7 @@ PORTNAME= base64-bytestring PORTVERSION= 1.0.0.1 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-text/Makefile b/devel/hs-basement/Makefile similarity index 61% rename from devel/hs-text/Makefile rename to devel/hs-basement/Makefile index b7e1dcdc5de..3ccf118a145 100644 --- a/devel/hs-text/Makefile +++ b/devel/hs-basement/Makefile @@ -1,12 +1,11 @@ # $FreeBSD$ -PORTNAME= text -PORTVERSION= 1.2.2.2 -PORTREVISION= 1 +PORTNAME= basement +PORTVERSION= 0.0.7 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org -COMMENT= Efficient packed Unicode text type +COMMENT= Foundation most basic primitives without any dependencies LICENSE= BSD3CLAUSE diff --git a/devel/hs-basement/distinfo b/devel/hs-basement/distinfo new file mode 100644 index 00000000000..a99967e24fa --- /dev/null +++ b/devel/hs-basement/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1523131438 +SHA256 (cabal/basement-0.0.7.tar.gz) = b501b9b378f35b80c60321031dbbf9ed7af46c66353f072e00f00abdd2244f70 +SIZE (cabal/basement-0.0.7.tar.gz) = 133178 diff --git a/devel/hs-basement/pkg-descr b/devel/hs-basement/pkg-descr new file mode 100644 index 00000000000..38f7cc1da12 --- /dev/null +++ b/devel/hs-basement/pkg-descr @@ -0,0 +1,12 @@ +This package has the following goals: + * provide a base like sets of modules that provide a consistent set of + features and bugfixes across multiple versions of GHC (unlike base). + * provide a better and more efficient prelude than base's prelude. + * be self-sufficient: no external dependencies apart from base. + * provide better data-types: packed unicode string by default, arrays. + * Better numerical classes that better represent mathematical thing + (No more all-in-one Num). + * Better I/O system with less Lazy IO + * Usual partial functions distinguished through type system + +WWW: https://hackage.haskell.org/package/foundation diff --git a/devel/hs-basic-prelude/Makefile b/devel/hs-basic-prelude/Makefile index d2b1a460987..0bae08d4b98 100644 --- a/devel/hs-basic-prelude/Makefile +++ b/devel/hs-basic-prelude/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= basic-prelude -PORTVERSION= 0.6.1.1 -PORTREVISION= 1 +PORTVERSION= 0.7.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,8 +9,8 @@ COMMENT= Enhanced core prelude; a common foundation for alternate preludes LICENSE= MIT -USE_CABAL= hashable lifted-base ReadArgs>=1.2 safe text \ - unordered-containers vector +USE_CABAL= hashable lifted-base ReadArgs>=1.2 safe unordered-containers \ + vector .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-basic-prelude/distinfo b/devel/hs-basic-prelude/distinfo index 4ed645814ee..2f92747dd22 100644 --- a/devel/hs-basic-prelude/distinfo +++ b/devel/hs-basic-prelude/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627821 -SHA256 (cabal/basic-prelude-0.6.1.1.tar.gz) = f7b178ad8d1491933e1eb8def0b98c7270da3a5e06bed977f0c624c24ff92ec7 -SIZE (cabal/basic-prelude-0.6.1.1.tar.gz) = 6009 +TIMESTAMP = 1524414505 +SHA256 (cabal/basic-prelude-0.7.0.tar.gz) = 10755f892548faa956b81b40d1d03ec6e94609fd8ec8e92be09b4453b7ad9379 +SIZE (cabal/basic-prelude-0.7.0.tar.gz) = 6471 diff --git a/devel/hs-bifunctors/Makefile b/devel/hs-bifunctors/Makefile index 0765d55cd6b..9697900d858 100644 --- a/devel/hs-bifunctors/Makefile +++ b/devel/hs-bifunctors/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= bifunctors -PORTVERSION= 5.4.2 -PORTREVISION= 1 +PORTVERSION= 5.5.2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,8 @@ COMMENT= Bifunctors LICENSE= BSD3CLAUSE -USE_CABAL= base-orphans comonad semigroups>=0.8.3.1 tagged>=0.7.3 +USE_CABAL= base-orphans comonad semigroups>=0.8.3.1 tagged>=0.7.3 \ + th-abstraction .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-bifunctors/distinfo b/devel/hs-bifunctors/distinfo index 8dce950a966..ef67a3242c6 100644 --- a/devel/hs-bifunctors/distinfo +++ b/devel/hs-bifunctors/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499542053 -SHA256 (cabal/bifunctors-5.4.2.tar.gz) = 38620267824abbf834f708f1b7cf10307c1d2719b1a0f8ae49330a1002dfdc8d -SIZE (cabal/bifunctors-5.4.2.tar.gz) = 39535 +TIMESTAMP = 1523787744 +SHA256 (cabal/bifunctors-5.5.2.tar.gz) = 332bb2ea19e77dac55282daff8046d89f69514ced5b987779d887e53b5d7cb11 +SIZE (cabal/bifunctors-5.5.2.tar.gz) = 37983 diff --git a/devel/hs-bifunctors/files/patch-bifunctors.cabal b/devel/hs-bifunctors/files/patch-bifunctors.cabal new file mode 100644 index 00000000000..02e2dfd4732 --- /dev/null +++ b/devel/hs-bifunctors/files/patch-bifunctors.cabal @@ -0,0 +1,11 @@ +--- bifunctors.cabal.orig 2018-04-15 11:07:07 UTC ++++ bifunctors.cabal +@@ -43,7 +43,7 @@ library + base-orphans >= 0.5.2 && < 1, + comonad >= 4 && < 6, + containers >= 0.1 && < 0.6, +- template-haskell >= 2.4 && < 2.13, ++ template-haskell >= 2.4 && < 2.14, + th-abstraction >= 0.2.2 && < 0.3, + transformers >= 0.2 && < 0.6, + transformers-compat >= 0.5 && < 0.6 diff --git a/devel/hs-bits-atomic/Makefile b/devel/hs-bits-atomic/Makefile index ae0c821d504..cb2f5d7734c 100644 --- a/devel/hs-bits-atomic/Makefile +++ b/devel/hs-bits-atomic/Makefile @@ -2,7 +2,7 @@ PORTNAME= bits-atomic PORTVERSION= 0.1.3 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-blaze-builder-enumerator/Makefile b/devel/hs-blaze-builder-enumerator/Makefile index 2f48c551f23..95e4a2b5d0d 100644 --- a/devel/hs-blaze-builder-enumerator/Makefile +++ b/devel/hs-blaze-builder-enumerator/Makefile @@ -2,7 +2,7 @@ PORTNAME= blaze-builder-enumerator PORTVERSION= 0.2.1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-blaze-builder/Makefile b/devel/hs-blaze-builder/Makefile index 3ccc19c9806..c02ec0fb273 100644 --- a/devel/hs-blaze-builder/Makefile +++ b/devel/hs-blaze-builder/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= blaze-builder -PORTVERSION= 0.4.0.2 -PORTREVISION= 1 +PORTVERSION= 0.4.1.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,5 @@ COMMENT= Efficient buffered output LICENSE= BSD3CLAUSE -USE_CABAL= text>=0.10 - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-blaze-builder/distinfo b/devel/hs-blaze-builder/distinfo index 30274144b35..a7f33d463cd 100644 --- a/devel/hs-blaze-builder/distinfo +++ b/devel/hs-blaze-builder/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499546087 -SHA256 (cabal/blaze-builder-0.4.0.2.tar.gz) = 9ad3e4661bf5556d650fb9aa56a3ad6e6eec7575e87d472e8ab6d15eaef163d4 -SIZE (cabal/blaze-builder-0.4.0.2.tar.gz) = 58681 +TIMESTAMP = 1523427415 +SHA256 (cabal/blaze-builder-0.4.1.0.tar.gz) = 91fc8b966f3e9dc9461e1675c7566b881740f99abc906495491a3501630bc814 +SIZE (cabal/blaze-builder-0.4.1.0.tar.gz) = 61365 diff --git a/devel/hs-blaze-textual/Makefile b/devel/hs-blaze-textual/Makefile index 0d1813e79f8..0073d0cb8ae 100644 --- a/devel/hs-blaze-textual/Makefile +++ b/devel/hs-blaze-textual/Makefile @@ -2,7 +2,7 @@ PORTNAME= blaze-textual PORTVERSION= 0.2.1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,7 @@ COMMENT= Fast rendering of common datatypes LICENSE= BSD3CLAUSE USE_CABAL= blaze-builder>=0.2.1.4 double-conversion>=0.2.0.1 \ - old-locale text>=0.11.0.2 vector + old-locale vector .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-bloomfilter/Makefile b/devel/hs-bloomfilter/Makefile index 796a913e5a4..6a7b9b84a9b 100644 --- a/devel/hs-bloomfilter/Makefile +++ b/devel/hs-bloomfilter/Makefile @@ -2,7 +2,7 @@ PORTNAME= bloomfilter PORTVERSION= 2.0.1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-boxes/Makefile b/devel/hs-boxes/Makefile index d71a3d7699d..d70b9a6587d 100644 --- a/devel/hs-boxes/Makefile +++ b/devel/hs-boxes/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= boxes -PORTVERSION= 0.1.4 -PORTREVISION= 2 +PORTVERSION= 0.1.5 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-boxes/distinfo b/devel/hs-boxes/distinfo index 19bce67a016..6b983eadebc 100644 --- a/devel/hs-boxes/distinfo +++ b/devel/hs-boxes/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627822 -SHA256 (cabal/boxes-0.1.4.tar.gz) = 4e3ee9a88a28ed14a61b2c885b111922f201f56392ff68d350418ff6e98dfdd8 -SIZE (cabal/boxes-0.1.4.tar.gz) = 6481 +TIMESTAMP = 1523955976 +SHA256 (cabal/boxes-0.1.5.tar.gz) = 38e1782e8a458f342a0acbb74af8f55cb120756bc3af7ee7220d955812af56c3 +SIZE (cabal/boxes-0.1.5.tar.gz) = 7598 diff --git a/devel/hs-bsd-sysctl/Makefile b/devel/hs-bsd-sysctl/Makefile index f22d2f1b3ff..bd7f2e7c90b 100644 --- a/devel/hs-bsd-sysctl/Makefile +++ b/devel/hs-bsd-sysctl/Makefile @@ -3,7 +3,7 @@ PORTNAME= bsd-sysctl PORTVERSION= 1.0.7 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-byteable/Makefile b/devel/hs-byteable/Makefile index f354fde0c02..8008d39c744 100644 --- a/devel/hs-byteable/Makefile +++ b/devel/hs-byteable/Makefile @@ -2,7 +2,7 @@ PORTNAME= byteable PORTVERSION= 0.1.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-byteorder/Makefile b/devel/hs-byteorder/Makefile index 64881611e30..b73ebe7dc76 100644 --- a/devel/hs-byteorder/Makefile +++ b/devel/hs-byteorder/Makefile @@ -2,7 +2,7 @@ PORTNAME= byteorder PORTVERSION= 1.0.4 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-bytestring-lexing/Makefile b/devel/hs-bytestring-lexing/Makefile index f21d045e220..2b43fe6c23b 100644 --- a/devel/hs-bytestring-lexing/Makefile +++ b/devel/hs-bytestring-lexing/Makefile @@ -3,7 +3,7 @@ PORTNAME= bytestring-lexing PORTVERSION= 0.5.0.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-bytestring-mmap/Makefile b/devel/hs-bytestring-mmap/Makefile index 8f12c4c07da..f09d0c98f51 100644 --- a/devel/hs-bytestring-mmap/Makefile +++ b/devel/hs-bytestring-mmap/Makefile @@ -2,7 +2,7 @@ PORTNAME= bytestring-mmap PORTVERSION= 0.2.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-bytestring-nums/Makefile b/devel/hs-bytestring-nums/Makefile index 6c6a57cf4c0..150da33faf6 100644 --- a/devel/hs-bytestring-nums/Makefile +++ b/devel/hs-bytestring-nums/Makefile @@ -2,7 +2,7 @@ PORTNAME= bytestring-nums PORTVERSION= 0.3.6 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-bytestring-show/Makefile b/devel/hs-bytestring-show/Makefile index 00f4860e5fc..a145ce96afe 100644 --- a/devel/hs-bytestring-show/Makefile +++ b/devel/hs-bytestring-show/Makefile @@ -2,7 +2,7 @@ PORTNAME= bytestring-show PORTVERSION= 0.3.5.6 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-c2hs/Makefile b/devel/hs-c2hs/Makefile index d4617587f64..e94e28718df 100644 --- a/devel/hs-c2hs/Makefile +++ b/devel/hs-c2hs/Makefile @@ -3,7 +3,7 @@ PORTNAME= c2hs PORTVERSION= 0.28.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,7 @@ COMMENT= C->Haskell FFI tool that gives some cross-language type safety LICENSE= GPLv2 -USE_CABAL= dlist language-c>=0.7.1 shelly>=1.0 text yaml>=0.8 +USE_CABAL= dlist language-c>=0.7.1 shelly>=1.0 yaml>=0.8 XMLDOCS= doc/users_guide:html diff --git a/devel/hs-cabal-install/Makefile b/devel/hs-cabal-install/Makefile index 148b5991085..967b433cfcc 100644 --- a/devel/hs-cabal-install/Makefile +++ b/devel/hs-cabal-install/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= cabal-install -PORTVERSION= 1.24.0.2 +PORTVERSION= 2.2.0.0 PORTREVISION= 1 CATEGORIES= devel haskell @@ -10,9 +10,10 @@ COMMENT= Command-line interface for Cabal and Hackage LICENSE= BSD3CLAUSE -USE_CABAL= async base16-bytestring cryptohash-sha256 hackage-security \ - hashable HTTP mtl network network-uri old-time random stm \ - tar zlib +USE_CABAL= async base16-bytestring base64-bytestring \ + cryptohash-sha256 echo ed25519 edit-distance \ + hackage-security hashable HTTP mtl network network-uri \ + random resolv tar zlib STANDALONE= yes EXECUTABLE= cabal diff --git a/devel/hs-cabal-install/distinfo b/devel/hs-cabal-install/distinfo index e357bb419c5..f3b8a3bc4d1 100644 --- a/devel/hs-cabal-install/distinfo +++ b/devel/hs-cabal-install/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499540276 -SHA256 (cabal/cabal-install-1.24.0.2.tar.gz) = 2ac8819238a0e57fff9c3c857e97b8705b1b5fef2e46cd2829e85d96e2a00fe0 -SIZE (cabal/cabal-install-1.24.0.2.tar.gz) = 499937 +TIMESTAMP = 1523277454 +SHA256 (cabal/cabal-install-2.2.0.0.tar.gz) = c856a2dd93c5a7b909597c066b9f9ca27fbda1a502b3f96077b7918c0f64a3d9 +SIZE (cabal/cabal-install-2.2.0.0.tar.gz) = 662421 diff --git a/devel/hs-call-stack/Makefile b/devel/hs-call-stack/Makefile index 551ce32664b..0257948590b 100644 --- a/devel/hs-call-stack/Makefile +++ b/devel/hs-call-stack/Makefile @@ -2,7 +2,7 @@ PORTNAME= call-stack PORTVERSION= 0.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-cereal/Makefile b/devel/hs-cereal/Makefile index f8128093479..e244738b806 100644 --- a/devel/hs-cereal/Makefile +++ b/devel/hs-cereal/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= cereal -PORTVERSION= 0.5.4.0 -PORTREVISION= 1 +PORTVERSION= 0.5.5.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-cereal/distinfo b/devel/hs-cereal/distinfo index f99ee80b5ce..a6983e6d323 100644 --- a/devel/hs-cereal/distinfo +++ b/devel/hs-cereal/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627824 -SHA256 (cabal/cereal-0.5.4.0.tar.gz) = daca6c5aeff21ca233bebe006c158b0e4421b239c722768b568fca9b32cafee7 -SIZE (cabal/cereal-0.5.4.0.tar.gz) = 19504 +TIMESTAMP = 1523129318 +SHA256 (cabal/cereal-0.5.5.0.tar.gz) = 0b97320ffbfa6df2e5679022215dbd0fe6e3b5ae8428c2ff4310d9e1acf16822 +SIZE (cabal/cereal-0.5.5.0.tar.gz) = 19832 diff --git a/devel/hs-checkers/Makefile b/devel/hs-checkers/Makefile index d625a709302..7e9d1b9e80c 100644 --- a/devel/hs-checkers/Makefile +++ b/devel/hs-checkers/Makefile @@ -3,7 +3,7 @@ PORTNAME= checkers PORTVERSION= 0.4.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-chunked-data/Makefile b/devel/hs-chunked-data/Makefile index 7f1720d0062..269ba3feb43 100644 --- a/devel/hs-chunked-data/Makefile +++ b/devel/hs-chunked-data/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= chunked-data -PORTVERSION= 0.3.0 -PORTREVISION= 1 +PORTVERSION= 0.3.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,8 +9,7 @@ COMMENT= Typeclasses for dealing with various chunked data representations LICENSE= MIT -USE_CABAL= blaze-builder mono-traversable>=0.2 semigroups text>=0.11 \ - vector +USE_CABAL= blaze-builder mono-traversable>=0.2 semigroups vector .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-chunked-data/distinfo b/devel/hs-chunked-data/distinfo index 08ac2c815ca..c0c02750867 100644 --- a/devel/hs-chunked-data/distinfo +++ b/devel/hs-chunked-data/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627825 -SHA256 (cabal/chunked-data-0.3.0.tar.gz) = e1be9da64c3682fd907aa9f1a118e8bfba7964d509fddf54bd245b199dc15f2f -SIZE (cabal/chunked-data-0.3.0.tar.gz) = 4349 +TIMESTAMP = 1524413491 +SHA256 (cabal/chunked-data-0.3.1.tar.gz) = f710c581aee1f899e807fc9e6cba721b27d53dc9d56986f1922bc7ccddf1a79a +SIZE (cabal/chunked-data-0.3.1.tar.gz) = 4605 diff --git a/devel/hs-classy-prelude-conduit/Makefile b/devel/hs-classy-prelude-conduit/Makefile index 1d0bcf01b49..ce7242281ec 100644 --- a/devel/hs-classy-prelude-conduit/Makefile +++ b/devel/hs-classy-prelude-conduit/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= classy-prelude-conduit -PORTVERSION= 1.2.0 -PORTREVISION= 1 +PORTVERSION= 1.4.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-classy-prelude-conduit/distinfo b/devel/hs-classy-prelude-conduit/distinfo index f6816aa3392..f4cfe351a02 100644 --- a/devel/hs-classy-prelude-conduit/distinfo +++ b/devel/hs-classy-prelude-conduit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627826 -SHA256 (cabal/classy-prelude-conduit-1.2.0.tar.gz) = 24090dd042cd74d2663a5870482a60746b9096754f598b5171b800511230ec7f -SIZE (cabal/classy-prelude-conduit-1.2.0.tar.gz) = 1735 +TIMESTAMP = 1525092204 +SHA256 (cabal/classy-prelude-conduit-1.4.0.tar.gz) = 39ef2567a3542ebf91f6ebc103cc4afb64c2a4ec051c7ce578b577ef9931c424 +SIZE (cabal/classy-prelude-conduit-1.4.0.tar.gz) = 1979 diff --git a/devel/hs-classy-prelude/Makefile b/devel/hs-classy-prelude/Makefile index c9b2da16364..61f2f688fd8 100644 --- a/devel/hs-classy-prelude/Makefile +++ b/devel/hs-classy-prelude/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= classy-prelude -PORTVERSION= 1.2.0.1 -PORTREVISION= 1 +PORTVERSION= 1.4.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -14,7 +13,7 @@ USE_CABAL= async basic-prelude bifunctors chunked-data dlist \ exceptions hashable lifted-async lifted-base monad-unlift \ mono-traversable mono-traversable-instances mtl \ mutable-containers primitive safe-exceptions say semigroups \ - stm stm-chans text time-locale-compat transformers-base \ + stm-chans time-locale-compat transformers-base unliftio \ unordered-containers vector vector-instances .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" diff --git a/devel/hs-classy-prelude/distinfo b/devel/hs-classy-prelude/distinfo index e72567fe62a..0b2a4726f7f 100644 --- a/devel/hs-classy-prelude/distinfo +++ b/devel/hs-classy-prelude/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627825 -SHA256 (cabal/classy-prelude-1.2.0.1.tar.gz) = a47ee0c339a73b19fb511e1477fec6a385d2180bcc836a92c157dcb5c91ffa34 -SIZE (cabal/classy-prelude-1.2.0.1.tar.gz) = 12017 +TIMESTAMP = 1525004675 +SHA256 (cabal/classy-prelude-1.4.0.tar.gz) = 2b3b255676ab0fdeb39aebafa3543535ddd684d00c645b643e50cb9e2d25f9e0 +SIZE (cabal/classy-prelude-1.4.0.tar.gz) = 12056 diff --git a/devel/hs-clock/Makefile b/devel/hs-clock/Makefile index a929f26e23f..9fccf376978 100644 --- a/devel/hs-clock/Makefile +++ b/devel/hs-clock/Makefile @@ -2,7 +2,7 @@ PORTNAME= clock PORTVERSION= 0.7.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-cmdargs/Makefile b/devel/hs-cmdargs/Makefile index 52458e6bcf6..9feb8c71b6c 100644 --- a/devel/hs-cmdargs/Makefile +++ b/devel/hs-cmdargs/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= cmdargs -PORTVERSION= 0.10.17 -PORTREVISION= 1 +PORTVERSION= 0.10.20 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-cmdargs/distinfo b/devel/hs-cmdargs/distinfo index 8509d2ff8fc..e1e68f30d7a 100644 --- a/devel/hs-cmdargs/distinfo +++ b/devel/hs-cmdargs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499596679 -SHA256 (cabal/cmdargs-0.10.17.tar.gz) = 3437a4caf4ced650b61620e1c66f406db76ff70244928e5a4e7a20e5e88374da -SIZE (cabal/cmdargs-0.10.17.tar.gz) = 64440 +TIMESTAMP = 1523129483 +SHA256 (cabal/cmdargs-0.10.20.tar.gz) = 0e269dc48c3d4c0447c96ffd772a6fe69dfa1260c323f4cd7bf171cbf2ab7331 +SIZE (cabal/cmdargs-0.10.20.tar.gz) = 64550 diff --git a/devel/hs-code-page/Makefile b/devel/hs-code-page/Makefile index ed81f483259..43010a0b651 100644 --- a/devel/hs-code-page/Makefile +++ b/devel/hs-code-page/Makefile @@ -2,7 +2,7 @@ PORTNAME= code-page PORTVERSION= 0.1.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-colour/Makefile b/devel/hs-colour/Makefile index 6ae2f165dc6..7d08609773b 100644 --- a/devel/hs-colour/Makefile +++ b/devel/hs-colour/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= colour -PORTVERSION= 2.3.3 -PORTREVISION= 1 +PORTVERSION= 2.3.4 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-colour/distinfo b/devel/hs-colour/distinfo index db94588f4d6..6ac4ad7ae04 100644 --- a/devel/hs-colour/distinfo +++ b/devel/hs-colour/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499547650 -SHA256 (cabal/colour-2.3.3.tar.gz) = 8d15a63494f8e2a06fe6dc38baee8e948adfae0e93749b9e3ce0fd8ece09b6e2 -SIZE (cabal/colour-2.3.3.tar.gz) = 20392 +TIMESTAMP = 1523129642 +SHA256 (cabal/colour-2.3.4.tar.gz) = 0f439f00b322ce3d551f28a4dd1520aa2c91d699de4cdc6d485b9b04be0dc5eb +SIZE (cabal/colour-2.3.4.tar.gz) = 20418 diff --git a/devel/hs-concurrent-output/Makefile b/devel/hs-concurrent-output/Makefile index d7883325b97..189ec57b677 100644 --- a/devel/hs-concurrent-output/Makefile +++ b/devel/hs-concurrent-output/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= concurrent-output -PORTVERSION= 1.10.0 +PORTVERSION= 1.10.5 PORTREVISION= 1 CATEGORIES= devel haskell @@ -10,7 +10,7 @@ COMMENT= Ungarble output from several threads or commands LICENSE= BSD2CLAUSE -USE_CABAL= text async stm exceptions ansi-terminal terminal-size +USE_CABAL= async exceptions ansi-terminal terminal-size .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-concurrent-output/distinfo b/devel/hs-concurrent-output/distinfo index f3d0b41e12c..1d3fd4ffc09 100644 --- a/devel/hs-concurrent-output/distinfo +++ b/devel/hs-concurrent-output/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1501333173 -SHA256 (cabal/concurrent-output-1.10.0.tar.gz) = 29716759e088f2a59b4aef2c9cb5e4931d7990f1a6393adcb551781ed1af58b2 -SIZE (cabal/concurrent-output-1.10.0.tar.gz) = 21764 +TIMESTAMP = 1523694433 +SHA256 (cabal/concurrent-output-1.10.5.tar.gz) = 98c096228664d591eb2c352080955a202e883cdab8452efae3cae407e30fa5c3 +SIZE (cabal/concurrent-output-1.10.5.tar.gz) = 21970 diff --git a/devel/hs-concurrent-output/files/patch-concurrent-output.cabal b/devel/hs-concurrent-output/files/patch-concurrent-output.cabal deleted file mode 100644 index a517c388b92..00000000000 --- a/devel/hs-concurrent-output/files/patch-concurrent-output.cabal +++ /dev/null @@ -1,11 +0,0 @@ ---- concurrent-output.cabal.orig 2017-05-19 15:55:09 UTC -+++ concurrent-output.cabal -@@ -34,7 +34,7 @@ Library - , text (>= 0.11.0 && < 1.3.0) - , async (>= 2.0 && < 2.2) - , stm (>= 2.0 && < 2.5) -- , process (>= 1.6.0 && < 1.7.0) -+ , process - , directory (>= 1.2.0 && < 1.4.0) - , transformers (>= 0.3.0 && < 0.6.0) - , exceptions (>= 0.6.0 && < 0.9.0) diff --git a/devel/hs-conduit-combinators/Makefile b/devel/hs-conduit-combinators/Makefile index 2ccb0eff61d..0ef74f01a28 100644 --- a/devel/hs-conduit-combinators/Makefile +++ b/devel/hs-conduit-combinators/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= conduit-combinators -PORTVERSION= 1.1.1 -PORTREVISION= 1 +PORTVERSION= 1.3.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -13,7 +12,7 @@ LICENSE= MIT USE_CABAL= base16-bytestring base64-bytestring>=0.1.1.1 chunked-data \ conduit>=1.2.2 conduit-extra>=1.1.1 monad-control \ mono-traversable>=0.4 mwc-random primitive resourcet \ - text transformers-base unix-compat vector void + transformers-base unix-compat vector void .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-conduit-combinators/distinfo b/devel/hs-conduit-combinators/distinfo index 28904c912a6..f9858acb773 100644 --- a/devel/hs-conduit-combinators/distinfo +++ b/devel/hs-conduit-combinators/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627827 -SHA256 (cabal/conduit-combinators-1.1.1.tar.gz) = a022e80d54d6cae017ae69e04b44fd6f57f8bac6b889e574dc09d30170ac0918 -SIZE (cabal/conduit-combinators-1.1.1.tar.gz) = 38380 +TIMESTAMP = 1525004319 +SHA256 (cabal/conduit-combinators-1.3.0.tar.gz) = 9717d916a0422a7fb7cc262302333269607530d40cd0bea3be947872f906e7d3 +SIZE (cabal/conduit-combinators-1.3.0.tar.gz) = 2204 diff --git a/devel/hs-conduit-extra/Makefile b/devel/hs-conduit-extra/Makefile index c73417eaa9f..bfaf8d98069 100644 --- a/devel/hs-conduit-extra/Makefile +++ b/devel/hs-conduit-extra/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= conduit-extra -PORTVERSION= 1.1.16 +PORTVERSION= 1.3.0 PORTREVISION= 1 CATEGORIES= devel haskell @@ -12,7 +12,7 @@ LICENSE= MIT USE_CABAL= attoparsec>=0.10 blaze-builder>=0.3 conduit>=1.1 \ monad-control network>=2.3 primitive>=0.5 resourcet>=1.1 \ - stm streaming-commons>=0.1.11 text transformers-base + streaming-commons>=0.1.11 transformers-base typed-process .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-conduit-extra/distinfo b/devel/hs-conduit-extra/distinfo index bb3c610cd93..27b1aad9f74 100644 --- a/devel/hs-conduit-extra/distinfo +++ b/devel/hs-conduit-extra/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627827 -SHA256 (cabal/conduit-extra-1.1.16.tar.gz) = bd72c1bacd5f59a74a73a0aa115b8314f0a1dc1b24d939e52a983113c960f8d5 -SIZE (cabal/conduit-extra-1.1.16.tar.gz) = 34402 +TIMESTAMP = 1523897535 +SHA256 (cabal/conduit-extra-1.3.0.tar.gz) = 2c41c925fc53d9ba2e640c7cdca72c492b28c0d45f1a82e94baef8dfa65922ae +SIZE (cabal/conduit-extra-1.3.0.tar.gz) = 32716 diff --git a/devel/hs-conduit/Makefile b/devel/hs-conduit/Makefile index 5db2c85d4d7..36afa5a6528 100644 --- a/devel/hs-conduit/Makefile +++ b/devel/hs-conduit/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= conduit -PORTVERSION= 1.2.11 -PORTREVISION= 1 +PORTVERSION= 1.3.0.2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,8 +9,8 @@ COMMENT= Streaming data processing library LICENSE= MIT -USE_CABAL= exceptions>=0.6 lifted-base>=0.1 mmorph mtl resourcet>=1.1 \ - transformers-base>=0.4.1 void>=0.5.5 +USE_CABAL= exceptions>=0.6 lifted-base>=0.1 mmorph mono-traversable mtl \ + resourcet>=1.1 transformers-base>=0.4.1 vector void>=0.5.5 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-conduit/distinfo b/devel/hs-conduit/distinfo index 0ede71efa0c..04677914237 100644 --- a/devel/hs-conduit/distinfo +++ b/devel/hs-conduit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499543753 -SHA256 (cabal/conduit-1.2.11.tar.gz) = 0b66423f04d991262b800174064d0c6046fba0009eddcca616f9afaf84dca8f7 -SIZE (cabal/conduit-1.2.11.tar.gz) = 50240 +TIMESTAMP = 1523696712 +SHA256 (cabal/conduit-1.3.0.2.tar.gz) = c0f099d242504e65a78e1cbb54c18afad45fe2c9297d1d918ce28ae7dc4a1e5b +SIZE (cabal/conduit-1.3.0.2.tar.gz) = 86664 diff --git a/devel/hs-configurator/Makefile b/devel/hs-configurator/Makefile index 9ec1491cec8..f59f74dbc17 100644 --- a/devel/hs-configurator/Makefile +++ b/devel/hs-configurator/Makefile @@ -2,7 +2,7 @@ PORTNAME= configurator PORTVERSION= 0.3.0.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,8 +10,7 @@ COMMENT= Configuration management LICENSE= BSD3CLAUSE -USE_CABAL= attoparsec>=0.10.0.2 hashable text>=0.11.1.0 unix-compat \ - unordered-containers +USE_CABAL= attoparsec>=0.10.0.2 hashable unix-compat unordered-containers .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-constraints/Makefile b/devel/hs-constraints/Makefile index a9c7c3ee0aa..3103143f0f4 100644 --- a/devel/hs-constraints/Makefile +++ b/devel/hs-constraints/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= constraints -PORTVERSION= 0.9.1 -PORTREVISION= 1 +PORTVERSION= 0.10 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= Constraint manipulation LICENSE= BSD3CLAUSE -USE_CABAL= hashable mtl transformers-compat +USE_CABAL= hashable mtl semigroups transformers-compat .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-constraints/distinfo b/devel/hs-constraints/distinfo index 33ab5090452..eda0daed2a9 100644 --- a/devel/hs-constraints/distinfo +++ b/devel/hs-constraints/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499444670 -SHA256 (cabal/constraints-0.9.1.tar.gz) = 276e012838861145fca65d065dd9839f7cbd71236032b557194389180a30a785 -SIZE (cabal/constraints-0.9.1.tar.gz) = 18503 +TIMESTAMP = 1523445706 +SHA256 (cabal/constraints-0.10.tar.gz) = c224b82e53c21791083c83fed2f2c938bd715a63c8efa90a5abcc3d8859126c6 +SIZE (cabal/constraints-0.10.tar.gz) = 19703 diff --git a/devel/hs-convertible/Makefile b/devel/hs-convertible/Makefile index f111fa33dc3..1d28d45aa2d 100644 --- a/devel/hs-convertible/Makefile +++ b/devel/hs-convertible/Makefile @@ -3,7 +3,7 @@ PORTNAME= convertible PORTVERSION= 1.1.1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,7 @@ COMMENT= Typeclasses and instances for converting between types LICENSE= BSD3CLAUSE -USE_CABAL= mtl old-locale old-time text>=0.8 +USE_CABAL= mtl old-locale old-time .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-cpphs/Makefile b/devel/hs-cpphs/Makefile index 0f0b6a01a29..3997c51a541 100644 --- a/devel/hs-cpphs/Makefile +++ b/devel/hs-cpphs/Makefile @@ -3,7 +3,7 @@ PORTNAME= cpphs PORTVERSION= 1.20.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-darcs/Makefile b/devel/hs-darcs/Makefile index 2b5f28695d7..15926cb0267 100644 --- a/devel/hs-darcs/Makefile +++ b/devel/hs-darcs/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= darcs -PORTVERSION= 2.12.5 -PORTREVISION= 1 +PORTVERSION= 2.14.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -13,13 +12,15 @@ LICENSE= GPLv2 USE_CABAL= async attoparsec base16-bytestring cryptohash \ data-ordlist dataenc fgl graphviz hashable html HTTP \ - mmap mtl parsec random \ + mmap mtl random \ regex-applicative regex-compat-tdfa sandi tar \ - text transformers-compat unix-compat \ + transformers-compat unix-compat \ utf8-string vector zip-archive zlib EXECUTABLE= darcs +IGNORE= Depends on graphics/hs-graphviz, which doesn't compile with recent GHC + MAN1PAGES= darcs.1 FLAGS_DEFINE= STATIC TERMINFO THREADED diff --git a/devel/hs-darcs/distinfo b/devel/hs-darcs/distinfo index b1637f2cebd..78c41004966 100644 --- a/devel/hs-darcs/distinfo +++ b/devel/hs-darcs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499538866 -SHA256 (cabal/darcs-2.12.5.tar.gz) = 355b04c85c27bca43c8c380212988d9c1e9a984b0b593ceb2884de4295063553 -SIZE (cabal/darcs-2.12.5.tar.gz) = 1460698 +TIMESTAMP = 1525013682 +SHA256 (cabal/darcs-2.14.0.tar.gz) = 19fa0882a1485f03ab0552d6f01d538c2b286c4a38a1fe502e9cf2a78f782803 +SIZE (cabal/darcs-2.14.0.tar.gz) = 1063067 diff --git a/devel/hs-darcs/files/patch-darcs.cabal b/devel/hs-darcs/files/patch-darcs.cabal deleted file mode 100644 index 18095e40a87..00000000000 --- a/devel/hs-darcs/files/patch-darcs.cabal +++ /dev/null @@ -1,11 +0,0 @@ ---- darcs.cabal.orig 2017-07-11 16:28:16 UTC -+++ darcs.cabal -@@ -400,7 +400,7 @@ Library - transformers-compat >= 0.4 && < 0.6, - parsec >= 3.1 && < 3.2, - fgl >= 5.5.0.1 && < 5.6, -- graphviz >= 2999.17.0.1 && < 2999.19, -+ graphviz >= 2999.17.0.1 && < 2999.20, - html >= 1.0.1.2 && < 1.1, - filepath >= 1.3.0.1 && < 1.5.0.0, - haskeline >= 0.6.3 && < 0.8, diff --git a/devel/hs-data-default-class/Makefile b/devel/hs-data-default-class/Makefile index 80a1be79067..93806eee7fb 100644 --- a/devel/hs-data-default-class/Makefile +++ b/devel/hs-data-default-class/Makefile @@ -2,7 +2,7 @@ PORTNAME= data-default-class PORTVERSION= 0.1.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-data-default-instances-base/Makefile b/devel/hs-data-default-instances-base/Makefile index cfd840eaaf0..7607f52e3c7 100644 --- a/devel/hs-data-default-instances-base/Makefile +++ b/devel/hs-data-default-instances-base/Makefile @@ -2,7 +2,7 @@ PORTNAME= data-default-instances-base PORTVERSION= 0.1.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-data-default-instances-containers/Makefile b/devel/hs-data-default-instances-containers/Makefile index 5355b8bf596..fa610c0227c 100644 --- a/devel/hs-data-default-instances-containers/Makefile +++ b/devel/hs-data-default-instances-containers/Makefile @@ -2,7 +2,7 @@ PORTNAME= data-default-instances-containers PORTVERSION= 0.0.1 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-data-default-instances-dlist/Makefile b/devel/hs-data-default-instances-dlist/Makefile index 94b2f4c386b..c97f3288e15 100644 --- a/devel/hs-data-default-instances-dlist/Makefile +++ b/devel/hs-data-default-instances-dlist/Makefile @@ -2,7 +2,7 @@ PORTNAME= data-default-instances-dlist PORTVERSION= 0.0.1 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-data-default-instances-old-locale/Makefile b/devel/hs-data-default-instances-old-locale/Makefile index c021b29e35e..43047104a48 100644 --- a/devel/hs-data-default-instances-old-locale/Makefile +++ b/devel/hs-data-default-instances-old-locale/Makefile @@ -2,7 +2,7 @@ PORTNAME= data-default-instances-old-locale PORTVERSION= 0.0.1 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-data-default/Makefile b/devel/hs-data-default/Makefile index 41dcfa8bbbd..c238d99cc8e 100644 --- a/devel/hs-data-default/Makefile +++ b/devel/hs-data-default/Makefile @@ -2,7 +2,7 @@ PORTNAME= data-default PORTVERSION= 0.7.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-data-endian/Makefile b/devel/hs-data-endian/Makefile index 8b4bb77da09..14830268713 100644 --- a/devel/hs-data-endian/Makefile +++ b/devel/hs-data-endian/Makefile @@ -2,7 +2,7 @@ PORTNAME= data-endian PORTVERSION= 0.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-data-hash/Makefile b/devel/hs-data-hash/Makefile index 8df8401ae5e..a7697577cd4 100644 --- a/devel/hs-data-hash/Makefile +++ b/devel/hs-data-hash/Makefile @@ -2,7 +2,7 @@ PORTNAME= data-hash PORTVERSION= 0.2.0.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-data-ordlist/Makefile b/devel/hs-data-ordlist/Makefile index bf8f82fd21c..905388bfada 100644 --- a/devel/hs-data-ordlist/Makefile +++ b/devel/hs-data-ordlist/Makefile @@ -2,7 +2,7 @@ PORTNAME= data-ordlist PORTVERSION= 0.4.7.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-data-pprint/files/patch-Data_PPrint.hs b/devel/hs-data-pprint/files/patch-Data_PPrint.hs new file mode 100644 index 00000000000..f517231270e --- /dev/null +++ b/devel/hs-data-pprint/files/patch-Data_PPrint.hs @@ -0,0 +1,9 @@ +--- Data/PPrint.hs.orig 2018-04-13 19:36:43 UTC ++++ Data/PPrint.hs +@@ -60,6 +60,6 @@ a === b = do + showBotts :: [(String, String)] -> Doc + showBotts es = vcat $ map f es + where +- f (i, e) = text i <> text ":" <+> vcat (map text $ lines e) ++ f (i, e) = text i Text.PrettyPrint.HughesPJ.<> text ":" <+> vcat (map text $ lines e) + diff --git a/devel/hs-data-pprint/files/patch-data-pprint.cabal b/devel/hs-data-pprint/files/patch-data-pprint.cabal index a63eb3a4941..7540b55da34 100644 --- a/devel/hs-data-pprint/files/patch-data-pprint.cabal +++ b/devel/hs-data-pprint/files/patch-data-pprint.cabal @@ -1,10 +1,14 @@ ---- data-pprint.cabal.orig 2017-07-10 15:51:41 UTC +--- data-pprint.cabal.orig 2016-05-24 15:33:57 UTC +++ data-pprint.cabal -@@ -72,6 +72,6 @@ library +@@ -68,10 +68,10 @@ library + System.IO.Parallel + other-modules: + build-depends: +- base >= 4.0 && < 4.10, ++ base >= 4.0 && < 4.12, pretty >= 1.0 && < 1.2, mtl >= 2.0 && < 2.3, deepseq >= 1.1 && < 1.5, - time >= 1.2 && < 1.6, -+ time >= 1.2 && < 1.7, ++ time >= 1.2 && < 1.9, parallel >= 3.1 && < 3.3 - diff --git a/devel/hs-date-cache/Makefile b/devel/hs-date-cache/Makefile index 731b61f8673..cf72a6193e1 100644 --- a/devel/hs-date-cache/Makefile +++ b/devel/hs-date-cache/Makefile @@ -2,7 +2,7 @@ PORTNAME= date-cache PORTVERSION= 0.3.0 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-datetime/Makefile b/devel/hs-datetime/Makefile index d2683024f8b..aa50ab687a0 100644 --- a/devel/hs-datetime/Makefile +++ b/devel/hs-datetime/Makefile @@ -3,7 +3,7 @@ PORTNAME= datetime PORTVERSION= 0.3.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-dbus/Makefile b/devel/hs-dbus/Makefile index 3f8dd4b5313..21483daafbc 100644 --- a/devel/hs-dbus/Makefile +++ b/devel/hs-dbus/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= dbus -PORTVERSION= 0.10.13 -PORTREVISION= 1 +PORTVERSION= 1.0.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,8 @@ COMMENT= A client library for the D-Bus IPC system LICENSE= GPLv3 -USE_CABAL= cereal libxml-sax network parsec random text vector xml-types +USE_CABAL= cereal lens libxml-sax network random split th-lift vector \ + xml-types .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-dbus/distinfo b/devel/hs-dbus/distinfo index 14245bed493..d259b22642a 100644 --- a/devel/hs-dbus/distinfo +++ b/devel/hs-dbus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1501342515 -SHA256 (cabal/dbus-0.10.13.tar.gz) = aa94aefba8a0be240faddec88442afd8db1fa4e994423d474b112ec1c67e7aca -SIZE (cabal/dbus-0.10.13.tar.gz) = 75603 +TIMESTAMP = 1524595525 +SHA256 (cabal/dbus-1.0.1.tar.gz) = a325b5c6958a343b30fd378d54ac01f9db889a4d7cadb14b2103da7ef4e7e8f5 +SIZE (cabal/dbus-1.0.1.tar.gz) = 77535 diff --git a/devel/hs-deepseq-generics/Makefile b/devel/hs-deepseq-generics/Makefile index b304c7b6035..06a3c2ea7f3 100644 --- a/devel/hs-deepseq-generics/Makefile +++ b/devel/hs-deepseq-generics/Makefile @@ -1,14 +1,14 @@ # $FreeBSD$ -PORTNAME= deepseq-generics -PORTVERSION= 0.2.0.0 -PORTREVISION= 1 -CATEGORIES= devel haskell +PORTNAME= deepseq-generics +PORTVERSION= 0.2.0.0 +PORTREVISION= 2 +CATEGORIES= devel haskell -MAINTAINER= haskell@FreeBSD.org -COMMENT= GHC.Generics-based Control.DeepSeq.rnf implementation +MAINTAINER= haskell@FreeBSD.org +COMMENT= GHC.Generics-based Control.DeepSeq.rnf implementation -LICENSE= BSD3CLAUSE +LICENSE= BSD3CLAUSE .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-deepseq-generics/files/patch-deepseq-generics.cabal b/devel/hs-deepseq-generics/files/patch-deepseq-generics.cabal new file mode 100644 index 00000000000..0a299b3510f --- /dev/null +++ b/devel/hs-deepseq-generics/files/patch-deepseq-generics.cabal @@ -0,0 +1,10 @@ +--- deepseq-generics.cabal.orig 2018-04-11 11:03:49 UTC ++++ deepseq-generics.cabal +@@ -42,7 +42,7 @@ source-repository head + library + default-language: Haskell2010 + exposed-modules: Control.DeepSeq.Generics +- build-depends: base >= 4.5 && < 4.10, ghc-prim >= 0.2 && < 0.6, deepseq >= 1.2.0.1 && < 1.5 ++ build-depends: base >= 4.5 && < 4.12, ghc-prim >= 0.2 && < 0.6, deepseq >= 1.2.0.1 && < 1.5 + other-extensions: BangPatterns, FlexibleContexts, TypeOperators + ghc-options: -Wall diff --git a/devel/hs-directory-tree/Makefile b/devel/hs-directory-tree/Makefile index bce313f4ba5..d07bd5d3a72 100644 --- a/devel/hs-directory-tree/Makefile +++ b/devel/hs-directory-tree/Makefile @@ -2,7 +2,7 @@ PORTNAME= directory-tree PORTVERSION= 0.12.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-dlist-instances/Makefile b/devel/hs-dlist-instances/Makefile index 99f4a5d4e0f..a2b8dc3f142 100644 --- a/devel/hs-dlist-instances/Makefile +++ b/devel/hs-dlist-instances/Makefile @@ -2,7 +2,7 @@ PORTNAME= dlist-instances PORTVERSION= 0.1.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-dlist/Makefile b/devel/hs-dlist/Makefile index b96deb5ec13..bcfd5271606 100644 --- a/devel/hs-dlist/Makefile +++ b/devel/hs-dlist/Makefile @@ -3,7 +3,7 @@ PORTNAME= dlist PORTVERSION= 0.8.0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-easy-file/Makefile b/devel/hs-easy-file/Makefile index 359e686e78b..cb4796d2bb5 100644 --- a/devel/hs-easy-file/Makefile +++ b/devel/hs-easy-file/Makefile @@ -2,7 +2,7 @@ PORTNAME= easy-file PORTVERSION= 0.2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-echo/Makefile b/devel/hs-echo/Makefile new file mode 100644 index 00000000000..14af7c95978 --- /dev/null +++ b/devel/hs-echo/Makefile @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTNAME= echo +PORTVERSION= 0.1.3 +CATEGORIES= devel haskell + +MAINTAINER= haskell@FreeBSD.org +COMMENT= Cross-platform and cross-console library to handle echoing terminal input + +LICENSE= BSD3CLAUSE + +.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" +.include diff --git a/devel/hs-echo/distinfo b/devel/hs-echo/distinfo new file mode 100644 index 00000000000..a7cf34b1ea2 --- /dev/null +++ b/devel/hs-echo/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1523290399 +SHA256 (cabal/echo-0.1.3.tar.gz) = 704f07310f8272d170f8ab7fb2a2c13f15d8501ef8310801e36964c8eff485ef +SIZE (cabal/echo-0.1.3.tar.gz) = 5373 diff --git a/devel/hs-echo/files/patch-echo.cabal b/devel/hs-echo/files/patch-echo.cabal new file mode 100644 index 00000000000..515e4e8df56 --- /dev/null +++ b/devel/hs-echo/files/patch-echo.cabal @@ -0,0 +1,11 @@ +--- echo.cabal.orig 2018-04-09 16:19:02 UTC ++++ echo.cabal +@@ -39,7 +39,7 @@ library + System.IO.Echo.Internal + + build-depends: base >= 4.3 && < 5 +- , process >= 1.0.1.1 && < 1.5 ++ , process >= 1.0.1.1 && < 1.7 + if os(windows) + cpp-options: "-DWINDOWS" + build-depends: mintty >= 0.1 && < 0.2 diff --git a/devel/hs-echo/pkg-descr b/devel/hs-echo/pkg-descr new file mode 100644 index 00000000000..e36e97fe376 --- /dev/null +++ b/devel/hs-echo/pkg-descr @@ -0,0 +1,6 @@ +The base Haskell library exposes the hGetEcho and hSetEcho functions for +querying and setting echo status, but unfortunately, neither function works +with MinTTY consoles on Windows. This library provides an alternative interface +which works with both MinTTY and other consoles. + +WWW: https://github.com/RyanGlScott/echo diff --git a/devel/hs-edit-distance/Makefile b/devel/hs-edit-distance/Makefile index e18bc7647f9..26a790956fb 100644 --- a/devel/hs-edit-distance/Makefile +++ b/devel/hs-edit-distance/Makefile @@ -2,7 +2,7 @@ PORTNAME= edit-distance PORTVERSION= 0.2.2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-either/Makefile b/devel/hs-either/Makefile index a9a00c4c169..97016147fa8 100644 --- a/devel/hs-either/Makefile +++ b/devel/hs-either/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= either -PORTVERSION= 4.4.1.1 -PORTREVISION= 1 +PORTVERSION= 5 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-either/distinfo b/devel/hs-either/distinfo index 69815b6ae8a..0cd4aea4ad8 100644 --- a/devel/hs-either/distinfo +++ b/devel/hs-either/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627832 -SHA256 (cabal/either-4.4.1.1.tar.gz) = b087cb0fb63fec2fbdcac05fef0d03751daef5deb86cda3c732b9a6a31e634d3 -SIZE (cabal/either-4.4.1.1.tar.gz) = 9376 +TIMESTAMP = 1524406695 +SHA256 (cabal/either-5.tar.gz) = 75cee27641a34f80e6c71f82469a76c7f51d23a522e792e2733269ebf7cbf420 +SIZE (cabal/either-5.tar.gz) = 8637 diff --git a/devel/hs-either/files/patch-either.cabal b/devel/hs-either/files/patch-either.cabal deleted file mode 100644 index ab50ef68213..00000000000 --- a/devel/hs-either/files/patch-either.cabal +++ /dev/null @@ -1,14 +0,0 @@ ---- either.cabal.orig 2017-07-10 15:15:32 UTC -+++ either.cabal -@@ -32,9 +32,9 @@ library - exceptions >= 0.5 && < 0.9, - free >= 4.9 && < 5, - monad-control >= 0.3.2 && < 1.1, -- MonadRandom >= 0.1 && < 0.5, -+ MonadRandom >= 0.1 && < 0.6, - mtl >= 2.0 && < 2.3, -- mmorph >= 1.0.0 && < 1.1, -+ mmorph >= 1.0.0 && < 1.2, - profunctors >= 4 && < 6, - semigroups >= 0.8.3.1 && < 1, - semigroupoids >= 4 && < 6, diff --git a/devel/hs-enclosed-exceptions/Makefile b/devel/hs-enclosed-exceptions/Makefile index 1848f1e4cfd..7f3662e795e 100644 --- a/devel/hs-enclosed-exceptions/Makefile +++ b/devel/hs-enclosed-exceptions/Makefile @@ -2,7 +2,7 @@ PORTNAME= enclosed-exceptions PORTVERSION= 1.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-enumerator/Makefile b/devel/hs-enumerator/Makefile index 73cdc720f8f..dc2f0412cec 100644 --- a/devel/hs-enumerator/Makefile +++ b/devel/hs-enumerator/Makefile @@ -2,7 +2,7 @@ PORTNAME= enumerator PORTVERSION= 0.4.20 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,7 @@ COMMENT= Reliable, high-performance processing with left-fold enumerators LICENSE= MIT -USE_CABAL= text>=0.7 +IGNORE= Doesn't build with recent GHC version .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-equivalence/Makefile b/devel/hs-equivalence/Makefile index 2187c1a0e6b..f926a4f3889 100644 --- a/devel/hs-equivalence/Makefile +++ b/devel/hs-equivalence/Makefile @@ -2,7 +2,7 @@ PORTNAME= equivalence PORTVERSION= 0.3.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-errors/Makefile b/devel/hs-errors/Makefile index 66ef21668b6..1230d1473cf 100644 --- a/devel/hs-errors/Makefile +++ b/devel/hs-errors/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= errors -PORTVERSION= 2.2.1 -PORTREVISION= 1 +PORTVERSION= 2.2.5 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= Simplified error-handling LICENSE= BSD3CLAUSE -USE_CABAL= exceptions>=0.6 safe>=0.3.3 transformers-compat unexceptionalio text +USE_CABAL= exceptions>=0.6 safe>=0.3.3 transformers-compat unexceptionalio .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-errors/distinfo b/devel/hs-errors/distinfo index 0a965efdc04..31be5b46197 100644 --- a/devel/hs-errors/distinfo +++ b/devel/hs-errors/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499451104 -SHA256 (cabal/errors-2.2.1.tar.gz) = 4197eb87910bf32d81b92247c2f8fbeee1650217532374ecb63a09d12255f531 -SIZE (cabal/errors-2.2.1.tar.gz) = 8821 +TIMESTAMP = 1523996378 +SHA256 (cabal/errors-2.2.5.tar.gz) = e917ca560c5573d792483677fa5ad30d9d1923d21361ce24879cb51e6fbc735c +SIZE (cabal/errors-2.2.5.tar.gz) = 9030 diff --git a/devel/hs-exceptions/Makefile b/devel/hs-exceptions/Makefile index 76d7b5d3dbc..3adad433c93 100644 --- a/devel/hs-exceptions/Makefile +++ b/devel/hs-exceptions/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= exceptions -PORTVERSION= 0.8.3 +PORTVERSION= 0.10.0 PORTREVISION= 1 CATEGORIES= devel haskell @@ -10,7 +10,7 @@ COMMENT= Extensible optionally-pure exceptions LICENSE= BSD3CLAUSE -USE_CABAL= mtl stm transformers-compat +USE_CABAL= mtl transformers-compat .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-exceptions/distinfo b/devel/hs-exceptions/distinfo index da74124de56..3482e8b1ae9 100644 --- a/devel/hs-exceptions/distinfo +++ b/devel/hs-exceptions/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499444351 -SHA256 (cabal/exceptions-0.8.3.tar.gz) = 4d6ad97e8e3d5dc6ce9ae68a469dc2fd3f66e9d312bc6faa7ab162eddcef87be -SIZE (cabal/exceptions-0.8.3.tar.gz) = 12986 +TIMESTAMP = 1523386414 +SHA256 (cabal/exceptions-0.10.0.tar.gz) = 1edd912e5ea5cbda37941b06738597d35214dc247d332b1bfffc82adadfa49d7 +SIZE (cabal/exceptions-0.10.0.tar.gz) = 19460 diff --git a/devel/hs-extensible-exceptions/Makefile b/devel/hs-extensible-exceptions/Makefile index 0e147eb5b8b..d59087a4afc 100644 --- a/devel/hs-extensible-exceptions/Makefile +++ b/devel/hs-extensible-exceptions/Makefile @@ -2,7 +2,7 @@ PORTNAME= extensible-exceptions PORTVERSION= 0.1.1.4 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-extra/Makefile b/devel/hs-extra/Makefile index e4f73fb5c2c..7a5d06c5865 100644 --- a/devel/hs-extra/Makefile +++ b/devel/hs-extra/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= extra -PORTVERSION= 1.6 -PORTREVISION= 1 +PORTVERSION= 1.6.6 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-extra/distinfo b/devel/hs-extra/distinfo index a5810203840..ff729928526 100644 --- a/devel/hs-extra/distinfo +++ b/devel/hs-extra/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627833 -SHA256 (cabal/extra-1.6.tar.gz) = 0766e656fad80cfff4fc4c0370d2fe1712077549a5f8a57c38d2c1b5da7b14df -SIZE (cabal/extra-1.6.tar.gz) = 36369 +TIMESTAMP = 1525013177 +SHA256 (cabal/extra-1.6.6.tar.gz) = 79996e6a8add465b9ae6253249199afc7fb2e4df475744dbe32b3c0b4573a09d +SIZE (cabal/extra-1.6.6.tar.gz) = 39499 diff --git a/devel/hs-fast-logger/Makefile b/devel/hs-fast-logger/Makefile index 257c4332caf..dc5e407bcfe 100644 --- a/devel/hs-fast-logger/Makefile +++ b/devel/hs-fast-logger/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= fast-logger -PORTVERSION= 2.4.10 -PORTREVISION= 1 +PORTVERSION= 2.4.11 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= Fast logging system LICENSE= BSD3CLAUSE -USE_CABAL= auto-update easy-file old-locale text unix-time +USE_CABAL= auto-update easy-file old-locale unix-time .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-fast-logger/distinfo b/devel/hs-fast-logger/distinfo index c05e4df04fa..e8a39e4b4bb 100644 --- a/devel/hs-fast-logger/distinfo +++ b/devel/hs-fast-logger/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627834 -SHA256 (cabal/fast-logger-2.4.10.tar.gz) = dec4a5d1a88f822d08d334ee870a08a8bb63b2b226d145cd24a7f08676ce678d -SIZE (cabal/fast-logger-2.4.10.tar.gz) = 9537 +TIMESTAMP = 1523783540 +SHA256 (cabal/fast-logger-2.4.11.tar.gz) = bbe5deab58f435754dbe938cf0ddf26fc21f317c35fb3431d4bdb96809dea2a9 +SIZE (cabal/fast-logger-2.4.11.tar.gz) = 10326 diff --git a/devel/hs-fgl/Makefile b/devel/hs-fgl/Makefile index 87598b6ba8b..53cc26e8af5 100644 --- a/devel/hs-fgl/Makefile +++ b/devel/hs-fgl/Makefile @@ -3,7 +3,7 @@ PORTNAME= fgl PORTVERSION= 5.5.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-file-embed/Makefile b/devel/hs-file-embed/Makefile index 6c680612cf0..983a8c4ebfd 100644 --- a/devel/hs-file-embed/Makefile +++ b/devel/hs-file-embed/Makefile @@ -2,7 +2,7 @@ PORTNAME= file-embed PORTVERSION= 0.0.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-filemanip/Makefile b/devel/hs-filemanip/Makefile index 807fd066f4f..dd5a1471031 100644 --- a/devel/hs-filemanip/Makefile +++ b/devel/hs-filemanip/Makefile @@ -3,7 +3,7 @@ PORTNAME= filemanip PORTVERSION= 0.3.6.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-filestore/Makefile b/devel/hs-filestore/Makefile index b90a78d389d..99e1db8526e 100644 --- a/devel/hs-filestore/Makefile +++ b/devel/hs-filestore/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= filestore -PORTVERSION= 0.6.3.1 -PORTREVISION= 1 +PORTVERSION= 0.6.3.2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,8 +9,7 @@ COMMENT= Interface for versioning file stores LICENSE= BSD3CLAUSE -USE_CABAL= Diff>=0.2 old-locale>=1.0 parsec>=2 split>=0.1 \ - utf8-string>=0.3 xml>=1.3 +USE_CABAL= Diff>=0.2 old-locale>=1.0 split>=0.1 utf8-string>=0.3 xml>=1.3 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-filestore/distinfo b/devel/hs-filestore/distinfo index 6088cc20a8d..2c868f21974 100644 --- a/devel/hs-filestore/distinfo +++ b/devel/hs-filestore/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627835 -SHA256 (cabal/filestore-0.6.3.1.tar.gz) = 816f0db22291c7ac719db4b342e8ecc42c8ab749374cc70790887a6d025ad8de -SIZE (cabal/filestore-0.6.3.1.tar.gz) = 31776 +TIMESTAMP = 1523961106 +SHA256 (cabal/filestore-0.6.3.2.tar.gz) = 1b8090d20c940ac3444dd9649ed71e934601dba9f2fb9579e67fff6dcd32a15b +SIZE (cabal/filestore-0.6.3.2.tar.gz) = 31870 diff --git a/devel/hs-fmlist/Makefile b/devel/hs-fmlist/Makefile index 02922469220..0570b80342a 100644 --- a/devel/hs-fmlist/Makefile +++ b/devel/hs-fmlist/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= fmlist -PORTVERSION= 0.9 -PORTREVISION= 1 +PORTVERSION= 0.9.2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-fmlist/distinfo b/devel/hs-fmlist/distinfo index dea77335835..47f0bced997 100644 --- a/devel/hs-fmlist/distinfo +++ b/devel/hs-fmlist/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499719989 -SHA256 (cabal/fmlist-0.9.tar.gz) = 581153395a71e3c139365ffbebbeac6d880a6fdfee23e7f5d942ccbeb2aefcbf -SIZE (cabal/fmlist-0.9.tar.gz) = 4256 +TIMESTAMP = 1523130549 +SHA256 (cabal/fmlist-0.9.2.tar.gz) = 8fc4b55d04e7f216740a01acd2f38293e3bd9409a9495e6042a162580c420609 +SIZE (cabal/fmlist-0.9.2.tar.gz) = 4387 diff --git a/devel/hs-foundation/Makefile b/devel/hs-foundation/Makefile index dfbc92b46ef..155b8bd7337 100644 --- a/devel/hs-foundation/Makefile +++ b/devel/hs-foundation/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= foundation -PORTVERSION= 0.0.13 -PORTREVISION= 1 +PORTVERSION= 0.0.20 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,5 +9,7 @@ COMMENT= A custom prelude with no dependencies apart from base LICENSE= BSD3CLAUSE +USE_CABAL= basement==0.0.7 + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-foundation/distinfo b/devel/hs-foundation/distinfo index 59ee0c7dfef..292ff476386 100644 --- a/devel/hs-foundation/distinfo +++ b/devel/hs-foundation/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627835 -SHA256 (cabal/foundation-0.0.13.tar.gz) = 106a85cbbf936591df44b46ee04d39f29c15752f6eca438341f2b735e9c0755f -SIZE (cabal/foundation-0.0.13.tar.gz) = 221540 +TIMESTAMP = 1523130712 +SHA256 (cabal/foundation-0.0.20.tar.gz) = ba6ae63a9ce0846bf942af2c3ace56600f051c61e83a0b55dd625de23a78e42d +SIZE (cabal/foundation-0.0.20.tar.gz) = 122940 diff --git a/devel/hs-free/Makefile b/devel/hs-free/Makefile index d901e28e21c..07164b58010 100644 --- a/devel/hs-free/Makefile +++ b/devel/hs-free/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= free -PORTVERSION= 4.12.4 -PORTREVISION= 1 +PORTVERSION= 5.0.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -12,7 +11,7 @@ LICENSE= BSD3CLAUSE USE_CABAL= bifunctors>=4 comonad>=4 distributive>=0.2.1 exceptions>=0.6 \ mtl>=2.0.1.0 prelude-extras>=0.4 profunctors>=4 \ - semigroupoids>=4 semigroups>=0.8.3.1 + semigroupoids>=4 semigroups>=0.8.3.1 transformers-base .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-free/distinfo b/devel/hs-free/distinfo index c6c9e393dea..fa8edc99aba 100644 --- a/devel/hs-free/distinfo +++ b/devel/hs-free/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627836 -SHA256 (cabal/free-4.12.4.tar.gz) = c9fe45aae387855626ecb5a0fea6afdb207143cb00af3b1f715d1032d2d08784 -SIZE (cabal/free-4.12.4.tar.gz) = 50601 +TIMESTAMP = 1523821134 +SHA256 (cabal/free-5.0.1.tar.gz) = b75cb592fdcbe11b83d2316c0cb5c8a66621709f57af9f52bbfcc8e4524e6299 +SIZE (cabal/free-5.0.1.tar.gz) = 64069 diff --git a/devel/hs-free/files/patch-free.cabal b/devel/hs-free/files/patch-free.cabal new file mode 100644 index 00000000000..eb57b615aa3 --- /dev/null +++ b/devel/hs-free/files/patch-free.cabal @@ -0,0 +1,11 @@ +--- free.cabal.orig 2018-04-15 20:31:19 UTC ++++ free.cabal +@@ -84,7 +84,7 @@ library + transformers-base < 0.5, + transformers-compat >= 0.3 && < 1, + template-haskell >= 2.7.0.0 && < 3, +- exceptions >= 0.6 && < 0.10, ++ exceptions >= 0.6 && < 0.11, + containers < 0.6 + + exposed-modules: diff --git a/devel/hs-fsnotify/Makefile b/devel/hs-fsnotify/Makefile index 0bfce808785..4b854a6bcac 100644 --- a/devel/hs-fsnotify/Makefile +++ b/devel/hs-fsnotify/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= fsnotify -PORTVERSION= 0.2.1 -PORTREVISION= 2 +PORTVERSION= 0.2.1.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= Cross-platform library for file system notifications LICENSE= BSD3CLAUSE -USE_CABAL= async>=2.0.1 hinotify>=0.3.7 text>=0.11.0 unix-compat>=0.2 +USE_CABAL= async>=2.0.1 hinotify>=0.3.7 unix-compat>=0.2 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-fsnotify/distinfo b/devel/hs-fsnotify/distinfo index 728dfcc0bee..ec549246997 100644 --- a/devel/hs-fsnotify/distinfo +++ b/devel/hs-fsnotify/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627836 -SHA256 (cabal/fsnotify-0.2.1.tar.gz) = ebcf1b7bd825f269510850f20508a2ba0f640a41af08de0c171d8ba24618542b -SIZE (cabal/fsnotify-0.2.1.tar.gz) = 14689 +TIMESTAMP = 1523958991 +SHA256 (cabal/fsnotify-0.2.1.1.tar.gz) = 175a75962ad07c30c031fa8931f8d3e32abc06a96676e73e65cb7207e9d2dc90 +SIZE (cabal/fsnotify-0.2.1.1.tar.gz) = 14695 diff --git a/devel/hs-gconf/Makefile b/devel/hs-gconf/Makefile index c1a3351a12b..9337feb1de8 100644 --- a/devel/hs-gconf/Makefile +++ b/devel/hs-gconf/Makefile @@ -2,7 +2,7 @@ PORTNAME= gconf PORTVERSION= 0.13.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,7 @@ COMMENT= Binding to the GNOME configuration database system LICENSE= LGPL21 USES= pkgconfig -USE_CABAL= glib>=0.13.0.0 gtk2hs-buildtools text>=0.11.0.6 +USE_CABAL= glib>=0.13.0.0 gtk2hs-buildtools USE_GNOME= gconf2 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" diff --git a/devel/hs-generic-deriving/Makefile b/devel/hs-generic-deriving/Makefile index c26738701eb..31018635b1a 100644 --- a/devel/hs-generic-deriving/Makefile +++ b/devel/hs-generic-deriving/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= generic-deriving -PORTVERSION= 1.11.2 -PORTREVISION= 1 +PORTVERSION= 1.12.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-generic-deriving/distinfo b/devel/hs-generic-deriving/distinfo index f17dac44293..dfebc6140b6 100644 --- a/devel/hs-generic-deriving/distinfo +++ b/devel/hs-generic-deriving/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499450572 -SHA256 (cabal/generic-deriving-1.11.2.tar.gz) = 29960f2aa810abffc2f02658e7fa523cbfa4c92102e02d252482f9551bc122f9 -SIZE (cabal/generic-deriving-1.11.2.tar.gz) = 66546 +TIMESTAMP = 1523447778 +SHA256 (cabal/generic-deriving-1.12.1.tar.gz) = f5fd3f733a20deee5a6e752969edac1e04a90e2ee34e005fccb5d35a5c129473 +SIZE (cabal/generic-deriving-1.12.1.tar.gz) = 67982 diff --git a/devel/hs-generic-deriving/files/patch-generic-deriving.cabal b/devel/hs-generic-deriving/files/patch-generic-deriving.cabal new file mode 100644 index 00000000000..a23890ada60 --- /dev/null +++ b/devel/hs-generic-deriving/files/patch-generic-deriving.cabal @@ -0,0 +1,11 @@ +--- generic-deriving.cabal.orig 2018-04-11 11:59:07 UTC ++++ generic-deriving.cabal +@@ -77,7 +77,7 @@ library + + build-depends: containers >= 0.1 && < 0.6 + , ghc-prim < 1 +- , template-haskell >= 2.4 && < 2.13 ++ , template-haskell >= 2.4 && < 2.14 + + default-language: Haskell2010 + ghc-options: -Wall diff --git a/devel/hs-geniplate-mirror/Makefile b/devel/hs-geniplate-mirror/Makefile index 64e778e2878..85cd3e14c0f 100644 --- a/devel/hs-geniplate-mirror/Makefile +++ b/devel/hs-geniplate-mirror/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= geniplate-mirror -PORTVERSION= 0.7.5 -PORTREVISION= 1 +PORTVERSION= 0.7.6 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-geniplate-mirror/distinfo b/devel/hs-geniplate-mirror/distinfo index 4559e257c66..5d127d7cd69 100644 --- a/devel/hs-geniplate-mirror/distinfo +++ b/devel/hs-geniplate-mirror/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499447732 -SHA256 (cabal/geniplate-mirror-0.7.5.tar.gz) = 519b913dac8f56d5b0d93c15881cae63f759270540c634e6f845a31084be729f -SIZE (cabal/geniplate-mirror-0.7.5.tar.gz) = 9297 +TIMESTAMP = 1523650498 +SHA256 (cabal/geniplate-mirror-0.7.6.tar.gz) = 4b6b82d0348e79ae4a5e1deac029441251ae87ec15a7667cf0a1de5ff80215f8 +SIZE (cabal/geniplate-mirror-0.7.6.tar.gz) = 9314 diff --git a/devel/hs-ghc-events/Makefile b/devel/hs-ghc-events/Makefile index 442c44dc0c1..e1ed89848b7 100644 --- a/devel/hs-ghc-events/Makefile +++ b/devel/hs-ghc-events/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= ghc-events -PORTVERSION= 0.6.0 -PORTREVISION= 1 +PORTVERSION= 0.7.2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= Library and tool for parsing .eventlog files from GHC LICENSE= BSD3CLAUSE -USE_CABAL= mtl>=2.2.1 +USE_CABAL= mtl>=2.2.1 vector EXECUTABLE= ghc-events diff --git a/devel/hs-ghc-events/distinfo b/devel/hs-ghc-events/distinfo index d5b8b4ab490..df5d18eb0f4 100644 --- a/devel/hs-ghc-events/distinfo +++ b/devel/hs-ghc-events/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499451126 -SHA256 (cabal/ghc-events-0.6.0.tar.gz) = 277da9dcd9a1910e530c76b2ad8875868f5e2d8acff44091623dc97255ce0769 -SIZE (cabal/ghc-events-0.6.0.tar.gz) = 153517 +TIMESTAMP = 1523991488 +SHA256 (cabal/ghc-events-0.7.2.tar.gz) = b01643f72a448fcd63a0b48781d71b21fb0bb22a54967f0b8a39db0e5638ffbf +SIZE (cabal/ghc-events-0.7.2.tar.gz) = 203071 diff --git a/devel/hs-ghc-mtl/Makefile b/devel/hs-ghc-mtl/Makefile index 58a05d1f8d9..e79045e204c 100644 --- a/devel/hs-ghc-mtl/Makefile +++ b/devel/hs-ghc-mtl/Makefile @@ -3,7 +3,7 @@ PORTNAME= ghc-mtl PORTVERSION= 1.2.1.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-ghc-paths/Makefile b/devel/hs-ghc-paths/Makefile index 67f57e2fceb..9b4d42c51d5 100644 --- a/devel/hs-ghc-paths/Makefile +++ b/devel/hs-ghc-paths/Makefile @@ -3,7 +3,7 @@ PORTNAME= ghc-paths PORTVERSION= 0.1.0.9 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-gio/Makefile b/devel/hs-gio/Makefile index 55209554a67..83a56f9fb4e 100644 --- a/devel/hs-gio/Makefile +++ b/devel/hs-gio/Makefile @@ -2,7 +2,7 @@ PORTNAME= gio PORTVERSION= 0.13.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-git-annex/Makefile b/devel/hs-git-annex/Makefile index 0b87ba45036..608145b87b4 100644 --- a/devel/hs-git-annex/Makefile +++ b/devel/hs-git-annex/Makefile @@ -3,7 +3,7 @@ PORTNAME= git-annex PORTVERSION= 6.20170520 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-gitrev/Makefile b/devel/hs-gitrev/Makefile index d4619b7a2b4..3c3405e1e46 100644 --- a/devel/hs-gitrev/Makefile +++ b/devel/hs-gitrev/Makefile @@ -2,7 +2,7 @@ PORTNAME= gitrev PORTVERSION= 1.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-glib/Makefile b/devel/hs-glib/Makefile index 1db3463f877..025a510257d 100644 --- a/devel/hs-glib/Makefile +++ b/devel/hs-glib/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= glib -PORTVERSION= 0.13.4.1 -PORTREVISION= 1 +PORTVERSION= 0.13.6.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,7 @@ COMMENT= Binding to the GLIB library for Gtk2Hs LICENSE= LGPL21 USES= pkgconfig -USE_CABAL= gtk2hs-buildtools text>=1.0.0.0 utf8-string>=0.2 +USE_CABAL= gtk2hs-buildtools utf8-string>=0.2 USE_GNOME= glib20 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" diff --git a/devel/hs-glib/distinfo b/devel/hs-glib/distinfo index 6012de34c7a..89495003481 100644 --- a/devel/hs-glib/distinfo +++ b/devel/hs-glib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499537811 -SHA256 (cabal/glib-0.13.4.1.tar.gz) = f57202ed4094cc50caa8b390c8b78a1620b3c43b913edb1e5bda0f3c5be32630 -SIZE (cabal/glib-0.13.4.1.tar.gz) = 39441 +TIMESTAMP = 1524403919 +SHA256 (cabal/glib-0.13.6.0.tar.gz) = 4e71062c6a458440294d820e21449aa4666deed2ea233ef5915da7c1d4aee8eb +SIZE (cabal/glib-0.13.6.0.tar.gz) = 39809 diff --git a/devel/hs-gtk2hs-buildtools/Makefile b/devel/hs-gtk2hs-buildtools/Makefile index 34d0177fc38..362e0417401 100644 --- a/devel/hs-gtk2hs-buildtools/Makefile +++ b/devel/hs-gtk2hs-buildtools/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= gtk2hs-buildtools -PORTVERSION= 0.13.2.2 -PORTREVISION= 1 +PORTVERSION= 0.13.3.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-gtk2hs-buildtools/distinfo b/devel/hs-gtk2hs-buildtools/distinfo index 8f7d36f1bde..0660f9d2a5a 100644 --- a/devel/hs-gtk2hs-buildtools/distinfo +++ b/devel/hs-gtk2hs-buildtools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499539633 -SHA256 (cabal/gtk2hs-buildtools-0.13.2.2.tar.gz) = c5e4b59f8711ec4e4e25a91ce4213c5396dd0b56179751ed6da255ac35edfb4b -SIZE (cabal/gtk2hs-buildtools-0.13.2.2.tar.gz) = 178124 +TIMESTAMP = 1523786090 +SHA256 (cabal/gtk2hs-buildtools-0.13.3.1.tar.gz) = 220f2f4aa1e01b8585fddf35bfc9f3a9dd300f2308d3c2b800c621cdd2ce7154 +SIZE (cabal/gtk2hs-buildtools-0.13.3.1.tar.gz) = 177911 diff --git a/devel/hs-gtk2hs-buildtools/files/patch-c2hs_c_CPretty.hs b/devel/hs-gtk2hs-buildtools/files/patch-c2hs_c_CPretty.hs new file mode 100644 index 00000000000..9a31ddab2e4 --- /dev/null +++ b/devel/hs-gtk2hs-buildtools/files/patch-c2hs_c_CPretty.hs @@ -0,0 +1,10 @@ +--- c2hs/c/CPretty.hs.orig 2018-04-15 10:03:19 UTC ++++ c2hs/c/CPretty.hs +@@ -34,6 +34,8 @@ module CPretty ( + -- we are just providing instances to the class `Pretty' + ) where + ++import Prelude hiding ((<>)) ++ + import Idents (Ident, identToLexeme) + import Text.PrettyPrint.HughesPJ diff --git a/devel/hs-gtk2hs-buildtools/files/patch-gtk2hs-buildtools.cabal b/devel/hs-gtk2hs-buildtools/files/patch-gtk2hs-buildtools.cabal new file mode 100644 index 00000000000..7c3def870f9 --- /dev/null +++ b/devel/hs-gtk2hs-buildtools/files/patch-gtk2hs-buildtools.cabal @@ -0,0 +1,11 @@ +--- gtk2hs-buildtools.cabal.orig 2018-04-15 10:01:41 UTC ++++ gtk2hs-buildtools.cabal +@@ -40,7 +40,7 @@ Library + build-depends: base >= 4 && < 5, + process, array, pretty, + filepath, random, +- Cabal >= 1.24.0.0 && < 2.1, ++ Cabal >= 1.24.0.0 && < 2.3, + filepath >= 1.3.0.0 && < 1.5, + directory >= 1.2.0.0 && < 1.4, + containers >= 0.5.5.1 && < 0.6 diff --git a/devel/hs-haddock-api/Makefile b/devel/hs-haddock-api/Makefile index 3cc59a571d8..f547ce7aeb3 100644 --- a/devel/hs-haddock-api/Makefile +++ b/devel/hs-haddock-api/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= haddock-api -PORTVERSION= 2.17.4 -PORTREVISION= 1 +PORTVERSION= 2.19.0.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-haddock-api/distinfo b/devel/hs-haddock-api/distinfo index 0dbdea95c10..9162a8f99db 100644 --- a/devel/hs-haddock-api/distinfo +++ b/devel/hs-haddock-api/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499452541 -SHA256 (cabal/haddock-api-2.17.4.tar.gz) = 5a97114f567bb7384d07dfc77a7c2f6c35017193e63411b85ab2a3f7fe35d601 -SIZE (cabal/haddock-api-2.17.4.tar.gz) = 145712 +TIMESTAMP = 1523989416 +SHA256 (cabal/haddock-api-2.19.0.1.tar.gz) = 432be5729450dc1923637d4a3533932582a490e1fe81d48af8be9e2ba93ed130 +SIZE (cabal/haddock-api-2.19.0.1.tar.gz) = 177912 diff --git a/devel/hs-haddock-library/Makefile b/devel/hs-haddock-library/Makefile index 3411d9764ca..3e46ea6e4f8 100644 --- a/devel/hs-haddock-library/Makefile +++ b/devel/hs-haddock-library/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= haddock-library -PORTVERSION= 1.4.3 -PORTREVISION= 1 +PORTVERSION= 1.5.0.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,5 +9,7 @@ COMMENT= Library exposing some functionality of Haddock LICENSE= BSD3CLAUSE +USE_CABAL= attoparsec + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-haddock-library/distinfo b/devel/hs-haddock-library/distinfo index 2723301ae1e..c3bd020f4ec 100644 --- a/devel/hs-haddock-library/distinfo +++ b/devel/hs-haddock-library/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499448291 -SHA256 (cabal/haddock-library-1.4.3.tar.gz) = f764763f8004715431a184a981493781b8380e13fd89ca0075ac426edc5d445b -SIZE (cabal/haddock-library-1.4.3.tar.gz) = 38863 +TIMESTAMP = 1523633978 +SHA256 (cabal/haddock-library-1.5.0.1.tar.gz) = ff2c10f043524135c809303c0d81c7f27a954f0174784e59a497e75e287aabb2 +SIZE (cabal/haddock-library-1.5.0.1.tar.gz) = 47111 diff --git a/devel/hs-haddock-library/files/patch-haddock-library.cabal b/devel/hs-haddock-library/files/patch-haddock-library.cabal new file mode 100644 index 00000000000..dc8ed6c8aab --- /dev/null +++ b/devel/hs-haddock-library/files/patch-haddock-library.cabal @@ -0,0 +1,45 @@ +--- haddock-library.cabal.orig 2018-04-13 16:29:12 UTC ++++ haddock-library.cabal +@@ -49,42 +49,6 @@ library + if impl(ghc >= 8.0) + ghc-options: -Wcompat -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances + +-library attoparsec +- default-language: Haskell2010 +- +- build-depends: +- base >= 4.5 && < 4.12 +- , bytestring >= 0.9.2.1 && < 0.11 +- , deepseq >= 1.3 && < 1.5 +- +- hs-source-dirs: vendor/attoparsec-0.13.1.0 +- +- -- NB: haddock-library needs only small part of lib:attoparsec +- -- internally, so we only bundle that subset here +- exposed-modules: +- Data.Attoparsec.ByteString +- Data.Attoparsec.ByteString.Char8 +- Data.Attoparsec.Combinator +- +- other-modules: +- Data.Attoparsec +- Data.Attoparsec.ByteString.Buffer +- Data.Attoparsec.ByteString.FastSet +- Data.Attoparsec.ByteString.Internal +- Data.Attoparsec.Internal +- Data.Attoparsec.Internal.Fhthagn +- Data.Attoparsec.Internal.Types +- Data.Attoparsec.Number +- +- ghc-options: -funbox-strict-fields -Wall -fwarn-tabs -O2 +- +- ghc-options: -Wall +- if impl(ghc >= 8.0) +- ghc-options: -Wcompat -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances +- else +- build-depends: semigroups ^>= 0.18.3, fail ^>= 4.9.0.0 +- +- + test-suite spec + type: exitcode-stdio-1.0 + default-language: Haskell2010 diff --git a/devel/hs-haddock/Makefile b/devel/hs-haddock/Makefile index 36f6f9eef0a..4fafa5fd647 100644 --- a/devel/hs-haddock/Makefile +++ b/devel/hs-haddock/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= haddock -PORTVERSION= 2.17.5 -PORTREVISION= 1 +PORTVERSION= 2.19.0.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-haddock/distinfo b/devel/hs-haddock/distinfo index 3191273dead..fea2027f0c7 100644 --- a/devel/hs-haddock/distinfo +++ b/devel/hs-haddock/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499538938 -SHA256 (cabal/haddock-2.17.5.tar.gz) = 1493012ed12ca8cad901380fece150e4b342a8bacd9ba319bff8be7ebb37bee3 -SIZE (cabal/haddock-2.17.5.tar.gz) = 244683 +TIMESTAMP = 1524638302 +SHA256 (cabal/haddock-2.19.0.1.tar.gz) = 6769a3fae0a7c2c7ebb41029d4d3c7916eb7d75fe6f307a0f7d00b07814c32bc +SIZE (cabal/haddock-2.19.0.1.tar.gz) = 276623 diff --git a/devel/hs-happy/Makefile b/devel/hs-happy/Makefile index 801616a2a27..31feb832dba 100644 --- a/devel/hs-happy/Makefile +++ b/devel/hs-happy/Makefile @@ -3,7 +3,7 @@ PORTNAME= happy PORTVERSION= 1.19.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-hashable/Makefile b/devel/hs-hashable/Makefile index 92173f40c45..17cf3dee442 100644 --- a/devel/hs-hashable/Makefile +++ b/devel/hs-hashable/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= hashable -PORTVERSION= 1.2.6.1 -PORTREVISION= 1 +PORTVERSION= 1.2.7.0 PORTEPOCH= 1 CATEGORIES= devel haskell @@ -11,8 +10,6 @@ COMMENT= Class for types that can be converted to a hash value LICENSE= BSD3CLAUSE -USE_CABAL= text>=0.11.0.5 vector - FLAGS_DEFINE= INTEGER_GMP SSE2 SSE41 FLAGS_DEFAULT= INTEGER_GMP SSE2 diff --git a/devel/hs-hashable/distinfo b/devel/hs-hashable/distinfo index 6ac7cd36636..9c8ed5b1f25 100644 --- a/devel/hs-hashable/distinfo +++ b/devel/hs-hashable/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499444230 -SHA256 (cabal/hashable-1.2.6.1.tar.gz) = 94ca8789e13bc05c1582c46b709f3b0f5aeec2092be634b8606dbd9c5915bb7a -SIZE (cabal/hashable-1.2.6.1.tar.gz) = 30305 +TIMESTAMP = 1523295742 +SHA256 (cabal/hashable-1.2.7.0.tar.gz) = ecb5efc0586023f5a0dc861100621c1dbb4cbb2f0516829a16ebac39f0432abf +SIZE (cabal/hashable-1.2.7.0.tar.gz) = 30182 diff --git a/devel/hs-hashed-storage/Makefile b/devel/hs-hashed-storage/Makefile index 866c9afd714..82ff07e1942 100644 --- a/devel/hs-hashed-storage/Makefile +++ b/devel/hs-hashed-storage/Makefile @@ -2,7 +2,7 @@ PORTNAME= hashed-storage PORTVERSION= 0.5.11 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-hashtables/Makefile b/devel/hs-hashtables/Makefile index ee08f82e9d2..c0c25c263e2 100644 --- a/devel/hs-hashtables/Makefile +++ b/devel/hs-hashtables/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= hashtables -PORTVERSION= 1.2.1.1 -PORTREVISION= 1 +PORTVERSION= 1.2.3.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-hashtables/distinfo b/devel/hs-hashtables/distinfo index 5b17209d105..19284d783f9 100644 --- a/devel/hs-hashtables/distinfo +++ b/devel/hs-hashtables/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499459894 -SHA256 (cabal/hashtables-1.2.1.1.tar.gz) = 227f554a93310645c654254659969b347de3d1bf3d98901dbb5c113ece72e951 -SIZE (cabal/hashtables-1.2.1.1.tar.gz) = 53674 +TIMESTAMP = 1523445335 +SHA256 (cabal/hashtables-1.2.3.0.tar.gz) = f956b4bb6113f30193c9d85caebeda5000c29d8acf4f4994af650d3748bf73a5 +SIZE (cabal/hashtables-1.2.3.0.tar.gz) = 57335 diff --git a/devel/hs-haskell-lexer/Makefile b/devel/hs-haskell-lexer/Makefile index 7ea5ea6fdac..9d90f185fc2 100644 --- a/devel/hs-haskell-lexer/Makefile +++ b/devel/hs-haskell-lexer/Makefile @@ -2,7 +2,7 @@ PORTNAME= haskell-lexer PORTVERSION= 1.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-haskell-src-exts/Makefile b/devel/hs-haskell-src-exts/Makefile index bb4101eb925..87d182b96bd 100644 --- a/devel/hs-haskell-src-exts/Makefile +++ b/devel/hs-haskell-src-exts/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= haskell-src-exts -PORTVERSION= 1.19.1 -PORTREVISION= 1 +PORTVERSION= 1.20.2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-haskell-src-exts/distinfo b/devel/hs-haskell-src-exts/distinfo index 6be8325d27c..ff44be61de7 100644 --- a/devel/hs-haskell-src-exts/distinfo +++ b/devel/hs-haskell-src-exts/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1501416565 -SHA256 (cabal/haskell-src-exts-1.19.1.tar.gz) = f0f5b2867673d654c7cce8a5fcc69222ea09af460c29a819c23cccf6311ba971 -SIZE (cabal/haskell-src-exts-1.19.1.tar.gz) = 1296952 +TIMESTAMP = 1523958315 +SHA256 (cabal/haskell-src-exts-1.20.2.tar.gz) = 9f6686e8bc8b849991207304e524747b0d1dcedfea351ac073ce971b36f9a3ea +SIZE (cabal/haskell-src-exts-1.20.2.tar.gz) = 1387571 diff --git a/devel/hs-DrIFT/Makefile b/devel/hs-haskell-src-meta/Makefile similarity index 52% rename from devel/hs-DrIFT/Makefile rename to devel/hs-haskell-src-meta/Makefile index 65afd1f1e63..2f42bffeaba 100644 --- a/devel/hs-DrIFT/Makefile +++ b/devel/hs-haskell-src-meta/Makefile @@ -1,18 +1,15 @@ # $FreeBSD$ -PORTNAME= DrIFT -PORTVERSION= 2.4.2 -PORTREVISION= 4 +PORTNAME= haskell-src-meta +PORTVERSION= 0.8.0.2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org -COMMENT= Program to derive type class instances +COMMENT= Parse source to template-haskell abstract syntax LICENSE= BSD3CLAUSE -USE_CABAL= old-time random - -EXECUTABLE= DrIFT drift-ghc +USE_CABAL= haskell-src-exts safe syb th-orphans .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-haskell-src-meta/distinfo b/devel/hs-haskell-src-meta/distinfo new file mode 100644 index 00000000000..d6a3d72b14d --- /dev/null +++ b/devel/hs-haskell-src-meta/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1524930351 +SHA256 (cabal/haskell-src-meta-0.8.0.2.tar.gz) = 4b7b143b94fcf147b96bb34822c2feeae29daadd3a22796ee36cadd5ca262c8b +SIZE (cabal/haskell-src-meta-0.8.0.2.tar.gz) = 20217 diff --git a/devel/hs-haskell-src-meta/files/patch-haskell-src-meta.cabal b/devel/hs-haskell-src-meta/files/patch-haskell-src-meta.cabal new file mode 100644 index 00000000000..d7fb48b310c --- /dev/null +++ b/devel/hs-haskell-src-meta/files/patch-haskell-src-meta.cabal @@ -0,0 +1,16 @@ +--- haskell-src-meta.cabal.orig 2018-04-28 16:25:53 UTC ++++ haskell-src-meta.cabal +@@ -17,11 +17,11 @@ description: The translation from haskell-src-e + extra-source-files: ChangeLog README.md examples/*.hs + + library +- build-depends: base >= 4.6 && < 4.11, ++ build-depends: base >= 4.6 && < 4.12, + haskell-src-exts >= 1.18 && < 1.21, + pretty >= 1.0 && < 1.2, + syb >= 0.1 && < 0.8, +- template-haskell >= 2.8 && < 2.13, ++ template-haskell >= 2.8 && < 2.14, + th-orphans >= 0.9.1 && < 0.14 + + if impl(ghc < 7.8) diff --git a/devel/hs-haskell-src-meta/pkg-descr b/devel/hs-haskell-src-meta/pkg-descr new file mode 100644 index 00000000000..7d35074b8eb --- /dev/null +++ b/devel/hs-haskell-src-meta/pkg-descr @@ -0,0 +1,4 @@ +The translation from haskell-src-exts abstract syntax to template-haskell +abstract syntax. + +WWW: https://github.com/bmillwood/haskell-src-meta/ diff --git a/devel/hs-haskell-src/Makefile b/devel/hs-haskell-src/Makefile index aa6bef0737c..23d65d63e2b 100644 --- a/devel/hs-haskell-src/Makefile +++ b/devel/hs-haskell-src/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= haskell-src -PORTVERSION= 1.0.2.0 -PORTREVISION= 2 +PORTVERSION= 1.0.3.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-haskell-src/distinfo b/devel/hs-haskell-src/distinfo index 90bac848ea1..3fd72884302 100644 --- a/devel/hs-haskell-src/distinfo +++ b/devel/hs-haskell-src/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627839 -SHA256 (cabal/haskell-src-1.0.2.0.tar.gz) = 2a25ee5729230edddb94af8d9881efbc1d8798bd316097f4646749cb2fa491a6 -SIZE (cabal/haskell-src-1.0.2.0.tar.gz) = 53636 +TIMESTAMP = 1524150777 +SHA256 (cabal/haskell-src-1.0.3.0.tar.gz) = b4b4941e8883da32c3f2b93f3ecdd5cff82ff9304cb91e89850b19095c908dbc +SIZE (cabal/haskell-src-1.0.3.0.tar.gz) = 29863 diff --git a/devel/hs-hasktags/Makefile b/devel/hs-hasktags/Makefile index 9930b9ae148..176c905a080 100644 --- a/devel/hs-hasktags/Makefile +++ b/devel/hs-hasktags/Makefile @@ -2,7 +2,7 @@ PORTNAME= hasktags PORTVERSION= 0.69.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-hastache/Makefile b/devel/hs-hastache/Makefile deleted file mode 100644 index b65716a6622..00000000000 --- a/devel/hs-hastache/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# $FreeBSD$ - -PORTNAME= hastache -PORTVERSION= 0.6.1 -PORTREVISION= 2 -CATEGORIES= devel haskell - -MAINTAINER= haskell@FreeBSD.org -COMMENT= Haskell implementation of Mustache templates - -LICENSE= BSD3CLAUSE - -USE_CABAL= blaze-builder ieee754 mtl syb text - -EXECUTABLE= mkReadme - -INSTALL_PORTDATA= cd ${WRKSRC} && ${INSTALL_DATA} README.md ${STAGEDIR}${DATADIR} - -.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" -.include diff --git a/devel/hs-hastache/distinfo b/devel/hs-hastache/distinfo deleted file mode 100644 index 41407ad2d52..00000000000 --- a/devel/hs-hastache/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1499627841 -SHA256 (cabal/hastache-0.6.1.tar.gz) = 8c8f89669d6125201d7163385ea9055ab8027a69d1513259f8fbdd53c244b464 -SIZE (cabal/hastache-0.6.1.tar.gz) = 16452 diff --git a/devel/hs-hastache/files/patch-hastache.cabal b/devel/hs-hastache/files/patch-hastache.cabal deleted file mode 100644 index cd911a4513d..00000000000 --- a/devel/hs-hastache/files/patch-hastache.cabal +++ /dev/null @@ -1,29 +0,0 @@ ---- hastache.cabal.orig 2014-12-23 10:40:08 UTC -+++ hastache.cabal -@@ -27,7 +27,7 @@ extra-source-files: - executable mkReadme - main-is: mkReadme.hs - build-depends: hastache, process, -- base >=4 && <4.9 -+ base >=4.4 && <4.10 - ,bytestring - ,mtl - ,transformers -@@ -46,7 +46,7 @@ library - Text.Hastache.Context - - build-depends: -- base >=4 && <4.9 -+ base >=4.4 && <4.10 - ,bytestring - ,mtl - ,transformers -@@ -69,7 +69,7 @@ test-suite test-hastache - - build-depends: - hastache -- ,base >=4 && <4.9 -+ ,base >=4.4 && <4.10 - ,directory - ,mtl - ,HUnit diff --git a/devel/hs-hastache/pkg-descr b/devel/hs-hastache/pkg-descr deleted file mode 100644 index 98b30e1f977..00000000000 --- a/devel/hs-hastache/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Haskell implementation of Mustache templates [1]. - -[1] http://mustache.github.com/ - -WWW: https://github.com/lymar/hastache diff --git a/devel/hs-hex/Makefile b/devel/hs-hex/Makefile index 26571841183..c6fc8786824 100644 --- a/devel/hs-hex/Makefile +++ b/devel/hs-hex/Makefile @@ -2,7 +2,7 @@ PORTNAME= hex PORTVERSION= 0.1.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-hinotify/Makefile b/devel/hs-hinotify/Makefile index 9b395cbe269..1ca8cd90076 100644 --- a/devel/hs-hinotify/Makefile +++ b/devel/hs-hinotify/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= hinotify -PORTVERSION= 0.3.9 +PORTVERSION= 0.3.10 PORTREVISION= 1 CATEGORIES= devel haskell @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE LIB_DEPENDS= libinotify.so:devel/libinotify -USE_CABAL= async +USE_CABAL= async hashable .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-hinotify/distinfo b/devel/hs-hinotify/distinfo index 4c22b16eb38..1db0ae29957 100644 --- a/devel/hs-hinotify/distinfo +++ b/devel/hs-hinotify/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627841 -SHA256 (cabal/hinotify-0.3.9.tar.gz) = f2480e4c08a516831c2221eebc6a9d3242e892932d9315c34cbe92a101c5df99 -SIZE (cabal/hinotify-0.3.9.tar.gz) = 9021 +TIMESTAMP = 1523460966 +SHA256 (cabal/hinotify-0.3.10.tar.gz) = af2b7d5733ab52ca38f0d9aed1ec37304f1d6964caa0fb556b8215858c1d5d9d +SIZE (cabal/hinotify-0.3.10.tar.gz) = 9193 diff --git a/devel/hs-hint/Makefile b/devel/hs-hint/Makefile index 0d51b836f3d..7c982aaa662 100644 --- a/devel/hs-hint/Makefile +++ b/devel/hs-hint/Makefile @@ -14,5 +14,7 @@ LICENSE= BSD3CLAUSE USE_CABAL= exceptions extensible-exceptions ghc-mtl>=1.2.1 ghc-paths \ mtl random utf8-string +IGNORE= Doesn't build with recent GHC version + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-hlibev/Makefile b/devel/hs-hlibev/Makefile index e2644355797..ce69ae0b5fd 100644 --- a/devel/hs-hlibev/Makefile +++ b/devel/hs-hlibev/Makefile @@ -2,7 +2,7 @@ PORTNAME= hlibev PORTVERSION= 0.4.0 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-hlint/Makefile b/devel/hs-hlint/Makefile index c201da52552..40baaf63d40 100644 --- a/devel/hs-hlint/Makefile +++ b/devel/hs-hlint/Makefile @@ -15,5 +15,7 @@ USE_CABAL= ansi-terminal>=0.6.2 cmdargs>=0.10 cpphs>=1.18.1 extra>=0.5 \ EXECUTABLE= hlint +IGNORE= Doesn't build with recent GHC version + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-hoogle/Makefile b/devel/hs-hoogle/Makefile index 5509c6c6e70..3ee4bd8ccd0 100644 --- a/devel/hs-hoogle/Makefile +++ b/devel/hs-hoogle/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= hoogle -PORTVERSION= 5.0.12 -PORTREVISION= 1 +PORTVERSION= 5.0.17.3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -14,8 +13,8 @@ LICENSE= BSD3CLAUSE USE_CABAL= aeson cmdargs conduit conduit-extra connection extra \ haskell-src-exts http-conduit http-types js-flot js-jquery \ mmap network network-uri old-locale process-extras QuickCheck \ - resourcet tar text uniplate utf8-string vector wai wai-logger \ - warp warp-tls zlib + resourcet storable-tuple tar uniplate utf8-string vector wai \ + wai-logger warp warp-tls zlib EXECUTABLE= hoogle diff --git a/devel/hs-hoogle/distinfo b/devel/hs-hoogle/distinfo index dfbeb4d4ead..a32055b9277 100644 --- a/devel/hs-hoogle/distinfo +++ b/devel/hs-hoogle/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627842 -SHA256 (cabal/hoogle-5.0.12.tar.gz) = 1d37f1e96b699fe71ea3661ac2a9424cfd178cba5cc26b0a7ee5505e6fb49308 -SIZE (cabal/hoogle-5.0.12.tar.gz) = 85464 +TIMESTAMP = 1525080726 +SHA256 (cabal/hoogle-5.0.17.3.tar.gz) = 66bebaf75600fef1c5fc0613ccc55c137aaed4c8f69653cf903f4fb003b98f9c +SIZE (cabal/hoogle-5.0.17.3.tar.gz) = 86528 diff --git a/devel/hs-hourglass/Makefile b/devel/hs-hourglass/Makefile index 77366b300c9..8ec5d43dac6 100644 --- a/devel/hs-hourglass/Makefile +++ b/devel/hs-hourglass/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= hourglass -PORTVERSION= 0.2.10 -PORTREVISION= 1 +PORTVERSION= 0.2.11 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-hourglass/distinfo b/devel/hs-hourglass/distinfo index 004beeb3272..884a1f43d03 100644 --- a/devel/hs-hourglass/distinfo +++ b/devel/hs-hourglass/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627843 -SHA256 (cabal/hourglass-0.2.10.tar.gz) = d553362d7a6f7df60d8ff99304aaad0995be81f9d302725ebe9441829a0f8d80 -SIZE (cabal/hourglass-0.2.10.tar.gz) = 26417 +TIMESTAMP = 1523386565 +SHA256 (cabal/hourglass-0.2.11.tar.gz) = 18a6bb303fc055275cca45aaffc17b6a04b2e9d7509aa5aa5bb9d9239f4e4f51 +SIZE (cabal/hourglass-0.2.11.tar.gz) = 25904 diff --git a/devel/hs-hsb2hs/Makefile b/devel/hs-hsb2hs/Makefile index dc2b7fa90f1..2fe596c4528 100644 --- a/devel/hs-hsb2hs/Makefile +++ b/devel/hs-hsb2hs/Makefile @@ -2,7 +2,7 @@ PORTNAME= hsb2hs PORTVERSION= 0.3.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-hslogger/Makefile b/devel/hs-hslogger/Makefile index c45f9b67b5b..7a6fffdb408 100644 --- a/devel/hs-hslogger/Makefile +++ b/devel/hs-hslogger/Makefile @@ -3,7 +3,7 @@ PORTNAME= hslogger PORTVERSION= 1.2.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-monadplus/Makefile b/devel/hs-hslua-module-text/Makefile similarity index 56% rename from devel/hs-monadplus/Makefile rename to devel/hs-hslua-module-text/Makefile index 5fe9ee06cff..a731eabd6fe 100644 --- a/devel/hs-monadplus/Makefile +++ b/devel/hs-hslua-module-text/Makefile @@ -1,12 +1,15 @@ # $FreeBSD$ -PORTNAME= monadplus -PORTVERSION= 1.4.2 -PORTREVISION= 1 +PORTNAME= hslua-module-text +PORTVERSION= 0.1.2.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org -COMMENT= Haskell98 partial maps and filters over MonadPlus +COMMENT= Lua module for text + +LICENSE= MIT + +USE_CABAL= hslua .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-hslua-module-text/distinfo b/devel/hs-hslua-module-text/distinfo new file mode 100644 index 00000000000..c44e0dfaef4 --- /dev/null +++ b/devel/hs-hslua-module-text/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1524943044 +SHA256 (cabal/hslua-module-text-0.1.2.1.tar.gz) = aeb384f9743b76360f3779e44065fe297fb60f27519933f203b75bd8c2ba8e2d +SIZE (cabal/hslua-module-text-0.1.2.1.tar.gz) = 3594 diff --git a/devel/hs-hslua-module-text/files/patch-hslua-module-text.cabal b/devel/hs-hslua-module-text/files/patch-hslua-module-text.cabal new file mode 100644 index 00000000000..0cf1a95c964 --- /dev/null +++ b/devel/hs-hslua-module-text/files/patch-hslua-module-text.cabal @@ -0,0 +1,18 @@ +--- hslua-module-text.cabal.orig 2018-04-28 19:25:33 UTC ++++ hslua-module-text.cabal +@@ -20,7 +20,7 @@ source-repository head + + library + exposed-modules: Foreign.Lua.Module.Text +- build-depends: base >= 4.7 && < 4.11 ++ build-depends: base >= 4.7 && < 4.12 + , hslua >= 0.9 && < 0.10 + , text >= 1 && < 1.3 + hs-source-dirs: src +@@ -37,4 +37,4 @@ test-suite test-hslua + , hslua-module-text + , tasty + , tasty-hunit +- , text +\ No newline at end of file ++ , text diff --git a/devel/hs-hslua-module-text/pkg-descr b/devel/hs-hslua-module-text/pkg-descr new file mode 100644 index 00000000000..59de04cbab3 --- /dev/null +++ b/devel/hs-hslua-module-text/pkg-descr @@ -0,0 +1,3 @@ +UTF-8 aware subset of Lua's string module. + +WWW: https://github.com/hslua/hslua-module-test diff --git a/devel/hs-hslua/Makefile b/devel/hs-hslua/Makefile index dbf7de6d654..dc944afe4ca 100644 --- a/devel/hs-hslua/Makefile +++ b/devel/hs-hslua/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= hslua -PORTVERSION= 0.5.0 -PORTREVISION= 1 +PORTVERSION= 0.9.5.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,5 +9,7 @@ COMMENT= Lua language interpreter embedding in Haskell LICENSE= MIT +USE_CABAL= exceptions + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-hslua/distinfo b/devel/hs-hslua/distinfo index c2f863c5136..e99ab64d26f 100644 --- a/devel/hs-hslua/distinfo +++ b/devel/hs-hslua/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627844 -SHA256 (cabal/hslua-0.5.0.tar.gz) = 6b270a14cce6046a443e6700d0b73725bef2dc068dd40aa6a1feb1c84f41171b -SIZE (cabal/hslua-0.5.0.tar.gz) = 132155 +TIMESTAMP = 1524940935 +SHA256 (cabal/hslua-0.9.5.1.tar.gz) = 681ffb1775e948143c0dd4be3086259f2eda8a9f7b09ce94016150c57e9d74d0 +SIZE (cabal/hslua-0.9.5.1.tar.gz) = 228252 diff --git a/devel/hs-hslua/files/patch-hslua.cabal b/devel/hs-hslua/files/patch-hslua.cabal new file mode 100644 index 00000000000..83ac5715b79 --- /dev/null +++ b/devel/hs-hslua/files/patch-hslua.cabal @@ -0,0 +1,12 @@ +--- hslua.cabal.orig 2018-04-28 18:45:32 UTC ++++ hslua.cabal +@@ -77,8 +77,7 @@ library + build-depends: base >= 4.7 && < 5 + , bytestring >= 0.10.2 && < 0.11 + , containers >= 0.5 && < 0.6 +- , exceptions >= 0.8 && < 0.10 +- , fail >= 4.9 && < 5 ++ , exceptions >= 0.8 && < 0.11 + , mtl >= 2.2 && < 2.3 + , text + exposed-modules: Foreign.Lua diff --git a/devel/hs-hspec-core/Makefile b/devel/hs-hspec-core/Makefile index 7e93d7d3327..5bead25ff8b 100644 --- a/devel/hs-hspec-core/Makefile +++ b/devel/hs-hspec-core/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= hspec-core -PORTVERSION= 2.4.4 -PORTREVISION= 1 +PORTVERSION= 2.5.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= Testing Framework for Haskell LICENSE= MIT -USE_CABAL= ansi-terminal>=0.5 async>=2 hspec-expectations>=0.7.1 \ +USE_CABAL= ansi-terminal>=0.5 async>=2 clock hspec-expectations>=0.7.1 \ HUnit>=1.2.5 QuickCheck>=2.5.1 quickcheck-io random setenv \ tf-random diff --git a/devel/hs-hspec-core/distinfo b/devel/hs-hspec-core/distinfo index 4ed33224605..d4be3bf638d 100644 --- a/devel/hs-hspec-core/distinfo +++ b/devel/hs-hspec-core/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627845 -SHA256 (cabal/hspec-core-2.4.4.tar.gz) = 601d321cdf7f2685880ee80c31154763884cb90dc512906005c4a485e8c8bfdf -SIZE (cabal/hspec-core-2.4.4.tar.gz) = 40871 +TIMESTAMP = 1523960255 +SHA256 (cabal/hspec-core-2.5.0.tar.gz) = f2e5e1b6142eccda9dd9a03212cad691ceba6f66c99e01098bdfdd9c55d708dd +SIZE (cabal/hspec-core-2.5.0.tar.gz) = 55084 diff --git a/devel/hs-hspec-discover/Makefile b/devel/hs-hspec-discover/Makefile index 405a40b0618..e7c0b714eb5 100644 --- a/devel/hs-hspec-discover/Makefile +++ b/devel/hs-hspec-discover/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= hspec-discover -PORTVERSION= 2.4.4 -PORTREVISION= 1 +PORTVERSION= 2.5.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-hspec-discover/distinfo b/devel/hs-hspec-discover/distinfo index a21ccef9824..b7e9371a349 100644 --- a/devel/hs-hspec-discover/distinfo +++ b/devel/hs-hspec-discover/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627846 -SHA256 (cabal/hspec-discover-2.4.4.tar.gz) = 76423bc72f3ed0a80ccefb26fbf3fb16c3d74a69d69b4ce0bc88db54984d5d47 -SIZE (cabal/hspec-discover-2.4.4.tar.gz) = 5942 +TIMESTAMP = 1525007543 +SHA256 (cabal/hspec-discover-2.5.0.tar.gz) = 3e47c07c9e131c0327ac732b600986d99cfdd42a3b6b68502c01d986617a21e5 +SIZE (cabal/hspec-discover-2.5.0.tar.gz) = 6699 diff --git a/devel/hs-hspec-expectations/Makefile b/devel/hs-hspec-expectations/Makefile index 7a4f18976dc..9e8dcf16803 100644 --- a/devel/hs-hspec-expectations/Makefile +++ b/devel/hs-hspec-expectations/Makefile @@ -2,7 +2,7 @@ PORTNAME= hspec-expectations PORTVERSION= 0.8.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-hspec/Makefile b/devel/hs-hspec/Makefile index c97ba78ed6e..d88193a362f 100644 --- a/devel/hs-hspec/Makefile +++ b/devel/hs-hspec/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= hspec -PORTVERSION= 2.4.4 -PORTREVISION= 1 +PORTVERSION= 2.5.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-hspec/distinfo b/devel/hs-hspec/distinfo index 4bf6e7e7d4a..152c64e64e6 100644 --- a/devel/hs-hspec/distinfo +++ b/devel/hs-hspec/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627845 -SHA256 (cabal/hspec-2.4.4.tar.gz) = b01a3245da9c597608befddc4fc3cae35e5bc753235877076f11ae8e0647cf21 -SIZE (cabal/hspec-2.4.4.tar.gz) = 10634 +TIMESTAMP = 1525007159 +SHA256 (cabal/hspec-2.5.0.tar.gz) = abeda4a3282b5a1d80809fd17554bcc1593554832a6b11366c7ae3b6d01c779b +SIZE (cabal/hspec-2.5.0.tar.gz) = 9013 diff --git a/devel/hs-io-streams-haproxy/Makefile b/devel/hs-io-streams-haproxy/Makefile index 9093c4a0078..c1ec5ad3ff2 100644 --- a/devel/hs-io-streams-haproxy/Makefile +++ b/devel/hs-io-streams-haproxy/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= io-streams-haproxy -PORTVERSION= 1.0.0.1 -PORTREVISION= 1 +PORTVERSION= 1.0.0.2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-io-streams-haproxy/distinfo b/devel/hs-io-streams-haproxy/distinfo index 5753d01dfff..64bff3881fd 100644 --- a/devel/hs-io-streams-haproxy/distinfo +++ b/devel/hs-io-streams-haproxy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499716472 -SHA256 (cabal/io-streams-haproxy-1.0.0.1.tar.gz) = c4c0c512443e4da45f1a0023acc4ccee820e25c1088c06346abfb31b9e6e927f -SIZE (cabal/io-streams-haproxy-1.0.0.1.tar.gz) = 9892 +TIMESTAMP = 1524413753 +SHA256 (cabal/io-streams-haproxy-1.0.0.2.tar.gz) = 77814f8258b5c32707a13e0d30ab2e144e7ad073aee821d6def65554024ed086 +SIZE (cabal/io-streams-haproxy-1.0.0.2.tar.gz) = 9888 diff --git a/devel/hs-io-streams-haproxy/files/patch-io-streams-haproxy.cabal b/devel/hs-io-streams-haproxy/files/patch-io-streams-haproxy.cabal index bd2556d4f86..9a29416c362 100644 --- a/devel/hs-io-streams-haproxy/files/patch-io-streams-haproxy.cabal +++ b/devel/hs-io-streams-haproxy/files/patch-io-streams-haproxy.cabal @@ -1,11 +1,11 @@ ---- io-streams-haproxy.cabal.orig 2017-07-10 20:00:53 UTC +--- io-streams-haproxy.cabal.orig 2018-04-22 16:18:46 UTC +++ io-streams-haproxy.cabal -@@ -38,7 +38,7 @@ library - build-depends: base >= 4.5 && < 4.10, +@@ -35,7 +35,7 @@ library + other-modules: System.IO.Streams.Network.Internal.Address + c-sources: cbits/byteorder.c + +- build-depends: base >= 4.5 && < 4.11, ++ build-depends: base >= 4.5 && < 4.12, attoparsec >= 0.7 && < 0.14, bytestring >= 0.9 && < 0.11, -- io-streams >= 1.3 && < 1.4, -+ io-streams >= 1.3 && < 1.5, - network >= 2.3 && < 2.7, - transformers >= 0.3 && < 0.6 - default-language: Haskell2010 + io-streams >= 1.3 && < 1.6, diff --git a/devel/hs-io-streams/Makefile b/devel/hs-io-streams/Makefile index c38d95206f0..0cdf52e14da 100644 --- a/devel/hs-io-streams/Makefile +++ b/devel/hs-io-streams/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= io-streams -PORTVERSION= 1.4.0.0 -PORTREVISION= 1 +PORTVERSION= 1.5.0.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= Simple and easy-to-use primitives for I/O using streams LICENSE= BSD3CLAUSE -USE_CABAL= attoparsec network primitive text vector zlib-bindings +USE_CABAL= attoparsec network primitive vector zlib-bindings .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-io-streams/distinfo b/devel/hs-io-streams/distinfo index 8f375908cf3..c322b5a6908 100644 --- a/devel/hs-io-streams/distinfo +++ b/devel/hs-io-streams/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499694762 -SHA256 (cabal/io-streams-1.4.0.0.tar.gz) = 6d393da60cbbbb31ca3cfe6e25beea6a1fd426ed1348723b357c6358f538930e -SIZE (cabal/io-streams-1.4.0.0.tar.gz) = 62422 +TIMESTAMP = 1523904656 +SHA256 (cabal/io-streams-1.5.0.1.tar.gz) = 5dcb3717933197a84f31be74abf545126b3d25eb0e0d64f722c480d3c46b2c8b +SIZE (cabal/io-streams-1.5.0.1.tar.gz) = 62763 diff --git a/devel/hs-io-streams/files/patch-io-streams.cabal b/devel/hs-io-streams/files/patch-io-streams.cabal index 41a7921eb24..c0a4fc6eb04 100644 --- a/devel/hs-io-streams/files/patch-io-streams.cabal +++ b/devel/hs-io-streams/files/patch-io-streams.cabal @@ -1,4 +1,4 @@ ---- io-streams.cabal.orig 2017-07-10 15:08:37 UTC +--- io-streams.cabal.orig 2018-04-16 18:57:41 UTC +++ io-streams.cabal @@ -122,7 +122,6 @@ Library Build-depends: base >= 4 && <5, @@ -8,11 +8,3 @@ network >= 2.3 && <2.7, primitive >= 0.2 && <0.7, process >= 1.1 && <1.7, -@@ -205,7 +204,6 @@ Test-suite testsuite - Build-depends: base >= 4 && <5, - attoparsec >= 0.10 && <0.14, - bytestring >= 0.9 && <0.11, -- bytestring-builder >= 0.10 && <0.11, - deepseq >= 1.2 && <1.5, - directory >= 1.1 && <2, - filepath >= 1.2 && <2, diff --git a/devel/hs-js-flot/Makefile b/devel/hs-js-flot/Makefile index faa5f96389e..41a0dbf8957 100644 --- a/devel/hs-js-flot/Makefile +++ b/devel/hs-js-flot/Makefile @@ -2,7 +2,7 @@ PORTNAME= js-flot PORTVERSION= 0.8.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-js-jquery/Makefile b/devel/hs-js-jquery/Makefile index 789fffeb7c2..e642610375a 100644 --- a/devel/hs-js-jquery/Makefile +++ b/devel/hs-js-jquery/Makefile @@ -2,7 +2,7 @@ PORTNAME= js-jquery PORTVERSION= 3.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-keys/Makefile b/devel/hs-keys/Makefile index 09134dc00c3..486cf54c6d6 100644 --- a/devel/hs-keys/Makefile +++ b/devel/hs-keys/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= keys -PORTVERSION= 3.11 -PORTREVISION= 1 +PORTVERSION= 3.12 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-keys/distinfo b/devel/hs-keys/distinfo index 214b5041112..30170011a0a 100644 --- a/devel/hs-keys/distinfo +++ b/devel/hs-keys/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627846 -SHA256 (cabal/keys-3.11.tar.gz) = 0cf397b7e6eb8cda930a02118c0bf262f9ef80c5a2f91822238b7778042cc4b2 -SIZE (cabal/keys-3.11.tar.gz) = 8674 +TIMESTAMP = 1523890076 +SHA256 (cabal/keys-3.12.tar.gz) = d4bfa78ff9df50224f1722925ae148279377193d04277a7dad224a47b34d5e55 +SIZE (cabal/keys-3.12.tar.gz) = 13353 diff --git a/devel/hs-kqueue/files/patch-kqueue.cabal b/devel/hs-kqueue/files/patch-kqueue.cabal new file mode 100644 index 00000000000..fff95670d49 --- /dev/null +++ b/devel/hs-kqueue/files/patch-kqueue.cabal @@ -0,0 +1,16 @@ +--- kqueue.cabal.orig 2018-04-29 14:33:28 UTC ++++ kqueue.cabal +@@ -21,11 +21,11 @@ Library + Hs-Source-Dirs: src + Exposed-modules: System.KQueue + System.KQueue.HighLevel +- Build-depends: base >= 4.0 && < 4.10 ++ Build-depends: base >= 4.0 && < 4.12 + , directory >= 1.0 && < 1.4 + , filepath >= 1.1 && < 1.5 + , mtl >= 1.1 && < 2.3 +- , time >= 1.1 && < 1.7 ++ , time >= 1.1 && < 1.9 + , unix >= 2.3 && < 2.8 + Build-tools: c2hs + GHC-Options: -Wall diff --git a/devel/hs-language-c/Makefile b/devel/hs-language-c/Makefile index 2690e39c4ff..a9ce5c42fd8 100644 --- a/devel/hs-language-c/Makefile +++ b/devel/hs-language-c/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= language-c -PORTVERSION= 0.7.1 -PORTREVISION= 1 +PORTVERSION= 0.7.2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-language-c/distinfo b/devel/hs-language-c/distinfo index 75b5bc3f40d..823403e8913 100644 --- a/devel/hs-language-c/distinfo +++ b/devel/hs-language-c/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1513181967 -SHA256 (cabal/language-c-0.7.1.tar.gz) = a7447123f9b3bec9319ee2a22b22d97f03acd6566b4f6caf5b9a1f71e4f7a9ca -SIZE (cabal/language-c-0.7.1.tar.gz) = 181648 +TIMESTAMP = 1523449230 +SHA256 (cabal/language-c-0.7.2.tar.gz) = 63ad22ddd8e51747c8d64239029cf4afd3e7d4060c9b9478145479f5d4d549e5 +SIZE (cabal/language-c-0.7.2.tar.gz) = 121429 diff --git a/devel/hs-language-javascript/Makefile b/devel/hs-language-javascript/Makefile index a32ac3eb245..44f27ec5317 100644 --- a/devel/hs-language-javascript/Makefile +++ b/devel/hs-language-javascript/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= language-javascript -PORTVERSION= 0.6.0.10 -PORTREVISION= 1 +PORTVERSION= 0.6.0.11 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-language-javascript/distinfo b/devel/hs-language-javascript/distinfo index e6721b6b616..4395d009e08 100644 --- a/devel/hs-language-javascript/distinfo +++ b/devel/hs-language-javascript/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627848 -SHA256 (cabal/language-javascript-0.6.0.10.tar.gz) = caf14c410bf4463fda497af2b9ea750eddff34e55bc1cfc696f2fb4a36983e54 -SIZE (cabal/language-javascript-0.6.0.10.tar.gz) = 101770 +TIMESTAMP = 1523905950 +SHA256 (cabal/language-javascript-0.6.0.11.tar.gz) = d4756e9bc9a180cb93701e964a3157a03d4db4c7cb5a7b6b196067e587cc6143 +SIZE (cabal/language-javascript-0.6.0.11.tar.gz) = 106881 diff --git a/devel/hs-largeword/Makefile b/devel/hs-largeword/Makefile index a922ae6f166..29623141100 100644 --- a/devel/hs-largeword/Makefile +++ b/devel/hs-largeword/Makefile @@ -2,7 +2,7 @@ PORTNAME= largeword PORTVERSION= 1.2.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-lazysmallcheck/Makefile b/devel/hs-lazysmallcheck/Makefile index 9ddcd05fd7c..cb1afba040a 100644 --- a/devel/hs-lazysmallcheck/Makefile +++ b/devel/hs-lazysmallcheck/Makefile @@ -2,7 +2,7 @@ PORTNAME= lazysmallcheck PORTVERSION= 0.6 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-lens/Makefile b/devel/hs-lens/Makefile index c066e5eda61..0c01c3205bf 100644 --- a/devel/hs-lens/Makefile +++ b/devel/hs-lens/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= lens -PORTVERSION= 4.15.3 -PORTREVISION= 1 +PORTVERSION= 4.16.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,11 +9,11 @@ COMMENT= Lenses, Folds and Traversals LICENSE= BSD3CLAUSE -USE_CABAL= base-orphans>=0.3 bifunctors>=5 comonad>=4 \ +USE_CABAL= base-orphans>=0.3 bifunctors>=5 call-stack comonad>=4 \ contravariant>=0.3 distributive>=0.3 exceptions>=0.1.1 \ free>=4 hashable>=1.1.2.3 kan-extensions>=4.2.1 mtl>=2.0.1 \ parallel>=3.1.0.1 profunctors>=5 reflection>=2 \ - semigroupoids>=5 semigroups>=0.8.4 tagged>=0.4.4 text>=0.11 \ + semigroupoids>=5 semigroups>=0.8.4 tagged>=0.4.4 \ th-abstraction transformers-compat>=0.4 unordered-containers>=0.2.4 \ vector>=0.9 void>=0.5 diff --git a/devel/hs-lens/distinfo b/devel/hs-lens/distinfo index 448a02506de..789bb48a2e8 100644 --- a/devel/hs-lens/distinfo +++ b/devel/hs-lens/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627850 -SHA256 (cabal/lens-4.15.3.tar.gz) = a2613bb987792da597b514c979636882931d46c596b37d5fbbcdb63bed30cd7e -SIZE (cabal/lens-4.15.3.tar.gz) = 985354 +TIMESTAMP = 1524407577 +SHA256 (cabal/lens-4.16.1.tar.gz) = f5bec97b1d5cf3d6487afebc79b927bd5a18f1fd594b104de36a35bf606ea4c6 +SIZE (cabal/lens-4.16.1.tar.gz) = 991132 diff --git a/devel/hs-lifted-async/Makefile b/devel/hs-lifted-async/Makefile index 2e256e0b35c..73481a18fab 100644 --- a/devel/hs-lifted-async/Makefile +++ b/devel/hs-lifted-async/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= lifted-async -PORTVERSION= 0.9.3 -PORTREVISION= 1 +PORTVERSION= 0.10.0.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-lifted-async/distinfo b/devel/hs-lifted-async/distinfo index 539c569e453..881e89c193d 100644 --- a/devel/hs-lifted-async/distinfo +++ b/devel/hs-lifted-async/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499608443 -SHA256 (cabal/lifted-async-0.9.3.tar.gz) = 97978307f34c8ab1d765724d723a13fede4112a94fe5fbf3494f00378961b461 -SIZE (cabal/lifted-async-0.9.3.tar.gz) = 10321 +TIMESTAMP = 1523785768 +SHA256 (cabal/lifted-async-0.10.0.1.tar.gz) = 0d925b16fffe6fb3db994165401aeb0752595d1feec3011eba5b8b2c8524c4b1 +SIZE (cabal/lifted-async-0.10.0.1.tar.gz) = 10129 diff --git a/devel/hs-lifted-base/Makefile b/devel/hs-lifted-base/Makefile index 56e01dd5cfe..6615ec1fa17 100644 --- a/devel/hs-lifted-base/Makefile +++ b/devel/hs-lifted-base/Makefile @@ -2,7 +2,7 @@ PORTNAME= lifted-base PORTVERSION= 0.2.3.11 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-logict/Makefile b/devel/hs-logict/Makefile index ae97fd94861..650ab9ee116 100644 --- a/devel/hs-logict/Makefile +++ b/devel/hs-logict/Makefile @@ -2,7 +2,7 @@ PORTNAME= logict PORTVERSION= 0.6.0.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-map-syntax/Makefile b/devel/hs-map-syntax/Makefile index d0354d6c13c..b766a899405 100644 --- a/devel/hs-map-syntax/Makefile +++ b/devel/hs-map-syntax/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= map-syntax -PORTVERSION= 0.2.0.2 -PORTREVISION= 1 +PORTVERSION= 0.3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-map-syntax/distinfo b/devel/hs-map-syntax/distinfo index 809123a512a..1b481dc835b 100644 --- a/devel/hs-map-syntax/distinfo +++ b/devel/hs-map-syntax/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627850 -SHA256 (cabal/map-syntax-0.2.0.2.tar.gz) = b18f95a6369a600fda189c6f475606cbf5f5f1827f96ca3384f33ae76bda4d8a -SIZE (cabal/map-syntax-0.2.0.2.tar.gz) = 6944 +TIMESTAMP = 1523633771 +SHA256 (cabal/map-syntax-0.3.tar.gz) = 9330065755202de07809fb23605da43d0fd0e25d72915ce22b5c6994526c6d2c +SIZE (cabal/map-syntax-0.3.tar.gz) = 7104 diff --git a/devel/hs-memory/Makefile b/devel/hs-memory/Makefile index 51503dc49c1..d7a438c02e4 100644 --- a/devel/hs-memory/Makefile +++ b/devel/hs-memory/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= memory -PORTVERSION= 0.14.6 -PORTREVISION= 1 +PORTVERSION= 0.14.16 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= Memory and related abtraction stuff LICENSE= BSD3CLAUSE -USE_CABAL= foundation +USE_CABAL= basement foundation .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-memory/distinfo b/devel/hs-memory/distinfo index c5cc22911f6..baf6072f342 100644 --- a/devel/hs-memory/distinfo +++ b/devel/hs-memory/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499444278 -SHA256 (cabal/memory-0.14.6.tar.gz) = c7dec070174756f1753010585a6dcd4f958a4360634142c4e387b3475bffc160 -SIZE (cabal/memory-0.14.6.tar.gz) = 37020 +TIMESTAMP = 1523375674 +SHA256 (cabal/memory-0.14.16.tar.gz) = 7bb0834ab28ce1248f3be09df211d49d20d703cdcda3ed16cde99356e2d72b0f +SIZE (cabal/memory-0.14.16.tar.gz) = 42207 diff --git a/devel/hs-microlens-th/Makefile b/devel/hs-microlens-th/Makefile index 6cd3114b435..4496a6b6ff4 100644 --- a/devel/hs-microlens-th/Makefile +++ b/devel/hs-microlens-th/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= microlens-th -PORTVERSION= 0.4.1.1 -PORTREVISION= 1 +PORTVERSION= 0.4.2.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= This package lets you automatically generate lenses for data types LICENSE= BSD3CLAUSE -USE_CABAL= microlens +USE_CABAL= microlens th-abstraction .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-microlens-th/distinfo b/devel/hs-microlens-th/distinfo index 80e863a6dc7..ba492245a24 100644 --- a/devel/hs-microlens-th/distinfo +++ b/devel/hs-microlens-th/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499789717 -SHA256 (cabal/microlens-th-0.4.1.1.tar.gz) = 5b1a400db8577805d80fb83963ef2a41cf43023b38300fdeaacb01a4fb526a7b -SIZE (cabal/microlens-th-0.4.1.1.tar.gz) = 16406 +TIMESTAMP = 1523954941 +SHA256 (cabal/microlens-th-0.4.2.1.tar.gz) = ec57108e9ab54c085dd316b60ac156e6624078a46682a60ed2462005cae4fc42 +SIZE (cabal/microlens-th-0.4.2.1.tar.gz) = 20972 diff --git a/devel/hs-microlens/Makefile b/devel/hs-microlens/Makefile index afd4c46018f..b53560a6959 100644 --- a/devel/hs-microlens/Makefile +++ b/devel/hs-microlens/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= microlens -PORTVERSION= 0.4.8.0 -PORTREVISION= 1 +PORTVERSION= 0.4.9.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-microlens/distinfo b/devel/hs-microlens/distinfo index 2ab34561f53..ea768eabb0b 100644 --- a/devel/hs-microlens/distinfo +++ b/devel/hs-microlens/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499703416 -SHA256 (cabal/microlens-0.4.8.0.tar.gz) = aa0b12717671593f7e2cd686762fb842b22bf3e5b4559e4db8863f1d30be7af5 -SIZE (cabal/microlens-0.4.8.0.tar.gz) = 24766 +TIMESTAMP = 1523449015 +SHA256 (cabal/microlens-0.4.9.1.tar.gz) = a1401c6f92c142bafea4cf58a1d99cc34af285df808b97f5b64af4bb81fb5648 +SIZE (cabal/microlens-0.4.9.1.tar.gz) = 25185 diff --git a/devel/hs-microstache/Makefile b/devel/hs-microstache/Makefile index ee776495f61..f03b6a85672 100644 --- a/devel/hs-microstache/Makefile +++ b/devel/hs-microstache/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= microstache -PORTVERSION= 1 -PORTREVISION= 1 +PORTVERSION= 1.0.1.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= Mustache templates for Haskell LICENSE= BSD3CLAUSE -USE_CABAL= aeson parsec semigroups text unordered-containers vector +USE_CABAL= aeson semigroups unordered-containers vector .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-microstache/distinfo b/devel/hs-microstache/distinfo index a5f70a866a6..992082da095 100644 --- a/devel/hs-microstache/distinfo +++ b/devel/hs-microstache/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499618263 -SHA256 (cabal/microstache-1.tar.gz) = e8875bfeac9e54e84d7c91f1f448ee80ec07b9b3db28d5369131fbaa20517164 -SIZE (cabal/microstache-1.tar.gz) = 19859 +TIMESTAMP = 1524430537 +SHA256 (cabal/microstache-1.0.1.1.tar.gz) = 5de98542313eb75f84961366ff8a70ed632387ba6518215035b2dd1b32d6a120 +SIZE (cabal/microstache-1.0.1.1.tar.gz) = 20449 diff --git a/devel/hs-microstache/files/patch-microstache.cabal b/devel/hs-microstache/files/patch-microstache.cabal new file mode 100644 index 00000000000..f02f657fe66 --- /dev/null +++ b/devel/hs-microstache/files/patch-microstache.cabal @@ -0,0 +1,11 @@ +--- microstache.cabal.orig 2018-04-22 20:59:09 UTC ++++ microstache.cabal +@@ -40,7 +40,7 @@ source-repository head + + library + build-depends: +- aeson >=0.11 && < 1.3, ++ aeson >=0.11 && < 1.4, + base >=4.5 && < 5.0, + bytestring >=0.9.2.1 && < 0.11, + containers >=0.4.2.1 && < 0.6, diff --git a/devel/hs-mmap/Makefile b/devel/hs-mmap/Makefile index 77f0a132e9e..e3867900d32 100644 --- a/devel/hs-mmap/Makefile +++ b/devel/hs-mmap/Makefile @@ -3,7 +3,7 @@ PORTNAME= mmap PORTVERSION= 0.5.9 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-mmorph/Makefile b/devel/hs-mmorph/Makefile index a0818fd1ce1..ab89f701257 100644 --- a/devel/hs-mmorph/Makefile +++ b/devel/hs-mmorph/Makefile @@ -2,7 +2,7 @@ PORTNAME= mmorph PORTVERSION= 1.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-monad-control/Makefile b/devel/hs-monad-control/Makefile index 4202679698d..12c93e38d17 100644 --- a/devel/hs-monad-control/Makefile +++ b/devel/hs-monad-control/Makefile @@ -2,7 +2,7 @@ PORTNAME= monad-control PORTVERSION= 1.0.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-monad-logger/Makefile b/devel/hs-monad-logger/Makefile index 879c38e9c48..067e1b9191c 100644 --- a/devel/hs-monad-logger/Makefile +++ b/devel/hs-monad-logger/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= monad-logger -PORTVERSION= 0.3.24 +PORTVERSION= 0.3.28.5 PORTREVISION= 1 CATEGORIES= devel haskell @@ -12,7 +12,7 @@ LICENSE= MIT USE_CABAL= blaze-builder conduit>=1.0 conduit-extra>=1.0 exceptions \ fast-logger>=2.0 lifted-base monad-control monad-loops \ - mtl resourcet>=0.4 stm stm-chans text transformers-base + mtl resourcet>=0.4 stm-chans transformers-base .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-monad-logger/distinfo b/devel/hs-monad-logger/distinfo index 382f3b03383..cc343381bde 100644 --- a/devel/hs-monad-logger/distinfo +++ b/devel/hs-monad-logger/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499595500 -SHA256 (cabal/monad-logger-0.3.24.tar.gz) = 05e579193068769d641cbf6bf6475682497897e64640b3936f6eda66cb36e8e4 -SIZE (cabal/monad-logger-0.3.24.tar.gz) = 9525 +TIMESTAMP = 1524399749 +SHA256 (cabal/monad-logger-0.3.28.5.tar.gz) = 225ed7cd2d0d375c0207d5d3b9faa12b339ca7dd51ca92f96d3eaf2d360027f1 +SIZE (cabal/monad-logger-0.3.28.5.tar.gz) = 10720 diff --git a/devel/hs-monad-loops/Makefile b/devel/hs-monad-loops/Makefile index 5501b0da2f5..0dfa0947327 100644 --- a/devel/hs-monad-loops/Makefile +++ b/devel/hs-monad-loops/Makefile @@ -2,7 +2,7 @@ PORTNAME= monad-loops PORTVERSION= 0.4.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-monad-par-extras/Makefile b/devel/hs-monad-par-extras/Makefile index 480ccc62396..a2087af345e 100644 --- a/devel/hs-monad-par-extras/Makefile +++ b/devel/hs-monad-par-extras/Makefile @@ -2,7 +2,7 @@ PORTNAME= monad-par-extras PORTVERSION= 0.3.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-monad-par/Makefile b/devel/hs-monad-par/Makefile index 72bb1dcb931..71dba0c41d2 100644 --- a/devel/hs-monad-par/Makefile +++ b/devel/hs-monad-par/Makefile @@ -2,7 +2,7 @@ PORTNAME= monad-par PORTVERSION= 0.3.4.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-monad-unlift/Makefile b/devel/hs-monad-unlift/Makefile index 912400e7041..a7199948011 100644 --- a/devel/hs-monad-unlift/Makefile +++ b/devel/hs-monad-unlift/Makefile @@ -2,7 +2,7 @@ PORTNAME= monad-unlift PORTVERSION= 0.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-monadplus/distinfo b/devel/hs-monadplus/distinfo deleted file mode 100644 index 0adffef4e7f..00000000000 --- a/devel/hs-monadplus/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1500997085 -SHA256 (cabal/monadplus-1.4.2.tar.gz) = 366ed520db1eaf2ec56d8508fee2804cc24c7a6016de4b75b9addec681186595 -SIZE (cabal/monadplus-1.4.2.tar.gz) = 3671 diff --git a/devel/hs-monadplus/pkg-descr b/devel/hs-monadplus/pkg-descr deleted file mode 100644 index 6e70945c31a..00000000000 --- a/devel/hs-monadplus/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Filtering and folding over arbitrary MonadPlus instances. This package -generalizes many common stream operations such as filter, catMaybes etc. - -WWW: http://hackage.haskell.org/package/monadplus - diff --git a/devel/hs-monads-tf/Makefile b/devel/hs-monads-tf/Makefile index 00055c0239e..e0fea0d183f 100644 --- a/devel/hs-monads-tf/Makefile +++ b/devel/hs-monads-tf/Makefile @@ -2,7 +2,7 @@ PORTNAME= monads-tf PORTVERSION= 0.1.0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-mono-traversable-instances/Makefile b/devel/hs-mono-traversable-instances/Makefile index 310eb9f816a..12baa3df9e0 100644 --- a/devel/hs-mono-traversable-instances/Makefile +++ b/devel/hs-mono-traversable-instances/Makefile @@ -2,7 +2,7 @@ PORTNAME= mono-traversable-instances PORTVERSION= 0.1.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-mono-traversable/Makefile b/devel/hs-mono-traversable/Makefile index aa321a416e4..6269335319d 100644 --- a/devel/hs-mono-traversable/Makefile +++ b/devel/hs-mono-traversable/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= mono-traversable -PORTVERSION= 1.0.2 -PORTREVISION= 1 +PORTVERSION= 1.0.8.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,7 @@ COMMENT= Type classes for mapping, folding, and traversing monomorphic container LICENSE= MIT USE_CABAL= comonad>=3.0.3 dlist>=0.6 dlist-instances>=0.1 hashable \ - semigroupoids>=3.0 semigroups>=0.10 split text>=0.11 \ + semigroupoids>=3.0 semigroups>=0.10 split \ unordered-containers>=0.2 vector>=0.10 vector-algorithms>=0.6 \ vector-instances diff --git a/devel/hs-mono-traversable/distinfo b/devel/hs-mono-traversable/distinfo index 43c929c4eac..f1e4155d812 100644 --- a/devel/hs-mono-traversable/distinfo +++ b/devel/hs-mono-traversable/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627851 -SHA256 (cabal/mono-traversable-1.0.2.tar.gz) = aa110a1f08b726f2e0d17858e09bd76e13d60ccf2bf5366c92c15999da0b3633 -SIZE (cabal/mono-traversable-1.0.2.tar.gz) = 38239 +TIMESTAMP = 1523892095 +SHA256 (cabal/mono-traversable-1.0.8.1.tar.gz) = 991290797bd77ce2f2e23dd5dea32fb159c6cb9310615f64a0703ea4c6373935 +SIZE (cabal/mono-traversable-1.0.8.1.tar.gz) = 39037 diff --git a/devel/hs-mtl/Makefile b/devel/hs-mtl/Makefile index c5f88a3a1e1..57c521faac1 100644 --- a/devel/hs-mtl/Makefile +++ b/devel/hs-mtl/Makefile @@ -2,7 +2,7 @@ PORTNAME= mtl PORTVERSION= 2.2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-mueval/Makefile b/devel/hs-mueval/Makefile index cc57656ab63..90c250e6921 100644 --- a/devel/hs-mueval/Makefile +++ b/devel/hs-mueval/Makefile @@ -3,7 +3,7 @@ PORTNAME= mueval PORTVERSION= 0.9.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-murmur-hash/Makefile b/devel/hs-murmur-hash/Makefile index 0844303558d..6e0522fb6a6 100644 --- a/devel/hs-murmur-hash/Makefile +++ b/devel/hs-murmur-hash/Makefile @@ -2,7 +2,7 @@ PORTNAME= murmur-hash PORTVERSION= 0.1.0.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-mutable-containers/Makefile b/devel/hs-mutable-containers/Makefile index 93e126a531e..2b1993bd398 100644 --- a/devel/hs-mutable-containers/Makefile +++ b/devel/hs-mutable-containers/Makefile @@ -2,7 +2,7 @@ PORTNAME= mutable-containers PORTVERSION= 0.3.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-ncurses/Makefile b/devel/hs-ncurses/Makefile index 032d9259ce5..c9bcae18f3a 100644 --- a/devel/hs-ncurses/Makefile +++ b/devel/hs-ncurses/Makefile @@ -3,7 +3,7 @@ PORTNAME= ncurses PORTVERSION= 0.2.16 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -12,7 +12,6 @@ COMMENT= Modernised Haskell binding to GNU ncurses LICENSE= GPLv3 USE_C2HS= yes -USE_CABAL= text USES= ncurses diff --git a/devel/hs-newtype-generics/Makefile b/devel/hs-newtype-generics/Makefile index 15948e7033e..6b31742a013 100644 --- a/devel/hs-newtype-generics/Makefile +++ b/devel/hs-newtype-generics/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= newtype-generics -PORTVERSION= 0.5 -PORTREVISION= 1 +PORTVERSION= 0.5.3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-newtype-generics/distinfo b/devel/hs-newtype-generics/distinfo index 377a45c1a4b..8eb50b9807b 100644 --- a/devel/hs-newtype-generics/distinfo +++ b/devel/hs-newtype-generics/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499700022 -SHA256 (cabal/newtype-generics-0.5.tar.gz) = dc63ac2c9e682ee292a8f88fa3eb1af1b66d5860f7dcec0d09319c5ef96e7f9c -SIZE (cabal/newtype-generics-0.5.tar.gz) = 4490 +TIMESTAMP = 1523473191 +SHA256 (cabal/newtype-generics-0.5.3.tar.gz) = f295f001a86bdbcf759d6b91b9e7ae27cd431ccf41d9b9d34ee1c926b88efe45 +SIZE (cabal/newtype-generics-0.5.3.tar.gz) = 6956 diff --git a/devel/hs-newtype/Makefile b/devel/hs-newtype/Makefile index 916a6f08c24..ec00fba0c52 100644 --- a/devel/hs-newtype/Makefile +++ b/devel/hs-newtype/Makefile @@ -2,7 +2,7 @@ PORTNAME= newtype PORTVERSION= 0.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-old-locale/Makefile b/devel/hs-old-locale/Makefile index dc4b8ff23f7..03b24bb645a 100644 --- a/devel/hs-old-locale/Makefile +++ b/devel/hs-old-locale/Makefile @@ -2,7 +2,7 @@ PORTNAME= old-locale PORTVERSION= 1.0.0.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-old-locale/files/patch-git_15fea2d b/devel/hs-old-locale/files/patch-git_15fea2d index 89a56aedd19..c78bf11e3c9 100644 --- a/devel/hs-old-locale/files/patch-git_15fea2d +++ b/devel/hs-old-locale/files/patch-git_15fea2d @@ -16,6 +16,6 @@ index 37057a8..52aa83a 100644 System.Locale - build-depends: base >= 4.2 && < 4.9 -+ build-depends: base >= 4.2 && < 4.11 ++ build-depends: base >= 4.2 && < 4.12 ghc-options: -Wall diff --git a/devel/hs-old-time/Makefile b/devel/hs-old-time/Makefile index 7341b0eab86..333f45db796 100644 --- a/devel/hs-old-time/Makefile +++ b/devel/hs-old-time/Makefile @@ -2,7 +2,7 @@ PORTNAME= old-time PORTVERSION= 1.1.0.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-old-time/files/patch-git_82790af b/devel/hs-old-time/files/patch-git_82790af index d2f1d70132f..842bf10e1c6 100644 --- a/devel/hs-old-time/files/patch-git_82790af +++ b/devel/hs-old-time/files/patch-git_82790af @@ -16,7 +16,7 @@ index d322965..3a0e85c 100644 build-depends: - base >= 4.7 && < 4.9, -+ base >= 4.7 && < 4.11, ++ base >= 4.7 && < 4.12, old-locale == 1.0.* ghc-options: -Wall diff --git a/devel/hs-optparse-applicative/Makefile b/devel/hs-optparse-applicative/Makefile index b195fe4858e..b76b16ca9b3 100644 --- a/devel/hs-optparse-applicative/Makefile +++ b/devel/hs-optparse-applicative/Makefile @@ -2,7 +2,7 @@ PORTNAME= optparse-applicative PORTVERSION= 0.14.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-parallel/files/patch-parallel.cabal b/devel/hs-parallel/files/patch-parallel.cabal new file mode 100644 index 00000000000..a95e09349d9 --- /dev/null +++ b/devel/hs-parallel/files/patch-parallel.cabal @@ -0,0 +1,10 @@ +--- parallel.cabal.orig 2018-04-10 09:45:32 UTC ++++ parallel.cabal +@@ -34,7 +34,7 @@ library + + build-depends: + array >= 0.3 && < 0.6, +- base >= 4.3 && < 4.11, ++ base >= 4.3 && < 4.12, + containers >= 0.4 && < 0.6, + deepseq >= 1.1 && < 1.5 diff --git a/devel/hs-pcre-light/Makefile b/devel/hs-pcre-light/Makefile index d3788c0a147..7af361e589d 100644 --- a/devel/hs-pcre-light/Makefile +++ b/devel/hs-pcre-light/Makefile @@ -2,7 +2,7 @@ PORTNAME= pcre-light PORTVERSION= 0.4.0.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-prelude-extras/Makefile b/devel/hs-prelude-extras/Makefile index 55989575fd6..cad81f93c1e 100644 --- a/devel/hs-prelude-extras/Makefile +++ b/devel/hs-prelude-extras/Makefile @@ -2,7 +2,7 @@ PORTNAME= prelude-extras PORTVERSION= 0.4.0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-preprocessor-tools/Makefile b/devel/hs-preprocessor-tools/Makefile index b9183cf0c80..8cbe3b2fbd6 100644 --- a/devel/hs-preprocessor-tools/Makefile +++ b/devel/hs-preprocessor-tools/Makefile @@ -10,7 +10,9 @@ COMMENT= Framework for extending Haskell's syntax via quick-and-dirty preprocess LICENSE= BSD3CLAUSE -USE_CABAL= mtl>=1 parsec>=3 syb>=0 +USE_CABAL= mtl>=1 syb>=0 + +IGNORE= Doesn't build with recent GHC version .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-prettyclass/Makefile b/devel/hs-prettyclass/Makefile index a71a9377336..b412a586cc0 100644 --- a/devel/hs-prettyclass/Makefile +++ b/devel/hs-prettyclass/Makefile @@ -2,7 +2,7 @@ PORTNAME= prettyclass PORTVERSION= 1.0.0.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-primitive/Makefile b/devel/hs-primitive/Makefile index 8b4c9f00fdf..ea3af1843f3 100644 --- a/devel/hs-primitive/Makefile +++ b/devel/hs-primitive/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= primitive -PORTVERSION= 0.6.2.0 -PORTREVISION= 1 +PORTVERSION= 0.6.3.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-primitive/distinfo b/devel/hs-primitive/distinfo index 5b1160e1335..2b25698e8a2 100644 --- a/devel/hs-primitive/distinfo +++ b/devel/hs-primitive/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499444407 -SHA256 (cabal/primitive-0.6.2.0.tar.gz) = b8e8d70213e22b3fab0e0d11525c02627489618988fdc636052ca0adce282ae1 -SIZE (cabal/primitive-0.6.2.0.tar.gz) = 23954 +TIMESTAMP = 1523292481 +SHA256 (cabal/primitive-0.6.3.0.tar.gz) = cddeff804e0f577f1be0179d5d145dfc170f8bfb66f663b9fba67104a45d9555 +SIZE (cabal/primitive-0.6.3.0.tar.gz) = 25336 diff --git a/devel/hs-process-extras/Makefile b/devel/hs-process-extras/Makefile index bd0747a3583..f668ce1a15d 100644 --- a/devel/hs-process-extras/Makefile +++ b/devel/hs-process-extras/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= process-extras -PORTVERSION= 0.7.2 -PORTREVISION= 1 +PORTVERSION= 0.7.4 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= Read process input and output as ByteStrings or Text LICENSE= BSD3CLAUSE -USE_CABAL= data-default generic-deriving ListLike mtl text +USE_CABAL= data-default generic-deriving ListLike mtl .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-process-extras/distinfo b/devel/hs-process-extras/distinfo index 0cd81481a50..ef43c829a1d 100644 --- a/devel/hs-process-extras/distinfo +++ b/devel/hs-process-extras/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499719583 -SHA256 (cabal/process-extras-0.7.2.tar.gz) = e76c1031ec696dcd25b05f1b00611585a40050aa30548394d084a72267a8e958 -SIZE (cabal/process-extras-0.7.2.tar.gz) = 14267 +TIMESTAMP = 1523957985 +SHA256 (cabal/process-extras-0.7.4.tar.gz) = 293e75f849254ce0ce0d7fa659681917e07a557c602505a2f9e20777467e984e +SIZE (cabal/process-extras-0.7.4.tar.gz) = 14256 diff --git a/devel/hs-profunctors/Makefile b/devel/hs-profunctors/Makefile index e8a27dd0df2..d530e0efb21 100644 --- a/devel/hs-profunctors/Makefile +++ b/devel/hs-profunctors/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= profunctors -PORTVERSION= 5.2 -PORTREVISION= 1 +PORTVERSION= 5.2.2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-profunctors/distinfo b/devel/hs-profunctors/distinfo index f23b7830572..2bac91b4fc8 100644 --- a/devel/hs-profunctors/distinfo +++ b/devel/hs-profunctors/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499595371 -SHA256 (cabal/profunctors-5.2.tar.gz) = 87a7e25c4745ea8ff479dd1212ec2e57710abb3d3dd30f948fa16be1d3ee05a4 -SIZE (cabal/profunctors-5.2.tar.gz) = 23236 +TIMESTAMP = 1523817696 +SHA256 (cabal/profunctors-5.2.2.tar.gz) = e981e6a33ac99d38a947a749179bbea3c294ecf6bfde41660fe6d8d5a2e43768 +SIZE (cabal/profunctors-5.2.2.tar.gz) = 28155 diff --git a/devel/hs-profunctors/files/patch-git_c0574c b/devel/hs-profunctors/files/patch-git_c0574c deleted file mode 100644 index af645f89acb..00000000000 --- a/devel/hs-profunctors/files/patch-git_c0574c +++ /dev/null @@ -1,22 +0,0 @@ -From c0574c91a459083066d656bec39e67dfa02daf06 Mon Sep 17 00:00:00 2001 -From: Ryan Scott -Date: Mon, 10 Apr 2017 09:41:23 -0400 -Subject: [PATCH] Bump base-orphans upper version bounds - ---- - profunctors.cabal | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/profunctors.cabal b/profunctors.cabal -index 1233e734..8f94e27c 100644 ---- profunctors.cabal -+++ profunctors.cabal -@@ -30,7 +30,7 @@ source-repository head - library - build-depends: - base >= 4 && < 5, -- base-orphans >= 0.4 && < 0.6, -+ base-orphans >= 0.4 && < 0.7, - bifunctors >= 5.2 && < 6, - comonad >= 4 && < 6, - contravariant >= 1 && < 2, diff --git a/devel/hs-project-template/Makefile b/devel/hs-project-template/Makefile index d69dcb232d2..e8a248e3d02 100644 --- a/devel/hs-project-template/Makefile +++ b/devel/hs-project-template/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= project-template -PORTVERSION= 0.2.0 -PORTREVISION= 2 +PORTVERSION= 0.2.0.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,7 @@ COMMENT= Specify Haskell project templates and generate files LICENSE= BSD3CLAUSE USE_CABAL= base64-bytestring conduit>=1.0 conduit-extra mtl>=2.0 \ - resourcet>=0.4.3 text>=0.11 + resourcet>=0.4.3 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-project-template/distinfo b/devel/hs-project-template/distinfo index 66526b2a741..72a719d3051 100644 --- a/devel/hs-project-template/distinfo +++ b/devel/hs-project-template/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627854 -SHA256 (cabal/project-template-0.2.0.tar.gz) = aeabd7d1785b31abaffc78f02d9dda67d57d01822755f09614bfc65e99506310 -SIZE (cabal/project-template-0.2.0.tar.gz) = 8251 +TIMESTAMP = 1524430893 +SHA256 (cabal/project-template-0.2.0.1.tar.gz) = eb52496fa7448f5fed445525c05327b31a45282fc1d0a772c7022a9809e7c9dc +SIZE (cabal/project-template-0.2.0.1.tar.gz) = 8321 diff --git a/devel/hs-psqueues/Makefile b/devel/hs-psqueues/Makefile index 07abee5bf87..6e0391a150b 100644 --- a/devel/hs-psqueues/Makefile +++ b/devel/hs-psqueues/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= psqueues -PORTVERSION= 0.2.3.0 -PORTREVISION= 1 +PORTVERSION= 0.2.6.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-psqueues/distinfo b/devel/hs-psqueues/distinfo index 804de738bb5..53726d83d4a 100644 --- a/devel/hs-psqueues/distinfo +++ b/devel/hs-psqueues/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499689628 -SHA256 (cabal/psqueues-0.2.3.0.tar.gz) = 25ed95de5de62831d3e1db47aabd0b589ddf71aeec2d53bc3104a9bb663743a7 -SIZE (cabal/psqueues-0.2.3.0.tar.gz) = 26646 +TIMESTAMP = 1523432363 +SHA256 (cabal/psqueues-0.2.6.0.tar.gz) = 9a6a10c99a64617bdab28331bed4a77cdd373283ebc2a6f73eda488462d06958 +SIZE (cabal/psqueues-0.2.6.0.tar.gz) = 27266 diff --git a/devel/hs-quickcheck-io/Makefile b/devel/hs-quickcheck-io/Makefile index 0d7772d20b1..0c4c9d9065a 100644 --- a/devel/hs-quickcheck-io/Makefile +++ b/devel/hs-quickcheck-io/Makefile @@ -2,7 +2,7 @@ PORTNAME= quickcheck-io PORTVERSION= 0.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-random/Makefile b/devel/hs-random/Makefile index b14284f9397..4f5883a7caf 100644 --- a/devel/hs-random/Makefile +++ b/devel/hs-random/Makefile @@ -2,7 +2,7 @@ PORTNAME= random PORTVERSION= 1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-readable/Makefile b/devel/hs-readable/Makefile index dea27707cb5..9667f20ca17 100644 --- a/devel/hs-readable/Makefile +++ b/devel/hs-readable/Makefile @@ -2,7 +2,7 @@ PORTNAME= readable PORTVERSION= 0.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,5 @@ COMMENT= Reading data types from ByteString and Text LICENSE= BSD3CLAUSE -USE_CABAL= text - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-readline/Makefile b/devel/hs-readline/Makefile index 491a49ba43e..5252125794f 100644 --- a/devel/hs-readline/Makefile +++ b/devel/hs-readline/Makefile @@ -3,7 +3,7 @@ PORTNAME= readline PORTVERSION= 1.0.3.0 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-refact/Makefile b/devel/hs-refact/Makefile index e20c6faaf8c..9c8b79e2ede 100644 --- a/devel/hs-refact/Makefile +++ b/devel/hs-refact/Makefile @@ -2,7 +2,7 @@ PORTNAME= refact PORTVERSION= 0.3.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-reflection/Makefile b/devel/hs-reflection/Makefile index b8802f12b11..fc8a768a51c 100644 --- a/devel/hs-reflection/Makefile +++ b/devel/hs-reflection/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= reflection -PORTVERSION= 2.1.2 -PORTREVISION= 1 +PORTVERSION= 2.1.3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-reflection/distinfo b/devel/hs-reflection/distinfo index cec6f7cf28d..5016d7aa1ae 100644 --- a/devel/hs-reflection/distinfo +++ b/devel/hs-reflection/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627855 -SHA256 (cabal/reflection-2.1.2.tar.gz) = a909882c04b24016bedb85587c09f23cf06bad71a2b1f7e781e89abaa6023c39 -SIZE (cabal/reflection-2.1.2.tar.gz) = 14334 +TIMESTAMP = 1523900374 +SHA256 (cabal/reflection-2.1.3.tar.gz) = 88f81923abd7211e51de7071cd5800b30784e374c193de8cdd7b1c201f8de405 +SIZE (cabal/reflection-2.1.3.tar.gz) = 18085 diff --git a/devel/hs-resource-pool/Makefile b/devel/hs-resource-pool/Makefile index 278a023b0d1..8901d9173ee 100644 --- a/devel/hs-resource-pool/Makefile +++ b/devel/hs-resource-pool/Makefile @@ -2,7 +2,7 @@ PORTNAME= resource-pool PORTVERSION= 0.2.3.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,8 +10,8 @@ COMMENT= High-performance striped resource pooling implementation LICENSE= BSD3CLAUSE -USE_CABAL= hashable monad-control>=0.2.0.1 stm>=2.3 \ - transformers-base>=0.4 vector>=0.7 +USE_CABAL= hashable monad-control>=0.2.0.1 transformers-base>=0.4 \ + vector>=0.7 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-resourcet/Makefile b/devel/hs-resourcet/Makefile index 2fb3992a9b1..8c4849ba9fd 100644 --- a/devel/hs-resourcet/Makefile +++ b/devel/hs-resourcet/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= resourcet -PORTVERSION= 1.1.9 -PORTREVISION= 1 +PORTVERSION= 1.2.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,8 @@ COMMENT= Deterministic allocation and freeing of scarce resources LICENSE= BSD3CLAUSE USE_CABAL= exceptions lifted-base mmorph monad-control mtl \ - transformers-base transformers-compat + primitive transformers-base transformers-compat \ + unliftio-core .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-resourcet/distinfo b/devel/hs-resourcet/distinfo index f56286edbe4..cbc436e55e7 100644 --- a/devel/hs-resourcet/distinfo +++ b/devel/hs-resourcet/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499458469 -SHA256 (cabal/resourcet-1.1.9.tar.gz) = 5a1999d26b896603cab8121b77f36723dc50960291872b691ff4a9533e162ef5 -SIZE (cabal/resourcet-1.1.9.tar.gz) = 15215 +TIMESTAMP = 1523696873 +SHA256 (cabal/resourcet-1.2.1.tar.gz) = e765c12a6ec0f70efc3c938750060bc17569b99578aa635fd4da0c4d06fcf267 +SIZE (cabal/resourcet-1.2.1.tar.gz) = 16459 diff --git a/devel/hs-safe-exceptions/Makefile b/devel/hs-safe-exceptions/Makefile index fbc0b18a273..664947b3f31 100644 --- a/devel/hs-safe-exceptions/Makefile +++ b/devel/hs-safe-exceptions/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= safe-exceptions -PORTVERSION= 0.1.6.0 -PORTREVISION= 1 +PORTVERSION= 0.1.7.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-safe-exceptions/distinfo b/devel/hs-safe-exceptions/distinfo index 651ca5d1f08..3f12e9f4aeb 100644 --- a/devel/hs-safe-exceptions/distinfo +++ b/devel/hs-safe-exceptions/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499717912 -SHA256 (cabal/safe-exceptions-0.1.6.0.tar.gz) = 71d47ce1049465b02d89231f2931e7a1d22b6960e85fca5281162e979cf08d1c -SIZE (cabal/safe-exceptions-0.1.6.0.tar.gz) = 13447 +TIMESTAMP = 1523650633 +SHA256 (cabal/safe-exceptions-0.1.7.0.tar.gz) = 18cddc587b52b6faa0287fb6ad6c964d1562571ea2c8ff57a194dd54b5fba069 +SIZE (cabal/safe-exceptions-0.1.7.0.tar.gz) = 13533 diff --git a/devel/hs-safe-exceptions/files/patch-safe-exceptions.cabal b/devel/hs-safe-exceptions/files/patch-safe-exceptions.cabal new file mode 100644 index 00000000000..65a07f77952 --- /dev/null +++ b/devel/hs-safe-exceptions/files/patch-safe-exceptions.cabal @@ -0,0 +1,13 @@ +--- safe-exceptions.cabal.orig 2018-04-13 20:24:13 UTC ++++ safe-exceptions.cabal +@@ -16,9 +16,9 @@ cabal-version: >=1.10 + library + hs-source-dirs: src + exposed-modules: Control.Exception.Safe +- build-depends: base >= 4.7 && < 4.11 ++ build-depends: base >= 4.7 && < 4.12 + , deepseq >= 1.2 && < 1.5 +- , exceptions >= 0.8 && < 0.9 ++ , exceptions >= 0.8 && < 0.11 + , transformers >= 0.2 && < 0.6 + default-language: Haskell2010 diff --git a/devel/hs-safe/Makefile b/devel/hs-safe/Makefile index 751f63f2935..4d37af1a554 100644 --- a/devel/hs-safe/Makefile +++ b/devel/hs-safe/Makefile @@ -3,7 +3,7 @@ PORTNAME= safe PORTVERSION= 0.3.15 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-say/Makefile b/devel/hs-say/Makefile index c76b8449065..4fa4329ef0f 100644 --- a/devel/hs-say/Makefile +++ b/devel/hs-say/Makefile @@ -2,7 +2,7 @@ PORTNAME= say PORTVERSION= 0.1.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,5 @@ COMMENT= The say packagae LICENSE= BSD3CLAUSE -USE_CABAL= text - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-scientific/Makefile b/devel/hs-scientific/Makefile index 53cce24769b..cf9088dfce7 100644 --- a/devel/hs-scientific/Makefile +++ b/devel/hs-scientific/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= scientific -PORTVERSION= 0.3.5.1 -PORTREVISION= 1 +PORTVERSION= 0.3.5.3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= Numbers represented using scientific notation LICENSE= BSD3CLAUSE -USE_CABAL= hashable>=1.1.2 text>=0.8 integer-logarithms vector +USE_CABAL= hashable>=1.1.2 integer-logarithms vector .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-scientific/distinfo b/devel/hs-scientific/distinfo index c36c330750e..f19a3728990 100644 --- a/devel/hs-scientific/distinfo +++ b/devel/hs-scientific/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627855 -SHA256 (cabal/scientific-0.3.5.1.tar.gz) = 5ba6e682cbb6cd5c6444d1c6c35f3b396e316637a14456b18de58c9a33661ba6 -SIZE (cabal/scientific-0.3.5.1.tar.gz) = 20777 +TIMESTAMP = 1523636073 +SHA256 (cabal/scientific-0.3.5.3.tar.gz) = 12a6d13417c24e4b7f905d6cd8dcd1d9ae51f6f7ba3fda13057d521c8fc2c748 +SIZE (cabal/scientific-0.3.5.3.tar.gz) = 21013 diff --git a/devel/hs-securemem/Makefile b/devel/hs-securemem/Makefile index fcd425c77be..c14c44a3eff 100644 --- a/devel/hs-securemem/Makefile +++ b/devel/hs-securemem/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= securemem -PORTVERSION= 0.1.9 -PORTREVISION= 2 +PORTVERSION= 0.1.10 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= Abstraction to an auto scrubbing and const time eq, memory chunk LICENSE= BSD3CLAUSE -USE_CABAL= byteable>=0.1.1 memory>=0.7 +USE_CABAL= basement byteable>=0.1.1 foundation memory>=0.7 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-securemem/distinfo b/devel/hs-securemem/distinfo index 2cfe8181675..85b54ae1119 100644 --- a/devel/hs-securemem/distinfo +++ b/devel/hs-securemem/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627856 -SHA256 (cabal/securemem-0.1.9.tar.gz) = feb60dc542ea3ce9cdb449093b85dc69e43df310aab4fd161e4cdaa3ba847036 -SIZE (cabal/securemem-0.1.9.tar.gz) = 4180 +TIMESTAMP = 1523431880 +SHA256 (cabal/securemem-0.1.10.tar.gz) = 32895a4748508da58207b4867266601af6259b7109af80bbf5d2e9e598e016a6 +SIZE (cabal/securemem-0.1.10.tar.gz) = 3801 diff --git a/devel/hs-setenv/Makefile b/devel/hs-setenv/Makefile index 501a0fef290..cf7d9dd72b4 100644 --- a/devel/hs-setenv/Makefile +++ b/devel/hs-setenv/Makefile @@ -2,7 +2,7 @@ PORTNAME= setenv PORTVERSION= 0.1.1.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-setlocale/Makefile b/devel/hs-setlocale/Makefile index fa2ad918813..aae9201616f 100644 --- a/devel/hs-setlocale/Makefile +++ b/devel/hs-setlocale/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= setlocale -PORTVERSION= 1.0.0.5 -PORTREVISION= 1 +PORTVERSION= 1.0.0.6 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-setlocale/distinfo b/devel/hs-setlocale/distinfo index 7faa69e6456..516f2deb21f 100644 --- a/devel/hs-setlocale/distinfo +++ b/devel/hs-setlocale/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627856 -SHA256 (cabal/setlocale-1.0.0.5.tar.gz) = 57438491475004eda12d7a73eea0ab1c5fb28774027626e5bbcb142fe57d9ff0 -SIZE (cabal/setlocale-1.0.0.5.tar.gz) = 2108 +TIMESTAMP = 1523637605 +SHA256 (cabal/setlocale-1.0.0.6.tar.gz) = 587af63153c1f3642de2c2f526b3a3c82c46ece3bd09ffd96a0eedbfd1c288e6 +SIZE (cabal/setlocale-1.0.0.6.tar.gz) = 2113 diff --git a/devel/hs-shake/Makefile b/devel/hs-shake/Makefile index f4ceb82429b..dad555b2a3f 100644 --- a/devel/hs-shake/Makefile +++ b/devel/hs-shake/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= shake -PORTVERSION= 0.15.11 -PORTREVISION= 1 +PORTVERSION= 0.16.4 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,7 @@ COMMENT= Build system library, like Make, but more accurate dependencies LICENSE= BSD3CLAUSE USE_CABAL= extra>=1.3 hashable>=1.1.2.3 js-flot js-jquery old-time \ - random unordered-containers>=0.2.1 utf8-string>=0.3 + primitive random unordered-containers>=0.2.1 utf8-string>=0.3 EXECUTABLE= shake diff --git a/devel/hs-shake/distinfo b/devel/hs-shake/distinfo index b7f44b6f0a7..5c68f94d29f 100644 --- a/devel/hs-shake/distinfo +++ b/devel/hs-shake/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499544643 -SHA256 (cabal/shake-0.15.11.tar.gz) = 05520d833ce9563977aa57d777a644b2a2322366a9f54c1004d83967e826b1bb -SIZE (cabal/shake-0.15.11.tar.gz) = 513926 +TIMESTAMP = 1525012625 +SHA256 (cabal/shake-0.16.4.tar.gz) = b732a3a46ceb3b4545a78c3733e0a7904763e7cd3ee8bf4fe2e1e91f2c9b1436 +SIZE (cabal/shake-0.16.4.tar.gz) = 531091 diff --git a/devel/hs-show/Makefile b/devel/hs-show/Makefile index 35b24dacba8..b7a31e7fee5 100644 --- a/devel/hs-show/Makefile +++ b/devel/hs-show/Makefile @@ -3,7 +3,7 @@ PORTNAME= show PORTVERSION= 0.6 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-silently/Makefile b/devel/hs-silently/Makefile index d15c6bec828..4ff7e865884 100644 --- a/devel/hs-silently/Makefile +++ b/devel/hs-silently/Makefile @@ -2,7 +2,7 @@ PORTNAME= silently PORTVERSION= 1.2.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-simple-reflect/Makefile b/devel/hs-simple-reflect/Makefile index 40a47decc93..a32237cae02 100644 --- a/devel/hs-simple-reflect/Makefile +++ b/devel/hs-simple-reflect/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= simple-reflect -PORTVERSION= 0.3.2 -PORTREVISION= 4 +PORTVERSION= 0.3.3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-simple-reflect/distinfo b/devel/hs-simple-reflect/distinfo index 5e7ecbf9a70..24fde323ef2 100644 --- a/devel/hs-simple-reflect/distinfo +++ b/devel/hs-simple-reflect/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627856 -SHA256 (cabal/simple-reflect-0.3.2.tar.gz) = 38224eb3d0d5eafc7101ad48fa92001c3e753a015d53bb12753a3836b871ecb6 -SIZE (cabal/simple-reflect-0.3.2.tar.gz) = 4492 +TIMESTAMP = 1523698837 +SHA256 (cabal/simple-reflect-0.3.3.tar.gz) = 07825ea04c135298008cf080133e3bfc8e04cbacd24719c46ac6a2ca4acfdb2b +SIZE (cabal/simple-reflect-0.3.3.tar.gz) = 4590 diff --git a/devel/hs-smallcheck/Makefile b/devel/hs-smallcheck/Makefile index 731dabdd8cf..b69a4155fd3 100644 --- a/devel/hs-smallcheck/Makefile +++ b/devel/hs-smallcheck/Makefile @@ -3,7 +3,7 @@ PORTNAME= smallcheck PORTVERSION= 1.1.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-split/Makefile b/devel/hs-split/Makefile index e11d8cbb2c4..35ce60f1613 100644 --- a/devel/hs-split/Makefile +++ b/devel/hs-split/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= split -PORTVERSION= 0.2.3.2 -PORTREVISION= 1 +PORTVERSION= 0.2.3.3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-split/distinfo b/devel/hs-split/distinfo index 305823326e7..73bf2e1100b 100644 --- a/devel/hs-split/distinfo +++ b/devel/hs-split/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499447103 -SHA256 (cabal/split-0.2.3.2.tar.gz) = 4943eaad0dd473d44b4b97b8b9731c20f05ba86abb8a1fa07f8df819f09eb63a -SIZE (cabal/split-0.2.3.2.tar.gz) = 15779 +TIMESTAMP = 1523445494 +SHA256 (cabal/split-0.2.3.3.tar.gz) = 1dcd674f7c5f276f33300f5fd59e49d1ac6fc92ae949fd06a0f6d3e9d9ac1413 +SIZE (cabal/split-0.2.3.3.tar.gz) = 15681 diff --git a/devel/hs-stm-chans/Makefile b/devel/hs-stm-chans/Makefile index 10844930afa..d2ca1d26ed5 100644 --- a/devel/hs-stm-chans/Makefile +++ b/devel/hs-stm-chans/Makefile @@ -2,7 +2,7 @@ PORTNAME= stm-chans PORTVERSION= 3.0.0.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,5 @@ COMMENT= Additional types of channels for STM LICENSE= BSD3CLAUSE -USE_CABAL= stm>=2.4 - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-stm/distinfo b/devel/hs-stm/distinfo deleted file mode 100644 index 02ce74b1dac..00000000000 --- a/devel/hs-stm/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1498678463 -SHA256 (cabal/stm-2.4.4.1.tar.gz) = 8f999095ed8d50d2056fc6e185035ee8166c50751e1af8de02ac38d382bf3384 -SIZE (cabal/stm-2.4.4.1.tar.gz) = 10367 diff --git a/devel/hs-stm/pkg-descr b/devel/hs-stm/pkg-descr deleted file mode 100644 index c980d54cf12..00000000000 --- a/devel/hs-stm/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -A modular composable concurrency abstraction. - -WWW: http://hackage.haskell.org/package/stm diff --git a/devel/hs-storable-record/Makefile b/devel/hs-storable-record/Makefile new file mode 100644 index 00000000000..fc07d07585b --- /dev/null +++ b/devel/hs-storable-record/Makefile @@ -0,0 +1,15 @@ +# $FreeBSD$ + +PORTNAME= storable-record +PORTVERSION= 0.0.4 +CATEGORIES= devel haskell + +MAINTAINER= haskell@FreeBSD.org +COMMENT= Elegant definition of Storable instances for records + +LICENSE= BSD3CLAUSE + +USE_CABAL= semigroups utility-ht + +.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" +.include diff --git a/devel/hs-storable-record/distinfo b/devel/hs-storable-record/distinfo new file mode 100644 index 00000000000..921d3d4d53f --- /dev/null +++ b/devel/hs-storable-record/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1525082358 +SHA256 (cabal/storable-record-0.0.4.tar.gz) = ceffb2f08d8abc37e338ad924b264c230d5e54ecccaf1c22802c3107ea0c5a42 +SIZE (cabal/storable-record-0.0.4.tar.gz) = 7362 diff --git a/devel/hs-storable-record/pkg-descr b/devel/hs-storable-record/pkg-descr new file mode 100644 index 00000000000..fa272c20089 --- /dev/null +++ b/devel/hs-storable-record/pkg-descr @@ -0,0 +1,6 @@ +With this package you can build a Storable instance of a record type from +Storable instances of its elements in an elegant way. It does not do any magic, +just a bit arithmetic to compute the right offsets, that would be otherwise +done manually or by a preprocessor like C2HS. + +WWW: http://code.haskell.org/~thielema/storable-record/ diff --git a/devel/hs-storable-tuple/Makefile b/devel/hs-storable-tuple/Makefile new file mode 100644 index 00000000000..5f57049a900 --- /dev/null +++ b/devel/hs-storable-tuple/Makefile @@ -0,0 +1,15 @@ +# $FreeBSD$ + +PORTNAME= storable-tuple +PORTVERSION= 0.0.3.3 +CATEGORIES= devel haskell + +MAINTAINER= haskell@FreeBSD.org +COMMENT= Storable instance for pairs and triples + +LICENSE= BSD3CLAUSE + +USE_CABAL= base-orphans storable-record utility-ht + +.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" +.include diff --git a/devel/hs-storable-tuple/distinfo b/devel/hs-storable-tuple/distinfo new file mode 100644 index 00000000000..19a4001fbb8 --- /dev/null +++ b/devel/hs-storable-tuple/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1525081601 +SHA256 (cabal/storable-tuple-0.0.3.3.tar.gz) = dcfac049527a45c386c80a7c40ec211455b83d74311af88fa686063b5f87df35 +SIZE (cabal/storable-tuple-0.0.3.3.tar.gz) = 2383 diff --git a/devel/hs-storable-tuple/pkg-descr b/devel/hs-storable-tuple/pkg-descr new file mode 100644 index 00000000000..d6452512743 --- /dev/null +++ b/devel/hs-storable-tuple/pkg-descr @@ -0,0 +1,6 @@ +Provides a Storable instance for pair and triple which should be binary +compatible with C99 and C++. The only purpose of this package is to provide +a standard location for this instance so that other packages needing this +instance can play nicely together. + +WWW: http://code.haskell.org/~thielema/storable-tuple/ diff --git a/devel/hs-streaming-commons/Makefile b/devel/hs-streaming-commons/Makefile index cb80c98c402..16bf2c268f4 100644 --- a/devel/hs-streaming-commons/Makefile +++ b/devel/hs-streaming-commons/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= streaming-commons -PORTVERSION= 0.1.18 +PORTVERSION= 0.2.0.0 PORTREVISION= 1 CATEGORIES= devel haskell @@ -10,7 +10,7 @@ COMMENT= Common lower-level functions needed by various streaming data libraries LICENSE= MIT -USE_CABAL= async blaze-builder network random stm text zlib +USE_CABAL= async blaze-builder network random zlib .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-streaming-commons/distinfo b/devel/hs-streaming-commons/distinfo index d2427bab995..25dbbaecee4 100644 --- a/devel/hs-streaming-commons/distinfo +++ b/devel/hs-streaming-commons/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627857 -SHA256 (cabal/streaming-commons-0.1.18.tar.gz) = 27af2efb901a003c83fc6c71563eb70f45b4823516c299759d800a48d9f083cb -SIZE (cabal/streaming-commons-0.1.18.tar.gz) = 87832 +TIMESTAMP = 1523696417 +SHA256 (cabal/streaming-commons-0.2.0.0.tar.gz) = f4e2b8460325c133c83d04048e334fb502ba3627f41ffc85c05f81f1f38ace5f +SIZE (cabal/streaming-commons-0.2.0.0.tar.gz) = 86501 diff --git a/devel/hs-strict/Makefile b/devel/hs-strict/Makefile index 469870770a2..1896ec8ce01 100644 --- a/devel/hs-strict/Makefile +++ b/devel/hs-strict/Makefile @@ -2,7 +2,7 @@ PORTNAME= strict PORTVERSION= 0.3.2 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-syb-with-class/Makefile b/devel/hs-syb-with-class/Makefile index 6159390389d..db6a584d04f 100644 --- a/devel/hs-syb-with-class/Makefile +++ b/devel/hs-syb-with-class/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= syb-with-class -PORTVERSION= 0.6.1.7 -PORTREVISION= 1 +PORTVERSION= 0.6.1.9 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-syb-with-class/distinfo b/devel/hs-syb-with-class/distinfo index 19544d142ad..9aac1318517 100644 --- a/devel/hs-syb-with-class/distinfo +++ b/devel/hs-syb-with-class/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499448315 -SHA256 (cabal/syb-with-class-0.6.1.7.tar.gz) = 5c521870d8c533dabb0483015592897e1bc2356dacd19ad7f279e41b69e66abb -SIZE (cabal/syb-with-class-0.6.1.7.tar.gz) = 12524 +TIMESTAMP = 1524154298 +SHA256 (cabal/syb-with-class-0.6.1.9.tar.gz) = 06a96de923d9e67e4399fab5ddcc792cefcc7e87d5c6b72a648ba6c0fedffbaa +SIZE (cabal/syb-with-class-0.6.1.9.tar.gz) = 12526 diff --git a/devel/hs-syb/Makefile b/devel/hs-syb/Makefile index e42b5b1e510..1fb94b331a3 100644 --- a/devel/hs-syb/Makefile +++ b/devel/hs-syb/Makefile @@ -2,7 +2,7 @@ PORTNAME= syb PORTVERSION= 0.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-system-fileio/Makefile b/devel/hs-system-fileio/Makefile index 4c7d8e620cd..7588f92728c 100644 --- a/devel/hs-system-fileio/Makefile +++ b/devel/hs-system-fileio/Makefile @@ -2,7 +2,7 @@ PORTNAME= system-fileio PORTVERSION= 0.3.16.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,7 @@ COMMENT= Consistent filesystem interaction across GHC versions LICENSE= MIT -USE_CABAL= system-filepath>=0.3.1 text>=0.7.1 +USE_CABAL= system-filepath>=0.3.1 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-system-filepath/Makefile b/devel/hs-system-filepath/Makefile index 45149c5a746..66a74046e36 100644 --- a/devel/hs-system-filepath/Makefile +++ b/devel/hs-system-filepath/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= system-filepath -PORTVERSION= 0.4.13.4 -PORTREVISION= 2 +PORTVERSION= 0.4.14 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,5 @@ COMMENT= High-level, byte-based file and directory path manipulations LICENSE= MIT -USE_CABAL= text>=0.11.0.6 - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-system-filepath/distinfo b/devel/hs-system-filepath/distinfo index 50074e72a94..3137249f93c 100644 --- a/devel/hs-system-filepath/distinfo +++ b/devel/hs-system-filepath/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627858 -SHA256 (cabal/system-filepath-0.4.13.4.tar.gz) = 345d7dec968b74ab1b8c0e7bb78c2ef1e5be7be6b7bac455340fd658abfec5fb -SIZE (cabal/system-filepath-0.4.13.4.tar.gz) = 16590 +TIMESTAMP = 1523433190 +SHA256 (cabal/system-filepath-0.4.14.tar.gz) = 1656ce3c0d585650784ceb3f794748286e19fb635f557e7b29b0897f8956d993 +SIZE (cabal/system-filepath-0.4.14.tar.gz) = 16663 diff --git a/devel/hs-tagged/Makefile b/devel/hs-tagged/Makefile index 92ed8dfab14..a9202b7f174 100644 --- a/devel/hs-tagged/Makefile +++ b/devel/hs-tagged/Makefile @@ -2,7 +2,7 @@ PORTNAME= tagged PORTVERSION= 0.8.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-tagged/files/patch-tagged.cabal b/devel/hs-tagged/files/patch-tagged.cabal index ed0eb7c3ac4..2028756a946 100644 --- a/devel/hs-tagged/files/patch-tagged.cabal +++ b/devel/hs-tagged/files/patch-tagged.cabal @@ -5,7 +5,7 @@ if impl(ghc>=7.6) exposed-modules: Data.Proxy.TH - build-depends: template-haskell >= 2.8 && < 2.12 -+ build-depends: template-haskell >= 2.8 && < 2.13 ++ build-depends: template-haskell >= 2.8 && < 2.14 if flag(deepseq) build-depends: deepseq >= 1.1 && < 1.5 diff --git a/devel/hs-temporary/Makefile b/devel/hs-temporary/Makefile index 745176b4b5b..a7925f7d478 100644 --- a/devel/hs-temporary/Makefile +++ b/devel/hs-temporary/Makefile @@ -2,7 +2,7 @@ PORTNAME= temporary PORTVERSION= 1.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-terminal-size/Makefile b/devel/hs-terminal-size/Makefile index 196f5f11820..b0e235b2144 100644 --- a/devel/hs-terminal-size/Makefile +++ b/devel/hs-terminal-size/Makefile @@ -2,7 +2,7 @@ PORTNAME= terminal-size PORTVERSION= 0.3.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-test-framework-hunit/Makefile b/devel/hs-test-framework-hunit/Makefile index 7329c459e08..f3657641421 100644 --- a/devel/hs-test-framework-hunit/Makefile +++ b/devel/hs-test-framework-hunit/Makefile @@ -2,7 +2,7 @@ PORTNAME= test-framework-hunit PORTVERSION= 0.3.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-test-framework-quickcheck2/Makefile b/devel/hs-test-framework-quickcheck2/Makefile index 71adbc08b3e..3e938f070a8 100644 --- a/devel/hs-test-framework-quickcheck2/Makefile +++ b/devel/hs-test-framework-quickcheck2/Makefile @@ -2,7 +2,7 @@ PORTNAME= test-framework-quickcheck2 PORTVERSION= 0.3.0.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-test-framework/Makefile b/devel/hs-test-framework/Makefile index 575ea9fdf39..92c70f243dc 100644 --- a/devel/hs-test-framework/Makefile +++ b/devel/hs-test-framework/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= test-framework -PORTVERSION= 0.8.1.1 -PORTREVISION= 2 +PORTVERSION= 0.8.2.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-test-framework/distinfo b/devel/hs-test-framework/distinfo index c3edb1f25d5..4db6c80e911 100644 --- a/devel/hs-test-framework/distinfo +++ b/devel/hs-test-framework/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627859 -SHA256 (cabal/test-framework-0.8.1.1.tar.gz) = 7883626a5aebb1df327bf26dbd382208946250a79f9cc3bf9a9eb0b0767bb273 -SIZE (cabal/test-framework-0.8.1.1.tar.gz) = 20900 +TIMESTAMP = 1523960922 +SHA256 (cabal/test-framework-0.8.2.0.tar.gz) = f5aec7a15dbcb39e951bcf6502606fd99d751197b5510f41706899aa7e660ac2 +SIZE (cabal/test-framework-0.8.2.0.tar.gz) = 21317 diff --git a/devel/hs-test-framework/files/patch-test-framework.cabal b/devel/hs-test-framework/files/patch-test-framework.cabal deleted file mode 100644 index 9f4db483b1d..00000000000 --- a/devel/hs-test-framework/files/patch-test-framework.cabal +++ /dev/null @@ -1,11 +0,0 @@ ---- test-framework.cabal.orig 2017-07-08 19:34:13 UTC -+++ test-framework.cabal -@@ -50,7 +50,7 @@ Library - base >= 4.3 && < 5, random >= 1.0, containers >= 0.1, - regex-posix >= 0.72, - old-locale >= 1.0, -- time >= 1.1.2 && < 1.6, -+ time >= 1.1.2 && < 1.7, - xml >= 1.3.5, hostname >= 1.0 - - Extensions: CPP diff --git a/devel/hs-text-icu/Makefile b/devel/hs-text-icu/Makefile index 9011e34f245..7fb721bc711 100644 --- a/devel/hs-text-icu/Makefile +++ b/devel/hs-text-icu/Makefile @@ -2,7 +2,7 @@ PORTNAME= text-icu PORTVERSION= 0.7.0.1 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,8 +10,6 @@ COMMENT= Bindings to the ICU library LICENSE= BSD3CLAUSE -USE_CABAL= text>=0.9.1.0 - LIB_DEPENDS+= libicui18n.so:devel/icu .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" diff --git a/devel/hs-text-short/Makefile b/devel/hs-text-short/Makefile index 1fc7f094220..bdd351dd033 100644 --- a/devel/hs-text-short/Makefile +++ b/devel/hs-text-short/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= text-short -PORTVERSION= 0.1 -PORTREVISION= 1 +PORTVERSION= 0.1.2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= This package provides the ShortText type which is suitable for keeping LICENSE= BSD3CLAUSE -USE_CABAL= hashable semigroups text +USE_CABAL= hashable semigroups .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-text-short/distinfo b/devel/hs-text-short/distinfo index 061c1b8f838..5243b094f92 100644 --- a/devel/hs-text-short/distinfo +++ b/devel/hs-text-short/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499546701 -SHA256 (cabal/text-short-0.1.tar.gz) = c06af3e53c345fa50df8e30589d854c84d212787eba648e6ded9b794e0df937e -SIZE (cabal/text-short-0.1.tar.gz) = 6048 +TIMESTAMP = 1523958157 +SHA256 (cabal/text-short-0.1.2.tar.gz) = b3f2b867d14c7c2586ea580028606b6662293ad080726d5241def937e5e31167 +SIZE (cabal/text-short-0.1.2.tar.gz) = 23454 diff --git a/devel/hs-text/distinfo b/devel/hs-text/distinfo deleted file mode 100644 index 2be66835e56..00000000000 --- a/devel/hs-text/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1499546607 -SHA256 (cabal/text-1.2.2.2.tar.gz) = 31465106360a7d7e214d96f1d1b4303a113ffce1bde44a4e614053a1e5072df9 -SIZE (cabal/text-1.2.2.2.tar.gz) = 151048 diff --git a/devel/hs-text/pkg-descr b/devel/hs-text/pkg-descr deleted file mode 100644 index a910cc70fda..00000000000 --- a/devel/hs-text/pkg-descr +++ /dev/null @@ -1,16 +0,0 @@ -An efficient packed, immutable Unicode text type (both strict and lazy), -with a powerful loop fusion optimization framework. - -The Text type represents Unicode character strings, in a time and -space-efficient manner. This package provides text processing -capabilities that are optimized for performance critical use, both in -terms of large data quantities and high speed. - -The Text type provides character-encoding, type-safe case conversion via -whole-string case conversion functions. It also provides a range of -functions for converting Text values to and from ByteStrings, using -several standard encodings. - -Efficient locale-sensitive support for text IO is also supported. - -WWW: https://github.com/bos/text diff --git a/devel/hs-tf-random/Makefile b/devel/hs-tf-random/Makefile index 160021d1273..ae0c824f333 100644 --- a/devel/hs-tf-random/Makefile +++ b/devel/hs-tf-random/Makefile @@ -2,7 +2,7 @@ PORTNAME= tf-random PORTVERSION= 0.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-th-abstraction/Makefile b/devel/hs-th-abstraction/Makefile index 345e3f85672..7fde8265a51 100644 --- a/devel/hs-th-abstraction/Makefile +++ b/devel/hs-th-abstraction/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= th-abstraction -PORTVERSION= 0.2.3.0 -PORTREVISION= 1 +PORTVERSION= 0.2.6.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-th-abstraction/distinfo b/devel/hs-th-abstraction/distinfo index 7ba65f2abd8..70bd629dfda 100644 --- a/devel/hs-th-abstraction/distinfo +++ b/devel/hs-th-abstraction/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499694293 -SHA256 (cabal/th-abstraction-0.2.3.0.tar.gz) = 954bf25a4d558242970b2085333b2fb8811d2a926354a5d237a2db9c0718de03 -SIZE (cabal/th-abstraction-0.2.3.0.tar.gz) = 22183 +TIMESTAMP = 1523446140 +SHA256 (cabal/th-abstraction-0.2.6.0.tar.gz) = e52e289a547d68f203d65f2e63ec2d87a3c613007d2fe873615c0969b981823c +SIZE (cabal/th-abstraction-0.2.6.0.tar.gz) = 23406 diff --git a/devel/hs-th-abstraction/files/patch-th-abstraction.cabal b/devel/hs-th-abstraction/files/patch-th-abstraction.cabal new file mode 100644 index 00000000000..02a07dfac45 --- /dev/null +++ b/devel/hs-th-abstraction/files/patch-th-abstraction.cabal @@ -0,0 +1,11 @@ +--- th-abstraction.cabal.orig 2018-04-11 11:32:45 UTC ++++ th-abstraction.cabal +@@ -28,7 +28,7 @@ library + other-modules: Language.Haskell.TH.Datatype.Internal + build-depends: base >=4.3 && <5, + ghc-prim, +- template-haskell >=2.5 && <2.13, ++ template-haskell >=2.5 && <2.14, + containers >=0.4 && <0.6 + hs-source-dirs: src + default-language: Haskell2010 diff --git a/devel/hs-th-expand-syns/Makefile b/devel/hs-th-expand-syns/Makefile new file mode 100644 index 00000000000..6541c199668 --- /dev/null +++ b/devel/hs-th-expand-syns/Makefile @@ -0,0 +1,15 @@ +# $FreeBSD$ + +PORTNAME= th-expand-syns +PORTVERSION= 0.4.4.0 +CATEGORIES= devel haskell + +MAINTAINER= haskell@FreeBSD.org +COMMENT= Expands type synonyms in Template Haskell ASTs + +LICENSE= BSD3CLAUSE + +USE_CABAL= syb + +.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" +.include diff --git a/devel/hs-th-expand-syns/distinfo b/devel/hs-th-expand-syns/distinfo new file mode 100644 index 00000000000..f1617f14ca1 --- /dev/null +++ b/devel/hs-th-expand-syns/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1524931602 +SHA256 (cabal/th-expand-syns-0.4.4.0.tar.gz) = cc0f52d1364ace9ba56f51afd9106a5fe01ed3f5ae45c958c1b0f83be0a6f906 +SIZE (cabal/th-expand-syns-0.4.4.0.tar.gz) = 7572 diff --git a/devel/hs-th-expand-syns/pkg-descr b/devel/hs-th-expand-syns/pkg-descr new file mode 100644 index 00000000000..8fbca9bebe3 --- /dev/null +++ b/devel/hs-th-expand-syns/pkg-descr @@ -0,0 +1,3 @@ +Expands type synonyms in Template Haskell ASTs. + +WWW: https://github.com/DanielSchuessler/th-expand-syns diff --git a/devel/hs-th-lift-instances/Makefile b/devel/hs-th-lift-instances/Makefile index 2a33d30e479..9fdeab72719 100644 --- a/devel/hs-th-lift-instances/Makefile +++ b/devel/hs-th-lift-instances/Makefile @@ -2,7 +2,7 @@ PORTNAME= th-lift-instances PORTVERSION= 0.1.11 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,7 @@ COMMENT= Some more Lift instances for common haskell data types LICENSE= BSD3CLAUSE -USE_CABAL= text th-lift vector +USE_CABAL= th-lift vector .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-th-lift/Makefile b/devel/hs-th-lift/Makefile index d683e253413..8f1fa17c721 100644 --- a/devel/hs-th-lift/Makefile +++ b/devel/hs-th-lift/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= th-lift -PORTVERSION= 0.7.7 -PORTREVISION= 1 +PORTVERSION= 0.7.8 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-th-lift/distinfo b/devel/hs-th-lift/distinfo index c50cacb6471..b0a656d79cb 100644 --- a/devel/hs-th-lift/distinfo +++ b/devel/hs-th-lift/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499621822 -SHA256 (cabal/th-lift-0.7.7.tar.gz) = 16c6fa6fbe972fa0d850698c147cd9a30dc0e201554d9a4ee9ade62dc807cbb5 -SIZE (cabal/th-lift-0.7.7.tar.gz) = 12399 +TIMESTAMP = 1523429375 +SHA256 (cabal/th-lift-0.7.8.tar.gz) = 2cf83385e848d9136a1d6e49ca845fd1d09935f2ff658c6f4e268d8ece02c12b +SIZE (cabal/th-lift-0.7.8.tar.gz) = 12399 diff --git a/devel/hs-th-orphans/Makefile b/devel/hs-th-orphans/Makefile new file mode 100644 index 00000000000..a4c3dfd06e3 --- /dev/null +++ b/devel/hs-th-orphans/Makefile @@ -0,0 +1,15 @@ +# $FreeBSD$ + +PORTNAME= th-orphans +PORTVERSION= 0.13.5 +CATEGORIES= devel haskell + +MAINTAINER= haskell@FreeBSD.org +COMMENT= Orphan instances for TH datatypes + +LICENSE= BSD3CLAUSE + +USE_CABAL= th-lift th-lift-instances th-reify-many + +.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" +.include diff --git a/devel/hs-th-orphans/distinfo b/devel/hs-th-orphans/distinfo new file mode 100644 index 00000000000..6e704d3dbc0 --- /dev/null +++ b/devel/hs-th-orphans/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1524930811 +SHA256 (cabal/th-orphans-0.13.5.tar.gz) = 95644d4b7914317e1dd31095947b8371f1a18be0c09e75f0e29203eb774a25ad +SIZE (cabal/th-orphans-0.13.5.tar.gz) = 6675 diff --git a/devel/hs-th-orphans/pkg-descr b/devel/hs-th-orphans/pkg-descr new file mode 100644 index 00000000000..2e5b8b9f51f --- /dev/null +++ b/devel/hs-th-orphans/pkg-descr @@ -0,0 +1,5 @@ +Orphan instances for TH datatypes. In particular, instances for Ord and Lift, +as well as a few missing Show / Eq. These instances used to live in +haskell-src-meta, and that's where the version number started. + +WWW: https://github.com/mgsloan/th-orphans/ diff --git a/devel/hs-th-reify-many/Makefile b/devel/hs-th-reify-many/Makefile new file mode 100644 index 00000000000..1f2706e8e35 --- /dev/null +++ b/devel/hs-th-reify-many/Makefile @@ -0,0 +1,15 @@ +# $FreeBSD$ + +PORTNAME= th-reify-many +PORTVERSION= 0.1.8 +CATEGORIES= devel haskell + +MAINTAINER= haskell@FreeBSD.org +COMMENT= Recurseively reify template haskell datatype info + +LICENSE= BSD3CLAUSE + +USE_CABAL= safe th-expand-syns + +.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" +.include diff --git a/devel/hs-th-reify-many/distinfo b/devel/hs-th-reify-many/distinfo new file mode 100644 index 00000000000..e333842e436 --- /dev/null +++ b/devel/hs-th-reify-many/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1524931291 +SHA256 (cabal/th-reify-many-0.1.8.tar.gz) = cecaae187df911de515d08929e1394d6d6f7ce129795be8189a6b10d3734fe43 +SIZE (cabal/th-reify-many-0.1.8.tar.gz) = 5663 diff --git a/devel/hs-th-reify-many/pkg-descr b/devel/hs-th-reify-many/pkg-descr new file mode 100644 index 00000000000..415ef672d00 --- /dev/null +++ b/devel/hs-th-reify-many/pkg-descr @@ -0,0 +1,6 @@ +th-reify-many provides functions for recursively reifying top level declarations. +The main intended use case is for enumerating the names of datatypes reachable +from an initial datatype, and passing these names to some function which +generates instances. + +WWW: http://github.com/mgsloan/th-reify-many diff --git a/devel/hs-threads/Makefile b/devel/hs-threads/Makefile index b2b4ae3971a..e1a3b771f3d 100644 --- a/devel/hs-threads/Makefile +++ b/devel/hs-threads/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= threads -PORTVERSION= 0.5.1.4 +PORTVERSION= 0.5.1.6 PORTREVISION= 1 CATEGORIES= devel haskell @@ -10,7 +10,5 @@ COMMENT= Fork threads and wait for their result LICENSE= BSD3CLAUSE -USE_CABAL= stm>=2.1 - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-threads/distinfo b/devel/hs-threads/distinfo index 32a63654f91..31ea527b775 100644 --- a/devel/hs-threads/distinfo +++ b/devel/hs-threads/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499447395 -SHA256 (cabal/threads-0.5.1.4.tar.gz) = d3b805b743cc7c0bce2a9b142f45bb1ad07e7bd6c2bd97a5fc442c007276febd -SIZE (cabal/threads-0.5.1.4.tar.gz) = 7395 +TIMESTAMP = 1523649637 +SHA256 (cabal/threads-0.5.1.6.tar.gz) = 139ac3c067fcbb392b5b9c2feaa98184b75ebe7f2e580726eea6ce812d94562e +SIZE (cabal/threads-0.5.1.6.tar.gz) = 7406 diff --git a/devel/hs-threadscope/Makefile b/devel/hs-threadscope/Makefile index 6a2cd6d3f7c..ece35926ec6 100644 --- a/devel/hs-threadscope/Makefile +++ b/devel/hs-threadscope/Makefile @@ -2,7 +2,7 @@ PORTNAME= threadscope PORTVERSION= 0.2.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,11 +10,13 @@ COMMENT= Graphical tool for profiling parallel Haskell programs LICENSE= BSD3CLAUSE -USE_CABAL= cairo ghc-events glib gtk mtl pango text +USE_CABAL= cairo ghc-events glib gtk mtl pango EXECUTABLE= threadscope STANDALONE= yes +IGNORE= Doesn't build with recent GHC version + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-time-compat/Makefile b/devel/hs-time-compat/Makefile index 607b820fa0c..d6cec6b23c2 100644 --- a/devel/hs-time-compat/Makefile +++ b/devel/hs-time-compat/Makefile @@ -2,7 +2,7 @@ PORTNAME= time-compat PORTVERSION= 0.1.0.3 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-time-locale-compat/Makefile b/devel/hs-time-locale-compat/Makefile index 09480120c9e..63370b1ebf5 100644 --- a/devel/hs-time-locale-compat/Makefile +++ b/devel/hs-time-locale-compat/Makefile @@ -2,7 +2,7 @@ PORTNAME= time-locale-compat PORTVERSION= 0.1.1.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-timezone-olson/Makefile b/devel/hs-timezone-olson/Makefile index 7be294799ab..9684786da89 100644 --- a/devel/hs-timezone-olson/Makefile +++ b/devel/hs-timezone-olson/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= timezone-olson -PORTVERSION= 0.1.8 -PORTREVISION= 1 +PORTVERSION= 0.1.9 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-timezone-olson/distinfo b/devel/hs-timezone-olson/distinfo index ba5547e3d00..49fecb1ded4 100644 --- a/devel/hs-timezone-olson/distinfo +++ b/devel/hs-timezone-olson/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499450481 -SHA256 (cabal/timezone-olson-0.1.8.tar.gz) = b96b01015ae5191a56d6bbdbbc3d084f0afb9acd72d84c301792f07871dd3747 -SIZE (cabal/timezone-olson-0.1.8.tar.gz) = 11356 +TIMESTAMP = 1524157973 +SHA256 (cabal/timezone-olson-0.1.9.tar.gz) = 32230509029bcf9e1bd95b5ad7ee69b8b0250cffc4bb8f2df88a651b3af74b15 +SIZE (cabal/timezone-olson-0.1.9.tar.gz) = 11471 diff --git a/devel/hs-timezone-series/Makefile b/devel/hs-timezone-series/Makefile index 0eac6e99a4c..218cab60300 100644 --- a/devel/hs-timezone-series/Makefile +++ b/devel/hs-timezone-series/Makefile @@ -2,7 +2,7 @@ PORTNAME= timezone-series PORTVERSION= 0.1.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-transformers-base/Makefile b/devel/hs-transformers-base/Makefile index 82b0c59ce9d..668b3447894 100644 --- a/devel/hs-transformers-base/Makefile +++ b/devel/hs-transformers-base/Makefile @@ -2,7 +2,7 @@ PORTNAME= transformers-base PORTVERSION= 0.4.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,7 @@ COMMENT= Lift computations from the bottom of a transformer stack LICENSE= BSD3CLAUSE -USE_CABAL= stm>=2.3 transformers-compat>=0.2 +USE_CABAL= transformers-compat>=0.2 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-transformers-compat/Makefile b/devel/hs-transformers-compat/Makefile index 688513ed7e8..8d6c5ff4268 100644 --- a/devel/hs-transformers-compat/Makefile +++ b/devel/hs-transformers-compat/Makefile @@ -2,7 +2,7 @@ PORTNAME= transformers-compat PORTVERSION= 0.5.1.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-typed-process/Makefile b/devel/hs-typed-process/Makefile index 044421e9dc7..dbb0879f1fc 100644 --- a/devel/hs-typed-process/Makefile +++ b/devel/hs-typed-process/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= typed-process -PORTVERSION= 0.1.0.0 +PORTVERSION= 0.2.2.0 PORTREVISION= 1 CATEGORIES= devel haskell @@ -10,7 +10,7 @@ COMMENT= The typed-process package LICENSE= BSD3CLAUSE -USE_CABAL= async conduit conduit-extra exceptions stm +USE_CABAL= async exceptions .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-typed-process/distinfo b/devel/hs-typed-process/distinfo index 1c4fce06c6c..c846443db72 100644 --- a/devel/hs-typed-process/distinfo +++ b/devel/hs-typed-process/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499720967 -SHA256 (cabal/typed-process-0.1.0.0.tar.gz) = de866bc6ccb3ae3ccce20701add8bd913f7d7b4e252a9133eac35d035d0a10f8 -SIZE (cabal/typed-process-0.1.0.0.tar.gz) = 12886 +TIMESTAMP = 1523897812 +SHA256 (cabal/typed-process-0.2.2.0.tar.gz) = 42ed06889c15aa07577a0e8e3632659e343be95b77afa252b48b592ff7dbcf30 +SIZE (cabal/typed-process-0.2.2.0.tar.gz) = 13890 diff --git a/devel/hs-unamb/Makefile b/devel/hs-unamb/Makefile index 8e0bd75d30f..ee9b5d60e5a 100644 --- a/devel/hs-unamb/Makefile +++ b/devel/hs-unamb/Makefile @@ -3,7 +3,7 @@ PORTNAME= unamb PORTVERSION= 0.2.5 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-unexceptionalio/Makefile b/devel/hs-unexceptionalio/Makefile index f8fab4b1628..53200d00782 100644 --- a/devel/hs-unexceptionalio/Makefile +++ b/devel/hs-unexceptionalio/Makefile @@ -2,7 +2,7 @@ PORTNAME= unexceptionalio PORTVERSION= 0.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-stm/Makefile b/devel/hs-unicode-show/Makefile similarity index 64% rename from devel/hs-stm/Makefile rename to devel/hs-unicode-show/Makefile index dd8098384d1..c33f1e43220 100644 --- a/devel/hs-stm/Makefile +++ b/devel/hs-unicode-show/Makefile @@ -1,12 +1,11 @@ # $FreeBSD$ -PORTNAME= stm -PORTVERSION= 2.4.4.1 -PORTREVISION= 1 +PORTNAME= unicode-show +PORTVERSION= 0.1.0.2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org -COMMENT= Software Transactional Memory +COMMENT= Print and show in unicode LICENSE= BSD3CLAUSE diff --git a/devel/hs-unicode-show/distinfo b/devel/hs-unicode-show/distinfo new file mode 100644 index 00000000000..e04ae2169fa --- /dev/null +++ b/devel/hs-unicode-show/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1525760473 +SHA256 (cabal/unicode-show-0.1.0.2.tar.gz) = 7ee394879b345ee397aef87ca058628cd79d59cbfc1cec81aeda7fea65f53943 +SIZE (cabal/unicode-show-0.1.0.2.tar.gz) = 4303 diff --git a/devel/hs-unicode-show/pkg-descr b/devel/hs-unicode-show/pkg-descr new file mode 100644 index 00000000000..846ba6325f3 --- /dev/null +++ b/devel/hs-unicode-show/pkg-descr @@ -0,0 +1,4 @@ +This package provides variants of show and print functions that does not +escape non-ascii characters. + +WWW: https://github.com/nushio3/unicode-show diff --git a/devel/hs-uniplate/Makefile b/devel/hs-uniplate/Makefile index 8b840ffdb1d..99c27a1e05a 100644 --- a/devel/hs-uniplate/Makefile +++ b/devel/hs-uniplate/Makefile @@ -3,7 +3,7 @@ PORTNAME= uniplate PORTVERSION= 1.6.12 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-unix-compat/Makefile b/devel/hs-unix-compat/Makefile index e5f170e3bf0..423ed68a89e 100644 --- a/devel/hs-unix-compat/Makefile +++ b/devel/hs-unix-compat/Makefile @@ -3,7 +3,7 @@ PORTNAME= unix-compat PORTVERSION= 0.4.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-unix-time/Makefile b/devel/hs-unix-time/Makefile index 44182a82c4e..0a51a24cf6d 100644 --- a/devel/hs-unix-time/Makefile +++ b/devel/hs-unix-time/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= unix-time -PORTVERSION= 0.3.7 -PORTREVISION= 1 +PORTVERSION= 0.3.8 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-unix-time/distinfo b/devel/hs-unix-time/distinfo index d59e5ce39ab..e93e4344f10 100644 --- a/devel/hs-unix-time/distinfo +++ b/devel/hs-unix-time/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627862 -SHA256 (cabal/unix-time-0.3.7.tar.gz) = 1131301131dd3e73353a346daa04578ec067073e7674d447051ac1a87262b4e1 -SIZE (cabal/unix-time-0.3.7.tar.gz) = 40549 +TIMESTAMP = 1523432893 +SHA256 (cabal/unix-time-0.3.8.tar.gz) = dca1bd332f4690f667570868c91c1270083428067e0e20b88a9d9516efa33a14 +SIZE (cabal/unix-time-0.3.8.tar.gz) = 40672 diff --git a/devel/hs-unliftio-core/Makefile b/devel/hs-unliftio-core/Makefile new file mode 100644 index 00000000000..10c2a69aa89 --- /dev/null +++ b/devel/hs-unliftio-core/Makefile @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTNAME= unliftio-core +PORTVERSION= 0.1.1.0 +CATEGORIES= devel haskell + +MAINTAINER= haskell@FreeBSD.org +COMMENT= MonadUnliftIO typeclass for unlifting monads to IO + +LICENSE= BSD3CLAUSE + +.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" +.include diff --git a/devel/hs-unliftio-core/distinfo b/devel/hs-unliftio-core/distinfo new file mode 100644 index 00000000000..61cddb74899 --- /dev/null +++ b/devel/hs-unliftio-core/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1523697342 +SHA256 (cabal/unliftio-core-0.1.1.0.tar.gz) = 7550b017d87af53ae3e0d3b8524e24a77faf739073f35e40663454a9e9752385 +SIZE (cabal/unliftio-core-0.1.1.0.tar.gz) = 3293 diff --git a/devel/hs-unliftio-core/files/patch-unliftio-core.cabal b/devel/hs-unliftio-core/files/patch-unliftio-core.cabal new file mode 100644 index 00000000000..6dd96c3ebaa --- /dev/null +++ b/devel/hs-unliftio-core/files/patch-unliftio-core.cabal @@ -0,0 +1,11 @@ +--- unliftio-core.cabal.orig 2018-04-14 09:20:34 UTC ++++ unliftio-core.cabal +@@ -26,7 +26,7 @@ library + hs-source-dirs: + src + build-depends: +- base >=4.5 && <4.11 ++ base >=4.5 && <4.12 + , transformers >=0.2 && <0.6 + exposed-modules: + Control.Monad.IO.Unlift diff --git a/devel/hs-unliftio-core/pkg-descr b/devel/hs-unliftio-core/pkg-descr new file mode 100644 index 00000000000..35faf383fe9 --- /dev/null +++ b/devel/hs-unliftio-core/pkg-descr @@ -0,0 +1,4 @@ +Provides the core MonadUnliftIO typeclass, instances for base +and transformers, and basic utility functions. + +WWW: https://github.com/fpco/unliftio diff --git a/devel/hs-unliftio/Makefile b/devel/hs-unliftio/Makefile new file mode 100644 index 00000000000..b8f95301b71 --- /dev/null +++ b/devel/hs-unliftio/Makefile @@ -0,0 +1,15 @@ +# $FreeBSD$ + +PORTNAME= unliftio +PORTVERSION= 0.2.6.0 +CATEGORIES= devel haskell + +MAINTAINER= haskell@FreeBSD.org +COMMENT= MonadUnliftIO typeclass for unlifting monads to IO + +LICENSE= BSD3CLAUSE + +USE_CABAL= async unliftio-core + +.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" +.include diff --git a/devel/hs-unliftio/distinfo b/devel/hs-unliftio/distinfo new file mode 100644 index 00000000000..1e358d9455c --- /dev/null +++ b/devel/hs-unliftio/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1523902179 +SHA256 (cabal/unliftio-0.2.6.0.tar.gz) = f87d5b6fa7f1bdb2d47e91c30411a3a878bc281a1259fc23abe146d1c4a4b366 +SIZE (cabal/unliftio-0.2.6.0.tar.gz) = 28311 diff --git a/devel/hs-unliftio/pkg-descr b/devel/hs-unliftio/pkg-descr new file mode 100644 index 00000000000..35faf383fe9 --- /dev/null +++ b/devel/hs-unliftio/pkg-descr @@ -0,0 +1,4 @@ +Provides the core MonadUnliftIO typeclass, instances for base +and transformers, and basic utility functions. + +WWW: https://github.com/fpco/unliftio diff --git a/devel/hs-unordered-containers/Makefile b/devel/hs-unordered-containers/Makefile index 28d738e1d08..ff65b9a2f2a 100644 --- a/devel/hs-unordered-containers/Makefile +++ b/devel/hs-unordered-containers/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= unordered-containers -PORTVERSION= 0.2.8.0 -PORTREVISION= 1 +PORTVERSION= 0.2.9.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-unordered-containers/distinfo b/devel/hs-unordered-containers/distinfo index a571c53c549..7668e58effe 100644 --- a/devel/hs-unordered-containers/distinfo +++ b/devel/hs-unordered-containers/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499596921 -SHA256 (cabal/unordered-containers-0.2.8.0.tar.gz) = a4a188359ff28640359131061953f7dbb8258da8ecf0542db0d23f08bfa6eea8 -SIZE (cabal/unordered-containers-0.2.8.0.tar.gz) = 31824 +TIMESTAMP = 1523375916 +SHA256 (cabal/unordered-containers-0.2.9.0.tar.gz) = 6730cb5c4a3e953e2c199d6425be08fd088ff0089a3e140d63226c052e318250 +SIZE (cabal/unordered-containers-0.2.9.0.tar.gz) = 33098 diff --git a/devel/hs-utf8-light/Makefile b/devel/hs-utf8-light/Makefile index e5b45bb6641..661d72dfe81 100644 --- a/devel/hs-utf8-light/Makefile +++ b/devel/hs-utf8-light/Makefile @@ -2,7 +2,7 @@ PORTNAME= utf8-light PORTVERSION= 0.4.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-utf8-string/Makefile b/devel/hs-utf8-string/Makefile index 19981965a71..bee0680557b 100644 --- a/devel/hs-utf8-string/Makefile +++ b/devel/hs-utf8-string/Makefile @@ -2,7 +2,7 @@ PORTNAME= utf8-string PORTVERSION= 1.0.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-utility-ht/Makefile b/devel/hs-utility-ht/Makefile index 96bde57f681..64cb6603535 100644 --- a/devel/hs-utility-ht/Makefile +++ b/devel/hs-utility-ht/Makefile @@ -3,7 +3,7 @@ PORTNAME= utility-ht PORTVERSION= 0.0.14 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-uuagc-bootstrap/Makefile b/devel/hs-uuagc-bootstrap/Makefile index a2de8becf4e..e8e1b04a7fe 100644 --- a/devel/hs-uuagc-bootstrap/Makefile +++ b/devel/hs-uuagc-bootstrap/Makefile @@ -2,7 +2,7 @@ PORTNAME= uuagc-bootstrap PORTVERSION= 0.9.40.2 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-uuagc-cabal/Makefile b/devel/hs-uuagc-cabal/Makefile index 52f2acb0774..40f24a0f457 100644 --- a/devel/hs-uuagc-cabal/Makefile +++ b/devel/hs-uuagc-cabal/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= uuagc-cabal -PORTVERSION= 1.0.6.0 -PORTREVISION= 2 +PORTVERSION= 1.1.0.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-uuagc-cabal/distinfo b/devel/hs-uuagc-cabal/distinfo index b34ca2b703e..29b9ce2adb1 100644 --- a/devel/hs-uuagc-cabal/distinfo +++ b/devel/hs-uuagc-cabal/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627863 -SHA256 (cabal/uuagc-cabal-1.0.6.0.tar.gz) = dcc87f9e738cbd5228e91f433b69ac540ab1f109c522da290539c2f33791b80b -SIZE (cabal/uuagc-cabal-1.0.6.0.tar.gz) = 14781 +TIMESTAMP = 1523959204 +SHA256 (cabal/uuagc-cabal-1.1.0.0.tar.gz) = f2d3daccab5082165c6621852cc555f530adac90220f57dd13c724bd5acfbb2d +SIZE (cabal/uuagc-cabal-1.1.0.0.tar.gz) = 14924 diff --git a/devel/hs-uuagc/Makefile b/devel/hs-uuagc/Makefile index 0e45ff28cc7..adbea0182ed 100644 --- a/devel/hs-uuagc/Makefile +++ b/devel/hs-uuagc/Makefile @@ -3,7 +3,7 @@ PORTNAME= uuagc PORTVERSION= 0.9.52.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-uuid-types/Makefile b/devel/hs-uuid-types/Makefile index c9904ff8656..9c034d9373d 100644 --- a/devel/hs-uuid-types/Makefile +++ b/devel/hs-uuid-types/Makefile @@ -2,7 +2,7 @@ PORTNAME= uuid-types PORTVERSION= 1.0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,7 @@ COMMENT= Type definitions for Universally Unique Identifiers LICENSE= BSD3CLAUSE -USE_CABAL= hashable>=1.1.1.0 random>=1.0.1 text>=1 +USE_CABAL= hashable>=1.1.1.0 random>=1.0.1 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-uuid/Makefile b/devel/hs-uuid/Makefile index 70ab8f393d6..1aed01d8094 100644 --- a/devel/hs-uuid/Makefile +++ b/devel/hs-uuid/Makefile @@ -2,7 +2,7 @@ PORTNAME= uuid PORTVERSION= 1.3.13 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,7 @@ COMMENT= Creating, comparing, parsing and printing Universally Unique Identifier LICENSE= BSD3CLAUSE USE_CABAL= cryptohash-md5 cryptohash-sha1 entropy network-info random \ - text uuid-types + uuid-types .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-uuid/files/patch-uuid.cabal b/devel/hs-uuid/files/patch-uuid.cabal new file mode 100644 index 00000000000..673d36c51cb --- /dev/null +++ b/devel/hs-uuid/files/patch-uuid.cabal @@ -0,0 +1,10 @@ +--- uuid.cabal.orig 2018-04-29 12:00:18 UTC ++++ uuid.cabal +@@ -37,7 +37,7 @@ Library + entropy >= 0.3.7 && < 0.4, + network-info == 0.2.*, + random >= 1.0.1 && < 1.2, +- time >= 1.1 && < 1.8, ++ time >= 1.1 && < 1.9, + text >= 1 && < 1.3, + uuid-types >= 1.0.2 && < 2 diff --git a/devel/hs-uulib/Makefile b/devel/hs-uulib/Makefile index b26bba0a137..5cdeb419e93 100644 --- a/devel/hs-uulib/Makefile +++ b/devel/hs-uulib/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= uulib -PORTVERSION= 0.9.22 -PORTREVISION= 1 +PORTVERSION= 0.9.23 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-uulib/distinfo b/devel/hs-uulib/distinfo index 5f00cf1175b..916b59a6787 100644 --- a/devel/hs-uulib/distinfo +++ b/devel/hs-uulib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627863 -SHA256 (cabal/uulib-0.9.22.tar.gz) = cdd0a15d33834e367e2b9d9a6b78cb17e1947e31c7d2d26344a144bf3ab131ad -SIZE (cabal/uulib-0.9.22.tar.gz) = 45487 +TIMESTAMP = 1523470473 +SHA256 (cabal/uulib-0.9.23.tar.gz) = c6fb906d2751c5a5c0839a4eaca62f2987ff8e0857146b8643cccff683e72fed +SIZE (cabal/uulib-0.9.23.tar.gz) = 45287 diff --git a/devel/hs-uulib/files/patch-src_UU_PPrint.hs b/devel/hs-uulib/files/patch-src_UU_PPrint.hs new file mode 100644 index 00000000000..e874d9d8bc2 --- /dev/null +++ b/devel/hs-uulib/files/patch-src_UU_PPrint.hs @@ -0,0 +1,11 @@ +--- src/UU/PPrint.hs.orig 2018-04-11 18:54:44 UTC ++++ src/UU/PPrint.hs +@@ -60,7 +60,7 @@ module UU.PPrint + import System.IO (Handle,hPutStr,hPutChar,stdout) + + #if __GLASGOW_HASKELL__ >= 710 +-import Prelude hiding ((<$>)) ++import Prelude hiding ((<$>), (<>)) + #endif + + infixr 5 ,,<$>,<$$> diff --git a/devel/hs-vault/Makefile b/devel/hs-vault/Makefile index cad6ec8b0ca..fa4fcde70cc 100644 --- a/devel/hs-vault/Makefile +++ b/devel/hs-vault/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= vault -PORTVERSION= 0.3.0.7 -PORTREVISION= 1 +PORTVERSION= 0.3.1.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= Persistent store for values of arbitrary types LICENSE= BSD3CLAUSE -USE_CABAL= hashable>=1.1.2.5 unordered-containers>=0.2.3.0 +USE_CABAL= hashable>=1.1.2.5 semigroups unordered-containers>=0.2.3.0 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-vault/distinfo b/devel/hs-vault/distinfo index 886921f34bd..9591f6f4842 100644 --- a/devel/hs-vault/distinfo +++ b/devel/hs-vault/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499458511 -SHA256 (cabal/vault-0.3.0.7.tar.gz) = 9e9189da0821d68fc8f85aab958bbec141635858a7aeb8178e1eec5872a366f0 -SIZE (cabal/vault-0.3.0.7.tar.gz) = 5140 +TIMESTAMP = 1523431307 +SHA256 (cabal/vault-0.3.1.0.tar.gz) = d960a843c3dae1f6073f50e980dcdbbe2e46e9911273c9f122ba96494c4c979f +SIZE (cabal/vault-0.3.1.0.tar.gz) = 5199 diff --git a/devel/hs-vector-algorithms/Makefile b/devel/hs-vector-algorithms/Makefile index 28b3e95f3b0..4d5ebad0548 100644 --- a/devel/hs-vector-algorithms/Makefile +++ b/devel/hs-vector-algorithms/Makefile @@ -2,7 +2,7 @@ PORTNAME= vector-algorithms PORTVERSION= 0.7.0.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-vector-binary-instances/Makefile b/devel/hs-vector-binary-instances/Makefile index 3abd72d7e12..655e61e1eb9 100644 --- a/devel/hs-vector-binary-instances/Makefile +++ b/devel/hs-vector-binary-instances/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= vector-binary-instances -PORTVERSION= 0.2.3.5 -PORTREVISION= 1 +PORTVERSION= 0.2.4 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= Instances of Data.Binary and Data.Serialize for vector LICENSE= BSD3CLAUSE -USE_CABAL= cereal vector>=0.6 +USE_CABAL= vector>=0.6 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-vector-binary-instances/distinfo b/devel/hs-vector-binary-instances/distinfo index 06fbd906551..8dca970e903 100644 --- a/devel/hs-vector-binary-instances/distinfo +++ b/devel/hs-vector-binary-instances/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627864 -SHA256 (cabal/vector-binary-instances-0.2.3.5.tar.gz) = e11255baeca51fb01df28b120ee308802d4e45929e520c8464e3f74513682a5a -SIZE (cabal/vector-binary-instances-0.2.3.5.tar.gz) = 4133 +TIMESTAMP = 1523451213 +SHA256 (cabal/vector-binary-instances-0.2.4.tar.gz) = 2b2f783e414dcf2e7dc34ad14264e5af83e5cd4784d5a0a64e4b4571963443f8 +SIZE (cabal/vector-binary-instances-0.2.4.tar.gz) = 4146 diff --git a/devel/hs-vector-binary-instances/files/patch-vector-binary-instances.cabal b/devel/hs-vector-binary-instances/files/patch-vector-binary-instances.cabal new file mode 100644 index 00000000000..d2dee98a591 --- /dev/null +++ b/devel/hs-vector-binary-instances/files/patch-vector-binary-instances.cabal @@ -0,0 +1,10 @@ +--- vector-binary-instances.cabal.orig 2018-04-11 12:56:40 UTC ++++ vector-binary-instances.cabal +@@ -50,7 +50,7 @@ Library + + -- Packages needed in order to build this package. + Build-depends: +- base > 3 && < 4.11, ++ base > 3 && < 4.12, + vector >= 0.6 && < 0.13, + binary >= 0.5 && < 0.10 diff --git a/devel/hs-vector-instances/Makefile b/devel/hs-vector-instances/Makefile index 3e027108bb7..d528eda7f96 100644 --- a/devel/hs-vector-instances/Makefile +++ b/devel/hs-vector-instances/Makefile @@ -2,7 +2,7 @@ PORTNAME= vector-instances PORTVERSION= 3.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-vector-th-unbox/Makefile b/devel/hs-vector-th-unbox/Makefile index 124099689a3..4331822adc7 100644 --- a/devel/hs-vector-th-unbox/Makefile +++ b/devel/hs-vector-th-unbox/Makefile @@ -2,7 +2,7 @@ PORTNAME= vector-th-unbox PORTVERSION= 0.2.1.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-vector/files/patch-vector.cabal b/devel/hs-vector/files/patch-vector.cabal new file mode 100644 index 00000000000..6d3a2e102e3 --- /dev/null +++ b/devel/hs-vector/files/patch-vector.cabal @@ -0,0 +1,11 @@ +--- vector.cabal.orig 2018-04-09 18:20:35 UTC ++++ vector.cabal +@@ -144,7 +144,7 @@ Library + Install-Includes: + vector.h + +- Build-Depends: base >= 4.5 && < 4.10 ++ Build-Depends: base >= 4.5 && < 4.12 + , primitive >= 0.5.0.1 && < 0.7 + , ghc-prim >= 0.2 && < 0.6 + , deepseq >= 1.1 && < 1.5 diff --git a/devel/hs-void/Makefile b/devel/hs-void/Makefile index 940ebb0d09d..7c6fdef91b6 100644 --- a/devel/hs-void/Makefile +++ b/devel/hs-void/Makefile @@ -2,7 +2,7 @@ PORTNAME= void PORTVERSION= 0.7.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-wl-pprint-text/Makefile b/devel/hs-wl-pprint-text/Makefile index bd62c88b63d..bc8d9ec561b 100644 --- a/devel/hs-wl-pprint-text/Makefile +++ b/devel/hs-wl-pprint-text/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= wl-pprint-text -PORTVERSION= 1.1.1.0 -PORTREVISION= 1 +PORTVERSION= 1.1.1.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= A clone of wl-pprint for use with the text library LICENSE= BSD3CLAUSE -USE_CABAL= base-compat text +USE_CABAL= base-compat .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/devel/hs-wl-pprint-text/distinfo b/devel/hs-wl-pprint-text/distinfo index 096e33a8bb8..0205d08a6bd 100644 --- a/devel/hs-wl-pprint-text/distinfo +++ b/devel/hs-wl-pprint-text/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499543226 -SHA256 (cabal/wl-pprint-text-1.1.1.0.tar.gz) = 2960c8201c05d912a1df748a3ceeadc7525905ff1c371d7b4972f4011eca0acd -SIZE (cabal/wl-pprint-text-1.1.1.0.tar.gz) = 16575 +TIMESTAMP = 1525013982 +SHA256 (cabal/wl-pprint-text-1.1.1.1.tar.gz) = 8bdeeaef7e1f55ba582cd4ea104dcd9346b461da09431f3b366b4522583e42ec +SIZE (cabal/wl-pprint-text-1.1.1.1.tar.gz) = 16621 diff --git a/devel/hs-word8/Makefile b/devel/hs-word8/Makefile index d5de09ca49f..4d46e075eaa 100644 --- a/devel/hs-word8/Makefile +++ b/devel/hs-word8/Makefile @@ -2,7 +2,7 @@ PORTNAME= word8 PORTVERSION= 0.1.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/jenkins/Makefile b/devel/jenkins/Makefile index 84f62f70860..368f17fc8c6 100644 --- a/devel/jenkins/Makefile +++ b/devel/jenkins/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= jenkins -PORTVERSION= 2.122 +PORTVERSION= 2.124 CATEGORIES= devel java MASTER_SITES= http://mirrors.jenkins-ci.org/war/${PORTVERSION}/ DISTNAME= jenkins diff --git a/devel/jenkins/distinfo b/devel/jenkins/distinfo index 490536a258e..8c6c6169f41 100644 --- a/devel/jenkins/distinfo +++ b/devel/jenkins/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1526401594 -SHA256 (jenkins/2.122/jenkins.war) = d2e39ead2d684308e708848671a7997419d06a7bad463212ba9222b6e4dc8ce9 -SIZE (jenkins/2.122/jenkins.war) = 74741090 +TIMESTAMP = 1527239408 +SHA256 (jenkins/2.124/jenkins.war) = 37dbac39974c9affe2b97e20d60607fdaaecb992cfa780caccac19ad8d8226e1 +SIZE (jenkins/2.124/jenkins.war) = 74771300 diff --git a/devel/libappindicator/Makefile b/devel/libappindicator/Makefile index 53da72e6560..a9aa68c7798 100644 --- a/devel/libappindicator/Makefile +++ b/devel/libappindicator/Makefile @@ -11,7 +11,7 @@ COMMENT= KSNI App Indicator library LIB_DEPENDS= libdbusmenu-gtk3.so:devel/libdbusmenu \ libindicator3.so:devel/libindicator -USES= gmake libtool pkgconfig python +USES= gmake libtool pkgconfig python:2.7 USE_LDCONFIG= yes USE_GNOME= gtk30 pygtk2 diff --git a/devel/p5-Class-Generate/Makefile b/devel/p5-Class-Generate/Makefile index e92e679dcc9..d60b2ae0ab2 100644 --- a/devel/p5-Class-Generate/Makefile +++ b/devel/p5-Class-Generate/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Class-Generate -PORTVERSION= 1.15 +PORTVERSION= 1.17 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -15,6 +15,7 @@ LICENSE_COMB= dual TEST_DEPENDS= p5-Text-Soundex>=0:textproc/p5-Text-Soundex +NO_ARCH= yes USES= perl5 USE_PERL5= modbuild diff --git a/devel/p5-Class-Generate/distinfo b/devel/p5-Class-Generate/distinfo index 1cb7ab63b27..dc63ced8037 100644 --- a/devel/p5-Class-Generate/distinfo +++ b/devel/p5-Class-Generate/distinfo @@ -1,2 +1,3 @@ -SHA256 (Class-Generate-1.15.tar.gz) = d8d47cfdae7e797f2c81262b5da8a8b01b4af5bc0d5a1ef8c6e65b5d1b9ecb02 -SIZE (Class-Generate-1.15.tar.gz) = 76362 +TIMESTAMP = 1527234526 +SHA256 (Class-Generate-1.17.tar.gz) = 49ca50dc4ff26678c62e92cc261c1a5cbba6cb43a8789fd8910345fdccd82a3b +SIZE (Class-Generate-1.17.tar.gz) = 67069 diff --git a/devel/p5-Class-Generate/pkg-plist b/devel/p5-Class-Generate/pkg-plist index 80486e2e16e..2c7f0065467 100644 --- a/devel/p5-Class-Generate/pkg-plist +++ b/devel/p5-Class-Generate/pkg-plist @@ -1,3 +1,2 @@ %%SITE_PERL%%/Class/Generate.pm -%%SITE_PERL%%/Class/Generate.pod %%PERL5_MAN3%%/Class::Generate.3.gz diff --git a/devel/p5-Config-INI-Simple/Makefile b/devel/p5-Config-INI-Simple/Makefile index 919928838ca..033be2b2d57 100644 --- a/devel/p5-Config-INI-Simple/Makefile +++ b/devel/p5-Config-INI-Simple/Makefile @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= Config-INI-Simple -PORTVERSION= 0.02 -PORTREVISION= 1 +PORTVERSION= 1.00 CATEGORIES= devel perl5 MASTER_SITES= CPAN +MASTER_SITE_SUBDIR= CPAN:TORG PKGNAMEPREFIX= p5- MAINTAINER= sunpoet@FreeBSD.org @@ -14,6 +14,9 @@ COMMENT= Simple reading and writing from an INI file LICENSE= ART10 GPLv1+ LICENSE_COMB= dual +BUILD_DEPENDS= p5-File-Slurp>=0:devel/p5-File-Slurp +RUN_DEPENDS:= ${BUILD_DEPENDS} + NO_ARCH= yes USE_PERL5= configure USES= perl5 diff --git a/devel/p5-Config-INI-Simple/distinfo b/devel/p5-Config-INI-Simple/distinfo index 0f8a8a9d995..64216ef48e3 100644 --- a/devel/p5-Config-INI-Simple/distinfo +++ b/devel/p5-Config-INI-Simple/distinfo @@ -1,2 +1,3 @@ -SHA256 (Config-INI-Simple-0.02.tar.gz) = 7f9de9fb08f7966182e4a4df96d1cb0abf320d229c41a27152fccfb8d8386ecb -SIZE (Config-INI-Simple-0.02.tar.gz) = 3696 +TIMESTAMP = 1527133140 +SHA256 (Config-INI-Simple-1.00.tar.gz) = 4f6e5ce4b168499d7e863ff4760a45f63eb42e4c3744d3dec39c0730cf1165f8 +SIZE (Config-INI-Simple-1.00.tar.gz) = 2601 diff --git a/devel/p5-Config-INI-Simple/pkg-descr b/devel/p5-Config-INI-Simple/pkg-descr index d4a2486b74e..beaf315ba23 100644 --- a/devel/p5-Config-INI-Simple/pkg-descr +++ b/devel/p5-Config-INI-Simple/pkg-descr @@ -3,4 +3,4 @@ new object must be created for each INI file (an object keeps all the data read in from an INI which is used on the write method to write to the INI). It also keeps all your comments and original order intact. -WWW: http://search.cpan.org/dist/Config-INI-Simple/ +WWW: https://metacpan.org/release/TORG/Config-INI-Simple-1.00 diff --git a/devel/p5-Data-Types/Makefile b/devel/p5-Data-Types/Makefile index 3d1e6503469..435031239b8 100644 --- a/devel/p5-Data-Types/Makefile +++ b/devel/p5-Data-Types/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Data-Types -PORTVERSION= 0.11 +PORTVERSION= 0.13 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -13,6 +13,7 @@ COMMENT= Validate and convert data types LICENSE_COMB= dual LICENSE= ART10 GPLv1+ +NO_ARCH= yes USES= perl5 USE_PERL5= modbuild diff --git a/devel/p5-Data-Types/distinfo b/devel/p5-Data-Types/distinfo index 3fb3d9c1e79..2e7ffca7ac3 100644 --- a/devel/p5-Data-Types/distinfo +++ b/devel/p5-Data-Types/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1527164700 -SHA256 (Data-Types-0.11.tar.gz) = acb08ff66702935d6ffd2e4310a70478c664fd68b4081ef5afd74a8b20330663 -SIZE (Data-Types-0.11.tar.gz) = 8736 +TIMESTAMP = 1527334339 +SHA256 (Data-Types-0.13.tar.gz) = 6be4d1a12387bde7ecc1865ea99952c6b4fb087502245633c3ccf9a869d13a27 +SIZE (Data-Types-0.13.tar.gz) = 7737 diff --git a/devel/p5-Data-Types/pkg-plist b/devel/p5-Data-Types/pkg-plist index 8c4fb98c85b..76069e4600c 100644 --- a/devel/p5-Data-Types/pkg-plist +++ b/devel/p5-Data-Types/pkg-plist @@ -1,2 +1,2 @@ -%%PERL5_MAN3%%/Data::Types.3.gz %%SITE_PERL%%/Data/Types.pm +%%PERL5_MAN3%%/Data::Types.3.gz diff --git a/devel/p5-IO-KQueue/Makefile b/devel/p5-IO-KQueue/Makefile index 5565848c5d4..99f111d9262 100644 --- a/devel/p5-IO-KQueue/Makefile +++ b/devel/p5-IO-KQueue/Makefile @@ -10,13 +10,16 @@ PKGNAMEPREFIX= p5- MAINTAINER= kuriyama@FreeBSD.org COMMENT= Perl interface to the BSD kqueue system call +LICENSE= ART10 GPLv2 +LICENSE_COMB= dual + USES= perl5 USE_PERL5= configure OPTIONS_DEFINE= EXAMPLES -post-install: - ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} +post-install-EXAMPLES-on: + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR} .include diff --git a/devel/p5-System-Info/Makefile b/devel/p5-System-Info/Makefile index 585159fd64d..5ee2195fa3a 100644 --- a/devel/p5-System-Info/Makefile +++ b/devel/p5-System-Info/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= System-Info -PORTVERSION= 0.057 +PORTVERSION= 0.058 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/devel/p5-System-Info/distinfo b/devel/p5-System-Info/distinfo index 14d8b9520ec..2957b7fe508 100644 --- a/devel/p5-System-Info/distinfo +++ b/devel/p5-System-Info/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1524779255 -SHA256 (System-Info-0.057.tgz) = c78fbe99eb77c44a9718c59250dedb742a34e562de038b176eef23ee09494702 -SIZE (System-Info-0.057.tgz) = 40455 +TIMESTAMP = 1527356141 +SHA256 (System-Info-0.058.tgz) = 3f58b7aac859bf451d488d65c304941aa9093abdc6de0e7acdd96f4d50442d1c +SIZE (System-Info-0.058.tgz) = 41617 diff --git a/devel/py-noseofyeti/Makefile b/devel/py-noseofyeti/Makefile index 6f0fa2ac7b6..b3edab68dfa 100644 --- a/devel/py-noseofyeti/Makefile +++ b/devel/py-noseofyeti/Makefile @@ -37,7 +37,7 @@ do-test: cd ${WRKSRC} && ${PYTHON_CMD} test.sh post-build-DOCS-on: - (cd ${WRKSRC}/docs ; PYTHONPATH=${WRKSRC} ${MAKE_CMD} html) + (cd ${WRKSRC}/docs ; PYTHONPATH=${WRKSRC} ${MAKE_CMD} html SPHINXBUILD=sphinx-build-${PYTHON_VER}) post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/devel/py-twilio/Makefile b/devel/py-twilio/Makefile index 5be468a7bc3..f1704735199 100644 --- a/devel/py-twilio/Makefile +++ b/devel/py-twilio/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= twilio -PORTVERSION= 6.14.0 +PORTVERSION= 6.14.3 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-twilio/distinfo b/devel/py-twilio/distinfo index cc8e364a902..e201d32cdae 100644 --- a/devel/py-twilio/distinfo +++ b/devel/py-twilio/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1526150976 -SHA256 (twilio-6.14.0.tar.gz) = 868470a7c6c6b1e44431c307149f92b77b6e152a5a409a7b199b194d17154448 -SIZE (twilio-6.14.0.tar.gz) = 305213 +TIMESTAMP = 1527362605 +SHA256 (twilio-6.14.3.tar.gz) = b1e6ed8871cacdcafb7060ba38801abd70e37d88ad8501305040356971653963 +SIZE (twilio-6.14.3.tar.gz) = 307322 diff --git a/devel/pycharm-ce/Makefile b/devel/pycharm-ce/Makefile index 2fe7bb1a96b..34971724810 100644 --- a/devel/pycharm-ce/Makefile +++ b/devel/pycharm-ce/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pycharm-ce -PORTVERSION= 2018.1 +PORTVERSION= 2018.1.3 CATEGORIES= devel java python MASTER_SITES= https://download.jetbrains.com/python/ \ http://download.jetbrains.com/python/ diff --git a/devel/pycharm-ce/distinfo b/devel/pycharm-ce/distinfo index ebfd6c4ce6e..0046e15833a 100644 --- a/devel/pycharm-ce/distinfo +++ b/devel/pycharm-ce/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1522269587 -SHA256 (pycharm-community-2018.1.tar.gz) = 4bda5aae5aa6396059bf4d55aa982676381afe69062ad0e69be3d2a357846c38 -SIZE (pycharm-community-2018.1.tar.gz) = 264891672 +TIMESTAMP = 1527372811 +SHA256 (pycharm-community-2018.1.3.tar.gz) = 561976581892ae5e6b924ff3ce61958b30ba1610e191211a4799437359c399b3 +SIZE (pycharm-community-2018.1.3.tar.gz) = 267256240 diff --git a/devel/pycharm-ce/pkg-plist b/devel/pycharm-ce/pkg-plist index 3b308113885..dcca8bcdb40 100644 --- a/devel/pycharm-ce/pkg-plist +++ b/devel/pycharm-ce/pkg-plist @@ -236,7 +236,7 @@ share/applications/pycharm-ce.desktop %%DATADIR%%/helpers/generator3.py %%DATADIR%%/helpers/icon-robots.txt %%DATADIR%%/helpers/packaging_tool.py -%%DATADIR%%/helpers/pip-9.0.1.tar.gz +%%DATADIR%%/helpers/pip-9.0.3.tar.gz %%DATADIR%%/helpers/pockets/__init__.py %%DATADIR%%/helpers/pockets/_version.py %%DATADIR%%/helpers/pockets/collections.py @@ -1165,7 +1165,8 @@ share/applications/pycharm-ce.desktop %%DATADIR%%/helpers/required_gen_version %%DATADIR%%/helpers/rest_runners/rst2smth.py %%DATADIR%%/helpers/rest_runners/sphinx_runner.py -%%DATADIR%%/helpers/setuptools-28.8.0.tar.gz +%%DATADIR%%/helpers/setuptools-36.8.0.tar.gz +%%DATADIR%%/helpers/setuptools-39.0.1.tar.gz %%DATADIR%%/helpers/six.py %%DATADIR%%/helpers/sphinxcontrib/__init__.py %%DATADIR%%/helpers/sphinxcontrib/napoleon/__init__.py @@ -2147,7 +2148,7 @@ share/applications/pycharm-ce.desktop %%DATADIR%%/lib/asm-all.jar %%DATADIR%%/lib/automaton.jar %%DATADIR%%/lib/batik-all.jar -%%DATADIR%%/lib/bcprov-jdk15on-1.55.jar +%%DATADIR%%/lib/bcprov-jdk15on-1.59.jar %%DATADIR%%/lib/bootstrap.jar %%DATADIR%%/lib/cglib-nodep-3.2.4.jar %%DATADIR%%/lib/cli-parser-1.1.jar @@ -2157,7 +2158,7 @@ share/applications/pycharm-ce.desktop %%DATADIR%%/lib/commons-codec-1.9.jar %%DATADIR%%/lib/commons-compress-1.10.jar %%DATADIR%%/lib/commons-httpclient-3.1-patched.jar -%%DATADIR%%/lib/commons-imaging-1.0-RC.jar +%%DATADIR%%/lib/commons-imaging-1.0-RC-1.jar %%DATADIR%%/lib/commons-logging-1.2.jar %%DATADIR%%/lib/eddsa-0.2.0.jar %%DATADIR%%/lib/extensions.jar @@ -2177,7 +2178,9 @@ share/applications/pycharm-ce.desktop %%DATADIR%%/lib/imgscalr-lib-4.2.jar %%DATADIR%%/lib/ini4j-0.5.5-2.jar %%DATADIR%%/lib/isorelax.jar -%%DATADIR%%/lib/jackson-core-2.8.8.jar +%%DATADIR%%/lib/jackson-annotations-2.9.0.jar +%%DATADIR%%/lib/jackson-core-2.9.5.jar +%%DATADIR%%/lib/jackson-databind-2.9.5.jar %%DATADIR%%/lib/javassist-3.21.0-GA.jar %%DATADIR%%/lib/jaxen-1.1.3.jar %%DATADIR%%/lib/jayatana-1.2.4.jar @@ -2299,9 +2302,6 @@ share/applications/pycharm-ce.desktop %%DATADIR%%/plugins/python-terminal/lib/python-terminal.jar %%DATADIR%%/plugins/rest/lib/resources_en.jar %%DATADIR%%/plugins/rest/lib/rest.jar -%%DATADIR%%/plugins/settings-repository/lib/jackson-annotations-2.8.1.jar -%%DATADIR%%/plugins/settings-repository/lib/jackson-core-2.8.1.jar -%%DATADIR%%/plugins/settings-repository/lib/jackson-databind-2.8.1.jar %%DATADIR%%/plugins/settings-repository/lib/jgit.jar %%DATADIR%%/plugins/settings-repository/lib/resources_en.jar %%DATADIR%%/plugins/settings-repository/lib/settings-repository.jar diff --git a/devel/qgit/Makefile b/devel/qgit/Makefile index ea161f0389a..9a48757f7bb 100644 --- a/devel/qgit/Makefile +++ b/devel/qgit/Makefile @@ -3,7 +3,7 @@ PORTNAME= qgit DISTVERSIONPREFIX= ${PORTNAME}- -DISTVERSION= 2.7 +DISTVERSION= 2.8 CATEGORIES= devel MAINTAINER= adridg@FreeBSD.org diff --git a/devel/qgit/distinfo b/devel/qgit/distinfo index 9682289bf9b..c6f30df9d76 100644 --- a/devel/qgit/distinfo +++ b/devel/qgit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1505308761 -SHA256 (tibirna-qgit-qgit-2.7_GH0.tar.gz) = 183d116b2fb38c6a76c99577f6cc86f0241f8b6bdc74042be4cb8631567f5e9e -SIZE (tibirna-qgit-qgit-2.7_GH0.tar.gz) = 259624 +TIMESTAMP = 1527247496 +SHA256 (tibirna-qgit-qgit-2.8_GH0.tar.gz) = 792cf639fbf02eb5ec7e76d05a290062982c142355b65de873cce05e90b8a112 +SIZE (tibirna-qgit-qgit-2.8_GH0.tar.gz) = 260001 diff --git a/devel/qgit/files/patch-src_config.h b/devel/qgit/files/patch-src_config.h new file mode 100644 index 00000000000..07457779801 --- /dev/null +++ b/devel/qgit/files/patch-src_config.h @@ -0,0 +1,12 @@ +--- src/config.h.orig 2018-05-21 16:21:27 UTC ++++ src/config.h +@@ -17,7 +17,7 @@ + #define PACKAGE_TARNAME "qgit" + + /* Define to the version of this package. */ +-#define PACKAGE_VERSION "2.7" ++#define PACKAGE_VERSION "2.8" + + /* Version number of package */ +-#define VERSION "2.7" ++#define VERSION "2.8" diff --git a/devel/rubygem-authlogic/Makefile b/devel/rubygem-authlogic/Makefile index ed678ef98a2..8e0e3b21104 100644 --- a/devel/rubygem-authlogic/Makefile +++ b/devel/rubygem-authlogic/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= authlogic -PORTVERSION= 4.1.0 +PORTVERSION= 4.1.1 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-authlogic/distinfo b/devel/rubygem-authlogic/distinfo index 6bf344ea04c..01f0fd95602 100644 --- a/devel/rubygem-authlogic/distinfo +++ b/devel/rubygem-authlogic/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1524751149 -SHA256 (rubygem/authlogic-4.1.0.gem) = f03f15d4cd97c137cbac9506fa2cad3acf7e8725a9662eaa77f3ef128bca100a -SIZE (rubygem/authlogic-4.1.0.gem) = 85504 +TIMESTAMP = 1527140881 +SHA256 (rubygem/authlogic-4.1.1.gem) = 2f945d667f47383532f3be71546c17459bba1cfc15883bd610d0a7ba03d80647 +SIZE (rubygem/authlogic-4.1.1.gem) = 85504 diff --git a/devel/rubygem-aws-sdk-core/Makefile b/devel/rubygem-aws-sdk-core/Makefile index 9de9f938a40..3424756f968 100644 --- a/devel/rubygem-aws-sdk-core/Makefile +++ b/devel/rubygem-aws-sdk-core/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= aws-sdk-core -DISTVERSION= 2.11.55 +DISTVERSION= 2.11.56 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-core/distinfo b/devel/rubygem-aws-sdk-core/distinfo index fc3310785fe..5ecb5977dc6 100644 --- a/devel/rubygem-aws-sdk-core/distinfo +++ b/devel/rubygem-aws-sdk-core/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1527079370 -SHA256 (rubygem/aws-sdk-core-2.11.55.gem) = 6d13fbc328cec846e8d3a952959948724b48ccb4ccb22434bc4f2984d3e009ea -SIZE (rubygem/aws-sdk-core-2.11.55.gem) = 1268224 +TIMESTAMP = 1527232817 +SHA256 (rubygem/aws-sdk-core-2.11.56.gem) = eb26098893cb7437ddf2e1be7136e2cd432d93fbbbf9c82df044ace82ec5cada +SIZE (rubygem/aws-sdk-core-2.11.56.gem) = 1268224 diff --git a/devel/rubygem-aws-sdk-resources/Makefile b/devel/rubygem-aws-sdk-resources/Makefile index 1e896d81cf5..17b2347dd22 100644 --- a/devel/rubygem-aws-sdk-resources/Makefile +++ b/devel/rubygem-aws-sdk-resources/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= aws-sdk-resources -DISTVERSION= 2.11.55 +DISTVERSION= 2.11.56 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-resources/distinfo b/devel/rubygem-aws-sdk-resources/distinfo index a933dc8bedc..142550f6bd5 100644 --- a/devel/rubygem-aws-sdk-resources/distinfo +++ b/devel/rubygem-aws-sdk-resources/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1527079380 -SHA256 (rubygem/aws-sdk-resources-2.11.55.gem) = 30279bd6f017aa906d616e3723a117611156d588c0def2c02fb8edfb02f1d3b2 -SIZE (rubygem/aws-sdk-resources-2.11.55.gem) = 48640 +TIMESTAMP = 1527232827 +SHA256 (rubygem/aws-sdk-resources-2.11.56.gem) = 130adfdf8bde7acb0a6bd60f187cbc666ace9bd4f14c315866c49a8194cae6cf +SIZE (rubygem/aws-sdk-resources-2.11.56.gem) = 48640 diff --git a/devel/rubygem-aws-sdk/Makefile b/devel/rubygem-aws-sdk/Makefile index d59c86abbbb..0806c74ad8c 100644 --- a/devel/rubygem-aws-sdk/Makefile +++ b/devel/rubygem-aws-sdk/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= aws-sdk -DISTVERSION= 2.11.55 +DISTVERSION= 2.11.56 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk/distinfo b/devel/rubygem-aws-sdk/distinfo index d8c42fe5023..3fcb5e161c2 100644 --- a/devel/rubygem-aws-sdk/distinfo +++ b/devel/rubygem-aws-sdk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1527079390 -SHA256 (rubygem/aws-sdk-2.11.55.gem) = ae3e983e90fd2efbbe40dedd2f98eca7c45de4e1d6ab3dbe1391389a4426e90d -SIZE (rubygem/aws-sdk-2.11.55.gem) = 4608 +TIMESTAMP = 1527232836 +SHA256 (rubygem/aws-sdk-2.11.56.gem) = 3e0735d6c7260ecad6067ee63a2e6459b62309d3bbda681a80f75cc54faa8632 +SIZE (rubygem/aws-sdk-2.11.56.gem) = 4608 diff --git a/devel/rubygem-docile/Makefile b/devel/rubygem-docile/Makefile index 11457eac582..82fc465f5b0 100644 --- a/devel/rubygem-docile/Makefile +++ b/devel/rubygem-docile/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= docile -PORTVERSION= 1.3.0 +PORTVERSION= 1.3.1 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-docile/distinfo b/devel/rubygem-docile/distinfo index d020c8d240d..bfba94f1bcc 100644 --- a/devel/rubygem-docile/distinfo +++ b/devel/rubygem-docile/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1518091866 -SHA256 (rubygem/docile-1.3.0.gem) = f69a7ec173a552bb4757e3b7b6eab11fe57dbaeac163a7bf535be0013225d07b -SIZE (rubygem/docile-1.3.0.gem) = 14848 +TIMESTAMP = 1527234576 +SHA256 (rubygem/docile-1.3.1.gem) = 27d87e90c70e10ec4ca8fd33bcd668251ce514cb9d60ee8c75500d65e78fa211 +SIZE (rubygem/docile-1.3.1.gem) = 14848 diff --git a/devel/rubygem-et-orbi/Makefile b/devel/rubygem-et-orbi/Makefile index d501af3f58b..e5c01f7fcf8 100644 --- a/devel/rubygem-et-orbi/Makefile +++ b/devel/rubygem-et-orbi/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= et-orbi -PORTVERSION= 1.1.1 +PORTVERSION= 1.1.2 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-et-orbi/distinfo b/devel/rubygem-et-orbi/distinfo index 2457962f58e..e5f6e97faf0 100644 --- a/devel/rubygem-et-orbi/distinfo +++ b/devel/rubygem-et-orbi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1525554987 -SHA256 (rubygem/et-orbi-1.1.1.gem) = 467dfb8bf2795375aea5bc6dedacb7c81e7b034420c3efe2bf2e2b746989cadc -SIZE (rubygem/et-orbi-1.1.1.gem) = 13312 +TIMESTAMP = 1527232846 +SHA256 (rubygem/et-orbi-1.1.2.gem) = 3c3c308b0fe949ba798421b64755e51ad6be914f4fe8dfe6f7b09963249813f0 +SIZE (rubygem/et-orbi-1.1.2.gem) = 14848 diff --git a/devel/rubygem-statsd-instrument/Makefile b/devel/rubygem-statsd-instrument/Makefile index d86f3429297..d090f94702a 100644 --- a/devel/rubygem-statsd-instrument/Makefile +++ b/devel/rubygem-statsd-instrument/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= statsd-instrument -PORTVERSION= 2.2.0 +PORTVERSION= 2.2.1 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-statsd-instrument/distinfo b/devel/rubygem-statsd-instrument/distinfo index c1b9a8d5769..7427b523ab8 100644 --- a/devel/rubygem-statsd-instrument/distinfo +++ b/devel/rubygem-statsd-instrument/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1526716314 -SHA256 (rubygem/statsd-instrument-2.2.0.gem) = 77405cbf475d9c816d3e90d51816b5a4dc10453aedd78a1749a0d485f39b2153 -SIZE (rubygem/statsd-instrument-2.2.0.gem) = 28160 +TIMESTAMP = 1527234585 +SHA256 (rubygem/statsd-instrument-2.2.1.gem) = 059d5a55122f963049f3911de5f76ecd7b895fb2085da7ac0d8a57118f4d3dd4 +SIZE (rubygem/statsd-instrument-2.2.1.gem) = 28160 diff --git a/devel/stack/Makefile b/devel/stack/Makefile index 91838f49ca3..393b0e79eed 100644 --- a/devel/stack/Makefile +++ b/devel/stack/Makefile @@ -2,19 +2,18 @@ # $FreeBSD$ # To update this port first go to -# https://github.com/applicative-tech/stack-dependencies, change the +# https://github.com/arrowd/stack-dependencies, change the # version in the Makefile there, regenerate the stack-dependencies # tarball, commit Makefile changes, create a new tag (release) # matching the new stack version, and upload the tarball. Finally # bump the version here. PORTNAME= stack -PORTVERSION= 1.5.1 +PORTVERSION= 1.7.1 DISTVERSIONPREFIX= v -PORTREVISION= 1 CATEGORIES= devel haskell MASTER_SITES= GH \ - https://github.com/applicative-tech/stack-dependencies/releases/download/v${PORTVERSION}/:deps + https://github.com/arrowd/stack-dependencies/releases/download/v${PORTVERSION}/:deps DISTFILES= stack-dependencies-${PORTVERSION}${EXTRACT_SUFX}:deps MAINTAINER= ports@FreeBSD.org @@ -27,12 +26,10 @@ BUILD_DEPENDS= ghc>0:lang/ghc \ hs-network>0:net/hs-network \ hs-old-locale>0:devel/hs-old-locale \ hs-old-time>0:devel/hs-old-time \ - hs-parsec>0:textproc/hs-parsec \ hs-random>0:devel/hs-random \ - hs-stm>0:devel/hs-stm \ - hs-text>0:devel/hs-text \ hs-zlib>0:archivers/hs-zlib \ - cabal:devel/hs-cabal-install + cabal:devel/hs-cabal-install \ + happy:devel/hs-happy LIB_DEPENDS= libgmp.so:math/gmp \ libffi.so:devel/libffi RUN_DEPENDS= ca_root_nss>0:security/ca_root_nss \ @@ -41,7 +38,7 @@ RUN_DEPENDS= ca_root_nss>0:security/ca_root_nss \ USES= gmake iconv:translit perl5 USE_GITHUB= yes -GH_ACCOUNT= applicative-tech +GH_ACCOUNT= arrowd GH_PROJECT= stack-dependencies MAKE_ENV= TARGET="${WRKSRC}" \ diff --git a/devel/stack/distinfo b/devel/stack/distinfo index 83027fb19ef..e7db08312ba 100644 --- a/devel/stack/distinfo +++ b/devel/stack/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1507494796 -SHA256 (stack-dependencies-1.5.1.tar.gz) = 2782fd7edba61645d070e54022dc81905bd283382de1282c851ebfa83d49f044 -SIZE (stack-dependencies-1.5.1.tar.gz) = 42063311 -SHA256 (applicative-tech-stack-dependencies-v1.5.1_GH0.tar.gz) = 0819916b46c3485bad4b8030d0af8e91cd1fecf5b99a1a61137a3d5a9caf730a -SIZE (applicative-tech-stack-dependencies-v1.5.1_GH0.tar.gz) = 999 +TIMESTAMP = 1524999031 +SHA256 (stack-dependencies-1.7.1.tar.gz) = 4320a4803c889603fd13469d6ce795642f218e5ae65c46616ed8ec3418d13240 +SIZE (stack-dependencies-1.7.1.tar.gz) = 155869633 +SHA256 (arrowd-stack-dependencies-v1.7.1_GH0.tar.gz) = 8487fb66e17df5960d7fea96e80eb33a7e9e08a839f80926a2144afc6bc4159e +SIZE (arrowd-stack-dependencies-v1.7.1_GH0.tar.gz) = 997 diff --git a/devel/umem/Makefile b/devel/umem/Makefile index c1ba45e907a..ff6496a0ae1 100644 --- a/devel/umem/Makefile +++ b/devel/umem/Makefile @@ -10,17 +10,18 @@ MASTER_SITES= https://labs.omniti.com/portableumem/releases/${PORTVERSION:R}/ MAINTAINER= ports@FreeBSD.org COMMENT= Port of the Solaris memory allocator +LICENSE= CDDL +LICENSE_FILE= ${WRKSRC}/OPENSOLARIS.LICENSE + USES= libtool tar:bzip2 USE_LDCONFIG= yes GNU_CONFIGURE= yes ONLY_FOR_ARCHS= i386 amd64 MAKE_JOBS_UNSAFE= yes INSTALL_TARGET= install-strip +TEST_TARGET= check # XXX: 1 of 4 tests fail post-patch: @${REINPLACE_CMD} -e 's/ -ldl//g' ${WRKSRC}/Makefile.in -regression-test: build - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check - .include diff --git a/dns/Makefile b/dns/Makefile index 734836f16d1..64dedb98d97 100644 --- a/dns/Makefile +++ b/dns/Makefile @@ -13,6 +13,7 @@ SUBDIR += bind910 SUBDIR += bind911 SUBDIR += bind912 + SUBDIR += bind913 SUBDIR += bind99 SUBDIR += bindgraph SUBDIR += bundy diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile index acef9ffeaa2..b5244addb20 100644 --- a/dns/bind9-devel/Makefile +++ b/dns/bind9-devel/Makefile @@ -65,7 +65,7 @@ CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \ ETCDIR= ${PREFIX}/etc/namedb # XXX: Add -devel -CONFLICTS= bind99 bind910 bind911 bind912 +CONFLICTS= bind99 bind910 bind911 bind912 bind913 .if defined(BIND_TOOLS_SLAVE) CONFIGURE_ARGS+= --disable-shared diff --git a/dns/bind9-devel/files/pkg-message.in b/dns/bind9-devel/files/pkg-message.in index e62ff8197c9..e6454ef08a8 100644 --- a/dns/bind9-devel/files/pkg-message.in +++ b/dns/bind9-devel/files/pkg-message.in @@ -21,7 +21,7 @@ * And then restarting syslogd with: service syslogd restart * * * * * -* THIS IS A DEVELOPMENT VERSION IF BIND, IT WILL EAT YOUR DATA * +* THIS IS A DEVELOPMENT VERSION OF BIND, IT WILL EAT YOUR DATA * * * * * * * diff --git a/dns/bind910/Makefile b/dns/bind910/Makefile index 958c854f59e..c29a5baf1a6 100644 --- a/dns/bind910/Makefile +++ b/dns/bind910/Makefile @@ -41,7 +41,7 @@ CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \ --sysconfdir=${ETCDIR} ETCDIR= ${PREFIX}/etc/namedb -CONFLICTS= bind-tools bind99 bind911 bind912 bind9-devel +CONFLICTS= bind-tools bind99 bind911 bind912 bind913 bind9-devel SUB_FILES= pkg-message named.conf USE_RC_SUBR= named diff --git a/dns/bind912/Makefile b/dns/bind912/Makefile index 9c8a8feb569..e2f8c9d9ddc 100644 --- a/dns/bind912/Makefile +++ b/dns/bind912/Makefile @@ -54,7 +54,7 @@ CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \ --sysconfdir=${ETCDIR} ETCDIR= ${PREFIX}/etc/namedb -CONFLICTS= bind99 bind910 bind911 bind9-devel +CONFLICTS= bind99 bind910 bind911 bind913 bind9-devel .if defined(BIND_TOOLS_SLAVE) CONFIGURE_ARGS+= --disable-shared diff --git a/dns/bind913/Makefile b/dns/bind913/Makefile new file mode 100644 index 00000000000..744fa96bda1 --- /dev/null +++ b/dns/bind913/Makefile @@ -0,0 +1,283 @@ +# $FreeBSD$ +# pkg-help formatted with fmt 59 63 + +PORTNAME= bind +PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} +.if defined(BIND_TOOLS_SLAVE) +# dns/bind-tools here +PORTREVISION= 0 +.else +# dns/bind913 here +PORTREVISION= 0 +.endif +CATEGORIES= dns net ipv6 +MASTER_SITES= ISC/bind9/${ISCVERSION} +.if defined(BIND_TOOLS_SLAVE) +PKGNAMESUFFIX= -tools +.else +PKGNAMESUFFIX= 913 +.endif +DISTNAME= ${PORTNAME}-${ISCVERSION} + +MAINTAINER= mat@FreeBSD.org +.if defined(BIND_TOOLS_SLAVE) +COMMENT= Command line tools from BIND: delv, dig, host, nslookup... +.else +COMMENT= BIND DNS suite with updated DNSSEC and DNS64 +.endif + +LICENSE= MPL20 +LICENSE_FILE= ${WRKSRC}/COPYRIGHT + +# ISC releases things like 9.8.0-P1, which our versioning doesn't like +ISCVERSION= 9.13.0 +USES= cpe libedit ssl + +CPE_VENDOR= isc +CPE_VERSION= ${ISCVERSION:C/-.*//} +.if ${ISCVERSION:M*-*} +CPE_UPDATE= ${ISCVERSION:C/.*-//:tl} +.endif + +LIB_DEPENDS= libxml2.so:textproc/libxml2 + +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \ + --disable-symtable \ + --with-randomdev=/dev/random \ + --with-libxml2=${LOCALBASE} \ + --with-readline="-L${LOCALBASE}/lib -ledit" \ + --with-dlopen=yes \ + --with-openssl=${OPENSSLBASE} \ + --sysconfdir=${ETCDIR} +ETCDIR= ${PREFIX}/etc/namedb + +CONFLICTS= bind99 bind910 bind911 bind912 bind9-devel + +.if defined(BIND_TOOLS_SLAVE) +CONFIGURE_ARGS+= --disable-shared +CONFLICTS+= bind913 +.else +USE_RC_SUBR= named +SUB_FILES= pkg-message named.conf +CONFLICTS+= bind-tools +.endif # BIND_TOOLS_SLAVE + +MAKE_JOBS_UNSAFE= yes + +PORTDOCS= * + +OPTIONS_DEFAULT= THREADS SIGCHASE IDN GSSAPI_NONE JSON PYTHON +OPTIONS_DEFINE= IDN LARGE_FILE PYTHON JSON \ + FIXED_RRSET SIGCHASE IPV6 THREADS + +OPTIONS_RADIO= CRYPTO GOSTDEF +OPTIONS_RADIO_CRYPTO= NATIVE_PKCS11 +OPTIONS_RADIO_GOSTDEF= GOST GOST_ASN1 + +.if !defined(BIND_TOOLS_SLAVE) +OPTIONS_DEFAULT+= DLZ_FILESYSTEM LMDB RPZ_NSDNAME RPZ_NSIP TCP_FASTOPEN +OPTIONS_DEFINE+= RPZ_NSIP RPZ_NSDNAME DOCS GEOIP \ + MINCACHE PORTREVISION QUERYTRACE LMDB DNSTAP \ + START_LATE TUNING_LARGE TCP_FASTOPEN +OPTIONS_GROUP= DLZ +OPTIONS_GROUP_DLZ= DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \ + DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB +.endif # BIND_TOOLS_SLAVE +OPTIONS_SINGLE= GSSAPI +OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE + +OPTIONS_SUB= yes + +CRYPTO_DESC= Choose which crypto engine to use +DLZ_BDB_DESC= DLZ BDB driver +DLZ_DESC= Dynamically Loadable Zones +DLZ_FILESYSTEM_DESC= DLZ filesystem driver +DLZ_LDAP_DESC= DLZ LDAP driver +DLZ_MYSQL_DESC= DLZ MySQL driver (no threading) +DLZ_POSTGRESQL_DESC= DLZ Postgres driver +DLZ_STUB_DESC= DLZ stub driver +DNSTAP_DESC= Provides fast passive logging of DNS messages +FIXED_RRSET_DESC= Enable fixed rrset ordering +GEOIP_DESC= Allow geographically based ACL. +GOSTDEF_DESC= Enable GOST ciphers +GOST_ASN1_DESC= GOST using ASN.1 +GOST_DESC= GOST raw keys (new default) +GSSAPI_BASE_DESC= Using Heimdal in base +GSSAPI_HEIMDAL_DESC= Using security/heimdal +GSSAPI_MIT_DESC= Using security/krb5 +GSSAPI_NONE_DESC= Disable +LARGE_FILE_DESC= 64-bit file support +LMDB_DESC= Use LMDB for zone management +MINCACHE_DESC= Use the mincachettl patch +NATIVE_PKCS11_DESC= Use PKCS\#11 native API (**READ HELP**) +PORTREVISION_DESC= Show PORTREVISION in the version string +PYTHON_DESC= Build with Python utilities +QUERYTRACE_DESC= Enable the very verbose query tracelogging +RPZ_NSDNAME_DESC= Enable RPZ NSDNAME policy records +RPZ_NSIP_DESC= Enable RPZ NSIP trigger rules +SIGCHASE_DESC= dig/host/nslookup will do DNSSEC validation +START_LATE_DESC= Start BIND late in the boot process (see help) +TCP_FASTOPEN_DESC= RFC 7413 support +TUNING_LARGE_DESC= Tune named for large systems (**READ HELP**) + +DLZ_BDB_CONFIGURE_ON= --with-dlz-bdb=yes +DLZ_BDB_USES= bdb + +DLZ_FILESYSTEM_CONFIGURE_ON= --with-dlz-filesystem=yes + +DLZ_LDAP_CONFIGURE_ON= --with-dlz-ldap=yes +DLZ_LDAP_USE= openldap=yes + +DLZ_MYSQL_CONFIGURE_ON= --with-dlz-mysql=yes +DLZ_MYSQL_PREVENTS= THREADS +DLZ_MYSQL_USES= mysql + +DLZ_POSTGRESQL_CONFIGURE_ON= --with-dlz-postgres=yes +DLZ_POSTGRESQL_USES= pgsql + +DLZ_STUB_CONFIGURE_ON= --with-dlz-stub=yes + +DNSTAP_CONFIGURE_ENABLE= dnstap +DNSTAP_IMPLIES= THREADS +DNSTAP_LIB_DEPENDS= libfstrm.so:devel/fstrm \ + libprotobuf-c.so:devel/protobuf-c + +FIXED_RRSET_CONFIGURE_ENABLE= fixed-rrset + +GEOIP_CONFIGURE_WITH= geoip +GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP + +GOST_ASN1_CONFIGURE_ON= --with-gost=asn1 + +GOST_CONFIGURE_ON= --with-gost + +GSSAPI_BASE_CONFIGURE_ON= \ + --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" +GSSAPI_BASE_USES= gssapi + +GSSAPI_HEIMDAL_CONFIGURE_ON= \ + --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" +GSSAPI_HEIMDAL_USES= gssapi:heimdal + +GSSAPI_MIT_CONFIGURE_ON= \ + --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" +GSSAPI_MIT_USES= gssapi:mit + +GSSAPI_NONE_CONFIGURE_ON= --without-gssapi + +IDN_CONFIGURE_OFF= --without-libidn2 +IDN_CONFIGURE_ON= --with-libidn2=${LOCALBASE} ${ICONV_CONFIGURE_BASE} +IDN_LIB_DEPENDS= libidn2.so:dns/libidn2 +IDN_USES= iconv + +IPV6_CONFIGURE_ENABLE= ipv6 + +JSON_CONFIGURE_WITH= libjson=${LOCALBASE} +JSON_LIB_DEPENDS= libjson-c.so:devel/json-c + +LARGE_FILE_CONFIGURE_ENABLE= largefile + +LMDB_CONFIGURE_WITH= lmdb=${LOCALBASE} +LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb + +MINCACHE_EXTRA_PATCHES= ${FILESDIR}/extrapatch-bind-min-override-ttl + +NATIVE_PKCS11_CONFIGURE_ENABLE= native-pkcs11 +NATIVE_PKCS11_IMPLIES= THREADS + +PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR} +PYTHON_CONFIGURE_WITH= python=${PYTHON_CMD} +PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR} +PYTHON_USES= python + +QUERYTRACE_CONFIGURE_ENABLE= querytrace + +RPZ_NSDNAME_CONFIGURE_ENABLE= rpz-nsdname + +RPZ_NSIP_CONFIGURE_ENABLE= rpz-nsip + +SIGCHASE_CONFIGURE_ON= STD_CDEFINES="-DDIG_SIGCHASE=1" + + +START_LATE_SUB_LIST= NAMED_REQUIRE="SERVERS cleanvar" \ + NAMED_BEFORE="LOGIN" +START_LATE_SUB_LIST_OFF=NAMED_REQUIRE="NETWORKING ldconfig syslogd" \ + NAMED_BEFORE="SERVERS" + +TCP_FASTOPEN_CONFIGURE_ENABLE= tcp-fastopen + +THREADS_CONFIGURE_ENABLE= threads + +TUNING_LARGE_IMPLIES= THREADS +TUNING_LARGE_CONFIGURE_ON= --with-tuning=large +TUNING_LARGE_CONFIGURE_OFF= --with-tuning=default + +.include + +.if !${PORT_OPTIONS:MGOST} && !${PORT_OPTIONS:MGOST_ASN1} +CONFIGURE_ARGS+= --without-gost +.endif + +.if ( ${PORT_OPTIONS:MGOST} || ${PORT_OPTIONS:MGOST_ASN1} ) && ${SSL_DEFAULT} == base +BROKEN= OpenSSL from the base system does not support GOST, add \ + DEFAULT_VERSIONS+=ssl=openssl to your /etc/make.conf and rebuild everything \ + that needs SSL. +.endif + +post-patch: +.if defined(BIND_TOOLS_SLAVE) + @${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = lib bin#' \ + -e 's#isc-config.sh installdirs#installdirs#' \ + -e 's#.*INSTALL.*isc-config.*##' \ + -e 's#.*INSTALL.*bind.keys.*##' \ + ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = delv dig dnssec tools nsupdate \\#' \ + -e 's#^ .*check confgen ##' \ + ${WRKSRC}/bin/Makefile.in +.else +. for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \ + rndc/rndc.8 + @${REINPLACE_CMD} -e 's#/etc/named.conf#${ETCDIR}/named.conf#g' \ + -e 's#/etc/rndc.conf#${ETCDIR}/rndc.conf#g' \ + -e "s#/var\/run\/named\/named.pid#/var/run/named/pid#" \ + ${WRKSRC}/bin/${FILE} +. endfor +.endif + +.if !defined(BIND_TOOLS_SLAVE) +. if ${PORTREVISION:N0} +post-patch-PORTREVISION-on: + @${REINPLACE_CMD} -e '/EXTENSIONS/s#=$$#=_${PORTREVISION}#' \ + ${WRKSRC}/version +. endif + +post-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/mtree + ${MKDIR} ${STAGEDIR}${ETCDIR} +. for i in dynamic master slave working + @${MKDIR} ${STAGEDIR}${ETCDIR}/$i +. endfor + ${INSTALL_DATA} ${WRKDIR}/named.conf ${STAGEDIR}${ETCDIR}/named.conf.sample + ${INSTALL_DATA} ${FILESDIR}/named.root ${STAGEDIR}${ETCDIR} + ${INSTALL_DATA} ${FILESDIR}/empty.db ${STAGEDIR}${ETCDIR}/master + ${INSTALL_DATA} ${FILESDIR}/localhost-forward.db ${STAGEDIR}${ETCDIR}/master + ${INSTALL_DATA} ${FILESDIR}/localhost-reverse.db ${STAGEDIR}${ETCDIR}/master + ${INSTALL_DATA} ${FILESDIR}/BIND.chroot.dist ${STAGEDIR}${PREFIX}/etc/mtree/BIND.chroot.dist.sample + ${INSTALL_DATA} ${FILESDIR}/BIND.chroot.local.dist ${STAGEDIR}${PREFIX}/etc/mtree/BIND.chroot.local.dist.sample + ${INSTALL_DATA} ${WRKSRC}/bin/rndc/rndc.conf \ + ${STAGEDIR}${ETCDIR}/rndc.conf.sample + +post-install-DOCS-on: + ${MKDIR} ${STAGEDIR}${DOCSDIR}/arm + ${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${STAGEDIR}${DOCSDIR}/arm + ${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/CHANGES* ${WRKSRC}/HISTORY.md \ + ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} +.endif # BIND_TOOLS_SLAVE + +# Can't use USE_PYTHON=autoplist +post-install-PYTHON-on: + @${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -type f | ${SED} -e 's|${STAGEDIR}||' >> ${TMPPLIST} + +.include diff --git a/dns/bind913/distinfo b/dns/bind913/distinfo new file mode 100644 index 00000000000..bc0ad71e562 --- /dev/null +++ b/dns/bind913/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1527250140 +SHA256 (bind-9.13.0.tar.gz) = cac499088c7135d9486ba1fc8416088adec58eea9eeee017845383a1aff34ffc +SIZE (bind-9.13.0.tar.gz) = 8906102 diff --git a/dns/bind913/files/BIND.chroot.dist b/dns/bind913/files/BIND.chroot.dist new file mode 100644 index 00000000000..c3863a6a4e7 --- /dev/null +++ b/dns/bind913/files/BIND.chroot.dist @@ -0,0 +1,24 @@ +# $FreeBSD$ +# +# mtree -deU -f files/BIND.chroot.dist -p tmp +# mtree -cjnb -k uname,gname,mode -p tmp + +/set type=file uname=root gname=wheel mode=0755 +. type=dir + dev type=dir mode=0555 + .. + etc type=dir + .. +/set type=file uname=bind gname=bind mode=0755 + var type=dir uname=root gname=wheel + dump type=dir + .. + log type=dir + .. + run type=dir + named type=dir + .. + .. + stats type=dir + .. + .. diff --git a/dns/bind913/files/BIND.chroot.local.dist b/dns/bind913/files/BIND.chroot.local.dist new file mode 100644 index 00000000000..53b36a87c08 --- /dev/null +++ b/dns/bind913/files/BIND.chroot.local.dist @@ -0,0 +1,20 @@ +# $FreeBSD$ +# +# mtree -deU -f files/BIND.etc.dist -p tmp +# mtree -cjnb -k uname,gname,mode -p tmp + +/set type=file uname=root gname=wheel mode=0755 +. type=dir + etc type=dir +/set type=file uname=bind gname=wheel mode=0755 + namedb type=dir uname=root + dynamic type=dir + .. + master type=dir uname=root + .. + slave type=dir + .. + working type=dir + .. + .. + .. diff --git a/dns/bind913/files/empty.db b/dns/bind913/files/empty.db new file mode 100644 index 00000000000..070f6634825 --- /dev/null +++ b/dns/bind913/files/empty.db @@ -0,0 +1,11 @@ + +; $FreeBSD$ + +$TTL 3h +@ SOA @ nobody.localhost. 42 1d 12h 1w 3h + ; Serial, Refresh, Retry, Expire, Neg. cache TTL + +@ NS @ + +; Silence a BIND warning +@ A 127.0.0.1 diff --git a/dns/bind913/files/extrapatch-bind-min-override-ttl b/dns/bind913/files/extrapatch-bind-min-override-ttl new file mode 100644 index 00000000000..d659e08099d --- /dev/null +++ b/dns/bind913/files/extrapatch-bind-min-override-ttl @@ -0,0 +1,79 @@ +--- bin/named/config.c.orig 2018-05-18 05:44:02 UTC ++++ bin/named/config.c +@@ -174,12 +174,14 @@ options {\n\ + max-recursion-queries 75;\n\ + max-stale-ttl 604800; /* 1 week */\n\ + message-compression yes;\n\ ++ min-cache-ttl 0; /* no minimal, zero is allowed */\n\ + # min-roots ;\n\ + minimal-any false;\n\ + minimal-responses no-auth-recursive;\n\ + notify-source *;\n\ + notify-source-v6 *;\n\ + nsec3-test-zone no;\n\ ++ override-cache-ttl 0; /* do not override */\n\ + provide-ixfr true;\n\ + query-source address *;\n\ + query-source-v6 address *;\n\ +--- bin/named/server.c.orig 2018-05-18 05:44:02 UTC ++++ bin/named/server.c +@@ -4072,6 +4072,16 @@ configure_view(dns_view_t *view, dns_vie + } + + obj = NULL; ++ result = named_config_get(maps, "override-cache-ttl", &obj); ++ INSIST(result == ISC_R_SUCCESS); ++ view->overridecachettl = cfg_obj_asuint32(obj); ++ ++ obj = NULL; ++ result = named_config_get(maps, "min-cache-ttl", &obj); ++ INSIST(result == ISC_R_SUCCESS); ++ view->mincachettl = cfg_obj_asuint32(obj); ++ ++ obj = NULL; + result = named_config_get(maps, "max-cache-ttl", &obj); + INSIST(result == ISC_R_SUCCESS); + view->maxcachettl = cfg_obj_asuint32(obj); +--- lib/dns/include/dns/view.h.orig 2018-05-18 05:44:02 UTC ++++ lib/dns/include/dns/view.h +@@ -149,6 +149,8 @@ struct dns_view { + isc_boolean_t requestnsid; + isc_boolean_t sendcookie; + dns_ttl_t maxcachettl; ++ dns_ttl_t mincachettl; ++ dns_ttl_t overridecachettl; + dns_ttl_t maxncachettl; + isc_uint32_t nta_lifetime; + isc_uint32_t nta_recheck; +--- lib/dns/resolver.c.orig 2018-05-18 05:44:02 UTC ++++ lib/dns/resolver.c +@@ -5746,6 +5746,18 @@ cache_name(fetchctx_t *fctx, dns_name_t + } + + /* ++ * Enforce the configure cache TTL override. ++ */ ++ if (res->view->overridecachettl) ++ rdataset->ttl = res->view->overridecachettl; ++ ++ /* ++ * Enforce the configure minimum cache TTL. ++ */ ++ if (rdataset->ttl < res->view->mincachettl) ++ rdataset->ttl = res->view->mincachettl; ++ ++ /* + * Enforce the configure maximum cache TTL. + */ + if (rdataset->ttl > res->view->maxcachettl) { +--- lib/isccfg/namedconf.c.orig 2018-05-18 05:44:02 UTC ++++ lib/isccfg/namedconf.c +@@ -1916,6 +1916,8 @@ view_clauses[] = { + { "max-acache-size", &cfg_type_sizenodefault, + CFG_CLAUSEFLAG_OBSOLETE }, + { "max-cache-size", &cfg_type_sizeorpercent, 0 }, ++ { "override-cache-ttl", &cfg_type_ttlval, 0 }, ++ { "min-cache-ttl", &cfg_type_ttlval, 0 }, + { "max-cache-ttl", &cfg_type_ttlval, 0 }, + { "max-clients-per-query", &cfg_type_uint32, 0 }, + { "max-ncache-ttl", &cfg_type_ttlval, 0 }, diff --git a/dns/bind913/files/localhost-forward.db b/dns/bind913/files/localhost-forward.db new file mode 100644 index 00000000000..9156d2f0997 --- /dev/null +++ b/dns/bind913/files/localhost-forward.db @@ -0,0 +1,11 @@ + +; $FreeBSD$ + +$TTL 3h +localhost. SOA localhost. nobody.localhost. 42 1d 12h 1w 3h + ; Serial, Refresh, Retry, Expire, Neg. cache TTL + + NS localhost. + + A 127.0.0.1 + AAAA ::1 diff --git a/dns/bind913/files/localhost-reverse.db b/dns/bind913/files/localhost-reverse.db new file mode 100644 index 00000000000..ceabe059ba7 --- /dev/null +++ b/dns/bind913/files/localhost-reverse.db @@ -0,0 +1,13 @@ + +; $FreeBSD$ + +$TTL 3h +@ SOA localhost. nobody.localhost. 42 1d 12h 1w 3h + ; Serial, Refresh, Retry, Expire, Neg. cache TTL + + NS localhost. + +1.0.0 PTR localhost. + +1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 PTR localhost. + diff --git a/dns/bind913/files/named.conf.in b/dns/bind913/files/named.conf.in new file mode 100644 index 00000000000..2d23a6592fa --- /dev/null +++ b/dns/bind913/files/named.conf.in @@ -0,0 +1,380 @@ +// $FreeBSD$ +// +// Refer to the named.conf(5) and named(8) man pages, and the documentation +// in /usr/local/share/doc/bind for more details. +// +// If you are going to set up an authoritative server, make sure you +// understand the hairy details of how DNS works. Even with +// simple mistakes, you can break connectivity for affected parties, +// or cause huge amounts of useless Internet traffic. + +options { + // All file and path names are relative to the chroot directory, + // if any, and should be fully qualified. + directory "%%ETCDIR%%/working"; + pid-file "/var/run/named/pid"; + dump-file "/var/dump/named_dump.db"; + statistics-file "/var/stats/named.stats"; + +// If named is being used only as a local resolver, this is a safe default. +// For named to be accessible to the network, comment this option, specify +// the proper IP address, or delete this option. + listen-on { 127.0.0.1; }; + +// If you have IPv6 enabled on this system, uncomment this option for +// use as a local resolver. To give access to the network, specify +// an IPv6 address, or the keyword "any". +// listen-on-v6 { ::1; }; + +// These zones are already covered by the empty zones listed below. +// If you remove the related empty zones below, comment these lines out. + disable-empty-zone "255.255.255.255.IN-ADDR.ARPA"; + disable-empty-zone "0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.IP6.ARPA"; + disable-empty-zone "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.IP6.ARPA"; + +// If you've got a DNS server around at your upstream provider, enter +// its IP address here, and enable the line below. This will make you +// benefit from its cache, thus reduce overall DNS traffic in the Internet. +/* + forwarders { + 127.0.0.1; + }; +*/ + +// If the 'forwarders' clause is not empty the default is to 'forward first' +// which will fall back to sending a query from your local server if the name +// servers in 'forwarders' do not have the answer. Alternatively you can +// force your name server to never initiate queries of its own by enabling the +// following line: +// forward only; + +// If you wish to have forwarding configured automatically based on +// the entries in /etc/resolv.conf, uncomment the following line and +// set named_auto_forward=yes in /etc/rc.conf. You can also enable +// named_auto_forward_only (the effect of which is described above). +// include "%%ETCDIR%%/auto_forward.conf"; + + /* + Modern versions of BIND use a random UDP port for each outgoing + query by default in order to dramatically reduce the possibility + of cache poisoning. All users are strongly encouraged to utilize + this feature, and to configure their firewalls to accommodate it. + + AS A LAST RESORT in order to get around a restrictive firewall + policy you can try enabling the option below. Use of this option + will significantly reduce your ability to withstand cache poisoning + attacks, and should be avoided if at all possible. + + Replace NNNNN in the example with a number between 49160 and 65530. + */ + // query-source address * port NNNNN; +}; + +// If you enable a local name server, don't forget to enter 127.0.0.1 +// first in your /etc/resolv.conf so this server will be queried. +// Also, make sure to enable it in /etc/rc.conf. + +// The traditional root hints mechanism. Use this, OR the slave zones below. +zone "." { type hint; file "%%ETCDIR%%/named.root"; }; + +/* Slaving the following zones from the root name servers has some + significant advantages: + 1. Faster local resolution for your users + 2. No spurious traffic will be sent from your network to the roots + 3. Greater resilience to any potential root server failure/DDoS + + On the other hand, this method requires more monitoring than the + hints file to be sure that an unexpected failure mode has not + incapacitated your server. Name servers that are serving a lot + of clients will benefit more from this approach than individual + hosts. Use with caution. + + To use this mechanism, uncomment the entries below, and comment + the hint zone above. + + As documented at http://dns.icann.org/services/axfr/ these zones: + "." (the root), ARPA, IN-ADDR.ARPA, IP6.ARPA, and a few others + are available for AXFR from these servers on IPv4 and IPv6: + xfr.lax.dns.icann.org, xfr.cjr.dns.icann.org +*/ +/* +zone "." { + type slave; + file "%%ETCDIR%%/slave/root.slave"; + masters { + 192.0.32.132; // lax.xfr.dns.icann.org + 2620:0:2d0:202::132; // lax.xfr.dns.icann.org + 192.0.47.132; // iad.xfr.dns.icann.org + 2620:0:2830:202::132; // iad.xfr.dns.icann.org + }; + notify no; +}; +zone "arpa" { + type slave; + file "%%ETCDIR%%/slave/arpa.slave"; + masters { + 192.0.32.132; // lax.xfr.dns.icann.org + 2620:0:2d0:202::132; // lax.xfr.dns.icann.org + 192.0.47.132; // iad.xfr.dns.icann.org + 2620:0:2830:202::132; // iad.xfr.dns.icann.org + }; + notify no; +}; +zone "in-addr.arpa" { + type slave; + file "%%ETCDIR%%/slave/in-addr.arpa.slave"; + masters { + 192.0.32.132; // lax.xfr.dns.icann.org + 2620:0:2d0:202::132; // lax.xfr.dns.icann.org + 192.0.47.132; // iad.xfr.dns.icann.org + 2620:0:2830:202::132; // iad.xfr.dns.icann.org + }; + notify no; +}; +zone "ip6.arpa" { + type slave; + file "%%ETCDIR%%/slave/ip6.arpa.slave"; + masters { + 192.0.32.132; // lax.xfr.dns.icann.org + 2620:0:2d0:202::132; // lax.xfr.dns.icann.org + 192.0.47.132; // iad.xfr.dns.icann.org + 2620:0:2830:202::132; // iad.xfr.dns.icann.org + }; + notify no; +}; +*/ + +/* Serving the following zones locally will prevent any queries + for these zones leaving your network and going to the root + name servers. This has two significant advantages: + 1. Faster local resolution for your users + 2. No spurious traffic will be sent from your network to the roots +*/ +// RFCs 1912, 5735 and 6303 (and BCP 32 for localhost) +zone "localhost" { type master; file "%%ETCDIR%%/master/localhost-forward.db"; }; +zone "127.in-addr.arpa" { type master; file "%%ETCDIR%%/master/localhost-reverse.db"; }; +zone "255.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; + +// RFC 1912-style zone for IPv6 localhost address (RFC 6303) +zone "0.ip6.arpa" { type master; file "%%ETCDIR%%/master/localhost-reverse.db"; }; + +// "This" Network (RFCs 1912, 5735 and 6303) +zone "0.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; + +// Private Use Networks (RFCs 1918, 5735 and 6303) +zone "10.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "16.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "17.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "18.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "19.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "20.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "21.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "22.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "23.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "24.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "25.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "26.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "27.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "28.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "29.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "30.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "31.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "168.192.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; + +// Shared Address Space (RFC 6598) +zone "64.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "65.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "66.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "67.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "68.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "69.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "70.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "71.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "72.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "73.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "74.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "75.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "76.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "77.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "78.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "79.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "80.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "81.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "82.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "83.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "84.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "85.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "86.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "87.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "88.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "89.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "90.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "91.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "92.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "93.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "94.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "95.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "96.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "97.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "98.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "99.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "100.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "101.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "102.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "103.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "104.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "105.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "106.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "107.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "108.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "109.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "110.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "111.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "112.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "113.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "114.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "115.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "116.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "117.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "118.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "119.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "120.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "121.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "122.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "123.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "124.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "125.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "126.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "127.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; + +// Link-local/APIPA (RFCs 3927, 5735 and 6303) +zone "254.169.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; + +// IETF protocol assignments (RFCs 5735 and 5736) +zone "0.0.192.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; + +// TEST-NET-[1-3] for Documentation (RFCs 5735, 5737 and 6303) +zone "2.0.192.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "100.51.198.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "113.0.203.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; + +// IPv6 Example Range for Documentation (RFCs 3849 and 6303) +zone "8.b.d.0.1.0.0.2.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; + +// Router Benchmark Testing (RFCs 2544 and 5735) +zone "18.198.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "19.198.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; + +// IANA Reserved - Old Class E Space (RFC 5735) +zone "240.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "241.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "242.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "243.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "244.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "245.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "246.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "247.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "248.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "249.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "250.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "251.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "252.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "253.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "254.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; + +// IPv6 Unassigned Addresses (RFC 4291) +zone "1.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "3.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "4.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "5.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "6.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "7.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "8.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "9.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "a.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "b.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "c.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "d.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "e.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "0.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "1.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "2.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "3.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "4.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "5.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "6.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "7.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "8.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "9.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "a.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "b.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "0.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "1.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "2.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "3.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "4.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "5.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "6.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "7.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; + +// IPv6 ULA (RFCs 4193 and 6303) +zone "c.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "d.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; + +// IPv6 Link Local (RFCs 4291 and 6303) +zone "8.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "9.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "a.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "b.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; + +// IPv6 Deprecated Site-Local Addresses (RFCs 3879 and 6303) +zone "c.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "d.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "e.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "f.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; + +// IP6.INT is Deprecated (RFC 4159) +zone "ip6.int" { type master; file "%%ETCDIR%%/master/empty.db"; }; + +// NB: Do not use the IP addresses below, they are faked, and only +// serve demonstration/documentation purposes! +// +// Example slave zone config entries. It can be convenient to become +// a slave at least for the zone your own domain is in. Ask +// your network administrator for the IP address of the responsible +// master name server. +// +// Do not forget to include the reverse lookup zone! +// This is named after the first bytes of the IP address, in reverse +// order, with ".IN-ADDR.ARPA" appended, or ".IP6.ARPA" for IPv6. +// +// Before starting to set up a master zone, make sure you fully +// understand how DNS and BIND work. There are sometimes +// non-obvious pitfalls. Setting up a slave zone is usually simpler. +// +// NB: Don't blindly enable the examples below. :-) Use actual names +// and addresses instead. + +/* An example dynamic zone +key "exampleorgkey" { + algorithm hmac-md5; + secret "sf87HJqjkqh8ac87a02lla=="; +}; +zone "example.org" { + type master; + allow-update { + key "exampleorgkey"; + }; + file "%%ETCDIR%%/dynamic/example.org"; +}; +*/ + +/* Example of a slave reverse zone +zone "1.168.192.in-addr.arpa" { + type slave; + file "%%ETCDIR%%/slave/1.168.192.in-addr.arpa"; + masters { + 192.168.1.1; + }; +}; +*/ diff --git a/dns/bind913/files/named.in b/dns/bind913/files/named.in new file mode 100644 index 00000000000..d2815f1f905 --- /dev/null +++ b/dns/bind913/files/named.in @@ -0,0 +1,435 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: named +# REQUIRE: %%NAMED_REQUIRE%% +# BEFORE: %%NAMED_BEFORE%% +# KEYWORD: shutdown + +# +# Add the following lines to /etc/rc.conf to enable BIND: +# named_enable (bool): Run named, the DNS server (or NO). +# named_program (str): Path to named, if you want a different one. +# named_conf (str): Path to the configuration file +# named_flags (str): Use this for flags OTHER than -u and -c +# named_uid (str): User to run named as +# named_chrootdir (str): Chroot directory (or "" not to auto-chroot it) +# Historically, was /var/named +# named_chroot_autoupdate (bool): Automatically install/update chrooted +# components of named. +# named_symlink_enable (bool): Symlink the chrooted pid file +# named_wait (bool): Wait for working name service before exiting +# named_wait_host (str): Hostname to check if named_wait is enabled +# named_auto_forward (str): Set up forwarders from /etc/resolv.conf +# named_auto_forward_only (str): Do "forward only" instead of "forward first" +%%NATIVE_PKCS11%%# named_pkcs11_engine (str): Path to the PKCS#11 library to use. +# + +. /etc/rc.subr + +name=named +desc="named BIND startup script" +rcvar=named_enable + +load_rc_config ${name} + +extra_commands=reload + +start_precmd=named_prestart +start_postcmd=named_poststart +reload_cmd=named_reload +stop_cmd=named_stop +stop_postcmd=named_poststop + +named_enable=${named_enable:-"NO"} +named_program=${named_program:-"%%PREFIX%%/sbin/named"} +named_conf=${named_conf:-"%%ETCDIR%%/named.conf"} +named_flags=${named_flags:-""} +named_uid=${named_uid:-"bind"} +named_chrootdir=${named_chrootdir:-""} +named_chroot_autoupdate=${named_chroot_autoupdate:-"YES"} +named_symlink_enable=${named_symlink_enable:-"YES"} +named_wait=${named_wait:-"NO"} +named_wait_host=${named_wait_host:-"localhost"} +named_auto_forward=${named_auto_forward:-"NO"} +named_auto_forward_only=${named_auto_forward_only:-"NO"} +%%NATIVE_PKCS11%%named_pkcs11_engine=${named_pkcs11_engine:-""} + +# Not configuration variables but having them here keeps rclint happy +required_dirs="${named_chrootdir}" +_named_confdirroot="${named_conf%/*}" +_named_confdir="${named_chrootdir}${_named_confdirroot}" +_named_program_root="${named_program%/sbin/named}" +_openssl_engines="%%LOCALBASE%%/lib/engines" + +# Needed if named.conf and rndc.conf are moved or if rndc.conf is used +rndc_conf=${rndc_conf:-"$_named_confdir/rndc.conf"} +rndc_key=${rndc_key:-"$_named_confdir/rndc.key"} + +# If running in a chroot cage, ensure that the appropriate files +# exist inside the cage, as well as helper symlinks into the cage +# from outside. +# +# As this is called after the is_running and required_dir checks +# are made in run_rc_command(), we can safely assume ${named_chrootdir} +# exists and named isn't running at this point (unless forcestart +# is used). +# +chroot_autoupdate() +{ + local file + + # If it's the first time around, fiddle with things and move the + # current configuration to the chroot. + if [ -d ${_named_confdirroot} -a ! -d ${_named_confdir} ]; then + warn "named chroot: Moving current configuration in the chroot!" + install -d ${_named_confdir%/*} + mv ${_named_confdirroot} ${_named_confdir} + fi + + # Create (or update) the chroot directory structure + # + if [ -r %%PREFIX%%/etc/mtree/BIND.chroot.dist ]; then + mtree -deU -f %%PREFIX%%/etc/mtree/BIND.chroot.dist \ + -p ${named_chrootdir} + else + warn "%%PREFIX%%/etc/mtree/BIND.chroot.dist missing," + warn "${named_chrootdir} directory structure not updated" + fi + if [ -r %%PREFIX%%/etc/mtree/BIND.chroot.local.dist ]; then + mkdir -p ${named_chrootdir}%%PREFIX%% + mtree -deU -f %%PREFIX%%/etc/mtree/BIND.chroot.local.dist \ + -p ${named_chrootdir}%%PREFIX%% + else + warn "%%PREFIX%%/etc/mtree/BIND.chroot.local.dist missing," + warn "${named_chrootdir}%%PREFIX%% directory structure not updated" + fi + + # Create (or update) the configuration directory symlink + # + if [ ! -L "${_named_confdirroot}" ]; then + if [ -d "${_named_confdirroot}" ]; then + warn "named chroot: ${_named_confdirroot} is a directory!" + elif [ -e "${_named_confdirroot}" ]; then + warn "named chroot: ${_named_confdirroot} exists!" + else + ln -s ${_named_confdir} ${_named_confdirroot} + fi + else + # Make sure it points to the right place. + ln -shf ${_named_confdir} ${_named_confdirroot} + fi + + # Mount a devfs in the chroot directory if needed + # + if [ `${SYSCTL_N} security.jail.jailed` -eq 0 ]; then + umount ${named_chrootdir}/dev 2>/dev/null + devfs_domount ${named_chrootdir}/dev devfsrules_hide_all + devfs -m ${named_chrootdir}/dev rule apply path null unhide + devfs -m ${named_chrootdir}/dev rule apply path random unhide + else + if [ -c ${named_chrootdir}/dev/null -a \ + -c ${named_chrootdir}/dev/random ]; then + info "named chroot: using pre-mounted devfs." + else + err 1 "named chroot: devfs cannot be mounted from " \ + "within a jail. Thus a chrooted named cannot " \ + "be run from within a jail. Either mount the " \ + "devfs with null and random from the host, or " \ + "run named without chrooting it, set " \ + "named_chrootdir=\"\" in /etc/rc.conf." + fi + fi + + # If OpenSSL from ports, then the engines should be present in the + # chroot, named loads them after chrooting. + if [ -d ${_openssl_engines} ]; then + # FIXME when 8.4 is gone see if + # security.jail.param.allow.mount.nullfs can be used. + if [ `${SYSCTL_N} security.jail.jailed` -eq 0 -o `${SYSCTL_N} security.jail.mount_allowed` -eq 1 ]; then + mkdir -p ${named_chrootdir}${_openssl_engines} + mount -t nullfs ${_openssl_engines} ${named_chrootdir}${_openssl_engines} + else + warn "named chroot: cannot nullfs mount OpenSSL" \ + "engines into the chroot, will copy the shared" \ + "libraries instead." + mkdir -p ${named_chrootdir}${_openssl_engines} + cp -f ${_openssl_engines}/*.so ${named_chrootdir}${_openssl_engines} + fi + fi + + # Copy and/or update key files to the chroot /etc + # + for file in localtime protocols services; do + if [ -r /etc/${file} ] && \ + ! cmp -s /etc/${file} "${named_chrootdir}/etc/${file}"; then + cp -p /etc/${file} "${named_chrootdir}/etc/${file}" + fi + done +} + +# Make symlinks to the correct pid file +# +make_symlinks() +{ + checkyesno named_symlink_enable && + ln -fs "${named_chrootdir}${pidfile}" ${pidfile} && + ln -fs "${named_chrootdir}${sessionkeyfile}" ${sessionkeyfile} +} + +named_poststart() +{ + make_symlinks + + if checkyesno named_wait; then + until ${_named_program_root}/bin/host ${named_wait_host} >/dev/null 2>&1; do + echo " Waiting for nameserver to resolve ${named_wait_host}" + sleep 1 + done + fi +} + +named_reload() +{ + # This is a one line function, but ${named_program} is not defined early + # enough to be there when the reload_cmd variable is defined up there. + rndc reload +} + +find_pidfile() +{ + if get_pidfile_from_conf pid-file ${named_conf}; then + pidfile="${_pidfile_from_conf}" + else + pidfile="/var/run/named/pid" + fi +} + +find_sessionkeyfile() +{ + if get_pidfile_from_conf session-keyfile ${named_conf}; then + sessionkeyfile="${_pidfile_from_conf}" + else + sessionkeyfile="/var/run/named/session.key" + fi +} + +named_stop() +{ + find_pidfile + + # This duplicates an undesirably large amount of code from the stop + # routine in rc.subr in order to use rndc to shut down the process, + # and to give it a second chance in case rndc fails. + rc_pid=$(check_pidfile ${pidfile} ${command}) + if [ -z "${rc_pid}" ]; then + [ -n "${rc_fast}" ] && return 0 + _run_rc_notrunning + return 1 + fi + echo 'Stopping named.' + if rndc stop; then + wait_for_pids ${rc_pid} + else + echo -n 'rndc failed, trying kill: ' + kill -TERM ${rc_pid} + wait_for_pids ${rc_pid} + fi +} + +named_poststop() +{ + if [ -n "${named_chrootdir}" -a -c ${named_chrootdir}/dev/null ]; then + # if using OpenSSL from ports, unmount OpenSSL engines, if they + # were not mounted but only copied, do nothing. + if [ -d ${_openssl_engines} -a \( `${SYSCTL_N} security.jail.jailed` -eq 0 -o `${SYSCTL_N} security.jail.mount_allowed` -eq 1 \) ]; then + umount ${named_chrootdir}${_openssl_engines} + fi + # unmount /dev + if [ `${SYSCTL_N} security.jail.jailed` -eq 0 ]; then + umount ${named_chrootdir}/dev 2>/dev/null || true + else + warn "named chroot:" \ + "cannot unmount devfs from inside jail!" + fi + fi +} + +create_file() +{ + if [ -e "$1" ]; then + unlink $1 + fi + install -o root -g wheel -m 0644 /dev/null $1 +} + +rndc() +{ + if [ -z "${rndc_flags}" ]; then + if [ -s "${rndc_conf}" ] ; then + rndc_flags="-c ${rndc_conf}" + elif [ -s "${rndc_key}" ] ; then + rndc_flags="-k ${rndc_key}" + else + rndc_flags="" + fi + fi + + ${_named_program_root}/sbin/rndc ${rndc_flags} "$@" +} + +named_prestart() +{ + find_pidfile + find_sessionkeyfile + + if [ -n "${named_pidfile}" ]; then + warn 'named_pidfile: now determined from the conf file' + fi + + if [ -n "${named_sessionkeyfile}" ]; then + warn 'named_sessionkeyfile: now determined from the conf file' + fi + + piddir=`/usr/bin/dirname ${pidfile}` + if [ ! -d ${piddir} ]; then + install -d -o ${named_uid} -g ${named_uid} ${piddir} + fi + + sessionkeydir=`/usr/bin/dirname ${sessionkeyfile}` + if [ ! -d ${sessionkeydir} ]; then + install -d -o ${named_uid} -g ${named_uid} ${sessionkeydir} + fi + + command_args="-u ${named_uid:=root} -c ${named_conf} ${command_args}" + +%%NATIVE_PKCS11%% if [ -z "${named_pkcs11_engine}"]; then +%%NATIVE_PKCS11%% err 3 "named_pkcs11_engine has to be set to the PKCS#11 engine's library you want to use" +%%NATIVE_PKCS11%% elif [ ! -f ${named_pkcs11_engine} ]; then +%%NATIVE_PKCS11%% err 3 "named_pkcs11_engine the PKCS#11 engine's library you want to use doesn't exist" +%%NATIVE_PKCS11%% else +%%NATIVE_PKCS11%% mkdir -p ${named_chrootdir}${named_pkcs11_engine%/*} +%%NATIVE_PKCS11%% cp -p ${named_pkcs11_engine} ${named_chrootdir}${named_pkcs11_engine} +%%NATIVE_PKCS11%% command_args="-E ${named_pkcs11_engine} ${command_args}" +%%NATIVE_PKCS11%% fi + + local line nsip firstns + + # Is the user using a sandbox? + # + if [ -n "${named_chrootdir}" ]; then + rc_flags="${rc_flags} -t ${named_chrootdir}" + checkyesno named_chroot_autoupdate && chroot_autoupdate + + case "${altlog_proglist}" in + *named*) + ;; + *) + warn 'Using chroot without setting altlog_proglist, logging may not' + warn 'work correctly. Run sysrc altlog_proglist+=named' + ;; + esac + else + named_symlink_enable=NO + fi + + # Create an rndc.key file for the user if none exists + # + confgen_command="${_named_program_root}/sbin/rndc-confgen -a -b256 -u ${named_uid} \ + -c ${_named_confdir}/rndc.key" + if [ -s "${_named_confdir}/rndc.conf" ]; then + unset confgen_command + fi + if [ -s "${_named_confdir}/rndc.key" ]; then + case `stat -f%Su ${_named_confdir}/rndc.key` in + root|${named_uid}) ;; + *) ${confgen_command} ;; + esac + else + ${confgen_command} + fi + + local checkconf + + checkconf="${_named_program_root}/sbin/named-checkconf" + if ! checkyesno named_chroot_autoupdate && [ -n "${named_chrootdir}" ]; then + checkconf="${checkconf} -t ${named_chrootdir}" + fi + + # Create a forwarder configuration based on /etc/resolv.conf + if checkyesno named_auto_forward; then + if [ ! -s /etc/resolv.conf ]; then + warn "named_auto_forward enabled, but no /etc/resolv.conf" + + # Empty the file in case it is included in named.conf + [ -s "${_named_confdir}/auto_forward.conf" ] && + create_file ${_named_confdir}/auto_forward.conf + + ${checkconf} ${named_conf} || + err 3 'named-checkconf for ${named_conf} failed' + return + fi + + create_file /var/run/naf-resolv.conf + create_file /var/run/auto_forward.conf + + echo ' forwarders {' > /var/run/auto_forward.conf + + while read line; do + case "${line}" in + 'nameserver '*|'nameserver '*) + nsip=${line##nameserver[ ]} + + if [ -z "${firstns}" ]; then + if [ ! "${nsip}" = '127.0.0.1' ]; then + echo 'nameserver 127.0.0.1' + echo " ${nsip};" >> /var/run/auto_forward.conf + fi + + firstns=1 + else + [ "${nsip}" = '127.0.0.1' ] && continue + echo " ${nsip};" >> /var/run/auto_forward.conf + fi + ;; + esac + + echo ${line} + done < /etc/resolv.conf > /var/run/naf-resolv.conf + + echo ' };' >> /var/run/auto_forward.conf + echo '' >> /var/run/auto_forward.conf + if checkyesno named_auto_forward_only; then + echo " forward only;" >> /var/run/auto_forward.conf + else + echo " forward first;" >> /var/run/auto_forward.conf + fi + + if cmp -s /etc/resolv.conf /var/run/naf-resolv.conf; then + unlink /var/run/naf-resolv.conf + else + [ -e /etc/resolv.conf ] && unlink /etc/resolv.conf + mv /var/run/naf-resolv.conf /etc/resolv.conf + fi + + if cmp -s ${_named_confdir}/auto_forward.conf \ + /var/run/auto_forward.conf; then + unlink /var/run/auto_forward.conf + else + [ -e "${_named_confdir}/auto_forward.conf" ] && + unlink ${_named_confdir}/auto_forward.conf + mv /var/run/auto_forward.conf \ + ${_named_confdir}/auto_forward.conf + fi + else + # Empty the file in case it is included in named.conf + [ -s "${_named_confdir}/auto_forward.conf" ] && + create_file ${_named_confdir}/auto_forward.conf + fi + + ${checkconf} ${named_conf} || err 3 "named-checkconf for ${named_conf} failed" +} + +run_rc_command "$1" diff --git a/dns/bind913/files/named.root b/dns/bind913/files/named.root new file mode 100644 index 00000000000..8e3bac373eb --- /dev/null +++ b/dns/bind913/files/named.root @@ -0,0 +1,96 @@ +; +; $FreeBSD$ +; + +; This file holds the information on root name servers needed to +; initialize cache of Internet domain name servers +; (e.g. reference this file in the "cache . " +; configuration file of BIND domain name servers). +; +; This file is made available by InterNIC +; under anonymous FTP as +; file /domain/named.cache +; on server FTP.INTERNIC.NET +; -OR- RS.INTERNIC.NET +; +; last update: November 16, 2017 +; related version of root zone: 2017111601 +; +; FORMERLY NS.INTERNIC.NET +; +. 3600000 NS A.ROOT-SERVERS.NET. +A.ROOT-SERVERS.NET. 3600000 A 198.41.0.4 +A.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:ba3e::2:30 +; +; FORMERLY NS1.ISI.EDU +; +. 3600000 NS B.ROOT-SERVERS.NET. +B.ROOT-SERVERS.NET. 3600000 A 199.9.14.201 +B.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:200::b +; +; FORMERLY C.PSI.NET +; +. 3600000 NS C.ROOT-SERVERS.NET. +C.ROOT-SERVERS.NET. 3600000 A 192.33.4.12 +C.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2::c +; +; FORMERLY TERP.UMD.EDU +; +. 3600000 NS D.ROOT-SERVERS.NET. +D.ROOT-SERVERS.NET. 3600000 A 199.7.91.13 +D.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2d::d +; +; FORMERLY NS.NASA.GOV +; +. 3600000 NS E.ROOT-SERVERS.NET. +E.ROOT-SERVERS.NET. 3600000 A 192.203.230.10 +E.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:a8::e +; +; FORMERLY NS.ISC.ORG +; +. 3600000 NS F.ROOT-SERVERS.NET. +F.ROOT-SERVERS.NET. 3600000 A 192.5.5.241 +F.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2f::f +; +; FORMERLY NS.NIC.DDN.MIL +; +. 3600000 NS G.ROOT-SERVERS.NET. +G.ROOT-SERVERS.NET. 3600000 A 192.112.36.4 +G.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:12::d0d +; +; FORMERLY AOS.ARL.ARMY.MIL +; +. 3600000 NS H.ROOT-SERVERS.NET. +H.ROOT-SERVERS.NET. 3600000 A 198.97.190.53 +H.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:1::53 +; +; FORMERLY NIC.NORDU.NET +; +. 3600000 NS I.ROOT-SERVERS.NET. +I.ROOT-SERVERS.NET. 3600000 A 192.36.148.17 +I.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fe::53 +; +; OPERATED BY VERISIGN, INC. +; +. 3600000 NS J.ROOT-SERVERS.NET. +J.ROOT-SERVERS.NET. 3600000 A 192.58.128.30 +J.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:c27::2:30 +; +; OPERATED BY RIPE NCC +; +. 3600000 NS K.ROOT-SERVERS.NET. +K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129 +K.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fd::1 +; +; OPERATED BY ICANN +; +. 3600000 NS L.ROOT-SERVERS.NET. +L.ROOT-SERVERS.NET. 3600000 A 199.7.83.42 +L.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:9f::42 +; +; OPERATED BY WIDE +; +. 3600000 NS M.ROOT-SERVERS.NET. +M.ROOT-SERVERS.NET. 3600000 A 202.12.27.33 +M.ROOT-SERVERS.NET. 3600000 AAAA 2001:dc3::35 +; End of file diff --git a/dns/bind913/files/patch-bin_named_include_named_globals.h b/dns/bind913/files/patch-bin_named_include_named_globals.h new file mode 100644 index 00000000000..dba6a591278 --- /dev/null +++ b/dns/bind913/files/patch-bin_named_include_named_globals.h @@ -0,0 +1,13 @@ +We reference the pid file as being run/named/pid everywere else. + +--- bin/named/include/named/globals.h.orig 2018-05-18 05:44:02 UTC ++++ bin/named/include/named/globals.h +@@ -126,7 +126,7 @@ EXTERN isc_boolean_t named_g_forcelock + #if NAMED_RUN_PID_DIR + EXTERN const char * named_g_defaultpidfile INIT(NAMED_LOCALSTATEDIR + "/run/named/" +- "named.pid"); ++ "pid"); + #else + EXTERN const char * named_g_defaultpidfile INIT(NAMED_LOCALSTATEDIR + "/run/named.pid"); diff --git a/dns/bind913/files/patch-bin_tests_system_dlzexternal_Makefile.in b/dns/bind913/files/patch-bin_tests_system_dlzexternal_Makefile.in new file mode 100644 index 00000000000..8aa8af37029 --- /dev/null +++ b/dns/bind913/files/patch-bin_tests_system_dlzexternal_Makefile.in @@ -0,0 +1,11 @@ +--- bin/tests/system/dlzexternal/Makefile.in.orig 2018-02-26 06:30:28 UTC ++++ bin/tests/system/dlzexternal/Makefile.in +@@ -34,7 +34,7 @@ OBJS = + @BIND9_MAKE_RULES@ + + CFLAGS = @CFLAGS@ @SO_CFLAGS@ +-SO_LDFLAGS = @LDFLAGS@ @SO_LDFLAGS@ ++SO_LDFLAGS = @SO_LDFLAGS@ + + driver.@SO@: ${SO_OBJS} + ${LIBTOOL_MODE_LINK} @SO_LD@ ${SO_LDFLAGS} -o $@ driver.@O@ diff --git a/dns/bind913/files/patch-configure b/dns/bind913/files/patch-configure new file mode 100644 index 00000000000..fede241d1a3 --- /dev/null +++ b/dns/bind913/files/patch-configure @@ -0,0 +1,90 @@ +--- configure.orig 2018-05-22 23:42:35 UTC ++++ configure +@@ -14757,27 +14757,9 @@ done + # problems start to show up. + saved_libs="$LIBS" + for TRY_LIBS in \ +- "-lgssapi_krb5" \ +- "-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" \ +- "-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lresolv" \ +- "-lgssapi" \ +- "-lgssapi -lkrb5 -ldes -lcrypt -lasn1 -lroken -lcom_err" \ +- "-lgssapi -lkrb5 -lcrypt -lasn1 -lroken -lcom_err" \ +- "-lgssapi -lkrb5 -lgssapi_krb5 -lcrypt -lasn1 -lroken -lcom_err" \ +- "-lgssapi -lkrb5 -lhx509 -lcrypt -lasn1 -lroken -lcom_err" \ +- "-lgss -lkrb5" ++ "$($KRB5CONFIG gssapi --libs)"; \ + do +- # Note that this does not include $saved_libs, because +- # on FreeBSD machines this configure script has added +- # -L/usr/local/lib to LIBS, which can make the +- # -lgssapi_krb5 test succeed with shared libraries even +- # when you are trying to build with KTH in /usr/lib. +- if test "/usr" = "$use_gssapi" +- then +- LIBS="$TRY_LIBS $ISC_OPENSSL_LIBS" +- else +- LIBS="-L$use_gssapi/lib $TRY_LIBS $ISC_OPENSSL_LIBS" +- fi ++ LIBS="$TRY_LIBS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking linking as $TRY_LIBS" >&5 + $as_echo_n "checking linking as $TRY_LIBS... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -14820,47 +14802,7 @@ $as_echo "no" >&6; } ;; + no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;; + esac + +- # +- # XXXDCL Major kludge. Tries to cope with KTH in /usr/lib +- # but MIT in /usr/local/lib and trying to build with KTH. +- # /usr/local/lib can end up earlier on the link lines. +- # Like most kludges, this one is not only inelegant it +- # is also likely to be the wrong thing to do at least as +- # many times as it is the right thing. Something better +- # needs to be done. +- # +- if test "/usr" = "$use_gssapi" -a \ +- -f /usr/local/lib/libkrb5.a; then +- FIX_KTH_VS_MIT=yes +- fi +- +- case "$FIX_KTH_VS_MIT" in +- yes) +- case "$enable_static_linking" in +- yes) gssapi_lib_suffix=".a" ;; +- *) gssapi_lib_suffix=".so" ;; +- esac +- +- for lib in $LIBS; do +- case $lib in +- -L*) +- ;; +- -l*) +- new_lib=`echo $lib | +- sed -e s%^-l%$use_gssapi/lib/lib% \ +- -e s%$%$gssapi_lib_suffix%` +- NEW_LIBS="$NEW_LIBS $new_lib" +- ;; +- *) +- as_fn_error $? "KTH vs MIT Kerberos confusion!" "$LINENO" 5 +- ;; +- esac +- done +- LIBS="$NEW_LIBS" +- ;; +- esac +- +- DST_GSSAPI_INC="-I$use_gssapi/include" ++ DST_GSSAPI_INC="$($KRB5CONFIG gssapi --cflags)" + DNS_GSSAPI_LIBS="$LIBS" + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5 +@@ -23329,7 +23271,7 @@ $as_echo "" >&6; } + # Check other locations for includes. + # Order is important (sigh). + +- bdb_incdirs="/db53 /db51 /db48 /db47 /db46 /db45 /db44 /db43 /db42 /db41 /db4 /db" ++ bdb_incdirs="/db6 /db5 /db48" + # include a blank element first + for d in "" $bdb_incdirs + do diff --git a/dns/bind913/files/patch-lib_isc_include_isc_Makefile.in b/dns/bind913/files/patch-lib_isc_include_isc_Makefile.in new file mode 100644 index 00000000000..013dd1db0de --- /dev/null +++ b/dns/bind913/files/patch-lib_isc_include_isc_Makefile.in @@ -0,0 +1,11 @@ +--- lib/isc/include/isc/Makefile.in.orig 2018-05-18 05:44:02 UTC ++++ lib/isc/include/isc/Makefile.in +@@ -21,7 +21,7 @@ VERSION=@BIND9_VERSION@ + HEADERS = aes.h app.h assertions.h backtrace.h base32.h base64.h \ + bind9.h boolean.h buffer.h bufferlist.h \ + commandline.h counter.h crc64.h deprecated.h \ +- entropy.h errno.h error.h event.h eventclass.h \ ++ errno.h error.h event.h eventclass.h \ + file.h formatcheck.h fsaccess.h fuzz.h \ + hash.h heap.h hex.h hmacmd5.h hmacsha.h ht.h httpd.h \ + interfaceiter.h @ISC_IPV6_H@ iterated_hash.h \ diff --git a/dns/bind913/files/pkg-message.in b/dns/bind913/files/pkg-message.in new file mode 100644 index 00000000000..a2696e2ab2e --- /dev/null +++ b/dns/bind913/files/pkg-message.in @@ -0,0 +1,28 @@ +********************************************************************** +* _ _____ _____ _____ _ _ _____ ___ ___ _ _ * +* / \|_ _|_ _| ____| \ | |_ _|_ _/ _ \| \ | | * +* / _ \ | | | | | _| | \| | | | | | | | | \| | * +* / ___ \| | | | | |___| |\ | | | | | |_| | |\ | * +* /_/ \_\_| |_| |_____|_| \_| |_| |___\___/|_| \_| * +* * +* BIND requires configuration of rndc, including a "secret" key. * +* The easiest, and most secure way to configure rndc is to run * +* 'rndc-confgen -a' to generate the proper conf file, with a new * +* random key, and appropriate file permissions. * +* * +* The %%PREFIX%%/etc/rc.d/named script will do that for you. * +* * +* If using syslog to log the BIND9 activity, and using a * +* chroot'ed installation, you will need to tell syslog to * +* install a log socket in the BIND9 chroot by running: * +* * +* # sysrc altlog_proglist+=named * +* * +* And then restarting syslogd with: service syslogd restart * +* * +* * +* THIS IS A DEVELOPMENT VERSION OF BIND, IT MAY EAT YOUR DATA * +* * +* * +* * +********************************************************************** diff --git a/dns/bind913/pkg-descr b/dns/bind913/pkg-descr new file mode 100644 index 00000000000..c1b342a7354 --- /dev/null +++ b/dns/bind913/pkg-descr @@ -0,0 +1,15 @@ +BIND version 9 is a major rewrite of nearly all aspects of the underlying BIND +architecture. Some of the important features of BIND 9 are: + +DNS Security: DNSSEC (signed zones), TSIG (signed DNS requests) +IP version 6: Answers DNS queries on IPv6 sockets, IPv6 resource records (AAAA) + Experimental IPv6 Resolver Library +DNS Protocol Enhancements: IXFR, DDNS, Notify, EDNS0 + Improved standards conformance +Views: One server process can provide multiple "views" of the DNS namespace, + e.g. an "inside" view to certain clients, and an "outside" view to others. +Multiprocessor Support + +See the CHANGES file for more information on new features. + +WWW: https://www.isc.org/software/bind diff --git a/dns/bind913/pkg-help b/dns/bind913/pkg-help new file mode 100644 index 00000000000..c303766037c --- /dev/null +++ b/dns/bind913/pkg-help @@ -0,0 +1,38 @@ + NATIVE_PKCS11 +When using the NATIVE_PKCS11 option, BIND will use the PKCS#11 +engine specified by the named_pkcss11_engine variable in +/etc/rc.conf for *all* crypto operations. + +This is primarily intended to be used in an authoritative +case. + +If BIND is also operating as a validating resolver, +NATIVE_PKCS11 should not be used, because the HSM will be +used for all crypto, including DNSSEC validations, and the +HSM is likely to be slower than the CPU for this purpose. +Additionally, the HSM might not support all of the PKCS#11 +API functions needed for signature verification. + + + GOST +If using a chrooted instance of BIND on FreeBSD 8.x and 9.x, +the OpenSSL engines MUST be accessible from within the chroot. +If BIND is chrooted in /var/named, this can be achieved by +either copying content of /usr/local/lib/engines into +/var/named/usr/local/lib/engines, or by creating that directory +and adding this line to /etc/fstab: +/usr/local/lib/engines /var/named/usr/local/lib/engines nullfs ro 0 0 + + + START_LATE +Most of the time, BIND needs to start early in the boot +process. Enable this if BIND starts too early for you and +you need it to start later. + + + TUNING_LARGE + https://kb.isc.org/article/AA-01314/0 +Tunes certain compiled-in constants and default settings to +values better suited to large servers with 12/16GB+ of memory. +This can improve performance on such servers, but will consume +more memory and may degrade performance on smaller systems. diff --git a/dns/bind913/pkg-plist b/dns/bind913/pkg-plist new file mode 100644 index 00000000000..d16500756e9 --- /dev/null +++ b/dns/bind913/pkg-plist @@ -0,0 +1,356 @@ +bin/arpaname +bin/bind9-config +bin/delv +bin/dig +%%DNSTAP%%bin/dnstap-read +bin/host +bin/isc-config.sh +bin/mdig +bin/named-rrchecker +bin/nslookup +bin/nsupdate +@sample etc/mtree/BIND.chroot.dist.sample +@sample etc/mtree/BIND.chroot.local.dist.sample +%%ETCDIR%%/bind.keys +%%ETCDIR%%/master/empty.db +%%ETCDIR%%/master/localhost-forward.db +%%ETCDIR%%/master/localhost-reverse.db +@sample %%ETCDIR%%/named.conf.sample +%%ETCDIR%%/named.root +%%ETCDIR%%/rndc.conf.sample +include/bind9/check.h +include/bind9/getaddresses.h +include/bind9/version.h +include/dns/acl.h +include/dns/adb.h +include/dns/badcache.h +include/dns/bit.h +include/dns/byaddr.h +include/dns/cache.h +include/dns/callbacks.h +include/dns/catz.h +include/dns/cert.h +include/dns/client.h +include/dns/clientinfo.h +include/dns/compress.h +include/dns/db.h +include/dns/dbiterator.h +include/dns/dbtable.h +include/dns/diff.h +include/dns/dispatch.h +include/dns/dlz.h +include/dns/dlz_dlopen.h +include/dns/dns64.h +include/dns/dnsrps.h +include/dns/dnssec.h +include/dns/dnstap.h +%%DNSTAP%%include/dns/dnstap.pb-c.h +include/dns/ds.h +include/dns/dsdigest.h +include/dns/dyndb.h +include/dns/ecdb.h +include/dns/ecs.h +include/dns/edns.h +include/dns/enumclass.h +include/dns/enumtype.h +include/dns/events.h +include/dns/fixedname.h +include/dns/forward.h +include/dns/geoip.h +include/dns/ipkeylist.h +include/dns/iptable.h +include/dns/journal.h +include/dns/keydata.h +include/dns/keyflags.h +include/dns/keytable.h +include/dns/keyvalues.h +include/dns/lib.h +include/dns/librpz.h +include/dns/log.h +include/dns/lookup.h +include/dns/master.h +include/dns/masterdump.h +include/dns/message.h +include/dns/name.h +include/dns/ncache.h +include/dns/nsec.h +include/dns/nsec3.h +include/dns/nta.h +include/dns/opcode.h +include/dns/order.h +include/dns/peer.h +include/dns/portlist.h +include/dns/private.h +include/dns/rbt.h +include/dns/rcode.h +include/dns/rdata.h +include/dns/rdataclass.h +include/dns/rdatalist.h +include/dns/rdataset.h +include/dns/rdatasetiter.h +include/dns/rdataslab.h +include/dns/rdatastruct.h +include/dns/rdatatype.h +include/dns/request.h +include/dns/resolver.h +include/dns/result.h +include/dns/rootns.h +include/dns/rpz.h +include/dns/rriterator.h +include/dns/rrl.h +include/dns/sdb.h +include/dns/sdlz.h +include/dns/secalg.h +include/dns/secproto.h +include/dns/soa.h +include/dns/ssu.h +include/dns/stats.h +include/dns/tcpmsg.h +include/dns/time.h +include/dns/timer.h +include/dns/tkey.h +include/dns/tsec.h +include/dns/tsig.h +include/dns/ttl.h +include/dns/types.h +include/dns/update.h +include/dns/validator.h +include/dns/version.h +include/dns/view.h +include/dns/xfrin.h +include/dns/zone.h +include/dns/zonekey.h +include/dns/zt.h +include/dst/dst.h +include/dst/gssapi.h +include/dst/lib.h +include/dst/result.h +include/irs/context.h +include/irs/dnsconf.h +include/irs/netdb.h +include/irs/platform.h +include/irs/resconf.h +include/irs/types.h +include/irs/version.h +include/isc/aes.h +include/isc/app.h +include/isc/assertions.h +include/isc/atomic.h +include/isc/backtrace.h +include/isc/base32.h +include/isc/base64.h +include/isc/bind9.h +include/isc/boolean.h +include/isc/buffer.h +include/isc/bufferlist.h +include/isc/commandline.h +include/isc/condition.h +include/isc/counter.h +include/isc/crc64.h +include/isc/deprecated.h +include/isc/dir.h +include/isc/errno.h +include/isc/error.h +include/isc/event.h +include/isc/eventclass.h +include/isc/file.h +include/isc/formatcheck.h +include/isc/fsaccess.h +include/isc/fuzz.h +include/isc/hash.h +include/isc/heap.h +include/isc/hex.h +include/isc/hmacmd5.h +include/isc/hmacsha.h +include/isc/ht.h +include/isc/httpd.h +include/isc/int.h +include/isc/interfaceiter.h +include/isc/iterated_hash.h +include/isc/json.h +include/isc/keyboard.h +include/isc/lang.h +include/isc/lex.h +include/isc/lfsr.h +include/isc/lib.h +include/isc/likely.h +include/isc/list.h +include/isc/log.h +include/isc/magic.h +include/isc/md5.h +include/isc/mem.h +include/isc/meminfo.h +include/isc/msgcat.h +include/isc/msgs.h +include/isc/mutex.h +include/isc/mutexblock.h +include/isc/net.h +include/isc/netaddr.h +include/isc/netdb.h +include/isc/netscope.h +include/isc/offset.h +include/isc/once.h +include/isc/os.h +include/isc/parseint.h +include/isc/platform.h +include/isc/pool.h +include/isc/portset.h +include/isc/print.h +include/isc/queue.h +include/isc/quota.h +include/isc/radix.h +include/isc/random.h +include/isc/ratelimiter.h +include/isc/refcount.h +include/isc/regex.h +include/isc/region.h +include/isc/resource.h +include/isc/result.h +include/isc/resultclass.h +include/isc/rwlock.h +include/isc/safe.h +include/isc/serial.h +include/isc/sha1.h +include/isc/sha2.h +include/isc/sockaddr.h +include/isc/socket.h +include/isc/stat.h +include/isc/stats.h +include/isc/stdio.h +include/isc/stdlib.h +include/isc/stdtime.h +include/isc/strerror.h +include/isc/string.h +include/isc/symtab.h +include/isc/syslog.h +include/isc/task.h +include/isc/taskpool.h +include/isc/thread.h +include/isc/time.h +include/isc/timer.h +include/isc/tm.h +include/isc/types.h +include/isc/util.h +include/isc/version.h +include/isc/xml.h +include/isccc/alist.h +include/isccc/base64.h +include/isccc/cc.h +include/isccc/ccmsg.h +include/isccc/events.h +include/isccc/lib.h +include/isccc/result.h +include/isccc/sexpr.h +include/isccc/symtab.h +include/isccc/symtype.h +include/isccc/types.h +include/isccc/util.h +include/isccc/version.h +include/isccfg/aclconf.h +include/isccfg/cfg.h +include/isccfg/dnsconf.h +include/isccfg/grammar.h +include/isccfg/log.h +include/isccfg/namedconf.h +include/isccfg/version.h +include/ns/client.h +include/ns/interfacemgr.h +include/ns/lib.h +include/ns/listenlist.h +include/ns/log.h +include/ns/notify.h +include/ns/query.h +include/ns/server.h +include/ns/sortlist.h +include/ns/stats.h +include/ns/types.h +include/ns/update.h +include/ns/version.h +include/ns/xfrout.h +include/pk11/constants.h +include/pk11/internal.h +include/pk11/pk11.h +include/pk11/result.h +include/pk11/site.h +include/pkcs11/cryptoki.h +include/pkcs11/eddsa.h +include/pkcs11/pkcs11.h +include/pkcs11/pkcs11f.h +include/pkcs11/pkcs11t.h +lib/libbind9.a +lib/libdns.a +lib/libirs.a +lib/libisc.a +lib/libisccc.a +lib/libisccfg.a +lib/libns.a +man/man1/arpaname.1.gz +man/man1/bind9-config.1.gz +man/man1/delv.1.gz +man/man1/dig.1.gz +%%DNSTAP%%man/man1/dnstap-read.1.gz +man/man1/host.1.gz +man/man1/isc-config.sh.1.gz +man/man1/mdig.1.gz +man/man1/named-rrchecker.1.gz +man/man1/nslookup.1.gz +man/man1/nsupdate.1.gz +man/man5/named.conf.5.gz +man/man5/rndc.conf.5.gz +man/man8/ddns-confgen.8.gz +man/man8/dnssec-cds.8.gz +%%PYTHON%%man/man8/dnssec-checkds.8.gz +%%PYTHON%%man/man8/dnssec-coverage.8.gz +man/man8/dnssec-dsfromkey.8.gz +man/man8/dnssec-importkey.8.gz +man/man8/dnssec-keyfromlabel.8.gz +man/man8/dnssec-keygen.8.gz +%%PYTHON%%man/man8/dnssec-keymgr.8.gz +man/man8/dnssec-revoke.8.gz +man/man8/dnssec-settime.8.gz +man/man8/dnssec-signzone.8.gz +man/man8/dnssec-verify.8.gz +man/man8/named-checkconf.8.gz +man/man8/named-checkzone.8.gz +man/man8/named-compilezone.8.gz +man/man8/named-journalprint.8.gz +%%LMDB%%man/man8/named-nzd2nzf.8.gz +man/man8/named.8.gz +man/man8/nsec3hash.8.gz +%%NATIVE_PKCS11%%man/man8/pkcs11-destroy.8.gz +%%NATIVE_PKCS11%%man/man8/pkcs11-keygen.8.gz +%%NATIVE_PKCS11%%man/man8/pkcs11-list.8.gz +%%NATIVE_PKCS11%%man/man8/pkcs11-tokens.8.gz +man/man8/rndc-confgen.8.gz +man/man8/rndc.8.gz +man/man8/tsig-keygen.8.gz +sbin/ddns-confgen +sbin/dnssec-cds +%%PYTHON%%sbin/dnssec-checkds +%%PYTHON%%sbin/dnssec-coverage +sbin/dnssec-dsfromkey +sbin/dnssec-importkey +sbin/dnssec-keyfromlabel +sbin/dnssec-keygen +%%PYTHON%%sbin/dnssec-keymgr +sbin/dnssec-revoke +sbin/dnssec-settime +sbin/dnssec-signzone +sbin/dnssec-verify +sbin/named +sbin/named-checkconf +sbin/named-checkzone +sbin/named-compilezone +sbin/named-journalprint +%%LMDB%%sbin/named-nzd2nzf +sbin/nsec3hash +%%NATIVE_PKCS11%%sbin/pkcs11-destroy +%%NATIVE_PKCS11%%sbin/pkcs11-keygen +%%NATIVE_PKCS11%%sbin/pkcs11-list +%%NATIVE_PKCS11%%sbin/pkcs11-tokens +sbin/rndc +sbin/rndc-confgen +sbin/tsig-keygen +@dir(bind,bind,) %%ETCDIR%%/dynamic +@dir(bind,bind,) %%ETCDIR%%/slave +@dir(bind,bind,) %%ETCDIR%%/working diff --git a/dns/bind99/Makefile b/dns/bind99/Makefile index ca6834dfaf7..dd2fa9151cc 100644 --- a/dns/bind99/Makefile +++ b/dns/bind99/Makefile @@ -41,7 +41,7 @@ CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \ --sysconfdir=${ETCDIR} ETCDIR= ${PREFIX}/etc/namedb -CONFLICTS= bind-tools bind9-devel bind910 bind911 bind912 +CONFLICTS= bind-tools bind9-devel bind910 bind911 bind912 bind913 SUB_FILES= pkg-message named.conf USE_RC_SUBR= named diff --git a/dns/dnsproxy/pkg-descr b/dns/dnsproxy/pkg-descr index 034b390fe3b..19878f2cf56 100644 --- a/dns/dnsproxy/pkg-descr +++ b/dns/dnsproxy/pkg-descr @@ -3,4 +3,4 @@ queries to two previously configured nameservers: one for authoritative queries and another for recursive queries. The received answers are sent back to the client unchanged. No local caching is done. -WWW: http://www.wolfermann.org/dnsproxy.html +WWW: https://www.wolfermann.org/dnsproxy.html diff --git a/dns/hs-dns/Makefile b/dns/hs-dns/Makefile index 8bb869a9988..fd1826e32b0 100644 --- a/dns/hs-dns/Makefile +++ b/dns/hs-dns/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= dns -PORTVERSION= 2.0.10 -PORTREVISION= 1 +PORTVERSION= 3.0.2 CATEGORIES= dns haskell MAINTAINER= haskell@FreeBSD.org @@ -10,8 +9,9 @@ COMMENT= DNS library in Haskell LICENSE= BSD3CLAUSE -USE_CABAL= attoparsec blaze-builder conduit>=1.1 conduit-extra>=1.1 \ - iproute>=1.2.4 mtl network>=2.3 random resourcet safe +USE_CABAL= attoparsec auto-update base64-bytestring blaze-builder \ + conduit>=1.1 conduit-extra>=1.1 cryptonite iproute>=1.2.4 \ + mtl network>=2.3 psqueues random resourcet safe .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/dns/hs-dns/distinfo b/dns/hs-dns/distinfo index 599dc196d34..2fb3f865d69 100644 --- a/dns/hs-dns/distinfo +++ b/dns/hs-dns/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499620675 -SHA256 (cabal/dns-2.0.10.tar.gz) = ba03bc8fe25b58fd066588569eb5707a245cb098181e2d5cca72c239849aa6a3 -SIZE (cabal/dns-2.0.10.tar.gz) = 24142 +TIMESTAMP = 1524597697 +SHA256 (cabal/dns-3.0.2.tar.gz) = f1a895a136e1b5a77ca0d00ff627993ee3fd2f4bbd7db7de80717668e53172a4 +SIZE (cabal/dns-3.0.2.tar.gz) = 37022 diff --git a/dns/hs-dns/files/patch-dns.cabal b/dns/hs-dns/files/patch-dns.cabal deleted file mode 100644 index deed89903df..00000000000 --- a/dns/hs-dns/files/patch-dns.cabal +++ /dev/null @@ -1,34 +0,0 @@ ---- dns.cabal.orig 2017-07-11 15:30:47 UTC -+++ dns.cabal -@@ -30,7 +30,6 @@ Library - , attoparsec - , binary - , bytestring -- , bytestring-builder - , conduit >= 1.1 - , conduit-extra >= 1.1 - , containers -@@ -45,7 +44,6 @@ Library - , attoparsec - , binary - , bytestring -- , bytestring-builder - , conduit >= 1.1 - , conduit-extra >= 1.1 - , containers -@@ -67,7 +65,6 @@ Test-Suite network - Build-Depends: dns - , base - , bytestring -- , bytestring-builder - , hspec - - Test-Suite spec -@@ -82,7 +79,6 @@ Test-Suite spec - , attoparsec - , binary - , bytestring -- , bytestring-builder - , conduit >= 1.1 - , conduit-extra >= 1.1 - , containers diff --git a/dns/hs-gnuidn/Makefile b/dns/hs-gnuidn/Makefile index 9bba43d70f9..68891673edc 100644 --- a/dns/hs-gnuidn/Makefile +++ b/dns/hs-gnuidn/Makefile @@ -2,7 +2,7 @@ PORTNAME= gnuidn PORTVERSION= 0.2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= dns haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,6 @@ COMMENT= Bindings for GNU IDN LICENSE= GPLv3 -USE_CABAL= text USE_C2HS= yes USES= pkgconfig diff --git a/editors/Makefile b/editors/Makefile index 393f8ff0443..b2b8a55ec08 100644 --- a/editors/Makefile +++ b/editors/Makefile @@ -51,6 +51,7 @@ SUBDIR += gmanedit SUBDIR += gnotepad+ SUBDIR += gobby + SUBDIR += gomate SUBDIR += gwrite SUBDIR += heme SUBDIR += hexcurse @@ -77,11 +78,8 @@ SUBDIR += komodo-edit SUBDIR += latexila SUBDIR += lazarus - SUBDIR += lazarus-lcl-gtk2 - SUBDIR += lazarus-lcl-nogui - SUBDIR += lazarus-lcl-qt - SUBDIR += lazarus-lcl-qt5 - SUBDIR += lazarus-lcl-units + SUBDIR += lazarus-qt4 + SUBDIR += lazarus-qt5 SUBDIR += le SUBDIR += leafpad SUBDIR += led diff --git a/editors/coedit/Makefile b/editors/coedit/Makefile index 6a236c2d3a8..a2c85fd5df6 100644 --- a/editors/coedit/Makefile +++ b/editors/coedit/Makefile @@ -1,18 +1,17 @@ -# Created by: Alonso Cardenas Marquez # $FreeBSD$ PORTNAME= coedit -PORTVERSION= 3.6.1 +PORTVERSION= 3.6.4 DISTVERSIONPREFIX=v CATEGORIES= editors +PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX} MAINTAINER= acm@FreeBSD.org COMMENT= IDE for the D programming language LICENSE= BSL -BUILD_DEPENDS= lazbuild:editors/lazarus \ - ldmd2:lang/ldc \ +BUILD_DEPENDS= ldmd2:lang/ldc \ ${LOCALBASE}/lib/d/libiz.a:devel/iz \ ${LOCALBASE}/lib/d/libdparse.a:devel/libdparse RUN_DEPENDS= ldmd2:lang/ldc \ @@ -26,10 +25,11 @@ USE_GITHUB= yes GH_ACCOUNT= BBasile GH_PROJECT= Coedit -USES= fpc -USE_FPC= cairo chm fcl-base fcl-db fcl-image fcl-json fcl-net fcl-registry \ +USES= fpc lazarus:flavors +USE_FPC= chm fcl-base fcl-db fcl-image fcl-json fcl-net fcl-registry \ fcl-stl fcl-web fcl-xml numlib openssl pasjpeg rtl-objpas \ regexpr rtl-extra x11 +USE_XORG= x11 DESKTOP_ENTRIES="Coedit" \ "IDE for the D programming language" \ @@ -38,38 +38,23 @@ DESKTOP_ENTRIES="Coedit" \ "Application;IDE;Development;" \ ${TRUE} -OPTIONS_SINGLE= LCL -OPTIONS_SINGLE_LCL= GTK2 QT4 QT5 - -GTK2_DESC= Use gtk20 interface -QT4_DESC= Use qt4 interface -QT5_DESC= Use qt5 interface - -OPTIONS_DEFAULT= GTK2 - D_LIB_DIR= ${LOCALBASE}/lib/d D_INCLUDE_DIR= ${LOCALBASE}/include/d -PROJECT_FILE= lazproj/coedit.lpi -LAZARUS_VER= 1.8.0 -LAZBUILD_CMD= ${LOCALBASE}/bin/lazbuild -LAZARUS_DIR= ${WRKSRC}/lazarus-${LAZARUS_VER} -LCL_UNITS_DIR= ${LOCALBASE}/share/lazarus-${LAZARUS_VER}/lcl/units/${BUILDNAME} + +LAZARUS_PROJECT_FILES= anchordocking/anchordocking.lpk lazproj/coedit.lpi + +LAZBUILD_ARGS= -d + LDMD2_CMD= ${LOCALBASE}/bin/ldmd2 -GTK2_BUILD_DEPENDS= ${LCL_UNITS_DIR}/gtk2/interfaces.ppu:editors/lazarus-lcl-gtk2 -GTK2_USE= GNOME=gtk20 FPC=gtk2 -GTK2_MAKE_ENV= GUI=gtk2 -GTK2_VARS= LCL_PLATFORM=gtk2 +gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt4 ${PORTNAME}-qt5 +qt4_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt5 +qt5_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt4 -QT4_BUILD_DEPENDS= ${LCL_UNITS_DIR}/qt/interfaces.ppu:editors/lazarus-lcl-qt -QT4_LIB_DEPENDS= libQt4Pas.so:x11-toolkits/qt4pas -QT4_MAKE_ENV= GUI=qt -QT4_VARS= LCL_PLATFORM=qt - -QT4_BUILD_DEPENDS= ${LCL_UNITS_DIR}/qt5/interfaces.ppu:editors/lazarus-lcl-qt5 -QT4_LIB_DEPENDS= libQt5Pas.so:x11-toolkits/qt5pas -QT4_MAKE_ENV= GUI=qt5 -QT4_VARS= LCL_PLATFORM=qt5 +.if ${FLAVOR:Ugtk2:Mgtk2} +USE_FPC+= cairo +USE_GNOME+= cairo +.endif post-patch: ${REINPLACE_CMD} -e 's|%%LDMD2_CMD%%|${LDMD2_CMD}|g' \ @@ -79,20 +64,12 @@ post-patch: ${REINPLACE_CMD} -e 's|LINUX|UNIX|g' ${WRKSRC}/src/ce_common.pas ${WRKSRC}/src/ce_dcd.pas ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/src/ce_compilers.pas -pre-build: +post-configure: @${MKDIR} ${WRKSRC}/tmppcp - @${MKDIR} ${LAZARUS_DIR} - @cd ${LOCALBASE}/share/lazarus-${LAZARUS_VER} && \ - ${FIND} * -type d -exec ${MKDIR} ${LAZARUS_DIR}/{} \; - @cd ${LOCALBASE}/share/lazarus-${LAZARUS_VER} && \ - ${FIND} * -type f -exec ${LN} -fs ${LOCALBASE}/share/lazarus-${LAZARUS_VER}/{} ${LAZARUS_DIR}/{} \; - @${FIND} ${LAZARUS_DIR} -type d -name ${BUILDNAME} -type d -print0 | \ - ${XARGS} -0 ${RM} -R + ${CP} -a ${LAZARUS_DIR}/components/anchordocking ${WRKSRC} -do-build: +pre-build: @cd ${WRKSRC}/dastworx && ${SH} build.sh - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --ws=${LCL_PLATFORM} --lazarusdir=${LAZARUS_DIR} --pcp=${WRKSRC}/tmppcp ${PROJECT_FILE} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/coedit ${STAGEDIR}${PREFIX}/bin/ diff --git a/editors/coedit/distinfo b/editors/coedit/distinfo index be5be7d1b1c..dea06962305 100644 --- a/editors/coedit/distinfo +++ b/editors/coedit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1517606831 -SHA256 (BBasile-Coedit-v3.6.1_GH0.tar.gz) = 8bb0b6ec365c70c81a89e696b9fbfcd9a0a77f3fd5dae8b94b4b4049d95b0e9b -SIZE (BBasile-Coedit-v3.6.1_GH0.tar.gz) = 3857174 +TIMESTAMP = 1520727939 +SHA256 (BBasile-Coedit-v3.6.4_GH0.tar.gz) = afed9234facf9683e0de3620f97d2f00e4b35aae38e7b39b3bd5333ba3278052 +SIZE (BBasile-Coedit-v3.6.4_GH0.tar.gz) = 3862290 diff --git a/editors/coedit/files/patch-dastworx_build.sh b/editors/coedit/files/patch-dastworx_build.sh index 5225e39e8ab..7f62b06fd6c 100644 --- a/editors/coedit/files/patch-dastworx_build.sh +++ b/editors/coedit/files/patch-dastworx_build.sh @@ -1,6 +1,6 @@ ---- dastworx/build.sh.orig 2017-07-14 05:55:36 UTC -+++ dastworx/build.sh -@@ -1,13 +1,3 @@ +--- dastworx/build.sh 2018-02-11 21:48:35.000000000 -0500 ++++ dastworx/build.sh 2018-02-12 12:01:10.311013000 -0500 +@@ -1,18 +1,3 @@ -#iz sources -cd ../etc/iz/import/ -iz=$(find `pwd` -type f -name \*.d) @@ -10,24 +10,24 @@ -cd ../etc/libdparse/src/ -dparse=$(find `pwd` -type f -name \*.d) -cd ../../../dastworx +- +-#stdx-alloc sources +-cd ../etc/stdx-allocator/source/ +-stdxalloc=$(find `pwd` -type f -name \*.d) +-cd ../../../dastworx - #dast sources cd src/ dast=$(find `pwd` -type f -name \*.d) -@@ -16,12 +6,12 @@ cd ../ +@@ -21,9 +6,9 @@ echo building... #build --dmd ${dast[@]} ${dparse[@]} ${iz[@]} \ -+%%LDMD2_CMD%% ${dast} \ +-dmd ${dast[@]} ${dparse[@]} ${iz[@]} ${stdxalloc[@]} \ ++%%LDMD2_CMD%% ${dast} \ -O -release -inline -boundscheck=off \ ---Isrc -I../etc/iz/import -I../etc/libdparse/src \ +--Isrc -I../etc/iz/import -I../etc/libdparse/src -I../etc/stdx-allocator/source \ +-Isrc -I%%D_INCLUDE_DIR%% -L%%D_LIB_DIR%%/libiz.a -L%%D_LIB_DIR%%/libdparse.a \ -of../bin/dastworx #cleanup - rm ../bin/dastworx.o - --echo ...done -\ No newline at end of file -+echo ...done diff --git a/editors/gomate/Makefile b/editors/gomate/Makefile new file mode 100644 index 00000000000..0887edc66c3 --- /dev/null +++ b/editors/gomate/Makefile @@ -0,0 +1,20 @@ +# $FreeBSD$ + +PORTNAME= gomate +DISTVERSION= g20170711 +CATEGORIES= editors + +MAINTAINER= fabian.freyer@physik.tu-berlin.de +COMMENT= Edit files from an ssh session in TextMate/VSCode + +LICENSE= MIT + +USES= go + +USE_GITHUB= yes +GH_ACCOUNT= mattn +GH_TAGNAME= 7008ee3057500672a7b3b28360b10d1b9288f2f7 + +PLIST_FILES= bin/gomate + +.include diff --git a/editors/gomate/distinfo b/editors/gomate/distinfo new file mode 100644 index 00000000000..d5782989b6b --- /dev/null +++ b/editors/gomate/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1527262340 +SHA256 (mattn-gomate-g20170711-7008ee3057500672a7b3b28360b10d1b9288f2f7_GH0.tar.gz) = fba980ee5560edb204178ba6c2f39d0906296f366bd547b4fd3f48c339451f3e +SIZE (mattn-gomate-g20170711-7008ee3057500672a7b3b28360b10d1b9288f2f7_GH0.tar.gz) = 1464 diff --git a/editors/gomate/pkg-descr b/editors/gomate/pkg-descr new file mode 100644 index 00000000000..822450c87c6 --- /dev/null +++ b/editors/gomate/pkg-descr @@ -0,0 +1,5 @@ +Gomate is an implementation of rmate in Go. It allows editing of +files via an ssh session in TextMate, VSCode, or any other editor +that supports rmate. + +WWW: https://github.com/mattn/gomate diff --git a/editors/gomate/pkg-message b/editors/gomate/pkg-message new file mode 100644 index 00000000000..b20671e1244 --- /dev/null +++ b/editors/gomate/pkg-message @@ -0,0 +1,5 @@ +To remotely edit a file on this host connect via SSH with remote +port forwarding: + +ssh -R 52698:127.0.0.1:52698 user@example.org \ + gomate /path/to/the/file.txt diff --git a/editors/lazarus-lcl-gtk2/Makefile b/editors/lazarus-lcl-gtk2/Makefile deleted file mode 100644 index a8ac0e7b530..00000000000 --- a/editors/lazarus-lcl-gtk2/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# Created by: Alonso Cardenas Marquez -# $FreeBSD$ - -PKGNAMESUFFIX= -lcl-gtk2 - -COMMENT= Lazarus components library - GTK2 backend - -BUILD_DEPENDS= ${LCL_UNITS_DIR}/alllclunits.ppu:editors/lazarus-lcl-units - -USE_FPC= cairo chm fcl-base fcl-db fcl-image fcl-json fcl-res \ - fcl-registry fcl-xml gtk2 pasjpeg regexpr x11 - -LCL_INTERFACE= gtk2 - -MASTERDIR= ${.CURDIR}/../../editors/lazarus - -OPT= # -.include "${MASTERDIR}/Makefile" diff --git a/editors/lazarus-lcl-nogui/Makefile b/editors/lazarus-lcl-nogui/Makefile deleted file mode 100644 index b426cc58558..00000000000 --- a/editors/lazarus-lcl-nogui/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# Created by: Alonso Cardenas Marquez -# $FreeBSD$ - -PKGNAMESUFFIX= -lcl-nogui - -COMMENT= Lazarus components library - No gui backend - -BUILD_DEPENDS= ${LCL_UNITS_DIR}/alllclunits.ppu:editors/lazarus-lcl-units - -USE_FPC= chm fcl-base fcl-db fcl-image fcl-json fcl-registry fcl-xml \ - pasjpeg regexpr rtl-objpas - -LCL_INTERFACE= nogui - -MASTERDIR= ${.CURDIR}/../../editors/lazarus - -OPT= # -.include "${MASTERDIR}/Makefile" diff --git a/editors/lazarus-lcl-qt/Makefile b/editors/lazarus-lcl-qt/Makefile deleted file mode 100644 index 2847569a3d5..00000000000 --- a/editors/lazarus-lcl-qt/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# Created by: Alonso Cardenas Marquez -# $FreeBSD$ - -PKGNAMESUFFIX= -lcl-qt - -COMMENT= Lazarus components library - QT backend - -BUILD_DEPENDS= ${LCL_UNITS_DIR}/alllclunits.ppu:editors/lazarus-lcl-units - -USE_FPC= chm fcl-base fcl-db fcl-image fcl-json fcl-registry fcl-res \ - fcl-xml pasjpeg regexpr x11 - -LCL_INTERFACE= qt - -MASTERDIR= ${.CURDIR}/../../editors/lazarus - -.include "${MASTERDIR}/Makefile" diff --git a/editors/lazarus-lcl-qt/files/patch-interfaces_qt_qt45.pas b/editors/lazarus-lcl-qt/files/patch-interfaces_qt_qt45.pas deleted file mode 100644 index 0f1fdf1fc62..00000000000 --- a/editors/lazarus-lcl-qt/files/patch-interfaces_qt_qt45.pas +++ /dev/null @@ -1,11 +0,0 @@ ---- interfaces/qt/qt45.pas.orig 2014-02-05 12:08:29 UTC -+++ interfaces/qt/qt45.pas -@@ -45,7 +45,7 @@ const - {$ENDIF} - - {$IFNDEF QTOPIA} -- {$IF DEFINED(LINUX) or DEFINED(FREEBSD) or DEFINED(NETBSD)} -+ {$IF DEFINED(LINUX) or DEFINED(FREEBSD) or DEFINED(NETBSD) or DEFINED(DRAGONFLY)} - {$DEFINE BINUX} - Qt4PasLib = 'libQt4Pas.so.5'; - {$ENDIF} diff --git a/editors/lazarus-lcl-qt5/Makefile b/editors/lazarus-lcl-qt5/Makefile deleted file mode 100644 index 605a881bcb9..00000000000 --- a/editors/lazarus-lcl-qt5/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# Created by: Alonso Cardenas Marquez -# $FreeBSD$ - -PKGNAMESUFFIX= -lcl-qt5 - -COMMENT= Lazarus components library - QT5 backend - -BUILD_DEPENDS= ${LCL_UNITS_DIR}/alllclunits.ppu:editors/lazarus-lcl-units - -USE_FPC= chm fcl-base fcl-db fcl-image fcl-json fcl-registry fcl-res \ - fcl-xml pasjpeg regexpr x11 - -LCL_INTERFACE= qt5 - -MASTERDIR= ${.CURDIR}/../../editors/lazarus - -.include "${MASTERDIR}/Makefile" diff --git a/editors/lazarus-lcl-qt5/files/patch-interfaces_qt_qt45.pas b/editors/lazarus-lcl-qt5/files/patch-interfaces_qt_qt45.pas deleted file mode 100644 index 0f1fdf1fc62..00000000000 --- a/editors/lazarus-lcl-qt5/files/patch-interfaces_qt_qt45.pas +++ /dev/null @@ -1,11 +0,0 @@ ---- interfaces/qt/qt45.pas.orig 2014-02-05 12:08:29 UTC -+++ interfaces/qt/qt45.pas -@@ -45,7 +45,7 @@ const - {$ENDIF} - - {$IFNDEF QTOPIA} -- {$IF DEFINED(LINUX) or DEFINED(FREEBSD) or DEFINED(NETBSD)} -+ {$IF DEFINED(LINUX) or DEFINED(FREEBSD) or DEFINED(NETBSD) or DEFINED(DRAGONFLY)} - {$DEFINE BINUX} - Qt4PasLib = 'libQt4Pas.so.5'; - {$ENDIF} diff --git a/editors/lazarus-lcl-units/Makefile b/editors/lazarus-lcl-units/Makefile deleted file mode 100644 index 1e8e177ccf7..00000000000 --- a/editors/lazarus-lcl-units/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# Created by: Alonso Cardenas Marquez -# $FreeBSD$ - -PKGNAMESUFFIX= -lcl-units - -COMMENT= Lazarus components library units - -USE_FPC= chm fcl-base fcl-db fcl-image fcl-json fcl-registry \ - fcl-res fcl-xml iconvenc pasjpeg regexpr - -LCL_INTERFACE= # - -MASTERDIR= ${.CURDIR}/../../editors/lazarus - -OPT= "-Fu../../lcl/ -Fu../lcl -Fu../../lcl/forms -Fu../../lcl/nonwin32 -Fu../../lcl/widgetset -Fi../../lcl/include" - -.include "${MASTERDIR}/Makefile" diff --git a/editors/lazarus-qt4/Makefile b/editors/lazarus-qt4/Makefile new file mode 100644 index 00000000000..654ae66772a --- /dev/null +++ b/editors/lazarus-qt4/Makefile @@ -0,0 +1,15 @@ +# $FreeBSD$ + +PKGNAMESUFFIX?= -qt4 + +COMMENT= Portable Delphi-like IDE for the FreePascal compiler (QT4) + +CONFLICTS= ${PORTNAME}-gtk2-* ${PORTNAME}-qt5-* + +LIB_DEPENDS= libQt4Pas.so:x11-toolkits/qt4pas + +LCL_PLATFORM= qt + +MASTERDIR= ${.CURDIR}/../../editors/lazarus + +.include "${MASTERDIR}/Makefile" diff --git a/editors/lazarus-qt5/Makefile b/editors/lazarus-qt5/Makefile new file mode 100644 index 00000000000..b3f24e945de --- /dev/null +++ b/editors/lazarus-qt5/Makefile @@ -0,0 +1,16 @@ +# $FreeBSD$ + +PKGNAMESUFFIX?= -qt5 + +COMMENT= Portable Delphi-like IDE for the FreePascal compiler (QT5) + +CONFLICTS= ${PORTNAME}-gtk2-* ${PORTNAME}-qt4-* + +LIB_DEPENDS= libQt5Pas.so:x11-toolkits/qt5pas + +LCL_PLATFORM= qt5 + +MASTERDIR= ${.CURDIR}/../../editors/lazarus + +.include "${MASTERDIR}/Makefile" + diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile index 30a54a4fdaf..6d08681e125 100644 --- a/editors/lazarus/Makefile +++ b/editors/lazarus/Makefile @@ -1,8 +1,8 @@ -# Created by: Shaun Amott # $FreeBSD$ PORTNAME= lazarus -PORTVERSION= 1.8.0 +PORTVERSION= 1.8.2 +PKGNAMESUFFIX?= -gtk2 PORTREVISION?= 0 CATEGORIES= editors devel MASTER_SITES= SF/${PORTNAME}/Lazarus%20Zip%20_%20GZip/Lazarus%20${PORTVERSION} \ @@ -10,16 +10,17 @@ MASTER_SITES= SF/${PORTNAME}/Lazarus%20Zip%20_%20GZip/Lazarus%20${PORTVERSION} \ DIST_SUBDIR= freepascal MAINTAINER?= acm@FreeBSD.org -COMMENT?= Portable Delphi-like IDE for the FreePascal compiler +COMMENT?= Portable Delphi-like IDE for the FreePascal compiler (GTK2) -BUILD_DEPENDS?= # -RUN_DEPENDS?= # +CONFLICTS?= ${PORTNAME}-qt4-* ${PORTNAME}-qt5-* + +BUILD_DEPENDS?= fpcres:lang/fpc-utils +RUN_DEPENDS?= fpcres:lang/fpc-utils ONLY_FOR_ARCHS= i386 amd64 -USES= fpc gmake -USE_GNOME= # -USE_FPC?= cairo dblib fcl-base fcl-db fcl-fpcunit fcl-image fcl-json fcl-net \ +USES= fpc gettext gmake iconv +USE_FPC?= chm cairo dblib fcl-base fcl-db fcl-fpcunit fcl-image fcl-json fcl-net \ fcl-registry fcl-res fcl-web fcl-xml gtk2 ibase iconvenc mysql \ numlib odbc openssl oracle pasjpeg postgres regexpr rtl-extra \ sqlite x11 @@ -31,36 +32,16 @@ PLIST= ${WRKDIR}/pkg-plist WRKSRC?= ${WRKDIR}/${PORTNAME} DATADIR?= ${PREFIX}/share/${PORTNAME}-${PORTVERSION} -.if !defined(PKGNAMESUFFIX) OPTIONS_DEFINE= GDB -OPTIONS_SINGLE= LCL -OPTIONS_SINGLE_LCL= GTK2 QT4 QT5 - GDB_DESC= Install a newest version of gdb -GTK2_DESC= Use gtk20 interface -QT4_DESC= Use qt4 interface -QT5_DESC= Use qt5 interface - OPTIONS_DEFAULT= GTK2 GDB -.endif .include LAZARUS_ARCH= ${ARCH:S,amd64,x86_64,} BUILDNAME= ${LAZARUS_ARCH}-${OPSYS:tl} -LCL_UNITS_DIR= ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/lcl/units/${BUILDNAME} - -.if !defined(PKGNAMESUFFIX) -BUILD_DEPENDS+= fpcres:lang/fpc-utils \ - ${LCL_UNITS_DIR}/alllclunits.ppu:editors/lazarus-lcl-units \ - ${LCL_UNITS_DIR}/nogui/interfaces.ppu:editors/lazarus-lcl-nogui -RUN_DEPENDS+= fpcres:lang/fpc-utils \ - ${LCL_UNITS_DIR}/alllclunits.ppu:editors/lazarus-lcl-units \ - ${LCL_UNITS_DIR}/nogui/interfaces.ppu:editors/lazarus-lcl-nogui - -USES+= gettext iconv -USE_FPC+= chm +LCL_PLATFORM?= gtk2 MAN1S= lazarus-ide.1 lazbuild.1 startlazarus.1 SUB_FILES= pkg-message @@ -70,25 +51,9 @@ SUB_LIST+= PORTSDIR="${PORTSDIR}" RUN_DEPENDS+= ${LOCALBASE}/bin/gdb:devel/gdb .endif -.if ${PORT_OPTIONS:MGTK2} +.if ${PKGNAMESUFFIX} == "-gtk2" +USES+= gnome USE_GNOME= cairo gtk20 gdkpixbuf2 -LCL_PLATFORM= gtk2 -BUILD_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-gtk2 -RUN_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-gtk2 -.endif - -.if ${PORT_OPTIONS:MQT4} -LIB_DEPENDS+= libQt4Pas.so:x11-toolkits/qt4pas -LCL_PLATFORM= qt -BUILD_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt -RUN_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt -.endif - -.if ${PORT_OPTIONS:MQT5} -LIB_DEPENDS+= libQt5Pas.so:x11-toolkits/qt5pas -LCL_PLATFORM= qt5 -BUILD_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt5 -RUN_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt5 .endif post-extract: @@ -100,28 +65,18 @@ post-extract: @${MV} ${WRKSRC}/docs ${WRKDIR}/docs post-patch: - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' -e 's|%%DATADIR%%|${DATADIR}|g' \ - -e 's|tools: lcl|tools:|g' -e '3267d' -e '3269d' -e '3270d' -e '3271d' -e '3272d' -e '3273d' ${WRKSRC}/${MAKEFILE} - -pre-build: - @${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/lcl/units ${WRKSRC}/lcl/units - @${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/debuggerintf/lib ${WRKSRC}/components/debuggerintf/lib - @${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/ideintf/units ${WRKSRC}/components/ideintf/units - @${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/synedit/units ${WRKSRC}/components/synedit/units - @${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/lazcontrols/lib ${WRKSRC}/components/lazcontrols/lib - @${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/lazdebuggergdbmi/lib ${WRKSRC}/components/lazdebuggergdbmi/lib + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' -e 's|%%DATADIR%%|${DATADIR}|g' ${WRKSRC}/${MAKEFILE} do-build: @cd ${WRKSRC} && \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} registration lazutils codetools bigide starter lazbuild LCL_PLATFORM=${LCL_PLATFORM} + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} bigide LCL_PLATFORM=${LCL_PLATFORM} @cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} tools LCL_PLATFORM=${LCL_PLATFORM} post-build: @cd ${WRKSRC} && \ ${RM} -R COPYING* README* debian localize.bat test *.orig *.bak startlazarus.app \ - ide/Makefile*.orig ide/Makefile*.bak lcl/units components/ideintf/units \ - components/synedit/units components/lazcontrols/lib + ide/Makefile*.orig ide/Makefile*.bak pre-install: @${ECHO} "#!/bin/sh" > ${WRKDIR}/lazarus-wrapper @@ -129,7 +84,6 @@ pre-install: @${ECHO} "exec ./startlazarus" >> ${WRKDIR}/lazarus-wrapper @${RM} ${PLIST} - @${RM} ${WRKSRC}/lcl/units @${RM} -r ${WRKSRC}/components/chmhelp/lhelp/lhelp.app/Contents/MacOS \ ${WRKSRC}/lazarus.app/Contents/MacOS \ ${WRKSRC}/lazarus.app/Contents/Resources/startlazarus.app/Contents/MacOS @@ -187,8 +141,4 @@ do-install: .endfor ${LN} -s ${DATADIR}/lazbuild ${STAGEDIR}${PREFIX}/bin/lazbuild -.else -.include "${MASTERDIR}/Makefile.common" -.endif - .include diff --git a/editors/lazarus/Makefile.common b/editors/lazarus/Makefile.common deleted file mode 100644 index 8888044feeb..00000000000 --- a/editors/lazarus/Makefile.common +++ /dev/null @@ -1,104 +0,0 @@ -# $FreeBSD: ports/editors/lazarus/Makefile.common,v 1.3 2012/12/12 21:08:13 svnexp Exp $ - -EXTRACT_AFTER_ARGS= ${LCLDIR} ${PORTNAME}/packager/registration \ - ${PORTNAME}/components/lazutils ${PORTNAME}/components/ideintf \ - ${PORTNAME}/images ${PORTNAME}/components/synedit \ - ${PORTNAME}/components/lazcontrols - -.if ${PKGNAMESUFFIX} == "-lcl-nogui" -EXTRACT_AFTER_ARGS+= ${PORTNAME}/components/debuggerintf \ - ${PORTNAME}/components/lazdebuggergdbmi -.endif - -PATCHDIR= ${.CURDIR}/files -FILESDIR= ${.CURDIR}/files -PLIST_SUB+= BUILDNAME=${BUILDNAME} - -LCLDIR= ${PORTNAME}/lcl - -WRKSRC= ${WRKDIR}/${LCLDIR} - -.if ${PKGNAMESUFFIX} != "-lcl-units" -BUILDSRC= ${WRKSRC}/interfaces -.else -BUILDSRC= ${WRKSRC} -.endif - -.if ${PKGNAMESUFFIX} != "-lcl-units" -pre-build: - @${MKDIR} ${WRKSRC}/units/${BUILDNAME} - @${MKDIR} ${WRKDIR}/${PORTNAME}/components/debuggerintf/lib/${BUILDNAME} - @${MKDIR} ${WRKDIR}/${PORTNAME}/components/lazcontrols/lib/${BUILDNAME} - @${MKDIR} ${WRKDIR}/${PORTNAME}/components/ideintf/units/${BUILDNAME} - @${MKDIR} ${WRKDIR}/${PORTNAME}/components/synedit/units/${BUILDNAME} - @${MKDIR} ${WRKDIR}/${PORTNAME}/components/lazdebuggergdbmi/lib/${BUILDNAME} - @${LN} -s ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/lcl/units/${BUILDNAME}/* ${WRKDIR}/${LCLDIR}/units/${BUILDNAME}/ - @${LN} -s ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/debuggerintf/lib/${BUILDNAME}/* ${WRKDIR}/${PORTNAME}/components/debuggerintf/lib/${BUILDNAME}/ - @${LN} -s ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/lazcontrols/lib/${BUILDNAME}/* ${WRKDIR}/${PORTNAME}/components/lazcontrols/lib/${BUILDNAME}/ - @${LN} -s ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/ideintf/units/${BUILDNAME}/* ${WRKDIR}/${PORTNAME}/components/ideintf/units/${BUILDNAME}/ - @${LN} -s ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/synedit/units/${BUILDNAME}/* ${WRKDIR}/${PORTNAME}/components/synedit/units/${BUILDNAME}/ - @${LN} -s ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/lazdebuggergdbmi/lib/${BUILDNAME}/* ${WRKDIR}/${PORTNAME}/components/lazdebuggergdbmi/lib/${BUILDNAME}/ -.endif - -do-build: - @cd ${WRKDIR}/${PORTNAME}/packager/registration && \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE} - @cd ${WRKDIR}/${PORTNAME}/components/lazutils && \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE} - @cd ${WRKDIR}/${PORTNAME}/components/lazcontrols && \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE} - @cd ${WRKDIR}/${PORTNAME}/components/ideintf && \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE} - @cd ${WRKDIR}/${PORTNAME}/components/synedit && \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE} -.if ${PKGNAMESUFFIX} == "-lcl-nogui" - @cd ${WRKDIR}/${PORTNAME}/components/debuggerintf && \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE} - @cd ${WRKDIR}/${PORTNAME}/components/lazdebuggergdbmi && \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE} -.endif - @cd ${BUILDSRC} && \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE} - -pre-install: - @${RM} ${PLIST} - - @cd ${WRKSRC}/units/${BUILDNAME}/${LCL_INTERFACE} && \ - ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/lcl/units/%%BUILDNAME%%/${LCL_INTERFACE}/|' -e 's|//|/|' >> ${PLIST} -.if ${PKGNAMESUFFIX} == "-lcl-nogui" - @cd ${WRKDIR}/${PORTNAME}/components/debuggerintf/lib/${BUILDNAME}/ && \ - ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/components/debuggerintf/lib/%%BUILDNAME%%/|' -e 's|//|/|' >> ${PLIST} - @cd ${WRKDIR}/${PORTNAME}/components/lazdebuggergdbmi/lib/${BUILDNAME}/ && \ - ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/components/lazdebuggergdbmi/lib/%%BUILDNAME%%/|' -e 's|//|/|' >> ${PLIST} -.endif - @cd ${WRKDIR}/${PORTNAME}/components/ideintf/units/${BUILDNAME}/${LCL_INTERFACE} && \ - ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/components/ideintf/units/%%BUILDNAME%%/${LCL_INTERFACE}/|' -e 's|//|/|' >> ${PLIST} - @cd ${WRKDIR}/${PORTNAME}/components/synedit/units/${BUILDNAME}/${LCL_INTERFACE} && \ - ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/components/synedit/units/%%BUILDNAME%%/${LCL_INTERFACE}/|' -e 's|//|/|' >> ${PLIST} - @cd ${WRKDIR}/${PORTNAME}/components/lazcontrols/lib/${BUILDNAME}/${LCL_INTERFACE} && \ - ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/components/lazcontrols/lib/%%BUILDNAME%%/${LCL_INTERFACE}/|' -e 's|//|/|' >> ${PLIST} - -do-install: - @${MKDIR} ${STAGEDIR}${DATADIR}/lcl/units/${BUILDNAME}/${LCL_INTERFACE} -.if ${PKGNAMESUFFIX} == "-lcl-nogui" - @${MKDIR} ${STAGEDIR}${DATADIR}/components/debuggerintf/lib/${BUILDNAME} - @${MKDIR} ${STAGEDIR}${DATADIR}/components/lazdebuggergdbmi/lib/${BUILDNAME} -.endif - @${MKDIR} ${STAGEDIR}${DATADIR}/components/ideintf/units/${BUILDNAME}/${LCL_INTERFACE} - @${MKDIR} ${STAGEDIR}${DATADIR}/components/synedit/units/${BUILDNAME}/${LCL_INTERFACE} - @${MKDIR} ${STAGEDIR}${DATADIR}/components/lazcontrols/lib/${BUILDNAME}/${LCL_INTERFACE} - - @cd ${WRKSRC}/units/${BUILDNAME}/${LCL_INTERFACE} && \ - ${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DATADIR}/lcl/units/${BUILDNAME}/${LCL_INTERFACE}/{}" \; -.if ${PKGNAMESUFFIX} == "-lcl-nogui" - @cd ${WRKDIR}/${PORTNAME}/components/debuggerintf/lib/${BUILDNAME} && \ - ${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DATADIR}/components/debuggerintf/lib/${BUILDNAME}/{}" \; - @cd ${WRKDIR}/${PORTNAME}/components/lazdebuggergdbmi/lib/${BUILDNAME} && \ - ${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DATADIR}/components/lazdebuggergdbmi/lib/${BUILDNAME}/{}" \; -.endif - @cd ${WRKDIR}/${PORTNAME}/components/ideintf/units/${BUILDNAME}/${LCL_INTERFACE} && \ - ${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DATADIR}/components/ideintf/units/${BUILDNAME}/${LCL_INTERFACE}/{}" \; - @cd ${WRKDIR}/${PORTNAME}/components/synedit/units/${BUILDNAME}/${LCL_INTERFACE} && \ - ${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DATADIR}/components/synedit/units/${BUILDNAME}/${LCL_INTERFACE}/{}" \; - @cd ${WRKDIR}/${PORTNAME}/components/lazcontrols/lib/${BUILDNAME}/${LCL_INTERFACE} && \ - ${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DATADIR}/components/lazcontrols/lib/${BUILDNAME}/${LCL_INTERFACE}/{}" \; diff --git a/editors/lazarus/distinfo b/editors/lazarus/distinfo index fc2574cebbd..bf194cecc81 100644 --- a/editors/lazarus/distinfo +++ b/editors/lazarus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1513100874 -SHA256 (freepascal/lazarus-1.8.0.tar.gz) = 320888ba1af17295b8d3993d50c31780d137e363e05797e3575eee90f3b3a844 -SIZE (freepascal/lazarus-1.8.0.tar.gz) = 62114372 +TIMESTAMP = 1520354258 +SHA256 (freepascal/lazarus-1.8.2.tar.gz) = 252861f86b7e49487fa925195b78e8ab6a68528d3e6059cf68630fb5bc6d5219 +SIZE (freepascal/lazarus-1.8.2.tar.gz) = 62935678 diff --git a/editors/lazarus/files/patch-Makefile b/editors/lazarus/files/patch-Makefile index 9ee3b84e66a..9ac26bed5b2 100644 --- a/editors/lazarus/files/patch-Makefile +++ b/editors/lazarus/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile 2014-03-23 19:30:47.000000000 -0500 -+++ Makefile 2014-03-25 19:19:37.000000000 -0500 -@@ -294,7 +294,7 @@ +--- Makefile.orig 2018-02-25 03:49:41.000000000 -0500 ++++ Makefile 2018-03-06 15:24:00.905598000 -0500 +@@ -339,7 +339,7 @@ LAZARUS_INSTALL_DIR=C:\lazarus endif ifneq ($(findstring $(OS_TARGET),freebsd),) @@ -9,12 +9,3 @@ endif ifneq ($(findstring $(OS_TARGET),win32 win64),) IDEVERSION=$(shell .\tools\install\get_lazarus_version.bat) -@@ -2848,7 +2848,7 @@ - examples: - $(MAKE) -C examples - all: lazbuild lcl basecomponents ide starter --bigide: lazbuild lcl basecomponents bigidecomponents idebig starter lhelp -+bigide: lazbuild bigidecomponents idebig starter lhelp - cleanide: - $(MAKE) -C ide cleanide - cleanlaz: cleanide diff --git a/editors/lazarus/files/patch-components-synedit_synedit.pp b/editors/lazarus/files/patch-components-synedit_synedit.pp deleted file mode 100644 index 92a6300235d..00000000000 --- a/editors/lazarus/files/patch-components-synedit_synedit.pp +++ /dev/null @@ -1,20 +0,0 @@ ---- components/synedit/synedit.pp 2018-01-30 13:41:54.904942000 -0500 -+++ components/synedit/synedit.pp 2018-01-30 13:40:23.811860000 -0500 -@@ -8945,7 +8945,7 @@ - while not Highlighter.GetEol do begin - Start := Highlighter.GetTokenPos + 1; - Token := Highlighter.GetToken; -- if (PosX >= Start) and (PosX <= Start + Length(Token)) then begin -+ if (PosX >= Start) and (PosX < Start + Length(Token)) then begin - Attri := Highlighter.GetTokenAttribute; - TokenType := Highlighter.GetTokenKind; - exit(True); -@@ -8990,7 +8990,7 @@ - //TokenType := Highlighter.GetTokenKind; - Attri := Highlighter.GetTokenAttribute; - //DebugLn([' TCustomSynEdit.CaretAtIdentOrString: Start=', Start, ', Token=', Token]); -- if (PosX >= Start) and (PosX <= Start + Length(Token)) then -+ if (PosX >= Start) and (PosX < Start + Length(Token)) then - begin - AtIdent := Attri = Highlighter.IdentifierAttribute; - NearString := (Attri = Highlighter.StringAttribute) diff --git a/editors/lazarus/files/pkg-message.in b/editors/lazarus/files/pkg-message.in index 185aa361e4c..a345a4a2469 100644 --- a/editors/lazarus/files/pkg-message.in +++ b/editors/lazarus/files/pkg-message.in @@ -24,12 +24,11 @@ The Lazarus RAD was installed and these can be built with an interface different than lazarus has compiled by default: - editors/lazarus-lcl-nogui - editors/lazarus-lcl-gtk2 - editors/lazarus-lcl-qt - editors/lazarus-lcl-qt5 + editors/lazarus + editors/lazarus-qt4 + editors/lazarus-qt5 - You can added those ports if you want support for nogui, gtk2, qt or qt5 + You can added those ports if you want support for gtk2, qt4 or qt5 interfaces. Please look at net-p2p/transmission-remote-gui like a example of how use it diff --git a/emulators/citra/Makefile b/emulators/citra/Makefile index 17d0c90e286..c468aab5f4b 100644 --- a/emulators/citra/Makefile +++ b/emulators/citra/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= citra -PORTVERSION= s20180518 +PORTVERSION= s20180525 PORTREVISION?= 0 CATEGORIES= emulators @@ -27,14 +27,14 @@ ONLY_FOR_ARCHS_REASON= https://github.com/MerryMage/dynarmic/issues/35 USE_GITHUB= yes GH_ACCOUNT= citra-emu -GH_TAGNAME= e35c634f +GH_TAGNAME= 03209efe GH_TUPLE= citra-emu:ext-libressl-portable:cbb1dca:libressl/externals/libressl \ citra-emu:ext-soundtouch:019d208:soundtouch/externals/soundtouch \ MerryMage:dynarmic:d1d4705:dynarmic/externals/dynarmic \ benhoyt:inih:r40:inih/externals/inih/inih \ catchorg:Catch2:v2.1.1:catch/externals/catch \ fmtlib:fmt:4.0.0-510-g5859e58:fmt/externals/fmt \ - herumi:xbyak:v5.53-1-gc5da377:xbyak/externals/xbyak \ + herumi:xbyak:v5.64:xbyak/externals/xbyak \ lsalzman:enet:39a72ab:enet/externals/enet \ neobrain:nihstro:fd69de1:nihstro/externals/nihstro \ weidai11:cryptopp:CRYPTOPP_6_1_0:cryptopp/externals/cryptopp/cryptopp diff --git a/emulators/citra/distinfo b/emulators/citra/distinfo index 769fd924dcc..82b600e68f2 100644 --- a/emulators/citra/distinfo +++ b/emulators/citra/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1526670258 -SHA256 (citra-emu-citra-s20180518-e35c634f_GH0.tar.gz) = c59e67b08509059ea41fd788dfedfe6a65c2a0a691460360bcd211d366123a3e -SIZE (citra-emu-citra-s20180518-e35c634f_GH0.tar.gz) = 2181703 +TIMESTAMP = 1527269952 +SHA256 (citra-emu-citra-s20180525-03209efe_GH0.tar.gz) = 29a8fb6839832bc4662ff9e09d1210f67b47fe9408c3e9a95bebced3fdf7f792 +SIZE (citra-emu-citra-s20180525-03209efe_GH0.tar.gz) = 2209762 SHA256 (citra-emu-ext-libressl-portable-cbb1dca_GH0.tar.gz) = f3741a3bb480d9f8a817f032f59d1908e659620cbb93c0fe8289cfb46d2ab89c SIZE (citra-emu-ext-libressl-portable-cbb1dca_GH0.tar.gz) = 1761962 SHA256 (citra-emu-ext-soundtouch-019d208_GH0.tar.gz) = f48c211bbabe7ad79e1c504af1082756c74241be6bab4aca13140803f4b694e7 @@ -13,8 +13,8 @@ SHA256 (catchorg-Catch2-v2.1.1_GH0.tar.gz) = c40d3c8133c9274946067007e911a55b0d0 SIZE (catchorg-Catch2-v2.1.1_GH0.tar.gz) = 481236 SHA256 (fmtlib-fmt-4.0.0-510-g5859e58_GH0.tar.gz) = 6d719fe37c54ffcd6a7c1679a288e4947304cc24b4ff00aaf679ef0b0474a7b3 SIZE (fmtlib-fmt-4.0.0-510-g5859e58_GH0.tar.gz) = 623334 -SHA256 (herumi-xbyak-v5.53-1-gc5da377_GH0.tar.gz) = 51129bc945fe2650f5fcd41f3b0166555b17589f03bda5d2216927234ef6446a -SIZE (herumi-xbyak-v5.53-1-gc5da377_GH0.tar.gz) = 206888 +SHA256 (herumi-xbyak-v5.64_GH0.tar.gz) = e329c76774ef8e1e89b6407de70e29ed1f93ad4abbfc12437f5e2b74d69b3acf +SIZE (herumi-xbyak-v5.64_GH0.tar.gz) = 212271 SHA256 (lsalzman-enet-39a72ab_GH0.tar.gz) = cdeec4d447266d93dbd56564b260c57e411dc681caba6887a7e3f152009e6be1 SIZE (lsalzman-enet-39a72ab_GH0.tar.gz) = 79471 SHA256 (neobrain-nihstro-fd69de1_GH0.tar.gz) = cebeb307aad4b9fbc4d26eb54c01c90e118bc6287ab65688a50303a59272be5a diff --git a/emulators/ppsspp-qt5/Makefile b/emulators/ppsspp-qt5/Makefile index ce0f451bc9d..e436926eb3d 100644 --- a/emulators/ppsspp-qt5/Makefile +++ b/emulators/ppsspp-qt5/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 PKGNAMESUFFIX= -qt5 MASTERDIR= ${.CURDIR}/../ppsspp diff --git a/emulators/ppsspp/Makefile b/emulators/ppsspp/Makefile index f2580a48198..e4ccd46e78b 100644 --- a/emulators/ppsspp/Makefile +++ b/emulators/ppsspp/Makefile @@ -2,17 +2,14 @@ PORTNAME= ppsspp DISTVERSIONPREFIX= v -DISTVERSION?= 1.5.4 -PORTREVISION?= 1 +DISTVERSION?= 1.6 +PORTREVISION?= 0 CATEGORIES= emulators # XXX Get from Debian once #697821 lands MASTER_SITES= https://bazaar.launchpad.net/~sergio-br2/${PORTNAME}/debian-sdl/download/5/${PORTNAME}.1-20140802045408-dd26dik367ztj5xg-8/:manpage DISTFILES= ${PORTNAME}.1:manpage EXTRACT_ONLY= ${DISTFILES:N*\:manpage:C/:.*//} -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES= 70c54a7d1ab1.patch:-p1 - MAINTAINER= jbeich@FreeBSD.org COMMENT= PSP emulator in C++ with dynarec JIT for x86, ARM, MIPS @@ -26,7 +23,7 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils USE_GITHUB= yes GH_ACCOUNT= hrydgard GH_TUPLE?= hrydgard:glslang:2edde666:glslang/ext/glslang \ - hrydgard:${PORTNAME}-lang:1e3e4a0:lang/assets/lang \ + hrydgard:${PORTNAME}-lang:c2c4ad9:lang/assets/lang \ KhronosGroup:SPIRV-Cross:90966d5:SPIRV/ext/SPIRV-Cross \ Kingcom:armips:v0.9-89-g8b4cada:armips/ext/armips \ Kingcom:tinyformat:Release-2.0.1-7-gb7f5a22:tinyformat/ext/armips/ext/tinyformat @@ -38,7 +35,7 @@ EXCLUDE= libzip zlib EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ,} USE_GL= gl glew glu USE_SDL= sdl2 # joystick -CMAKE_ON= USE_SYSTEM_FFMPEG +CMAKE_ON= USE_SYSTEM_FFMPEG USE_SYSTEM_LIBZIP CMAKE_OFF= USING_EGL SUB_FILES= pkg-message PORTDATA= assets ${PORTNAME} @@ -53,9 +50,13 @@ DESKTOP_ENTRIES="PPSSPP" \ OPTIONS_DEFINE= OLDJOY OPTIONS_SINGLE= GUI OPTIONS_SINGLE_GUI= QT5 SDL -OPTIONS_SLAVE?= SDL +OPTIONS_SLAVE?= LIBRETRO SDL OPTIONS_EXCLUDE:= ${OPTIONS_SINGLE_GUI} +LIBRETRO_DESC= libretro core for games/retroarch +LIBRETRO_CMAKE_BOOL= LIBRETRO +LIBRETRO_PLIST_FILES= lib/libretro/${PORTNAME}_libretro.so +LIBRETRO_IMPLIES= SDL OLDJOY_DESC= Old joystick support with fixed button mappings (deprecated) OLDJOY_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-old-joy QT5_USE= QT5=qmake_build,buildtools_build,linguisttools_build,gui,opengl,widgets @@ -90,4 +91,9 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/icons/icon-512.svg \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/${PORTNAME}.svg +do-install-LIBRETRO-on: + ${MKDIR} ${STAGEDIR}${PREFIX}/${LIBRETRO_PLIST_FILES:H} + ${INSTALL_LIB} ${BUILD_WRKSRC}/lib/${LIBRETRO_PLIST_FILES:T} \ + ${STAGEDIR}${PREFIX}/${LIBRETRO_PLIST_FILES:H} + .include diff --git a/emulators/ppsspp/distinfo b/emulators/ppsspp/distinfo index 4fa4b632e1b..18cc6b1dcfa 100644 --- a/emulators/ppsspp/distinfo +++ b/emulators/ppsspp/distinfo @@ -1,17 +1,15 @@ -TIMESTAMP = 1512481911 +TIMESTAMP = 1527337592 SHA256 (ppsspp.1) = 64a7cca4c3a5fc6ad5b63399edef9056b0c85ea68fed00fb7e97f4b2724e503b SIZE (ppsspp.1) = 1598 -SHA256 (hrydgard-ppsspp-v1.5.4_GH0.tar.gz) = e739155f135f9b3e2e5ce85d0cc11028c4ad71a0078673abe3f908ac6875284a -SIZE (hrydgard-ppsspp-v1.5.4_GH0.tar.gz) = 19008538 +SHA256 (hrydgard-ppsspp-v1.6_GH0.tar.gz) = d5f7f10b0d39cd927c08bb296a22c9b724ce40f8cc0be17136ff845f33b7ffa5 +SIZE (hrydgard-ppsspp-v1.6_GH0.tar.gz) = 19472093 SHA256 (hrydgard-glslang-2edde666_GH0.tar.gz) = 9ab09c2aa5a89b2c32297358d25850bec56667aa28fdfe6986fbedd1ced28e78 SIZE (hrydgard-glslang-2edde666_GH0.tar.gz) = 1941913 -SHA256 (hrydgard-ppsspp-lang-1e3e4a0_GH0.tar.gz) = 9b4f7356c5e17de9910a70f82d7ea5593db6d8b05e369ca2d8095d371f1ca9c3 -SIZE (hrydgard-ppsspp-lang-1e3e4a0_GH0.tar.gz) = 347352 +SHA256 (hrydgard-ppsspp-lang-c2c4ad9_GH0.tar.gz) = 6ba8b1cf10686ae141ed7d87480b4907a702eb2479f4e4e196cb612d2206a39e +SIZE (hrydgard-ppsspp-lang-c2c4ad9_GH0.tar.gz) = 477345 SHA256 (KhronosGroup-SPIRV-Cross-90966d5_GH0.tar.gz) = de8bcf01e0a0c4107871fdc8b764771487052fedbe2990a369e7908d4a95c000 SIZE (KhronosGroup-SPIRV-Cross-90966d5_GH0.tar.gz) = 228783 SHA256 (Kingcom-armips-v0.9-89-g8b4cada_GH0.tar.gz) = c41aa68bd6798356af568509de4f298485f752f620caae35ff84d17ff798b227 SIZE (Kingcom-armips-v0.9-89-g8b4cada_GH0.tar.gz) = 191171 SHA256 (Kingcom-tinyformat-Release-2.0.1-7-gb7f5a22_GH0.tar.gz) = d86b5b4592047254c5118d0639e51d00869b3adc2f2c5419fdf29381ca42011e SIZE (Kingcom-tinyformat-Release-2.0.1-7-gb7f5a22_GH0.tar.gz) = 22286 -SHA256 (70c54a7d1ab1.patch) = bb8cda9414a11fd611c6214e3c46d30ad373b3f1a68b3c8afb60311e830ca1c6 -SIZE (70c54a7d1ab1.patch) = 1111 diff --git a/emulators/ppsspp/files/extra-patch-old-joy b/emulators/ppsspp/files/extra-patch-old-joy index e70948bb286..a540671f3b0 100644 --- a/emulators/ppsspp/files/extra-patch-old-joy +++ b/emulators/ppsspp/files/extra-patch-old-joy @@ -464,14 +464,3 @@ https://github.com/hrydgard/ppsspp/commit/ac0052c6af92 + + int getDeviceIndex(int instanceId); }; ---- ext/native/base/PCMain.cpp.orig 2017-10-04 19:26:40 UTC -+++ ext/native/base/PCMain.cpp -@@ -428,7 +428,7 @@ int main(int argc, char *argv[]) { - NativeGetAppInfo(&app_name, &app_name_nice, &landscape, &version); - - bool joystick_enabled = true; -- if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER | SDL_INIT_AUDIO) < 0) { -+ if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO) < 0) { - joystick_enabled = false; - if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO) < 0) { - fprintf(stderr, "Unable to initialize SDL: %s\n", SDL_GetError()); diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile index 948a1a35734..98a93783c97 100644 --- a/emulators/rpcs3/Makefile +++ b/emulators/rpcs3/Makefile @@ -2,8 +2,8 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.5-382 -DISTVERSIONSUFFIX= -gc10b39923 +DISTVERSION= 0.0.5-391 +DISTVERSIONSUFFIX= -g964b3937a CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org @@ -30,6 +30,7 @@ GH_TUPLE= RPCS3:hidapi:hidapi-0.8.0-rc1-25-gca39ce8:hidapi/3rdparty/hidapi \ akrzemi1:Optional:f27e790:Optional/3rdparty/Optional \ Cyan4973:xxHash:v0.6.5:xxHash/3rdparty/xxHash \ kobalicek:asmjit:673dcef:asmjit/asmjit \ + KhronosGroup:glslang:3.0-1794-ge22e3473:glslang/Vulkan/glslang \ Microsoft:GSL:fc5fce4:GSL/3rdparty/GSL \ USCiLab:cereal:v1.2.0:cereal/3rdparty/cereal \ zeux:pugixml:v1.8.1-148-g257fbb4:pugixml/3rdparty/pugixml @@ -69,9 +70,8 @@ PULSEAUDIO_LIB_DEPENDS= libpulse-simple.so:audio/pulseaudio PULSEAUDIO_CMAKE_BOOL= USE_PULSE VULKAN_DESC= Vulkan renderer -VULKAN_BUILD_DEPENDS= ${LOCALBASE}/lib/libglslang.a:devel/glslang VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-sdk -VULKAN_CMAKE_BOOL= USE_VULKAN VULKAN_PREBUILT +VULKAN_CMAKE_BOOL= USE_VULKAN post-patch: @${REINPLACE_CMD} -e '/GIT_BRANCH/s/unknown/master/' \ diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo index 596d65f2745..499c51644b9 100644 --- a/emulators/rpcs3/distinfo +++ b/emulators/rpcs3/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1527091628 -SHA256 (RPCS3-rpcs3-v0.0.5-382-gc10b39923_GH0.tar.gz) = feae291e55d513726939ba8f05b2de65ceca15b2b68d3c4f112f5ab2532cb382 -SIZE (RPCS3-rpcs3-v0.0.5-382-gc10b39923_GH0.tar.gz) = 4920581 +TIMESTAMP = 1527192891 +SHA256 (RPCS3-rpcs3-v0.0.5-391-g964b3937a_GH0.tar.gz) = 0606b68bae873601aa48a2be04c18b376f23cf69ce26388f548a9b28ca0e1169 +SIZE (RPCS3-rpcs3-v0.0.5-391-g964b3937a_GH0.tar.gz) = 4925875 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = e50e4f4e9035e891e16867e995f44aac87ce734a9dde169f02fc9719b2ce3642 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = 105623 SHA256 (RPCS3-llvm-17ec6d78a73_GH0.tar.gz) = 4567d1d946429ce55d6c0480fad3b82874aad22c2b1928ac4d4ba5ba40338604 @@ -13,6 +13,8 @@ SHA256 (Cyan4973-xxHash-v0.6.5_GH0.tar.gz) = 19030315f4fc1b4b2cdb9d7a317069a109f SIZE (Cyan4973-xxHash-v0.6.5_GH0.tar.gz) = 37521 SHA256 (kobalicek-asmjit-673dcef_GH0.tar.gz) = 228dd2f422740a1c9e713f1c86934e95d75fc1a8731a88ea006a2cebb033ca8c SIZE (kobalicek-asmjit-673dcef_GH0.tar.gz) = 448118 +SHA256 (KhronosGroup-glslang-3.0-1794-ge22e3473_GH0.tar.gz) = cc1f9bd99f875650113cdf4870caa1fc5510c571ac61368834586e6c856831d7 +SIZE (KhronosGroup-glslang-3.0-1794-ge22e3473_GH0.tar.gz) = 1981069 SHA256 (Microsoft-GSL-fc5fce4_GH0.tar.gz) = 2df1538ff240bf4dd3ef44ba8c832451376fff8e74f7734d32fc8c337557a64d SIZE (Microsoft-GSL-fc5fce4_GH0.tar.gz) = 38809 SHA256 (USCiLab-cereal-v1.2.0_GH0.tar.gz) = 1ccf3ed205a7a2f0d6a060415b123f1ae0d984cd4435db01af8de11a2eda49c1 diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index 2fb1786e311..dc1074913ae 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wine -DISTVERSION= 3.8 +DISTVERSION= 3.9 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= http://mirrors.ibiblio.org/wine/source/3.x/ \ @@ -56,7 +56,7 @@ SUB_FILES= pkg-message PORTDATA= l_intl.nls wine.inf -OPTIONS_DEFINE= CUPS DOCS DOSBOX GNUTLS HAL LDAP LIBXSLT MPG123 OPENAL STAGING V4L WINEMAKER X11 GECKO MONO +OPTIONS_DEFINE= CUPS DOCS DOSBOX GNUTLS HAL LDAP LIBXSLT MPG123 OPENAL STAGING V4L VKD3D WINEMAKER X11 GECKO MONO OPTIONS_DEFAULT=GNUTLS X11 OPTIONS_SUB= yes diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo index 04f9baa40ea..5f5b5c5aec0 100644 --- a/emulators/wine-devel/distinfo +++ b/emulators/wine-devel/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1526178184 -SHA256 (wine-3.8.tar.xz) = 02b00c6c948b3bab717e1b1e2075a5406b14d138bd2e01fdb1268a93d1c20d51 -SIZE (wine-3.8.tar.xz) = 20473392 -SHA256 (v3.8.tar.gz) = fd40c24e00b3da4498f78885a5d3c4a9699790c1de78f6e43ff151432824f2ad -SIZE (v3.8.tar.gz) = 9957202 +TIMESTAMP = 1527370158 +SHA256 (wine-3.9.tar.xz) = ccadc281966d5a94f1161dec22d29bf7bd6506b371b26f18f652d374e986b735 +SIZE (wine-3.9.tar.xz) = 20508952 +SHA256 (v3.9.tar.gz) = 4e919585aba04654a42290a9ba31fb0b62ec0960d149759d88c86c4ff3778bf8 +SIZE (v3.9.tar.gz) = 9932873 diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist index f1ea54cdbee..b93d1b2d363 100644 --- a/emulators/wine-devel/pkg-plist +++ b/emulators/wine-devel/pkg-plist @@ -1244,7 +1244,7 @@ lib/wine/d3d10.dll.so lib/wine/d3d10_1.dll.so lib/wine/d3d10core.dll.so lib/wine/d3d11.dll.so -lib/wine/d3d12.dll.so +%%VKD3D%%lib/wine/d3d12.dll.so lib/wine/d3d8.dll.so lib/wine/d3d9.dll.so lib/wine/d3dcompiler_33.dll.so @@ -1389,7 +1389,7 @@ lib/wine/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0.dll.so lib/wine/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.dll.so lib/wine/ext-ms-win-security-credui-l1-1-0.dll.so lib/wine/ext-ms-win-security-cryptui-l1-1-0.dll.so -%%STAGING%%lib/wine/ext-ms-win-uxtheme-themes-l1-1-0.dll.so +lib/wine/ext-ms-win-uxtheme-themes-l1-1-0.dll.so %%STAGING%%lib/wine/ext-ms-win-xaml-pal-l1-1-0.dll.so lib/wine/extrac32.exe.so lib/wine/fakedlls/acledit.dll @@ -1670,7 +1670,7 @@ lib/wine/fakedlls/d3d10.dll lib/wine/fakedlls/d3d10_1.dll lib/wine/fakedlls/d3d10core.dll lib/wine/fakedlls/d3d11.dll -lib/wine/fakedlls/d3d12.dll +%%VKD3D%%lib/wine/fakedlls/d3d12.dll lib/wine/fakedlls/d3d8.dll lib/wine/fakedlls/d3d9.dll lib/wine/fakedlls/d3dcompiler_33.dll @@ -1815,11 +1815,11 @@ lib/wine/fakedlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0.dll lib/wine/fakedlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.dll lib/wine/fakedlls/ext-ms-win-security-credui-l1-1-0.dll lib/wine/fakedlls/ext-ms-win-security-cryptui-l1-1-0.dll -%%STAGING%%lib/wine/fakedlls/ext-ms-win-uxtheme-themes-l1-1-0.dll +lib/wine/fakedlls/ext-ms-win-uxtheme-themes-l1-1-0.dll %%STAGING%%lib/wine/fakedlls/ext-ms-win-xaml-pal-l1-1-0.dll lib/wine/fakedlls/extrac32.exe lib/wine/fakedlls/faultrep.dll -%%STAGING%%lib/wine/fakedlls/feclient.dll +lib/wine/fakedlls/feclient.dll lib/wine/fakedlls/findstr.exe lib/wine/fakedlls/fltlib.dll lib/wine/fakedlls/fltmgr.sys @@ -2301,7 +2301,7 @@ lib/wine/fakedlls/xolehlp.dll lib/wine/fakedlls/xpsprint.dll lib/wine/fakedlls/xpssvcs.dll lib/wine/faultrep.dll.so -%%STAGING%%lib/wine/feclient.dll.so +lib/wine/feclient.dll.so lib/wine/findstr.exe.so lib/wine/fltlib.dll.so lib/wine/fltmgr.sys.so @@ -2393,7 +2393,7 @@ lib/wine/libd3d10.def lib/wine/libd3d10_1.def lib/wine/libd3d10core.def lib/wine/libd3d11.def -lib/wine/libd3d12.def +%%VKD3D%%lib/wine/libd3d12.def lib/wine/libd3d8.def lib/wine/libd3d9.def lib/wine/libd3dcompiler.def diff --git a/emulators/wxmupen64plus/Makefile b/emulators/wxmupen64plus/Makefile index ac0e047ebbb..92871f7565a 100644 --- a/emulators/wxmupen64plus/Makefile +++ b/emulators/wxmupen64plus/Makefile @@ -22,7 +22,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/libmupen64plus.so.2:emulators/mupen64plus-core \ WRKSRC= ${WRKDIR}/auria-${PORTNAME}-0564db396383 -USES= compiler:c++11-lib python +USES= compiler:c++11-lib python:2.7 USE_CXXSTD= c++11 USE_SDL= yes USE_WX= 3.0 diff --git a/french/wordpress/Makefile b/french/wordpress/Makefile index 842a107f1d2..3256fdead20 100644 --- a/french/wordpress/Makefile +++ b/french/wordpress/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -DISTVERSION= 4.9.5 +DISTVERSION= 4.9.6 DISTVERSIONSUFFIX= -fr_FR PORTEPOCH= 1 CATEGORIES= french www diff --git a/french/wordpress/distinfo b/french/wordpress/distinfo index c5ffb71bf27..1998e6d5838 100644 --- a/french/wordpress/distinfo +++ b/french/wordpress/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1524258377 -SHA256 (wordpress-4.9.5-fr_FR.tar.gz) = c070d075bf544e915f107b84934f7ea1a562fadbe98da1fc77d8cdaa173cd47e -SIZE (wordpress-4.9.5-fr_FR.tar.gz) = 9062579 +TIMESTAMP = 1527283082 +SHA256 (wordpress-4.9.6-fr_FR.tar.gz) = 9ab5aae07b3215f5a74aa3a09e61e0bc4e1a569b3c801c7f56ee494d633ab30d +SIZE (wordpress-4.9.6-fr_FR.tar.gz) = 9272059 diff --git a/ftp/hs-curl/Makefile b/ftp/hs-curl/Makefile index 57586ca9403..39535edb44e 100644 --- a/ftp/hs-curl/Makefile +++ b/ftp/hs-curl/Makefile @@ -2,7 +2,7 @@ PORTNAME= curl PORTVERSION= 1.3.8 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= ftp haskell MAINTAINER= haskell@FreeBSD.org diff --git a/games/bsdgames/Makefile b/games/bsdgames/Makefile index 0b284facb4f..53b044f77ef 100644 --- a/games/bsdgames/Makefile +++ b/games/bsdgames/Makefile @@ -7,7 +7,7 @@ PORTEPOCH= 1 CATEGORIES= games MASTER_SITES= LOCAL/adamw -MAINTAINER= adamw@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Traditional BSD games taken from DragonFly BSD LICENSE= BSD3CLAUSE diff --git a/games/hs-scroll/Makefile b/games/hs-scroll/Makefile index eb18055d331..2112573ee4b 100644 --- a/games/hs-scroll/Makefile +++ b/games/hs-scroll/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= scroll -PORTVERSION= 1.20170122 -PORTREVISION= 1 +PORTVERSION= 1.20180421 CATEGORIES= games haskell MAINTAINER= haskell@FreeBSD.org @@ -14,7 +13,7 @@ LICENSE= GPLv2 PKGNAMEPREFIX= USE_CABAL= IfElse case-insensitive data-default monad-loops mtl \ - optparse-applicative ncurses random text vector + optparse-applicative ncurses random vector STANDALONE= yes EXECUTABLE= scroll diff --git a/games/hs-scroll/distinfo b/games/hs-scroll/distinfo index 68ffb0aedf0..261ad92aced 100644 --- a/games/hs-scroll/distinfo +++ b/games/hs-scroll/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499620738 -SHA256 (cabal/scroll-1.20170122.tar.gz) = 89b5636f8ff2e540892a1b6fb96d3c1bb7b287c13f24c94c143e99afdca38b38 -SIZE (cabal/scroll-1.20170122.tar.gz) = 266023 +TIMESTAMP = 1525090021 +SHA256 (cabal/scroll-1.20180421.tar.gz) = 9203353457c53550524d40216d069129389dbb94a7d8ba1a9153e794dcceff2a +SIZE (cabal/scroll-1.20180421.tar.gz) = 266900 diff --git a/games/nethack34/Makefile b/games/nethack34/Makefile index 622a4c2f2fc..cb244e43f5d 100644 --- a/games/nethack34/Makefile +++ b/games/nethack34/Makefile @@ -57,7 +57,7 @@ CFLAGS+= -DMENU_COLOR_REGEX_POSIX .endif .if defined(WITH_STATUSCOLORS) PATCHFILES+= nh343-statuscolors.fixed.patch -PATCH_SITES+= http://jdc.koitsu.org/nethack/ \ +PATCH_SITES+= https://jdc.koitsu.org/nethack/ \ LOCAL/wxs PATCH_DIST_STRIP= -p1 .endif diff --git a/games/tome4/Makefile b/games/tome4/Makefile index 2ace96ae815..bf7ed265791 100644 --- a/games/tome4/Makefile +++ b/games/tome4/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= tome4 -PORTVERSION= 1.5.9 +PORTVERSION= 1.5.10 CATEGORIES= games MASTER_SITES= https://te4.org/dl/t-engine/ \ SF/lifanov-ports-distfiles/${PORTNAME}/:icons diff --git a/games/tome4/distinfo b/games/tome4/distinfo index b81507389f1..c3758969c9a 100644 --- a/games/tome4/distinfo +++ b/games/tome4/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1526507768 -SHA256 (t-engine4-src-1.5.9.tar.bz2) = 2f4f98be127447f03733d0618f6e4134c618b088e36ba3c84067e3e99ff8750e -SIZE (t-engine4-src-1.5.9.tar.bz2) = 422653233 +TIMESTAMP = 1527269649 +SHA256 (t-engine4-src-1.5.10.tar.bz2) = a76d29d2c0b964e9ab121873041c55930db1a0ccdaf877228dcba62ee06b8555 +SIZE (t-engine4-src-1.5.10.tar.bz2) = 422659741 SHA256 (tome4.png) = b5223208ca6f0a51f8bbe3b96055f38f94336dbeca6704db6684fec00fad1a36 SIZE (tome4.png) = 37143 diff --git a/games/vegastrike/Makefile b/games/vegastrike/Makefile index fa8aad60999..d3fe6773b9e 100644 --- a/games/vegastrike/Makefile +++ b/games/vegastrike/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= ${PY_BOOST} \ libvorbis.so:audio/libvorbis \ libogg.so:audio/libogg -USES= dos2unix gmake localbase:ldflags openal:al pkgconfig python \ +USES= dos2unix gmake localbase:ldflags openal:al pkgconfig python:2.7 \ tar:bzip2 GNU_CONFIGURE= yes USE_SDL= sdl diff --git a/games/wtf/Makefile b/games/wtf/Makefile index 14c650205c5..1f4a316ba00 100644 --- a/games/wtf/Makefile +++ b/games/wtf/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wtf -PORTVERSION= 20180510 +PORTVERSION= 20180525 CATEGORIES= games MASTER_SITES= SF/bsdwtf diff --git a/games/wtf/distinfo b/games/wtf/distinfo index 3e2d060c9f1..85c1a3c5e2e 100644 --- a/games/wtf/distinfo +++ b/games/wtf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1526046462 -SHA256 (wtf-20180510.tar.gz) = 1cbdd41fb75a55a915ea8691ab7710730643d544baafa0302d542d2464fb9def -SIZE (wtf-20180510.tar.gz) = 25790 +TIMESTAMP = 1527255101 +SHA256 (wtf-20180525.tar.gz) = 84cdf0c459daf609c7bf3dc0eb74e5633a6623db18998653d43454e240bf426e +SIZE (wtf-20180525.tar.gz) = 25923 diff --git a/german/wordpress/Makefile b/german/wordpress/Makefile index e39394a8c60..2e4646d23af 100644 --- a/german/wordpress/Makefile +++ b/german/wordpress/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -DISTVERSION= 4.9.5 +DISTVERSION= 4.9.6 DISTVERSIONSUFFIX= -de_DE CATEGORIES= german www MASTER_SITES= http://de.wordpress.org/ diff --git a/german/wordpress/distinfo b/german/wordpress/distinfo index a2901f767fb..0da565a0d1d 100644 --- a/german/wordpress/distinfo +++ b/german/wordpress/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1524258337 -SHA256 (wordpress-4.9.5-de_DE.tar.gz) = ae38feaf55860e8d847aa31a22b1c7a098b02373fa308eb067136fc1c51f940b -SIZE (wordpress-4.9.5-de_DE.tar.gz) = 9059826 +TIMESTAMP = 1527283105 +SHA256 (wordpress-4.9.6-de_DE.tar.gz) = f5340e1c7a4f69f444d5f8aee4a8e8d17aaf37cd1af77d7bd8f02e0e9ff49d6f +SIZE (wordpress-4.9.6-de_DE.tar.gz) = 9275512 diff --git a/graphics/Makefile b/graphics/Makefile index 8c499442dec..b2321659851 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -352,7 +352,6 @@ SUBDIR += hiptext SUBDIR += hobbes-icons-xpm SUBDIR += hppsmtools - SUBDIR += hs-HGL SUBDIR += hs-JuicyPixels SUBDIR += hs-cairo SUBDIR += hs-dia-base diff --git a/graphics/alembic/Makefile b/graphics/alembic/Makefile index 3e044acbfb4..b390101f97d 100644 --- a/graphics/alembic/Makefile +++ b/graphics/alembic/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= alembic -PORTVERSION= 1.7.7 +PORTVERSION= 1.7.8 CATEGORIES= graphics MAINTAINER= danfe@FreeBSD.org diff --git a/graphics/alembic/distinfo b/graphics/alembic/distinfo index 7456da33d96..33fe37b9948 100644 --- a/graphics/alembic/distinfo +++ b/graphics/alembic/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1521745118 -SHA256 (alembic-alembic-1.7.7_GH0.tar.gz) = 831b016afa9e66187b66819a02c0bd198b0f30e501a3552d0634796728cf1bff -SIZE (alembic-alembic-1.7.7_GH0.tar.gz) = 809572 +TIMESTAMP = 1525111387 +SHA256 (alembic-alembic-1.7.8_GH0.tar.gz) = 119e2cbac2b862880018e756da2219171d1e9ae7aa0ef7dc7c216d678384808e +SIZE (alembic-alembic-1.7.8_GH0.tar.gz) = 809902 diff --git a/graphics/bmeps/Makefile b/graphics/bmeps/Makefile index 977b3d74886..e41b7d6f548 100644 --- a/graphics/bmeps/Makefile +++ b/graphics/bmeps/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= bmpp -DISTVERSION= 4.14.1 +DISTVERSION= 4.15.0 CATEGORIES= graphics perl5 MASTER_SITES= SF/dktools/dktools/dktools-${PORTVERSION} DISTNAME= dktools-${PORTVERSION} diff --git a/graphics/bmeps/distinfo b/graphics/bmeps/distinfo index 55a05629e38..d9a75621aff 100644 --- a/graphics/bmeps/distinfo +++ b/graphics/bmeps/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1527060950 -SHA256 (dktools-4.14.1.tar.gz) = 9285bc161611b9e9bb6a55fba2a6b07780839c6475d15414e717cae88d4f45b3 -SIZE (dktools-4.14.1.tar.gz) = 12477243 +TIMESTAMP = 1527205911 +SHA256 (dktools-4.15.0.tar.gz) = 71389f1b884dae0e843f934a5749f64c43f4feb0eaac3fba42a4611a855fec67 +SIZE (dktools-4.15.0.tar.gz) = 12493770 diff --git a/graphics/hs-HGL/Makefile b/graphics/hs-HGL/Makefile deleted file mode 100644 index 538b2a5c1b5..00000000000 --- a/graphics/hs-HGL/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# Created by: Giuseppe Pilichi aka Jacula Modyun -# $FreeBSD$ - -PORTNAME= HGL -PORTVERSION= 3.2.0.5 -PORTREVISION= 4 -CATEGORIES= graphics haskell - -MAINTAINER= haskell@FreeBSD.org -COMMENT= Simple Haskell graphics library based on X11 or Win32 - -LICENSE= BSD3CLAUSE - -USE_CABAL= X11 - -.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" -.include diff --git a/graphics/hs-HGL/distinfo b/graphics/hs-HGL/distinfo deleted file mode 100644 index d1b37ef3581..00000000000 --- a/graphics/hs-HGL/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (cabal/HGL-3.2.0.5.tar.gz) = 8b97240ff97d3e5eda09d8ceead6e6d7315e444bdbbfd3b9a260942e5e770d7d -SIZE (cabal/HGL-3.2.0.5.tar.gz) = 39012 diff --git a/graphics/hs-HGL/files/patch-Graphics_HGL_Internals_Draw.hs b/graphics/hs-HGL/files/patch-Graphics_HGL_Internals_Draw.hs deleted file mode 100644 index c4910277f2b..00000000000 --- a/graphics/hs-HGL/files/patch-Graphics_HGL_Internals_Draw.hs +++ /dev/null @@ -1,22 +0,0 @@ ---- Graphics/HGL/Internals/Draw.hs.orig 1991-05-09 14:40:52 UTC -+++ Graphics/HGL/Internals/Draw.hs -@@ -31,7 +31,7 @@ import Graphics.HGL.X11.Types(DC) - import Graphics.HGL.Win32.Types(DC) - #endif - import qualified Graphics.HGL.Internals.Utilities as Utils (bracket, bracket_) --import Control.Monad (liftM) -+import Control.Monad (liftM, ap) - - ---------------------------------------------------------------- - -- Graphics -@@ -61,6 +61,10 @@ instance Monad Draw where - - instance Functor Draw where fmap = liftM - -+instance Applicative Draw where -+ pure = return -+ (<*>) = ap -+ - -- | Wrap a drawing action in initialization and finalization actions. - bracket - :: Draw a -- ^ a pre-operation, whose value is passed to the diff --git a/graphics/hs-HGL/pkg-descr b/graphics/hs-HGL/pkg-descr deleted file mode 100644 index b4b577c9b34..00000000000 --- a/graphics/hs-HGL/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -A simple graphics library, designed to give the programmer access to -most interesting parts of the Win32 Graphics Device Interface and X11 -library without exposing the programmer to the pain and anguish usually -associated with using these interfaces. The library also includes a -module Graphics.SOE providing the interface used in "The Haskell School -of Expression", by Paul Hudak. - -WWW: http://hackage.haskell.org/package/HGL diff --git a/graphics/hs-JuicyPixels/Makefile b/graphics/hs-JuicyPixels/Makefile index 3fcb9102b5f..b0ad122c213 100644 --- a/graphics/hs-JuicyPixels/Makefile +++ b/graphics/hs-JuicyPixels/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= JuicyPixels -PORTVERSION= 3.2.8.2 -PORTREVISION= 1 +PORTVERSION= 3.2.9.5 CATEGORIES= graphics haskell MAINTAINER= haskell@FreeBSD.org diff --git a/graphics/hs-JuicyPixels/distinfo b/graphics/hs-JuicyPixels/distinfo index 955555fd9aa..8d6bbc35d09 100644 --- a/graphics/hs-JuicyPixels/distinfo +++ b/graphics/hs-JuicyPixels/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499538228 -SHA256 (cabal/JuicyPixels-3.2.8.2.tar.gz) = b74c89e57ea81f6f69470dce215beccb7ced270ce8529b4a97535879ea5478e8 -SIZE (cabal/JuicyPixels-3.2.8.2.tar.gz) = 125699 +TIMESTAMP = 1523462111 +SHA256 (cabal/JuicyPixels-3.2.9.5.tar.gz) = 849c6cf4a613f906f7e553a1baefe9c0dc61c13b41a5f5b9605cf80e328cc355 +SIZE (cabal/JuicyPixels-3.2.9.5.tar.gz) = 122952 diff --git a/graphics/hs-cairo/Makefile b/graphics/hs-cairo/Makefile index ce777d1f3b2..803dcfc1dec 100644 --- a/graphics/hs-cairo/Makefile +++ b/graphics/hs-cairo/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= cairo -PORTVERSION= 0.13.3.1 -PORTREVISION= 1 +PORTVERSION= 0.13.5.0 CATEGORIES= graphics haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,7 @@ COMMENT= Binding to the Cairo library LICENSE= BSD3CLAUSE USES= pkgconfig -USE_CABAL= gtk2hs-buildtools mtl text utf8-string +USE_CABAL= gtk2hs-buildtools mtl utf8-string BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/cairo-pdf.pc:graphics/cairo diff --git a/graphics/hs-cairo/distinfo b/graphics/hs-cairo/distinfo index 822cf9aba2c..b8020a4b6c2 100644 --- a/graphics/hs-cairo/distinfo +++ b/graphics/hs-cairo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499538056 -SHA256 (cabal/cairo-0.13.3.1.tar.gz) = a3ca197c6d63875686ed8129530771f945fbd954ab8283841ad238da233d675a -SIZE (cabal/cairo-0.13.3.1.tar.gz) = 45033 +TIMESTAMP = 1524402125 +SHA256 (cabal/cairo-0.13.5.0.tar.gz) = 420acd81e0b5578ad188bcdd38463135293c233221abb741cc4004d4c8a6bef3 +SIZE (cabal/cairo-0.13.5.0.tar.gz) = 46877 diff --git a/graphics/hs-dia-base/Makefile b/graphics/hs-dia-base/Makefile index 5e4c7ac253e..ba8ade34b14 100644 --- a/graphics/hs-dia-base/Makefile +++ b/graphics/hs-dia-base/Makefile @@ -2,7 +2,7 @@ PORTNAME= dia-base PORTVERSION= 0.1.1.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics haskell MAINTAINER= haskell@FreeBSD.org diff --git a/graphics/hs-dia-base/files/patch-dia-base.cabal b/graphics/hs-dia-base/files/patch-dia-base.cabal new file mode 100644 index 00000000000..fee7a553587 --- /dev/null +++ b/graphics/hs-dia-base/files/patch-dia-base.cabal @@ -0,0 +1,10 @@ +--- dia-base.cabal.orig 2018-04-11 15:42:07 UTC ++++ dia-base.cabal +@@ -27,7 +27,7 @@ library + Graphics.Diagrams + + Build-Depends: +- base >= 4.0 && < 4.10, ++ base >= 4.0 && < 4.12, + deepseq >= 1.1 && < 1.5 + diff --git a/graphics/hs-dia-functions/Makefile b/graphics/hs-dia-functions/Makefile index afd114a7c31..dddc804c1e1 100644 --- a/graphics/hs-dia-functions/Makefile +++ b/graphics/hs-dia-functions/Makefile @@ -2,7 +2,7 @@ PORTNAME= dia-functions PORTVERSION= 0.2.1.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics haskell MAINTAINER= haskell@FreeBSD.org diff --git a/graphics/hs-graphviz/Makefile b/graphics/hs-graphviz/Makefile index ed01fdf1b8e..e762e47f89e 100644 --- a/graphics/hs-graphviz/Makefile +++ b/graphics/hs-graphviz/Makefile @@ -11,7 +11,9 @@ COMMENT= This library provides bindings for the Dot language used by the Graphvi LICENSE= BSD3CLAUSE USES= pkgconfig -USE_CABAL= colour dlist fgl polyparse temporary text wl-pprint-text +USE_CABAL= colour dlist fgl polyparse temporary wl-pprint-text + +IGNORE= Doesn't build with recent GHC version BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/libxdot.pc:graphics/graphviz diff --git a/graphics/hs-svgcairo/Makefile b/graphics/hs-svgcairo/Makefile index 7b14ab9e904..41ec8debfd2 100644 --- a/graphics/hs-svgcairo/Makefile +++ b/graphics/hs-svgcairo/Makefile @@ -2,7 +2,7 @@ PORTNAME= svgcairo PORTVERSION= 0.13.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,7 @@ COMMENT= Binding to the libsvg-cairo library LICENSE= BSD3CLAUSE USES= pkgconfig -USE_CABAL= cairo glib mtl text +USE_CABAL= cairo glib mtl USE_GNOME= librsvg2 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" diff --git a/graphics/maim/Makefile b/graphics/maim/Makefile index db6e56edbf1..6a5607e3d22 100644 --- a/graphics/maim/Makefile +++ b/graphics/maim/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= maim -PORTVERSION= 3.4.47 +PORTVERSION= 5.5.1 DISTVERSIONPREFIX= v CATEGORIES= graphics @@ -10,17 +10,23 @@ COMMENT= Screenshot utility with performance improvements over scrot LICENSE= GPLv3 -LIB_DEPENDS= libImlib2.so:graphics/imlib2 +BUILD_DEPENDS= ${LOCALBASE}/include/glm/glm.hpp:math/glm +LIB_DEPENDS= libImlib2.so:graphics/imlib2 \ + libicuuc.so:devel/icu \ + libpng16.so:graphics/png \ + libslopy.so:x11/slop +USES= cmake jpeg USE_GITHUB= yes GH_ACCOUNT= naelstrof - -USES= cmake -USE_XORG= x11 xrandr xfixes +USE_GL= gl glut +USE_XORG= ice sm x11 xcomposite xext xfixes xrandr xrender PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz +CMAKE_ARGS= -DSLOP_LIBRARIES=${LOCALBASE}/lib/libslopy.so + do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/man-src/${PORTNAME}.1.gz ${STAGEDIR}${MAN1PREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 .include diff --git a/graphics/maim/distinfo b/graphics/maim/distinfo index d371695c917..422ac75851d 100644 --- a/graphics/maim/distinfo +++ b/graphics/maim/distinfo @@ -1,2 +1,3 @@ -SHA256 (naelstrof-maim-v3.4.47_GH0.tar.gz) = fb12524cc05f7f4ff46fe40b951334c6dbc274e50b6d0ea08185f555ca3cd74d -SIZE (naelstrof-maim-v3.4.47_GH0.tar.gz) = 46799 +TIMESTAMP = 1527211487 +SHA256 (naelstrof-maim-v5.5.1_GH0.tar.gz) = 5a954fa2feb80809874517804f7fdea703ac36a709b3f6cd9310a66cbb027cb7 +SIZE (naelstrof-maim-v5.5.1_GH0.tar.gz) = 39601 diff --git a/graphics/py-mayavi/Makefile b/graphics/py-mayavi/Makefile index 0602260d1bb..1d847233539 100644 --- a/graphics/py-mayavi/Makefile +++ b/graphics/py-mayavi/Makefile @@ -23,15 +23,15 @@ LICENSE_FILE_APACHE11= ${WRKSRC}/LICENSE_COLORBREWER.txt # See ${WRKSRC}/image_LICENSE.txt for per file license information BUILD_DEPENDS= vtk6>=6.1.0_8:math/vtk6 \ - py27-sphinx>=1.3.1_2:textproc/py-sphinx + ${PYTHON_PKGNAMEPREFIX}sphinx>=1.3.1_2:textproc/py-sphinx@${PY_FLAVOR} RUN_DEPENDS= vtk6>=6.1.0_8:math/vtk6 \ ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}envisage>=4.4.0:devel/py-envisage@${FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pyface>=4.5.2:devel/py-pyface@${FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}scimath>=4.1.2:science/py-scimath@${FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}traitsui>=4.5.1:graphics/py-traitsui@${FLAVOR} + ${PYTHON_PKGNAMEPREFIX}envisage>=4.4.0:devel/py-envisage@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyface>=4.5.2:devel/py-pyface@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scimath>=4.1.2:science/py-scimath@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}traitsui>=4.5.1:graphics/py-traitsui@${PY_FLAVOR} -USES= python:-2.7 shebangfix tar:bzip2 +USES= python:2.7 shebangfix tar:bzip2 USE_PYTHON= autoplist distutils USE_WX= 2.8+ WX_COMPS= python:run diff --git a/graphics/py-sorl-thumbnail/Makefile b/graphics/py-sorl-thumbnail/Makefile index 705103840e6..38a845a5972 100644 --- a/graphics/py-sorl-thumbnail/Makefile +++ b/graphics/py-sorl-thumbnail/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= sorl-thumbnail -PORTVERSION= 3.2.5 -PORTREVISION= 6 +PORTVERSION= 12.4.1 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,33 +11,42 @@ MAINTAINER= ports@caomhin.org COMMENT= Sorl-thumbnail provides an easy way to generate image thumbnails LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${PY_FLAVOR} USES= python USE_PYTHON= autoplist distutils +NO_ARCH= yes +PORTDOCS= * -DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}@${FLAVOR} +OPTIONS_DEFINE= DOCS +OPTIONS_DEFAULT= IMAGEMAGICK +OPTIONS_SINGLE= IMAGELIB +OPTIONS_GROUP= CACHING -OPTIONS_DEFINE= DJANGO PDF WORD -DJANGO_DESC= Enable Django -PDF_DESC= PDF Thumbnails -WORD_DESC= Word Document thumbnail handling +OPTIONS_SINGLE_IMAGELIB= GRAPHICSMAGICK IMAGEMAGICK PILLOW WAND +OPTIONS_GROUP_CACHING= REDIS -OPTIONS_DEFAULT= DJANGO +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR} +DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E" -.include +GRAPHICSMAGICK_RUN_DEPENDS= ${LOCALBASE}/bin/gm:graphics/GraphicsMagick +IMAGEMAGICK_RUN_DEPENDS= ${LOCALBASE}/bin/convert:graphics/ImageMagick +PILLOW_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} +REDIS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>0:databases/py-redis@${PY_FLAVOR} +WAND_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Wand>0:graphics/py-wand@${PY_FLAVOR} -.if ${PORT_OPTIONS:MDJANGO} -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR} -.endif +GRAPHICSMAGICK_DESC= Use GraphicsMagick for image processing (faster) +IMAGEMAGICK_DESC= Use ImageMagick for image processing +PILLOW_DESC= Use internal image processing +REDIS_DESC= Use REDIS as Key Value Store +WAND_DESC= Use Wand with ImageMagick -.if ${PORT_OPTIONS:MPDF} -RUN_DEPENDS+= ${LOCALBASE}/bin/Magick-config:graphics/ImageMagick -.endif - -.if ${PORT_OPTIONS:MWORD} -RUN_DEPENDS+= wvVersion:textproc/wv -.endif +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC}/build/sphinx/html && \ + ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \ + "! -name .buildinfo -and ! -name objects.inv") .include diff --git a/graphics/py-sorl-thumbnail/distinfo b/graphics/py-sorl-thumbnail/distinfo index a1946674bfe..96e71fbecb1 100644 --- a/graphics/py-sorl-thumbnail/distinfo +++ b/graphics/py-sorl-thumbnail/distinfo @@ -1,2 +1,3 @@ -SHA256 (sorl-thumbnail-3.2.5.tar.gz) = 8f0378cc08bed75a7e86fc44847e652378d1951af452a47976d2eca8b8276968 -SIZE (sorl-thumbnail-3.2.5.tar.gz) = 19622 +TIMESTAMP = 1526248144 +SHA256 (sorl-thumbnail-12.4.1.tar.gz) = 1cc6d913fe4f1224e479f25a23ec2ad3ca71c3154919a2c9463b07e7fbe11ac2 +SIZE (sorl-thumbnail-12.4.1.tar.gz) = 533008 diff --git a/graphics/py-sorl-thumbnail/files/patch-docs_conf.py b/graphics/py-sorl-thumbnail/files/patch-docs_conf.py new file mode 100644 index 00000000000..737f09c375c --- /dev/null +++ b/graphics/py-sorl-thumbnail/files/patch-docs_conf.py @@ -0,0 +1,17 @@ +--- docs/conf.py.orig 2017-11-21 00:08:00 UTC ++++ docs/conf.py +@@ -15,10 +15,13 @@ import os + import sphinx + import sys + ++if sys.version_info < (3,): ++ range = xrange ++ + sys.path.insert(0, os.path.pardir) + import sorl + +-for j in xrange(0, len(sphinx.__version__)): ++for j in range(0, len(sphinx.__version__)): + try: + version = float(sphinx.__version__[:-j]) + break diff --git a/graphics/py-sorl-thumbnail/pkg-descr b/graphics/py-sorl-thumbnail/pkg-descr index 3ff228ce9db..ca0800f625d 100644 --- a/graphics/py-sorl-thumbnail/pkg-descr +++ b/graphics/py-sorl-thumbnail/pkg-descr @@ -1,6 +1,18 @@ The sorl-thumbnail package provides an easy way to generate image thumbnails. -Although not required to use, sorl-thumbnail is heavily integrated with -the Django framework. -WWW: http://code.google.com/p/sorl-thumbnail/ +Some of its features: +- Storage support +- Pluggable Engine support for Pillow, GraphicsMagick, ImageMagick and Wand +- Pluggable Key Value Store support (cached db and redis) +- Pluggable Backend support +- Admin integration with possibility to delete +- Dummy generation (placeholders) +- Flexible, simple syntax, generates no html +- ImageField for model that deletes thumbnails +- CSS style cropping options +- Back smart cropping, and remove borders from the images when cropping +- Margin calculation for vertical positioning +- Alternative resolutions versions of a thumbnail + +WWW: https://github.com/jazzband/sorl-thumbnail diff --git a/graphics/seexpr/Makefile b/graphics/seexpr/Makefile index 9f9c7722e04..cb0f7973eda 100644 --- a/graphics/seexpr/Makefile +++ b/graphics/seexpr/Makefile @@ -16,9 +16,10 @@ USE_GITHUB= yes GH_ACCOUNT= wdas GH_PROJECT= SeExpr -USES= bison cmake compiler:c++0x pyqt:4 python +USES= bison cmake compiler:c++0x pyqt:4 python:2.7 USE_PYQT= gui_build sip_build USE_QT4= moc_build qmake_build rcc_build uic_build gui opengl +BINARY_ALIAS= sip=sip-${PYTHON_VER} MAKE_JOBS_UNSAFE= yes # https://github.com/wdas/seexpr/issues/40 diff --git a/japanese/wordpress/Makefile b/japanese/wordpress/Makefile index 88cb07330a9..693a0eee903 100644 --- a/japanese/wordpress/Makefile +++ b/japanese/wordpress/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -DISTVERSION= 4.9.5 +DISTVERSION= 4.9.6 DISTVERSIONSUFFIX= -ja CATEGORIES= japanese www MASTER_SITES= http://ja.wordpress.org/ diff --git a/japanese/wordpress/distinfo b/japanese/wordpress/distinfo index 9bff2dc095e..988337e5407 100644 --- a/japanese/wordpress/distinfo +++ b/japanese/wordpress/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1524258314 -SHA256 (wordpress-4.9.5-ja.tar.gz) = 63a1ed405935587469d6f03aa754bdaf5f319db2c8799c3624faf9ddf7aebbc7 -SIZE (wordpress-4.9.5-ja.tar.gz) = 9069188 +TIMESTAMP = 1527283174 +SHA256 (wordpress-4.9.6-ja.tar.gz) = 589347e8433663f4de220015df333f70562605d0471fefc1b39b40fcd4e5052d +SIZE (wordpress-4.9.6-ja.tar.gz) = 9326906 diff --git a/java/intellij-rubymine/pkg-plist b/java/intellij-rubymine/pkg-plist index b7f3d41118d..10ecee51d1c 100644 --- a/java/intellij-rubymine/pkg-plist +++ b/java/intellij-rubymine/pkg-plist @@ -203,7 +203,7 @@ share/applications/rubymine.desktop %%DATADIR%%/lib/jbcrypt-1.0.0.jar %%DATADIR%%/lib/jcodings-1.0.10.jar %%DATADIR%%/lib/jdom.jar -%%DATADIR%%/lib/jediterm-pty-%%PYTHON_VER%%.jar +%%DATADIR%%/lib/jediterm-pty-2.7.jar %%DATADIR%%/lib/jettison-1.3.2.jar %%DATADIR%%/lib/jgoodies-forms.jar %%DATADIR%%/lib/jh.jar @@ -326,7 +326,7 @@ share/applications/rubymine.desktop %%DATADIR%%/plugins/Docker/lib/jackson-annotations-2.6.4.jar %%DATADIR%%/plugins/Docker/lib/jackson-core-2.6.4.jar %%DATADIR%%/plugins/Docker/lib/jackson-databind-2.6.4.jar -%%DATADIR%%/plugins/Docker/lib/jackson-dataformat-yaml-%%PYTHON_VER%%.3.jar +%%DATADIR%%/plugins/Docker/lib/jackson-dataformat-yaml-2.7.3.jar %%DATADIR%%/plugins/Docker/lib/rt/aopalliance-repackaged-2.4.0-b34.jar %%DATADIR%%/plugins/Docker/lib/rt/bcpkix-jdk15on-1.54.jar %%DATADIR%%/plugins/Docker/lib/rt/bcprov-jdk15on-1.54.jar diff --git a/java/intellij/Makefile b/java/intellij/Makefile index 7ad39400cdc..467a8939f7a 100644 --- a/java/intellij/Makefile +++ b/java/intellij/Makefile @@ -5,7 +5,7 @@ # Vadim Zhukov PORTNAME= intellij -PORTVERSION= 2018.1 +PORTVERSION= 2018.1.4 CATEGORIES= java devel MASTER_SITES= https://download.jetbrains.com/idea/ \ http://download.jetbrains.com/idea/ @@ -28,7 +28,7 @@ NO_ARCH= yes NO_BUILD= yes INSTALL_TARGET= install-strip -WRKSRC= ${WRKDIR}/idea-IC-181.4203.550 +WRKSRC= ${WRKDIR}/idea-IC-181.5087.20 .include "common.mk" diff --git a/java/intellij/distinfo b/java/intellij/distinfo index f623ac44632..b9cd17cbcf6 100644 --- a/java/intellij/distinfo +++ b/java/intellij/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1522269288 -SHA256 (ideaIC-2018.1-no-jdk.tar.gz) = a8749bf8468ceb0bb957ba88c85eeb1c10a424e2140b1da976cd2d47b2f95426 -SIZE (ideaIC-2018.1-no-jdk.tar.gz) = 467885154 +TIMESTAMP = 1527369400 +SHA256 (ideaIC-2018.1.4-no-jdk.tar.gz) = a31f0e08d718df6794e178e299cc41b16b62127d431a32b9a17568e7fb4b6c33 +SIZE (ideaIC-2018.1.4-no-jdk.tar.gz) = 469330992 diff --git a/java/intellij/pkg-plist b/java/intellij/pkg-plist index 2a5cf4747cf..b4f828b799e 100644 --- a/java/intellij/pkg-plist +++ b/java/intellij/pkg-plist @@ -84,7 +84,7 @@ share/applications/idea.desktop %%IDEA_HOME%%/lib/automaton.jar %%IDEA_HOME%%/lib/baksmali-2.2.1.jar %%IDEA_HOME%%/lib/batik-all.jar -%%IDEA_HOME%%/lib/bcprov-jdk15on-1.55.jar +%%IDEA_HOME%%/lib/bcprov-jdk15on-1.59.jar %%IDEA_HOME%%/lib/bootstrap.jar %%IDEA_HOME%%/lib/cglib-nodep-3.2.4.jar %%IDEA_HOME%%/lib/cli-parser-1.1.jar @@ -94,7 +94,7 @@ share/applications/idea.desktop %%IDEA_HOME%%/lib/commons-codec-1.9.jar %%IDEA_HOME%%/lib/commons-compress-1.10.jar %%IDEA_HOME%%/lib/commons-httpclient-3.1-patched.jar -%%IDEA_HOME%%/lib/commons-imaging-1.0-RC.jar +%%IDEA_HOME%%/lib/commons-imaging-1.0-RC-1.jar %%IDEA_HOME%%/lib/commons-io-2.2.jar %%IDEA_HOME%%/lib/commons-logging-1.2.jar %%IDEA_HOME%%/lib/commons-net-3.3.jar @@ -133,7 +133,9 @@ share/applications/idea.desktop %%IDEA_HOME%%/lib/imgscalr-lib-4.2.jar %%IDEA_HOME%%/lib/ini4j-0.5.5-2.jar %%IDEA_HOME%%/lib/isorelax.jar -%%IDEA_HOME%%/lib/jackson-core-2.8.8.jar +%%IDEA_HOME%%/lib/jackson-annotations-2.9.0.jar +%%IDEA_HOME%%/lib/jackson-core-2.9.5.jar +%%IDEA_HOME%%/lib/jackson-databind-2.9.5.jar %%IDEA_HOME%%/lib/java-api.jar %%IDEA_HOME%%/lib/java-impl.jar %%IDEA_HOME%%/lib/java_resources_en.jar @@ -10103,9 +10105,6 @@ share/applications/idea.desktop %%IDEA_HOME%%/plugins/maven/lib/resources_en.jar %%IDEA_HOME%%/plugins/properties/lib/properties.jar %%IDEA_HOME%%/plugins/properties/lib/resources_en.jar -%%IDEA_HOME%%/plugins/settings-repository/lib/jackson-annotations-2.8.1.jar -%%IDEA_HOME%%/plugins/settings-repository/lib/jackson-core-2.8.1.jar -%%IDEA_HOME%%/plugins/settings-repository/lib/jackson-databind-2.8.1.jar %%IDEA_HOME%%/plugins/settings-repository/lib/jgit.jar %%IDEA_HOME%%/plugins/settings-repository/lib/resources_en.jar %%IDEA_HOME%%/plugins/settings-repository/lib/settings-repository.jar diff --git a/java/linux-oracle-jdk18/Makefile b/java/linux-oracle-jdk18/Makefile index a8468076b16..3a1dbff18a5 100644 --- a/java/linux-oracle-jdk18/Makefile +++ b/java/linux-oracle-jdk18/Makefile @@ -30,7 +30,7 @@ ONLY_FOR_ARCHS= i386 amd64 JDK_VENDOR= oracle JDK_VERSION= 8 JDK_INTERNAL_VERSION= 1.${JDK_VERSION}.0 -JDK_UPDATE_VERSION= 162 +JDK_UPDATE_VERSION= 172 .if ${JDK_UPDATE_VERSION} == 0 DL_JDK_VERSION= ${JDK_INTERNAL_VERSION} .elif ${JDK_UPDATE_VERSION} <= 9 diff --git a/java/linux-oracle-jdk18/distinfo b/java/linux-oracle-jdk18/distinfo index 7685c6b7bb0..f0a20b5de2a 100644 --- a/java/linux-oracle-jdk18/distinfo +++ b/java/linux-oracle-jdk18/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1519432970 -SHA256 (jdk-8u162-linux-i586.tar.gz) = eecf88dbcf7c78d236251d44350126f1297a522f2eab974b4027ef20f7a6fb24 -SIZE (jdk-8u162-linux-i586.tar.gz) = 192733880 -SHA256 (jdk-8u162-linux-i586-demos.tar.gz) = 09ba57c751a44a3326edda544bb869696e69bdb8fe6aabe3f988d89fcfca05bf -SIZE (jdk-8u162-linux-i586-demos.tar.gz) = 55100252 -SHA256 (jdk-8u162-linux-x64.tar.gz) = 68ec82d47fd9c2b8eb84225b6db398a72008285fafc98631b1ff8d2229680257 -SIZE (jdk-8u162-linux-x64.tar.gz) = 189815615 -SHA256 (jdk-8u162-linux-x64-demos.tar.gz) = c7aa3e9136ba987b0972f5301ffadfc5c46a6a2cbbbed63d31d725932012cd19 -SIZE (jdk-8u162-linux-x64-demos.tar.gz) = 55164558 +TIMESTAMP = 1526861935 +SHA256 (jdk-8u172-linux-i586.tar.gz) = 0a4310d31246924d5c3cd161b9da7f446acef373e6484452c80de8d8519f5a33 +SIZE (jdk-8u172-linux-i586.tar.gz) = 193889453 +SHA256 (jdk-8u172-linux-i586-demos.tar.gz) = e43f95fa3a57d9d576e57d2a745d43eb7f59cabb4fa213cd3961ac32f1c7c26d +SIZE (jdk-8u172-linux-i586-demos.tar.gz) = 59159082 +SHA256 (jdk-8u172-linux-x64.tar.gz) = 28a00b9400b6913563553e09e8024c286b506d8523334c93ddec6c9ec7e9d346 +SIZE (jdk-8u172-linux-x64.tar.gz) = 190921804 +SHA256 (jdk-8u172-linux-x64-demos.tar.gz) = 2d1cdbcf72052b4ac25942bd2d061b7bb3e6872ec1a8d961833329c09bb1b90a +SIZE (jdk-8u172-linux-x64-demos.tar.gz) = 59218933 diff --git a/java/linux-oracle-jdk18/pkg-plist b/java/linux-oracle-jdk18/pkg-plist index 550e4c53f91..cc804b5f602 100644 --- a/java/linux-oracle-jdk18/pkg-plist +++ b/java/linux-oracle-jdk18/pkg-plist @@ -628,8 +628,9 @@ %%DEMO%%%%T%%/demo/javafx_samples/src/Ensemble8/cssref/cssexample2.png %%DEMO%%%%T%%/demo/javafx_samples/src/Ensemble8/cssref/cssref.html %%DEMO%%%%T%%/demo/javafx_samples/src/Ensemble8/cssref/fx_code_header.jpg -%%DEMO%%%%T%%/demo/javafx_samples/src/Ensemble8/lib/lucene-core-3.2.0.jar -%%DEMO%%%%T%%/demo/javafx_samples/src/Ensemble8/lib/lucene-grouping-3.2.0.jar +%%DEMO%%%%T%%/demo/javafx_samples/src/Ensemble8/lib/lucene-core-7.1.0.jar +%%DEMO%%%%T%%/demo/javafx_samples/src/Ensemble8/lib/lucene-grouping-7.1.0.jar +%%DEMO%%%%T%%/demo/javafx_samples/src/Ensemble8/lib/lucene-queryparser-7.1.0.jar %%DEMO%%%%T%%/demo/javafx_samples/src/Ensemble8/nbproject/build-impl.xml %%DEMO%%%%T%%/demo/javafx_samples/src/Ensemble8/nbproject/configs/Build_index.properties %%DEMO%%%%T%%/demo/javafx_samples/src/Ensemble8/nbproject/genfiles.properties @@ -695,16 +696,10 @@ %%DEMO%%%%T%%/demo/javafx_samples/src/Ensemble8/src/compiletime/java/ensemble/compiletime/search/DocumentType.java %%DEMO%%%%T%%/demo/javafx_samples/src/Ensemble8/src/compiletime/java/ensemble/compiletime/search/DocumentationIndexer.java %%DEMO%%%%T%%/demo/javafx_samples/src/Ensemble8/src/generated/java/ensemble/generated/Samples.java -%%DEMO%%%%T%%/demo/javafx_samples/src/Ensemble8/src/generated/resources/ensemble/search/index/_0.fdt -%%DEMO%%%%T%%/demo/javafx_samples/src/Ensemble8/src/generated/resources/ensemble/search/index/_0.fdx -%%DEMO%%%%T%%/demo/javafx_samples/src/Ensemble8/src/generated/resources/ensemble/search/index/_0.fnm -%%DEMO%%%%T%%/demo/javafx_samples/src/Ensemble8/src/generated/resources/ensemble/search/index/_0.frq -%%DEMO%%%%T%%/demo/javafx_samples/src/Ensemble8/src/generated/resources/ensemble/search/index/_0.nrm -%%DEMO%%%%T%%/demo/javafx_samples/src/Ensemble8/src/generated/resources/ensemble/search/index/_0.prx -%%DEMO%%%%T%%/demo/javafx_samples/src/Ensemble8/src/generated/resources/ensemble/search/index/_0.tii -%%DEMO%%%%T%%/demo/javafx_samples/src/Ensemble8/src/generated/resources/ensemble/search/index/_0.tis +%%DEMO%%%%T%%/demo/javafx_samples/src/Ensemble8/src/generated/resources/ensemble/search/index/_0.cfe +%%DEMO%%%%T%%/demo/javafx_samples/src/Ensemble8/src/generated/resources/ensemble/search/index/_0.cfs +%%DEMO%%%%T%%/demo/javafx_samples/src/Ensemble8/src/generated/resources/ensemble/search/index/_0.si %%DEMO%%%%T%%/demo/javafx_samples/src/Ensemble8/src/generated/resources/ensemble/search/index/listAll.txt -%%DEMO%%%%T%%/demo/javafx_samples/src/Ensemble8/src/generated/resources/ensemble/search/index/segments.gen %%DEMO%%%%T%%/demo/javafx_samples/src/Ensemble8/src/generated/resources/ensemble/search/index/segments_1 %%DEMO%%%%T%%/demo/javafx_samples/src/Ensemble8/src/samples/java/ensemble/samples/animation/interpolator/InterpolatorApp.java %%DEMO%%%%T%%/demo/javafx_samples/src/Ensemble8/src/samples/java/ensemble/samples/animation/timeline/TimelineApp.java @@ -1870,20 +1865,20 @@ %%T%%/lib/missioncontrol/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info %%T%%/lib/missioncontrol/configuration/org.eclipse.update/platform.xml %%T%%/lib/missioncontrol/dropins/README.TXT -%%T%%/lib/missioncontrol/features/com.jrockit.mc.feature.console_5.5.1.172852/feature.properties -%%T%%/lib/missioncontrol/features/com.jrockit.mc.feature.console_5.5.1.172852/feature.xml -%%T%%/lib/missioncontrol/features/com.jrockit.mc.feature.core_5.5.1.172852/feature.properties -%%T%%/lib/missioncontrol/features/com.jrockit.mc.feature.core_5.5.1.172852/feature.xml -%%T%%/lib/missioncontrol/features/com.jrockit.mc.feature.flightrecorder_5.5.1.172852/feature.properties -%%T%%/lib/missioncontrol/features/com.jrockit.mc.feature.flightrecorder_5.5.1.172852/feature.xml -%%T%%/lib/missioncontrol/features/com.jrockit.mc.feature.rcp.ja_5.5.1.172852/feature.properties -%%T%%/lib/missioncontrol/features/com.jrockit.mc.feature.rcp.ja_5.5.1.172852/feature.xml -%%T%%/lib/missioncontrol/features/com.jrockit.mc.feature.rcp.zh_CN_5.5.1.172852/feature.properties -%%T%%/lib/missioncontrol/features/com.jrockit.mc.feature.rcp.zh_CN_5.5.1.172852/feature.xml -%%T%%/lib/missioncontrol/features/com.jrockit.mc.feature.rcp_5.5.1.172852/feature.properties -%%T%%/lib/missioncontrol/features/com.jrockit.mc.feature.rcp_5.5.1.172852/feature.xml -%%T%%/lib/missioncontrol/features/com.jrockit.mc.rcp.product_5.5.1.172852/feature.properties -%%T%%/lib/missioncontrol/features/com.jrockit.mc.rcp.product_5.5.1.172852/feature.xml +%%T%%/lib/missioncontrol/features/com.jrockit.mc.feature.console_5.5.2.174165/feature.properties +%%T%%/lib/missioncontrol/features/com.jrockit.mc.feature.console_5.5.2.174165/feature.xml +%%T%%/lib/missioncontrol/features/com.jrockit.mc.feature.core_5.5.2.174165/feature.properties +%%T%%/lib/missioncontrol/features/com.jrockit.mc.feature.core_5.5.2.174165/feature.xml +%%T%%/lib/missioncontrol/features/com.jrockit.mc.feature.flightrecorder_5.5.2.174165/feature.properties +%%T%%/lib/missioncontrol/features/com.jrockit.mc.feature.flightrecorder_5.5.2.174165/feature.xml +%%T%%/lib/missioncontrol/features/com.jrockit.mc.feature.rcp.ja_5.5.2.174165/feature.properties +%%T%%/lib/missioncontrol/features/com.jrockit.mc.feature.rcp.ja_5.5.2.174165/feature.xml +%%T%%/lib/missioncontrol/features/com.jrockit.mc.feature.rcp.zh_CN_5.5.2.174165/feature.properties +%%T%%/lib/missioncontrol/features/com.jrockit.mc.feature.rcp.zh_CN_5.5.2.174165/feature.xml +%%T%%/lib/missioncontrol/features/com.jrockit.mc.feature.rcp_5.5.2.174165/feature.properties +%%T%%/lib/missioncontrol/features/com.jrockit.mc.feature.rcp_5.5.2.174165/feature.xml +%%T%%/lib/missioncontrol/features/com.jrockit.mc.rcp.product_5.5.2.174165/feature.properties +%%T%%/lib/missioncontrol/features/com.jrockit.mc.rcp.product_5.5.2.174165/feature.xml %%T%%/lib/missioncontrol/features/org.eclipse.babel.nls_eclipse_ja_4.4.0.v20140623020002/about.html %%T%%/lib/missioncontrol/features/org.eclipse.babel.nls_eclipse_ja_4.4.0.v20140623020002/eclipse_update_120.jpg %%T%%/lib/missioncontrol/features/org.eclipse.babel.nls_eclipse_ja_4.4.0.v20140623020002/epl-v10.html @@ -2001,154 +1996,154 @@ %%T%%/lib/missioncontrol/icon.xpm %%T%%/lib/missioncontrol/mc.jar %%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.core/cache/artifacts.xml -%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.core/cache/binary/com.jrockit.mc.rcp.product_root_5.5.1.172852 -%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.core/cache/binary/com.oracle.jmc.executable.gtk.linux.%%ECLIPSE_ARCHPATH%%_5.5.1 +%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.core/cache/binary/com.jrockit.mc.rcp.product_root_5.5.2.174165 +%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.core/cache/binary/com.oracle.jmc.executable.gtk.linux.%%ECLIPSE_ARCHPATH%%_5.5.2 %%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.core/cache/binary/org.eclipse.rcp_root_4.4.0.v20141007-2301 %%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/.settings/org.eclipse.equinox.p2.artifact.repository.prefs -%%I386_ONLY%%%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/.settings/org.eclipse.equinox.p2.metadata.repository.prefs +%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/.settings/org.eclipse.equinox.p2.metadata.repository.prefs %%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/.lock -%%AMD64_ONLY%%%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/1480019103515.profile.gz -%%AMD64_ONLY%%%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/1480019103856.profile.gz -%%AMD64_ONLY%%%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/1480019113009.profile.gz -%%AMD64_ONLY%%%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/1480019115339.profile.gz -%%I386_ONLY%%%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/1480011635880.profile.gz -%%I386_ONLY%%%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/1480011636212.profile.gz -%%I386_ONLY%%%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/1480011645368.profile.gz -%%I386_ONLY%%%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/1480011647611.profile.gz +%%AMD64_ONLY%%%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/1513160551369.profile.gz +%%AMD64_ONLY%%%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/1513160551742.profile.gz +%%AMD64_ONLY%%%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/1513160561556.profile.gz +%%AMD64_ONLY%%%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/1513160564559.profile.gz +%%I386_ONLY%%%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/1513160512497.profile.gz +%%I386_ONLY%%%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/1513160512778.profile.gz +%%I386_ONLY%%%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/1513160523742.profile.gz +%%I386_ONLY%%%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/1513160525994.profile.gz %%T%%/lib/missioncontrol/plugins/com.ibm.icu_52.1.0.v201404241930.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.alert.ja_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.alert.zh_CN_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.alert_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.attach_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.browser.attach.ja_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.browser.attach.zh_CN_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.browser.attach_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.browser.ja_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.browser.jdp.ja_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.browser.jdp.zh_CN_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.browser.jdp_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.browser.zh_CN_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.browser_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.commands_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.common_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.components.ui.ja_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.components.ui.zh_CN_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.components.ui_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.historicaldata.ja_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.historicaldata.zh_CN_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.historicaldata_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.diagnostic.ja_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.diagnostic.zh_CN_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.diagnostic_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.ja_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.mbeanbrowser.ja_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.mbeanbrowser.zh_CN_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.mbeanbrowser_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification.ja_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification.zh_CN_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.1.172852/META-INF/MANIFEST.MF -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.1.172852/com.jrockit.mc.console.ui.notification_contexts.xml -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.1.172852/html/dcommon/css/blafdoc.css -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.1.172852/html/dcommon/gifs/bookbig.gif -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.1.172852/html/dcommon/gifs/bookicon.gif -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.1.172852/html/dcommon/gifs/booklist.gif -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.1.172852/html/dcommon/gifs/contbig.gif -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.1.172852/html/dcommon/gifs/conticon.gif -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.1.172852/html/dcommon/gifs/doclib.gif -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.1.172852/html/dcommon/gifs/feedback.gif -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.1.172852/html/dcommon/gifs/feedbck2.gif -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.1.172852/html/dcommon/gifs/help.gif -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.1.172852/html/dcommon/gifs/index.gif -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.1.172852/html/dcommon/gifs/indxicon.gif -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.1.172852/html/dcommon/gifs/larrow.gif -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.1.172852/html/dcommon/gifs/leftnav.gif -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.1.172852/html/dcommon/gifs/masterix.gif -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.1.172852/html/dcommon/gifs/mix.gif -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.1.172852/html/dcommon/gifs/oracle.gif -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.1.172852/html/dcommon/gifs/prodbig.gif -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.1.172852/html/dcommon/gifs/prodicon.gif -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.1.172852/html/dcommon/gifs/rarrow.gif -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.1.172852/html/dcommon/gifs/rightnav.gif -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.1.172852/html/dcommon/gifs/toc.gif -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.1.172852/html/dcommon/gifs/topnav.gif -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.1.172852/html/dcommon/gifs/uarrow.gif -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.1.172852/html/dcommon/html/cpyr.htm -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.1.172852/html/olh.htm -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.1.172852/html/olh001.htm -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.1.172852/html/preface.htm -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.1.172852/html/title.htm -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.1.172852/icons/alert_obj.png -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.1.172852/icons/file_obj.gif -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.1.172852/icons/flight_recorder.png -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.1.172852/icons/new-trigger-wiz.gif -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.1.172852/notification_plugin.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.1.172852/plugin.properties -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.1.172852/plugin.xml -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.1.172852/toc.xml -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.zh_CN_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.core_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.docs.ja_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.docs.zh_CN_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.docs_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.flightrecorder.configuration_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.flightrecorder.controlpanel.ui.configuration_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.flightrecorder.controlpanel.ui.ja_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.flightrecorder.controlpanel.ui.zh_CN_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.flightrecorder.controlpanel.ui_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.flightrecorder.ui.ja_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.flightrecorder.ui.zh_CN_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.flightrecorder.ui_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.flightrecorder_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.greychart.ui.ja_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.greychart.ui.zh_CN_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.greychart.ui_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.greychartplugin_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.jdp_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.p2.ui.overridden_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rcp.application.ja_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rcp.application.zh_CN_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rcp.application_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rcp.intro.ja_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rcp.intro.zh_CN_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rcp.intro_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx.ext_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx.ja_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx.ui.ja_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx.ui.zh_CN_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx.ui_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx.zh_CN_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.1.172852/META-INF/MANIFEST.MF -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.1.172852/icons/console_view.png -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.1.172852/icons/date-span-16.png -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.1.172852/icons/day-of-week-16.png -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.1.172852/icons/diagnostic-command-16.png -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.1.172852/icons/hprof-16.png -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.1.172852/icons/send-email-16.png -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.1.172852/icons/time-span-16.png -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.1.172852/lib/dsn.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.1.172852/lib/gimap.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.1.172852/lib/imap.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.1.172852/lib/mailapi.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.1.172852/lib/pop3.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.1.172852/lib/smtp.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.1.172852/plugin.properties -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.1.172852/plugin.xml -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.1.172852/rjmx.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.1.172852/schema/com.jrockit.mc.rjmx.actionProvider.exsd -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.1.172852/schema/com.jrockit.mc.rjmx.attributeTransformation.exsd -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.1.172852/schema/com.jrockit.mc.rjmx.descriptorProvider.exsd -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.1.172852/schema/com.jrockit.mc.rjmx.metadataprovider.exsd -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.1.172852/schema/com.jrockit.mc.rjmx.service.exsd -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.1.172852/schema/com.jrockit.mc.rjmx.syntheticattribute.exsd -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.1.172852/schema/com.jrockit.mc.rjmx.syntheticnotification.exsd -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.1.172852/schema/triggerActionExceptionHandlers.exsd -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.1.172852/schema/triggerActions.exsd -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.1.172852/schema/triggerConstraints.exsd -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.1.172852/schema/triggerEvaluators.exsd -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.ui.ja_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.ui.zh_CN_5.5.1.172852.jar -%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.ui_5.5.1.172852.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.alert.ja_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.alert.zh_CN_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.alert_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.attach_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.browser.attach.ja_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.browser.attach.zh_CN_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.browser.attach_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.browser.ja_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.browser.jdp.ja_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.browser.jdp.zh_CN_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.browser.jdp_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.browser.zh_CN_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.browser_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.commands_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.common_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.components.ui.ja_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.components.ui.zh_CN_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.components.ui_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.historicaldata.ja_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.historicaldata.zh_CN_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.historicaldata_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.diagnostic.ja_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.diagnostic.zh_CN_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.diagnostic_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.ja_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.mbeanbrowser.ja_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.mbeanbrowser.zh_CN_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.mbeanbrowser_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification.ja_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification.zh_CN_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.2.174165/META-INF/MANIFEST.MF +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.2.174165/com.jrockit.mc.console.ui.notification_contexts.xml +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.2.174165/html/dcommon/css/blafdoc.css +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.2.174165/html/dcommon/gifs/bookbig.gif +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.2.174165/html/dcommon/gifs/bookicon.gif +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.2.174165/html/dcommon/gifs/booklist.gif +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.2.174165/html/dcommon/gifs/contbig.gif +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.2.174165/html/dcommon/gifs/conticon.gif +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.2.174165/html/dcommon/gifs/doclib.gif +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.2.174165/html/dcommon/gifs/feedback.gif +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.2.174165/html/dcommon/gifs/feedbck2.gif +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.2.174165/html/dcommon/gifs/help.gif +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.2.174165/html/dcommon/gifs/index.gif +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.2.174165/html/dcommon/gifs/indxicon.gif +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.2.174165/html/dcommon/gifs/larrow.gif +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.2.174165/html/dcommon/gifs/leftnav.gif +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.2.174165/html/dcommon/gifs/masterix.gif +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.2.174165/html/dcommon/gifs/mix.gif +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.2.174165/html/dcommon/gifs/oracle.gif +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.2.174165/html/dcommon/gifs/prodbig.gif +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.2.174165/html/dcommon/gifs/prodicon.gif +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.2.174165/html/dcommon/gifs/rarrow.gif +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.2.174165/html/dcommon/gifs/rightnav.gif +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.2.174165/html/dcommon/gifs/toc.gif +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.2.174165/html/dcommon/gifs/topnav.gif +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.2.174165/html/dcommon/gifs/uarrow.gif +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.2.174165/html/dcommon/html/cpyr.htm +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.2.174165/html/olh.htm +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.2.174165/html/olh001.htm +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.2.174165/html/preface.htm +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.2.174165/html/title.htm +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.2.174165/icons/alert_obj.png +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.2.174165/icons/file_obj.gif +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.2.174165/icons/flight_recorder.png +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.2.174165/icons/new-trigger-wiz.gif +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.2.174165/notification_plugin.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.2.174165/plugin.properties +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.2.174165/plugin.xml +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.notification_5.5.2.174165/toc.xml +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui.zh_CN_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.console.ui_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.core_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.docs.ja_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.docs.zh_CN_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.docs_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.flightrecorder.configuration_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.flightrecorder.controlpanel.ui.configuration_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.flightrecorder.controlpanel.ui.ja_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.flightrecorder.controlpanel.ui.zh_CN_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.flightrecorder.controlpanel.ui_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.flightrecorder.ui.ja_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.flightrecorder.ui.zh_CN_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.flightrecorder.ui_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.flightrecorder_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.greychart.ui.ja_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.greychart.ui.zh_CN_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.greychart.ui_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.greychartplugin_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.jdp_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.p2.ui.overridden_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rcp.application.ja_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rcp.application.zh_CN_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rcp.application_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rcp.intro.ja_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rcp.intro.zh_CN_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rcp.intro_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx.ext_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx.ja_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx.ui.ja_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx.ui.zh_CN_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx.ui_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx.zh_CN_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.2.174165/META-INF/MANIFEST.MF +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.2.174165/icons/console_view.png +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.2.174165/icons/date-span-16.png +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.2.174165/icons/day-of-week-16.png +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.2.174165/icons/diagnostic-command-16.png +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.2.174165/icons/hprof-16.png +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.2.174165/icons/send-email-16.png +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.2.174165/icons/time-span-16.png +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.2.174165/lib/dsn.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.2.174165/lib/gimap.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.2.174165/lib/imap.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.2.174165/lib/mailapi.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.2.174165/lib/pop3.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.2.174165/lib/smtp.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.2.174165/plugin.properties +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.2.174165/plugin.xml +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.2.174165/rjmx.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.2.174165/schema/com.jrockit.mc.rjmx.actionProvider.exsd +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.2.174165/schema/com.jrockit.mc.rjmx.attributeTransformation.exsd +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.2.174165/schema/com.jrockit.mc.rjmx.descriptorProvider.exsd +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.2.174165/schema/com.jrockit.mc.rjmx.metadataprovider.exsd +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.2.174165/schema/com.jrockit.mc.rjmx.service.exsd +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.2.174165/schema/com.jrockit.mc.rjmx.syntheticattribute.exsd +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.2.174165/schema/com.jrockit.mc.rjmx.syntheticnotification.exsd +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.2.174165/schema/triggerActionExceptionHandlers.exsd +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.2.174165/schema/triggerActions.exsd +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.2.174165/schema/triggerConstraints.exsd +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.rjmx_5.5.2.174165/schema/triggerEvaluators.exsd +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.ui.ja_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.ui.zh_CN_5.5.2.174165.jar +%%T%%/lib/missioncontrol/plugins/com.jrockit.mc.ui_5.5.2.174165.jar %%T%%/lib/missioncontrol/plugins/com.sun.el_2.2.0.v201303151357.jar %%T%%/lib/missioncontrol/plugins/javax.annotation_1.2.0.v201401042248.jar %%T%%/lib/missioncontrol/plugins/javax.el_2.2.0.v201303151357.jar diff --git a/java/linux-oracle-jre18/Makefile b/java/linux-oracle-jre18/Makefile index b7a6692d30c..c70acf7d402 100644 --- a/java/linux-oracle-jre18/Makefile +++ b/java/linux-oracle-jre18/Makefile @@ -28,7 +28,7 @@ ONLY_FOR_ARCHS= i386 amd64 JRE_VENDOR= oracle JRE_VERSION= 8 JRE_INTERNAL_VERSION= 1.${JRE_VERSION}.0 -JRE_UPDATE_VERSION= 162 +JRE_UPDATE_VERSION= 172 .if ${JRE_UPDATE_VERSION} == 0 DL_JRE_VERSION= ${JRE_INTERNAL_VERSION} .elif ${JRE_UPDATE_VERSION} <= 9 diff --git a/java/linux-oracle-jre18/distinfo b/java/linux-oracle-jre18/distinfo index 296098b944c..62020a87ea9 100644 --- a/java/linux-oracle-jre18/distinfo +++ b/java/linux-oracle-jre18/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1519433018 -SHA256 (jre-8u162-linux-i586.tar.gz) = b0752798b28ce6e6bb133070f06fbdbd0a5bbbaf678f6c40a6def5c25e102289 -SIZE (jre-8u162-linux-i586.tar.gz) = 83185844 -SHA256 (jre-8u162-linux-x64.tar.gz) = dfa25ebd1f90bf74ad7ba2dacb0e08d884594e733c9a522b58256778031341a4 -SIZE (jre-8u162-linux-x64.tar.gz) = 80107578 +TIMESTAMP = 1527358498 +SHA256 (jre-8u172-linux-i586.tar.gz) = ce7924a8dbfac69814b360d639a0abc04963d68c8f507b79715cdb5fb2f098c7 +SIZE (jre-8u172-linux-i586.tar.gz) = 84306480 +SHA256 (jre-8u172-linux-x64.tar.gz) = f08f25aec2bdc86138ccba8fd5b904451e3afa1d24a88c85f28c2d84bfd45bad +SIZE (jre-8u172-linux-x64.tar.gz) = 81182269 diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile index a19a541c5d8..9a80fc35996 100644 --- a/lang/ghc/Makefile +++ b/lang/ghc/Makefile @@ -3,10 +3,9 @@ PORTNAME= ghc PORTVERSION= ${GHC_VERSION} -PORTREVISION= 3 CATEGORIES= lang haskell MASTER_SITES= http://www.haskell.org/ghc/dist/${PORTVERSION}/:source \ - LOCAL/pgj/:boot + LOCAL/arrowd/:boot DISTFILES= ghc-${PORTVERSION}-src${EXTRACT_SUFX}:source MAINTAINER= haskell@FreeBSD.org @@ -17,13 +16,13 @@ LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= i386 amd64 -GHC_VERSION= 8.0.2 -HSCOLOUR_VERSION= 1.24.1 +GHC_VERSION= 8.4.2 +HSCOLOUR_VERSION= 1.24.4 DATADIR= ${PREFIX}/share/ghc-${GHC_VERSION} EXAMPLESDIR= ${PREFIX}/share/examples/ghc-${GHC_VERSION} -CONFLICTS= ghc-7.4.* ghc-7.6.* ghc-7.8.* ghc-7.10.* +CONFLICTS= ghc-7.4.* ghc-7.6.* ghc-7.8.* ghc-7.10.* ghc-8.0.* LIB_DEPENDS+= libgmp.so:math/gmp @@ -40,8 +39,7 @@ USE_HARDENING= pie:off # This is better fixed in files/build.mk.in GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-ld=${LD} \ - --with-gmp-includes=${LOCALBASE}/include \ +CONFIGURE_ARGS= --with-gmp-includes=${LOCALBASE}/include \ --with-gmp-libraries=${LOCALBASE}/lib \ --with-iconv-includes=${LOCALBASE}/include \ --with-iconv-libraries=${LOCALBASE}/lib @@ -49,7 +47,7 @@ CONFIGURE_ARGS= --with-ld=${LD} \ SUB_FILES= build.mk \ build.boot.mk SUB_LIST= GHC_VERSION=${GHC_VERSION} \ - NCURSESINC="${NCURSESINC}" NCURSESLIB="${NCURSESLIB}" \ + NCURSESINC="${NCURSESBASE}/include" NCURSESLIB="${NCURSESLIB}" \ CFLAGS="${CFLAGS}" OPTIONS_GROUP= BOOTSTRAP @@ -92,14 +90,17 @@ LOCALBASE?= /usr/local .include .if empty(PORT_OPTIONS:MBOOT) -BOOT_GHC_VERSION= 7.10.2 +BOOT_GHC_VERSION= 8.4.2 DISTFILES+= ghc-${BOOT_GHC_VERSION}-boot-${ARCH}-freebsd${EXTRACT_SUFX}:boot .endif # MBOOT -CONFIGURE_ARGS+= -with-gcc=${CC} -.if empty(PORT_OPTIONS:MBOOT) -CONFIGURE_ARGS_BOOT+= --with-gcc=${CC} +.if ${OSVERSION} < 1200000 +USE_GCC= yes +CONFIGURE_ARGS+= --enable-dtrace=0 +.else +LD= ld.bfd .endif +CONFIGURE_ENV+= CC=${CC} LD=${LD} DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} GHC_LIBDIR= ${STAGEDIR}${PREFIX}/lib/ghc-${GHC_VERSION} @@ -117,7 +118,7 @@ BOOT_HSC2HS= ${BOOT_DIR}/bin/hsc2hs SLAVE_CMD= ${SETENV} PATH=${BOOT_DIR}/bin:${PATH} -CONFIGURE_ARGS_BOOT+= --prefix=${BOOT_DIR} --with-ld=${LD} +CONFIGURE_ARGS_BOOT+= --prefix=${BOOT_DIR} CONFIGURE_ARGS+= --with-ghc=${BOOT_GHC} .else # MBOOT SLAVE_CMD= # empty @@ -191,13 +192,19 @@ post-patch: s|%%AR%%|${AR}|; \ s|%%LD%%|${LD}|' \ ${WRKSRC}/libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs +.if empty(PORT_OPTIONS:MBOOT) + @${REINPLACE_CMD} -e '/^mandir/d' ${BOOT_DIR}/mk/build.mk + @${REINPLACE_CMD} -e '/^infodir/d' ${BOOT_DIR}/mk/build.mk + @${REINPLACE_CMD} -e '/^docdir/d' ${BOOT_DIR}/mk/build.mk + @${REINPLACE_CMD} -e '/^htmldir/d' ${BOOT_DIR}/mk/build.mk +.endif pre-configure: apply-slist # Copy the subbed build.mk to the proper position ${CP} ${WRKDIR}/build.mk ${WRKSRC}/mk/build.mk @${MKDIR} ${TMPDIR} -.if empty(PORT_OPTIONS:MBOOTH) && ${OPSYS} == FreeBSD && \ +.if empty(PORT_OPTIONS:MBOOT) && ${OPSYS} == FreeBSD && \ ${OSVERSION} >= 1200031 ${CC} ${CFLAGS} -c -o ${BOOT_DIR}/wrap.o ${PATCHDIR}/wrap.c for x in ${BOOT_DIR}/rts/dist/build/libCffi*.a; do \ @@ -234,14 +241,14 @@ pre-configure: apply-slist ${SLAVE_CMD} ./Setup install) .endif -_EXECUTABLES= ${STAGEDIR}${PREFIX}/bin/hp2ps \ - ${GHC_LIBDIR}/bin/unlit \ +_EXECUTABLES= ${GHC_LIBDIR}/bin/unlit \ ${GHC_LIBDIR}/bin/hpc \ ${GHC_LIBDIR}/bin/ghc-iserv \ ${GHC_LIBDIR}/bin/ghc-pkg \ ${GHC_LIBDIR}/bin/hsc2hs \ ${GHC_LIBDIR}/bin/runghc \ - ${GHC_LIBDIR}/bin/ghc + ${GHC_LIBDIR}/bin/ghc \ + ${GHC_LIBDIR}/bin/hp2ps .if ${PORT_OPTIONS:MPROFILE} _EXECUTABLES+= ${GHC_LIBDIR}/bin/ghc-iserv-prof @@ -258,7 +265,7 @@ post-install: .if ${PORT_OPTIONS:MDOCS} ${LN} -sf haddock-ghc-${GHC_VERSION} ${STAGEDIR}${PREFIX}/bin/haddock .endif - (for f in ${_EXECUTABLES} $$(${FIND} ${GHC_LIBDIR} -name '*.so'); do \ + (for f in ${_EXECUTABLES} $$(${FIND} ${GHC_LIBDIR} -name '*.so*'); do \ ${STRIP_CMD} $$f; done) .include @@ -266,12 +273,8 @@ post-install: # Create a bootstrap compiler tar ball: run this in an interactive poudriere jail .PHONY: create-bootstrap create-bootstrap: - @${ECHO} "TODO: https://github.com/freebsd-haskell/ports/wiki/Updating-the-Bootstrap-Compiler" - cd ${WRKSCR} \ - && ${CP} ${WRKDIR}/build.boot.mk mk \ - && setenv ${CONFIGURE_ENV} ./configure --with-iconv-includes=${LOCALBASE}/include \ - --with-iconv-libraries=${LOCALBASE}/lib \ - --with-gcc=${CC} \ - --with-ld=${LD} \ - && make binary-dist TAR_COMP=xz \\ - && mv ghc-${GHC_VERSION}-boot-${GHC_ARCH}-unknown-freebsd.tar.xz /tmp/ghc-${GHC_VERSION}-${ARCH}-freebsd${FREEBSD_MAJOR_VERSION}-boot.tar.xz + cd ${WRKSRC} \ + && gmake binary-dist TAR_COMP=xz \ + && mv ${WRKSRC}/ghc-${GHC_VERSION}-${ARCH}-portbld-freebsd.tar.xz /tmp/ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz + && sha256 ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz + && stat -f %z ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz diff --git a/lang/ghc/bsd.cabal.options.mk b/lang/ghc/bsd.cabal.options.mk index aa64e85c9ec..3c1635363af 100644 --- a/lang/ghc/bsd.cabal.options.mk +++ b/lang/ghc/bsd.cabal.options.mk @@ -18,9 +18,9 @@ GHC_CMD?= ${LOCALBASE}/bin/ghc HADDOCK_CMD?= ${LOCALBASE}/bin/haddock HSCOLOUR_CMD?= ${LOCALBASE}/bin/HsColour -GHC_VERSION?= 8.0.2 +GHC_VERSION?= 8.4.2 -HSCOLOUR_VERSION= 1.24.1 +HSCOLOUR_VERSION= 1.24.4 HSCOLOUR_DESC?= Colorize generated documentation by HsColour DYNAMIC_DESC?= Add support for dynamic linking diff --git a/lang/ghc/bsd.hackage.mk b/lang/ghc/bsd.hackage.mk index 4b48785a2cb..fc1c9ed9a75 100644 --- a/lang/ghc/bsd.hackage.mk +++ b/lang/ghc/bsd.hackage.mk @@ -86,14 +86,15 @@ authenticate_port?= www/hs-authenticate auto-update_port?= devel/hs-auto-update aws_port?= net/hs-aws base-compat_port?= devel/hs-base-compat +base-compat-batteries_port?= devel/hs-base-compat-batteries base-orphans_port?= devel/hs-base-orphans base-unicode-symbols_port?= devel/hs-base-unicode-symbols base16-bytestring_port?= devel/hs-base16-bytestring base64-bytestring_port?= devel/hs-base64-bytestring +basement_port?= devel/hs-basement basic-prelude_port?= devel/hs-basic-prelude bencode_port?= textproc/hs-bencode bifunctors_port?= devel/hs-bifunctors -bio_port?= science/hs-bio # executable bits-atomic_port?= devel/hs-bits-atomic blaze-builder_port?= devel/hs-blaze-builder blaze-builder-enumerator_port?= devel/hs-blaze-builder-enumerator @@ -101,11 +102,11 @@ blaze-html_port?= textproc/hs-blaze-html blaze-markup_port?= textproc/hs-blaze-markup blaze-textual_port?= devel/hs-blaze-textual bloomfilter_port?= devel/hs-bloomfilter -BNFC_port?= devel/hs-BNFC # executable Boolean_port?= devel/hs-Boolean BoundedChan_port?= devel/hs-BoundedChan boxes_port?= devel/hs-boxes brainfuck_port?= lang/hs-brainfuck # executable +bsb-http-chunked_port?= net/hs-bsb-http-chunked bsd-sysctl_port?= devel/hs-bsd-sysctl byteable_port?= devel/hs-byteable byteorder_port?= devel/hs-byteorder @@ -137,6 +138,7 @@ classy-prelude-conduit_port?= devel/hs-classy-prelude-conduit clientsession_port?= security/hs-clientsession clock_port?= devel/hs-clock cmark_port?= textproc/hs-cmark +cmark-gfm_port?= textproc/hs-cmark-gfm cmdargs_port?= devel/hs-cmdargs code-page_port?= devel/hs-code-page colour_port?= devel/hs-colour @@ -173,6 +175,7 @@ cryptohash-sha256_port?= security/hs-cryptohash-sha256 cryptohash-conduit_port?= security/hs-cryptohash-conduit cryptohash-cryptoapi_port?= security/hs-cryptohash-cryptoapi cryptonite_port?= security/hs-cryptonite +cryptonite-conduit_port?= security/hs-cryptonite-conduit css-text_port?= www/hs-css-text csv_port?= textproc/hs-csv curl_port?= ftp/hs-curl # lib_depends @@ -210,6 +213,7 @@ double-conversion_port?= textproc/hs-double-conversion DRBG_port?= security/hs-DRBG ed25519_port?= security/hs-ed25519 easy-file_port?= devel/hs-easy-file +echo_port?= devel/hs-echo EdisonAPI_port?= devel/hs-EdisonAPI EdisonCore_port?= devel/hs-EdisonCore edit-distance_port?= devel/hs-edit-distance @@ -274,12 +278,12 @@ happy_port?= devel/hs-happy hashable_port?= devel/hs-hashable hashed-storage_port?= devel/hs-hashed-storage hashtables_port?= devel/hs-hashtables -haskell-lexer_port?= devel/hs-haskell-lexer +haskell-lexer_port?= devel/hs-haskell-lexer haskell-src_port?= devel/hs-haskell-src haskell-src-exts_port?= devel/hs-haskell-src-exts +haskell-src-meta_port?= devel/hs-haskell-src-meta haskell-xmpp_port?= net-im/hs-haskell-xmpp hasktags_port?= devel/hs-hasktags # executable -hastache_port?= devel/hs-hastache HaXml_port?= textproc/hs-HaXml # executable hedis_port?= databases/hs-hedis heist_port?= www/hs-heist @@ -302,6 +306,7 @@ hsb2hs_port?= devel/hs-hsb2hs hscolour_port?= print/hs-hscolour # executable hslogger_port?= devel/hs-hslogger hslua_port?= devel/hs-hslua +hslua-module-text_port?= devel/hs-hslua-module-text HsOpenSSL_port?= security/hs-HsOpenSSL hspec_port?= devel/hs-hspec # executable hspec-core_port?= devel/hs-hspec-core @@ -374,7 +379,6 @@ monad-par_port?= devel/hs-monad-par monad-par-extras_port?= devel/hs-monad-par-extras monad-unlift_port?= devel/hs-monad-unlift monadcryptorandom_port?= security/hs-monadcryptorandom -monadplus_port?= devel/hs-monadplus MonadRandom_port?= devel/hs-MonadRandom monads-tf_port?= devel/hs-monads-tf mono-traversable_port?= devel/hs-mono-traversable @@ -411,7 +415,6 @@ pandoc-citeproc_port?= textproc/hs-pandoc-citeproc pandoc-types_port?= textproc/hs-pandoc-types pango_port?= x11-toolkits/hs-pango parallel_port?= devel/hs-parallel -parsec_port?= textproc/hs-parsec path-pieces_port?= www/hs-path-pieces pcap_port?= net/hs-pcap pcre-light_port?= devel/hs-pcre-light # lib_depends @@ -453,6 +456,7 @@ regex-pcre_port?= textproc/hs-regex-pcre regex-pcre-builtin_port?= textproc/hs-regex-pcre-builtin # lib_depends regex-posix_port?= textproc/hs-regex-posix regex-tdfa_port?= textproc/hs-regex-tdfa +resolv_port?= net/hs-resolv resource-pool_port?= devel/hs-resource-pool resourcet_port?= devel/hs-resourcet rfc5051_port?= textproc/hs-rfc5051 @@ -482,6 +486,7 @@ simple-reflect_port?= devel/hs-simple-reflect simple-sendfile_port?= net/hs-simple-sendfile skein_port?= security/hs-skein skylighting_port?= textproc/hs-skylighting +skylighting-core_port?= textproc/hs-skylighting-core smallcheck_port?= devel/hs-smallcheck snap_port?= www/hs-snap # executable snap-core_port?= www/hs-snap-core @@ -493,6 +498,8 @@ statistics_port?= math/hs-statistics stm_port?= devel/hs-stm stm-chans_port?= devel/hs-stm-chans STMonadTrans_port?= devel/hs-STMonadTrans +storable-record_port?= devel/hs-storable-record +storable-tuple_port?= devel/hs-storable-tuple Stream_port?= devel/hs-Stream streaming-commons_port?= devel/hs-streaming-commons strict_port?= devel/hs-strict @@ -512,13 +519,15 @@ test-framework_port?= devel/hs-test-framework test-framework-hunit_port?= devel/hs-test-framework-hunit test-framework-quickcheck2_port?= devel/hs-test-framework-quickcheck2 texmath_port?= textproc/hs-texmath # executable -text_port?= devel/hs-text text-icu_port?= devel/hs-text-icu # lib_depends text-short_port?= devel/hs-text-short tf-random_port?= devel/hs-tf-random th-abstraction_port?= devel/hs-th-abstraction +th-expand-syns_port?= devel/hs-th-expand-syns th-lift_port?= devel/hs-th-lift th-lift-instances_port?= devel/hs-th-lift-instances +th-orphans_port?= devel/hs-th-orphans +th-reify-many_port?= devel/hs-th-reify-many threads_port?= devel/hs-threads threadscope_port?= devel/hs-threadscope # executable time-compat_port?= devel/hs-time-compat @@ -534,14 +543,18 @@ TypeCompose_port?= devel/hs-TypeCompose typed-process_port?= devel/hs-typed-process unamb_port?= devel/hs-unamb unexceptionalio_port?= devel/hs-unexceptionalio +unicode-show_port?= devel/hs-unicode-show uniplate_port?= devel/hs-uniplate unix-compat_port?= devel/hs-unix-compat unix-time_port?= devel/hs-unix-time unlambda_port?= lang/hs-unlambda # executable +unliftio_port?= devel/hs-unliftio +unliftio-core_port?= devel/hs-unliftio-core unordered-containers_port?= devel/hs-unordered-containers uri_port?= textproc/hs-uri uri-bytestring_port?= textproc/hs-uri-bytestring uri-bytestring-aeson_port?= textproc/hs-uri-bytestring-aeson +uri-encode_port?= textproc/hs-uri-encode url_port?= www/hs-url utf8-light_port?= devel/hs-utf8-light utf8-string_port?= devel/hs-utf8-string diff --git a/lang/ghc/distinfo b/lang/ghc/distinfo index 53d94da1c51..61bea444c10 100644 --- a/lang/ghc/distinfo +++ b/lang/ghc/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1499672924 -SHA256 (ghc-8.0.2-src.tar.xz) = 11625453e1d0686b3fa6739988f70ecac836cadc30b9f0c8b49ef9091d6118b1 -SIZE (ghc-8.0.2-src.tar.xz) = 10687760 -SHA256 (ghc-7.10.2-boot-i386-freebsd.tar.xz) = 5cadd55316fe6c1bf275d0f44f10b46342096922a15ecb9fb78c80fc293f901a -SIZE (ghc-7.10.2-boot-i386-freebsd.tar.xz) = 39858716 -SHA256 (ghc-7.10.2-boot-amd64-freebsd.tar.xz) = 4af0ee0795537baa11a96fba23477f8390ccb5f45910cda119d0a16bdebaedc8 -SIZE (ghc-7.10.2-boot-amd64-freebsd.tar.xz) = 49833224 -SHA256 (hscolour-1.24.1.tar.gz) = e46fe3de8ed6f96e2216b94b7608d01919bc86b15dd8d0ec7e71c0e7e5bf79c8 -SIZE (hscolour-1.24.1.tar.gz) = 28717 +TIMESTAMP = 1521746767 +SHA256 (ghc-8.4.2-src.tar.xz) = 01cc32f24a06bf3b2428351b6d7fec791e82d042426d29ad9e5a245b35f0047b +SIZE (ghc-8.4.2-src.tar.xz) = 11313140 +SHA256 (ghc-8.4.2-boot-amd64-freebsd.tar.xz) = 8fe44700c0b765b38a2072c8ea9ddb1da18b4a738397c9ceddcce80708900e4f +SIZE (ghc-8.4.2-boot-amd64-freebsd.tar.xz) = 72751016 +SHA256 (ghc-8.4.2-boot-i386-freebsd.tar.xz) = 673230735fc459a3c05cf845ef7beeeb6eab9576bc03471b9fb50bd3fe29d911 +SIZE (ghc-8.4.2-boot-i386-freebsd.tar.xz) = 69976728 +SHA256 (hscolour-1.24.4.tar.gz) = 243332b082294117f37b2c2c68079fa61af68b36223b3fc07594f245e0e5321d +SIZE (hscolour-1.24.4.tar.gz) = 28729 diff --git a/lang/ghc/files/patch-compiler_main_SysTools.hs b/lang/ghc/files/patch-compiler_main_SysTools.hs deleted file mode 100644 index 06dce352555..00000000000 --- a/lang/ghc/files/patch-compiler_main_SysTools.hs +++ /dev/null @@ -1,12 +0,0 @@ ---- compiler/main/SysTools.hs.orig 2017-08-12 09:25:57 UTC -+++ compiler/main/SysTools.hs -@@ -907,6 +907,9 @@ getCompilerInfo' dflags = do - -- Regular clang - | any ("clang version" `isInfixOf`) stde = - return Clang -+ -- FreeBSD clang -+ | any ("FreeBSD clang version" `isInfixOf`) stde = -+ return Clang - -- XCode 5.1 clang - | any ("Apple LLVM version 5.1" `isPrefixOf`) stde = - return AppleClang51 diff --git a/lang/ghc/files/patch-configure.ac b/lang/ghc/files/patch-configure.ac index 8906fbb875d..5a4a978d08b 100644 --- a/lang/ghc/files/patch-configure.ac +++ b/lang/ghc/files/patch-configure.ac @@ -1,6 +1,6 @@ ---- configure.ac.orig 2017-01-04 14:17:17 UTC +--- configure.ac.orig 2018-03-06 16:48:53 UTC +++ configure.ac -@@ -418,6 +418,9 @@ AC_SUBST([SplitObjsBroken]) +@@ -447,6 +447,9 @@ XCODE_VERSION() dnl ** Building a cross compiler? dnl -------------------------------------------------------------- CrossCompiling=NO @@ -10,15 +10,15 @@ # If 'host' and 'target' differ, then this means we are building a cross-compiler. if test "$TargetPlatform" != "$HostPlatform" ; then CrossCompiling=YES -@@ -1057,6 +1060,11 @@ if test "$ac_cv_sizeof_void_p" -eq 8 ; then - use_large_address_space=yes - elif test "$ghc_host_os" = "openbsd" ; then - # as of OpenBSD 5.8 (2015), OpenBSD does not support mmap with MAP_NORESERVE. -+ # The flag MAP_NORESERVE is supported for source compatibility reasons, -+ # but is completely ignored by OS mmap -+ use_large_address_space=no -+ elif test "$ghc_host_os" = "freebsd" ; then -+ # FreeBSD does not support mmap with MAP_NORESERVE,r emoved in r273250. +@@ -1163,6 +1158,11 @@ if test "$ac_cv_sizeof_void_p" -eq 8 ; t # The flag MAP_NORESERVE is supported for source compatibility reasons, # but is completely ignored by OS mmap use_large_address_space=no ++ elif test "$ghc_host_os" = "freebsd" ; then ++ # FreeBSD does not support mmap with MAP_NORESERVE, removed in r273250. ++ # The flag MAP_NORESERVE is supported for source compatibility reasons, ++ # but is completely ignored by OS mmap ++ use_large_address_space=no + else + AC_CHECK_DECLS([MAP_NORESERVE, MADV_FREE, MADV_DONTNEED],[],[], + [ diff --git a/lang/ghc/files/patch-ghc.mk b/lang/ghc/files/patch-ghc.mk index 8ffda7a1671..8ab4d6e1313 100644 --- a/lang/ghc/files/patch-ghc.mk +++ b/lang/ghc/files/patch-ghc.mk @@ -8,14 +8,14 @@ else $(error Make has restarted itself $(MAKE_RESTARTS) times; is there a makefile bug? See http://ghc.haskell.org/trac/ghc/wiki/Building/Troubleshooting#Makehasrestarteditself3timesisthereamakefilebug for details) endif -@@ -465,10 +466,7 @@ PACKAGES_STAGE1 += ghc-boot +@@ -459,10 +460,7 @@ PACKAGES_STAGE1 += ghc-boot-th + PACKAGES_STAGE1 += ghc-boot PACKAGES_STAGE1 += template-haskell - PACKAGES_STAGE1 += hoopl - PACKAGES_STAGE1 += transformers + PACKAGES_STAGE1 += ghc-compact - -ifeq "$(HADDOCK_DOCS)" "YES" PACKAGES_STAGE1 += xhtml -endif - ifeq "$(Windows_Target)" "NO" - ifneq "$(TargetOS_CPP)" "ios" + ifeq "$(WITH_TERMINFO)" "YES" + PACKAGES_STAGE1 += terminfo diff --git a/lang/ghc/files/patch-includes_rts_storage_ClosureMacros.h b/lang/ghc/files/patch-includes_rts_storage_ClosureMacros.h deleted file mode 100644 index 77e317c6003..00000000000 --- a/lang/ghc/files/patch-includes_rts_storage_ClosureMacros.h +++ /dev/null @@ -1,22 +0,0 @@ ---- includes/rts/storage/ClosureMacros.h.orig 2018-01-03 13:27:55 UTC -+++ includes/rts/storage/ClosureMacros.h -@@ -499,8 +499,17 @@ INLINE_HEADER StgWord8 *mutArrPtrsCard ( - - -------------------------------------------------------------------------- */ - --#define ZERO_SLOP_FOR_LDV_PROF (defined(PROFILING)) --#define ZERO_SLOP_FOR_SANITY_CHECK (defined(DEBUG) && !defined(THREADED_RTS)) -+#if defined(PROFILING) -+#define ZERO_SLOP_FOR_LDV_PROF 1 -+#else -+#define ZERO_SLOP_FOR_LDV_PROF 0 -+#endif -+ -+#if defined(DEBUG) && !defined(THREADED_RTS) -+#define ZERO_SLOP_FOR_SANITY_CHECK 1 -+#else -+#define ZERO_SLOP_FOR_SANITY_CHECK 0 -+#endif - - #if ZERO_SLOP_FOR_LDV_PROF || ZERO_SLOP_FOR_SANITY_CHECK - #define OVERWRITING_CLOSURE(c) overwritingClosure(c) diff --git a/lang/ghc/files/patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs b/lang/ghc/files/patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs deleted file mode 100644 index c7ddc4addf4..00000000000 --- a/lang/ghc/files/patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs +++ /dev/null @@ -1,11 +0,0 @@ ---- libraries/Cabal/Cabal/Distribution/Simple/GHC.hs.orig 2017-01-03 15:59:20 UTC -+++ libraries/Cabal/Cabal/Distribution/Simple/GHC.hs -@@ -996,7 +996,7 @@ getRPaths lbi clbi | supportRPaths hostOS = do - supportRPaths Linux   = True - supportRPaths Windows = False - supportRPaths OSX   = True -- supportRPaths FreeBSD   = False -+ supportRPaths FreeBSD   = True - supportRPaths OpenBSD   = False - supportRPaths NetBSD   = False - supportRPaths DragonFly = False diff --git a/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs b/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs index 18f93733593..96b536dc0ea 100644 --- a/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs +++ b/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs @@ -1,15 +1,15 @@ ---- libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs.orig 2017-01-03 15:59:20 UTC +--- libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs.orig 2017-11-28 16:40:34 UTC +++ libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs -@@ -54,6 +54,8 @@ import Distribution.Compat.Exception +@@ -59,6 +59,8 @@ import Distribution.Compat.Exception import Distribution.Verbosity import Distribution.Version +import System.FilePath (takeDirectory) + - import Data.Char - ( isDigit ) import qualified Data.Map as Map -@@ -251,11 +253,13 @@ alexProgram = (simpleProgram "alex") { + + -- ------------------------------------------------------------ +@@ -265,11 +267,13 @@ alexProgram = (simpleProgram "alex") { gccProgram :: Program gccProgram = (simpleProgram "gcc") { @@ -26,7 +26,7 @@ stripProgram :: Program stripProgram = (simpleProgram "strip") { -@@ -311,7 +315,9 @@ greencardProgram :: Program +@@ -337,7 +341,9 @@ greencardProgram :: Program greencardProgram = simpleProgram "greencard" ldProgram :: Program diff --git a/lang/ghc/files/patch-rts_Linker.c b/lang/ghc/files/patch-rts_Linker.c deleted file mode 100644 index 9597fe88760..00000000000 --- a/lang/ghc/files/patch-rts_Linker.c +++ /dev/null @@ -1,11 +0,0 @@ ---- rts/Linker.c.orig 2017-08-12 09:22:13 UTC -+++ rts/Linker.c -@@ -797,7 +797,7 @@ initLinker_ (int retain_cafs) - # endif /* RTLD_DEFAULT */ - - compileResult = regcomp(&re_invalid, -- "(([^ \t()])+\\.so([^ \t:()])*):([ \t])*(invalid ELF header|file too short)", -+ "(([^ \t()])+\\.so([^ \t:()])*):([ \t])*(invalid ELF header|file too short|invalid file format)", - REG_EXTENDED); - if (compileResult != 0) { - barf("Compiling re_invalid failed"); diff --git a/lang/hs-brainfuck/Makefile b/lang/hs-brainfuck/Makefile index bbe84280616..fb33e113fc5 100644 --- a/lang/hs-brainfuck/Makefile +++ b/lang/hs-brainfuck/Makefile @@ -3,7 +3,7 @@ PORTNAME= brainfuck PORTVERSION= 0.1.0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang haskell MAINTAINER= haskell@FreeBSD.org diff --git a/lang/hs-unlambda/Makefile b/lang/hs-unlambda/Makefile index 1f0b20f729e..b1a42f9335b 100644 --- a/lang/hs-unlambda/Makefile +++ b/lang/hs-unlambda/Makefile @@ -3,7 +3,7 @@ PORTNAME= unlambda PORTVERSION= 0.1.4.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang haskell MAINTAINER= haskell@FreeBSD.org diff --git a/mail/hs-email-validate/Makefile b/mail/hs-email-validate/Makefile index e90754a4c40..8616aec9b14 100644 --- a/mail/hs-email-validate/Makefile +++ b/mail/hs-email-validate/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= email-validate -PORTVERSION= 2.3 -PORTREVISION= 1 +PORTVERSION= 2.3.2.5 CATEGORIES= mail haskell MAINTAINER= haskell@FreeBSD.org diff --git a/mail/hs-email-validate/distinfo b/mail/hs-email-validate/distinfo index e70f72ac996..4a917ef8078 100644 --- a/mail/hs-email-validate/distinfo +++ b/mail/hs-email-validate/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499623071 -SHA256 (cabal/email-validate-2.3.tar.gz) = c149b4a2d4d91c5263f9883944498446ac41258347bdf29908240fa536d6a6fe -SIZE (cabal/email-validate-2.3.tar.gz) = 9648 +TIMESTAMP = 1523785923 +SHA256 (cabal/email-validate-2.3.2.5.tar.gz) = 7b4ff4e89eccc073df2f51e9d20d507ba1a6d4f5746130c712844c7cf8674e4c +SIZE (cabal/email-validate-2.3.2.5.tar.gz) = 9693 diff --git a/mail/hs-mime-mail/Makefile b/mail/hs-mime-mail/Makefile index b86a93feb91..ae9eec4fb7a 100644 --- a/mail/hs-mime-mail/Makefile +++ b/mail/hs-mime-mail/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= mime-mail -PORTVERSION= 0.4.13.1 -PORTREVISION= 1 +PORTVERSION= 0.4.14 CATEGORIES= mail haskell MAINTAINER= haskell@FreeBSD.org @@ -10,8 +9,7 @@ COMMENT= Compose MIME email messages LICENSE= MIT -USE_CABAL= base64-bytestring>=0.1 blaze-builder>=0.2.1 random>=1.0 \ - text>=0.7 +USE_CABAL= base64-bytestring>=0.1 blaze-builder>=0.2.1 random>=1.0 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/mail/hs-mime-mail/distinfo b/mail/hs-mime-mail/distinfo index fab5f310943..8db974cedc5 100644 --- a/mail/hs-mime-mail/distinfo +++ b/mail/hs-mime-mail/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499623071 -SHA256 (cabal/mime-mail-0.4.13.1.tar.gz) = 9481671092739dab1d963c9db0dce56a0187390fb24c9badeeded6afb5895917 -SIZE (cabal/mime-mail-0.4.13.1.tar.gz) = 9538 +TIMESTAMP = 1523900845 +SHA256 (cabal/mime-mail-0.4.14.tar.gz) = 9632c3d54c9741fece0a3ea705d965485a1299ebe5798d2aa7cca2c8e4baaa3e +SIZE (cabal/mime-mail-0.4.14.tar.gz) = 9594 diff --git a/mail/hs-mime-types/Makefile b/mail/hs-mime-types/Makefile index cbee8b6d5ad..230d7e05c8e 100644 --- a/mail/hs-mime-types/Makefile +++ b/mail/hs-mime-types/Makefile @@ -2,7 +2,7 @@ PORTNAME= mime-types PORTVERSION= 0.1.0.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,5 @@ COMMENT= Basic mime-type handling types and functions LICENSE= MIT -USE_CABAL= text - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/mail/hs-mime/Makefile b/mail/hs-mime/Makefile index d6472827d5e..fdf3787ce20 100644 --- a/mail/hs-mime/Makefile +++ b/mail/hs-mime/Makefile @@ -3,7 +3,7 @@ PORTNAME= mime PORTVERSION= 0.4.0.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,5 @@ COMMENT= Working with MIME types LICENSE= BSD3CLAUSE -USE_CABAL= text>=0.9 - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/mail/p5-Sisimai/Makefile b/mail/p5-Sisimai/Makefile index b21463d794c..bf32ae96623 100644 --- a/mail/p5-Sisimai/Makefile +++ b/mail/p5-Sisimai/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= Sisimai -PORTVERSION= 4.22.5 -DISTVERSIONPREFIX=v +PORTVERSION= 4.22.6 +DISTVERSIONPREFIX= v CATEGORIES= mail perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:AKXLIX @@ -12,11 +12,12 @@ MAINTAINER= perl@FreeBSD.org COMMENT= Mail Analyzing Interface for bounce mails LICENSE= BSD2CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= p5-Module-Build-Tiny>0:devel/p5-Module-Build-Tiny TEST_DEPENDS= p5-Class-Accessor-Lite>0:devel/p5-Class-Accessor-Lite +NO_ARCH= yes USES= perl5 -USE_PERL5= modbuild +USE_PERL5= modbuildtiny .include diff --git a/mail/p5-Sisimai/distinfo b/mail/p5-Sisimai/distinfo index 778b01743fa..40b09a8e725 100644 --- a/mail/p5-Sisimai/distinfo +++ b/mail/p5-Sisimai/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1526143052 -SHA256 (Sisimai-v4.22.5.tar.gz) = 7e91ea6adc3448ca03e09ff8b116111ebc2fc5999b80ee212b490a20ed96df31 -SIZE (Sisimai-v4.22.5.tar.gz) = 995961 +TIMESTAMP = 1527234544 +SHA256 (Sisimai-v4.22.6.tar.gz) = 20905e9227679d6154bcc8063e3d61fa250cc02306a2644e754942fcf58b8f24 +SIZE (Sisimai-v4.22.6.tar.gz) = 1156566 diff --git a/mail/p5-Sisimai/pkg-plist b/mail/p5-Sisimai/pkg-plist index 4737716e27a..5426f01025e 100644 --- a/mail/p5-Sisimai/pkg-plist +++ b/mail/p5-Sisimai/pkg-plist @@ -112,6 +112,7 @@ %%SITE_PERL%%/Sisimai/Rhost/FrancePTT.pm %%SITE_PERL%%/Sisimai/Rhost/GoDaddy.pm %%SITE_PERL%%/Sisimai/Rhost/GoogleApps.pm +%%SITE_PERL%%/Sisimai/Rhost/KDDI.pm %%SITE_PERL%%/Sisimai/SMTP.pm %%SITE_PERL%%/Sisimai/SMTP/Error.pm %%SITE_PERL%%/Sisimai/SMTP/Reply.pm @@ -232,6 +233,7 @@ %%PERL5_MAN3%%/Sisimai::Rhost::FrancePTT.3.gz %%PERL5_MAN3%%/Sisimai::Rhost::GoDaddy.3.gz %%PERL5_MAN3%%/Sisimai::Rhost::GoogleApps.3.gz +%%PERL5_MAN3%%/Sisimai::Rhost::KDDI.3.gz %%PERL5_MAN3%%/Sisimai::SMTP.3.gz %%PERL5_MAN3%%/Sisimai::SMTP::Error.3.gz %%PERL5_MAN3%%/Sisimai::SMTP::Reply.3.gz diff --git a/mail/py-dkimpy/Makefile b/mail/py-dkimpy/Makefile index 7785547274c..c1668d3cc48 100644 --- a/mail/py-dkimpy/Makefile +++ b/mail/py-dkimpy/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= dkimpy -DISTVERSION= 0.7.1 -PORTREVISION= 1 +DISTVERSION= 0.8.0 CATEGORIES= mail python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/mail/py-dkimpy/distinfo b/mail/py-dkimpy/distinfo index ae264a499b4..cad44b0f95e 100644 --- a/mail/py-dkimpy/distinfo +++ b/mail/py-dkimpy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1520604501 -SHA256 (dkimpy-0.7.1.tar.gz) = f74bb5e612bd2f75668816ad68512e5019d46a2e17af0a2d2abb96abe29e90b4 -SIZE (dkimpy-0.7.1.tar.gz) = 47833 +TIMESTAMP = 1526824378 +SHA256 (dkimpy-0.8.0.tar.gz) = f09bd4893885d2e12ec9c0c9e2b6bcce6afe0f0473e0d024b8885e698c17d454 +SIZE (dkimpy-0.8.0.tar.gz) = 49663 diff --git a/mail/py-dkimpy/files/patch-setup.py b/mail/py-dkimpy/files/patch-setup.py index 2d27d27f29a..7daf6948270 100644 --- a/mail/py-dkimpy/files/patch-setup.py +++ b/mail/py-dkimpy/files/patch-setup.py @@ -1,9 +1,9 @@ ---- setup.py.orig 2018-02-10 07:29:15 UTC +--- setup.py.orig 2018-05-20 14:27:17 UTC +++ setup.py -@@ -41,11 +41,11 @@ verification.""", - packages = ["dkim"], - scripts = ["arcsign.py", "arcverify.py", "dknewkey.py", "dkimsign.py", - "dkimverify.py"], +@@ -55,11 +55,11 @@ verification.""", + 'dknewkey = dkim.dknewkey:main' + ], + }, - data_files = [(os.path.join('share', 'man', 'man1'), - ['man/arcsign.1']), (os.path.join('share', 'man', 'man1'), - ['man/arcverify.1']),(os.path.join('share', 'man', 'man1'), diff --git a/math/hs-Agda-stdlib/Makefile b/math/hs-Agda-stdlib/Makefile index 56c747eadcd..17f418635b9 100644 --- a/math/hs-Agda-stdlib/Makefile +++ b/math/hs-Agda-stdlib/Makefile @@ -4,7 +4,7 @@ PORTNAME= Agda-stdlib PORTVERSION= 0.13 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org diff --git a/math/hs-Agda/Makefile b/math/hs-Agda/Makefile index a9ef822c55a..93d3fb38bf3 100644 --- a/math/hs-Agda/Makefile +++ b/math/hs-Agda/Makefile @@ -11,8 +11,8 @@ COMMENT= Dependently typed functional programming language and proof assistant USE_CABAL= EdisonCore boxes data-hash edit-distance equivalence \ geniplate-mirror gitrev hashable hashtables ieee754 \ - monadplus mtl murmur-hash parallel regex-tdfa strict \ - text unordered-containers zlib + mtl murmur-hash parallel regex-tdfa strict \ + unordered-containers zlib USE_ALEX= yes USE_HAPPY= yes @@ -26,5 +26,7 @@ FLAGS_ENABLE= cpphs SUB_FILES= pkg-install pkg-deinstall SUB_LIST= DATADIR=${DATADIR} +IGNORE= Doesn't build with recent GHC version + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/math/hs-NumInstances/Makefile b/math/hs-NumInstances/Makefile index b03bcaf30fe..46deef116cf 100644 --- a/math/hs-NumInstances/Makefile +++ b/math/hs-NumInstances/Makefile @@ -2,7 +2,7 @@ PORTNAME= NumInstances PORTVERSION= 1.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org diff --git a/math/hs-adjunctions/Makefile b/math/hs-adjunctions/Makefile index 3ba97c79ac8..6e27e3f9425 100644 --- a/math/hs-adjunctions/Makefile +++ b/math/hs-adjunctions/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= adjunctions -PORTVERSION= 4.3 -PORTREVISION= 1 +PORTVERSION= 4.4 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org diff --git a/math/hs-adjunctions/distinfo b/math/hs-adjunctions/distinfo index 2b0978e8140..a430b89b701 100644 --- a/math/hs-adjunctions/distinfo +++ b/math/hs-adjunctions/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499623373 -SHA256 (cabal/adjunctions-4.3.tar.gz) = b948a14fafe8857f451ae3e474f5264c907b5a2d841d52bf78249ae4749c3ecc -SIZE (cabal/adjunctions-4.3.tar.gz) = 15651 +TIMESTAMP = 1523889909 +SHA256 (cabal/adjunctions-4.4.tar.gz) = 507c2ef55337ae61c805f8cbc1213dfd7d2b85187342675d662254b8d8a16ae9 +SIZE (cabal/adjunctions-4.4.tar.gz) = 19891 diff --git a/math/hs-categories/Makefile b/math/hs-categories/Makefile index 9f0e28b4be2..956d9daf56c 100644 --- a/math/hs-categories/Makefile +++ b/math/hs-categories/Makefile @@ -2,7 +2,7 @@ PORTNAME= categories PORTVERSION= 1.0.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org diff --git a/math/hs-comonad/Makefile b/math/hs-comonad/Makefile index 7d6e59f59ca..905d603739f 100644 --- a/math/hs-comonad/Makefile +++ b/math/hs-comonad/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= comonad -PORTVERSION= 5.0.1 -PORTREVISION= 1 +PORTVERSION= 5.0.3 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org diff --git a/math/hs-comonad/distinfo b/math/hs-comonad/distinfo index 19dd26099e8..f17140d27fb 100644 --- a/math/hs-comonad/distinfo +++ b/math/hs-comonad/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499543660 -SHA256 (cabal/comonad-5.0.1.tar.gz) = 561ffd697d9d38467d0d426947e0bade25a05e3c507235eca29ec800ad3f463d -SIZE (cabal/comonad-5.0.1.tar.gz) = 18218 +TIMESTAMP = 1523787141 +SHA256 (cabal/comonad-5.0.3.tar.gz) = a7f4584d634051123c547f0d10f88eaf23d99229dbd01dfdcd98cddd41e54df6 +SIZE (cabal/comonad-5.0.3.tar.gz) = 17430 diff --git a/math/hs-contravariant/Makefile b/math/hs-contravariant/Makefile index dbb9d8143fc..60f39dfa59c 100644 --- a/math/hs-contravariant/Makefile +++ b/math/hs-contravariant/Makefile @@ -2,7 +2,7 @@ PORTNAME= contravariant PORTVERSION= 1.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org diff --git a/math/hs-data-lens-template/files/patch-data-lens-template.cabal b/math/hs-data-lens-template/files/patch-data-lens-template.cabal new file mode 100644 index 00000000000..2fdee632b58 --- /dev/null +++ b/math/hs-data-lens-template/files/patch-data-lens-template.cabal @@ -0,0 +1,11 @@ +--- data-lens-template.cabal.orig 2018-04-24 19:52:13 UTC ++++ data-lens-template.cabal +@@ -22,7 +22,7 @@ library + build-depends: + data-lens >= 2.0 && < 2.12, + base >= 1.0 && < 5, +- template-haskell >= 2.11 && < 2.12 ++ template-haskell >= 2.11 && < 2.14 + + exposed-modules: + Data.Lens.Template diff --git a/math/hs-data-lens/Makefile b/math/hs-data-lens/Makefile index 45e82804082..0dc0f6c0b6b 100644 --- a/math/hs-data-lens/Makefile +++ b/math/hs-data-lens/Makefile @@ -2,7 +2,7 @@ PORTNAME= data-lens PORTVERSION= 2.11.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org diff --git a/math/hs-distributive/Makefile b/math/hs-distributive/Makefile index 4f1dac443c9..4a42b54b058 100644 --- a/math/hs-distributive/Makefile +++ b/math/hs-distributive/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= distributive -PORTVERSION= 0.5.2 -PORTREVISION= 1 +PORTVERSION= 0.5.3 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org diff --git a/math/hs-distributive/distinfo b/math/hs-distributive/distinfo index 91eba5cc0bb..3b6c94e969d 100644 --- a/math/hs-distributive/distinfo +++ b/math/hs-distributive/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499537738 -SHA256 (cabal/distributive-0.5.2.tar.gz) = ade2be6a5e81950ab2918d938037dde0ce09d04dc399cefbf191ce6cb5f76cd9 -SIZE (cabal/distributive-0.5.2.tar.gz) = 11824 +TIMESTAMP = 1523780948 +SHA256 (cabal/distributive-0.5.3.tar.gz) = 9173805b9c941bda1f37e5aeb68ae30f57a12df9b17bd2aa86db3b7d5236a678 +SIZE (cabal/distributive-0.5.3.tar.gz) = 10147 diff --git a/math/hs-erf/Makefile b/math/hs-erf/Makefile index 075c24da5a2..96a406a24fe 100644 --- a/math/hs-erf/Makefile +++ b/math/hs-erf/Makefile @@ -3,7 +3,7 @@ PORTNAME= erf PORTVERSION= 2.0.0.0 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org diff --git a/math/hs-fixed/Makefile b/math/hs-fixed/Makefile index 19afe133011..6ee78a0c876 100644 --- a/math/hs-fixed/Makefile +++ b/math/hs-fixed/Makefile @@ -2,7 +2,7 @@ PORTNAME= fixed PORTVERSION= 0.2.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org diff --git a/math/hs-half/Makefile b/math/hs-half/Makefile index 0f4ed6e0fc7..3ec88db333c 100644 --- a/math/hs-half/Makefile +++ b/math/hs-half/Makefile @@ -2,7 +2,7 @@ PORTNAME= half PORTVERSION= 0.2.2.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org diff --git a/math/hs-ieee754/Makefile b/math/hs-ieee754/Makefile index 0bad09940b3..65396ac3dc8 100644 --- a/math/hs-ieee754/Makefile +++ b/math/hs-ieee754/Makefile @@ -2,7 +2,7 @@ PORTNAME= ieee754 PORTVERSION= 0.8.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org diff --git a/math/hs-integer-logarithms/Makefile b/math/hs-integer-logarithms/Makefile index 50342404231..b205a2ff81d 100644 --- a/math/hs-integer-logarithms/Makefile +++ b/math/hs-integer-logarithms/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= integer-logarithms -PORTVERSION= 1.0.2 -PORTREVISION= 1 +PORTVERSION= 1.0.2.1 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org diff --git a/math/hs-integer-logarithms/distinfo b/math/hs-integer-logarithms/distinfo index 7c4820709e7..8d3b4ce80df 100644 --- a/math/hs-integer-logarithms/distinfo +++ b/math/hs-integer-logarithms/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499448646 -SHA256 (cabal/integer-logarithms-1.0.2.tar.gz) = 31069ccbff489baf6c4a93cb7475640aabea9366eb0b583236f10714a682b570 -SIZE (cabal/integer-logarithms-1.0.2.tar.gz) = 8854 +TIMESTAMP = 1523429156 +SHA256 (cabal/integer-logarithms-1.0.2.1.tar.gz) = 32ad4a482a60ec957d1af1268952e2a6b382b67438c14f74f6c2aef2e49b48f2 +SIZE (cabal/integer-logarithms-1.0.2.1.tar.gz) = 8781 diff --git a/math/hs-kan-extensions/Makefile b/math/hs-kan-extensions/Makefile index 18ae40d8dea..003fcfc2a43 100644 --- a/math/hs-kan-extensions/Makefile +++ b/math/hs-kan-extensions/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= kan-extensions -PORTVERSION= 5.0.2 -PORTREVISION= 1 +PORTVERSION= 5.1 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org diff --git a/math/hs-kan-extensions/distinfo b/math/hs-kan-extensions/distinfo index d737ba37a20..cd83d37cca4 100644 --- a/math/hs-kan-extensions/distinfo +++ b/math/hs-kan-extensions/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499623376 -SHA256 (cabal/kan-extensions-5.0.2.tar.gz) = 1c9ede8595424209944e59fd46c1d2edb654758be9a45c1c48a4d3cedf42482e -SIZE (cabal/kan-extensions-5.0.2.tar.gz) = 19957 +TIMESTAMP = 1523890567 +SHA256 (cabal/kan-extensions-5.1.tar.gz) = 193f8e58f267663d5da8e38045b000d0983ac08b84808de42af1a44963f63205 +SIZE (cabal/kan-extensions-5.1.tar.gz) = 22573 diff --git a/math/hs-kan-extensions/files/patch-kan-extensions.cabal b/math/hs-kan-extensions/files/patch-kan-extensions.cabal index 2d2a1bee65f..39598c6a6dc 100644 --- a/math/hs-kan-extensions/files/patch-kan-extensions.cabal +++ b/math/hs-kan-extensions/files/patch-kan-extensions.cabal @@ -1,10 +1,10 @@ ---- kan-extensions.cabal.orig 2017-07-09 21:09:48 UTC +--- kan-extensions.cabal.orig 2018-01-28 14:54:04 UTC +++ kan-extensions.cabal -@@ -47,7 +47,6 @@ library +@@ -57,7 +57,6 @@ library containers >= 0.4 && < 0.6, contravariant >= 1 && < 2, distributive >= 0.2.2 && < 1, - fail >= 4.9 && < 5, - free >= 4 && < 5, + free >= 4 && < 6, mtl >= 2.0.1 && < 2.3, - semigroupoids >= 4 && < 6, + profunctors >= 5 && < 6, diff --git a/math/hs-math-functions/Makefile b/math/hs-math-functions/Makefile index 9088c73eb25..30cec2202a2 100644 --- a/math/hs-math-functions/Makefile +++ b/math/hs-math-functions/Makefile @@ -3,7 +3,7 @@ PORTNAME= math-functions PORTVERSION= 0.2.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org diff --git a/math/hs-mwc-random/Makefile b/math/hs-mwc-random/Makefile index e5febca9363..15331000448 100644 --- a/math/hs-mwc-random/Makefile +++ b/math/hs-mwc-random/Makefile @@ -3,7 +3,7 @@ PORTNAME= mwc-random PORTVERSION= 0.13.6.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org diff --git a/math/hs-pointed/Makefile b/math/hs-pointed/Makefile index de6363a7116..4b1468d2d5a 100644 --- a/math/hs-pointed/Makefile +++ b/math/hs-pointed/Makefile @@ -2,7 +2,7 @@ PORTNAME= pointed PORTVERSION= 5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org @@ -10,9 +10,8 @@ COMMENT= Pointed and copointed data LICENSE= BSD3CLAUSE -USE_CABAL= comonad data-default-class hashable \ - kan-extensions semigroupoids semigroups \ - stm tagged unordered-containers +USE_CABAL= comonad data-default-class hashable kan-extensions \ + semigroupoids semigroups tagged unordered-containers .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/math/hs-probability/Makefile b/math/hs-probability/Makefile index 3e62092a8fd..dde0ceb6add 100644 --- a/math/hs-probability/Makefile +++ b/math/hs-probability/Makefile @@ -3,7 +3,7 @@ PORTNAME= probability PORTVERSION= 0.2.5.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org diff --git a/math/hs-semigroupoids/Makefile b/math/hs-semigroupoids/Makefile index 64ec5d77661..18161073140 100644 --- a/math/hs-semigroupoids/Makefile +++ b/math/hs-semigroupoids/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= semigroupoids -PORTVERSION= 5.2 -PORTREVISION= 1 +PORTVERSION= 5.2.2 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org diff --git a/math/hs-semigroupoids/distinfo b/math/hs-semigroupoids/distinfo index 4b18a65474a..f05279af550 100644 --- a/math/hs-semigroupoids/distinfo +++ b/math/hs-semigroupoids/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499609808 -SHA256 (cabal/semigroupoids-5.2.tar.gz) = d957f8804ca0dc2b85ef68edcab92dba9cd5d61ea0dddc41c173dda6f97791bc -SIZE (cabal/semigroupoids-5.2.tar.gz) = 23371 +TIMESTAMP = 1523816690 +SHA256 (cabal/semigroupoids-5.2.2.tar.gz) = e4def54834cda65ac1e74e6f12a435410e19c1348e820434a30c491c8937299e +SIZE (cabal/semigroupoids-5.2.2.tar.gz) = 23800 diff --git a/math/hs-semigroups/Makefile b/math/hs-semigroups/Makefile index 175ec63b2ec..3566c6ea823 100644 --- a/math/hs-semigroups/Makefile +++ b/math/hs-semigroups/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= semigroups -PORTVERSION= 0.18.3 -PORTREVISION= 1 +PORTVERSION= 0.18.4 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= Anything that associates LICENSE= BSD3CLAUSE -USE_CABAL= hashable>=1.1 text>=0.10 transformers-compat>=0.3 unordered-containers>=0.2 +USE_CABAL= hashable>=1.1 transformers-compat>=0.3 unordered-containers>=0.2 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/math/hs-semigroups/distinfo b/math/hs-semigroups/distinfo index 0e75c0f6df0..5d14ee21010 100644 --- a/math/hs-semigroups/distinfo +++ b/math/hs-semigroups/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499594594 -SHA256 (cabal/semigroups-0.18.3.tar.gz) = 35297c986872406e2efe29620c623727369f8c578e2f9c22998d575996e5a9ca -SIZE (cabal/semigroups-0.18.3.tar.gz) = 18629 +TIMESTAMP = 1523428484 +SHA256 (cabal/semigroups-0.18.4.tar.gz) = 589e3042329a6bcffb5c0e85834143586db22eb7a2aae094d492cd004f685d27 +SIZE (cabal/semigroups-0.18.4.tar.gz) = 19869 diff --git a/math/hs-statistics/Makefile b/math/hs-statistics/Makefile index c8c4b314c2b..0563cc4891c 100644 --- a/math/hs-statistics/Makefile +++ b/math/hs-statistics/Makefile @@ -3,7 +3,7 @@ PORTNAME= statistics PORTVERSION= 0.14.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org diff --git a/math/hs-vector-space/Makefile b/math/hs-vector-space/Makefile index 01fde2f7193..f51d4d1b124 100644 --- a/math/hs-vector-space/Makefile +++ b/math/hs-vector-space/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= vector-space -PORTVERSION= 0.10.4 -PORTREVISION= 1 +PORTVERSION= 0.13 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org diff --git a/math/hs-vector-space/distinfo b/math/hs-vector-space/distinfo index 62ea2051598..5d7611982ce 100644 --- a/math/hs-vector-space/distinfo +++ b/math/hs-vector-space/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499623378 -SHA256 (cabal/vector-space-0.10.4.tar.gz) = b712cc9fc675b1d9e592f56ed08a9636c87783c11d6ac84b5f18f46cdcbefda2 -SIZE (cabal/vector-space-0.10.4.tar.gz) = 14249 +TIMESTAMP = 1524638503 +SHA256 (cabal/vector-space-0.13.tar.gz) = 0291d5778378acbbb1d6709ba57238f3d6ad551b8b2c6ca2b8177e68f748d617 +SIZE (cabal/vector-space-0.13.tar.gz) = 16121 diff --git a/misc/freebsd-release-manifests/Makefile b/misc/freebsd-release-manifests/Makefile index 6c1d0c5ec1b..144af29350d 100644 --- a/misc/freebsd-release-manifests/Makefile +++ b/misc/freebsd-release-manifests/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= freebsd-release-manifests -DISTVERSION= 20180519 +DISTVERSION= 20180526 PORTREVISION= 0 CATEGORIES= misc MASTER_SITES= # diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-11.2-BETA3 b/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-11.2-BETA3 new file mode 100644 index 00000000000..1c0b448b1a3 --- /dev/null +++ b/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-11.2-BETA3 @@ -0,0 +1,10 @@ +base-dbg.txz de13570adade9397ab9a100e7e54f8a7e1e52476b572c295ad1f90528cb48d9f 1455 base_dbg "Base system (Debugging)" off +base.txz 04367860540d482220ae904136a0ca098659b7aa336457427212c6d36ba2820e 22841 base "Base system (MANDATORY)" on +doc.txz ac4ba69836557429f7726045609cd481352b4052c5dcb8deba6b75b5132eff23 120 doc "Additional Documentation" off +kernel-dbg.txz 48f865dcb0427bfe589c3372b47f3b8c21a7b78fde05de6281a0d6ecee698e7d 872 kernel_dbg "Kernel (Debugging)" off +kernel.txz 57ac212d4870a814e843132571021a1587eec58d3a361f2f3e8d42daed3f1b27 881 kernel "Kernel (MANDATORY)" on +lib32-dbg.txz f89d72244705adb50f077cf56eef99c78f30d07065399e50fe3026df541303e8 209 lib32_dbg "32-bit compatibility libraries (Debugging)" off +lib32.txz 83365957e965f1fdba1a782e2203364f092f040a2e7ee7d8136794699dcd3f4e 732 lib32 "32-bit compatibility libraries" on +ports.txz 4edbb3605230ff45206a7c8d24eccadc14ce9048915c7b9827075c75a003627d 172828 ports "Ports tree" on +src.txz 54bb480aa593f1672b99ae6a3bf55b5597eece5509bb504d9a5c8d0f586eb36f 79977 src "System source tree" off +tests.txz 034b5710a184dc8da279973e5ce45959c8307f714adcbcb71bdd517744d2a6dd 4076 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-11.2-BETA3 b/misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-11.2-BETA3 new file mode 100644 index 00000000000..1dfa174cdc6 --- /dev/null +++ b/misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-11.2-BETA3 @@ -0,0 +1,8 @@ +base-dbg.txz 6768cf592e2bdd43610d5e2fd54c26bf81dca914bf122e9a44ff72f460072db7 1424 base_dbg "Base system (Debugging)" off +base.txz 8a159e80039fbba3789d59f08385a26d0a7a5d55b0747260277a0432730512d5 22476 base "Base system (MANDATORY)" on +doc.txz 8ff849568523e901d830996b77870e85ad460531f1d1a0ef392074da5056e3a0 120 doc "Additional Documentation" off +kernel-dbg.txz 9af0089e4948b93ab7e455e9e9963e443940589a47c1a94fc4b0062e1b3bc700 584 kernel_dbg "Kernel (Debugging)" off +kernel.txz 498237cb4e476c79b181cfa2bfa94ac1eb0ae1e538cd789a4cbd2848bc45a951 592 kernel "Kernel (MANDATORY)" on +ports.txz 4edbb3605230ff45206a7c8d24eccadc14ce9048915c7b9827075c75a003627d 172828 ports "Ports tree" on +src.txz 54bb480aa593f1672b99ae6a3bf55b5597eece5509bb504d9a5c8d0f586eb36f 79977 src "System source tree" off +tests.txz 8db9ac5a3cc2474fef1718cc0dd644cc5efe64f61a7fe0aeb4bcba0b4291ecbc 4072 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-11.2-BETA3 b/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-11.2-BETA3 new file mode 100644 index 00000000000..b012f792734 --- /dev/null +++ b/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-11.2-BETA3 @@ -0,0 +1,8 @@ +base-dbg.txz c636e53444c579a2658bedd3755107933214e40c7a295b945bc1125a5f96f24b 1455 base_dbg "Base system (Debugging)" off +base.txz 801a5ef387eced1ed5dc6dc730079162e1ceb999a8bbfe6501a092816ca84abb 22855 base "Base system (MANDATORY)" on +doc.txz d5ca6aeab6c6f594be86b0241c4f0b2e11b4a9cd1865a37643d025cebe302738 120 doc "Additional Documentation" off +kernel-dbg.txz 9c750253a77f337e214314fcad3f148852f298be99b3e7ccc213e9f56fda53fc 881 kernel_dbg "Kernel (Debugging)" off +kernel.txz 3b7c88d042603d3f0812e71d833f35ba22457d5661eccdd5e3a3b4bee3656ab2 890 kernel "Kernel (MANDATORY)" on +ports.txz 4edbb3605230ff45206a7c8d24eccadc14ce9048915c7b9827075c75a003627d 172828 ports "Ports tree" on +src.txz 54bb480aa593f1672b99ae6a3bf55b5597eece5509bb504d9a5c8d0f586eb36f 79977 src "System source tree" off +tests.txz 15eff53367340cb02efe51c5c087673f104de0fd2b3349535a91f863c7fed516 4076 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-11.2-BETA3 b/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-11.2-BETA3 new file mode 100644 index 00000000000..f0955ad3b0d --- /dev/null +++ b/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-11.2-BETA3 @@ -0,0 +1,8 @@ +base-dbg.txz f02ceb8ab7d1c7a4deecec3b57c014ebff62429104bbac927a36da2765212f25 1427 base_dbg "Base system (Debugging)" off +base.txz a1fd4ce161e94ed58a7f08b3718d280da6dac074d096a5576eda6a70931bebc3 22695 base "Base system (MANDATORY)" on +doc.txz 85e9f71fb4adf1c221ff706418695c1bcb5bcade4e902c2cc6ecd5ac323b2463 120 doc "Additional Documentation" off +kernel-dbg.txz 4bdeea081f3935d4f7049cd770d1673400b734ff3ebec4e24a74951432bcbc9b 595 kernel_dbg "Kernel (Debugging)" off +kernel.txz 2110678f5aacb92d22ebcd1383bca145b8d443649bb78eabf59e559da9370e9f 603 kernel "Kernel (MANDATORY)" on +ports.txz 4edbb3605230ff45206a7c8d24eccadc14ce9048915c7b9827075c75a003627d 172828 ports "Ports tree" on +src.txz 54bb480aa593f1672b99ae6a3bf55b5597eece5509bb504d9a5c8d0f586eb36f 79977 src "System source tree" off +tests.txz 175274cb2ef26c3f87e3d38a740ac841856677de71d3b95ae01de17173f1e586 4071 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-11.2-BETA3 b/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-11.2-BETA3 new file mode 100644 index 00000000000..3721a274f1b --- /dev/null +++ b/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-11.2-BETA3 @@ -0,0 +1,10 @@ +base-dbg.txz 71f741534e33a78f488ca03efd36c4ba89187965ecb683041daf70da6d0382d8 1429 base_dbg "Base system (Debugging)" off +base.txz e3a880bd0dca4a0adb1a80aa70ebef89c2976a7af39eb55e99f0afdd3ace3729 22714 base "Base system (MANDATORY)" on +doc.txz 0848d8a572223d6e3b1ac00e088ca389995853d27c9e46ff706c31fdf8bfa37d 120 doc "Additional Documentation" off +kernel-dbg.txz 13d7c2e61841f2c2a7a6e9c2a81d344c4d261042d46d64186de138ada68f5670 688 kernel_dbg "Kernel (Debugging)" off +kernel.txz d98db7a8e4489d47fa50998e743c9e86c7e780b897db1e8e7598befe34682f4d 696 kernel "Kernel (MANDATORY)" on +lib32-dbg.txz a4b779fdf1596163dfbd969e176cee995edc9694807afbfd01a401f6cb8bc0e4 207 lib32_dbg "32-bit compatibility libraries (Debugging)" off +lib32.txz d6773e89a63833c8742c29a8f54f74d1732a85d49e7cb27cf23426519b93f616 725 lib32 "32-bit compatibility libraries" on +ports.txz 4edbb3605230ff45206a7c8d24eccadc14ce9048915c7b9827075c75a003627d 172828 ports "Ports tree" on +src.txz 54bb480aa593f1672b99ae6a3bf55b5597eece5509bb504d9a5c8d0f586eb36f 79977 src "System source tree" off +tests.txz a5c81a716dd0bdb1636f48acbfbc2f77f4d1edfab11e94967400209bcb438f71 4071 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-11.2-BETA3 b/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-11.2-BETA3 new file mode 100644 index 00000000000..b283b8cb37d --- /dev/null +++ b/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-11.2-BETA3 @@ -0,0 +1,8 @@ +base-dbg.txz 046a111ec78e4ee7c86ddc9693ff57f73d238e430cc886ce26b27254be01d03e 1425 base_dbg "Base system (Debugging)" off +base.txz 62cf537bfd53bf1ecc904001ab7e47959f8e0d6638eceacf9f2379dc453db08e 22630 base "Base system (MANDATORY)" on +doc.txz 0b6c422e504ea9860888e28d69bc1bb42942cbcc91d21876ded0acd62967aca7 120 doc "Additional Documentation" off +kernel-dbg.txz ca35c0b825130d35f48a695b12891135743efc6db8acdb60c89130785a85df2d 579 kernel_dbg "Kernel (Debugging)" off +kernel.txz cb30fb634c70d211ce1e8cf72cdfa7815d01692648c0436254a67f631c3c99d1 587 kernel "Kernel (MANDATORY)" on +ports.txz 4edbb3605230ff45206a7c8d24eccadc14ce9048915c7b9827075c75a003627d 172828 ports "Ports tree" on +src.txz 54bb480aa593f1672b99ae6a3bf55b5597eece5509bb504d9a5c8d0f586eb36f 79977 src "System source tree" off +tests.txz bbcb9e93b2719ab7c70ea92eccca4b00a5bc44a84a487b39cf774cc11ee9f08f 4067 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/pkg-plist b/misc/freebsd-release-manifests/pkg-plist index bb15630719a..5bf05b68dad 100644 --- a/misc/freebsd-release-manifests/pkg-plist +++ b/misc/freebsd-release-manifests/pkg-plist @@ -74,3 +74,9 @@ %%DATADIR%%/MANIFESTS/powerpc-powerpc-11.2-BETA2 %%DATADIR%%/MANIFESTS/powerpc-powerpc64-11.2-BETA2 %%DATADIR%%/MANIFESTS/sparc64-sparc64-11.2-BETA2 +%%DATADIR%%/MANIFESTS/amd64-amd64-11.2-BETA3 +%%DATADIR%%/MANIFESTS/arm64-aarch64-11.2-BETA3 +%%DATADIR%%/MANIFESTS/i386-i386-11.2-BETA3 +%%DATADIR%%/MANIFESTS/powerpc-powerpc-11.2-BETA3 +%%DATADIR%%/MANIFESTS/powerpc-powerpc64-11.2-BETA3 +%%DATADIR%%/MANIFESTS/sparc64-sparc64-11.2-BETA3 diff --git a/misc/py-tqdm/Makefile b/misc/py-tqdm/Makefile index eba45579214..197dabc4a90 100644 --- a/misc/py-tqdm/Makefile +++ b/misc/py-tqdm/Makefile @@ -2,7 +2,7 @@ PORTNAME= tqdm DISTVERSIONPREFIX= v -DISTVERSION= 4.23.2 +DISTVERSION= 4.23.4 CATEGORIES= misc PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/misc/py-tqdm/distinfo b/misc/py-tqdm/distinfo index b0cb01c7769..3f3b410a3c5 100644 --- a/misc/py-tqdm/distinfo +++ b/misc/py-tqdm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1525506644 -SHA256 (tqdm-tqdm-v4.23.2_GH0.tar.gz) = 513242f897e6c35f8ebe9c680990b3eb341d74407413e13c3fe28d7b42d72130 -SIZE (tqdm-tqdm-v4.23.2_GH0.tar.gz) = 75923 +TIMESTAMP = 1527203617 +SHA256 (tqdm-tqdm-v4.23.4_GH0.tar.gz) = dc7f7afb7de8806c8bcfa89a884817e62bdafde73069b2bde8b5b28908d0722c +SIZE (tqdm-tqdm-v4.23.4_GH0.tar.gz) = 75993 diff --git a/multimedia/plexmediaserver-plexpass/Makefile b/multimedia/plexmediaserver-plexpass/Makefile index 8dc79beeff0..d96713e65ee 100644 --- a/multimedia/plexmediaserver-plexpass/Makefile +++ b/multimedia/plexmediaserver-plexpass/Makefile @@ -1,8 +1,8 @@ # Created by: KalleDK # $FreeBSD$ -PORTVERSION= 1.13.1.5063 -DISTVERSIONSUFFIX=b4605f76e +PORTVERSION= 1.13.2.5102 +DISTVERSIONSUFFIX=4898d7d96 PORTREVISION= 0 PKGNAMESUFFIX= -plexpass diff --git a/multimedia/plexmediaserver-plexpass/distinfo b/multimedia/plexmediaserver-plexpass/distinfo index f2c1889cded..084950465ab 100644 --- a/multimedia/plexmediaserver-plexpass/distinfo +++ b/multimedia/plexmediaserver-plexpass/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1526499640 -SHA256 (PlexMediaServer-1.13.1.5063-b4605f76e-freebsd-amd64.tar.bz2) = 8329d5fffdd172f020684a755c8f97541cc3b27a863bce89f4c5de5a78c1abda -SIZE (PlexMediaServer-1.13.1.5063-b4605f76e-freebsd-amd64.tar.bz2) = 86708724 +TIMESTAMP = 1527254224 +SHA256 (PlexMediaServer-1.13.2.5102-4898d7d96-freebsd-amd64.tar.bz2) = ed22b5541915ca330c2a7821688190699f96b1a9228872cb6c2d9a65f7360919 +SIZE (PlexMediaServer-1.13.2.5102-4898d7d96-freebsd-amd64.tar.bz2) = 86518380 diff --git a/multimedia/vdr-plugin-eepg/Makefile b/multimedia/vdr-plugin-eepg/Makefile index e3ed17bf3c3..a9da058025d 100644 --- a/multimedia/vdr-plugin-eepg/Makefile +++ b/multimedia/vdr-plugin-eepg/Makefile @@ -14,6 +14,7 @@ COMMENT= Video Disk Recorder - extended EPG plugin LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING +BROKEN_FreeBSD_12= does not build with newer clang GITHASH= e7383ed PATCH_STRIP= -p1 WRKSRC= ${WRKDIR}/${PORTNAME}-${GITHASH} diff --git a/multimedia/vdr-plugin-epgsearch/Makefile b/multimedia/vdr-plugin-epgsearch/Makefile index f8febf4bf55..8c3130926b8 100644 --- a/multimedia/vdr-plugin-epgsearch/Makefile +++ b/multimedia/vdr-plugin-epgsearch/Makefile @@ -18,6 +18,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpcre.so:devel/pcre \ libtre.so:textproc/libtre +BROKEN_FreeBSD_12= does not build with newer clang USES= pkgconfig tar:bzip2 PATCH_STRIP= -p1 WRKSRC= ${WRKDIR}/vdr-plugin-${PLUGIN} diff --git a/multimedia/vdr-plugin-extrecmenu/Makefile b/multimedia/vdr-plugin-extrecmenu/Makefile index fb27cd84762..f0d674225cd 100644 --- a/multimedia/vdr-plugin-extrecmenu/Makefile +++ b/multimedia/vdr-plugin-extrecmenu/Makefile @@ -14,6 +14,7 @@ COMMENT= Video Disk Recorder - extended recordings menu LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING +BROKEN_FreeBSD_12= does not build with newer clang USES= tar:tgz PATCH_STRIP= -p1 WRKSRC= ${WRKDIR}/${PLUGIN}-${PORTVERSION} diff --git a/multimedia/vdr-plugin-osdpip/Makefile b/multimedia/vdr-plugin-osdpip/Makefile index 43ccdf31ddb..ffead12cdb5 100644 --- a/multimedia/vdr-plugin-osdpip/Makefile +++ b/multimedia/vdr-plugin-osdpip/Makefile @@ -17,6 +17,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS+= libavcodec.so:multimedia/ffmpeg +BROKEN_FreeBSD_12= does not build with newer clang USES= pkgconfig tar:tgz HAVE_CONFIGURE= yes PORTDOCS= COPYING README HISTORY diff --git a/multimedia/vdr-plugin-sleeptimer/Makefile b/multimedia/vdr-plugin-sleeptimer/Makefile index e52f93c6d23..041f4aa13f1 100644 --- a/multimedia/vdr-plugin-sleeptimer/Makefile +++ b/multimedia/vdr-plugin-sleeptimer/Makefile @@ -13,6 +13,8 @@ COMMENT= Video Disk Recorder - sleep timer plugin LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING +BROKEN_FreeBSD_12= does not build with newer clang + USES= tar:tgz PATCH_STRIP= -p1 WRKSRC= ${WRKDIR}/${PLUGIN}-${PORTVERSION} diff --git a/multimedia/vdr-plugin-ttxtsubs/Makefile b/multimedia/vdr-plugin-ttxtsubs/Makefile index 5afc6ddf906..e102554d790 100644 --- a/multimedia/vdr-plugin-ttxtsubs/Makefile +++ b/multimedia/vdr-plugin-ttxtsubs/Makefile @@ -14,6 +14,7 @@ COMMENT= Video Disk Recorder - teletext subtitle plugin LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING +BROKEN_FreeBSD_12= does not build with newer clang PATCH_STRIP= -p1 WRKSRC= ${WRKDIR}/${PLUGIN}-${DISTVERSION} diff --git a/multimedia/vdr-plugin-vdrmanager/Makefile b/multimedia/vdr-plugin-vdrmanager/Makefile index 59123653f95..af9dcd94007 100644 --- a/multimedia/vdr-plugin-vdrmanager/Makefile +++ b/multimedia/vdr-plugin-vdrmanager/Makefile @@ -14,6 +14,7 @@ COMMENT= Video Disk Recorder - VDR-Manager server plugin LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING +BROKEN_FreeBSD_12= does not build with newer clang6 PATCH_STRIP= -p1 PORTDOCS= README HISTORY diff --git a/multimedia/vdr-plugin-vnsiserver/Makefile b/multimedia/vdr-plugin-vnsiserver/Makefile index b039602e82b..537da590821 100644 --- a/multimedia/vdr-plugin-vnsiserver/Makefile +++ b/multimedia/vdr-plugin-vnsiserver/Makefile @@ -12,6 +12,7 @@ COMMENT= Video Disk Recorder - VNSI server plugin LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING +BROKEN_FreeBSD_12= does not build with newer clang USE_GITHUB= yes GH_ACCOUNT= FernetMenta GH_TAGNAME= 36e2b61 diff --git a/multimedia/vdr-plugin-xineliboutput/Makefile b/multimedia/vdr-plugin-xineliboutput/Makefile index 39c9ba260ed..a62cdf1b469 100644 --- a/multimedia/vdr-plugin-xineliboutput/Makefile +++ b/multimedia/vdr-plugin-xineliboutput/Makefile @@ -20,6 +20,7 @@ LIB_DEPENDS= libxine.so:multimedia/libxine \ libdbus-glib-1.so:devel/dbus-glib \ libvdpau.so:multimedia/libvdpau +BROKEN_FreeBSD_12= does not build with newer clang PATCH_STRIP= -p1 USES= pkgconfig tar:bzip2 USE_XORG= xrandr xrender diff --git a/multimedia/winff/Makefile b/multimedia/winff/Makefile index f991a384718..11bdc5fd48f 100644 --- a/multimedia/winff/Makefile +++ b/multimedia/winff/Makefile @@ -3,8 +3,9 @@ PORTNAME= WinFF PORTVERSION= 1.5.5 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= multimedia +PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX} MASTER_SITES= http://winff.org/docs/source/ DISTNAME= ${_PORTNAME}-${PORTVERSION}-source @@ -13,20 +14,15 @@ COMMENT= Convert your videos quickly, easily, and all at once LICENSE= GPLv3 -BROKEN= fails to build - -BUILD_DEPENDS= lazbuild:editors/lazarus LIB_DEPENDS= libavutil.so:multimedia/ffmpeg NO_WRKSUBDIR= yes -USES= fpc USE_XORG= x11 -USE_FPC= cairo fcl-base fcl-image fcl-json fcl-xml pasjpeg regexpr x11 -USE_GNOME= cairo +USES= fpc lazarus:flavors +USE_FPC= chm fcl-base fcl-image fcl-json fcl-xml pasjpeg regexpr x11 _PORTNAME= ${PORTNAME:tl} DATADIR= ${PREFIX}/share/${_PORTNAME} DOCSDIR= ${PREFIX}/share/doc/${_PORTNAME} -INSTALLS_ICONS= yes DESKTOP_ENTRIES= "${PORTNAME}" \ "${COMMENT}" \ @@ -35,34 +31,19 @@ DESKTOP_ENTRIES= "${PORTNAME}" \ "AudioVideo;" \ true -LAZBUILD_CMD= ${LOCALBASE}/bin/lazbuild -d -LAZARUS_VER= 1.8.0 -LAZARUS_DIR= ${LOCALBASE}/share/lazarus-${LAZARUS_VER} -LCL_UNITS_DIR= ${LOCALBASE}/share/lazarus-${LAZARUS_VER}/lcl/units/${BUILDNAME} +LAZARUS_NO_FLAVORS= qt5 +LAZARUS_PROJECT_FILES= winff.lpr +LAZBUILD_ARGS= -d + +gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt4 +qt4_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 BUILD_WRKSRC= ${WRKDIR}/${PKGNAME}/${_PORTNAME} -OPTIONS_SINGLE= LCL -OPTIONS_SINGLE_LCL= GTK2 QT4 - -GTK2_DESC= Use gtk20 interface -QT4_DESC= Use qt4 interface - -OPTIONS_DEFAULT= GTK2 - -.include - -.if ${PORT_OPTIONS:MGTK2} -USE_FPC+= gtk2 -USE_GNOME+= gtk20 -LCL_PLATFORM= gtk2 -BUILD_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-gtk2 -.endif - -.if ${PORT_OPTIONS:MQT4} -LIB_DEPENDS+= libQt4Pas.so:x11-toolkits/qt4pas -LCL_PLATFORM= qt -BUILD_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt +.if ${FLAVOR:Ugtk2:Mgtk2} +USE_FPC+= cairo +USE_GNOME+= cairo +INSTALLS_ICONS=yes .endif pre-configure: @@ -71,10 +52,6 @@ pre-configure: ${REINPLACE_CMD} -e 's|/usr/bin/|${LOCALBASE}/bin/|g' ${BUILD_WRKSRC}/${fp} .endfor -do-build: - cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --ws=${LCL_PLATFORM} --lazarusdir=${LAZARUS_DIR} -B winff.lpr - do-install: ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME:tl} ${STAGEDIR}${PREFIX}/bin ${MKDIR} ${STAGEDIR}${DATADIR}/languages diff --git a/multimedia/winff/files/patch-winff_unit1.pas b/multimedia/winff/files/patch-winff_unit1.pas index e4a3c9ba5c6..e272ae6f991 100644 --- a/multimedia/winff/files/patch-winff_unit1.pas +++ b/multimedia/winff/files/patch-winff_unit1.pas @@ -1,6 +1,15 @@ ---- winff/unit1.pas.orig 2013-08-16 03:55:46 UTC -+++ winff/unit1.pas -@@ -1228,13 +1228,13 @@ end; +--- winff/unit1.pas 2016-09-21 16:40:54.000000000 -0500 ++++ winff/unit1.pas 2018-03-07 17:35:42.310241000 -0500 +@@ -27,7 +27,7 @@ + {$IFDEF WINDOWS} windows, shellapi, dos,{$endif} + {$IFDEF unix} baseunix, unix, {$endif} + laz_xmlcfg, dom, xmlread, xmlwrite, StdCtrls, Buttons, ActnList, Menus, unit2, unit3, +- unit4, unit5, gettext, translations, process ++ unit4, unit5, gettext, translations, process, LazFileUtils, LazUTF8 + {$IFDEF TRANSLATESTRING}, DefaultTranslator{$ENDIF}, ExtCtrls, ComCtrls, Spin, UTF8Process, + PoTranslator, types, FileUtil, regexpr; + +@@ -1241,13 +1241,13 @@ // launch browser procedure TfrmMain.launchbrowser(URL:string); @@ -16,7 +25,7 @@ s:=''; if fileexists('/usr/bin/konqueror') then s:='/usr/bin/konqueror'; if fileexists('/usr/bin/mozilla-firefox') then s:='/usr/bin/mozilla-firefox'; -@@ -1369,13 +1369,13 @@ end; +@@ -1382,13 +1382,13 @@ // launch pdf procedure TfrmMain.LaunchPdf(pdffile:string); @@ -32,7 +41,7 @@ s:=''; if fileexists('/usr/bin/evince') then s:='/usr/bin/evince'; if fileexists('/usr/bin/kpdf') then s:='/usr/bin/kpdf'; -@@ -1953,7 +1953,7 @@ var s : string; +@@ -1982,7 +1982,7 @@ language: string; begin language:=leftstr(lang,2); diff --git a/net-im/hs-haskell-xmpp/Makefile b/net-im/hs-haskell-xmpp/Makefile index 4c4266a2806..a4823c5d9db 100644 --- a/net-im/hs-haskell-xmpp/Makefile +++ b/net-im/hs-haskell-xmpp/Makefile @@ -2,7 +2,7 @@ PORTNAME= haskell-xmpp PORTVERSION= 1.0.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-im haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,7 @@ COMMENT= Haskell XMPP library based on HaXml & STM LICENSE= BSD3CLAUSE USE_CABAL= HaXml>=1.23.3 html mtl>=1.0 network \ - polyparse random regex-compat stm utf8-string + polyparse random regex-compat utf8-string .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/net-im/py-matrix-synapse/Makefile b/net-im/py-matrix-synapse/Makefile index 8f560c562d0..459ddcb1e1d 100644 --- a/net-im/py-matrix-synapse/Makefile +++ b/net-im/py-matrix-synapse/Makefile @@ -3,8 +3,8 @@ PORTNAME= matrix-synapse DISTVERSIONPREFIX= v -DISTVERSION= 0.27.4 -PORTREVISION= 2 +DISTVERSION= 0.28.1 +PORTREVISION= 0 CATEGORIES= net-im python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/net-im/py-matrix-synapse/distinfo b/net-im/py-matrix-synapse/distinfo index 4c29cf5c90e..47ad26ec3e0 100644 --- a/net-im/py-matrix-synapse/distinfo +++ b/net-im/py-matrix-synapse/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523908627 -SHA256 (matrix-org-synapse-v0.27.4_GH0.tar.gz) = afdead01189d5bd97c47a8bccd88d973b811241d889298fdacb8384d97707db8 -SIZE (matrix-org-synapse-v0.27.4_GH0.tar.gz) = 939200 +TIMESTAMP = 1527270564 +SHA256 (matrix-org-synapse-v0.28.1_GH0.tar.gz) = 3f2238172341506614a1b6ba5275bee79b418fee639a7fef3917b1188c515e70 +SIZE (matrix-org-synapse-v0.28.1_GH0.tar.gz) = 944101 diff --git a/net-mgmt/Makefile b/net-mgmt/Makefile index b8ff8003f59..b768f9542e8 100644 --- a/net-mgmt/Makefile +++ b/net-mgmt/Makefile @@ -178,6 +178,7 @@ SUBDIR += nedi SUBDIR += nefu SUBDIR += net-snmp + SUBDIR += netbox SUBDIR += netdata SUBDIR += netdisco SUBDIR += netdisco-mibs diff --git a/net-mgmt/netbox/Makefile b/net-mgmt/netbox/Makefile new file mode 100644 index 00000000000..fd1a14fe7db --- /dev/null +++ b/net-mgmt/netbox/Makefile @@ -0,0 +1,70 @@ +# $FreeBSD$ + +PORTNAME= netbox +DISTVERSIONPREFIX= v +DISTVERSION= 2.3.3 +CATEGORIES= net-mgmt + +MAINTAINER= freebsd_ports@k-worx.org +COMMENT= IP address management tool + +LICENSE= APACHE20 +LICENSE_FILE= ${WRKSRC}/LICENSE.txt + +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.11:www/py-django111@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django-cors-headers>=2.1.0:www/py-django-cors-headers@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django-debug-toolbar>=1.9.0:www/py-django-debug-toolbar@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django-filter>=1.1.0:www/py-django-filter@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django-mptt>=0.9.0:www/py-django-mptt@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django-tables2>=1.19.0:www/py-django-tables2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django-timezone-field>=2.0:www/py-django-timezone-field@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}djangorestframework>=3.7.7:www/py-djangorestframework@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}drf-yasg>=1.4.4:www/py-drf-yasg@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gfm>=0.1.3:textproc/py-gfm@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}graphviz>=0.8.2:graphics/py-graphviz@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}markdown>=2.6.11:textproc/py-markdown@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ncclient>=0.5.3:net-mgmt/py-ncclient@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.18:net/py-netaddr@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}paramiko>=2.4.0:security/py-paramiko@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycryptodome>=3.4.11:security/py-pycryptodome@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=5.0.0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.7.4:databases/py-psycopg2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}natsort>=5.2.0:devel/py-natsort@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xmltodict>=0.11.0:devel/py-xmltodict@${PY_FLAVOR} + +USES= pgsql:9.4+ python:3.5+ +WANT_PGSQL= server +USE_GITHUB= yes +GH_ACCOUNT= digitalocean + +SUB_FILES= pkg-message +SUB_LIST= DATADIR=${DATADIR} PYTHON_VER=${PYTHON_VER} +NO_BUILD= yes +NO_ARCH= yes + +OPTIONS_DEFINE= DOCS + +do-install: + cd ${WRKSRC}/netbox ; \ + for src in $$( ${FIND} . ! -name '*.bak' ) ; do \ + dst=${STAGEDIR}${DATADIR}$${src#.} ; \ + if ${TEST} -d "$$src" ; then \ + ${MKDIR} "$$dst" ; \ + else \ + ${INSTALL_DATA} "$$src" "$$dst" ; \ + fi \ + done + +post-install-DOCS-on: + cd ${WRKSRC}/docs ; \ + ${MKDIR} ${STAGEDIR}${DOCSDIR} ; \ + for src in $$( ${FIND} . ! -name '*.bak' ) ; do \ + dst=${STAGEDIR}${DOCSDIR}$${src#.} ; \ + if ${TEST} -d "$$src" ; then \ + ${MKDIR} "$$dst" ; \ + else \ + ${INSTALL_DATA} "$$src" "$$dst" ; \ + fi \ + done + +.include diff --git a/net-mgmt/netbox/distinfo b/net-mgmt/netbox/distinfo new file mode 100644 index 00000000000..263ea315ea1 --- /dev/null +++ b/net-mgmt/netbox/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1526915921 +SHA256 (digitalocean-netbox-v2.3.3_GH0.tar.gz) = 7328ee8d9918f299f23fde170b2e47ff27d6e7073b9db2d69292c5f5e67012bd +SIZE (digitalocean-netbox-v2.3.3_GH0.tar.gz) = 2131052 diff --git a/net-mgmt/netbox/files/pkg-message.in b/net-mgmt/netbox/files/pkg-message.in new file mode 100644 index 00000000000..b8137674c97 --- /dev/null +++ b/net-mgmt/netbox/files/pkg-message.in @@ -0,0 +1,112 @@ +================================================================================ + +================================== + Create a new PostgreSQL database +================================== + +# su pgsql +$ psql postgres + +postgres=# CREATE DATABASE netbox; +CREATE DATABASE +postgres=# CREATE USER netbox WITH PASSWORD 'v3rYs3cR3t'; +CREATE ROLE +postgres=# GRANT ALL PRIVILEGES ON DATABASE netbox TO netbox; +GRANT +postgres=# \q + +================== + Configure Netbox +================== + +1. Move into the netbox directory create a new configuration from the shipped + example configuration + +# cd %%DATADIR%%/netbox/ +# cp configuration.example.py configuration.py + +2. Edit configuration.py with an editor of your choice. + +3. Configure the variables ALLOWED_HOSTS, DATABASE and SECRET_KEY with the + respective values: + +3a. ALLOWED_HOST variable +--- --------------------- + +ALLOWED_HOSTS = ['netbox.example.com', 'anotherhost.example.com' ] + +3b. DATABASE variable +--- ----------------- + +DATABASE = { + 'NAME': 'netbox', # Database name + 'USER': 'netbox', # PostgreSQL username + 'PASSWORD': 'v3rYs3cR3t', # PostgreSQL password + 'HOST': 'localhost', # Database server + 'PORT': '', # Database port (leave blank for default) +} + +3c. SECRET_KEY variable +--- ------------------- + +Generate a secret key and add the value to the SECRET_KEY variable. The +supplied script generate_secret_key.py can be used for this task. Of course you +can also generate your own key which must contain at least 50 alpha-numeric +characters then. + +# python%%PYTHON_VER%% %%DATADIR%%/generate_secret_key.py + +SECRET_KEY = 'dfIOdfa # $FreeBSD$ PORTNAME= transmission-remote-gui -PORTVERSION= 5.0.1 -PORTREVISION= 13 +PORTVERSION= 5.14.0 +DISTVERSIONPREFIX= v CATEGORIES= net-p2p -MASTER_SITES= SF/${PROJECTNAME}/${PORTVERSION}/ -DISTNAME= transgui-${PORTVERSION}-src +PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX} + +USE_GITHUB= yes +GH_ACCOUNT= transmission-remote-gui +GH_PROJECT= transgui MAINTAINER= acm@FreeBSD.org COMMENT= Remote GUI for transmission daemon -BROKEN= fails to build +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING.txt -BUILD_DEPENDS= lazbuild:editors/lazarus \ - fpcres:lang/fpc-utils -RUN_DEPENDS= transmission-daemon:net-p2p/transmission-daemon +USES= fpc iconv lazarus:flavors +USE_FPC= cairo chm fcl-base fcl-image fcl-json fcl-net pasjpeg rtl-objpas \ + rtl-extra x11 -USES= fpc -USE_FPC= cairo fcl-base fcl-image fcl-net pasjpeg rtl-objpas rtl-extra \ - x11 -USES= iconv zip -USE_GNOME= # - -WRKSRC= ${WRKDIR}/TransGUI +WRKSRC= ${WRKDIR}/transgui-${PORTVERSION} PLIST_FILES= bin/transgui SUB_FILES= pkg-message -LAZARUS_PROJECT_FILE= transgui.lpi -LAZBUILD_CMD= ${LOCALBASE}/bin/lazbuild -d -LCL_UNITS_DIR= ${LOCALBASE}/share/lazarus-${LAZARUS_VER}/lcl/units/${BUILDNAME} -LAZARUS_VER= 1.8.0 -LAZARUS_DIR= ${LOCALBASE}/share/lazarus-${LAZARUS_VER} +LAZARUS_PROJECT_FILES= transgui.lpi +LAZBUILD_ARGS= -d PROJECT_NAME= transgui -OPTIONS_SINGLE= LCL -OPTIONS_SINGLE_LCL= GTK2 QT4 - -GTK2_DESC= Use gtk20 interface -QT4_DESC= Use qt4 interface - -OPTIONS_DEFAULT= GTK2 - -.include - -.if ${PORT_OPTIONS:MGTK2} -USE_FPC+= gtk2 -USE_GNOME= gtk20 -LCL_PLATFORM= gtk2 -BUILD_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-gtk2 -.endif - -.if ${PORT_OPTIONS:MQT4} -LIB_DEPENDS+= libQt4Pas.so:x11-toolkits/qt4pas -LCL_PLATFORM= qt -BUILD_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt -.endif - -do-build: - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --ws=${LCL_PLATFORM} --lazarusdir=${LAZARUS_DIR} ${LAZARUS_PROJECT_FILE} +gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt4 ${PORTNAME}-qt5 +qt4_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt5 +qt5_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt4 do-install: @cd ${WRKSRC}/units && \ diff --git a/net-p2p/transmission-remote-gui/distinfo b/net-p2p/transmission-remote-gui/distinfo index b59cf0b2d90..069390ea08b 100644 --- a/net-p2p/transmission-remote-gui/distinfo +++ b/net-p2p/transmission-remote-gui/distinfo @@ -1,2 +1,3 @@ -SHA256 (transgui-5.0.1-src.zip) = 9f59ca89169bd59c63c0c8bc30c3e32b654319ef53a117787fa99eff08ac1278 -SIZE (transgui-5.0.1-src.zip) = 947645 +TIMESTAMP = 1520359617 +SHA256 (transmission-remote-gui-transgui-v5.14.0_GH0.tar.gz) = 30c0bdd9ede5b11fdc3abf8768e4d52d28614c180e4d08e649bf9ce7b4230df2 +SIZE (transmission-remote-gui-transgui-v5.14.0_GH0.tar.gz) = 1699886 diff --git a/net-p2p/transmission-remote-gui/pkg-descr b/net-p2p/transmission-remote-gui/pkg-descr index 75f03c1da57..5d5f3dfb5a3 100644 --- a/net-p2p/transmission-remote-gui/pkg-descr +++ b/net-p2p/transmission-remote-gui/pkg-descr @@ -2,4 +2,4 @@ Transmission Remote GUI is feature rich cross platform front-end to remotely control Transmission daemon via its RPC protocol. It is faster and has more functionality than build-in Transmission web interface. -WWW: http://code.google.com/p/transmisson-remote-gui/ +WWW: https://github.com/transmission-remote-gui/transgui diff --git a/net/Makefile b/net/Makefile index 9466dd9200b..8384a2c0b49 100644 --- a/net/Makefile +++ b/net/Makefile @@ -53,7 +53,7 @@ SUBDIR += bindtest SUBDIR += binkd SUBDIR += bird - SUBDIR += bird-devel + SUBDIR += bird2 SUBDIR += bittwist SUBDIR += bluemix-cli SUBDIR += bmon @@ -246,6 +246,7 @@ SUBDIR += howl SUBDIR += hping SUBDIR += hs-aws + SUBDIR += hs-bsb-http-chunked SUBDIR += hs-connection SUBDIR += hs-gsasl SUBDIR += hs-hoauth2 @@ -259,6 +260,7 @@ SUBDIR += hs-network-uri SUBDIR += hs-pcap SUBDIR += hs-publicsuffixlist + SUBDIR += hs-resolv SUBDIR += hs-sendfile SUBDIR += hs-simple-sendfile SUBDIR += hs-socks diff --git a/net/bird-devel/Makefile b/net/bird2/Makefile similarity index 88% rename from net/bird-devel/Makefile rename to net/bird2/Makefile index 82512475cba..6977af41094 100644 --- a/net/bird-devel/Makefile +++ b/net/bird2/Makefile @@ -3,10 +3,10 @@ PORTNAME= bird DISTVERSION= 2.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= ftp://bird.network.cz/pub/bird/ -PKGNAMESUFFIX= -devel +PKGNAMESUFFIX= 2 MAINTAINER= olivier@FreeBSD.org COMMENT= Dynamic IP routing daemon (devel version) @@ -28,7 +28,7 @@ MAKE_JOBS_UNSAFE= yes OPTIONS_MULTI= RP RP_DESC= Routing Protocols -OPTIONS_MULTI_RP= BFD BABEL BGP OSPF PIPE RADV RIP STATIC +OPTIONS_MULTI_RP= BFD BABEL BGP OSPF PIPE RADV RIP RPKI STATIC OPTIONS_DEFAULT= ${OPTIONS_MULTI_RP} BFD_DESC= Bidirectional Forwarding Detection @@ -38,6 +38,7 @@ OSPF_DESC= Open Short Path First PIPE_DESC= PIPE routing RADV_DESC= Router Advertisement RIP_DESC= Routing Information Protocol +RPKI_DESC= Resource Public Key Infrastructure STATIC_DESC= Static routing BFD_VARS= rt_prot+=bfd @@ -47,6 +48,7 @@ OSPF_VARS= rt_prot+=ospf PIPE_VARS= rt_prot+=pipe RADV_VARS= rt_prot+=radv RIP_VARS= rt_prot+=rip +RPKI_VARS= rt_prot+=rpki STATIC_VARS= rt_prot+=static CONFIGURE_ARGS+=--with-protocols="${RT_PROT}" diff --git a/net/bird-devel/distinfo b/net/bird2/distinfo similarity index 100% rename from net/bird-devel/distinfo rename to net/bird2/distinfo diff --git a/net/bird-devel/files/bird.in b/net/bird2/files/bird.in similarity index 100% rename from net/bird-devel/files/bird.in rename to net/bird2/files/bird.in diff --git a/net/bird-devel/files/patch-Makefile.in b/net/bird2/files/patch-Makefile.in similarity index 100% rename from net/bird-devel/files/patch-Makefile.in rename to net/bird2/files/patch-Makefile.in diff --git a/net/bird-devel/files/patch-sysdep_bsd_setkey.h b/net/bird2/files/patch-sysdep_bsd_setkey.h similarity index 100% rename from net/bird-devel/files/patch-sysdep_bsd_setkey.h rename to net/bird2/files/patch-sysdep_bsd_setkey.h diff --git a/net/bird-devel/files/pkg-message.in b/net/bird2/files/pkg-message.in similarity index 100% rename from net/bird-devel/files/pkg-message.in rename to net/bird2/files/pkg-message.in diff --git a/net/bird-devel/pkg-descr b/net/bird2/pkg-descr similarity index 100% rename from net/bird-devel/pkg-descr rename to net/bird2/pkg-descr diff --git a/net/bird-devel/pkg-plist b/net/bird2/pkg-plist similarity index 100% rename from net/bird-devel/pkg-plist rename to net/bird2/pkg-plist diff --git a/net/bwi-firmware-kmod/Makefile b/net/bwi-firmware-kmod/Makefile index 041f5d215e2..eb66c565cd0 100644 --- a/net/bwi-firmware-kmod/Makefile +++ b/net/bwi-firmware-kmod/Makefile @@ -13,6 +13,9 @@ EXTRACT_ONLY= MAINTAINER= swhetzel@gmail.com COMMENT= Broadcom AirForce IEEE 802.11 Firmware Kernel Module +ONLY_FOR_ARCHS= amd64 i386 +ONLY_FOR_ARCHS_REASON= hardware particular to PCI/CardBus + BUILD_DEPENDS= b43-fwcutter:sysutils/b43-fwcutter FIRMWARES= ucode ucode11 ucode2 ucode4 ucode5 \ diff --git a/net/bwn-firmware-kmod/Makefile b/net/bwn-firmware-kmod/Makefile index a0bbf4b3fe8..697207a118e 100644 --- a/net/bwn-firmware-kmod/Makefile +++ b/net/bwn-firmware-kmod/Makefile @@ -13,6 +13,9 @@ EXTRACT_ONLY= MAINTAINER= swhetzel@gmail.com COMMENT= Broadcom AirForce IEEE 802.11 Firmware Kernel Module +ONLY_FOR_ARCHS= amd64 i386 +ONLY_FOR_ARCHS_REASON= hardware particular to PCI/CardBus + BUILD_DEPENDS= b43-fwcutter:sysutils/b43-fwcutter FIRMWARES= \ diff --git a/net/dhcpd/Makefile b/net/dhcpd/Makefile index 9b0c6d7512a..45256769fa4 100644 --- a/net/dhcpd/Makefile +++ b/net/dhcpd/Makefile @@ -2,6 +2,7 @@ PORTNAME= dhcpd PORTVERSION= 6.0.20170207 +PORTREVISION= 1 CATEGORIES= net MAINTAINER= koue@chaosophia.net @@ -26,6 +27,10 @@ MAKE_ARGS+= BINDIR=${PREFIX}/sbin MANDIR=${PREFIX}/man/man USERS= dhcpd GROUPS= dhcpd +post-patch: + @${REINPLACE_CMD} -e "s|/etc/dhcpd.conf|${PREFIX}/etc/dhcpd.conf|" \ + ${WRKSRC}/dhcpd.[h8] + post-install: ${INSTALL_DATA} ${WRKSRC}/dhcpd.conf \ ${STAGEDIR}${PREFIX}/etc/dhcpd.conf.sample diff --git a/net/dhcpd/files/dhcpd.in b/net/dhcpd/files/dhcpd.in index 16ec59f87ba..4dd6458bc89 100644 --- a/net/dhcpd/files/dhcpd.in +++ b/net/dhcpd/files/dhcpd.in @@ -16,10 +16,11 @@ name=dhcpd rcvar=dhcpd_enable +load_rc_config $name + command="%%PREFIX%%/sbin/dhcpd" dhcpd_enable=${dhcpd_enable:-"NO"} -dhcpd_flags=${dhcpd_flags:-"-c %%PREFIX%%/etc/dhcpd.conf"} +dhcpd_flags=${dhcpd_flags:-""} -load_rc_config $name run_rc_command "$1" diff --git a/net/hs-aws/Makefile b/net/hs-aws/Makefile index 210a971d690..ae86d220d38 100644 --- a/net/hs-aws/Makefile +++ b/net/hs-aws/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= aws -PORTVERSION= 0.16 -PORTREVISION= 1 +PORTVERSION= 0.19 CATEGORIES= net haskell MAINTAINER= haskell@FreeBSD.org @@ -16,10 +15,12 @@ USE_CABAL= aeson>=0.6 attoparsec>=0.11 base16-bytestring \ conduit-extra>=1.1 cryptohash>=0.11 data-default>=0.5.3 \ http-conduit>=2.1 http-types>=0.7 lifted-base>=0.1 \ monad-control>=0.3 mtl network resourcet>=1.1 safe>=0.3 \ - scientific>=0.3 tagged>=0.7 text>=0.11 unordered-containers>=0.2 \ + scientific>=0.3 tagged>=0.7 unordered-containers>=0.2 \ utf8-string>=0.3 vector>=0.10 xml-conduit>=1.2 FLAGS_DISABLE= examples +IGNORE= Doesn't build with recent hs-conduit and hs-resourcet + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/net/hs-aws/distinfo b/net/hs-aws/distinfo index 2edffbd8be7..f3ccb6c1a89 100644 --- a/net/hs-aws/distinfo +++ b/net/hs-aws/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499623590 -SHA256 (cabal/aws-0.16.tar.gz) = 84b5c60227f3c9eddc0abf0881aee22443fc4a211b8a95f18be628eaa492209c -SIZE (cabal/aws-0.16.tar.gz) = 99193 +TIMESTAMP = 1525086517 +SHA256 (cabal/aws-0.19.tar.gz) = b43b1215405a2c34b9e7ddac8a9f3cf80fff0f031b365a5c0e4e423f45b5777a +SIZE (cabal/aws-0.19.tar.gz) = 104207 diff --git a/net/hs-aws/files/patch-aws.cabal b/net/hs-aws/files/patch-aws.cabal deleted file mode 100644 index bbb71f8592a..00000000000 --- a/net/hs-aws/files/patch-aws.cabal +++ /dev/null @@ -1,11 +0,0 @@ ---- aws.cabal.orig 2017-07-10 15:40:11 UTC -+++ aws.cabal -@@ -145,7 +145,7 @@ Library - unordered-containers >= 0.2, - utf8-string >= 0.3 && < 1.1, - vector >= 0.10, -- xml-conduit >= 1.2 && <1.5 -+ xml-conduit >= 1.2 && <1.6 - - if !impl(ghc >= 7.6) - Build-depends: ghc-prim diff --git a/net/hs-bsb-http-chunked/Makefile b/net/hs-bsb-http-chunked/Makefile new file mode 100644 index 00000000000..5af01cdd13a --- /dev/null +++ b/net/hs-bsb-http-chunked/Makefile @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTNAME= bsb-http-chunked +PORTVERSION= 0.0.0.2 +CATEGORIES= net haskell + +MAINTAINER= haskell@FreeBSD.org +COMMENT= Chunked HTTP transfer encoding for bytestring builders + +LICENSE= BSD3CLAUSE + +.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" +.include diff --git a/net/hs-bsb-http-chunked/distinfo b/net/hs-bsb-http-chunked/distinfo new file mode 100644 index 00000000000..0ef011a0535 --- /dev/null +++ b/net/hs-bsb-http-chunked/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1524928561 +SHA256 (cabal/bsb-http-chunked-0.0.0.2.tar.gz) = 28cb750979763c815fbf69a6dc510f837b7ccbe262adf0a28ad270966737d5f4 +SIZE (cabal/bsb-http-chunked-0.0.0.2.tar.gz) = 6503 diff --git a/net/hs-bsb-http-chunked/files/patch-bsb-http-chunked.cabal b/net/hs-bsb-http-chunked/files/patch-bsb-http-chunked.cabal new file mode 100644 index 00000000000..4c3d7444036 --- /dev/null +++ b/net/hs-bsb-http-chunked/files/patch-bsb-http-chunked.cabal @@ -0,0 +1,9 @@ +--- bsb-http-chunked.cabal.orig 2018-04-28 15:19:50 UTC ++++ bsb-http-chunked.cabal +@@ -43,5 +43,4 @@ Library + Blaze.ByteString.Builder.Internal.Write + + build-depends: base >= 4.3 && < 4.12, +- bytestring >= 0.9 && < 0.11, +- bytestring-builder < 0.11 ++ bytestring >= 0.9 && < 0.11 diff --git a/net/hs-bsb-http-chunked/pkg-descr b/net/hs-bsb-http-chunked/pkg-descr new file mode 100644 index 00000000000..53a9896e9b4 --- /dev/null +++ b/net/hs-bsb-http-chunked/pkg-descr @@ -0,0 +1,4 @@ +This library contains functions for encoding bytestring builders for +chunked HTTP/1.1 transfer. + +WWW: http://github.com/sjakobi/bsb-http-chunked diff --git a/net/hs-connection/Makefile b/net/hs-connection/Makefile index 5ff9ac849b3..34bf56182e3 100644 --- a/net/hs-connection/Makefile +++ b/net/hs-connection/Makefile @@ -2,7 +2,7 @@ PORTNAME= connection PORTVERSION= 0.2.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net haskell MAINTAINER= haskell@FreeBSD.org diff --git a/net/hs-gsasl/Makefile b/net/hs-gsasl/Makefile index a10c26c515e..b1826bc80eb 100644 --- a/net/hs-gsasl/Makefile +++ b/net/hs-gsasl/Makefile @@ -2,7 +2,7 @@ PORTNAME= gsasl PORTVERSION= 0.3.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net haskell MAINTAINER= haskell@FreeBSD.org diff --git a/net/hs-hoauth2/Makefile b/net/hs-hoauth2/Makefile index 3fefacd6286..14d8957a26e 100644 --- a/net/hs-hoauth2/Makefile +++ b/net/hs-hoauth2/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= hoauth2 -PORTVERSION= 0.5.9 -PORTREVISION= 1 +PORTVERSION= 1.7.1 CATEGORIES= net haskell MAINTAINER= haskell@FreeBSD.org @@ -10,8 +9,8 @@ COMMENT= Haskell OAuth2 authentication LICENSE= BSD3CLAUSE -USE_CABAL= aeson http-conduit http-types text unordered-containers \ - wai warp +USE_CABAL= aeson http-conduit http-types microlens unordered-containers \ + uri-bytestring uri-bytestring-aeson wai warp FLAGS_DISABLE= test diff --git a/net/hs-hoauth2/distinfo b/net/hs-hoauth2/distinfo index 0ce3cf5c1fe..c67087045fb 100644 --- a/net/hs-hoauth2/distinfo +++ b/net/hs-hoauth2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1501281503 -SHA256 (cabal/hoauth2-0.5.9.tar.gz) = ffa512787b4ef5a32260aa8659260fdd7e0fcafae7c2482275dd85e7a202b25e -SIZE (cabal/hoauth2-0.5.9.tar.gz) = 10864 +TIMESTAMP = 1525036387 +SHA256 (cabal/hoauth2-1.7.1.tar.gz) = bae84321fb0c90013677d6abe754774f05fbb3271ced0844df725ca4edb38216 +SIZE (cabal/hoauth2-1.7.1.tar.gz) = 18045 diff --git a/net/hs-hoauth2/files/patch-hoauth2.cabal b/net/hs-hoauth2/files/patch-hoauth2.cabal index 1de01c4d489..203ffab8d5d 100644 --- a/net/hs-hoauth2/files/patch-hoauth2.cabal +++ b/net/hs-hoauth2/files/patch-hoauth2.cabal @@ -1,83 +1,26 @@ ---- hoauth2.cabal.orig 2017-04-05 20:01:54 UTC +--- hoauth2.cabal.orig 2018-04-29 21:29:58 UTC +++ hoauth2.cabal -@@ -63,7 +63,7 @@ Library - bytestring >= 0.9 && < 0.11, - http-conduit >= 2.1 && < 2.3, - http-types >= 0.9 && < 0.10, -- aeson >= 0.11 && < 1.2, -+ aeson >= 0.11 && < 1.3, - unordered-containers >= 0.2.5 - - -@@ -87,7 +87,7 @@ Executable test-weibo - http-conduit >= 2.1 && < 2.3, - text >= 0.11 && < 1.3, - bytestring >= 0.9 && < 0.11, -- aeson >= 0.11 && < 1.2, -+ aeson >= 0.11 && < 1.3, - hoauth2 +@@ -77,12 +77,12 @@ Library + bytestring >= 0.9 && < 0.11, + http-conduit >= 2.1 && < 2.4, + http-types >= 0.11 && < 0.13, +- aeson >= 0.11 && < 1.3, ++ aeson >= 0.11 && < 1.4, + unordered-containers >= 0.2.5, + uri-bytestring >= 0.2.3.1 && < 0.4, + uri-bytestring-aeson >= 0.1 && < 0.2, + microlens >= 0.4.0 && < 0.5, +- exceptions >= 0.8.3 && < 0.10 ++ exceptions >= 0.8.3 && < 0.11 if impl(ghc >= 6.12.0) -@@ -111,7 +111,7 @@ Executable test-google - http-conduit >= 2.1 && < 2.3, - text >= 0.11 && < 1.3, - bytestring >= 0.9 && < 0.11, -- aeson >= 0.11 && < 1.2, -+ aeson >= 0.11 && < 1.3, - hoauth2 - - if impl(ghc >= 6.12.0) -@@ -135,7 +135,7 @@ Executable test-github - http-conduit >= 2.1 && < 2.3, - text >= 0.11 && < 1.3, - bytestring >= 0.9 && < 0.11, -- aeson >= 0.11 && < 1.2, -+ aeson >= 0.11 && < 1.3, - hoauth2 - - if impl(ghc >= 6.12.0) -@@ -158,7 +158,7 @@ Executable test-douban - http-conduit >= 2.1 && < 2.3, - text >= 0.11 && < 1.3, - bytestring >= 0.9 && < 0.11, -- aeson >= 0.11 && < 1.2, -+ aeson >= 0.11 && < 1.3, - hoauth2 - - if impl(ghc >= 6.12.0) -@@ -181,7 +181,7 @@ Executable test-facebook - http-conduit >= 2.1 && < 2.3, - text >= 0.11 && < 1.3, - bytestring >= 0.9 && < 0.11, -- aeson >= 0.11 && < 1.2, -+ aeson >= 0.11 && < 1.3, - hoauth2 - - if impl(ghc >= 6.12.0) -@@ -207,7 +207,7 @@ Executable test-fitbit + ghc-options: -Wall -fwarn-tabs -funbox-strict-fields +@@ -125,7 +125,7 @@ Executable demo-server wai >= 3.2 && < 3.3, warp >= 3.2 && < 3.3, containers >= 0.4 && < 0.6, -- aeson >= 0.11 && < 1.2, -+ aeson >= 0.11 && < 1.3, - hoauth2 - - -@@ -231,7 +231,7 @@ Executable test-stackexchange - http-conduit >= 2.1 && < 2.3, - text >= 0.11 && < 1.3, - bytestring >= 0.9 && < 0.11, -- aeson >= 0.11 && < 1.2, -+ aeson >= 0.11 && < 1.3, - hoauth2 - - if impl(ghc >= 6.12.0) -@@ -254,7 +254,7 @@ Executable test-dropbox - http-conduit >= 2.1 && < 2.3, - text >= 0.11 && < 1.3, - bytestring >= 0.9 && < 0.11, -- aeson >= 0.11 && < 1.2, -+ aeson >= 0.11 && < 1.3, - hoauth2 - - if impl(ghc >= 6.12.0) +- aeson >= 0.11 && < 1.3, ++ aeson >= 0.11 && < 1.4, + microlens >= 0.4.0 && < 0.5, + unordered-containers >= 0.2.8 && < 0.2.9, + wai-extra >= 3.0.21.0 && < 3.0.22.0, diff --git a/net/hs-hostname/Makefile b/net/hs-hostname/Makefile index d2eb9308a40..63138c7f20a 100644 --- a/net/hs-hostname/Makefile +++ b/net/hs-hostname/Makefile @@ -2,7 +2,7 @@ PORTNAME= hostname PORTVERSION= 1.0 -PORTREVISION= 17 +PORTREVISION= 18 CATEGORIES= net haskell MAINTAINER= haskell@FreeBSD.org diff --git a/net/hs-iproute/Makefile b/net/hs-iproute/Makefile index 56ce5d96690..e06600dcae4 100644 --- a/net/hs-iproute/Makefile +++ b/net/hs-iproute/Makefile @@ -2,7 +2,7 @@ PORTNAME= iproute PORTVERSION= 1.7.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net haskell MAINTAINER= haskell@FreeBSD.org diff --git a/net/hs-maccatcher/Makefile b/net/hs-maccatcher/Makefile index 776d620fea2..dd376043839 100644 --- a/net/hs-maccatcher/Makefile +++ b/net/hs-maccatcher/Makefile @@ -2,7 +2,7 @@ PORTNAME= maccatcher PORTVERSION= 2.1.5 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= net haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,5 @@ COMMENT= Obtain the host MAC address on *NIX and Windows LICENSE= BSD3CLAUSE -USE_CABAL= parsec - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/net/hs-network-info/Makefile b/net/hs-network-info/Makefile index ac0855e23fe..523c201f7a4 100644 --- a/net/hs-network-info/Makefile +++ b/net/hs-network-info/Makefile @@ -2,7 +2,7 @@ PORTNAME= network-info PORTVERSION= 0.2.0.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net haskell MAINTAINER= haskell@FreeBSD.org diff --git a/net/hs-network-multicast/Makefile b/net/hs-network-multicast/Makefile index a857d935b63..8e489af3760 100644 --- a/net/hs-network-multicast/Makefile +++ b/net/hs-network-multicast/Makefile @@ -2,7 +2,7 @@ PORTNAME= network-multicast PORTVERSION= 0.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net haskell MAINTAINER= haskell@FreeBSD.org diff --git a/net/hs-network-protocol-xmpp/Makefile b/net/hs-network-protocol-xmpp/Makefile index 732fff609fe..4f842206b82 100644 --- a/net/hs-network-protocol-xmpp/Makefile +++ b/net/hs-network-protocol-xmpp/Makefile @@ -2,7 +2,7 @@ PORTNAME= network-protocol-xmpp PORTVERSION= 0.4.8 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,7 @@ COMMENT= Client library for the XMPP protocol LICENSE= GPLv3 USE_CABAL= gnuidn>=0.2 gnutls>=0.1.4 gsasl>=0.3 libxml-sax>=0.7 \ - monads-tf>=0.1 network>=2.2 text>=0.10 xml-types>=0.3 + monads-tf>=0.1 network>=2.2 xml-types>=0.3 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/net/hs-network-uri/Makefile b/net/hs-network-uri/Makefile index 61c48930e48..278d0d040ea 100644 --- a/net/hs-network-uri/Makefile +++ b/net/hs-network-uri/Makefile @@ -2,7 +2,7 @@ PORTNAME= network-uri PORTVERSION= 2.6.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,5 @@ COMMENT= URI manipulation LICENSE= BSD3CLAUSE -USE_CABAL= parsec>=3.0 - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/net/hs-network/Makefile b/net/hs-network/Makefile index 708bbf4d3f3..9821104c834 100644 --- a/net/hs-network/Makefile +++ b/net/hs-network/Makefile @@ -2,7 +2,7 @@ PORTNAME= network PORTVERSION= 2.6.3.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net haskell MAINTAINER= haskell@FreeBSD.org diff --git a/net/hs-pcap/Makefile b/net/hs-pcap/Makefile index 55ca33be291..ad219413bd1 100644 --- a/net/hs-pcap/Makefile +++ b/net/hs-pcap/Makefile @@ -3,7 +3,7 @@ PORTNAME= pcap PORTVERSION= 0.4.5.2 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= net haskell MAINTAINER= haskell@FreeBSD.org diff --git a/net/hs-publicsuffixlist/Makefile b/net/hs-publicsuffixlist/Makefile index 81516fde6ef..c50dc5f8d07 100644 --- a/net/hs-publicsuffixlist/Makefile +++ b/net/hs-publicsuffixlist/Makefile @@ -2,7 +2,7 @@ PORTNAME= publicsuffixlist PORTVERSION= 0.1 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= net haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,7 @@ COMMENT= Is a given string a domain suffix? LICENSE= BSD3CLAUSE -USE_CABAL= cereal data-default text>=0.11 utf8-string +USE_CABAL= cereal data-default utf8-string .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/net/hs-resolv/Makefile b/net/hs-resolv/Makefile new file mode 100644 index 00000000000..2d00ccdf266 --- /dev/null +++ b/net/hs-resolv/Makefile @@ -0,0 +1,15 @@ +# $FreeBSD$ + +PORTNAME= resolv +PORTVERSION= 0.1.1.1 +CATEGORIES= net haskell + +MAINTAINER= haskell@FreeBSD.org +COMMENT= Domain Name Service (DNS) lookup via the libresolv standard library routines + +LICENSE= GPLv3 + +USE_CABAL= base16-bytestring + +.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" +.include diff --git a/net/hs-resolv/distinfo b/net/hs-resolv/distinfo new file mode 100644 index 00000000000..f2b0e84ec83 --- /dev/null +++ b/net/hs-resolv/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1523298714 +SHA256 (cabal/resolv-0.1.1.1.tar.gz) = 49b12ed2b175cca3f885c06ca6906cde1245c02b6f98f2a95fc20d6a8ae40772 +SIZE (cabal/resolv-0.1.1.1.tar.gz) = 149436 diff --git a/net/hs-resolv/files/patch-resolv.cabal b/net/hs-resolv/files/patch-resolv.cabal new file mode 100644 index 00000000000..7bf02d0ad6a --- /dev/null +++ b/net/hs-resolv/files/patch-resolv.cabal @@ -0,0 +1,11 @@ +--- resolv.cabal.orig 2018-04-09 19:24:44 UTC ++++ resolv.cabal +@@ -78,7 +78,7 @@ library + Network.DNS.FFI + Compat + +- build-depends: base >= 4.5 && <4.11 ++ build-depends: base >= 4.5 && <4.12 + , base16-bytestring == 0.1.* + , binary >= 0.7.3 && < 0.9 + , bytestring >= 0.9.2 && < 0.11 diff --git a/net/hs-resolv/pkg-descr b/net/hs-resolv/pkg-descr new file mode 100644 index 00000000000..2eeb4e6fcaa --- /dev/null +++ b/net/hs-resolv/pkg-descr @@ -0,0 +1,5 @@ +This package implements an API for accessing the Domain Name Service (DNS) +resolver service via the standard libresolv system library (whose API is +often available directly via the standard libc C library) on Unix systems. + +WWW: https://github.com/hvr/resolv diff --git a/net/hs-sendfile/Makefile b/net/hs-sendfile/Makefile index 667c987cdde..ad6c7c71bdd 100644 --- a/net/hs-sendfile/Makefile +++ b/net/hs-sendfile/Makefile @@ -2,7 +2,7 @@ PORTNAME= sendfile PORTVERSION= 0.7.9 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= net haskell MAINTAINER= haskell@FreeBSD.org diff --git a/net/hs-simple-sendfile/Makefile b/net/hs-simple-sendfile/Makefile index 6bb2bb38371..7917f0936f2 100644 --- a/net/hs-simple-sendfile/Makefile +++ b/net/hs-simple-sendfile/Makefile @@ -2,7 +2,7 @@ PORTNAME= simple-sendfile PORTVERSION= 0.2.25 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net haskell MAINTAINER= haskell@FreeBSD.org diff --git a/net/hs-socks/Makefile b/net/hs-socks/Makefile index 165487b4e7c..8638791f28f 100644 --- a/net/hs-socks/Makefile +++ b/net/hs-socks/Makefile @@ -2,7 +2,7 @@ PORTNAME= socks PORTVERSION= 0.5.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net haskell MAINTAINER= haskell@FreeBSD.org diff --git a/net/malo-firmware-kmod/Makefile b/net/malo-firmware-kmod/Makefile index 269cb15c833..a41edfe0ea8 100644 --- a/net/malo-firmware-kmod/Makefile +++ b/net/malo-firmware-kmod/Makefile @@ -11,6 +11,9 @@ DISTNAME= ${FWNAME} MAINTAINER= cpm@FreeBSD.org COMMENT= Marvell Libertas 88W8335 IEEE 802.11b/g Firmware Kernel Module +ONLY_FOR_ARCHS= amd64 i386 +ONLY_FOR_ARCHS_REASON= hardware particular to PCI + FWNAME= malo-fw-${FWVERSION} FWVERSION= 3.0.0.39 diff --git a/net/p5-POE-Component-PubSub/Makefile b/net/p5-POE-Component-PubSub/Makefile index a3d5f28dcca..2c01016957f 100644 --- a/net/p5-POE-Component-PubSub/Makefile +++ b/net/p5-POE-Component-PubSub/Makefile @@ -2,18 +2,30 @@ # $FreeBSD$ PORTNAME= POE-Component-PubSub -PORTVERSION= 0.05 -PORTREVISION= 1 +PORTVERSION= 0.091370 CATEGORIES= net perl5 MASTER_SITES= CPAN +MASTER_SITE_SUBDIR= CPAN:NPEREZ PKGNAMEPREFIX= p5- MAINTAINER= perl@FreeBSD.org COMMENT= Generic publish/subscribe POE::Component -BUILD_DEPENDS= p5-POE>=0:devel/p5-POE +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/LICENSE + +BUILD_DEPENDS= p5-Moose>=0.79:devel/p5-Moose \ + p5-MooseX-Declare>=0.22:devel/p5-MooseX-Declare \ + p5-MooseX-Types>=0:devel/p5-MooseX-Types \ + p5-MooseX-Types-Set-Object>=0.02:devel/p5-MooseX-Types-Set-Object \ + p5-MooseX-Types-Structured>=0.14:devel/p5-MooseX-Types-Structured \ + p5-POE>=1.005:devel/p5-POE \ + p5-POE-API-Peek>=2.15:devel/p5-POE-API-Peek \ + p5-POEx-Role-SessionInstantiation>=0.01:devel/p5-POEx-Role-SessionInstantiation \ + p5-signatures>=0.05:lang/p5-signatures RUN_DEPENDS:= ${BUILD_DEPENDS} +NO_ARCH= yes USES= perl5 USE_PERL5= modbuild diff --git a/net/p5-POE-Component-PubSub/distinfo b/net/p5-POE-Component-PubSub/distinfo index 32e7e3e509e..333bf1763ef 100644 --- a/net/p5-POE-Component-PubSub/distinfo +++ b/net/p5-POE-Component-PubSub/distinfo @@ -1,2 +1,3 @@ -SHA256 (POE-Component-PubSub-0.05.tar.gz) = 73be9494299b71d65951289da4ffc422b78fc46cd10ab12a6b240caa3051665a -SIZE (POE-Component-PubSub-0.05.tar.gz) = 6892 +TIMESTAMP = 1527220600 +SHA256 (POE-Component-PubSub-0.091370.tar.gz) = 513431f12b6e32c4e487e52f5c7873a9ab1f4a4d54f6a940b0b35b7b279e8c21 +SIZE (POE-Component-PubSub-0.091370.tar.gz) = 19409 diff --git a/net/p5-POE-Component-PubSub/pkg-descr b/net/p5-POE-Component-PubSub/pkg-descr index 04ec897fb55..ac3a3a77d46 100644 --- a/net/p5-POE-Component-PubSub/pkg-descr +++ b/net/p5-POE-Component-PubSub/pkg-descr @@ -1,4 +1,4 @@ A generic publish/subscribe POE::Component that enables POE::Sessions to publish events to which other POE::Sessions may subscribe. -WWW: http://search.cpan.org/dist/POE-Component-PubSub/ +WWW: https://metacpan.org/release/NPEREZ/POE-Component-PubSub-0.091370 diff --git a/net/p5-POE-Component-PubSub/pkg-plist b/net/p5-POE-Component-PubSub/pkg-plist index 7cbd8a2a5eb..4a928de2879 100644 --- a/net/p5-POE-Component-PubSub/pkg-plist +++ b/net/p5-POE-Component-PubSub/pkg-plist @@ -1,2 +1,6 @@ -%%PERL5_MAN3%%/POE::Component::PubSub.3.gz %%SITE_PERL%%/POE/Component/PubSub.pm +%%SITE_PERL%%/POE/Component/PubSub/Event.pm +%%SITE_PERL%%/POE/Component/PubSub/Types.pm +%%PERL5_MAN3%%/POE::Component::PubSub.3.gz +%%PERL5_MAN3%%/POE::Component::PubSub::Event.3.gz +%%PERL5_MAN3%%/POE::Component::PubSub::Types.3.gz diff --git a/net/rubygem-connection_pool/Makefile b/net/rubygem-connection_pool/Makefile index b17d18f8c96..cf65c6e0391 100644 --- a/net/rubygem-connection_pool/Makefile +++ b/net/rubygem-connection_pool/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= connection_pool -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES= net rubygems MASTER_SITES= RG diff --git a/net/rubygem-connection_pool/distinfo b/net/rubygem-connection_pool/distinfo index 613ec3661d5..c95d5b447e2 100644 --- a/net/rubygem-connection_pool/distinfo +++ b/net/rubygem-connection_pool/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1480758541 -SHA256 (rubygem/connection_pool-2.2.1.gem) = 870bfad9e390e2888f515210034223ae293fc3cbe77755e34251383f8d54779f -SIZE (rubygem/connection_pool-2.2.1.gem) = 13824 +TIMESTAMP = 1527234593 +SHA256 (rubygem/connection_pool-2.2.2.gem) = c8cc9446bcc51034103c1259ad70b91dc9f5297d13460b2c0cce7e5a93e8d451 +SIZE (rubygem/connection_pool-2.2.2.gem) = 13824 diff --git a/net/rubygem-omniauth-authentiq/Makefile b/net/rubygem-omniauth-authentiq/Makefile index 6f4f733035e..23bd69d78d8 100644 --- a/net/rubygem-omniauth-authentiq/Makefile +++ b/net/rubygem-omniauth-authentiq/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= omniauth-authentiq -PORTVERSION= 0.3.1 +PORTVERSION= 0.3.2 CATEGORIES= net rubygems MASTER_SITES= RG @@ -11,7 +11,8 @@ COMMENT= Authentiq OAuth2 Strategy for OmniAuth LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= rubygem-omniauth-oauth2>=1.3.1:net/rubygem-omniauth-oauth2 +RUN_DEPENDS= rubygem-jwt1>=1.5:www/rubygem-jwt1 \ + rubygem-omniauth-oauth2>=1.5:net/rubygem-omniauth-oauth2 NO_ARCH= yes USE_RUBY= yes diff --git a/net/rubygem-omniauth-authentiq/distinfo b/net/rubygem-omniauth-authentiq/distinfo index 57a47831f41..00e021ebc7d 100644 --- a/net/rubygem-omniauth-authentiq/distinfo +++ b/net/rubygem-omniauth-authentiq/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1498809970 -SHA256 (rubygem/omniauth-authentiq-0.3.1.gem) = 0c8d19d0afe44afde1ce12eb61be765aef0f3fa757c4c1e82394a1ac867a0e1a -SIZE (rubygem/omniauth-authentiq-0.3.1.gem) = 9728 +TIMESTAMP = 1527275498 +SHA256 (rubygem/omniauth-authentiq-0.3.2.gem) = 796a5738ac24cf720c1848577ee3c88896eaf508d82b4f6508a0e274ec9ceb12 +SIZE (rubygem/omniauth-authentiq-0.3.2.gem) = 9728 diff --git a/ports-mgmt/hs-porte/Makefile b/ports-mgmt/hs-porte/Makefile index 194e3c8c0e6..ba51e3d294b 100644 --- a/ports-mgmt/hs-porte/Makefile +++ b/ports-mgmt/hs-porte/Makefile @@ -3,7 +3,7 @@ PORTNAME= porte PORTVERSION= 0.0.4 -PORTREVISION= 17 +PORTREVISION= 18 CATEGORIES= ports-mgmt haskell MAINTAINER= sbahra@repnop.org diff --git a/print/hs-hscolour/Makefile b/print/hs-hscolour/Makefile index 440d1cc2bdc..e36a82cd91e 100644 --- a/print/hs-hscolour/Makefile +++ b/print/hs-hscolour/Makefile @@ -3,7 +3,6 @@ PORTNAME= hscolour PORTVERSION= ${HSCOLOUR_VERSION} -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= print haskell diff --git a/print/hs-hscolour/distinfo b/print/hs-hscolour/distinfo index c430a7fca6e..2ad6c5d20c1 100644 --- a/print/hs-hscolour/distinfo +++ b/print/hs-hscolour/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499623755 -SHA256 (cabal/hscolour-1.24.1.tar.gz) = e46fe3de8ed6f96e2216b94b7608d01919bc86b15dd8d0ec7e71c0e7e5bf79c8 -SIZE (cabal/hscolour-1.24.1.tar.gz) = 28717 +TIMESTAMP = 1523651197 +SHA256 (cabal/hscolour-1.24.4.tar.gz) = 243332b082294117f37b2c2c68079fa61af68b36223b3fc07594f245e0e5321d +SIZE (cabal/hscolour-1.24.4.tar.gz) = 28729 diff --git a/print/scribus/Makefile b/print/scribus/Makefile index a10cf8087f1..21037c732cc 100644 --- a/print/scribus/Makefile +++ b/print/scribus/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= scribus -PORTVERSION= 1.4.6 -PORTREVISION= 11 +PORTVERSION= 1.4.7 CATEGORIES= print editors MASTER_SITES= SF \ http://www.scribus.net/downloads/${PORTVERSION}/ diff --git a/print/scribus/distinfo b/print/scribus/distinfo index 8a868f446fb..def832727b0 100644 --- a/print/scribus/distinfo +++ b/print/scribus/distinfo @@ -1,2 +1,3 @@ -SHA256 (scribus-1.4.6.tar.xz) = 21e336500d9edc9c90ccf73087e5ef3df59ec3e4a3cbfec15367bcd8d078a19a -SIZE (scribus-1.4.6.tar.xz) = 73601104 +TIMESTAMP = 1525025371 +SHA256 (scribus-1.4.7.tar.xz) = 42d335b4a59c26c8ae1e3f601676baa3c42b035b8cde326d195f7a30078e5fec +SIZE (scribus-1.4.7.tar.xz) = 72763748 diff --git a/print/scribus/files/patch-CMakeLists b/print/scribus/files/patch-CMakeLists index a5fa5a9d01e..14faf79dc93 100644 --- a/print/scribus/files/patch-CMakeLists +++ b/print/scribus/files/patch-CMakeLists @@ -18,27 +18,3 @@ IF (APPLEBUNDLE) SET(LIBDIR "lib/") ELSE (APPLEBUNDLE) -@@ -758,7 +758,7 @@ ENDIF(NOT WIN32) - #>>ASPELL for Speelling support - - #< -# $FreeBSD$ - -PORTNAME= bio -PORTVERSION= 0.5.3 -PORTREVISION= 4 -CATEGORIES= science haskell - -MAINTAINER= haskell@FreeBSD.org -COMMENT= Bioinformatics library - -LICENSE= LGPL21 - -USE_CABAL= mtl old-time parallel parsec QuickCheck>=2 random tagsoup>=0.8 - -EXECUTABLE= fastout flowclip flx frecover frename orf rselect-pe - -.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" -.include diff --git a/science/hs-bio/distinfo b/science/hs-bio/distinfo deleted file mode 100644 index f4b6aab534a..00000000000 --- a/science/hs-bio/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (cabal/bio-0.5.3.tar.gz) = 42c8f9b83fea6bf51356afe1251910ba4421e0af0bb4f26431eaf385971d7eed -SIZE (cabal/bio-0.5.3.tar.gz) = 103707 diff --git a/science/hs-bio/files/patch-Bio_Alignment_Bowtie.hs b/science/hs-bio/files/patch-Bio_Alignment_Bowtie.hs deleted file mode 100644 index f7ba1305fb8..00000000000 --- a/science/hs-bio/files/patch-Bio_Alignment_Bowtie.hs +++ /dev/null @@ -1,7 +0,0 @@ ---- Bio/Alignment/Bowtie.hs.orig 2013-07-20 07:25:31 UTC -+++ Bio/Alignment/Bowtie.hs -@@ -1,3 +1,4 @@ -+{-# LANGUAGE FlexibleContexts #-} - {-| This module provides a data type to represent an alignment - produced by the Bowtie short-read alignment tool (see - ). diff --git a/science/hs-bio/files/patch-bio.cabal b/science/hs-bio/files/patch-bio.cabal deleted file mode 100644 index c34a3277d73..00000000000 --- a/science/hs-bio/files/patch-bio.cabal +++ /dev/null @@ -1,11 +0,0 @@ ---- ./bio.cabal.orig 2011-12-15 12:56:28.000000000 +0100 -+++ ./bio.cabal 2011-12-17 11:02:26.000000000 +0100 -@@ -38,7 +38,7 @@ - Default: True - - Library -- Build-Depends: base>=4 && <5, binary >=0.4 && <0.5, tagsoup>=0.8, bytestring >= 0.9.1, -+ Build-Depends: base>=4 && <5, binary >=0.4, tagsoup>=0.8, bytestring >= 0.9.1, - containers, array, parallel, parsec, mtl, directory, QuickCheck >= 2 - - Exposed-modules: Bio.Sequence, diff --git a/science/hs-bio/pkg-descr b/science/hs-bio/pkg-descr deleted file mode 100644 index 8ebf118ce11..00000000000 --- a/science/hs-bio/pkg-descr +++ /dev/null @@ -1,13 +0,0 @@ -This is a collection of data structures and algorithms useful for -building bioinformatics-related tools and utilities. Current list of -features includes: a Sequence data type supporting protein and -nucleotide sequences and conversion between them. As of version 0.4, -different kinds of sequence have different types. Support for quality -data, reading and writing Fasta formatted files, reading TwoBit and phd -formats, and Roche/454 SFF files. Rudimentary (i.e. unoptimized) support -for doing alignments - including dynamic adjustment of scores based on -sequence quality. Also Blast output parsing. Partly implemented single -linkage clustering, and multiple alignment. Reading Gene Ontology (GO) -annotations (GOA) and definitions hierarchy. - -WWW: http://biohaskell.org/Libraries/Bio diff --git a/security/Makefile b/security/Makefile index ee3f4a31b19..faf63d19d54 100644 --- a/security/Makefile +++ b/security/Makefile @@ -252,6 +252,7 @@ SUBDIR += hs-cryptohash-sha1 SUBDIR += hs-cryptohash-sha256 SUBDIR += hs-cryptonite + SUBDIR += hs-cryptonite-conduit SUBDIR += hs-digest SUBDIR += hs-ed25519 SUBDIR += hs-entropy diff --git a/security/hs-Crypto/Makefile b/security/hs-Crypto/Makefile index d032f8f8cf2..154be684a24 100644 --- a/security/hs-Crypto/Makefile +++ b/security/hs-Crypto/Makefile @@ -2,7 +2,7 @@ PORTNAME= Crypto PORTVERSION= 4.2.5.1 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org diff --git a/security/hs-DRBG/Makefile b/security/hs-DRBG/Makefile index f93dc36b9bb..997cc1274b3 100644 --- a/security/hs-DRBG/Makefile +++ b/security/hs-DRBG/Makefile @@ -2,7 +2,7 @@ PORTNAME= DRBG PORTVERSION= 0.5.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org diff --git a/security/hs-HsOpenSSL/Makefile b/security/hs-HsOpenSSL/Makefile index 15be30e84ad..3548835971a 100644 --- a/security/hs-HsOpenSSL/Makefile +++ b/security/hs-HsOpenSSL/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= HsOpenSSL -PORTVERSION= 0.11.4.9 -PORTREVISION= 1 +PORTVERSION= 0.11.4.13 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org diff --git a/security/hs-HsOpenSSL/distinfo b/security/hs-HsOpenSSL/distinfo index 988efd22898..193c02507f5 100644 --- a/security/hs-HsOpenSSL/distinfo +++ b/security/hs-HsOpenSSL/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499450950 -SHA256 (cabal/HsOpenSSL-0.11.4.9.tar.gz) = ea0fe9bb2a6aa9afe5229dfdc44cae493c3fccf9daffa091d2d1aaa09087b378 -SIZE (cabal/HsOpenSSL-0.11.4.9.tar.gz) = 79689 +TIMESTAMP = 1524153978 +SHA256 (cabal/HsOpenSSL-0.11.4.13.tar.gz) = 125cd16f3db36ed102fe8748e474eaca69dbc57ee8794e29863c69d0a47fff47 +SIZE (cabal/HsOpenSSL-0.11.4.13.tar.gz) = 79832 diff --git a/security/hs-RSA/Makefile b/security/hs-RSA/Makefile index bd4f43c74f3..7dfa4f5eb6b 100644 --- a/security/hs-RSA/Makefile +++ b/security/hs-RSA/Makefile @@ -2,7 +2,7 @@ PORTNAME= RSA PORTVERSION= 2.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org diff --git a/security/hs-SHA/Makefile b/security/hs-SHA/Makefile index fd451fdc5c1..5147d38acb4 100644 --- a/security/hs-SHA/Makefile +++ b/security/hs-SHA/Makefile @@ -2,7 +2,7 @@ PORTNAME= SHA PORTVERSION= 1.6.4.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org diff --git a/security/hs-certificate/Makefile b/security/hs-certificate/Makefile index 45395b2a3d9..6cb37193e93 100644 --- a/security/hs-certificate/Makefile +++ b/security/hs-certificate/Makefile @@ -20,5 +20,7 @@ EXECUTABLE_FLAG_ENABLE= executable EXECUTABLE_FLAG_CABAL= cmdargs text>=0.11 cryptohash crypto-pubkey EXECUTABLE_FLAG_EXECUTABLE= certificate +IGNORE= Doesn't build with recent GHC version + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/security/hs-cipher-aes/Makefile b/security/hs-cipher-aes/Makefile index cdca99877ee..58f2d9b29f3 100644 --- a/security/hs-cipher-aes/Makefile +++ b/security/hs-cipher-aes/Makefile @@ -2,7 +2,7 @@ PORTNAME= cipher-aes PORTVERSION= 0.2.11 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org diff --git a/security/hs-cipher-aes128/Makefile b/security/hs-cipher-aes128/Makefile index ef6105d554a..acf42d18698 100644 --- a/security/hs-cipher-aes128/Makefile +++ b/security/hs-cipher-aes128/Makefile @@ -2,7 +2,7 @@ PORTNAME= cipher-aes128 PORTVERSION= 0.7.0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org diff --git a/security/hs-cipher-blowfish/Makefile b/security/hs-cipher-blowfish/Makefile index 6529aa2366a..6b17898e2a1 100644 --- a/security/hs-cipher-blowfish/Makefile +++ b/security/hs-cipher-blowfish/Makefile @@ -2,7 +2,7 @@ PORTNAME= cipher-blowfish PORTVERSION= 0.0.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org diff --git a/security/hs-cipher-camellia/Makefile b/security/hs-cipher-camellia/Makefile index 313fe423f06..1327605da15 100644 --- a/security/hs-cipher-camellia/Makefile +++ b/security/hs-cipher-camellia/Makefile @@ -2,7 +2,7 @@ PORTNAME= cipher-camellia PORTVERSION= 0.0.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org diff --git a/security/hs-cipher-des/Makefile b/security/hs-cipher-des/Makefile index ad8c8da755d..9af2144c0eb 100644 --- a/security/hs-cipher-des/Makefile +++ b/security/hs-cipher-des/Makefile @@ -2,7 +2,7 @@ PORTNAME= cipher-des PORTVERSION= 0.0.6 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org diff --git a/security/hs-cipher-rc4/Makefile b/security/hs-cipher-rc4/Makefile index 9523b0490dd..f4e2a03ef1b 100644 --- a/security/hs-cipher-rc4/Makefile +++ b/security/hs-cipher-rc4/Makefile @@ -2,7 +2,7 @@ PORTNAME= cipher-rc4 PORTVERSION= 0.1.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org diff --git a/security/hs-clientsession/Makefile b/security/hs-clientsession/Makefile index 3f368c0496c..2ffd5a00efb 100644 --- a/security/hs-clientsession/Makefile +++ b/security/hs-clientsession/Makefile @@ -2,7 +2,7 @@ PORTNAME= clientsession PORTVERSION= 0.9.1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org diff --git a/security/hs-cprng-aes/Makefile b/security/hs-cprng-aes/Makefile index 37ada3d1c67..99ae8298572 100644 --- a/security/hs-cprng-aes/Makefile +++ b/security/hs-cprng-aes/Makefile @@ -2,7 +2,7 @@ PORTNAME= cprng-aes PORTVERSION= 0.6.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org diff --git a/security/hs-crypto-api/Makefile b/security/hs-crypto-api/Makefile index cd8f7f7ae14..5e781871bd3 100644 --- a/security/hs-crypto-api/Makefile +++ b/security/hs-crypto-api/Makefile @@ -2,7 +2,7 @@ PORTNAME= crypto-api PORTVERSION= 0.13.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org diff --git a/security/hs-crypto-cipher-types/Makefile b/security/hs-crypto-cipher-types/Makefile index 9bbc8971e62..8c65954232d 100644 --- a/security/hs-crypto-cipher-types/Makefile +++ b/security/hs-crypto-cipher-types/Makefile @@ -2,7 +2,7 @@ PORTNAME= crypto-cipher-types PORTVERSION= 0.0.9 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org diff --git a/security/hs-crypto-conduit/files/patch-crypto-conduit.cabal b/security/hs-crypto-conduit/files/patch-crypto-conduit.cabal index 406550238d3..5ba5ff25f83 100644 --- a/security/hs-crypto-conduit/files/patch-crypto-conduit.cabal +++ b/security/hs-crypto-conduit/files/patch-crypto-conduit.cabal @@ -1,13 +1,14 @@ ---- crypto-conduit.cabal.orig 2014-11-12 15:04:14 UTC +--- crypto-conduit.cabal.orig 2014-11-12 15:04:14 UTC +++ crypto-conduit.cabal @@ -37,9 +37,9 @@ Library Build-depends: base >= 3 && < 5, bytestring >= 0.9, - cereal >= 0.3 && < 0.5, -+ cereal >= 0.3 && < 0.6, - conduit >= 1.0 && < 1.3, +- conduit >= 1.0 && < 1.3, - transformers >= 0.2 && < 0.5, ++ cereal >= 0.3 && < 0.6, ++ conduit >= 1.0 && < 1.4, + transformers >= 0.2 && < 0.6, resourcet if flag(conduit11) diff --git a/security/hs-crypto-numbers/Makefile b/security/hs-crypto-numbers/Makefile index 638ad2ade6f..158451c7766 100644 --- a/security/hs-crypto-numbers/Makefile +++ b/security/hs-crypto-numbers/Makefile @@ -2,7 +2,7 @@ PORTNAME= crypto-numbers PORTVERSION= 0.2.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org diff --git a/security/hs-crypto-pubkey-types/Makefile b/security/hs-crypto-pubkey-types/Makefile index b9bf2f1b09a..508aa9dbc14 100644 --- a/security/hs-crypto-pubkey-types/Makefile +++ b/security/hs-crypto-pubkey-types/Makefile @@ -2,7 +2,7 @@ PORTNAME= crypto-pubkey-types PORTVERSION= 0.4.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org diff --git a/security/hs-crypto-pubkey/Makefile b/security/hs-crypto-pubkey/Makefile index ee4b0e79b7f..1a8835aefcf 100644 --- a/security/hs-crypto-pubkey/Makefile +++ b/security/hs-crypto-pubkey/Makefile @@ -2,7 +2,7 @@ PORTNAME= crypto-pubkey PORTVERSION= 0.2.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org diff --git a/security/hs-crypto-random-api/Makefile b/security/hs-crypto-random-api/Makefile index 4e68a5b1dd4..84991955288 100644 --- a/security/hs-crypto-random-api/Makefile +++ b/security/hs-crypto-random-api/Makefile @@ -2,7 +2,7 @@ PORTNAME= crypto-random-api PORTVERSION= 0.2.0 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org diff --git a/security/hs-crypto-random/Makefile b/security/hs-crypto-random/Makefile index 8fe6dd89ee7..22861610790 100644 --- a/security/hs-crypto-random/Makefile +++ b/security/hs-crypto-random/Makefile @@ -2,7 +2,7 @@ PORTNAME= crypto-random PORTVERSION= 0.0.9 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org diff --git a/security/hs-cryptocipher/Makefile b/security/hs-cryptocipher/Makefile index e146fdd8a2f..5a3b8370b08 100644 --- a/security/hs-cryptocipher/Makefile +++ b/security/hs-cryptocipher/Makefile @@ -2,7 +2,7 @@ PORTNAME= cryptocipher PORTVERSION= 0.6.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org diff --git a/security/hs-cryptohash-conduit/Makefile b/security/hs-cryptohash-conduit/Makefile index cd7fa1c242b..c05ce32f33c 100644 --- a/security/hs-cryptohash-conduit/Makefile +++ b/security/hs-cryptohash-conduit/Makefile @@ -2,7 +2,7 @@ PORTNAME= cryptohash-conduit PORTVERSION= 0.1.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org diff --git a/security/hs-cryptohash-cryptoapi/Makefile b/security/hs-cryptohash-cryptoapi/Makefile index f58ed262c7a..54e43b123a1 100644 --- a/security/hs-cryptohash-cryptoapi/Makefile +++ b/security/hs-cryptohash-cryptoapi/Makefile @@ -2,7 +2,7 @@ PORTNAME= cryptohash-cryptoapi PORTVERSION= 0.1.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org diff --git a/security/hs-cryptohash-md5/Makefile b/security/hs-cryptohash-md5/Makefile index 7515d715a70..d68f8afe182 100644 --- a/security/hs-cryptohash-md5/Makefile +++ b/security/hs-cryptohash-md5/Makefile @@ -2,7 +2,7 @@ PORTNAME= cryptohash-md5 PORTVERSION= 0.11.100.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org diff --git a/security/hs-cryptohash-md5/files/patch-cryptohash-md5.cabal b/security/hs-cryptohash-md5/files/patch-cryptohash-md5.cabal new file mode 100644 index 00000000000..6281f57ac3e --- /dev/null +++ b/security/hs-cryptohash-md5/files/patch-cryptohash-md5.cabal @@ -0,0 +1,11 @@ +--- cryptohash-md5.cabal.orig 2018-04-11 18:11:29 UTC ++++ cryptohash-md5.cabal +@@ -41,7 +41,7 @@ source-repository head + + library + default-language: Haskell2010 +- build-depends: base >= 4.5 && < 4.10 ++ build-depends: base >= 4.5 && < 4.12 + , bytestring >= 0.9.2 && < 0.11 + + hs-source-dirs: src diff --git a/security/hs-cryptohash-sha1/Makefile b/security/hs-cryptohash-sha1/Makefile index ce84e626d9f..a1683c3a6d6 100644 --- a/security/hs-cryptohash-sha1/Makefile +++ b/security/hs-cryptohash-sha1/Makefile @@ -1,14 +1,14 @@ # $FreeBSD$ -PORTNAME= cryptohash-sha1 -PORTVERSION= 0.11.100.1 -PORTREVISION= 1 -CATEGORIES= security haskell +PORTNAME= cryptohash-sha1 +PORTVERSION= 0.11.100.1 +PORTREVISION= 2 +CATEGORIES= security haskell -MAINTAINER= haskell@FreeBSD.org -COMMENT= A practical incremental and one-pass, pure API to the SHA-1 hash algorithm +MAINTAINER= haskell@FreeBSD.org +COMMENT= A practical incremental and one-pass, pure API to the SHA-1 hash algorithm -LICENSE= BSD3CLAUSE +LICENSE= BSD3CLAUSE .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/security/hs-cryptohash-sha1/files/patch-cryptohash-sha1.cabal b/security/hs-cryptohash-sha1/files/patch-cryptohash-sha1.cabal new file mode 100644 index 00000000000..20e21c23933 --- /dev/null +++ b/security/hs-cryptohash-sha1/files/patch-cryptohash-sha1.cabal @@ -0,0 +1,11 @@ +--- cryptohash-sha1.cabal.orig 2018-04-13 20:05:39 UTC ++++ cryptohash-sha1.cabal +@@ -41,7 +41,7 @@ source-repository head + + library + default-language: Haskell2010 +- build-depends: base >= 4.5 && < 4.10 ++ build-depends: base >= 4.5 && < 4.12 + , bytestring >= 0.9.2 && < 0.11 + + hs-source-dirs: src diff --git a/security/hs-cryptohash-sha256/Makefile b/security/hs-cryptohash-sha256/Makefile index 8bbf09a1a02..ab9ccada5fd 100644 --- a/security/hs-cryptohash-sha256/Makefile +++ b/security/hs-cryptohash-sha256/Makefile @@ -1,14 +1,13 @@ # $FreeBSD$ -PORTNAME= cryptohash-sha256 -PORTVERSION= 0.11.100.1 -PORTREVISION= 1 -CATEGORIES= security haskell +PORTNAME= cryptohash-sha256 +PORTVERSION= 0.11.101.0 +CATEGORIES= security haskell -MAINTAINER= haskell@FreeBSD.org -COMMENT= A practical incremental and one-pass, pure API to the SHA-256 hash algorithm +MAINTAINER= haskell@FreeBSD.org +COMMENT= A practical incremental and one-pass, pure API to the SHA-256 hash algorithm -LICENSE= BSD3CLAUSE +LICENSE= BSD3CLAUSE .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/security/hs-cryptohash-sha256/distinfo b/security/hs-cryptohash-sha256/distinfo index d8533f99127..b65753b6feb 100644 --- a/security/hs-cryptohash-sha256/distinfo +++ b/security/hs-cryptohash-sha256/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499788695 -SHA256 (cabal/cryptohash-sha256-0.11.100.1.tar.gz) = 57b02338e9648639335788b422dd4c744543cb0991347472e2e3628a33c2f5d6 -SIZE (cabal/cryptohash-sha256-0.11.100.1.tar.gz) = 10885 +TIMESTAMP = 1523276193 +SHA256 (cabal/cryptohash-sha256-0.11.101.0.tar.gz) = 52756435dbea248e344fbcbcc5df5307f60dfacf337dfd11ae30f1c7a4da05dd +SIZE (cabal/cryptohash-sha256-0.11.101.0.tar.gz) = 14996 diff --git a/security/hs-cryptohash-sha256/files/patch-cryptohash-sha256.cabal b/security/hs-cryptohash-sha256/files/patch-cryptohash-sha256.cabal new file mode 100644 index 00000000000..e5291aadd36 --- /dev/null +++ b/security/hs-cryptohash-sha256/files/patch-cryptohash-sha256.cabal @@ -0,0 +1,11 @@ +--- cryptohash-sha256.cabal.orig 2018-04-09 12:20:11 UTC ++++ cryptohash-sha256.cabal +@@ -74,7 +74,7 @@ library + Trustworthy + Unsafe + +- build-depends: base >= 4.5 && < 4.11 ++ build-depends: base >= 4.5 && < 4.12 + , bytestring >= 0.9.2 && < 0.11 + + ghc-options: -Wall diff --git a/security/hs-cryptohash/Makefile b/security/hs-cryptohash/Makefile index c2e926e2ba9..8b90edda43e 100644 --- a/security/hs-cryptohash/Makefile +++ b/security/hs-cryptohash/Makefile @@ -2,7 +2,7 @@ PORTNAME= cryptohash PORTVERSION= 0.11.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org diff --git a/security/hs-cryptonite-conduit/Makefile b/security/hs-cryptonite-conduit/Makefile new file mode 100644 index 00000000000..159b1152997 --- /dev/null +++ b/security/hs-cryptonite-conduit/Makefile @@ -0,0 +1,15 @@ +# $FreeBSD$ + +PORTNAME= cryptonite-conduit +PORTVERSION= 0.2.2 +CATEGORIES= security haskell + +MAINTAINER= haskell@FreeBSD.org +COMMENT= Cryptonite conduit + +LICENSE= BSD3CLAUSE + +USE_CABAL= conduit conduit-extra cryptonite resourcet + +.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" +.include diff --git a/security/hs-cryptonite-conduit/distinfo b/security/hs-cryptonite-conduit/distinfo new file mode 100644 index 00000000000..a48f0765320 --- /dev/null +++ b/security/hs-cryptonite-conduit/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1525170379 +SHA256 (cabal/cryptonite-conduit-0.2.2.tar.gz) = 705d69ab3f79b7b8810c7b9e7da81a1c6686b6a4323b1e78150576a25a658dae +SIZE (cabal/cryptonite-conduit-0.2.2.tar.gz) = 5405 diff --git a/security/hs-cryptonite-conduit/pkg-descr b/security/hs-cryptonite-conduit/pkg-descr new file mode 100644 index 00000000000..e5ff652a3aa --- /dev/null +++ b/security/hs-cryptonite-conduit/pkg-descr @@ -0,0 +1,5 @@ +Conduit bridge for cryptonite. For now only provide a conduit version for +hash and hmac, but with contribution, this could provide cipher conduits too, +and probably other things. + +WWW: https://github.com/haskell-crypto/cryptonite-conduit diff --git a/security/hs-cryptonite/Makefile b/security/hs-cryptonite/Makefile index b63b15f7f22..b312be035b2 100644 --- a/security/hs-cryptonite/Makefile +++ b/security/hs-cryptonite/Makefile @@ -2,7 +2,7 @@ PORTNAME= cryptonite PORTVERSION= 0.24 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org diff --git a/security/hs-digest/Makefile b/security/hs-digest/Makefile index e7f7d86c63f..48f62f95124 100644 --- a/security/hs-digest/Makefile +++ b/security/hs-digest/Makefile @@ -2,7 +2,7 @@ PORTNAME= digest PORTVERSION= 0.0.1.2 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org diff --git a/security/hs-ed25519/Makefile b/security/hs-ed25519/Makefile index 4f0523c7c3c..1dff8274334 100644 --- a/security/hs-ed25519/Makefile +++ b/security/hs-ed25519/Makefile @@ -2,7 +2,7 @@ PORTNAME= ed25519 PORTVERSION= 0.0.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org diff --git a/security/hs-entropy/Makefile b/security/hs-entropy/Makefile index 47f5491b34b..31c2fef3b7b 100644 --- a/security/hs-entropy/Makefile +++ b/security/hs-entropy/Makefile @@ -2,7 +2,7 @@ PORTNAME= entropy PORTVERSION= 0.3.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org diff --git a/security/hs-gnutls/Makefile b/security/hs-gnutls/Makefile index 0341bedefbf..1be5f656983 100644 --- a/security/hs-gnutls/Makefile +++ b/security/hs-gnutls/Makefile @@ -2,7 +2,7 @@ PORTNAME= gnutls PORTVERSION= 0.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org diff --git a/security/hs-hackage-security/Makefile b/security/hs-hackage-security/Makefile index fe709a5206b..420fcf43936 100644 --- a/security/hs-hackage-security/Makefile +++ b/security/hs-hackage-security/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= hackage-security -PORTVERSION= 0.5.2.2 -PORTREVISION= 1 +PORTVERSION= 0.5.3.0 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,7 @@ COMMENT= The hackage security library provides both server and client utilities LICENSE= BSD3CLAUSE USE_CABAL= base16-bytestring base64-bytestring cryptohash-sha256 ed25519 \ - mtl network network-uri old-locale old-time parsec tar zlib + mtl network network-uri old-locale old-time tar zlib .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/security/hs-hackage-security/distinfo b/security/hs-hackage-security/distinfo index 4b6cc06aacb..877f03b7bcf 100644 --- a/security/hs-hackage-security/distinfo +++ b/security/hs-hackage-security/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499790857 -SHA256 (cabal/hackage-security-0.5.2.2.tar.gz) = 507a837851264a774c8f4d400f798c3dac5be11dc428fe72d33ef594ca533c41 -SIZE (cabal/hackage-security-0.5.2.2.tar.gz) = 83131 +TIMESTAMP = 1523300294 +SHA256 (cabal/hackage-security-0.5.3.0.tar.gz) = db986e17e9265aa9e40901690815b890b97d53159eb24d0a6cafaa7c18577c21 +SIZE (cabal/hackage-security-0.5.3.0.tar.gz) = 87119 diff --git a/security/hs-hackage-security/files/patch-hackage-security.cabal b/security/hs-hackage-security/files/patch-hackage-security.cabal deleted file mode 100644 index 9475199655e..00000000000 --- a/security/hs-hackage-security/files/patch-hackage-security.cabal +++ /dev/null @@ -1,10 +0,0 @@ ---- hackage-security.cabal.orig 2016-08-28 22:57:40 UTC -+++ hackage-security.cabal -@@ -101,7 +101,6 @@ library - bytestring >= 0.9 && < 0.11, - Cabal >= 1.14 && < 1.26, - containers >= 0.4 && < 0.6, -- directory >= 1.1.0.2 && < 1.3, - ed25519 >= 0.0 && < 0.1, - filepath >= 1.2 && < 1.5, - mtl >= 2.2 && < 2.3, diff --git a/security/hs-monadcryptorandom/Makefile b/security/hs-monadcryptorandom/Makefile index 8dba6f13d07..dc23feb8910 100644 --- a/security/hs-monadcryptorandom/Makefile +++ b/security/hs-monadcryptorandom/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= monadcryptorandom -PORTVERSION= 0.7.1 -PORTREVISION= 1 +PORTVERSION= 0.7.2.1 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org diff --git a/security/hs-monadcryptorandom/distinfo b/security/hs-monadcryptorandom/distinfo index 3aac0fe2783..fb7d523a0ae 100644 --- a/security/hs-monadcryptorandom/distinfo +++ b/security/hs-monadcryptorandom/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624172 -SHA256 (cabal/monadcryptorandom-0.7.1.tar.gz) = 85c37875743cd2357fba28d0bde3b06cd90f4f2d9770b8e0221e15258ac6b9e7 -SIZE (cabal/monadcryptorandom-0.7.1.tar.gz) = 4851 +TIMESTAMP = 1524150252 +SHA256 (cabal/monadcryptorandom-0.7.2.1.tar.gz) = 69453b6f8681033ff68a5afd410a336a37ff149de816439d5c49433d790a760d +SIZE (cabal/monadcryptorandom-0.7.2.1.tar.gz) = 4851 diff --git a/security/hs-nonce/Makefile b/security/hs-nonce/Makefile index 590180a706d..4bfe2e5c83a 100644 --- a/security/hs-nonce/Makefile +++ b/security/hs-nonce/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= nonce -PORTVERSION= 1.0.4 -PORTREVISION= 1 +PORTVERSION= 1.0.7 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,8 @@ COMMENT= Generate cryptographic nonces LICENSE= BSD3CLAUSE -USE_CABAL= base64-bytestring cprng-aes>=0.5 crypto-random entropy>=0.3.7 text>=0.9 +USE_CABAL= base64-bytestring cprng-aes>=0.5 crypto-random entropy>=0.3.7 \ + unliftio .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/security/hs-nonce/distinfo b/security/hs-nonce/distinfo index 9479c7ac43c..d82dcd87a28 100644 --- a/security/hs-nonce/distinfo +++ b/security/hs-nonce/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499537845 -SHA256 (cabal/nonce-1.0.4.tar.gz) = 51661ae3dda7263f1772d628f9a7c08a319dc221b3936ceabea3b2a50f086ef6 -SIZE (cabal/nonce-1.0.4.tar.gz) = 2788 +TIMESTAMP = 1523901488 +SHA256 (cabal/nonce-1.0.7.tar.gz) = 4b4f6232b2cb07a6de47a838b4dc35c346a745683866dbfc6ebb8682158037e1 +SIZE (cabal/nonce-1.0.7.tar.gz) = 2956 diff --git a/security/hs-pem/Makefile b/security/hs-pem/Makefile index 9a9039540c1..e936ef5254a 100644 --- a/security/hs-pem/Makefile +++ b/security/hs-pem/Makefile @@ -2,7 +2,7 @@ PORTNAME= pem PORTVERSION= 0.2.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org diff --git a/security/hs-pureMD5/Makefile b/security/hs-pureMD5/Makefile index 374de519494..67cf02343e3 100644 --- a/security/hs-pureMD5/Makefile +++ b/security/hs-pureMD5/Makefile @@ -2,7 +2,7 @@ PORTNAME= pureMD5 PORTVERSION= 2.1.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org diff --git a/security/hs-pwstore-fast/Makefile b/security/hs-pwstore-fast/Makefile index 775ec604e19..611630385c2 100644 --- a/security/hs-pwstore-fast/Makefile +++ b/security/hs-pwstore-fast/Makefile @@ -2,7 +2,7 @@ PORTNAME= pwstore-fast PORTVERSION= 2.4.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org diff --git a/security/hs-skein/Makefile b/security/hs-skein/Makefile index dc1de325c15..bc2a832c2ca 100644 --- a/security/hs-skein/Makefile +++ b/security/hs-skein/Makefile @@ -2,7 +2,7 @@ PORTNAME= skein PORTVERSION= 1.0.9.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org diff --git a/security/hs-tls-session-manager/Makefile b/security/hs-tls-session-manager/Makefile index a0d18b37b4d..2a9465adc0c 100644 --- a/security/hs-tls-session-manager/Makefile +++ b/security/hs-tls-session-manager/Makefile @@ -2,7 +2,7 @@ PORTNAME= tls-session-manager PORTVERSION= 0.0.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org diff --git a/security/hs-tls/Makefile b/security/hs-tls/Makefile index 3ebc0461dbe..5e0068478ae 100644 --- a/security/hs-tls/Makefile +++ b/security/hs-tls/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= tls -PORTVERSION= 1.3.11 -PORTREVISION= 1 +PORTVERSION= 1.4.1 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org diff --git a/security/hs-tls/distinfo b/security/hs-tls/distinfo index 44e95bcffc4..1919a625967 100644 --- a/security/hs-tls/distinfo +++ b/security/hs-tls/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499542268 -SHA256 (cabal/tls-1.3.11.tar.gz) = 3f008eb942874f8114f9a332f9669c44d72825ba39ce0fad89f0f8dfa6fb2703 -SIZE (cabal/tls-1.3.11.tar.gz) = 94342 +TIMESTAMP = 1524684486 +SHA256 (cabal/tls-1.4.1.tar.gz) = bbead1afc0b808bd5cff7bddaeae84ade37f18bbe72bd78d45a2fa4ac41908f8 +SIZE (cabal/tls-1.4.1.tar.gz) = 92647 diff --git a/security/hs-x509-store/Makefile b/security/hs-x509-store/Makefile index 0997ffb02e8..35ec208b1ee 100644 --- a/security/hs-x509-store/Makefile +++ b/security/hs-x509-store/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= x509-store -PORTVERSION= 1.6.2 -PORTREVISION= 1 +PORTVERSION= 1.6.6 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org diff --git a/security/hs-x509-store/distinfo b/security/hs-x509-store/distinfo index 701411ef031..4a0dc106d4d 100644 --- a/security/hs-x509-store/distinfo +++ b/security/hs-x509-store/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499594984 -SHA256 (cabal/x509-store-1.6.2.tar.gz) = 49fd261c7e55a45fd357931a6d9f81e22f242e6047304d3e2662e43db94d807b -SIZE (cabal/x509-store-1.6.2.tar.gz) = 4326 +TIMESTAMP = 1523784064 +SHA256 (cabal/x509-store-1.6.6.tar.gz) = 6a276f595cf91c9688129cad4c9c6be9c349ffc0de22300eeb3dfa6a2b6e7635 +SIZE (cabal/x509-store-1.6.6.tar.gz) = 10802 diff --git a/security/hs-x509-system/Makefile b/security/hs-x509-system/Makefile index ac2af610978..bf6f0655b5a 100644 --- a/security/hs-x509-system/Makefile +++ b/security/hs-x509-system/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= x509-system -PORTVERSION= 1.6.4 -PORTREVISION= 1 +PORTVERSION= 1.6.6 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org diff --git a/security/hs-x509-system/distinfo b/security/hs-x509-system/distinfo index f3cd52ac8b6..021da9b4fa3 100644 --- a/security/hs-x509-system/distinfo +++ b/security/hs-x509-system/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624174 -SHA256 (cabal/x509-system-1.6.4.tar.gz) = d98ef028855ad73a872ed86026f205aba383378bf1e63462c5d3e4733b60ff4c -SIZE (cabal/x509-system-1.6.4.tar.gz) = 3443 +TIMESTAMP = 1524253699 +SHA256 (cabal/x509-system-1.6.6.tar.gz) = 40dcdaae3ec67f38c08d96d4365b901eb8ac0c590bd7972eb429d37d58aa4419 +SIZE (cabal/x509-system-1.6.6.tar.gz) = 3419 diff --git a/security/hs-x509-validation/Makefile b/security/hs-x509-validation/Makefile index 16cc687bf64..de0d814b59e 100644 --- a/security/hs-x509-validation/Makefile +++ b/security/hs-x509-validation/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= x509-validation -PORTVERSION= 1.6.5 -PORTREVISION= 1 +PORTVERSION= 1.6.10 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org diff --git a/security/hs-x509-validation/distinfo b/security/hs-x509-validation/distinfo index 9216fb078f2..09ee09db3ff 100644 --- a/security/hs-x509-validation/distinfo +++ b/security/hs-x509-validation/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499594943 -SHA256 (cabal/x509-validation-1.6.5.tar.gz) = d1f73197677b6d19795fc80e4a1fa93e810d567ee4e3edc74e841b3eb20e1ca4 -SIZE (cabal/x509-validation-1.6.5.tar.gz) = 10370 +TIMESTAMP = 1524342266 +SHA256 (cabal/x509-validation-1.6.10.tar.gz) = 761c9d77322528259b690508e829cb360feb1fc542951a99f3af51ae980e45d7 +SIZE (cabal/x509-validation-1.6.10.tar.gz) = 19356 diff --git a/security/hs-x509/Makefile b/security/hs-x509/Makefile index 648cf5f4a69..30022923958 100644 --- a/security/hs-x509/Makefile +++ b/security/hs-x509/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= x509 -PORTVERSION= 1.6.5 -PORTREVISION= 1 +PORTVERSION= 1.7.3 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org diff --git a/security/hs-x509/distinfo b/security/hs-x509/distinfo index 0081dbdf0bd..6658040f2a5 100644 --- a/security/hs-x509/distinfo +++ b/security/hs-x509/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499543706 -SHA256 (cabal/x509-1.6.5.tar.gz) = b53894214e23ab2795f2a9f4c885e37b35a223bbc03763b0017ce06dc8394783 -SIZE (cabal/x509-1.6.5.tar.gz) = 16711 +TIMESTAMP = 1523638130 +SHA256 (cabal/x509-1.7.3.tar.gz) = 41740f949bb773dc721d342a85587a512658c81ee8cd38f102473b315e127356 +SIZE (cabal/x509-1.7.3.tar.gz) = 18386 diff --git a/security/nss/Makefile b/security/nss/Makefile index 364d5f84672..50805c2457c 100644 --- a/security/nss/Makefile +++ b/security/nss/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nss -PORTVERSION= 3.37 +PORTVERSION= 3.37.1 #DISTVERSIONSUFFIX= -with-ckbi-1.98 CATEGORIES= security MASTER_SITES= MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src diff --git a/security/nss/distinfo b/security/nss/distinfo index 25439bff3b3..4e772ac01a4 100644 --- a/security/nss/distinfo +++ b/security/nss/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1525452051 -SHA256 (nss-3.37.tar.gz) = 5821969e85d241833e96cb82bd4211ddea6d87003f2cccce25e0eab4aefa6268 -SIZE (nss-3.37.tar.gz) = 23027581 +TIMESTAMP = 1526459045 +SHA256 (nss-3.37.1.tar.gz) = 097b30e436479ad737b3703b25b6198b6513e202731085c6f097d8853dd20405 +SIZE (nss-3.37.1.tar.gz) = 23034142 diff --git a/security/rubygem-webpush/Makefile b/security/rubygem-webpush/Makefile index 69aeb13baee..f6e7ef5e351 100644 --- a/security/rubygem-webpush/Makefile +++ b/security/rubygem-webpush/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= webpush -PORTVERSION= 0.3.3 +PORTVERSION= 0.3.4 CATEGORIES= security rubygems MASTER_SITES= RG diff --git a/security/rubygem-webpush/distinfo b/security/rubygem-webpush/distinfo index 161197aba1e..9903188f3d1 100644 --- a/security/rubygem-webpush/distinfo +++ b/security/rubygem-webpush/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1510070653 -SHA256 (rubygem/webpush-0.3.3.gem) = d10a210eda9b4ff4cf7519abb994c0879d7ae44ad9d0379f63da3f4ba571bd57 -SIZE (rubygem/webpush-0.3.3.gem) = 13824 +TIMESTAMP = 1527275508 +SHA256 (rubygem/webpush-0.3.4.gem) = bb83e97114f3996ab0c8a1d435450a938668735b829da3b503daf6f897ae0a62 +SIZE (rubygem/webpush-0.3.4.gem) = 14336 diff --git a/shells/hs-shelly/Makefile b/shells/hs-shelly/Makefile index 687a2b83938..6917c435986 100644 --- a/shells/hs-shelly/Makefile +++ b/shells/hs-shelly/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= shelly -PORTVERSION= 1.6.8.3 -PORTREVISION= 1 +PORTVERSION= 1.7.2 CATEGORIES= shells haskell MAINTAINER= haskell@FreeBSD.org @@ -12,7 +11,7 @@ LICENSE= BSD3CLAUSE USE_CABAL= async enclosed-exceptions exceptions>=0.6 lifted-async \ lifted-base monad-control>=0.3.2 mtl>=2 system-fileio \ - system-filepath>=0.4.7 text transformers-base unix-compat + system-filepath>=0.4.7 transformers-base unix-compat .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/shells/hs-shelly/distinfo b/shells/hs-shelly/distinfo index a8e76eae885..073202b57b9 100644 --- a/shells/hs-shelly/distinfo +++ b/shells/hs-shelly/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624201 -SHA256 (cabal/shelly-1.6.8.3.tar.gz) = 78ae736c22455b40176b47003be4ea9ea2d02b440f921a1a022e8536833a8487 -SIZE (cabal/shelly-1.6.8.3.tar.gz) = 98086 +TIMESTAMP = 1524404401 +SHA256 (cabal/shelly-1.7.2.tar.gz) = 7662c746888a71f785fe00dde6940aeacdec6af700aec567493a99d8e31ef111 +SIZE (cabal/shelly-1.7.2.tar.gz) = 101946 diff --git a/sysutils/debhelper/Makefile b/sysutils/debhelper/Makefile index 4a179ca0ecc..41b40870f92 100644 --- a/sysutils/debhelper/Makefile +++ b/sysutils/debhelper/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= debhelper -PORTVERSION= 11.3.1 +PORTVERSION= 11.3.2 CATEGORIES= sysutils MASTER_SITES= DEBIAN DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/sysutils/debhelper/distinfo b/sysutils/debhelper/distinfo index e62d0e816cd..0a955f97c17 100644 --- a/sysutils/debhelper/distinfo +++ b/sysutils/debhelper/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1526972281 -SHA256 (debhelper_11.3.1.tar.xz) = d5e9b27d024980a3cdf3b65bab7029d940e8bb23366518005321fc798a7fcbe3 -SIZE (debhelper_11.3.1.tar.xz) = 463748 +TIMESTAMP = 1527232771 +SHA256 (debhelper_11.3.2.tar.xz) = 5470eae10edd70b9469f6b895ff17ccba5c76f9fd5b735765f5993d795fab6fa +SIZE (debhelper_11.3.2.tar.xz) = 463864 diff --git a/sysutils/hs-angel/Makefile b/sysutils/hs-angel/Makefile index c453d6d0048..c8224676db5 100644 --- a/sysutils/hs-angel/Makefile +++ b/sysutils/hs-angel/Makefile @@ -2,7 +2,7 @@ PORTNAME= angel PORTVERSION= 0.6.2 -PORTREVISION= 2 +PORTREVISION= 4 CATEGORIES= sysutils haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,7 @@ COMMENT= Process management and supervision daemon LICENSE= BSD3CLAUSE USE_CABAL= configurator>=0.1 mtl old-locale optparse-applicative \ - stm>=2.0 text>=0.11 unordered-containers>=0.1.4 + unordered-containers>=0.1.4 EXECUTABLE= angel diff --git a/sysutils/hs-cpu/Makefile b/sysutils/hs-cpu/Makefile index 16688066716..d8285271a16 100644 --- a/sysutils/hs-cpu/Makefile +++ b/sysutils/hs-cpu/Makefile @@ -2,7 +2,7 @@ PORTNAME= cpu PORTVERSION= 0.1.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= sysutils haskell MAINTAINER= haskell@FreeBSD.org diff --git a/sysutils/hs-disk-free-space/Makefile b/sysutils/hs-disk-free-space/Makefile index 06841e31f1b..4433e37b857 100644 --- a/sysutils/hs-disk-free-space/Makefile +++ b/sysutils/hs-disk-free-space/Makefile @@ -2,7 +2,7 @@ PORTNAME= disk-free-space PORTVERSION= 0.1.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils haskell MAINTAINER= haskell@FreeBSD.org diff --git a/sysutils/hs-ekg-core/Makefile b/sysutils/hs-ekg-core/Makefile index cb653f9476d..a419ab62ce8 100644 --- a/sysutils/hs-ekg-core/Makefile +++ b/sysutils/hs-ekg-core/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= ekg-core -PORTVERSION= 0.1.1.1 -PORTREVISION= 1 +PORTVERSION= 0.1.1.4 CATEGORIES= sysutils haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= Tracking of system metrics LICENSE= BSD3CLAUSE -USE_CABAL= text unordered-containers +USE_CABAL= unordered-containers .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/sysutils/hs-ekg-core/distinfo b/sysutils/hs-ekg-core/distinfo index b4761f240d9..c113e735dfa 100644 --- a/sysutils/hs-ekg-core/distinfo +++ b/sysutils/hs-ekg-core/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499538190 -SHA256 (cabal/ekg-core-0.1.1.1.tar.gz) = 54de3df4b1b027aa2f3760b64f6a8c8134f3275b6d95bf1cf1fc0e74282939d6 -SIZE (cabal/ekg-core-0.1.1.1.tar.gz) = 12426 +TIMESTAMP = 1523637800 +SHA256 (cabal/ekg-core-0.1.1.4.tar.gz) = 66d89acca05c1c91dc57a9c4b3f62d25ccd0c04bb2bfd46d5947f9b8cd8ee937 +SIZE (cabal/ekg-core-0.1.1.4.tar.gz) = 13252 diff --git a/sysutils/hs-ekg-core/files/patch-ekg-core.cabal b/sysutils/hs-ekg-core/files/patch-ekg-core.cabal new file mode 100644 index 00000000000..b5952457386 --- /dev/null +++ b/sysutils/hs-ekg-core/files/patch-ekg-core.cabal @@ -0,0 +1,11 @@ +--- ekg-core.cabal.orig 2018-04-13 16:45:53 UTC ++++ ekg-core.cabal +@@ -33,7 +33,7 @@ library + + build-depends: + ghc-prim < 0.6, +- base >= 4.5 && < 4.11, ++ base >= 4.5 && < 4.12, + containers >= 0.5 && < 0.6, + text < 1.3, + unordered-containers < 0.3 diff --git a/sysutils/hs-ekg-json/Makefile b/sysutils/hs-ekg-json/Makefile index 1ac3e196b7e..bb8ba279724 100644 --- a/sysutils/hs-ekg-json/Makefile +++ b/sysutils/hs-ekg-json/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= ekg-json -PORTVERSION= 0.1.0.5 -PORTREVISION= 1 +PORTVERSION= 0.1.0.6 CATEGORIES= sysutils haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= JSON encoding of ekg metrics LICENSE= BSD3CLAUSE -USE_CABAL= aeson ekg-core>=0.1 text unordered-containers +USE_CABAL= aeson ekg-core>=0.1 unordered-containers .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/sysutils/hs-ekg-json/distinfo b/sysutils/hs-ekg-json/distinfo index b5c864a8756..9f281afa82d 100644 --- a/sysutils/hs-ekg-json/distinfo +++ b/sysutils/hs-ekg-json/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499546477 -SHA256 (cabal/ekg-json-0.1.0.5.tar.gz) = 0cd5ecae57a156a5c779acff70d0fa3b02c52cb05283c0effb62a2902ebe8556 -SIZE (cabal/ekg-json-0.1.0.5.tar.gz) = 3092 +TIMESTAMP = 1524430137 +SHA256 (cabal/ekg-json-0.1.0.6.tar.gz) = 1e6a80aa0a28bbf41c9c6364cbb5731160d14fa54145f27a82d0b3467a04dd47 +SIZE (cabal/ekg-json-0.1.0.6.tar.gz) = 3094 diff --git a/sysutils/hs-ekg-json/files/patch-ekg-json.cabal b/sysutils/hs-ekg-json/files/patch-ekg-json.cabal new file mode 100644 index 00000000000..d3ae028c199 --- /dev/null +++ b/sysutils/hs-ekg-json/files/patch-ekg-json.cabal @@ -0,0 +1,13 @@ +--- ekg-json.cabal.orig 2018-04-22 20:52:14 UTC ++++ ekg-json.cabal +@@ -20,8 +20,8 @@ library + exposed-modules: + System.Metrics.Json + build-depends: +- aeson >=0.4 && < 1.3, +- base >= 4.5 && < 4.11, ++ aeson >=0.4 && < 1.4, ++ base >= 4.5 && < 4.12, + ekg-core >= 0.1 && < 0.2, + text < 1.3, + unordered-containers < 0.3 diff --git a/sysutils/hs-ekg/Makefile b/sysutils/hs-ekg/Makefile index e2b6b5fed0f..e55e130edfd 100644 --- a/sysutils/hs-ekg/Makefile +++ b/sysutils/hs-ekg/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= ekg -PORTVERSION= 0.4.0.13 -PORTREVISION= 1 +PORTVERSION= 0.4.0.15 CATEGORIES= sysutils haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,7 @@ COMMENT= Remote monitoring of processes LICENSE= BSD3CLAUSE USE_CABAL= aeson ekg-core>=0.1 ekg-json>=0.1 network snap-core \ - snap-server text unordered-containers + snap-server unordered-containers .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/sysutils/hs-ekg/distinfo b/sysutils/hs-ekg/distinfo index a35492f70bb..65a05039092 100644 --- a/sysutils/hs-ekg/distinfo +++ b/sysutils/hs-ekg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624252 -SHA256 (cabal/ekg-0.4.0.13.tar.gz) = 44b1d5987e8d8061aaf05fd96f9072399ba16b07999caf5186e856c7e47bb48f -SIZE (cabal/ekg-0.4.0.13.tar.gz) = 171231 +TIMESTAMP = 1525008611 +SHA256 (cabal/ekg-0.4.0.15.tar.gz) = 482ae3be495cfe4f03332ad1c79ce8b5ad4f9c8eec824980c664808ae32c6dcc +SIZE (cabal/ekg-0.4.0.15.tar.gz) = 171305 diff --git a/sysutils/hs-ekg/files/patch-ekg.cabal b/sysutils/hs-ekg/files/patch-ekg.cabal new file mode 100644 index 00000000000..ae5cd41e4ce --- /dev/null +++ b/sysutils/hs-ekg/files/patch-ekg.cabal @@ -0,0 +1,11 @@ +--- ekg.cabal.orig 2018-04-29 13:38:25 UTC ++++ ekg.cabal +@@ -39,7 +39,7 @@ library + System.Remote.Snap + + build-depends: +- aeson >= 0.4 && < 1.3, ++ aeson >= 0.4 && < 1.4, + base >= 4.5 && < 4.12, + bytestring < 1.0, + ekg-core >= 0.1 && < 0.2, diff --git a/sysutils/hs-mountpoints/Makefile b/sysutils/hs-mountpoints/Makefile index 8fa735387a8..6796ef37302 100644 --- a/sysutils/hs-mountpoints/Makefile +++ b/sysutils/hs-mountpoints/Makefile @@ -2,7 +2,7 @@ PORTNAME= mountpoints PORTVERSION= 1.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils haskell MAINTAINER= haskell@FreeBSD.org diff --git a/sysutils/mcelog/Makefile b/sysutils/mcelog/Makefile index 725d65c68fc..04773507185 100644 --- a/sysutils/mcelog/Makefile +++ b/sysutils/mcelog/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mcelog -PORTVERSION= 157 +PORTVERSION= 158 DISTVERSIONPREFIX= v CATEGORIES= sysutils diff --git a/sysutils/mcelog/distinfo b/sysutils/mcelog/distinfo index 64e308e24ce..1926be100c5 100644 --- a/sysutils/mcelog/distinfo +++ b/sysutils/mcelog/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1521503468 -SHA256 (andikleen-mcelog-v157_GH0.tar.gz) = bd0af97f0a2d7509d3872c1597b24ba5d6433c15df390a9849a7ba79f4832bdb -SIZE (andikleen-mcelog-v157_GH0.tar.gz) = 297194 +TIMESTAMP = 1527287916 +SHA256 (andikleen-mcelog-v158_GH0.tar.gz) = 4736ec895e9bbe62e9189557fb2dd023d9509e116194783b895d2ecc71fa9c86 +SIZE (andikleen-mcelog-v158_GH0.tar.gz) = 298117 diff --git a/sysutils/mcelog/files/patch-memdb.c b/sysutils/mcelog/files/patch-memdb.c index 30e94d37da9..44173d64bf6 100644 --- a/sysutils/mcelog/files/patch-memdb.c +++ b/sysutils/mcelog/files/patch-memdb.c @@ -1,11 +1,11 @@ ---- memdb.c.orig 2016-02-10 18:38:43 UTC +--- memdb.c.orig 2018-05-22 17:06:36 UTC +++ memdb.c -@@ -172,7 +172,9 @@ void memdb_trigger(char *msg, struct mem - asprintf(&env[ei++], "THRESHOLD_COUNT=%d", bucket->count); +@@ -172,7 +172,9 @@ void memdb_trigger(char *msg, struct memdimm *md, tim + xasprintf(&env[ei++], "THRESHOLD_COUNT=%d", bucket->count); env[ei] = NULL; assert(ei < MAX_ENV); +#ifdef __Linux__ - run_trigger(bc->trigger, NULL, env); + run_trigger(bc->trigger, args, env, sync); +#endif for (i = 0; i < ei; i++) free(env[i]); diff --git a/sysutils/munin-node/Makefile b/sysutils/munin-node/Makefile index 676ffd03fe6..c98f982af3b 100644 --- a/sysutils/munin-node/Makefile +++ b/sysutils/munin-node/Makefile @@ -3,7 +3,7 @@ PORTNAME= munin PORTVERSION= ${MUNIN_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils perl5 MASTER_SITES= ${MUNIN_SITES} PKGNAMESUFFIX= -node @@ -20,6 +20,7 @@ RUN_DEPENDS= p5-Cache-Cache>=0:devel/p5-Cache-Cache \ p5-DateTime-HiRes>=0:devel/p5-DateTime-HiRes \ munin-common>=${MUNIN_VERSION}:sysutils/munin-common \ p5-Net-Server>=0:net/p5-Net-Server \ + p5-List-MoreUtils>0:lang/p5-List-MoreUtils \ p5-Net-CIDR>=0:net-mgmt/p5-Net-CIDR \ p5-libwww>=0:www/p5-libwww \ bash:shells/bash diff --git a/sysutils/plasma5-kde-cli-tools/Makefile b/sysutils/plasma5-kde-cli-tools/Makefile index ee2880d78bf..88128e336ce 100644 --- a/sysutils/plasma5-kde-cli-tools/Makefile +++ b/sysutils/plasma5-kde-cli-tools/Makefile @@ -5,7 +5,9 @@ DISTVERSION= ${KDE_PLASMA_VERSION} CATEGORIES= sysutils kde kde-plasma MAINTAINER= kde@FreeBSD.org -COMMENT= Plasma5 non-interactive system tools +COMMENT= Plasma5 non-interactive system tools + +CONFLICTS_INSTALL= kde-runtime-kde4 USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 tar:xz USE_KDE= activities auth bookmarks codecs completion config configwidgets \ diff --git a/sysutils/pslist/Makefile b/sysutils/pslist/Makefile index 33267dcca3d..dcbb8d55ca0 100644 --- a/sysutils/pslist/Makefile +++ b/sysutils/pslist/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pslist -PORTVERSION= 1.3.1 +PORTVERSION= 1.4.0 CATEGORIES= sysutils MASTER_SITES= http://devel.ringlet.net/files/sys/pslist/ diff --git a/sysutils/pslist/distinfo b/sysutils/pslist/distinfo index 6daeb72f410..680ad839c13 100644 --- a/sysutils/pslist/distinfo +++ b/sysutils/pslist/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1477825510 -SHA256 (pslist-1.3.1.tar.gz) = 216fa241283d83897c1ab24c1eac025bc0fdc9900760a410cb3b3e4428fe18ef -SIZE (pslist-1.3.1.tar.gz) = 8355 +TIMESTAMP = 1527357172 +SHA256 (pslist-1.4.0.tar.gz) = b37a0e060e8d6692930178e42164ef23c0b8d4660b3ddf9a323c5388a8d4e67d +SIZE (pslist-1.4.0.tar.gz) = 9468 diff --git a/sysutils/rsyslog8/Makefile b/sysutils/rsyslog8/Makefile index e90fea10115..cf5b5b39c71 100644 --- a/sysutils/rsyslog8/Makefile +++ b/sysutils/rsyslog8/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= rsyslog -PORTVERSION= 8.34.0 +PORTVERSION= 8.35.0 CATEGORIES= sysutils MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ @@ -17,11 +17,11 @@ LIB_DEPENDS= libee.so:devel/libee \ liblogging-stdlog.so:devel/liblogging \ libuuid.so:misc/e2fsprogs-libuuid \ libcurl.so:ftp/curl -BUILD_DEPENDS= rst2man:textproc/py-docutils +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR} PORTSCOUT= limit:^8\. -USES= libtool pkgconfig autoreconf +USES= libtool pkgconfig autoreconf python:env USE_LDCONFIG= yes diff --git a/sysutils/rsyslog8/distinfo b/sysutils/rsyslog8/distinfo index 72fd7707964..86d0bca26bd 100644 --- a/sysutils/rsyslog8/distinfo +++ b/sysutils/rsyslog8/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1522926631 -SHA256 (rsyslog-8.34.0.tar.gz) = 18330a9764c55d2501b847aad267292bd96c2b12fa5c3b92909bd8d4563c80a9 -SIZE (rsyslog-8.34.0.tar.gz) = 2545544 +TIMESTAMP = 1526620739 +SHA256 (rsyslog-8.35.0.tar.gz) = d216a7f7c88341d5964657e61a33193c13d884c988822fced9fce3ab0b1f1082 +SIZE (rsyslog-8.35.0.tar.gz) = 2590108 diff --git a/sysutils/rsyslog8/pkg-plist b/sysutils/rsyslog8/pkg-plist index 33290402ed3..3c4583369a4 100644 --- a/sysutils/rsyslog8/pkg-plist +++ b/sysutils/rsyslog8/pkg-plist @@ -1,3 +1,4 @@ +lib/rsyslog/fmhash.so lib/rsyslog/fmhttp.so lib/rsyslog/im3195.so lib/rsyslog/imdiag.so diff --git a/sysutils/smenu/Makefile b/sysutils/smenu/Makefile index 33fda13d6e8..4f555e89ebf 100644 --- a/sysutils/smenu/Makefile +++ b/sysutils/smenu/Makefile @@ -2,8 +2,7 @@ PORTNAME= smenu DISTVERSIONPREFIX= v -DISTVERSION= 0.9.12-7 -DISTVERSIONSUFFIX= -g0ff0326 +DISTVERSION= 0.9.13 CATEGORIES= sysutils MAINTAINER= dbaio@FreeBSD.org diff --git a/sysutils/smenu/distinfo b/sysutils/smenu/distinfo index 3cecabee4e0..76548a9180f 100644 --- a/sysutils/smenu/distinfo +++ b/sysutils/smenu/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523878639 -SHA256 (p-gen-smenu-v0.9.12-7-g0ff0326_GH0.tar.gz) = 1c3379f0c7ae1d737d78690e0ad461dfd2a590fa57a1beab592d563337079914 -SIZE (p-gen-smenu-v0.9.12-7-g0ff0326_GH0.tar.gz) = 647119 +TIMESTAMP = 1527356759 +SHA256 (p-gen-smenu-v0.9.13_GH0.tar.gz) = 85a829aba2dd77676d7b5d542482762625bc8499df8abba22d6ab0689090870a +SIZE (p-gen-smenu-v0.9.13_GH0.tar.gz) = 680895 diff --git a/sysutils/xin/Makefile b/sysutils/xin/Makefile index 9c5b156ba49..bd3904edcab 100644 --- a/sysutils/xin/Makefile +++ b/sysutils/xin/Makefile @@ -10,6 +10,9 @@ MASTER_SITES= SUNSITE/utils/file MAINTAINER= ports@FreeBSD.org COMMENT= Splits standard input and pipes into a command +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + GNU_CONFIGURE= yes PLIST_FILES= bin/xin man/man1/xin.1.gz diff --git a/sysutils/xin/pkg-descr b/sysutils/xin/pkg-descr index 7f827b32adf..8d9795cc39d 100644 --- a/sysutils/xin/pkg-descr +++ b/sysutils/xin/pkg-descr @@ -2,4 +2,4 @@ Xin reads from standard input and splits the data up into sections, piping each section to a separate command. Optionally it can pad each section with zeros. -WWW: http://www.kyne.com.au/~mark/software/xin.php +WWW: https://www.kyne.com.au/~mark/software/xin.php diff --git a/textproc/Makefile b/textproc/Makefile index a47159d333e..b3b720b6c89 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -261,6 +261,7 @@ SUBDIR += hs-case-insensitive SUBDIR += hs-cassava SUBDIR += hs-cmark + SUBDIR += hs-cmark-gfm SUBDIR += hs-csv SUBDIR += hs-doctemplates SUBDIR += hs-double-conversion @@ -281,7 +282,6 @@ SUBDIR += hs-pandoc SUBDIR += hs-pandoc-citeproc SUBDIR += hs-pandoc-types - SUBDIR += hs-parsec SUBDIR += hs-polyparse SUBDIR += hs-pretty-show SUBDIR += hs-regex-applicative @@ -295,6 +295,7 @@ SUBDIR += hs-rfc5051 SUBDIR += hs-scanner SUBDIR += hs-skylighting + SUBDIR += hs-skylighting-core SUBDIR += hs-stringsearch SUBDIR += hs-tagsoup SUBDIR += hs-tagstream-conduit @@ -302,6 +303,7 @@ SUBDIR += hs-uri SUBDIR += hs-uri-bytestring SUBDIR += hs-uri-bytestring-aeson + SUBDIR += hs-uri-encode SUBDIR += hs-xml SUBDIR += hs-xml-conduit SUBDIR += hs-xml-hamlet diff --git a/textproc/cgrep/Makefile b/textproc/cgrep/Makefile index 98f8b8cfc79..5d9f63b5cbd 100644 --- a/textproc/cgrep/Makefile +++ b/textproc/cgrep/Makefile @@ -2,9 +2,7 @@ # $FreeBSD$ PORTNAME= cgrep -PORTVERSION= 6.4.3 -PORTREVISION= 1 -DISTVERSIONPREFIX= v +PORTVERSION= 6.6.25 CATEGORIES= textproc MAINTAINER= lwhsu@FreeBSD.org @@ -12,29 +10,12 @@ COMMENT= Context-aware grep for source codes LICENSE= GPLv2 -BUILD_DEPENDS= ghc:lang/ghc \ - hs-ansi-terminal>=0.5:devel/hs-ansi-terminal \ - hs-cmdargs>=0.10:devel/hs-cmdargs \ - hs-dlist>=0.3:devel/hs-dlist \ - hs-regex-posix>=0.90:textproc/hs-regex-posix \ - hs-safe>=0.3:devel/hs-safe \ - hs-split>=0.2:devel/hs-split \ - hs-stm>=2.1:devel/hs-stm \ - hs-stringsearch>=0.3:textproc/hs-stringsearch \ - hs-unordered-containers>=0.1:devel/hs-unordered-containers +USE_CABAL= aeson ansi-terminal async cmdargs either exceptions regex-pcre \ + regex-posix safe split stringsearch unicode-show unix-compat \ + utf8-string yaml -USE_GITHUB= yes -GH_ACCOUNT= awgn - -USES= gmake - -do-build: - cd ${WRKSRC}/src && ${GMAKE} cgrep - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/cgrep ${STAGEDIR}${PREFIX}/bin/ - - ${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/cgreprc ${STAGEDIR}${DATADIR} +EXECUTABLE= cgrep +STANDALONE= yes +.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/textproc/cgrep/distinfo b/textproc/cgrep/distinfo index 5d4d9aa6de6..e43fba0c142 100644 --- a/textproc/cgrep/distinfo +++ b/textproc/cgrep/distinfo @@ -1,2 +1,3 @@ -SHA256 (awgn-cgrep-v6.4.3_GH0.tar.gz) = 65cd59f50de4e1865cd39d198da21beb76ba898d859d07718e6605f7ff33ae78 -SIZE (awgn-cgrep-v6.4.3_GH0.tar.gz) = 33419 +TIMESTAMP = 1525721128 +SHA256 (cabal/cgrep-6.6.25.tar.gz) = 9c5ef414859b13b207e1b0867428ce159927868c9b28446c28013d5996f05931 +SIZE (cabal/cgrep-6.6.25.tar.gz) = 34671 diff --git a/textproc/cgrep/files/patch-src_Main.hs b/textproc/cgrep/files/patch-src_Main.hs deleted file mode 100644 index 08eb8a0f328..00000000000 --- a/textproc/cgrep/files/patch-src_Main.hs +++ /dev/null @@ -1,32 +0,0 @@ -Backport of: -From 2f787c5c1ba42ccee2f1ced759b3a4570afa9b28 Mon Sep 17 00:00:00 2001 -From: ilovezfs -Date: Mon, 23 May 2016 03:53:52 -0700 -Subject: [PATCH] cgrep: fix isSymbolicLink collision - -System.Directory.isSymbolicLink collides with -System.PosixCompat.Files.isSymbolicLink (and with -System.Posix.Files.isSymbolicLink) - -This applies the solution proposed here: -https://github.com/haskell/directory/issues/52#issuecomment-220879392 ---- src/Main.hs.orig 2014-06-21 09:27:05 UTC -+++ src/Main.hs -@@ -37,7 +37,7 @@ import System.Console.CmdArgs - import System.Directory - import System.FilePath ((), takeFileName) - import System.Environment --import System.Posix.Files -+import System.Posix.Files as PosixFiles - import System.IO - import System.Exit - -@@ -67,7 +67,7 @@ putRecursiveContents opts inchan topdir langs prunedir - status <- getFileStatus path - lstatus <- getSymbolicLinkStatus path - unless (cpath `Set.member` visited) $ -- if isDirectory status && (not (isSymbolicLink lstatus) || deference_recursive opts) -+ if isDirectory status && (not (PosixFiles.isSymbolicLink lstatus) || deference_recursive opts) - then unless (filename `elem` prunedir) $ - putRecursiveContents opts inchan path langs prunedir (Set.insert cpath visited) - else case getLang opts filename >>= (\f -> f `elemIndex` langs <|> toMaybe 0 (null langs) ) of diff --git a/textproc/cgrep/pkg-plist b/textproc/cgrep/pkg-plist deleted file mode 100644 index 0f919920f36..00000000000 --- a/textproc/cgrep/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -bin/cgrep -%%DATADIR%%/cgreprc diff --git a/textproc/hs-Diff/Makefile b/textproc/hs-Diff/Makefile index 8c790c23be3..8cf0212a1ca 100644 --- a/textproc/hs-Diff/Makefile +++ b/textproc/hs-Diff/Makefile @@ -3,7 +3,7 @@ PORTNAME= Diff PORTVERSION= 0.3.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-HStringTemplate/Makefile b/textproc/hs-HStringTemplate/Makefile index f75c25a4d74..328975c204f 100644 --- a/textproc/hs-HStringTemplate/Makefile +++ b/textproc/hs-HStringTemplate/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= HStringTemplate -PORTVERSION= 0.8.6 -PORTREVISION= 1 +PORTVERSION= 0.8.7 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= StringTemplate implementation in Haskell LICENSE= BSD3CLAUSE -USE_CABAL= blaze-builder mtl old-locale parsec syb text void +USE_CABAL= blaze-builder mtl old-locale syb void .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/textproc/hs-HStringTemplate/distinfo b/textproc/hs-HStringTemplate/distinfo index a37a85f9601..1dc0b669400 100644 --- a/textproc/hs-HStringTemplate/distinfo +++ b/textproc/hs-HStringTemplate/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499538746 -SHA256 (cabal/HStringTemplate-0.8.6.tar.gz) = 7022cb9c1e1c223cfb8adf5ca6994b9f4709399ae197cb7541247c0b5d0255cd -SIZE (cabal/HStringTemplate-0.8.6.tar.gz) = 16034 +TIMESTAMP = 1523960618 +SHA256 (cabal/HStringTemplate-0.8.7.tar.gz) = 4f4ea4aa2e45e7c45821b87b0105c201fbadebc2f2d00c211e728403a0af6b0e +SIZE (cabal/HStringTemplate-0.8.7.tar.gz) = 15903 diff --git a/textproc/hs-HaXml/Makefile b/textproc/hs-HaXml/Makefile index 2022a6e00e2..8643f3e628f 100644 --- a/textproc/hs-HaXml/Makefile +++ b/textproc/hs-HaXml/Makefile @@ -16,5 +16,7 @@ USE_CABAL= polyparse>=1.10 random EXECUTABLE= Canonicalise CanonicaliseLazy DtdToHaskell FpMLToHaskell \ MkOneOf Validate XsdToHaskell Xtract +IGNORE= Doesn't build with recent GHC version + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/textproc/hs-appar/Makefile b/textproc/hs-appar/Makefile index ed360a8ae60..a9c28abe7b2 100644 --- a/textproc/hs-appar/Makefile +++ b/textproc/hs-appar/Makefile @@ -2,7 +2,7 @@ PORTNAME= appar PORTVERSION= 0.1.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-attoparsec-enumerator/Makefile b/textproc/hs-attoparsec-enumerator/Makefile index 0ea6713134f..f2881b760c9 100644 --- a/textproc/hs-attoparsec-enumerator/Makefile +++ b/textproc/hs-attoparsec-enumerator/Makefile @@ -2,7 +2,7 @@ PORTNAME= attoparsec-enumerator PORTVERSION= 0.3.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,7 @@ COMMENT= Pass input from an enumerator to an Attoparsec parser LICENSE= MIT -USE_CABAL= attoparsec>=0.10 enumerator>=0.4 text +USE_CABAL= attoparsec>=0.10 enumerator>=0.4 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/textproc/hs-attoparsec-iso8601/Makefile b/textproc/hs-attoparsec-iso8601/Makefile index 6f286942baa..5c0afebf846 100644 --- a/textproc/hs-attoparsec-iso8601/Makefile +++ b/textproc/hs-attoparsec-iso8601/Makefile @@ -2,7 +2,7 @@ PORTNAME= attoparsec-iso8601 PORTVERSION= 1.0.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,7 @@ COMMENT= Parsing of ISO 8601 dates LICENSE= BSD3CLAUSE -USE_CABAL= attoparsec base-compat text +USE_CABAL= attoparsec base-compat .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/textproc/hs-attoparsec-iso8601/files/patch-attoparsec-iso8601.cabal b/textproc/hs-attoparsec-iso8601/files/patch-attoparsec-iso8601.cabal new file mode 100644 index 00000000000..a8a48a468b5 --- /dev/null +++ b/textproc/hs-attoparsec-iso8601/files/patch-attoparsec-iso8601.cabal @@ -0,0 +1,10 @@ +--- attoparsec-iso8601.cabal.orig 2018-04-29 20:25:05 UTC ++++ attoparsec-iso8601.cabal +@@ -37,7 +37,7 @@ library + build-depends: + attoparsec >= 0.13.0.1, + base >= 4.5 && < 5, +- base-compat >= 0.9.1 && < 0.10, ++ base-compat >= 0.9.1 && < 0.11, + text >= 1.1.1.0, + time >= 1.1.1.4 diff --git a/textproc/hs-attoparsec/Makefile b/textproc/hs-attoparsec/Makefile index b8d2fcad5c5..204e0611b19 100644 --- a/textproc/hs-attoparsec/Makefile +++ b/textproc/hs-attoparsec/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= attoparsec -PORTVERSION= 0.13.1.0 -PORTREVISION= 1 +PORTVERSION= 0.13.2.2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= Fast combinator parsing for bytestrings and text LICENSE= BSD3CLAUSE -USE_CABAL= scientific text +USE_CABAL= scientific .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/textproc/hs-attoparsec/distinfo b/textproc/hs-attoparsec/distinfo index d3dbac0e256..6228a54fcd8 100644 --- a/textproc/hs-attoparsec/distinfo +++ b/textproc/hs-attoparsec/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499537691 -SHA256 (cabal/attoparsec-0.13.1.0.tar.gz) = 52dc74d4955e457ce4f76f5c9d6dba05c1d07e2cd2a542d6251c6dbc66ce3f64 -SIZE (cabal/attoparsec-0.13.1.0.tar.gz) = 159512 +TIMESTAMP = 1523636401 +SHA256 (cabal/attoparsec-0.13.2.2.tar.gz) = dd93471eb969172cc4408222a3842d867adda3dd7fb39ad8a4df1b121a67d848 +SIZE (cabal/attoparsec-0.13.2.2.tar.gz) = 159729 diff --git a/textproc/hs-bencode/Makefile b/textproc/hs-bencode/Makefile index 579b1c5cee8..c57b915c428 100644 --- a/textproc/hs-bencode/Makefile +++ b/textproc/hs-bencode/Makefile @@ -2,7 +2,7 @@ PORTNAME= bencode PORTVERSION= 0.6.0.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,5 @@ COMMENT= Parser and printer for bencoded data LICENSE= BSD3CLAUSE -USE_CABAL= parsec - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/textproc/hs-blaze-html/Makefile b/textproc/hs-blaze-html/Makefile index 3608446850d..cf9623e9d39 100644 --- a/textproc/hs-blaze-html/Makefile +++ b/textproc/hs-blaze-html/Makefile @@ -2,7 +2,7 @@ PORTNAME= blaze-html PORTVERSION= 0.9.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,7 @@ COMMENT= Blazingly fast HTML combinator library for Haskell LICENSE= BSD3CLAUSE -USE_CABAL= blaze-builder>=0.3 blaze-markup>=0.7 text>=0.10 +USE_CABAL= blaze-builder>=0.3 blaze-markup>=0.7 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/textproc/hs-blaze-markup/Makefile b/textproc/hs-blaze-markup/Makefile index 9731ed79fbe..4be6ab04000 100644 --- a/textproc/hs-blaze-markup/Makefile +++ b/textproc/hs-blaze-markup/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= blaze-markup -PORTVERSION= 0.8.0.0 -PORTREVISION= 1 +PORTVERSION= 0.8.2.1 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= Blazingly fast markup combinator library for Haskell LICENSE= BSD3CLAUSE -USE_CABAL= blaze-builder>=0.2 text>=0.10 +USE_CABAL= blaze-builder>=0.2 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/textproc/hs-blaze-markup/distinfo b/textproc/hs-blaze-markup/distinfo index 916db7997db..c4ac9329c37 100644 --- a/textproc/hs-blaze-markup/distinfo +++ b/textproc/hs-blaze-markup/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624825 -SHA256 (cabal/blaze-markup-0.8.0.0.tar.gz) = 19e1cbb9303803273ed7f9fcf3b8b6938578afbed2bfafe5ea9fcc6d743f540f -SIZE (cabal/blaze-markup-0.8.0.0.tar.gz) = 14054 +TIMESTAMP = 1523696236 +SHA256 (cabal/blaze-markup-0.8.2.1.tar.gz) = 90ab7cbc29df9fbe24e208ade58ca9828e3074f1163618f1faaf4da8f0600146 +SIZE (cabal/blaze-markup-0.8.2.1.tar.gz) = 14320 diff --git a/textproc/hs-bytestring-csv/Makefile b/textproc/hs-bytestring-csv/Makefile index 8a693213ce5..a22dcb9f265 100644 --- a/textproc/hs-bytestring-csv/Makefile +++ b/textproc/hs-bytestring-csv/Makefile @@ -3,7 +3,7 @@ PORTNAME= bytestring-csv PORTVERSION= 0.1.2 -PORTREVISION= 20 +PORTREVISION= 21 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-case-insensitive/Makefile b/textproc/hs-case-insensitive/Makefile index 8cdbdb9784e..ef439292806 100644 --- a/textproc/hs-case-insensitive/Makefile +++ b/textproc/hs-case-insensitive/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= case-insensitive -PORTVERSION= 1.2.0.10 -PORTREVISION= 1 +PORTVERSION= 1.2.0.11 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= Case-insensitive string comparison LICENSE= BSD3CLAUSE -USE_CABAL= hashable>=1.0 text>=0.3 +USE_CABAL= hashable>=1.0 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/textproc/hs-case-insensitive/distinfo b/textproc/hs-case-insensitive/distinfo index 98fbd8a5104..008d7b75f2e 100644 --- a/textproc/hs-case-insensitive/distinfo +++ b/textproc/hs-case-insensitive/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499445486 -SHA256 (cabal/case-insensitive-1.2.0.10.tar.gz) = 66321c40fffb35f3a3188ba508753b74aada53fb51c822a9752614b03765306c -SIZE (cabal/case-insensitive-1.2.0.10.tar.gz) = 53630 +TIMESTAMP = 1523428332 +SHA256 (cabal/case-insensitive-1.2.0.11.tar.gz) = a7ce6d17e50caaa0f19ad8e67361499022860554c521b1e57993759da3eb37e3 +SIZE (cabal/case-insensitive-1.2.0.11.tar.gz) = 53581 diff --git a/textproc/hs-cassava/Makefile b/textproc/hs-cassava/Makefile index 0de035ad56f..2655670f293 100644 --- a/textproc/hs-cassava/Makefile +++ b/textproc/hs-cassava/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= cassava -PORTVERSION= 0.5.0.0 -PORTREVISION= 1 +PORTVERSION= 0.5.1.0 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= CSV parsing and encoding library LICENSE= BSD3CLAUSE -USE_CABAL= attoparsec blaze-builder hashable Only text text-short \ +USE_CABAL= attoparsec blaze-builder hashable Only text-short \ unordered-containers vector .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" diff --git a/textproc/hs-cassava/distinfo b/textproc/hs-cassava/distinfo index 52788632d2d..ed05e311c6c 100644 --- a/textproc/hs-cassava/distinfo +++ b/textproc/hs-cassava/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499538420 -SHA256 (cabal/cassava-0.5.0.0.tar.gz) = 847e4b09860e9721c1436ae48a9db89fff119c7b43c696997c18592ca86fbeb9 -SIZE (cabal/cassava-0.5.0.0.tar.gz) = 33476 +TIMESTAMP = 1524429884 +SHA256 (cabal/cassava-0.5.1.0.tar.gz) = 762c8aaea2cdad61f52bad1b9f1f3b32764b4b6da03371aba6e5017f69614277 +SIZE (cabal/cassava-0.5.1.0.tar.gz) = 37603 diff --git a/textproc/hs-cmark-gfm/Makefile b/textproc/hs-cmark-gfm/Makefile new file mode 100644 index 00000000000..13b6c63d309 --- /dev/null +++ b/textproc/hs-cmark-gfm/Makefile @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTNAME= cmark-gfm +PORTVERSION= 0.1.3 +CATEGORIES= textproc haskell + +MAINTAINER= haskell@FreeBSD.org +COMMENT= Fast, accurate GitHub Flavored Markdown parser and renderer + +LICENSE= BSD3CLAUSE + +.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" +.include diff --git a/textproc/hs-cmark-gfm/distinfo b/textproc/hs-cmark-gfm/distinfo new file mode 100644 index 00000000000..6990da174bc --- /dev/null +++ b/textproc/hs-cmark-gfm/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1524942342 +SHA256 (cabal/cmark-gfm-0.1.3.tar.gz) = 731cb392e4edfd18d0dae709904791610588e6770934e5112cbdd5e6f3d271ba +SIZE (cabal/cmark-gfm-0.1.3.tar.gz) = 198348 diff --git a/textproc/hs-cmark-gfm/pkg-descr b/textproc/hs-cmark-gfm/pkg-descr new file mode 100644 index 00000000000..f97d0a0a426 --- /dev/null +++ b/textproc/hs-cmark-gfm/pkg-descr @@ -0,0 +1,6 @@ +This package provides Haskell bindings for libcmark-gfm, the reference parser +for GitHub Flavored Markdown, a fully specified variant of Markdown. It +includes sources for libcmark-gfm (0.28.0) and does not require prior +installation of the C library. + +WWW: https://github.com/kivikakk/cmark-gfm-hs diff --git a/textproc/hs-cmark/Makefile b/textproc/hs-cmark/Makefile index 05a3857ef69..1f1e39068ed 100644 --- a/textproc/hs-cmark/Makefile +++ b/textproc/hs-cmark/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= cmark -PORTVERSION= 0.5.5.1 -PORTREVISION= 1 +PORTVERSION= 0.5.6 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,5 @@ COMMENT= Fast, accurate CommonMark (Markdown) parser and renderer LICENSE= BSD3CLAUSE -USE_CABAL= text>=1.0 - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/textproc/hs-cmark/distinfo b/textproc/hs-cmark/distinfo index 0315db4a382..8f26ebf8bb9 100644 --- a/textproc/hs-cmark/distinfo +++ b/textproc/hs-cmark/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499448212 -SHA256 (cabal/cmark-0.5.5.1.tar.gz) = 62b461f2ab0a611f0a88325c98f11c053a356d94e877b5efed564abb4f5b5a0d -SIZE (cabal/cmark-0.5.5.1.tar.gz) = 169811 +TIMESTAMP = 1523465640 +SHA256 (cabal/cmark-0.5.6.tar.gz) = 855c4b7aca6d4e9eb076beb6cc6f74e7578fae7aa3625fd3fca5e3b4901a32b0 +SIZE (cabal/cmark-0.5.6.tar.gz) = 170850 diff --git a/textproc/hs-csv/Makefile b/textproc/hs-csv/Makefile index f3ef566e265..866171f8070 100644 --- a/textproc/hs-csv/Makefile +++ b/textproc/hs-csv/Makefile @@ -3,7 +3,7 @@ PORTNAME= csv PORTVERSION= 0.1.2 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,5 @@ COMMENT= CSV library for Haskell LICENSE= MIT -USE_CABAL= parsec - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/textproc/hs-doctemplates/Makefile b/textproc/hs-doctemplates/Makefile index d7a40137abb..9f2764e8d32 100644 --- a/textproc/hs-doctemplates/Makefile +++ b/textproc/hs-doctemplates/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= doctemplates -PORTVERSION= 0.1.0.2 -PORTREVISION= 1 +PORTVERSION= 0.2.2.1 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,8 +9,8 @@ COMMENT= The doctemplates package LICENSE= BSD3CLAUSE -USE_CABAL= aeson blaze-html blaze-markup parsec scientific text \ - unordered-containers vector +USE_CABAL= aeson blaze-html blaze-markup scientific unordered-containers \ + vector .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/textproc/hs-doctemplates/distinfo b/textproc/hs-doctemplates/distinfo index 887a63e2ac9..203b2710ffb 100644 --- a/textproc/hs-doctemplates/distinfo +++ b/textproc/hs-doctemplates/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499720884 -SHA256 (cabal/doctemplates-0.1.0.2.tar.gz) = b752f52350daaa9bcf261a1f1af5852f75572093c3d0cdeb4822282fb3a18a6b -SIZE (cabal/doctemplates-0.1.0.2.tar.gz) = 5924 +TIMESTAMP = 1524418494 +SHA256 (cabal/doctemplates-0.2.2.1.tar.gz) = 6b0cfb565fc7fa90d71ac56b83aedecf670678e6f1441278877fbf399e9bccbf +SIZE (cabal/doctemplates-0.2.2.1.tar.gz) = 6139 diff --git a/textproc/hs-double-conversion/Makefile b/textproc/hs-double-conversion/Makefile index 37088bf8484..dcb4c21bdcb 100644 --- a/textproc/hs-double-conversion/Makefile +++ b/textproc/hs-double-conversion/Makefile @@ -2,7 +2,7 @@ PORTNAME= double-conversion PORTVERSION= 2.0.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,12 +10,5 @@ COMMENT= Fast conversion between double-precision floating-point and text LICENSE= BSD3CLAUSE -USE_CABAL= text>=0.11.0.8 - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" - -.if ${PORT_OPTIONS:MPCLANG} || ${PORT_OPTIONS:MBCLANG} -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-double-conversion.cabal -.endif - .include diff --git a/textproc/hs-double-conversion/files/extra-patch-double-conversion.cabal b/textproc/hs-double-conversion/files/extra-patch-double-conversion.cabal deleted file mode 100644 index f194f16d456..00000000000 --- a/textproc/hs-double-conversion/files/extra-patch-double-conversion.cabal +++ /dev/null @@ -1,12 +0,0 @@ ---- double-conversion.cabal.orig 2014-08-13 18:38:48 UTC -+++ double-conversion.cabal -@@ -71,7 +71,8 @@ library - double-conversion/src/fixed-dtoa.cc - double-conversion/src/strtod.cc - -- extra-libraries: stdc++ -+ cc-options: -std=c++11 -stdlib=libc++ -+ extra-libraries: cxxrt gcc_s - - include-dirs: - double-conversion/src diff --git a/textproc/hs-feed/Makefile b/textproc/hs-feed/Makefile index a342f5c25ec..68dedb8f857 100644 --- a/textproc/hs-feed/Makefile +++ b/textproc/hs-feed/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= feed -PORTVERSION= 0.3.12.0 -PORTREVISION= 1 +PORTVERSION= 1.0.0.0 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -11,8 +10,9 @@ COMMENT= Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds LICENSE= BSD3CLAUSE -USE_CABAL= old-locale>=1.0 old-time>=1 time-locale-compat>=0.1 \ - utf8-string xml>=1.2.6 +USE_CABAL= base-compat old-locale>=1.0 old-time>=1 safe \ + time-locale-compat>=0.1 utf8-string xml>=1.2.6 xml-conduit \ + xml-types .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/textproc/hs-feed/distinfo b/textproc/hs-feed/distinfo index 2925abf966f..c1b4874b42f 100644 --- a/textproc/hs-feed/distinfo +++ b/textproc/hs-feed/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499538656 -SHA256 (cabal/feed-0.3.12.0.tar.gz) = cc2d6a3b91027d75b91a0a4c0f83f2df68bee3ce0d7338ea5ae0bcab6dd47942 -SIZE (cabal/feed-0.3.12.0.tar.gz) = 102415 +TIMESTAMP = 1523695585 +SHA256 (cabal/feed-1.0.0.0.tar.gz) = 9359a12d3da138ba50fecfc31eed7f92438a6417e9fc3aa17b95a014fa792f17 +SIZE (cabal/feed-1.0.0.0.tar.gz) = 102936 diff --git a/textproc/hs-feed/files/patch-feed.cabal b/textproc/hs-feed/files/patch-feed.cabal new file mode 100644 index 00000000000..981e7de9fb2 --- /dev/null +++ b/textproc/hs-feed/files/patch-feed.cabal @@ -0,0 +1,31 @@ +--- feed.cabal.orig 2017-08-26 23:55:46 UTC ++++ feed.cabal +@@ -71,8 +71,8 @@ library + Data.Text.Util + Data.XML.Compat + build-depends: +- base >= 4 && < 4.11 +- , base-compat == 0.9.* ++ base >= 4 && < 4.12 ++ , base-compat == 0.10.* + , bytestring >= 0.9 && < 0.11 + , old-locale == 1.0.* + , old-time >= 1 && < 1.2 +@@ -82,7 +82,7 @@ library + , time-locale-compat == 0.1.* + , utf8-string < 1.1 + , xml-types >= 0.3.6 && < 0.4 +- , xml-conduit >= 1.3 && < 1.6 ++ , xml-conduit >= 1.3 && < 1.9 + + test-suite tests + ghc-options: -Wall +@@ -104,7 +104,7 @@ test-suite tests + build-depends: + base >= 4 && < 4.11 + , HUnit >= 1.2 && < 1.7 +- , base-compat == 0.9.* ++ , base-compat == 0.10.* + , feed + , old-locale == 1.0.* + , old-time >= 1 && < 1.2 diff --git a/textproc/hs-hexpat/Makefile b/textproc/hs-hexpat/Makefile index 0167f8a07f6..07adeb9cada 100644 --- a/textproc/hs-hexpat/Makefile +++ b/textproc/hs-hexpat/Makefile @@ -2,7 +2,7 @@ PORTNAME= hexpat PORTVERSION= 0.20.13 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE LIB_DEPENDS= libexpat.so:textproc/expat2 -USE_CABAL= List>=0.4.2 text>=0.5.0.0 utf8-string>=0.3 +USE_CABAL= List>=0.4.2 utf8-string>=0.3 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/textproc/hs-highlighting-kate/Makefile b/textproc/hs-highlighting-kate/Makefile index ff271b253e4..175435891e6 100644 --- a/textproc/hs-highlighting-kate/Makefile +++ b/textproc/hs-highlighting-kate/Makefile @@ -2,7 +2,7 @@ PORTNAME= highlighting-kate PORTVERSION= 0.6.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,8 +10,8 @@ COMMENT= Syntax highlighting LICENSE= GPLv2 -USE_CABAL= blaze-html>=0.4.2 mtl parsec \ - regex-pcre-builtin>=0.94.4.8.8.35 utf8-string +USE_CABAL= blaze-html>=0.4.2 mtl regex-pcre-builtin>=0.94.4.8.8.35 \ + utf8-string FLAGS_DEFINE= EXECUTABLE diff --git a/textproc/hs-hs-bibutils/Makefile b/textproc/hs-hs-bibutils/Makefile index 39694fb70d5..3133c157b20 100644 --- a/textproc/hs-hs-bibutils/Makefile +++ b/textproc/hs-hs-bibutils/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= hs-bibutils -PORTVERSION= 5.5 -PORTREVISION= 2 +PORTVERSION= 6.2.0.1 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-hs-bibutils/distinfo b/textproc/hs-hs-bibutils/distinfo index 99260edc6f9..d9e6052e77b 100644 --- a/textproc/hs-hs-bibutils/distinfo +++ b/textproc/hs-hs-bibutils/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624830 -SHA256 (cabal/hs-bibutils-5.5.tar.gz) = 95f9f34be9f3145da8acc8a0e9de379236cfe31c5a9bc0eb9489e77402a4c55d -SIZE (cabal/hs-bibutils-5.5.tar.gz) = 499546 +TIMESTAMP = 1525094674 +SHA256 (cabal/hs-bibutils-6.2.0.1.tar.gz) = 4b668090049bf67f107b8bcd39a4664c00b78ff596de9ccb63720af49ed4a630 +SIZE (cabal/hs-bibutils-6.2.0.1.tar.gz) = 515725 diff --git a/textproc/hs-html-conduit/Makefile b/textproc/hs-html-conduit/Makefile index 1b1e94df7b3..b5067886da1 100644 --- a/textproc/hs-html-conduit/Makefile +++ b/textproc/hs-html-conduit/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= html-conduit -PORTVERSION= 1.2.1.1 -PORTREVISION= 1 +PORTVERSION= 1.3.0 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,7 @@ COMMENT= Parse HTML documents using xml-conduit datatypes LICENSE= MIT USE_CABAL= conduit>=1.0 conduit-extra>=1.1.1 resourcet>=0.3 \ - tagstream-conduit>=0.5.5.3 text xml-conduit>=1.3 xml-types>=0.3 + tagstream-conduit>=0.5.5.3 xml-conduit>=1.3 xml-types>=0.3 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/textproc/hs-html-conduit/distinfo b/textproc/hs-html-conduit/distinfo index de9512724c3..310684866a3 100644 --- a/textproc/hs-html-conduit/distinfo +++ b/textproc/hs-html-conduit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624831 -SHA256 (cabal/html-conduit-1.2.1.1.tar.gz) = 98c27470cbf99b12ca9705216567fc8aafffb843cd9c37762e8607da153aa8a8 -SIZE (cabal/html-conduit-1.2.1.1.tar.gz) = 4125 +TIMESTAMP = 1524851689 +SHA256 (cabal/html-conduit-1.3.0.tar.gz) = 78bf09e175079bdd0f0dd363b3a4b2d32d095cc09413ca9d8069bc527809ee96 +SIZE (cabal/html-conduit-1.3.0.tar.gz) = 4458 diff --git a/textproc/hs-html-conduit/files/patch-html-conduit.cabal b/textproc/hs-html-conduit/files/patch-html-conduit.cabal deleted file mode 100644 index ae600cca1ac..00000000000 --- a/textproc/hs-html-conduit/files/patch-html-conduit.cabal +++ /dev/null @@ -1,11 +0,0 @@ ---- html-conduit.cabal.orig 2017-07-10 15:41:23 UTC -+++ html-conduit.cabal -@@ -22,7 +22,7 @@ Library - , resourcet >= 0.3 && < 1.2 - , conduit >= 1.0 && < 1.3 - , conduit-extra >= 1.1.1 -- , xml-conduit >= 1.3 && < 1.5 -+ , xml-conduit >= 1.3 && < 1.6 - , tagstream-conduit >= 0.5.5.3 && < 0.6 - , xml-types >= 0.3 && < 0.4 - diff --git a/textproc/hs-html/Makefile b/textproc/hs-html/Makefile index 2f25f70f975..a92e4c0cbf5 100644 --- a/textproc/hs-html/Makefile +++ b/textproc/hs-html/Makefile @@ -2,7 +2,7 @@ PORTNAME= html PORTVERSION= 1.0.1.2 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-hxt-charproperties/Makefile b/textproc/hs-hxt-charproperties/Makefile index 0abd9f215da..579f3c2aac0 100644 --- a/textproc/hs-hxt-charproperties/Makefile +++ b/textproc/hs-hxt-charproperties/Makefile @@ -2,7 +2,7 @@ PORTNAME= hxt-charproperties PORTVERSION= 9.2.0.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-hxt-regex-xmlschema/Makefile b/textproc/hs-hxt-regex-xmlschema/Makefile index 13a374a4f48..bf5f2657842 100644 --- a/textproc/hs-hxt-regex-xmlschema/Makefile +++ b/textproc/hs-hxt-regex-xmlschema/Makefile @@ -2,7 +2,7 @@ PORTNAME= hxt-regex-xmlschema PORTVERSION= 9.2.0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,7 @@ COMMENT= Regular expression library for W3C XML Schema regular expressions LICENSE= MIT -USE_CABAL= hxt-charproperties>=9.0 parsec>=2.1 text>=0.10 +USE_CABAL= hxt-charproperties>=9.0 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/textproc/hs-hxt-unicode/Makefile b/textproc/hs-hxt-unicode/Makefile index 87fa8667590..69e09e587c5 100644 --- a/textproc/hs-hxt-unicode/Makefile +++ b/textproc/hs-hxt-unicode/Makefile @@ -2,7 +2,7 @@ PORTNAME= hxt-unicode PORTVERSION= 9.0.2.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-hxt/Makefile b/textproc/hs-hxt/Makefile index ab89a5c3dfb..a59a01ae2f9 100644 --- a/textproc/hs-hxt/Makefile +++ b/textproc/hs-hxt/Makefile @@ -2,7 +2,7 @@ PORTNAME= hxt PORTVERSION= 9.3.1.16 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -11,8 +11,7 @@ COMMENT= Collection of tools for processing XML with Haskell LICENSE= MIT USE_CABAL= HUnit>=1.2 hxt-charproperties>=9.1 hxt-regex-xmlschema>=9.2 \ - hxt-unicode>=9.0.1 mtl>=2.0.1 network>=2.6 network-uri>=2.6 \ - parsec>=2.1 + hxt-unicode>=9.0.1 mtl>=2.0.1 network>=2.6 network-uri>=2.6 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/textproc/hs-lhs2tex/Makefile b/textproc/hs-lhs2tex/Makefile index 7534d3fbfdd..e914e554a3e 100644 --- a/textproc/hs-lhs2tex/Makefile +++ b/textproc/hs-lhs2tex/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= lhs2tex -PORTVERSION= 1.19 -PORTREVISION= 2 +PORTVERSION= 1.20 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-lhs2tex/distinfo b/textproc/hs-lhs2tex/distinfo index a9984180aef..5a627202555 100644 --- a/textproc/hs-lhs2tex/distinfo +++ b/textproc/hs-lhs2tex/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624833 -SHA256 (cabal/lhs2tex-1.19.tar.gz) = 24ae0557d95673e0c6d9b0aca829181b734359880dd58802ac154b89f384b00e -SIZE (cabal/lhs2tex-1.19.tar.gz) = 658353 +TIMESTAMP = 1524639224 +SHA256 (cabal/lhs2tex-1.20.tar.gz) = ae851e7f7d25ff822e1fec2f48aec7802d62e06458096de28069201562dfb03a +SIZE (cabal/lhs2tex-1.20.tar.gz) = 674326 diff --git a/textproc/hs-lhs2tex/files/patch-Setup.hs b/textproc/hs-lhs2tex/files/patch-Setup.hs index df80ba1420b..09f425ff12f 100644 --- a/textproc/hs-lhs2tex/files/patch-Setup.hs +++ b/textproc/hs-lhs2tex/files/patch-Setup.hs @@ -1,6 +1,6 @@ ---- Setup.hs.orig 2012-09-08 22:29:52.000000000 +0100 -+++ Setup.hs 2013-12-08 15:55:17.403235103 +0000 -@@ -205,7 +205,7 @@ +--- Setup.hs.orig 2017-09-29 08:44:16 UTC ++++ Setup.hs +@@ -210,7 +210,7 @@ lhs2texPostCopy a (CopyFlags { copyDest = cdf, copyVer else docdir (absoluteInstallDirs pd lbi cd) `joinFileName` "doc" let manDir = if isWindows then dataPref `joinFileName` "Documentation" @@ -9,7 +9,7 @@ createDirectoryIfMissing True docDir installOrdinaryFile v (lhs2texDocDir `joinFileName` "Guide2.pdf") (docDir `joinFileName` "Guide2.pdf") when (not isWindows) $ -@@ -213,7 +213,8 @@ +@@ -218,7 +218,8 @@ lhs2texPostCopy a (CopyFlags { copyDest = cdf, copyVer installOrdinaryFile v ("lhs2TeX.1") (manDir `joinFileName` "lhs2TeX.1") -- polytable case (installPolyTable ebi) of diff --git a/textproc/hs-lhs2tex/files/patch-src_Document.lhs b/textproc/hs-lhs2tex/files/patch-src_Document.lhs new file mode 100644 index 00000000000..fdbeead0aa3 --- /dev/null +++ b/textproc/hs-lhs2tex/files/patch-src_Document.lhs @@ -0,0 +1,10 @@ +--- src/Document.lhs.orig 2018-04-25 07:05:53 UTC ++++ src/Document.lhs +@@ -9,6 +9,7 @@ + + %endif + ++> import Prelude hiding ((<>)) + > infixr 5 {-"\enskip"-} <> -- same fixity as `|++|' + + The pretty printer generate documents of type |Doc|. diff --git a/textproc/hs-lhs2tex/files/patch-src_Main.lhs b/textproc/hs-lhs2tex/files/patch-src_Main.lhs new file mode 100644 index 00000000000..dcc2df875b0 --- /dev/null +++ b/textproc/hs-lhs2tex/files/patch-src_Main.lhs @@ -0,0 +1,11 @@ +--- src/Main.lhs.orig 2018-04-25 07:41:09 UTC ++++ src/Main.lhs +@@ -21,7 +21,7 @@ + > import Control.Monad.Error + > import Control.Monad.State ( MonadState(..), modify ) + > import Control.Monad.Trans +-> import Prelude hiding ( getContents ) ++> import Prelude hiding ( getContents, (<>) ) + > + > import Version + > import TeXCommands diff --git a/textproc/hs-lhs2tex/files/patch-src_Math.lhs b/textproc/hs-lhs2tex/files/patch-src_Math.lhs new file mode 100644 index 00000000000..942016c7ab3 --- /dev/null +++ b/textproc/hs-lhs2tex/files/patch-src_Math.lhs @@ -0,0 +1,11 @@ +--- src/Math.lhs.orig 2018-04-25 07:40:44 UTC ++++ src/Math.lhs +@@ -7,7 +7,7 @@ + > module Math ( module Math, substitute, number ) + > where + > +-> import Prelude hiding ( lines ) ++> import Prelude hiding ( lines, (<>) ) + > import Data.List ( partition ) + > import Numeric ( showFFloat ) + > import Control.Applicative ( many ) diff --git a/textproc/hs-lhs2tex/files/patch-src_MathPoly.lhs b/textproc/hs-lhs2tex/files/patch-src_MathPoly.lhs new file mode 100644 index 00000000000..21728d3ffa0 --- /dev/null +++ b/textproc/hs-lhs2tex/files/patch-src_MathPoly.lhs @@ -0,0 +1,11 @@ +--- src/MathPoly.lhs.orig 2018-04-25 07:08:26 UTC ++++ src/MathPoly.lhs +@@ -13,7 +13,7 @@ are subtle differences, and they will grow over time \ + > module MathPoly ( module MathPoly, substitute, number ) + > where + > +-> import Prelude hiding ( lines ) ++> import Prelude hiding ( lines, (<>) ) + > import Data.List ( partition, nub, insert, sort, transpose ) + > import Numeric ( showFFloat ) + > import Control.Applicative ( many ) diff --git a/textproc/hs-lhs2tex/files/patch-src_NewCode.lhs b/textproc/hs-lhs2tex/files/patch-src_NewCode.lhs new file mode 100644 index 00000000000..f9f22a8c93a --- /dev/null +++ b/textproc/hs-lhs2tex/files/patch-src_NewCode.lhs @@ -0,0 +1,10 @@ +--- src/NewCode.lhs.orig 2018-04-25 07:08:55 UTC ++++ src/NewCode.lhs +@@ -13,6 +13,7 @@ way that is compatible with the @poly@ or @math@ forma + > module NewCode ( module NewCode ) + > where + > ++> import Prelude hiding ((<>)) + > import Control.Monad ( (>=>) ) + > import Data.List ( partition ) + > diff --git a/textproc/hs-lhs2tex/files/patch-src_Typewriter.lhs b/textproc/hs-lhs2tex/files/patch-src_Typewriter.lhs new file mode 100644 index 00000000000..3b8ca478593 --- /dev/null +++ b/textproc/hs-lhs2tex/files/patch-src_Typewriter.lhs @@ -0,0 +1,10 @@ +--- src/Typewriter.lhs.orig 2018-04-25 07:07:53 UTC ++++ src/Typewriter.lhs +@@ -7,6 +7,7 @@ + > module Typewriter ( module Typewriter ) + > where + > ++> import Prelude hiding ((<>)) + > import Control.Monad + > + > import Verbatim ( trim, expand ) diff --git a/textproc/hs-lhs2tex/files/patch-src_Verbatim.lhs b/textproc/hs-lhs2tex/files/patch-src_Verbatim.lhs new file mode 100644 index 00000000000..c7130dd0541 --- /dev/null +++ b/textproc/hs-lhs2tex/files/patch-src_Verbatim.lhs @@ -0,0 +1,10 @@ +--- src/Verbatim.lhs.orig 2018-04-25 07:07:15 UTC ++++ src/Verbatim.lhs +@@ -7,6 +7,7 @@ + > module Verbatim ( module Verbatim ) + > where + > ++> import Prelude hiding ((<>)) + > import Control.Arrow ( (>>>) ) + > import Data.Char + > import Data.List ( intersperse ) diff --git a/textproc/hs-libxml-sax/Makefile b/textproc/hs-libxml-sax/Makefile index 68671888e58..a012c777fe0 100644 --- a/textproc/hs-libxml-sax/Makefile +++ b/textproc/hs-libxml-sax/Makefile @@ -2,7 +2,7 @@ PORTNAME= libxml-sax PORTVERSION= 0.7.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,7 @@ COMMENT= Bindings for the libXML2 SAX interface LICENSE= MIT -USE_CABAL= text>=0.7 xml-types>=0.3 +USE_CABAL= xml-types>=0.3 USES= pkgconfig LIB_DEPENDS= libxml2.so:textproc/libxml2 diff --git a/textproc/hs-libxml/Makefile b/textproc/hs-libxml/Makefile index 7999c680c26..92f3ac64544 100644 --- a/textproc/hs-libxml/Makefile +++ b/textproc/hs-libxml/Makefile @@ -2,7 +2,7 @@ PORTNAME= libxml PORTVERSION= 0.1.1 -PORTREVISION= 18 +PORTREVISION= 19 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-magic/Makefile b/textproc/hs-magic/Makefile index 70fe0da1df8..5b0a32eaeab 100644 --- a/textproc/hs-magic/Makefile +++ b/textproc/hs-magic/Makefile @@ -2,7 +2,7 @@ PORTNAME= magic PORTVERSION= 1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-pandoc-citeproc/Makefile b/textproc/hs-pandoc-citeproc/Makefile index 84ee9bd8791..ba9ef140cf4 100644 --- a/textproc/hs-pandoc-citeproc/Makefile +++ b/textproc/hs-pandoc-citeproc/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= pandoc-citeproc -PORTVERSION= 0.10.5.1 -PORTREVISION= 1 +PORTVERSION= 0.14.3.1 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -11,8 +10,8 @@ COMMENT= Supports using pandoc with citeproc LICENSE= BSD3CLAUSE USE_CABAL= aeson>=0.7 aeson-pretty attoparsec data-default \ - mtl pandoc>=1.13 pandoc-types>=1.12.3 parsec rfc5051 \ - setenv>=0.1 split syb tagsoup text vector xml-conduit>=1.2 \ + mtl pandoc>=1.13 pandoc-types>=1.12.3 rfc5051 \ + setenv>=0.1 split syb tagsoup vector xml-conduit>=1.2 \ yaml>=0.8.8.7 EXECUTABLE= pandoc-citeproc diff --git a/textproc/hs-pandoc-citeproc/distinfo b/textproc/hs-pandoc-citeproc/distinfo index 83916a3d8e0..d9f8e7435e1 100644 --- a/textproc/hs-pandoc-citeproc/distinfo +++ b/textproc/hs-pandoc-citeproc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624836 -SHA256 (cabal/pandoc-citeproc-0.10.5.1.tar.gz) = 49038b80ad802098169852b0bc7fc7c9878a85a9091eee4c32211844fecda783 -SIZE (cabal/pandoc-citeproc-0.10.5.1.tar.gz) = 262993 +TIMESTAMP = 1525014746 +SHA256 (cabal/pandoc-citeproc-0.14.3.1.tar.gz) = 42c0b2c8365441bf884daa6202e6ed01b42181cf255406c88b3b31cd27cb467a +SIZE (cabal/pandoc-citeproc-0.14.3.1.tar.gz) = 306846 diff --git a/textproc/hs-pandoc-citeproc/files/patch-pandoc-citeproc.cabal b/textproc/hs-pandoc-citeproc/files/patch-pandoc-citeproc.cabal deleted file mode 100644 index 26a28052b0e..00000000000 --- a/textproc/hs-pandoc-citeproc/files/patch-pandoc-citeproc.cabal +++ /dev/null @@ -1,38 +0,0 @@ ---- pandoc-citeproc.cabal.orig 2017-06-04 18:38:13 UTC -+++ pandoc-citeproc.cabal -@@ -99,7 +99,7 @@ library - ghc-prof-options: -fprof-auto-exported - build-depends: containers, directory, mtl, - bytestring, filepath, -- pandoc-types >= 1.16 && < 1.18, -+ pandoc-types >= 1.16 && < 1.20, - pandoc >= 1.16 && < 2.1, - tagsoup, - aeson >= 0.7 && < 1.3, -@@ -146,7 +146,7 @@ executable pandoc-citeproc - ghc-options: -funbox-strict-fields -Wall - ghc-prof-options: -fprof-auto-exported -rtsopts - build-depends: base >= 4, pandoc-citeproc, -- pandoc-types >= 1.16 && < 1.18, -+ pandoc-types >= 1.16 && < 1.20, - pandoc >= 1.16 && < 2.1, - aeson, - aeson-pretty >= 0.8, yaml, bytestring, syb, attoparsec, text, -@@ -169,7 +169,7 @@ executable test-citeproc - else - Buildable: False - build-depends: base >= 4, aeson, directory, text, mtl, -- pandoc-types >= 1.16 && < 1.18, -+ pandoc-types >= 1.16 && < 1.20, - pandoc >= 1.16 && < 2.1, - filepath, - bytestring, pandoc-citeproc, process, temporary >= 1.1, -@@ -185,7 +185,7 @@ test-suite test-pandoc-citeproc - Prelude - Hs-Source-Dirs: tests, prelude, compat - build-depends: base >= 4, aeson, directory, text, -- pandoc-types >= 1.16 && < 1.18, mtl, -+ pandoc-types >= 1.16 && < 1.20, mtl, - pandoc >= 1.16 && < 2.1, filepath, - bytestring, pandoc-citeproc, process, temporary >= 1.1, - yaml >= 0.8.8.7 diff --git a/textproc/hs-pandoc-types/Makefile b/textproc/hs-pandoc-types/Makefile index f770364de83..606e3809647 100644 --- a/textproc/hs-pandoc-types/Makefile +++ b/textproc/hs-pandoc-types/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= pandoc-types -PORTVERSION= 1.19 -PORTREVISION= 1 +PORTVERSION= 1.17.4.2 +PORTEPOCH= 1 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-pandoc-types/distinfo b/textproc/hs-pandoc-types/distinfo index 76620ce18f8..0515e7419fe 100644 --- a/textproc/hs-pandoc-types/distinfo +++ b/textproc/hs-pandoc-types/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499543994 -SHA256 (cabal/pandoc-types-1.19.tar.gz) = 2bdd244a1a8fda8d3da07b7e0ffbfe54d7808709bb35825963177b112d4dcccf -SIZE (cabal/pandoc-types-1.19.tar.gz) = 21942 +TIMESTAMP = 1524405363 +SHA256 (cabal/pandoc-types-1.17.4.2.tar.gz) = 57e15e0a8c74f1acc96259d24eb77a6febbc182a1fd8092af8c431e7a3263eca +SIZE (cabal/pandoc-types-1.17.4.2.tar.gz) = 24035 diff --git a/textproc/hs-pandoc-types/files/patch-pandoc-types.cabal b/textproc/hs-pandoc-types/files/patch-pandoc-types.cabal deleted file mode 100644 index e8741ae401d..00000000000 --- a/textproc/hs-pandoc-types/files/patch-pandoc-types.cabal +++ /dev/null @@ -1,24 +0,0 @@ ---- pandoc-types.cabal.orig 2017-01-22 09:26:57 UTC -+++ pandoc-types.cabal -@@ -48,10 +48,10 @@ Library - Other-modules: Paths_pandoc_types - Build-depends: base >= 4 && < 5, - containers >= 0.3, -- syb >= 0.1 && < 0.7, -+ syb >= 0.1 && < 0.8, - ghc-prim >= 0.2, - bytestring >= 0.9 && < 0.11, -- aeson >= 0.6.2 && < 1.2, -+ aeson >= 0.6.2 && < 1.3, - QuickCheck >= 2 - if impl(ghc < 7.10) - Build-depends: deepseq-generics >= 0.1 && < 0.2 -@@ -65,7 +65,7 @@ test-suite test-pandoc-types - build-depends: base, - pandoc-types, - syb, -- aeson >= 0.6.2 && < 1.2, -+ aeson >= 0.6.2 && < 1.3, - containers >= 0.3, - bytestring >= 0.9 && < 0.11, - test-framework >= 0.3 && < 0.9, diff --git a/textproc/hs-pandoc/Makefile b/textproc/hs-pandoc/Makefile index 7e7b890e4d9..73481fb9523 100644 --- a/textproc/hs-pandoc/Makefile +++ b/textproc/hs-pandoc/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= pandoc -PORTVERSION= 1.19.2.1 -PORTREVISION= 1 +PORTVERSION= 2.2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -11,14 +10,14 @@ COMMENT= Conversion between markup formats LICENSE= GPLv2 -USE_CABAL= aeson base64-bytestring blaze-html \ - blaze-markup cmark data-default \ +USE_CABAL= Glob aeson aeson-pretty base64-bytestring blaze-html \ + blaze-markup cmark cmark-gfm data-default \ deepseq-generics doctemplates extensible-exceptions \ - filemanip haddock-library highlighting-kate \ - hslua HTTP JuicyPixels mtl \ - network network-uri pandoc-types parsec \ + filemanip haddock-library \ + hslua hslua-module-text HTTP JuicyPixels mtl \ + network network-uri pandoc-types \ random scientific SHA skylighting syb tagsoup\ - temporary texmath text \ + temporary texmath \ unordered-containers vector xml \ yaml zip-archive zlib @@ -49,7 +48,7 @@ HTTPS_FLAG_CABAL= http-client>=0.3.2 http-client-tls>=0.2 http-types>=0.8 TRYPANDOC_DESC= Build trypandoc cgi executable TRYPANDOC_FLAG_ENABLE= trypandoc -TRYPANDOC_FLAG_CABAL= aeson highlighting-kate text wai-extra wai>=0.3 \ +TRYPANDOC_FLAG_CABAL= aeson wai-extra wai>=0.3 \ http-types TRYPANDOC_FLAG_EXECUTABLE= trypandoc diff --git a/textproc/hs-pandoc/distinfo b/textproc/hs-pandoc/distinfo index 5f38ab8379a..8ed8d343fac 100644 --- a/textproc/hs-pandoc/distinfo +++ b/textproc/hs-pandoc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624835 -SHA256 (cabal/pandoc-1.19.2.1.tar.gz) = 08692f3d77bf95bb9ba3407f7af26de7c23134e7efcdafad0bdaf9050e2c7801 -SIZE (cabal/pandoc-1.19.2.1.tar.gz) = 2755101 +TIMESTAMP = 1524940319 +SHA256 (cabal/pandoc-2.2.tar.gz) = 0f2984a6ea4948392154ecdcffcc21c561976c63f9c8aa648a56a677b80e8569 +SIZE (cabal/pandoc-2.2.tar.gz) = 8995928 diff --git a/textproc/hs-pandoc/files/patch-pandoc.cabal b/textproc/hs-pandoc/files/patch-pandoc.cabal deleted file mode 100644 index 07d92a10932..00000000000 --- a/textproc/hs-pandoc/files/patch-pandoc.cabal +++ /dev/null @@ -1,83 +0,0 @@ ---- pandoc.cabal.orig 2017-01-31 15:02:20 UTC -+++ pandoc.cabal -@@ -253,7 +253,7 @@ Flag old-locale - - Library - Build-Depends: base >= 4.7 && <5, -- syb >= 0.1 && < 0.7, -+ syb >= 0.1 && < 0.8, - containers >= 0.1 && < 0.6, - unordered-containers >= 0.2 && < 0.3, - array >= 0.3 && < 0.6, -@@ -270,12 +270,12 @@ Library - xml >= 1.3.12 && < 1.4, - random >= 1 && < 1.2, - extensible-exceptions >= 0.1 && < 0.2, -- pandoc-types >= 1.17 && < 1.18, -- aeson >= 0.7 && < 1.2, -+ pandoc-types >= 1.17 && < 1.20, -+ aeson >= 0.7 && < 1.3, - tagsoup >= 0.13.7 && < 0.15, - base64-bytestring >= 0.1 && < 1.1, - zlib >= 0.5 && < 0.7, -- skylighting >= 0.1.1.4 && < 0.2, -+ skylighting >= 0.1.1.4 && < 0.4, - data-default >= 0.4 && < 0.8, - temporary >= 1.1 && < 1.3, - blaze-html >= 0.5 && < 0.10, -@@ -283,7 +283,7 @@ Library - yaml >= 0.8.8.2 && < 0.9, - scientific >= 0.2 && < 0.4, - vector >= 0.10 && < 0.13, -- hslua >= 0.3 && < 0.5, -+ hslua >= 0.3 && < 0.6, - binary >= 0.5 && < 0.9, - SHA >= 1.6 && < 1.7, - haddock-library >= 1.1 && < 1.5, -@@ -424,15 +424,15 @@ Library - - Executable pandoc - Build-Depends: pandoc, -- pandoc-types >= 1.17 && < 1.18, -+ pandoc-types >= 1.17 && < 1.20, - base >= 4.2 && <5, - directory >= 1.2 && < 1.4, - filepath >= 1.1 && < 1.5, - text >= 0.11 && < 1.3, - bytestring >= 0.9 && < 0.11, - extensible-exceptions >= 0.1 && < 0.2, -- skylighting >= 0.1.1.3 && < 0.2, -- aeson >= 0.7.0.5 && < 1.2, -+ skylighting >= 0.1.1.3 && < 0.4, -+ aeson >= 0.7.0.5 && < 1.3, - yaml >= 0.8.8.2 && < 0.9, - containers >= 0.1 && < 0.6, - HTTP >= 4000.0.5 && < 4000.4 -@@ -498,15 +498,15 @@ Test-Suite test-pandoc - Hs-Source-Dirs: prelude - Other-Modules: Prelude - Build-Depends: base >= 4.2 && < 5, -- syb >= 0.1 && < 0.7, -+ syb >= 0.1 && < 0.8, - pandoc, -- pandoc-types >= 1.17 && < 1.18, -+ pandoc-types >= 1.17 && < 1.20, - bytestring >= 0.9 && < 0.11, - text >= 0.11 && < 1.3, - directory >= 1 && < 1.4, - filepath >= 1.1 && < 1.5, - process >= 1 && < 1.5, -- skylighting >= 0.1.1.3 && < 0.2, -+ skylighting >= 0.1.1.3 && < 0.4, - Diff >= 0.2 && < 0.4, - test-framework >= 0.3 && < 0.9, - test-framework-hunit >= 0.2 && < 0.4, -@@ -553,7 +553,7 @@ benchmark benchmark-pandoc - Other-Modules: Prelude - Build-Depends: pandoc, - base >= 4.2 && < 5, -- syb >= 0.1 && < 0.7, -+ syb >= 0.1 && < 0.8, - criterion >= 1.0 && < 1.2 - Ghc-Options: -rtsopts -Wall -fno-warn-unused-do-bind - Default-Language: Haskell98 diff --git a/textproc/hs-pandoc/files/patch-src_Text_Pandoc_Writers_Custom.hs b/textproc/hs-pandoc/files/patch-src_Text_Pandoc_Writers_Custom.hs deleted file mode 100644 index 648d7ffa890..00000000000 --- a/textproc/hs-pandoc/files/patch-src_Text_Pandoc_Writers_Custom.hs +++ /dev/null @@ -1,14 +0,0 @@ ---- src/Text/Pandoc/Writers/Custom.hs.orig 2017-01-25 16:07:43 UTC -+++ src/Text/Pandoc/Writers/Custom.hs -@@ -183,7 +183,11 @@ writeCustom luaFile opts doc@(Pandoc meta _) = do - setForeignEncoding utf8 - lua <- Lua.newstate - Lua.openlibs lua -+#if MIN_VERSION_hslua(0,5,0) -+ status <- Lua.loadstring lua luaScript -+#else - status <- Lua.loadstring lua luaScript luaFile -+#endif - -- check for error in lua script (later we'll change the return type - -- to handle this more gracefully): - when (status /= 0) $ diff --git a/textproc/hs-parsec/distinfo b/textproc/hs-parsec/distinfo deleted file mode 100644 index 53ec58aa1cb..00000000000 --- a/textproc/hs-parsec/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1499618976 -SHA256 (cabal/parsec-3.1.11.tar.gz) = 6f87251cb1d11505e621274dec15972de924a9074f07f7430a18892064c2676e -SIZE (cabal/parsec-3.1.11.tar.gz) = 32412 diff --git a/textproc/hs-parsec/pkg-descr b/textproc/hs-parsec/pkg-descr deleted file mode 100644 index cb0f2345441..00000000000 --- a/textproc/hs-parsec/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -Parsec is designed from scratch as an industrial-strength parser -library. It is simple, safe, well documented (on the package homepage), -has extensive libraries and good error messages, and is also fast. It -is defined as a monad transformer that can be stacked on arbitrary -monads, and it is also parametric in the input stream type. - -WWW: https://github.com/aslatter/parsec diff --git a/textproc/hs-polyparse/Makefile b/textproc/hs-polyparse/Makefile index 348c87c81e2..2fe6967856d 100644 --- a/textproc/hs-polyparse/Makefile +++ b/textproc/hs-polyparse/Makefile @@ -2,7 +2,7 @@ PORTNAME= polyparse PORTVERSION= 1.12 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,5 @@ COMMENT= Variety of alternative parser combinator libraries LICENSE= LGPL21 -USE_CABAL= text - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/textproc/hs-pretty-show/Makefile b/textproc/hs-pretty-show/Makefile index c0c9fd40bcc..fc4aca9b254 100644 --- a/textproc/hs-pretty-show/Makefile +++ b/textproc/hs-pretty-show/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= pretty-show -PORTVERSION= 1.6.13 -PORTREVISION= 1 +PORTVERSION= 1.7 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-pretty-show/distinfo b/textproc/hs-pretty-show/distinfo index 2dc39c2a812..c5a7d6e05e9 100644 --- a/textproc/hs-pretty-show/distinfo +++ b/textproc/hs-pretty-show/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499720300 -SHA256 (cabal/pretty-show-1.6.13.tar.gz) = 55ba43cb043e15738adcba3e9a5a5dd3e341026f5334fd0b9c80dfbcbc387dcd -SIZE (cabal/pretty-show-1.6.13.tar.gz) = 140057 +TIMESTAMP = 1523448613 +SHA256 (cabal/pretty-show-1.7.tar.gz) = 382b6ef4a78e4059611b5c86674ad72a6bfce821e8852da4f00b628cfbbc272f +SIZE (cabal/pretty-show-1.7.tar.gz) = 135621 diff --git a/textproc/hs-regex-applicative/Makefile b/textproc/hs-regex-applicative/Makefile index a2b3a73d09e..f0d1e11e64e 100644 --- a/textproc/hs-regex-applicative/Makefile +++ b/textproc/hs-regex-applicative/Makefile @@ -2,7 +2,7 @@ PORTNAME= regex-applicative PORTVERSION= 0.3.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-regex-base/Makefile b/textproc/hs-regex-base/Makefile index 80ff3d9612a..5ef5eaeddb7 100644 --- a/textproc/hs-regex-base/Makefile +++ b/textproc/hs-regex-base/Makefile @@ -2,7 +2,7 @@ PORTNAME= regex-base PORTVERSION= 0.93.2 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-regex-compat-tdfa/Makefile b/textproc/hs-regex-compat-tdfa/Makefile index 233c96e65e5..09bda2db8e6 100644 --- a/textproc/hs-regex-compat-tdfa/Makefile +++ b/textproc/hs-regex-compat-tdfa/Makefile @@ -2,7 +2,7 @@ PORTNAME= regex-compat-tdfa PORTVERSION= 0.95.1.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-regex-compat/Makefile b/textproc/hs-regex-compat/Makefile index b08ca00799e..9cbed60ea6c 100644 --- a/textproc/hs-regex-compat/Makefile +++ b/textproc/hs-regex-compat/Makefile @@ -2,7 +2,7 @@ PORTNAME= regex-compat PORTVERSION= 0.95.1 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-regex-pcre-builtin/Makefile b/textproc/hs-regex-pcre-builtin/Makefile index 18c04e526c0..bba3c39cf15 100644 --- a/textproc/hs-regex-pcre-builtin/Makefile +++ b/textproc/hs-regex-pcre-builtin/Makefile @@ -2,7 +2,7 @@ PORTNAME= regex-pcre-builtin PORTVERSION= 0.94.4.8.8.35 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-regex-pcre/Makefile b/textproc/hs-regex-pcre/Makefile index 63e98b93696..e28e263be52 100644 --- a/textproc/hs-regex-pcre/Makefile +++ b/textproc/hs-regex-pcre/Makefile @@ -2,7 +2,7 @@ PORTNAME= regex-pcre PORTVERSION= 0.94.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-regex-posix/Makefile b/textproc/hs-regex-posix/Makefile index 9785b6df46b..81f259744f8 100644 --- a/textproc/hs-regex-posix/Makefile +++ b/textproc/hs-regex-posix/Makefile @@ -2,7 +2,7 @@ PORTNAME= regex-posix PORTVERSION= 0.95.2 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-regex-tdfa/Makefile b/textproc/hs-regex-tdfa/Makefile index 22fd0301a58..c6a9bfa8904 100644 --- a/textproc/hs-regex-tdfa/Makefile +++ b/textproc/hs-regex-tdfa/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= regex-tdfa -PORTVERSION= 1.2.2 -PORTREVISION= 1 +PORTVERSION= 1.2.3 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= Replaces/Enhances Text.Regex LICENSE= BSD3CLAUSE -USE_CABAL= mtl parsec regex-base>=0.93.1 +USE_CABAL= mtl regex-base>=0.93.1 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/textproc/hs-regex-tdfa/distinfo b/textproc/hs-regex-tdfa/distinfo index 7d1d6321a45..81eec5bfb16 100644 --- a/textproc/hs-regex-tdfa/distinfo +++ b/textproc/hs-regex-tdfa/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624838 -SHA256 (cabal/regex-tdfa-1.2.2.tar.gz) = cb12d675be7b31ed8086d8d022023d03eb553e55dbee6e1b7a4154933d471d39 -SIZE (cabal/regex-tdfa-1.2.2.tar.gz) = 65969 +TIMESTAMP = 1523955154 +SHA256 (cabal/regex-tdfa-1.2.3.tar.gz) = 89b17ebb812d4597c0007fbbc21c78dfef70a133aa41b208217a9c99bed600d9 +SIZE (cabal/regex-tdfa-1.2.3.tar.gz) = 66268 diff --git a/textproc/hs-rfc5051/Makefile b/textproc/hs-rfc5051/Makefile index 4f6d0b5ef83..72c06daca20 100644 --- a/textproc/hs-rfc5051/Makefile +++ b/textproc/hs-rfc5051/Makefile @@ -2,7 +2,7 @@ PORTNAME= rfc5051 PORTVERSION= 0.1.0.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-scanner/Makefile b/textproc/hs-scanner/Makefile index c070c0c641f..d5476064cc9 100644 --- a/textproc/hs-scanner/Makefile +++ b/textproc/hs-scanner/Makefile @@ -2,7 +2,7 @@ PORTNAME= scanner PORTVERSION= 0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-skylighting-core/Makefile b/textproc/hs-skylighting-core/Makefile new file mode 100644 index 00000000000..7bc959ab065 --- /dev/null +++ b/textproc/hs-skylighting-core/Makefile @@ -0,0 +1,16 @@ +# $FreeBSD$ + +PORTNAME= skylighting-core +PORTVERSION= 0.7.1 +CATEGORIES= textproc haskell + +MAINTAINER= haskell@FreeBSD.org +COMMENT= Syntax highlighting library with support for over one hundred languages + +LICENSE= BSD3CLAUSE + +USE_CABAL= aeson ansi-terminal attoparsec base64-bytestring blaze-html case-insensitive colour hxt mtl \ + pretty-show regex-pcre regex-pcre-builtin safe utf8-string + +.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" +.include diff --git a/textproc/hs-skylighting-core/distinfo b/textproc/hs-skylighting-core/distinfo new file mode 100644 index 00000000000..667b1ae4b18 --- /dev/null +++ b/textproc/hs-skylighting-core/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1524848800 +SHA256 (cabal/skylighting-core-0.7.1.tar.gz) = 4ffe223554db53cedfce5af92a7f22a907904c40bf498777dfdfe3c5ccd8723e +SIZE (cabal/skylighting-core-0.7.1.tar.gz) = 545965 diff --git a/textproc/hs-skylighting-core/pkg-descr b/textproc/hs-skylighting-core/pkg-descr new file mode 100644 index 00000000000..1af3090ca07 --- /dev/null +++ b/textproc/hs-skylighting-core/pkg-descr @@ -0,0 +1,7 @@ +Skylighting is a syntax highlighting library with support for over one hundred +languages. It derives its tokenizers from XML syntax definitions used by KDE's +KSyntaxHighlighting framework, so any syntax supported by that framework can be +added. An optional command-line program is provided. Skylighting is intended to +be the successor to highlighting-kate. + +WWW: http://hackage.haskell.org/package/skylighting diff --git a/textproc/hs-skylighting/Makefile b/textproc/hs-skylighting/Makefile index fe5a47aa3eb..5614321c509 100644 --- a/textproc/hs-skylighting/Makefile +++ b/textproc/hs-skylighting/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= skylighting -PORTVERSION= 0.3.3.1 -PORTREVISION= 1 +PORTVERSION= 0.7.1 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,8 +9,9 @@ COMMENT= Syntax highlighting library with support for over one hundred languages LICENSE= BSD3CLAUSE -USE_CABAL= aeson attoparsec blaze-html case-insensitive hxt mtl \ - pretty-show regex-pcre regex-pcre-builtin safe text utf8-string +USE_CABAL= aeson ansi-terminal attoparsec base64-bytestring blaze-html \ + case-insensitive colour hxt mtl pretty-show regex-pcre \ + regex-pcre-builtin safe skylighting-core utf8-string .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/textproc/hs-skylighting/distinfo b/textproc/hs-skylighting/distinfo index 59a31d6dcf3..be12b27301a 100644 --- a/textproc/hs-skylighting/distinfo +++ b/textproc/hs-skylighting/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499717353 -SHA256 (cabal/skylighting-0.3.3.1.tar.gz) = f3e1f910a4d0e13afff2abdc54ad836ff968fcc8f4083b33c0153367393c5d57 -SIZE (cabal/skylighting-0.3.3.1.tar.gz) = 1014631 +TIMESTAMP = 1524846475 +SHA256 (cabal/skylighting-0.7.1.tar.gz) = c0bcd4f0075c77226052ab9a04f90ff8d2f2c8e97e5083d9e65843635bb0f574 +SIZE (cabal/skylighting-0.7.1.tar.gz) = 491234 diff --git a/textproc/hs-stringsearch/Makefile b/textproc/hs-stringsearch/Makefile index 5079e11069f..41bb6e06b85 100644 --- a/textproc/hs-stringsearch/Makefile +++ b/textproc/hs-stringsearch/Makefile @@ -3,7 +3,7 @@ PORTNAME= stringsearch PORTVERSION= 0.3.6.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-tagsoup/Makefile b/textproc/hs-tagsoup/Makefile index a1e655c2eb8..562476c669b 100644 --- a/textproc/hs-tagsoup/Makefile +++ b/textproc/hs-tagsoup/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= tagsoup -PORTVERSION= 0.14.1 -PORTREVISION= 1 +PORTVERSION= 0.14.6 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -11,8 +10,6 @@ COMMENT= Parsing and extracting information from HTML/XML documents LICENSE= BSD3CLAUSE -USE_CABAL= text - FLAGS_DEFINE= DOWNLOAD DOWNLOAD_DESC= Build with Download module diff --git a/textproc/hs-tagsoup/distinfo b/textproc/hs-tagsoup/distinfo index 653cf16d502..4a5409291a2 100644 --- a/textproc/hs-tagsoup/distinfo +++ b/textproc/hs-tagsoup/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624839 -SHA256 (cabal/tagsoup-0.14.1.tar.gz) = 028be660a864e0918f99f90471caea72af2bfbf8a64a423e181b2b29f9c64aeb -SIZE (cabal/tagsoup-0.14.1.tar.gz) = 44031 +TIMESTAMP = 1523444247 +SHA256 (cabal/tagsoup-0.14.6.tar.gz) = 4b4ed4db1428e859389d628dd5755074f659a424ec49934ec53e44b0fc6a63fb +SIZE (cabal/tagsoup-0.14.6.tar.gz) = 43982 diff --git a/textproc/hs-tagstream-conduit/Makefile b/textproc/hs-tagstream-conduit/Makefile index e35ea9d9bd8..74c1324736c 100644 --- a/textproc/hs-tagstream-conduit/Makefile +++ b/textproc/hs-tagstream-conduit/Makefile @@ -2,7 +2,7 @@ PORTNAME= tagstream-conduit PORTVERSION= 0.5.5.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,7 @@ COMMENT= Streamlined HTML tag parser LICENSE= BSD3CLAUSE USE_CABAL= attoparsec>=0.10 blaze-builder case-insensitive conduit>=1.2 \ - conduit-extra>=1.1.0 data-default>=0.5.0 resourcet text \ + conduit-extra>=1.1.0 data-default>=0.5.0 resourcet \ xml-conduit>=1.1.0.0 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" diff --git a/textproc/hs-texmath/Makefile b/textproc/hs-texmath/Makefile index ced97a4f3be..da4ddc367fb 100644 --- a/textproc/hs-texmath/Makefile +++ b/textproc/hs-texmath/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= texmath -PORTVERSION= 0.9.4.1 -PORTREVISION= 1 +PORTVERSION= 0.10.1.2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -11,8 +10,7 @@ COMMENT= Conversion between formats used to represent mathematics LICENSE= GPLv2 -USE_CABAL= aeson mtl network network-uri pandoc-types parsec split \ - syb text xml +USE_CABAL= aeson mtl network network-uri pandoc-types split syb xml FLAGS_ENABLE= network-uri FLAGS_DISABLE= executable diff --git a/textproc/hs-texmath/distinfo b/textproc/hs-texmath/distinfo index d300fd4ee54..4aacb04c0c4 100644 --- a/textproc/hs-texmath/distinfo +++ b/textproc/hs-texmath/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624840 -SHA256 (cabal/texmath-0.9.4.1.tar.gz) = 302202b2c896403963aefe63044ca65ca277482d0e661607010ca3bf8d9a9d04 -SIZE (cabal/texmath-0.9.4.1.tar.gz) = 1705730 +TIMESTAMP = 1524845873 +SHA256 (cabal/texmath-0.10.1.2.tar.gz) = fda230b0ce48efb1f45f14c47d3db255466b973f42699507d53f8a7ca8a5d821 +SIZE (cabal/texmath-0.10.1.2.tar.gz) = 1716634 diff --git a/textproc/hs-texmath/files/patch-texmath.cabal b/textproc/hs-texmath/files/patch-texmath.cabal deleted file mode 100644 index f1f846076b2..00000000000 --- a/textproc/hs-texmath/files/patch-texmath.cabal +++ /dev/null @@ -1,20 +0,0 @@ ---- texmath.cabal.orig 2017-07-10 15:55:23 UTC -+++ texmath.cabal -@@ -87,7 +87,7 @@ Flag network-uri - - Library - Build-depends: xml, parsec >= 3, containers, -- pandoc-types >= 1.12.3.3 && < 1.18, mtl -+ pandoc-types >= 1.12.3.3 , mtl - if impl(ghc >= 6.10) - Build-depends: base >= 4.5 && < 5, syb - else -@@ -141,7 +141,7 @@ Executable texmath - if flag(executable) - Buildable: True - Build-Depends: base >= 4.5 && < 5, texmath, xml, -- pandoc-types >= 1.12.3.3 && < 1.18, -+ pandoc-types >= 1.12.3.3 , - split, aeson, bytestring, text - else - Buildable: False diff --git a/textproc/hs-uri-bytestring-aeson/Makefile b/textproc/hs-uri-bytestring-aeson/Makefile index a0da6bf48e6..5cb5141f869 100644 --- a/textproc/hs-uri-bytestring-aeson/Makefile +++ b/textproc/hs-uri-bytestring-aeson/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= uri-bytestring-aeson -PORTVERSION= 0.1.0.1 -PORTREVISION= 1 +PORTVERSION= 0.1.0.6 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= The uri-bytestring-aeson package LICENSE= BSD3CLAUSE -USE_CABAL= aeson text uri-bytestring +USE_CABAL= aeson uri-bytestring .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/textproc/hs-uri-bytestring-aeson/distinfo b/textproc/hs-uri-bytestring-aeson/distinfo index 43e2944dbb9..f7346fcf4d6 100644 --- a/textproc/hs-uri-bytestring-aeson/distinfo +++ b/textproc/hs-uri-bytestring-aeson/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499703625 -SHA256 (cabal/uri-bytestring-aeson-0.1.0.1.tar.gz) = ef42c3b276a061e3c262de0aea6237aa1aa38ec71038f71d75bb4a3d059525fe -SIZE (cabal/uri-bytestring-aeson-0.1.0.1.tar.gz) = 1987 +TIMESTAMP = 1525011968 +SHA256 (cabal/uri-bytestring-aeson-0.1.0.6.tar.gz) = d8bd5f0772e8f45a7530b8b4422102ab24a896ac75611a3c36a02a56dffcef0a +SIZE (cabal/uri-bytestring-aeson-0.1.0.6.tar.gz) = 2003 diff --git a/textproc/hs-uri-bytestring/Makefile b/textproc/hs-uri-bytestring/Makefile index c195c20dbf1..6414880d051 100644 --- a/textproc/hs-uri-bytestring/Makefile +++ b/textproc/hs-uri-bytestring/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= uri-bytestring -PORTVERSION= 0.2.3.3 -PORTREVISION= 1 +PORTVERSION= 0.3.1.1 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-uri-bytestring/distinfo b/textproc/hs-uri-bytestring/distinfo index 71f3e2baf1f..d057dc82b94 100644 --- a/textproc/hs-uri-bytestring/distinfo +++ b/textproc/hs-uri-bytestring/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499621831 -SHA256 (cabal/uri-bytestring-0.2.3.3.tar.gz) = 3d838bf247e95a66885d2d603c1594ef01d4dade728aa50b6c2224a65d8d0b14 -SIZE (cabal/uri-bytestring-0.2.3.3.tar.gz) = 22514 +TIMESTAMP = 1524253203 +SHA256 (cabal/uri-bytestring-0.3.1.1.tar.gz) = 7f789452877d28799672c5bf9901fdcfdeaf4434d39a62849fd36cfc85e355fb +SIZE (cabal/uri-bytestring-0.3.1.1.tar.gz) = 22241 diff --git a/textproc/hs-uri-bytestring/files/patch-uri-bytestring.cabal b/textproc/hs-uri-bytestring/files/patch-uri-bytestring.cabal new file mode 100644 index 00000000000..2f8bf5512c2 --- /dev/null +++ b/textproc/hs-uri-bytestring/files/patch-uri-bytestring.cabal @@ -0,0 +1,10 @@ +--- uri-bytestring.cabal.orig 2018-04-20 19:43:36 UTC ++++ uri-bytestring.cabal +@@ -41,7 +41,6 @@ library + + attoparsec >= 0.13.1.0 && < 0.14 + , base >= 4.6 && < 5 +- , fail >= 4.9 && < 5 + , bytestring >= 0.9.1 && < 0.11 + , blaze-builder >= 0.3.0.0 && < 0.5 + , template-haskell >= 2.9 && < 2.14 diff --git a/textproc/hs-parsec/Makefile b/textproc/hs-uri-encode/Makefile similarity index 60% rename from textproc/hs-parsec/Makefile rename to textproc/hs-uri-encode/Makefile index b37f1598ec8..d315090cbd4 100644 --- a/textproc/hs-parsec/Makefile +++ b/textproc/hs-uri-encode/Makefile @@ -1,16 +1,15 @@ # $FreeBSD$ -PORTNAME= parsec -PORTVERSION= 3.1.11 -PORTREVISION= 1 +PORTNAME= uri-encode +PORTVERSION= 1.5.0.5 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org -COMMENT= Monadic parser combinators +COMMENT= URI encoding library LICENSE= BSD3CLAUSE -USE_CABAL= mtl text>=0.2 +USE_CABAL= network-uri utf8-string .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/textproc/hs-uri-encode/distinfo b/textproc/hs-uri-encode/distinfo new file mode 100644 index 00000000000..4212e969e86 --- /dev/null +++ b/textproc/hs-uri-encode/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1524855375 +SHA256 (cabal/uri-encode-1.5.0.5.tar.gz) = e82b588aad63112d34f6bad6f1ef72489b9edebfe14f2f523dc1dabdcbe2b186 +SIZE (cabal/uri-encode-1.5.0.5.tar.gz) = 3447 diff --git a/textproc/hs-uri-encode/pkg-descr b/textproc/hs-uri-encode/pkg-descr new file mode 100644 index 00000000000..c31db48b190 --- /dev/null +++ b/textproc/hs-uri-encode/pkg-descr @@ -0,0 +1,3 @@ +Unicode aware uri-encoding. + +WWW: https://github.com/silkapp/uri-encode diff --git a/textproc/hs-uri/Makefile b/textproc/hs-uri/Makefile index ebf1fb8c67e..095269b8360 100644 --- a/textproc/hs-uri/Makefile +++ b/textproc/hs-uri/Makefile @@ -2,7 +2,7 @@ PORTNAME= uri PORTVERSION= 0.1.6.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,7 @@ COMMENT= Library for working with URIs LICENSE= BSD3CLAUSE -USE_CABAL= parsec>=3.0 safe utf8-string +USE_CABAL= safe utf8-string .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/textproc/hs-xml-conduit/Makefile b/textproc/hs-xml-conduit/Makefile index cb31e113178..bc76287d5ca 100644 --- a/textproc/hs-xml-conduit/Makefile +++ b/textproc/hs-xml-conduit/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= xml-conduit -PORTVERSION= 1.5.1 -PORTREVISION= 1 +PORTVERSION= 1.8.0 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -13,7 +12,7 @@ LICENSE= MIT USE_CABAL= attoparsec>=0.10 blaze-builder>=0.2 blaze-html>=0.5 \ blaze-markup>=0.5 conduit>=1.0 conduit-extra>=1.1 \ data-default monad-control>=0.3 resourcet>=0.3 \ - text>=0.7 xml-types>=0.3.4 + xml-types>=0.3.4 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/textproc/hs-xml-conduit/distinfo b/textproc/hs-xml-conduit/distinfo index 0474c080371..da5da32152d 100644 --- a/textproc/hs-xml-conduit/distinfo +++ b/textproc/hs-xml-conduit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499546442 -SHA256 (cabal/xml-conduit-1.5.1.tar.gz) = 7afe26fa3e3160552b7a15af4a063f10678400cac54785a06ce9b70a5a5a9734 -SIZE (cabal/xml-conduit-1.5.1.tar.gz) = 37603 +TIMESTAMP = 1523899098 +SHA256 (cabal/xml-conduit-1.8.0.tar.gz) = 0382bfd3627be4970b11228948274faef51ca9a2590a7723b5787a7205a52036 +SIZE (cabal/xml-conduit-1.8.0.tar.gz) = 39469 diff --git a/textproc/hs-xml-hamlet/Makefile b/textproc/hs-xml-hamlet/Makefile index 39de69f686f..c5c45d6d0c9 100644 --- a/textproc/hs-xml-hamlet/Makefile +++ b/textproc/hs-xml-hamlet/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= xml-hamlet -PORTVERSION= 0.4.1 -PORTREVISION= 1 +PORTVERSION= 0.5.0 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= Hamlet-style quasiquoter for XML content LICENSE= BSD3CLAUSE -USE_CABAL= parsec>=2.0 shakespeare>=1.0 text>=0.10 xml-conduit>=1.0 +USE_CABAL= shakespeare>=1.0 xml-conduit>=1.0 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/textproc/hs-xml-hamlet/distinfo b/textproc/hs-xml-hamlet/distinfo index 6d415afdc90..5e91648bb30 100644 --- a/textproc/hs-xml-hamlet/distinfo +++ b/textproc/hs-xml-hamlet/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624842 -SHA256 (cabal/xml-hamlet-0.4.1.tar.gz) = 7df390f59599a0b16831c3f2cbb13ad0bebb92faa4a350fc6ae613bfba4ec2bb -SIZE (cabal/xml-hamlet-0.4.1.tar.gz) = 9149 +TIMESTAMP = 1524849871 +SHA256 (cabal/xml-hamlet-0.5.0.tar.gz) = 7bcec0aad83e72c2870efd3327553b3d78f6332cf01c12ad4b67c02f499015a3 +SIZE (cabal/xml-hamlet-0.5.0.tar.gz) = 9189 diff --git a/textproc/hs-xml-hamlet/files/patch-xml-hamlet.cabal b/textproc/hs-xml-hamlet/files/patch-xml-hamlet.cabal deleted file mode 100644 index 019f91570df..00000000000 --- a/textproc/hs-xml-hamlet/files/patch-xml-hamlet.cabal +++ /dev/null @@ -1,11 +0,0 @@ ---- xml-hamlet.cabal.orig 2017-07-10 13:36:43 UTC -+++ xml-hamlet.cabal -@@ -19,7 +19,7 @@ Library - - Build-depends: base >= 4 && < 5 - , shakespeare >= 1.0 && < 2.2 -- , xml-conduit >= 1.0 && < 1.5 -+ , xml-conduit >= 1.0 && < 1.6 - , text >= 0.10 - , template-haskell - , parsec >= 2.0 && < 3.2 diff --git a/textproc/hs-xml-types/Makefile b/textproc/hs-xml-types/Makefile index fbb26cc1698..4fe4b67b417 100644 --- a/textproc/hs-xml-types/Makefile +++ b/textproc/hs-xml-types/Makefile @@ -2,7 +2,7 @@ PORTNAME= xml-types PORTVERSION= 0.3.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,5 @@ COMMENT= Basic types for representing XML LICENSE= MIT -USE_CABAL= text - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/textproc/hs-xml/Makefile b/textproc/hs-xml/Makefile index 6722472f99b..35a12316b79 100644 --- a/textproc/hs-xml/Makefile +++ b/textproc/hs-xml/Makefile @@ -3,7 +3,7 @@ PORTNAME= xml PORTVERSION= 1.3.14 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,5 @@ COMMENT= Simple XML library for Haskell LICENSE= BSD3CLAUSE -USE_CABAL= text - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/textproc/hs-xmlhtml/Makefile b/textproc/hs-xmlhtml/Makefile index b9056120e31..9bd70396b84 100644 --- a/textproc/hs-xmlhtml/Makefile +++ b/textproc/hs-xmlhtml/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= xmlhtml -PORTVERSION= 0.2.4 -PORTREVISION= 1 +PORTVERSION= 0.2.5.2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,8 +9,7 @@ COMMENT= XML parser and renderer with HTML 5 quirks mode LICENSE= BSD3CLAUSE -USE_CABAL= blaze-builder blaze-html blaze-markup parsec text \ - unordered-containers +USE_CABAL= blaze-builder blaze-html blaze-markup unordered-containers .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/textproc/hs-xmlhtml/distinfo b/textproc/hs-xmlhtml/distinfo index b04f611d4d0..b159c775f81 100644 --- a/textproc/hs-xmlhtml/distinfo +++ b/textproc/hs-xmlhtml/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624843 -SHA256 (cabal/xmlhtml-0.2.4.tar.gz) = 80100374fe10802e3c1435d22c9281b35421db72f716d90451adc277dfe4539c -SIZE (cabal/xmlhtml-0.2.4.tar.gz) = 121541 +TIMESTAMP = 1524404821 +SHA256 (cabal/xmlhtml-0.2.5.2.tar.gz) = 64818617644bfc7c3c9fe561435af9929ef60310627b0796c78b4b99240b5bdc +SIZE (cabal/xmlhtml-0.2.5.2.tar.gz) = 123829 diff --git a/textproc/hs-xmlhtml/files/patch-src_Text_Blaze_Renderer_XmlHtml.hs b/textproc/hs-xmlhtml/files/patch-src_Text_Blaze_Renderer_XmlHtml.hs deleted file mode 100644 index cd84fb74b6a..00000000000 --- a/textproc/hs-xmlhtml/files/patch-src_Text_Blaze_Renderer_XmlHtml.hs +++ /dev/null @@ -1,30 +0,0 @@ ---- src/Text/Blaze/Renderer/XmlHtml.hs.orig 2017-05-19 10:38:07 UTC -+++ src/Text/Blaze/Renderer/XmlHtml.hs -@@ -58,22 +58,20 @@ renderNodes = go [] - (Element (getText tag) attrs (go [] content []) :) - go attrs (CustomParent tag content) = - (Element (fromChoiceStringText tag) attrs (go [] content []) :) -- go attrs (Leaf tag _ _) = -+ go attrs (Leaf tag _ _ _) = - (Element (getText tag) attrs [] :) -- go attrs (CustomLeaf tag _) = -+ go attrs (CustomLeaf tag _ _) = - (Element (fromChoiceStringText tag) attrs [] :) - go attrs (AddAttribute key _ value content) = - go ((getText key, fromChoiceStringText value) : attrs) content - go attrs (AddCustomAttribute key value content) = - go ((fromChoiceStringText key, fromChoiceStringText value) : attrs) - content -- go _ (Content content) = fromChoiceString content --#if MIN_VERSION_blaze_markup(0,6,3) -- go _ (TBI.Comment comment) = -+ go _ (Content content _) = fromChoiceString content -+ go _ (TBI.Comment comment _) = - (X.Comment (fromChoiceStringText comment) :) --#endif - go attrs (Append h1 h2) = go attrs h1 . go attrs h2 -- go _ Empty = id -+ go _ (Empty _) = id - {-# NOINLINE go #-} - {-# INLINE renderNodes #-} - diff --git a/textproc/hs-xmlhtml/files/patch-xmlhtml.cabal b/textproc/hs-xmlhtml/files/patch-xmlhtml.cabal index 4a675479e68..73eb6bd5a8d 100644 --- a/textproc/hs-xmlhtml/files/patch-xmlhtml.cabal +++ b/textproc/hs-xmlhtml/files/patch-xmlhtml.cabal @@ -1,15 +1,10 @@ ---- xmlhtml.cabal.orig 2017-05-19 10:38:07 UTC +--- xmlhtml.cabal.orig 2018-04-22 13:51:05 UTC +++ xmlhtml.cabal -@@ -820,9 +820,9 @@ Library - Text.XmlHtml.HTML.Render - - Build-depends: base >= 4 && < 5, -- blaze-builder >= 0.2 && < 0.5, -- blaze-html >= 0.5 && < 0.9, -- blaze-markup >= 0.5 && < 0.8, -+ blaze-builder >= 0.2 , -+ blaze-html >= 0.5 , -+ blaze-markup >= 0.5 , +@@ -826,7 +826,6 @@ Library + blaze-html >= 0.9 && < 0.10, + blaze-markup >= 0.8 && < 0.9, bytestring >= 0.9 && < 0.11, +- bytestring-builder >= 0.10.4.0.2 && < 0.11, containers >= 0.3 && < 0.6, parsec >= 3.1.2 && < 3.2, + text >= 0.11 && < 1.3, diff --git a/textproc/hs-yaml/Makefile b/textproc/hs-yaml/Makefile index eed0d98fb74..63107efef47 100644 --- a/textproc/hs-yaml/Makefile +++ b/textproc/hs-yaml/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= yaml -PORTVERSION= 0.8.23.1 -PORTREVISION= 1 +PORTVERSION= 0.8.29 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -11,9 +10,7 @@ COMMENT= Support for parsing and rendering YAML documents LICENSE= BSD3CLAUSE USE_CABAL= aeson>=0.5 attoparsec conduit>=1.1.0 enclosed-exceptions \ - resourcet>=0.3 scientific text unordered-containers vector - -EXECUTABLE= json2yaml yaml2json + resourcet>=0.3 scientific unordered-containers vector .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/textproc/hs-yaml/distinfo b/textproc/hs-yaml/distinfo index d4b4133c7d1..6729b43625e 100644 --- a/textproc/hs-yaml/distinfo +++ b/textproc/hs-yaml/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499546173 -SHA256 (cabal/yaml-0.8.23.1.tar.gz) = 4a9bc0b540b25db0edafea58e1c7fe5f00770bd599c9c94f16b92210bf0f606b -SIZE (cabal/yaml-0.8.23.1.tar.gz) = 81569 +TIMESTAMP = 1524402297 +SHA256 (cabal/yaml-0.8.29.tar.gz) = 1a5e5fe9d55273c286f177681c2cecb4cff77633af877756317120cc00d20f74 +SIZE (cabal/yaml-0.8.29.tar.gz) = 82660 diff --git a/textproc/p5-SGMLSpm/Makefile b/textproc/p5-SGMLSpm/Makefile index 1e81940d64e..4f6029ac0ee 100644 --- a/textproc/p5-SGMLSpm/Makefile +++ b/textproc/p5-SGMLSpm/Makefile @@ -33,7 +33,10 @@ PORTDOCS= * DOCS_INSTALL_TARGET= docs install_html HTMLDIR=${STAGEDIR}${DOCSDIR} -pre-install: - @${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${EXAMPLESDIR} +pre-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + +pre-install-EXAMPLES-on: + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .include diff --git a/textproc/py-Chameleon/Makefile b/textproc/py-Chameleon/Makefile index f805752e669..51ee0e59d76 100644 --- a/textproc/py-Chameleon/Makefile +++ b/textproc/py-Chameleon/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Chameleon -PORTVERSION= 3.2 +PORTVERSION= 3.3 CATEGORIES= textproc www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-Chameleon/distinfo b/textproc/py-Chameleon/distinfo index 566845ad0d1..0bf5f5895ae 100644 --- a/textproc/py-Chameleon/distinfo +++ b/textproc/py-Chameleon/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1507363138 -SHA256 (Chameleon-3.2.tar.gz) = ed2146fde4649f05c9def48de5d9e30d495e0dd7ac41448d14baf69b9cbe60dc -SIZE (Chameleon-3.2.tar.gz) = 116249 +TIMESTAMP = 1527234565 +SHA256 (Chameleon-3.3.tar.gz) = 77d1ae339caf4f8a0b2c19a4882e5cdf71367997d79c523a196dacfbfa365ec7 +SIZE (Chameleon-3.3.tar.gz) = 116743 diff --git a/textproc/py-parso/Makefile b/textproc/py-parso/Makefile index e7b4d3f7475..88906aafc37 100644 --- a/textproc/py-parso/Makefile +++ b/textproc/py-parso/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= parso -DISTVERSION= 0.2.0 +DISTVERSION= 0.2.1 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-parso/distinfo b/textproc/py-parso/distinfo index eaaee912a16..00dd473a451 100644 --- a/textproc/py-parso/distinfo +++ b/textproc/py-parso/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523934905 -SHA256 (parso-0.2.0.tar.gz) = 62bd6bf7f04ab5c817704ff513ef175328676471bdef3629d4bdd46626f75551 -SIZE (parso-0.2.0.tar.gz) = 380532 +TIMESTAMP = 1527287790 +SHA256 (parso-0.2.1.tar.gz) = f0604a40b96e062b0fd99cf134cc2d5cdf66939d0902f8267d938b0d5b26707f +SIZE (parso-0.2.1.tar.gz) = 380787 diff --git a/textproc/py-zope.i18nmessageid/Makefile b/textproc/py-zope.i18nmessageid/Makefile index b198b0beb29..8cbe0c905b4 100644 --- a/textproc/py-zope.i18nmessageid/Makefile +++ b/textproc/py-zope.i18nmessageid/Makefile @@ -12,6 +12,9 @@ DIST_SUBDIR= zope MAINTAINER= zope@FreeBSD.org COMMENT= Message Identifiers for internationalization +LICENSE= ZPL21 +LICENSE_FILE= ${WRKSRC}/LICENSE.txt + USES= python USE_PYTHON= distutils autoplist diff --git a/textproc/rubygem-autoprefixer-rails/Makefile b/textproc/rubygem-autoprefixer-rails/Makefile index 0503e074f56..6b81d8695d6 100644 --- a/textproc/rubygem-autoprefixer-rails/Makefile +++ b/textproc/rubygem-autoprefixer-rails/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= autoprefixer-rails -PORTVERSION= 8.5.0 +PORTVERSION= 8.5.1 CATEGORIES= textproc ruby MASTER_SITES= RG diff --git a/textproc/rubygem-autoprefixer-rails/distinfo b/textproc/rubygem-autoprefixer-rails/distinfo index 8d24defb71a..8d6a06e6583 100644 --- a/textproc/rubygem-autoprefixer-rails/distinfo +++ b/textproc/rubygem-autoprefixer-rails/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1526309951 -SHA256 (rubygem/autoprefixer-rails-8.5.0.gem) = fb0c1fbe34a73e9b165fab1c8625b27dd0e1f445e892c009250eb07b8518af5e -SIZE (rubygem/autoprefixer-rails-8.5.0.gem) = 202240 +TIMESTAMP = 1527334327 +SHA256 (rubygem/autoprefixer-rails-8.5.1.gem) = e2e9c58aaa8143067c3714eab233c87c90a9034bcc51c443435d2ee440b99a57 +SIZE (rubygem/autoprefixer-rails-8.5.1.gem) = 202752 diff --git a/www/Makefile b/www/Makefile index 496f9bd9d02..21d313dd502 100644 --- a/www/Makefile +++ b/www/Makefile @@ -1519,6 +1519,7 @@ SUBDIR += py-boto3 SUBDIR += py-bottle SUBDIR += py-bottle-cork + SUBDIR += py-branca SUBDIR += py-buku SUBDIR += py-cachecontrol SUBDIR += py-caldav @@ -1672,6 +1673,7 @@ SUBDIR += py-flask-wtf SUBDIR += py-flexget SUBDIR += py-flup6 + SUBDIR += py-folium SUBDIR += py-formalchemy SUBDIR += py-formencode SUBDIR += py-frappe-bench diff --git a/www/fabio/Makefile b/www/fabio/Makefile index 94765114ea3..79741e2ddf8 100644 --- a/www/fabio/Makefile +++ b/www/fabio/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= fabio -PORTVERSION= 1.5.6 +PORTVERSION= 1.5.9 DISTVERSIONPREFIX= v CATEGORIES= www diff --git a/www/fabio/distinfo b/www/fabio/distinfo index f372c92e6f3..48aa57e74e5 100644 --- a/www/fabio/distinfo +++ b/www/fabio/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1515280897 -SHA256 (fabiolb-fabio-v1.5.6_GH0.tar.gz) = 178764c8cba2298370166984a13f630a938c51ed8e627e24426538d7af2f3f3e -SIZE (fabiolb-fabio-v1.5.6_GH0.tar.gz) = 1691850 +TIMESTAMP = 1526573738 +SHA256 (fabiolb-fabio-v1.5.9_GH0.tar.gz) = 25e3826f25fa4baf50f0a722bf080ebb47f23b5db6064e9f4af6247872f15b9d +SIZE (fabiolb-fabio-v1.5.9_GH0.tar.gz) = 1723905 diff --git a/www/gohugo/Makefile b/www/gohugo/Makefile index f9dda691e22..b7439911271 100644 --- a/www/gohugo/Makefile +++ b/www/gohugo/Makefile @@ -2,7 +2,7 @@ PORTNAME= hugo DISTVERSIONPREFIX= v -DISTVERSION= 0.40.3 +DISTVERSION= 0.41 CATEGORIES= www PKGNAMEPREFIX= go DIST_SUBDIR= ${PKGNAMEPREFIX}${PORTNAME} diff --git a/www/gohugo/distinfo b/www/gohugo/distinfo index 144057f846a..511bcd8e948 100644 --- a/www/gohugo/distinfo +++ b/www/gohugo/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1525890868 -SHA256 (gohugo/gohugoio-hugo-v0.40.3_GH0.tar.gz) = e0301fefec3d67169920f979d777018045447c9efef71d57c9e0361b657a2ed7 -SIZE (gohugo/gohugoio-hugo-v0.40.3_GH0.tar.gz) = 15168823 +TIMESTAMP = 1527325758 +SHA256 (gohugo/gohugoio-hugo-v0.41_GH0.tar.gz) = a5a435d352ad8df3f0dd77968e6ac21925ee006e5538a37f775d9f53b30799fc +SIZE (gohugo/gohugoio-hugo-v0.41_GH0.tar.gz) = 16385469 SHA256 (gohugo/BurntSushi-toml-a368813_GH0.tar.gz) = 68dc067c4105cd20a642ddf1f4acaada7474c1b58e5b249d4bd9b0d7e8edebc2 SIZE (gohugo/BurntSushi-toml-a368813_GH0.tar.gz) = 42252 SHA256 (gohugo/PuerkitoBio-purell-0bcb03f_GH0.tar.gz) = ade9e6e2a5d1d79daaf2d729f450c482ff0aa316ea0a1d9e5e3f7a753d05c49c diff --git a/www/horde-ansel/Makefile b/www/horde-ansel/Makefile index 7f150df938c..0ecc68b517c 100644 --- a/www/horde-ansel/Makefile +++ b/www/horde-ansel/Makefile @@ -11,7 +11,7 @@ COMMENT= Horde Photo Management and Web Gallery LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USES= horde cpe php +USES= horde cpe php USE_PHP= gettext hash USE_HORDE_BUILD= Horde_Role USE_HORDE_RUN= Horde_Role \ diff --git a/www/horde-ansel/pkg-descr b/www/horde-ansel/pkg-descr index 528e3d8618e..aeccc0c827d 100644 --- a/www/horde-ansel/pkg-descr +++ b/www/horde-ansel/pkg-descr @@ -2,4 +2,4 @@ Ansel is a full featured photo management application. With it, you can create any number of galleries and subgalleries, share galleries among other Horde users or even make them public. -WWW: http://www.horde.org/apps/ansel/ +WWW: https://www.horde.org/apps/ansel/ diff --git a/www/hs-DAV/Makefile b/www/hs-DAV/Makefile index a9c599ba2c4..16a8b62a229 100644 --- a/www/hs-DAV/Makefile +++ b/www/hs-DAV/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= DAV -PORTVERSION= 1.3.1 -PORTREVISION= 1 +PORTVERSION= 1.3.2 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org diff --git a/www/hs-DAV/distinfo b/www/hs-DAV/distinfo index 1602983f2b9..b7079ff0d6b 100644 --- a/www/hs-DAV/distinfo +++ b/www/hs-DAV/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625369 -SHA256 (cabal/DAV-1.3.1.tar.gz) = 5c80faa58f8bbfb4bbdf7f3db6f23a3a4d26a199831ceb27dd5f69fef21bc009 -SIZE (cabal/DAV-1.3.1.tar.gz) = 20003 +TIMESTAMP = 1524938205 +SHA256 (cabal/DAV-1.3.2.tar.gz) = 613314357579b29e1d3fa8451b51e8b9a1307a2b33b65a3f2b2ef2bece025169 +SIZE (cabal/DAV-1.3.2.tar.gz) = 19992 diff --git a/www/hs-HTTP/Makefile b/www/hs-HTTP/Makefile index 5e82756ef2c..3a0e98979b1 100644 --- a/www/hs-HTTP/Makefile +++ b/www/hs-HTTP/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= HTTP -PORTVERSION= 4000.3.7 -PORTREVISION= 1 +PORTVERSION= 4000.3.11 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -11,8 +10,7 @@ COMMENT= Library for client-side HTTP LICENSE= BSD3CLAUSE -USE_CABAL= mtl>=2.0 network>=2.6 network-uri>=2.6 old-time>=1.0.0.0 \ - parsec>=2.0 +USE_CABAL= mtl>=2.0 network>=2.6 network-uri>=2.6 old-time>=1.0.0.0 FLAGS_ENABLE= network-uri FLAGS_DISABLE= mtl1 warn-as-error network23 conduit10 warp-tests diff --git a/www/hs-HTTP/distinfo b/www/hs-HTTP/distinfo index 0036ef459ee..3c79a7260ff 100644 --- a/www/hs-HTTP/distinfo +++ b/www/hs-HTTP/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499538127 -SHA256 (cabal/HTTP-4000.3.7.tar.gz) = d5c0cceb84e84434e851e97b3c2fce4b3e600d0410e7ac4427df44c541adeae8 -SIZE (cabal/HTTP-4000.3.7.tar.gz) = 71709 +TIMESTAMP = 1523302416 +SHA256 (cabal/HTTP-4000.3.11.tar.gz) = fad22b39d8027107158407a3af73907dbb66e403d9aa7b9fd778db171c65b645 +SIZE (cabal/HTTP-4000.3.11.tar.gz) = 71747 diff --git a/www/hs-activehs/Makefile b/www/hs-activehs/Makefile index 01d05405802..c3ff4d77d56 100644 --- a/www/hs-activehs/Makefile +++ b/www/hs-activehs/Makefile @@ -2,7 +2,7 @@ PORTNAME= activehs PORTVERSION= 0.3.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -14,7 +14,7 @@ USE_CABAL= activehs-base blaze-html blaze-markup cmdargs data-pprint \ dia-base dia-functions exceptions haskell-src-exts \ highlighting-kate hint hoogle mtl pandoc pureMD5 \ QuickCheck simple-reflect snap-core snap-server split syb \ - text utf8-string + utf8-string STANDALONE= yes EXECUTABLE= activehs diff --git a/www/hs-authenticate/Makefile b/www/hs-authenticate/Makefile index 7a41fd196fa..93d5021d675 100644 --- a/www/hs-authenticate/Makefile +++ b/www/hs-authenticate/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= authenticate -PORTVERSION= 1.3.3.2 -PORTREVISION= 1 +PORTVERSION= 1.3.4 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -13,7 +12,7 @@ LICENSE= BSD3CLAUSE USE_CABAL= aeson>=0.5 attoparsec blaze-builder case-insensitive>=0.2 \ conduit>=0.5 http-conduit>=1.5 http-types>=0.6 monad-control \ network>=2.6 network-uri>=2.6 resourcet \ - tagstream-conduit>=0.5.5 text unordered-containers \ + tagstream-conduit>=0.5.5 unordered-containers \ xml-conduit>=1.0 FLAGS_ENABLE= network-uri diff --git a/www/hs-authenticate/distinfo b/www/hs-authenticate/distinfo index 6b17aafaf3b..8f46fb0234c 100644 --- a/www/hs-authenticate/distinfo +++ b/www/hs-authenticate/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625370 -SHA256 (cabal/authenticate-1.3.3.2.tar.gz) = a65ff7791e646ea847fc6b8369addeecf6d2c3055a0b7ebe1421881103656e30 -SIZE (cabal/authenticate-1.3.3.2.tar.gz) = 8785 +TIMESTAMP = 1525184608 +SHA256 (cabal/authenticate-1.3.4.tar.gz) = 3fd566dbfdf75d81ad1bebd19facb9f01509ead6e27d9aed802404ecde932fb8 +SIZE (cabal/authenticate-1.3.4.tar.gz) = 8814 diff --git a/www/hs-cgi/Makefile b/www/hs-cgi/Makefile index 055678dd23d..9ff290481f9 100644 --- a/www/hs-cgi/Makefile +++ b/www/hs-cgi/Makefile @@ -3,7 +3,7 @@ PORTNAME= cgi PORTVERSION= 3001.3.0.2 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= www haskell @@ -13,7 +13,7 @@ COMMENT= Library for writing CGI programs LICENSE= BSD3CLAUSE USE_CABAL= exceptions mtl>=2.2.1 multipart>=0.1.2 network>=2.6 \ - network-uri>=2.6 old-locale old-time parsec>=2.0 + network-uri>=2.6 old-locale old-time FLAGS_ENABLE= network-uri FLAGS_DISABLE= old-mtl diff --git a/www/hs-cgi/files/patch-cgi.cabal b/www/hs-cgi/files/patch-cgi.cabal new file mode 100644 index 00000000000..77c886321db --- /dev/null +++ b/www/hs-cgi/files/patch-cgi.cabal @@ -0,0 +1,16 @@ +--- cgi.cabal.orig 2018-04-22 18:05:14 UTC ++++ cgi.cabal +@@ -44,11 +44,11 @@ Library + + Build-depends: + parsec >= 2.0 && < 3.2, +- exceptions < 0.9, ++ exceptions < 0.11, + xhtml >= 3000.0.0 && < 3000.3, + bytestring < 0.11, + base >= 4.5 && < 5, +- time >= 1.5 && < 1.7, ++ time >= 1.5 && < 1.9, + containers < 0.6, + multipart >= 0.1.2 && < 0.2 + If flag(network-uri) diff --git a/www/hs-cookie/Makefile b/www/hs-cookie/Makefile index b514ebb45f5..181c26a77aa 100644 --- a/www/hs-cookie/Makefile +++ b/www/hs-cookie/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= cookie -PORTVERSION= 0.4.2.1 -PORTREVISION= 1 +PORTVERSION= 0.4.4 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= HTTP cookie parsing and rendering LICENSE= BSD3CLAUSE -USE_CABAL= blaze-builder data-default-class old-locale text +USE_CABAL= blaze-builder data-default-class old-locale .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/www/hs-cookie/distinfo b/www/hs-cookie/distinfo index 465efe1e29d..4a85c10ee78 100644 --- a/www/hs-cookie/distinfo +++ b/www/hs-cookie/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625371 -SHA256 (cabal/cookie-0.4.2.1.tar.gz) = 06413091908e20ce154effdcd354d7eea1447380e29a8acdb15c3347512852e4 -SIZE (cabal/cookie-0.4.2.1.tar.gz) = 5774 +TIMESTAMP = 1523784609 +SHA256 (cabal/cookie-0.4.4.tar.gz) = 3245ed04ae933cf7becede816d1f76043b851472700abf558ae90b28414cc0e3 +SIZE (cabal/cookie-0.4.4.tar.gz) = 5996 diff --git a/www/hs-css-text/Makefile b/www/hs-css-text/Makefile index 9bb5b6cbe5e..0f4d8a0636f 100644 --- a/www/hs-css-text/Makefile +++ b/www/hs-css-text/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= css-text -PORTVERSION= 0.1.2.2 -PORTREVISION= 1 +PORTVERSION= 0.1.3.0 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= CSS parser and renderer LICENSE= BSD3CLAUSE -USE_CABAL= attoparsec>=0.10.2.0 text>=0.11 +USE_CABAL= attoparsec>=0.10.2.0 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/www/hs-css-text/distinfo b/www/hs-css-text/distinfo index 237086d00b9..383dd60ddb0 100644 --- a/www/hs-css-text/distinfo +++ b/www/hs-css-text/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625372 -SHA256 (cabal/css-text-0.1.2.2.tar.gz) = dff564ac08587950dab4fedf07c357d9907099f60c87bf465d648a8965e61987 -SIZE (cabal/css-text-0.1.2.2.tar.gz) = 4033 +TIMESTAMP = 1523784892 +SHA256 (cabal/css-text-0.1.3.0.tar.gz) = 5ff507bf3863219f41e7f2d215e5511fe15ee13d1e28bd3ee64e0b0b894bcd7a +SIZE (cabal/css-text-0.1.3.0.tar.gz) = 4594 diff --git a/www/hs-fastcgi/Makefile b/www/hs-fastcgi/Makefile index 60e55233361..419f182bbf4 100644 --- a/www/hs-fastcgi/Makefile +++ b/www/hs-fastcgi/Makefile @@ -3,7 +3,7 @@ PORTNAME= fastcgi PORTVERSION= 3001.0.2.4 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org diff --git a/www/hs-gitit/Makefile b/www/hs-gitit/Makefile index e7e2ddc4e93..cbcd0e9a084 100644 --- a/www/hs-gitit/Makefile +++ b/www/hs-gitit/Makefile @@ -2,7 +2,7 @@ PORTNAME= gitit PORTVERSION= 0.12.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -13,12 +13,14 @@ LICENSE= GPLv2 USE_CABAL= ConfigFile HStringTemplate HTTP SHA aeson base64-bytestring \ blaze-html feed filestore happstack-server highlighting-kate \ hoauth2 hslogger http-client-tls http-conduit json mtl \ - old-locale old-time pandoc pandoc-types parsec random \ - recaptcha safe split syb tagsoup text uri url utf8-string \ + old-locale old-time pandoc pandoc-types random \ + recaptcha safe split syb tagsoup uri url utf8-string \ uuid xml xss-sanitize zlib EXECUTABLE= expireGititCache gitit +IGNORE= Doesn't build with newest packages + FLAGS_DEFINE= PLUGINS FLAGS_DEFAULT= PLUGINS diff --git a/www/hs-hS3/Makefile b/www/hs-hS3/Makefile index 05900bc542a..7d197bc8486 100644 --- a/www/hs-hS3/Makefile +++ b/www/hs-hS3/Makefile @@ -2,7 +2,7 @@ PORTNAME= hS3 PORTVERSION= 0.5.9 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org diff --git a/www/hs-happstack-server/Makefile b/www/hs-happstack-server/Makefile index ce4c70a3c01..d5406f6546b 100644 --- a/www/hs-happstack-server/Makefile +++ b/www/hs-happstack-server/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= happstack-server -PORTVERSION= 7.4.6.4 -PORTREVISION= 1 +PORTVERSION= 7.5.1 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -12,9 +11,9 @@ LICENSE= BSD3CLAUSE USE_CABAL= base64-bytestring>=1.0 blaze-html>=0.5 exceptions \ extensible-exceptions hslogger>=1.0.2 html monad-control>=0.3 \ - mtl>=2 network>=2.6 network-uri>=2.6 parsec sendfile>=0.7.1 \ - syb system-filepath>=0.3.1 text>=0.10 threads>=0.5 \ - time-compat transformers-base>=0.4 utf8-string>=0.3.4 zlib + mtl>=2 network>=2.6 network-uri>=2.6 semigroups sendfile>=0.7.1 \ + syb system-filepath>=0.3.1 threads>=0.5 time-compat \ + transformers-base>=0.4 utf8-string>=0.3.4 zlib FLAGS_ENABLE= network-uri template_haskell diff --git a/www/hs-happstack-server/distinfo b/www/hs-happstack-server/distinfo index 748b0dcb23b..51096e97505 100644 --- a/www/hs-happstack-server/distinfo +++ b/www/hs-happstack-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499538462 -SHA256 (cabal/happstack-server-7.4.6.4.tar.gz) = b4c6c9503deeff37751af9ab9700158347658f28f1712933f9f1c8763b4ea1b9 -SIZE (cabal/happstack-server-7.4.6.4.tar.gz) = 81123 +TIMESTAMP = 1524594391 +SHA256 (cabal/happstack-server-7.5.1.tar.gz) = 32877ec758149dd3ffbd2a03f3fecd3a69bcac8f6c499e3a08e43bee1c9f8ea1 +SIZE (cabal/happstack-server-7.5.1.tar.gz) = 81810 diff --git a/www/hs-happstack/Makefile b/www/hs-happstack/Makefile index 0b6b6b7cbc9..5e1651980ec 100644 --- a/www/hs-happstack/Makefile +++ b/www/hs-happstack/Makefile @@ -12,5 +12,7 @@ LICENSE= BSD3CLAUSE USE_CABAL= happstack-server>=7.0 +IGNORE= Doesn't build with recent GHC version + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/www/hs-heist/Makefile b/www/hs-heist/Makefile index 213570cd5f3..618093ccae8 100644 --- a/www/hs-heist/Makefile +++ b/www/hs-heist/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= heist -PORTVERSION= 1.0.1.0 -PORTREVISION= 1 +PORTVERSION= 1.1 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -12,7 +11,7 @@ LICENSE= BSD3CLAUSE USE_CABAL= aeson attoparsec blaze-builder blaze-html directory-tree \ dlist hashable lifted-base map-syntax monad-control mtl \ - random text transformers-base unordered-containers vector \ + random transformers-base unordered-containers vector \ xmlhtml .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" diff --git a/www/hs-heist/distinfo b/www/hs-heist/distinfo index 4ea7affa6db..58a49974dbf 100644 --- a/www/hs-heist/distinfo +++ b/www/hs-heist/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625374 -SHA256 (cabal/heist-1.0.1.0.tar.gz) = fd4ff3c1bfc1473feb9e913a5cdecaf56bc9db022abc27a76768cb6345c68bcb -SIZE (cabal/heist-1.0.1.0.tar.gz) = 71050 +TIMESTAMP = 1524939588 +SHA256 (cabal/heist-1.1.tar.gz) = 78c939ca5dfc33e399b964b514f77c1f262efa36b625677c06f00602e2c00d96 +SIZE (cabal/heist-1.1.tar.gz) = 71239 diff --git a/www/hs-heist/files/patch-heist.cabal b/www/hs-heist/files/patch-heist.cabal deleted file mode 100644 index 59facc7f3c3..00000000000 --- a/www/hs-heist/files/patch-heist.cabal +++ /dev/null @@ -1,29 +0,0 @@ ---- heist.cabal.orig 2016-10-28 08:41:35 UTC -+++ heist.cabal -@@ -151,14 +151,14 @@ Library - Heist.Interpreted.Internal - - build-depends: -- aeson >= 0.6 && < 1.1, -+ aeson >= 0.6 && < 1.3, - attoparsec >= 0.10 && < 0.14, - base >= 4 && < 5, - blaze-builder >= 0.2 && < 0.5, -- blaze-html >= 0.4 && < 0.9, -+ blaze-html >= 0.4 && < 0.10, - bytestring >= 0.9 && < 0.11, - containers >= 0.2 && < 0.6, -- directory >= 1.1 && < 1.3, -+ directory >= 1.1 && < 1.4, - directory-tree >= 0.10 && < 0.13, - dlist >= 0.5 && < 0.9, - filepath >= 1.3 && < 1.5, -@@ -174,7 +174,7 @@ Library - transformers >= 0.3 && < 0.6, - transformers-base >= 0.4 && < 0.5, - unordered-containers >= 0.1.4 && < 0.3, -- vector >= 0.9 && < 0.12, -+ vector >= 0.9 && < 0.13, - xmlhtml >= 0.2.3.5 && < 0.3 - - if impl(ghc >= 6.12.0) diff --git a/www/hs-hjsmin/Makefile b/www/hs-hjsmin/Makefile index b81ba2811ed..61200a87ddc 100644 --- a/www/hs-hjsmin/Makefile +++ b/www/hs-hjsmin/Makefile @@ -2,7 +2,7 @@ PORTNAME= hjsmin PORTVERSION= 0.2.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,7 @@ COMMENT= Haskell implementation of a javascript minifier LICENSE= BSD3CLAUSE USE_CABAL= blaze-builder>=0.2 language-javascript>=0.5.14 \ - optparse-applicative>=0.7 text>=0.8 + optparse-applicative>=0.7 EXECUTABLE= hjsmin diff --git a/www/hs-http-api-data/Makefile b/www/hs-http-api-data/Makefile index 0365a209387..99ab8a5250d 100644 --- a/www/hs-http-api-data/Makefile +++ b/www/hs-http-api-data/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= http-api-data -PORTVERSION= 0.3.7.1 -PORTREVISION= 1 +PORTVERSION= 0.3.8.1 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -11,8 +10,8 @@ COMMENT= Convert Haskell data types to and from HTTP API data LICENSE= GPLv3 USE_CABAL= attoparsec attoparsec-iso8601 hashable http-types \ - text time-locale-compat unordered-containers \ - uri-bytestring uuid-types + time-locale-compat unordered-containers uri-bytestring \ + uuid-types .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/www/hs-http-api-data/distinfo b/www/hs-http-api-data/distinfo index 4e253b5daa0..f3da4d21c49 100644 --- a/www/hs-http-api-data/distinfo +++ b/www/hs-http-api-data/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625375 -SHA256 (cabal/http-api-data-0.3.7.1.tar.gz) = 8c633e95113c8ab655f4ba67e51e41a2c9035f0122ea68bfbb876b37277075fd -SIZE (cabal/http-api-data-0.3.7.1.tar.gz) = 18907 +TIMESTAMP = 1524685052 +SHA256 (cabal/http-api-data-0.3.8.1.tar.gz) = 6eeaba4b29a00407cb20b865825b17b8d884c26b09c5bbe7b6e673b4522106b3 +SIZE (cabal/http-api-data-0.3.8.1.tar.gz) = 19427 diff --git a/www/hs-http-client-tls/Makefile b/www/hs-http-client-tls/Makefile index 0cc953d2afa..cce987f7f32 100644 --- a/www/hs-http-client-tls/Makefile +++ b/www/hs-http-client-tls/Makefile @@ -2,7 +2,7 @@ PORTNAME= http-client-tls PORTVERSION= 0.3.5.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org diff --git a/www/hs-http-client/Makefile b/www/hs-http-client/Makefile index ea01c51d80b..5ebbef5820f 100644 --- a/www/hs-http-client/Makefile +++ b/www/hs-http-client/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= http-client -PORTVERSION= 0.5.7.0 -PORTREVISION= 1 +PORTVERSION= 0.5.12.1 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -12,8 +11,8 @@ LICENSE= MIT USE_CABAL= base64-bytestring>=1.0 blaze-builder>=0.3 case-insensitive>=1.0 \ cookie data-default-class exceptions>=0.4 http-types>=0.8 \ - mime-types network>=2.6 network-uri>=2.6 random \ - streaming-commons>=0.1.0.2 text>=0.11 + memory mime-types network>=2.6 network-uri>=2.6 random \ + streaming-commons>=0.1.0.2 FLAGS_ENABLE= network-uri diff --git a/www/hs-http-client/distinfo b/www/hs-http-client/distinfo index a9aada3bf64..d9eca7ef4c2 100644 --- a/www/hs-http-client/distinfo +++ b/www/hs-http-client/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625375 -SHA256 (cabal/http-client-0.5.7.0.tar.gz) = e241eac22c55cd851de534b9d84149702a8b3990d10afc282bd6955df550ffa3 -SIZE (cabal/http-client-0.5.7.0.tar.gz) = 86010 +TIMESTAMP = 1524400718 +SHA256 (cabal/http-client-0.5.12.1.tar.gz) = 4b5116324d217f0498d258d37135a52f3e69103d3a951b0999618b263c9bd63e +SIZE (cabal/http-client-0.5.12.1.tar.gz) = 87578 diff --git a/www/hs-http-conduit/Makefile b/www/hs-http-conduit/Makefile index 983b0ab68d6..0b975d9111d 100644 --- a/www/hs-http-conduit/Makefile +++ b/www/hs-http-conduit/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= http-conduit -PORTVERSION= 2.2.3.1 -PORTREVISION= 1 +PORTVERSION= 2.3.1 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org diff --git a/www/hs-http-conduit/distinfo b/www/hs-http-conduit/distinfo index d230a1ad1f2..7d34d06f985 100644 --- a/www/hs-http-conduit/distinfo +++ b/www/hs-http-conduit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625376 -SHA256 (cabal/http-conduit-2.2.3.1.tar.gz) = 53ae16c601f980f323f2b24a32a776f9867b6b595e6e1929d440d1549715ca0e -SIZE (cabal/http-conduit-2.2.3.1.tar.gz) = 37632 +TIMESTAMP = 1524934706 +SHA256 (cabal/http-conduit-2.3.1.tar.gz) = 8251c3f0ab2a42b998bda4aaf2805e8c3325f0084462502661ce964f671f7859 +SIZE (cabal/http-conduit-2.3.1.tar.gz) = 27332 diff --git a/www/hs-http-date/Makefile b/www/hs-http-date/Makefile index 9f6735017a8..d90884849a5 100644 --- a/www/hs-http-date/Makefile +++ b/www/hs-http-date/Makefile @@ -2,7 +2,7 @@ PORTNAME= http-date PORTVERSION= 0.0.6.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org diff --git a/www/hs-http-reverse-proxy/Makefile b/www/hs-http-reverse-proxy/Makefile index e395021c3c1..8eb54818c09 100644 --- a/www/hs-http-reverse-proxy/Makefile +++ b/www/hs-http-reverse-proxy/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= http-reverse-proxy -PORTVERSION= 0.4.4 -PORTREVISION= 1 +PORTVERSION= 0.6.0 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -13,7 +12,7 @@ LICENSE= BSD3CLAUSE USE_CABAL= async blaze-builder>=0.3 case-insensitive>=0.4 conduit>=1.1 \ conduit-extra data-default-class http-client>=0.3 \ http-types>=0.6 lifted-base>=0.1 monad-control>=0.3 \ - network resourcet streaming-commons text>=0.11 wai>=3.0 \ + network resourcet streaming-commons wai>=3.0 unliftio \ wai-logger word8>=0.0 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" diff --git a/www/hs-http-reverse-proxy/distinfo b/www/hs-http-reverse-proxy/distinfo index 18972d2eda0..27d4dd379fe 100644 --- a/www/hs-http-reverse-proxy/distinfo +++ b/www/hs-http-reverse-proxy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625376 -SHA256 (cabal/http-reverse-proxy-0.4.4.tar.gz) = 1caa943a7b9704a73ae9fa14606f96a6b9eec7312c424dd59574515a8c954978 -SIZE (cabal/http-reverse-proxy-0.4.4.tar.gz) = 10394 +TIMESTAMP = 1524852143 +SHA256 (cabal/http-reverse-proxy-0.6.0.tar.gz) = fb1c913111478384c4f23647810b8c3c01c79e9276a08a1ea46215e4a42dd1a8 +SIZE (cabal/http-reverse-proxy-0.6.0.tar.gz) = 10538 diff --git a/www/hs-http-server/Makefile b/www/hs-http-server/Makefile index 8790ec76ed4..42728d0cd8c 100644 --- a/www/hs-http-server/Makefile +++ b/www/hs-http-server/Makefile @@ -3,7 +3,7 @@ PORTNAME= http-server PORTVERSION= 1.0.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -12,7 +12,7 @@ COMMENT= Library for writing Haskell web servers LICENSE= BSD3CLAUSE USE_CABAL= HTTP>=4000.2.0 mime>=0.3 network>=2.6 network-uri>=2.6 \ - text>=1.0 url>=2.0 utf8-string>=0.3.4 + url>=2.0 utf8-string>=0.3.4 INSTALL_PORTEXAMPLES= cd ${WRKSRC}/example && \ ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR} diff --git a/www/hs-http-types/Makefile b/www/hs-http-types/Makefile index 715e56934d7..925e96145ad 100644 --- a/www/hs-http-types/Makefile +++ b/www/hs-http-types/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= http-types -PORTVERSION= 0.9.1 -PORTREVISION= 1 +PORTVERSION= 0.12.1 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= Generic HTTP types for Haskell (for both client and server code) LICENSE= BSD3CLAUSE -USE_CABAL= blaze-builder>=0.2.1.4 case-insensitive>=0.2 text>=0.11.0.2 +USE_CABAL= blaze-builder>=0.2.1.4 case-insensitive>=0.2 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/www/hs-http-types/distinfo b/www/hs-http-types/distinfo index c4a5448e9ca..46fc0b08909 100644 --- a/www/hs-http-types/distinfo +++ b/www/hs-http-types/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625376 -SHA256 (cabal/http-types-0.9.1.tar.gz) = 7bed648cdc1c69e76bf039763dbe1074b55fd2704911dd0cb6b7dfebf1b6f550 -SIZE (cabal/http-types-0.9.1.tar.gz) = 12284 +TIMESTAMP = 1523783338 +SHA256 (cabal/http-types-0.12.1.tar.gz) = 3fa7715428f375b6aa4998ef17822871d7bfe1b55ebd9329efbacd4dad9969f3 +SIZE (cabal/http-types-0.12.1.tar.gz) = 13189 diff --git a/www/hs-http2/Makefile b/www/hs-http2/Makefile index 7cd6038548e..ef763e157be 100644 --- a/www/hs-http2/Makefile +++ b/www/hs-http2/Makefile @@ -2,7 +2,7 @@ PORTNAME= http2 PORTVERSION= 1.6.3 -PORTREVISION= 1 +PORTREVISION= 3 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,7 @@ COMMENT= HTTP/2.0 library including frames and HPACK LICENSE= BSD3CLAUSE USE_CABAL= aeson aeson-pretty case-insensitive hex mwc-random psqueues \ - stm text unordered-containers vector word8 + unordered-containers vector word8 FLAGS_DISABLE= devel diff --git a/www/hs-multipart/Makefile b/www/hs-multipart/Makefile index 074b2ba84ea..3b57a3f9099 100644 --- a/www/hs-multipart/Makefile +++ b/www/hs-multipart/Makefile @@ -2,7 +2,7 @@ PORTNAME= multipart PORTVERSION= 0.1.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,5 @@ COMMENT= HTTP multipart split out of the cgi package LICENSE= BSD3CLAUSE -USE_CABAL= parsec>=2.0 - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/www/hs-oeis/Makefile b/www/hs-oeis/Makefile index d57fc7c17b2..6b47be32dec 100644 --- a/www/hs-oeis/Makefile +++ b/www/hs-oeis/Makefile @@ -3,7 +3,7 @@ PORTNAME= oeis PORTVERSION= 0.3.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org diff --git a/www/hs-path-pieces/Makefile b/www/hs-path-pieces/Makefile index 9e5c9addc79..60049966655 100644 --- a/www/hs-path-pieces/Makefile +++ b/www/hs-path-pieces/Makefile @@ -2,7 +2,7 @@ PORTNAME= path-pieces PORTVERSION= 0.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,5 @@ COMMENT= Components of paths LICENSE= BSD3CLAUSE -USE_CABAL= text>=0.5 - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/www/hs-recaptcha/Makefile b/www/hs-recaptcha/Makefile index 513eea7f590..3ad13f3a691 100644 --- a/www/hs-recaptcha/Makefile +++ b/www/hs-recaptcha/Makefile @@ -2,7 +2,7 @@ PORTNAME= recaptcha PORTVERSION= 0.1.0.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org diff --git a/www/hs-shakespeare/Makefile b/www/hs-shakespeare/Makefile index cf7cc6c3bfb..de6fcfb9b3b 100644 --- a/www/hs-shakespeare/Makefile +++ b/www/hs-shakespeare/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= shakespeare -PORTVERSION= 2.0.13 -PORTREVISION= 1 +PORTVERSION= 2.0.15 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= Toolkit for making compile-time interpolated templates LICENSE= MIT -USE_CABAL= aeson blaze-html blaze-markup exceptions parsec text +USE_CABAL= aeson blaze-html blaze-markup exceptions .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/www/hs-shakespeare/distinfo b/www/hs-shakespeare/distinfo index d25d7c0177f..d842e51d2bd 100644 --- a/www/hs-shakespeare/distinfo +++ b/www/hs-shakespeare/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499543938 -SHA256 (cabal/shakespeare-2.0.13.tar.gz) = a67e7f3186a7f33b90f97377b5e68ed20f76daedc564fcf578cf17a7f7ac580e -SIZE (cabal/shakespeare-2.0.13.tar.gz) = 65054 +TIMESTAMP = 1524400477 +SHA256 (cabal/shakespeare-2.0.15.tar.gz) = 4354c6eebbfa89103c8090aae3bc7be5fceae6a0e327acf8adc4f3fd535864ee +SIZE (cabal/shakespeare-2.0.15.tar.gz) = 65369 diff --git a/www/hs-snap-core/Makefile b/www/hs-snap-core/Makefile index 00764ef8eb7..97e0d5f6e53 100644 --- a/www/hs-snap-core/Makefile +++ b/www/hs-snap-core/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= snap-core -PORTVERSION= 1.0.2.1 -PORTREVISION= 1 +PORTVERSION= 1.0.3.2 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -12,7 +11,7 @@ LICENSE= BSD3CLAUSE USE_CABAL= attoparsec case-insensitive hashable HUnit io-streams \ lifted-base monad-control mtl network-uri old-locale \ - random readable regex-posix text time-locale-compat \ + random readable regex-posix time-locale-compat \ transformers-base unix-compat unordered-containers \ vector diff --git a/www/hs-snap-core/distinfo b/www/hs-snap-core/distinfo index 5ff85b7f888..4ec9f3cfb0d 100644 --- a/www/hs-snap-core/distinfo +++ b/www/hs-snap-core/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499544248 -SHA256 (cabal/snap-core-1.0.2.1.tar.gz) = de903d5dc4640f49cfebb41b4442f4901057a8627694373639d3972ccdcca11d -SIZE (cabal/snap-core-1.0.2.1.tar.gz) = 142939 +TIMESTAMP = 1524419838 +SHA256 (cabal/snap-core-1.0.3.2.tar.gz) = 4c4398476fe882122ce8adc03f69509588d071fc011f50162cd69706093dd88c +SIZE (cabal/snap-core-1.0.3.2.tar.gz) = 149530 diff --git a/www/hs-snap-server/Makefile b/www/hs-snap-server/Makefile index 4d0e9f60910..f6aa848f40b 100644 --- a/www/hs-snap-server/Makefile +++ b/www/hs-snap-server/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= snap-server -PORTVERSION= 1.0.2.2 -PORTREVISION= 1 +PORTVERSION= 1.1.0.0 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -12,7 +11,7 @@ LICENSE= BSD3CLAUSE USE_CABAL= attoparsec blaze-builder case-insensitive clock io-streams \ io-streams-haproxy lifted-base mtl network old-locale snap-core \ - text unix-compat vector + unix-compat vector FLAGS_DEFINE= OPENSSL diff --git a/www/hs-snap-server/distinfo b/www/hs-snap-server/distinfo index 8b20917a87a..5bef910ac31 100644 --- a/www/hs-snap-server/distinfo +++ b/www/hs-snap-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499544292 -SHA256 (cabal/snap-server-1.0.2.2.tar.gz) = 27de5fb962e88fbc4285015c2e7f7abf0e06dac64e8f9737ad6ece6074fa837f -SIZE (cabal/snap-server-1.0.2.2.tar.gz) = 74372 +TIMESTAMP = 1524853220 +SHA256 (cabal/snap-server-1.1.0.0.tar.gz) = 249ea390a4e54899b310c0dd13b91af007a2b685bd0d9769c3e208dd914d7c6f +SIZE (cabal/snap-server-1.1.0.0.tar.gz) = 74090 diff --git a/www/hs-snap/Makefile b/www/hs-snap/Makefile index 9f1fc90bd6b..558e1e0bc8a 100644 --- a/www/hs-snap/Makefile +++ b/www/hs-snap/Makefile @@ -2,7 +2,7 @@ PORTNAME= snap PORTVERSION= 1.0.0.1 -PORTREVISION= 1 +PORTREVISION= 3 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -13,8 +13,10 @@ LICENSE= BSD3CLAUSE USE_CABAL= aeson attoparsec cereal clientsession configurator \ directory-tree dlist hashable heist lens lifted-base \ map-syntax monad-control mtl mwc-random pwstore-fast \ - snap-core snap-server stm text transformers-base \ + snap-core snap-server transformers-base \ unordered-containers xmlhtml +IGNORE= Doesn't build with recent GHC version + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/www/hs-url/Makefile b/www/hs-url/Makefile index f36afb72280..5c02961c704 100644 --- a/www/hs-url/Makefile +++ b/www/hs-url/Makefile @@ -3,7 +3,7 @@ PORTNAME= url PORTVERSION= 2.1.3 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org diff --git a/www/hs-wai-app-static/Makefile b/www/hs-wai-app-static/Makefile index 37baf4e3959..98eb667f2f9 100644 --- a/www/hs-wai-app-static/Makefile +++ b/www/hs-wai-app-static/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= wai-app-static -PORTVERSION= 3.1.6.1 -PORTREVISION= 1 +PORTVERSION= 3.1.6.2 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -14,7 +13,7 @@ USE_CABAL= base64-bytestring>=0.1 blaze-builder>=0.2.1.4 blaze-html>=0.5 \ blaze-markup>=0.5.1 byteable cryptohash>=0.11 \ cryptohash-conduit file-embed>=0.0.3.1 http-date \ http-types>=0.7 mime-types>=0.1 optparse-applicative>=0.7 \ - text>=0.7 unix-compat>=0.2 unordered-containers>=0.2 wai>=3.0 \ + unix-compat>=0.2 unordered-containers>=0.2 wai>=3.0 \ wai-extra>=3.0 warp>=3.0.11 zlib>=0.5 EXECUTABLE= warp diff --git a/www/hs-wai-app-static/distinfo b/www/hs-wai-app-static/distinfo index c2fddb83753..61df9d10107 100644 --- a/www/hs-wai-app-static/distinfo +++ b/www/hs-wai-app-static/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625380 -SHA256 (cabal/wai-app-static-3.1.6.1.tar.gz) = b318acf31e2e809411f119744a016ba0a78f52554ac7321a3a1410a218886668 -SIZE (cabal/wai-app-static-3.1.6.1.tar.gz) = 22686 +TIMESTAMP = 1525035879 +SHA256 (cabal/wai-app-static-3.1.6.2.tar.gz) = d0b0a566be61ef4c8f800922a71dbc4de64287f8f73782b1461cd5d294c1dc3e +SIZE (cabal/wai-app-static-3.1.6.2.tar.gz) = 22509 diff --git a/www/hs-wai-extra/Makefile b/www/hs-wai-extra/Makefile index f3184a58600..3cbe974ea00 100644 --- a/www/hs-wai-extra/Makefile +++ b/www/hs-wai-extra/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= wai-extra -PORTVERSION= 3.0.20.0 -PORTREVISION= 1 +PORTVERSION= 3.0.22.1 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -14,7 +13,7 @@ USE_CABAL= aeson ansi-terminal base64-bytestring blaze-builder \ case-insensitive cookie data-default-class \ fast-logger http-types iproute lifted-base \ network old-locale resourcet streaming-commons \ - stringsearch text unix-compat vault void \ + stringsearch unix-compat vault void \ wai wai-logger word8 zlib .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" diff --git a/www/hs-wai-extra/distinfo b/www/hs-wai-extra/distinfo index da5c80ccadb..4bfc199b9fa 100644 --- a/www/hs-wai-extra/distinfo +++ b/www/hs-wai-extra/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625381 -SHA256 (cabal/wai-extra-3.0.20.0.tar.gz) = ad63ca529e812f5edec84e197a58433095a1376a127f8e9416235028bf021971 -SIZE (cabal/wai-extra-3.0.20.0.tar.gz) = 60542 +TIMESTAMP = 1524842206 +SHA256 (cabal/wai-extra-3.0.22.1.tar.gz) = 7e7c9075455015b90e079d7c1d16110f2fb27e33ff66620d84248c3a9805722f +SIZE (cabal/wai-extra-3.0.22.1.tar.gz) = 61594 diff --git a/www/hs-wai-logger/Makefile b/www/hs-wai-logger/Makefile index bb4510634f3..4aa61a39006 100644 --- a/www/hs-wai-logger/Makefile +++ b/www/hs-wai-logger/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= wai-logger -PORTVERSION= 2.3.0 -PORTREVISION= 1 +PORTVERSION= 2.3.2 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org diff --git a/www/hs-wai-logger/distinfo b/www/hs-wai-logger/distinfo index 292c96cd314..696f866f084 100644 --- a/www/hs-wai-logger/distinfo +++ b/www/hs-wai-logger/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625381 -SHA256 (cabal/wai-logger-2.3.0.tar.gz) = 90cd993c657e72a0480a988220b288aeb2561efa53d2c8f819197b6de3060bf0 -SIZE (cabal/wai-logger-2.3.0.tar.gz) = 5379 +TIMESTAMP = 1524842605 +SHA256 (cabal/wai-logger-2.3.2.tar.gz) = 8dd4ff875d9ac2c115f5d45cc4375635a6c3e55a75c632ff3781d1fb086eb470 +SIZE (cabal/wai-logger-2.3.2.tar.gz) = 5386 diff --git a/www/hs-wai/Makefile b/www/hs-wai/Makefile index 12649a9868d..6e78211a148 100644 --- a/www/hs-wai/Makefile +++ b/www/hs-wai/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= wai -PORTVERSION= 3.2.1.1 -PORTREVISION= 1 +PORTVERSION= 3.2.1.2 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,7 @@ COMMENT= Web Application Interface LICENSE= MIT USE_CABAL= blaze-builder>=0.2.1.4 http-types>=0.7 network>=2.2.1.5 \ - text>=0.7 vault>=0.3 + vault>=0.3 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/www/hs-wai/distinfo b/www/hs-wai/distinfo index 5ee6267b1bb..61ad245f291 100644 --- a/www/hs-wai/distinfo +++ b/www/hs-wai/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625379 -SHA256 (cabal/wai-3.2.1.1.tar.gz) = 5d80a68f5d8806682d8267b7dacc383d094e3ef7ecd705f20e42c91cad564e21 -SIZE (cabal/wai-3.2.1.1.tar.gz) = 10039 +TIMESTAMP = 1524252958 +SHA256 (cabal/wai-3.2.1.2.tar.gz) = 282351461f19fbac26aa0a7896d7ab583b4abef522fcd9aba944f1848e58234b +SIZE (cabal/wai-3.2.1.2.tar.gz) = 9938 diff --git a/www/hs-wai/files/patch-wai.cabal b/www/hs-wai/files/patch-wai.cabal deleted file mode 100644 index 739389af330..00000000000 --- a/www/hs-wai/files/patch-wai.cabal +++ /dev/null @@ -1,10 +0,0 @@ ---- wai.cabal.orig 2017-07-09 19:57:56 UTC -+++ wai.cabal -@@ -21,7 +21,6 @@ Source-repository head - Library - Build-Depends: base >= 4 && < 5 - , bytestring >= 0.10 -- , bytestring-builder >= 0.10.4.0 && < 0.11 - , blaze-builder >= 0.2.1.4 && < 0.5 - , network >= 2.2.1.5 - , http-types >= 0.7 diff --git a/www/hs-warp-tls/Makefile b/www/hs-warp-tls/Makefile index f9b26ed9922..cb69f183469 100644 --- a/www/hs-warp-tls/Makefile +++ b/www/hs-warp-tls/Makefile @@ -2,7 +2,7 @@ PORTNAME= warp-tls PORTVERSION= 3.2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org diff --git a/www/hs-warp/Makefile b/www/hs-warp/Makefile index 679be7122af..5c47c1800a5 100644 --- a/www/hs-warp/Makefile +++ b/www/hs-warp/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= warp -PORTVERSION= 3.2.13 -PORTREVISION= 1 +PORTVERSION= 3.2.22 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -10,11 +9,11 @@ COMMENT= Fast, light-weight web server for WAI applications LICENSE= MIT -USE_CABAL= auto-update>=0.1.1 blaze-builder>=0.4 case-insensitive>=0.2 \ +USE_CABAL= auto-update>=0.1.1 bsb-http-chunked case-insensitive>=0.2 \ hashable http-date http-types>=0.8.5 http2>=1.0.2 \ iproute>=1.3.1 network>=2.3 old-locale simple-sendfile>=0.2.7 \ - stm>=2.3 streaming-commons>=0.1.10 text unix-compat>=0.2 \ - vault>=0.3 wai>=3.0 word8 + streaming-commons>=0.1.10 unix-compat>=0.2 vault>=0.3 \ + wai>=3.0 word8 FLAGS_ENABLE= allow-sendfilefd FLAGS_DISABLE= network-bytestring warp-debug use-bytestring-builder diff --git a/www/hs-warp/distinfo b/www/hs-warp/distinfo index 12af17495a4..68e738127d1 100644 --- a/www/hs-warp/distinfo +++ b/www/hs-warp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625382 -SHA256 (cabal/warp-3.2.13.tar.gz) = 92395bf42d012e5c4deaea7f9e1fc2271a63c5380b4c5bc1cf16b7c53aa2c424 -SIZE (cabal/warp-3.2.13.tar.gz) = 78441 +TIMESTAMP = 1524927920 +SHA256 (cabal/warp-3.2.22.tar.gz) = 645b230c32050da227e4c2486a0ae6b6866706f563d2ba5e3761f581855f590e +SIZE (cabal/warp-3.2.22.tar.gz) = 77658 diff --git a/www/hs-warp/files/patch-warp.cabal b/www/hs-warp/files/patch-warp.cabal deleted file mode 100644 index bf0c57a6414..00000000000 --- a/www/hs-warp/files/patch-warp.cabal +++ /dev/null @@ -1,18 +0,0 @@ ---- warp.cabal.orig 2015-08-18 02:00:41 UTC -+++ warp.cabal -@@ -36,7 +36,6 @@ Library - , auto-update >= 0.1.1 && < 0.2 - , blaze-builder >= 0.4 - , bytestring >= 0.9.1.4 -- , bytestring-builder - , case-insensitive >= 0.2 - , containers - , ghc-prim -@@ -134,7 +133,6 @@ Test-Suite spec - , auto-update - , blaze-builder >= 0.4 - , bytestring >= 0.9.1.4 -- , bytestring-builder - , case-insensitive >= 0.2 - , ghc-prim - , HTTP diff --git a/www/hs-webkit/Makefile b/www/hs-webkit/Makefile index 2e33e2cb90d..fe27573d40d 100644 --- a/www/hs-webkit/Makefile +++ b/www/hs-webkit/Makefile @@ -2,7 +2,7 @@ PORTNAME= webkit PORTVERSION= 0.14.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -12,7 +12,7 @@ LICENSE= LGPL21 USES= pkgconfig USE_CABAL= cairo>=0.13.0.0 glib>=0.13.1.0 gtk>=0.13.0.0 mtl \ - pango>=0.13.0.0 text>=1.0.0.0 + pango>=0.13.0.0 LIB_DEPENDS+= libwebkitgtk-1.0.so:www/webkit-gtk2 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" diff --git a/www/hs-xss-sanitize/Makefile b/www/hs-xss-sanitize/Makefile index eccb65aea02..981647276ef 100644 --- a/www/hs-xss-sanitize/Makefile +++ b/www/hs-xss-sanitize/Makefile @@ -2,7 +2,7 @@ PORTNAME= xss-sanitize PORTVERSION= 0.3.5.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,7 @@ COMMENT= Sanitize untrusted HTML to prevent XSS attacks LICENSE= BSD3CLAUSE USE_CABAL= attoparsec>=0.10.0.3 css-text>=0.1.1 network>=2.6 \ - network-uri>=2.6 tagsoup>=0.12.2 text>=0.11 utf8-string>=0.3 + network-uri>=2.6 tagsoup>=0.12.2 utf8-string>=0.3 FLAGS_ENABLE= network-uri diff --git a/www/hs-yesod-auth-hashdb/Makefile b/www/hs-yesod-auth-hashdb/Makefile index 4213cca768a..11ba0677fa7 100644 --- a/www/hs-yesod-auth-hashdb/Makefile +++ b/www/hs-yesod-auth-hashdb/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= yesod-auth-hashdb -PORTVERSION= 1.6.1 -PORTREVISION= 1 +PORTVERSION= 1.7 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= Authentication plugin for Yesod LICENSE= MIT -USE_CABAL= cryptohash>=0.8 persistent>=2.1 pwstore-fast>=2.2 text>=0.7 \ +USE_CABAL= cryptohash>=0.8 persistent>=2.1 pwstore-fast>=2.2 \ yesod-auth>=1.4 yesod-core>=1.4 yesod-form>=1.4 \ yesod-persistent>=1.2 diff --git a/www/hs-yesod-auth-hashdb/distinfo b/www/hs-yesod-auth-hashdb/distinfo index 2e5e46fd24c..2d8e795dfb6 100644 --- a/www/hs-yesod-auth-hashdb/distinfo +++ b/www/hs-yesod-auth-hashdb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625384 -SHA256 (cabal/yesod-auth-hashdb-1.6.1.tar.gz) = 694405dea4e644acb74d6ad4ec8806d0f4b3779c5b36a430ebcf111542d35af8 -SIZE (cabal/yesod-auth-hashdb-1.6.1.tar.gz) = 15615 +TIMESTAMP = 1525187444 +SHA256 (cabal/yesod-auth-hashdb-1.7.tar.gz) = 65b9a941a9eb87421dfc57f817a7e4dd46bb204b0f27438084f7417805434f1c +SIZE (cabal/yesod-auth-hashdb-1.7.tar.gz) = 15493 diff --git a/www/hs-yesod-auth/Makefile b/www/hs-yesod-auth/Makefile index 89156ace84b..8a240ce8dab 100644 --- a/www/hs-yesod-auth/Makefile +++ b/www/hs-yesod-auth/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= yesod-auth -PORTVERSION= 1.4.17.2 -PORTREVISION= 1 +PORTVERSION= 1.6.3 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -17,7 +16,7 @@ USE_CABAL= aeson>=0.7 authenticate>=1.3 base16-bytestring \ http-conduit>=1.5 http-types lifted-base>=0.1 mime-mail>=0.3 \ network>=2.6 network-uri>=2.6 nonce>=1.0.2 persistent>=2.1 \ persistent-template>=2.1 random>=1.0.0.2 resourcet safe \ - shakespeare text>=0.7 unordered-containers wai>=1.4 \ + shakespeare unordered-containers wai>=1.4 \ yesod-core>=1.4 yesod-form>=1.4 yesod-persistent>=1.4 FLAGS_ENABLE= network-uri diff --git a/www/hs-yesod-auth/distinfo b/www/hs-yesod-auth/distinfo index c354a5785c0..63c4a97f60a 100644 --- a/www/hs-yesod-auth/distinfo +++ b/www/hs-yesod-auth/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625384 -SHA256 (cabal/yesod-auth-1.4.17.2.tar.gz) = 63a4273faed4bb7ddf3b196e30ae54bcc4b228e388f11cca71d5005c9ea19983 -SIZE (cabal/yesod-auth-1.4.17.2.tar.gz) = 50569 +TIMESTAMP = 1525183168 +SHA256 (cabal/yesod-auth-1.6.3.tar.gz) = a0df427bfd95374957435f56561787d0bc66f978a7ea7cb017ec64f59c8698b8 +SIZE (cabal/yesod-auth-1.6.3.tar.gz) = 50951 diff --git a/www/hs-yesod-bin/Makefile b/www/hs-yesod-bin/Makefile index ac5fd1ac3b1..38b348b1026 100644 --- a/www/hs-yesod-bin/Makefile +++ b/www/hs-yesod-bin/Makefile @@ -2,7 +2,7 @@ PORTNAME= yesod-bin PORTVERSION= 1.5.2.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -15,9 +15,9 @@ USE_CABAL= async attoparsec>=0.10 base64-bytestring \ data-default-class file-embed fsnotify>=0.0 ghc-paths>=0.1 \ http-client http-conduit>=2.1.4 http-reverse-proxy>=0.4 \ http-types>=0.7 lifted-base network \ - optparse-applicative>=0.11 parsec>=2.1 \ + optparse-applicative>=0.11 \ project-template>=0.1.1 resourcet>=0.3 safe-exceptions say shakespeare>=2.0 \ - split>=0.2 streaming-commons tar>=0.4 text>=0.11 \ + split>=0.2 streaming-commons tar>=0.4 \ transformers-compat typed-process unix-compat>=0.2 unordered-containers \ wai>=1.4 wai-extra warp>=1.3.7.5 warp-tls>=3.0.1 yaml>=0.8 \ zlib>=0.5 @@ -25,5 +25,7 @@ USE_CABAL= async attoparsec>=0.10 base64-bytestring \ EXECUTABLE= yesod STANDALONE= yes +IGNORE= Doesn't build with recent Cabal + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/www/hs-yesod-core/Makefile b/www/hs-yesod-core/Makefile index 571c9b3bed9..cb38f99b773 100644 --- a/www/hs-yesod-core/Makefile +++ b/www/hs-yesod-core/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= yesod-core -PORTVERSION= 1.4.35 -PORTREVISION= 1 +PORTVERSION= 1.6.4 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -15,9 +14,9 @@ USE_CABAL= aeson>=0.5 auto-update blaze-builder>=0.2.1.4 blaze-html>=0.5 \ clientsession>=0.9.1 conduit>=1.2 conduit-extra cookie>=0.4.1 \ data-default deepseq-generics exceptions>=0.6 fast-logger>=2.2 http-types>=0.7 \ lifted-base>=0.1.2 monad-control>=0.3 monad-logger>=0.3.1 mtl \ - mwc-random old-locale>=1.0.0.2 parsec>=2 path-pieces>=0.1.2 \ + mwc-random old-locale>=1.0.0.2 path-pieces>=0.1.2 \ primitive random>=1.0.0.2 resourcet>=0.4.9 safe semigroups \ - shakespeare>=2.0 text>=0.7 transformers-base>=0.4 unix-compat \ + shakespeare>=2.0 transformers-base>=0.4 unix-compat unliftio \ unordered-containers>=0.2 vector>=0.9 wai>=3.0 \ wai-extra>=3.0.5 wai-logger>=0.2 warp>=3.0.2 word8 diff --git a/www/hs-yesod-core/distinfo b/www/hs-yesod-core/distinfo index ff6ba7be2a0..ab9aed5ec22 100644 --- a/www/hs-yesod-core/distinfo +++ b/www/hs-yesod-core/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625385 -SHA256 (cabal/yesod-core-1.4.35.tar.gz) = 7e5d0bead1a415aeb8a1d5c62930506c81b8e5209f179d7f19c5627e45bb5cf1 -SIZE (cabal/yesod-core-1.4.35.tar.gz) = 93503 +TIMESTAMP = 1525033997 +SHA256 (cabal/yesod-core-1.6.4.tar.gz) = 8d7e42b70f18ee7a154d351df0bd3b6b025598f593598817ae88d6bb22092727 +SIZE (cabal/yesod-core-1.6.4.tar.gz) = 94604 diff --git a/www/hs-yesod-form/Makefile b/www/hs-yesod-form/Makefile index 69ec36dd9cc..0e3e930b159 100644 --- a/www/hs-yesod-form/Makefile +++ b/www/hs-yesod-form/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= yesod-form -PORTVERSION= 1.4.12 -PORTREVISION= 1 +PORTVERSION= 1.6.1 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -13,7 +12,7 @@ LICENSE= MIT USE_CABAL= aeson attoparsec>=0.10 blaze-builder>=0.2.1.4 blaze-html>=0.5 \ blaze-markup>=0.5.1 byteable data-default email-validate>=1.0 \ network>=2.6 network-uri>=2.6 persistent resourcet semigroups \ - shakespeare>=2.0 text>=0.9 wai>=1.3 xss-sanitize>=0.3.0.1 \ + shakespeare>=2.0 wai>=1.3 xss-sanitize>=0.3.0.1 \ yesod-core>=1.4 yesod-persistent>=1.4 FLAGS_ENABLE= network-uri diff --git a/www/hs-yesod-form/distinfo b/www/hs-yesod-form/distinfo index 9fcf7c8d2dd..b0186c2e1c6 100644 --- a/www/hs-yesod-form/distinfo +++ b/www/hs-yesod-form/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625386 -SHA256 (cabal/yesod-form-1.4.12.tar.gz) = 731638c1541b112f78ffeef05e11a57f518b6a6a15aa306779f6840e989b8a51 -SIZE (cabal/yesod-form-1.4.12.tar.gz) = 31515 +TIMESTAMP = 1525181435 +SHA256 (cabal/yesod-form-1.6.1.tar.gz) = b8ff14eafff4bb6c2b01b235e8ebeafe9802f545979c1c1227076b06edd3f616 +SIZE (cabal/yesod-form-1.6.1.tar.gz) = 32873 diff --git a/www/hs-yesod-persistent/Makefile b/www/hs-yesod-persistent/Makefile index f1367e876a6..f1cbb5fdb56 100644 --- a/www/hs-yesod-persistent/Makefile +++ b/www/hs-yesod-persistent/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= yesod-persistent -PORTVERSION= 1.4.2 -PORTREVISION= 1 +PORTVERSION= 1.6.0 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org diff --git a/www/hs-yesod-persistent/distinfo b/www/hs-yesod-persistent/distinfo index 445a92e0f13..21afddd170b 100644 --- a/www/hs-yesod-persistent/distinfo +++ b/www/hs-yesod-persistent/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625386 -SHA256 (cabal/yesod-persistent-1.4.2.tar.gz) = d938894209e27a7f2a6e41906a9db02cf5c66df2236a864361571ba4e63b1056 -SIZE (cabal/yesod-persistent-1.4.2.tar.gz) = 4887 +TIMESTAMP = 1525180776 +SHA256 (cabal/yesod-persistent-1.6.0.tar.gz) = 42be2b4277fb265e18273503f3592259feb69ce5bfa2d2a862639b755c4fa5bd +SIZE (cabal/yesod-persistent-1.6.0.tar.gz) = 4935 diff --git a/www/hs-yesod-persistent/files/patch-yesod-persistent.cabal b/www/hs-yesod-persistent/files/patch-yesod-persistent.cabal deleted file mode 100644 index ccaf7973e3f..00000000000 --- a/www/hs-yesod-persistent/files/patch-yesod-persistent.cabal +++ /dev/null @@ -1,13 +0,0 @@ ---- yesod-persistent.cabal.orig 2017-07-10 15:13:02 UTC -+++ yesod-persistent.cabal -@@ -16,8 +16,8 @@ extra-source-files: README.md ChangeLog.md - library - build-depends: base >= 4 && < 5 - , yesod-core >= 1.4.0 && < 1.5 -- , persistent >= 2.1 && < 2.7 -- , persistent-template >= 2.1 && < 2.7 -+ , persistent >= 2.1 && < 2.8 -+ , persistent-template >= 2.1 && < 2.8 - , transformers >= 0.2.2 - , blaze-builder - , conduit diff --git a/www/hs-yesod-static/Makefile b/www/hs-yesod-static/Makefile index 702bb022ba8..7fe66f47d6a 100644 --- a/www/hs-yesod-static/Makefile +++ b/www/hs-yesod-static/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= yesod-static -PORTVERSION= 1.5.3 -PORTREVISION= 1 +PORTVERSION= 1.6.0 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -12,11 +11,11 @@ LICENSE= MIT USE_CABAL= async attoparsec>=0.10 base64-bytestring>=0.1.0.1 \ blaze-builder>=0.3 byteable>=0.1 conduit>=0.5 conduit-extra \ - cryptohash>=0.11 cryptohash-conduit>=0.1 css-text>=0.1.2 \ - data-default file-embed>=0.0.4.1 hashable>=1.1 hjsmin \ - http-types>=0.7 mime-types>=0.1 old-time>=1.0 resourcet>=0.4 \ - text>=0.9 unix-compat>=0.2 unordered-containers>=0.2 wai>=1.3 \ - wai-app-static>=3.1 yesod-core>=1.4 + cryptohash>=0.11 cryptohash-conduit>=0.1 cryptonite-conduit \ + css-text>=0.1.2 data-default file-embed>=0.0.4.1 hashable>=1.1 \ + hjsmin http-types>=0.7 mime-types>=0.1 old-time>=1.0 \ + resourcet>=0.4 unix-compat>=0.2 unordered-containers>=0.2 \ + wai>=1.3 wai-app-static>=3.1 yesod-core>=1.4 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/www/hs-yesod-static/distinfo b/www/hs-yesod-static/distinfo index 2f52b2e8bfe..da2a619eade 100644 --- a/www/hs-yesod-static/distinfo +++ b/www/hs-yesod-static/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625386 -SHA256 (cabal/yesod-static-1.5.3.tar.gz) = b486aea2b24bc0497ace32b6318da3737d7f8ea8434327608eafdf1eb25d5d65 -SIZE (cabal/yesod-static-1.5.3.tar.gz) = 25521 +TIMESTAMP = 1525169575 +SHA256 (cabal/yesod-static-1.6.0.tar.gz) = bd0bf5924bb9c27fe24047816018158e92fc687053c190221af2f03bac94880e +SIZE (cabal/yesod-static-1.6.0.tar.gz) = 25416 diff --git a/www/hs-yesod-test/Makefile b/www/hs-yesod-test/Makefile index a2453ce0e81..a4dac935fef 100644 --- a/www/hs-yesod-test/Makefile +++ b/www/hs-yesod-test/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= yesod-test -PORTVERSION= 1.5.7 -PORTREVISION= 1 +PORTVERSION= 1.6.4 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -13,7 +12,7 @@ LICENSE= MIT USE_CABAL= attoparsec>=0.10 blaze-builder blaze-html>=0.5 \ blaze-markup>=0.5.1 case-insensitive>=0.2 cookie \ hspec-core>=2.0 html-conduit>=0.1 http-types>=0.7 HUnit>=1.2 \ - monad-control network>=2.2 persistent>=1.0 pretty-show text wai>=3.0 \ + monad-control network>=2.2 persistent>=1.0 pretty-show wai>=3.0 \ wai-extra xml-conduit>=1.0 xml-types>=0.3 yesod-core>=1.4 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" diff --git a/www/hs-yesod-test/distinfo b/www/hs-yesod-test/distinfo index ed6e0a7931c..78e1b45aace 100644 --- a/www/hs-yesod-test/distinfo +++ b/www/hs-yesod-test/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625387 -SHA256 (cabal/yesod-test-1.5.7.tar.gz) = 426b2aaf777b4c18aee150ed5bbe7ab95c987e622609b0cff1242f9ec0850113 -SIZE (cabal/yesod-test-1.5.7.tar.gz) = 19365 +TIMESTAMP = 1525176699 +SHA256 (cabal/yesod-test-1.6.4.tar.gz) = cffa1639237646836be0ead1bc0b1787a3fccb384cbb7e77dcbcf54c1ed3b95b +SIZE (cabal/yesod-test-1.6.4.tar.gz) = 21745 diff --git a/www/hs-yesod/Makefile b/www/hs-yesod/Makefile index fd601f8037a..80d98bea8fe 100644 --- a/www/hs-yesod/Makefile +++ b/www/hs-yesod/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= yesod -PORTVERSION= 1.4.5 -PORTREVISION= 1 +PORTVERSION= 1.6.0 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -12,7 +11,7 @@ LICENSE= MIT USE_CABAL= aeson blaze-html>=0.5 blaze-markup>=0.5.1 conduit-extra \ data-default fast-logger monad-control>=0.3 monad-logger \ - safe shakespeare>=2.0 streaming-commons text \ + safe shakespeare>=2.0 streaming-commons \ unordered-containers wai>=1.3 wai-extra>=1.3 wai-logger \ warp>=1.3 yaml yesod-auth>=1.4 yesod-core>=1.4 \ yesod-form>=1.3 yesod-persistent>=1.4 diff --git a/www/hs-yesod/distinfo b/www/hs-yesod/distinfo index fcddf8a19d0..770ac6ad21e 100644 --- a/www/hs-yesod/distinfo +++ b/www/hs-yesod/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625383 -SHA256 (cabal/yesod-1.4.5.tar.gz) = 267c8780b27cc0ae8199f80b3063683fb2cd62eeb9696c4b155a298fb035e6e9 -SIZE (cabal/yesod-1.4.5.tar.gz) = 9105 +TIMESTAMP = 1525179938 +SHA256 (cabal/yesod-1.6.0.tar.gz) = 8a242ffe1df10bc2c5dffb6e255ad21b11e96a9c4794bac20504b67f973da773 +SIZE (cabal/yesod-1.6.0.tar.gz) = 9072 diff --git a/www/p5-Plack-Middleware-MethodOverride/Makefile b/www/p5-Plack-Middleware-MethodOverride/Makefile index 5e4a68ae6ea..5fd3e019a6a 100644 --- a/www/p5-Plack-Middleware-MethodOverride/Makefile +++ b/www/p5-Plack-Middleware-MethodOverride/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Plack-Middleware-MethodOverride -PORTVERSION= 0.15 +PORTVERSION= 0.17 CATEGORIES= www perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -15,12 +15,10 @@ LICENSE_COMB= dual BUILD_DEPENDS= p5-Plack>=0:www/p5-Plack RUN_DEPENDS:= ${BUILD_DEPENDS} -TEST_DEPENDS= p5-Test-Pod>=1.41:devel/p5-Test-Pod \ - p5-Test-Pod-Coverage>=1.06:devel/p5-Test-Pod-Coverage \ - p5-URI>=0:net/p5-URI +TEST_DEPENDS= p5-URI>=0:net/p5-URI NO_ARCH= yes -USE_PERL5= configure +USE_PERL5= modbuildtiny USES= perl5 .include diff --git a/www/p5-Plack-Middleware-MethodOverride/distinfo b/www/p5-Plack-Middleware-MethodOverride/distinfo index e1f3d8f9f95..25985c8a818 100644 --- a/www/p5-Plack-Middleware-MethodOverride/distinfo +++ b/www/p5-Plack-Middleware-MethodOverride/distinfo @@ -1,2 +1,3 @@ -SHA256 (Plack-Middleware-MethodOverride-0.15.tar.gz) = 2b4a6e67006f97a2b4cf7980900f6a8ababb1cf97d6597319f9897ada3c555bc -SIZE (Plack-Middleware-MethodOverride-0.15.tar.gz) = 12510 +TIMESTAMP = 1527232802 +SHA256 (Plack-Middleware-MethodOverride-0.17.tar.gz) = fe951addc3e56005ac72b8339add8fd5ee3ffc310bee8dc3559009f2ae4602e1 +SIZE (Plack-Middleware-MethodOverride-0.17.tar.gz) = 12257 diff --git a/www/palemoon/Makefile b/www/palemoon/Makefile index a0d6004d362..c3c774f3cbd 100644 --- a/www/palemoon/Makefile +++ b/www/palemoon/Makefile @@ -3,6 +3,7 @@ PORTNAME= palemoon DISTVERSION= 27.9.2 +PORTREVISION= 1 DISTVERSIONSUFFIX=_Release CATEGORIES= www ipv6 diff --git a/www/palemoon/files/patch-bug1153151 b/www/palemoon/files/patch-bug1153151 deleted file mode 100644 index 855cdab8947..00000000000 --- a/www/palemoon/files/patch-bug1153151 +++ /dev/null @@ -1,13 +0,0 @@ -Bug 1153151 - make libcubeb sndio use non-blocking i/o - ---- media/libcubeb/src/cubeb_sndio.c.orig 2017-01-12 17:53:15 UTC -+++ media/libcubeb/src/cubeb_sndio.c -@@ -187,7 +187,7 @@ sndio_stream_init(cubeb *context, - if (s == NULL) - return CUBEB_ERROR; - s->context = context; -- s->hdl = sio_open(NULL, SIO_PLAY, 0); -+ s->hdl = sio_open(NULL, SIO_PLAY, 1); - if (s->hdl == NULL) { - free(s); - DPR("sndio_stream_init(), sio_open() failed\n"); diff --git a/www/palemoon/files/patch-bug1153179 b/www/palemoon/files/patch-bug1153179 deleted file mode 100644 index f39c9bbdcd8..00000000000 --- a/www/palemoon/files/patch-bug1153179 +++ /dev/null @@ -1,40 +0,0 @@ -Bug 1153179 - fix latency reporting in libcubeb sndio - ---- media/libcubeb/src/cubeb_sndio.c.orig 2017-01-12 17:53:15 UTC -+++ media/libcubeb/src/cubeb_sndio.c -@@ -67,7 +67,7 @@ sndio_onmove(void *arg, int delta) - { - cubeb_stream *s = (cubeb_stream *)arg; - -- s->rdpos += delta; -+ s->rdpos += delta * s->bpf; - } - - static void * -@@ -135,7 +135,7 @@ sndio_mainloop(void *arg) - state = CUBEB_STATE_ERROR; - break; - } -- s->wrpos = 0; -+ s->wrpos += n; - start += n; - } - } -@@ -326,7 +336,7 @@ sndio_stream_get_position(cubeb_stream * - { - pthread_mutex_lock(&s->mtx); - DPR("sndio_stream_get_position() %lld\n", s->rdpos); -- *p = s->rdpos; -+ *p = s->rdpos / s->bpf; - pthread_mutex_unlock(&s->mtx); - return CUBEB_OK; - } -@@ -346,7 +356,7 @@ sndio_stream_get_latency(cubeb_stream * - { - // http://www.openbsd.org/cgi-bin/man.cgi?query=sio_open - // in the "Measuring the latency and buffers usage" paragraph. -- *latency = stm->wrpos - stm->rdpos; -+ *latency = (stm->wrpos - stm->rdpos) / stm->bpf; - return CUBEB_OK; - } - diff --git a/www/palemoon/files/patch-cubeb5ffce9e91b b/www/palemoon/files/patch-cubeb5ffce9e91b deleted file mode 100644 index 65b1c912939..00000000000 --- a/www/palemoon/files/patch-cubeb5ffce9e91b +++ /dev/null @@ -1,41 +0,0 @@ -From 5ffce9e91b2fde70ba532ea215e3e9e7eed3d41a Mon Sep 17 00:00:00 2001 -From: Alexandre Ratchov -Date: Thu, 2 Apr 2015 13:09:22 +1300 -Subject: [PATCH] sndio: improve and clamp float->s16 conversion. - ---- - src/cubeb_sndio.c | 14 +++++++++++--- - 1 file changed, 11 insertions(+), 3 deletions(-) - -diff --git a/src/cubeb_sndio.c b/src/cubeb_sndio.c -index 01f96346..e6d531a4 100644 ---- media/libcubeb/src/cubeb_sndio.c.orig -+++ media/libcubeb/src/cubeb_sndio.c -@@ -4,6 +4,7 @@ - * This program is made available under an ISC-style license. See the - * accompanying file LICENSE for details. - */ -+#include - #include - #include - #include -@@ -49,9 +50,16 @@ float_to_s16(void *ptr, long nsamp) - { - int16_t *dst = ptr; - float *src = ptr; -- -- while (nsamp-- > 0) -- *(dst++) = *(src++) * 32767; -+ int s; -+ -+ while (nsamp-- > 0) { -+ s = lrintf(*(src++) * 32768); -+ if (s < -32768) -+ s = -32768; -+ else if (s > 32767) -+ s = 32767; -+ *(dst++) = s; -+ } - } - - static void diff --git a/www/palemoon/files/patch-sndio b/www/palemoon/files/patch-sndio new file mode 100644 index 00000000000..584c8ec49bf --- /dev/null +++ b/www/palemoon/files/patch-sndio @@ -0,0 +1,145 @@ +Bug 1153151 - make libcubeb sndio use non-blocking i/o +Bug 1153179 - fix latency reporting in libcubeb sndio + +From cubeb: +From 5ffce9e91b2fde70ba532ea215e3e9e7eed3d41a Mon Sep 17 00:00:00 2001 +From: Alexandre Ratchov +Date: Thu, 2 Apr 2015 13:09:22 +1300 +Subject: [PATCH] sndio: improve and clamp float->s16 conversion. + +https://marc.info/?l=openbsd-ports&m=152641946326955&w=2 +Apply volume in software as do other backends. This is necessary +because sndio volume may be controlled externally and there's no +volume getter in libcubeb to notify the caller about volume +changes. + +--- media/libcubeb/src/cubeb_sndio.c.orig 2018-05-24 13:59:58 UTC ++++ media/libcubeb/src/cubeb_sndio.c +@@ -4,6 +4,7 @@ + * This program is made available under an ISC-style license. See the + * accompanying file LICENSE for details. + */ ++#include + #include + #include + #include +@@ -41,17 +42,39 @@ struct cubeb_stream { + uint64_t wrpos; /* number of written frames */ + cubeb_data_callback data_cb; /* cb to preapare data */ + cubeb_state_callback state_cb; /* cb to notify about state changes */ ++ float volume; /* current volume */ + void *arg; /* user arg to {data,state}_cb */ + }; + + static void +-float_to_s16(void *ptr, long nsamp) ++s16_setvol(void *ptr, long nsamp, float volume) + { + int16_t *dst = ptr; ++ int32_t mult = volume * 32768; ++ int32_t s; ++ while (nsamp-- > 0) { ++ s = *dst; ++ s = (s * mult) >> 15; ++ *(dst++) = s; ++ } ++} ++ ++static void ++float_to_s16(void *ptr, long nsamp, float volume) ++{ ++ int16_t *dst = ptr; + float *src = ptr; ++ float mult = volume * 32768; ++ int s; + +- while (nsamp-- > 0) +- *(dst++) = *(src++) * 32767; ++ while (nsamp-- > 0) { ++ s = lrintf(*(src++) * mult); ++ if (s < -32768) ++ s = -32768; ++ else if (s > 32767) ++ s = 32767; ++ *(dst++) = s; ++ } + } + + static void +@@ -59,7 +82,7 @@ sndio_onmove(void *arg, int delta) + { + cubeb_stream *s = (cubeb_stream *)arg; + +- s->rdpos += delta; ++ s->rdpos += delta * s->bpf; + } + + static void * +@@ -103,7 +126,9 @@ sndio_mainloop(void *arg) + break; + } + if (s->conv) +- float_to_s16(s->buf, nfr * s->pchan); ++ float_to_s16(s->buf, nfr * s->pchan, s->volume); ++ else ++ s16_setvol(s->buf, nfr * s->pchan, s->volume); + start = 0; + end = nfr * s->bpf; + } +@@ -127,7 +152,7 @@ sndio_mainloop(void *arg) + state = CUBEB_STATE_ERROR; + break; + } +- s->wrpos = 0; ++ s->wrpos += n; + start += n; + } + } +@@ -179,7 +204,7 @@ sndio_stream_init(cubeb *context, + if (s == NULL) + return CUBEB_ERROR; + s->context = context; +- s->hdl = sio_open(NULL, SIO_PLAY, 0); ++ s->hdl = sio_open(NULL, SIO_PLAY, 1); + if (s->hdl == NULL) { + free(s); + DPR("sndio_stream_init(), sio_open() failed\n"); +@@ -242,6 +267,7 @@ sndio_stream_init(cubeb *context, + free(s); + return CUBEB_ERROR; + } ++ s->volume = 1.; + *stream = s; + DPR("sndio_stream_init() end, ok\n"); + (void)context; +@@ -318,7 +344,7 @@ sndio_stream_get_position(cubeb_stream *s, uint64_t *p + { + pthread_mutex_lock(&s->mtx); + DPR("sndio_stream_get_position() %lld\n", s->rdpos); +- *p = s->rdpos; ++ *p = s->rdpos / s->bpf; + pthread_mutex_unlock(&s->mtx); + return CUBEB_OK; + } +@@ -328,7 +354,11 @@ sndio_stream_set_volume(cubeb_stream *s, float volume) + { + DPR("sndio_stream_set_volume(%f)\n", volume); + pthread_mutex_lock(&s->mtx); +- sio_setvol(s->hdl, SIO_MAXVOL * volume); ++ if (volume < 0.) ++ volume = 0.; ++ else if (volume > 1.0) ++ volume = 1.; ++ s->volume = volume; + pthread_mutex_unlock(&s->mtx); + return CUBEB_OK; + } +@@ -338,7 +368,7 @@ sndio_stream_get_latency(cubeb_stream * stm, uint32_t + { + // http://www.openbsd.org/cgi-bin/man.cgi?query=sio_open + // in the "Measuring the latency and buffers usage" paragraph. +- *latency = stm->wrpos - stm->rdpos; ++ *latency = (stm->wrpos - stm->rdpos) / stm->bpf; + return CUBEB_OK; + } + diff --git a/www/py-branca/Makefile b/www/py-branca/Makefile new file mode 100644 index 00000000000..ee4ba142357 --- /dev/null +++ b/www/py-branca/Makefile @@ -0,0 +1,22 @@ +# Created by: Po-Chuan Hsieh +# $FreeBSD$ + +PORTNAME= branca +PORTVERSION= 0.3.0 +CATEGORIES= www python +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Generate complex HTML+JS pages with Python + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE.txt + +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${FLAVOR} + +NO_ARCH= yes +USE_PYTHON= autoplist concurrent distutils +USES= python + +.include diff --git a/www/py-branca/distinfo b/www/py-branca/distinfo new file mode 100644 index 00000000000..fdfc6d577b9 --- /dev/null +++ b/www/py-branca/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1527223375 +SHA256 (branca-0.3.0.tar.gz) = bea38396cf58fd7173ac942277fe4138127eb1546622684206cb34d344b03fb4 +SIZE (branca-0.3.0.tar.gz) = 39259 diff --git a/www/py-branca/pkg-descr b/www/py-branca/pkg-descr new file mode 100644 index 00000000000..d0d9055bb38 --- /dev/null +++ b/www/py-branca/pkg-descr @@ -0,0 +1,5 @@ +Branca is a spinoff from folium, that would host the non-map-specific features. +It may become a HTML+JS generation library in the future. + +WWW: https://pypi.org/project/branca/ +WWW: https://github.com/python-visualization/branca diff --git a/www/py-django-annoying/Makefile b/www/py-django-annoying/Makefile index 0be2287a5cb..64e0c2375bb 100644 --- a/www/py-django-annoying/Makefile +++ b/www/py-django-annoying/Makefile @@ -3,8 +3,9 @@ PORTNAME= django-annoying PORTVERSION= 0.10.4 -DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= www python +MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= cs@FreeBSD.org @@ -12,11 +13,8 @@ COMMENT= Eliminate annoying things in the Django framework LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.11:www/py-django111@${PY_FLAVOR} -USE_GITHUB= yes - -GH_ACCOUNT= skorokithakis USES= python USE_PYTHON= autoplist distutils diff --git a/www/py-django-annoying/distinfo b/www/py-django-annoying/distinfo index c5bfe6e3dad..eea13c13071 100644 --- a/www/py-django-annoying/distinfo +++ b/www/py-django-annoying/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1525113517 -SHA256 (skorokithakis-django-annoying-v0.10.4_GH0.tar.gz) = 3f5e9fbcb99770d72003b94a50017289c1c076fc9f06dc208d2c3121a0bf7eee -SIZE (skorokithakis-django-annoying-v0.10.4_GH0.tar.gz) = 12065 +TIMESTAMP = 1526022557 +SHA256 (django-annoying-0.10.4.tar.gz) = 93f54d244d453cba28d6cfb9deae7bba27e859762adee9ff7de4706017940931 +SIZE (django-annoying-0.10.4.tar.gz) = 6996 diff --git a/www/py-django-auth-ldap/Makefile b/www/py-django-auth-ldap/Makefile index 1d1c01d4ce7..cdf7d23fc69 100644 --- a/www/py-django-auth-ldap/Makefile +++ b/www/py-django-auth-ldap/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= django-auth-ldap -PORTVERSION= 1.2.7 +PORTVERSION= 1.5.0 CATEGORIES= www security python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,18 +13,22 @@ COMMENT= LDAP integration for django.contrib.auth LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.3.1:www/py-django18@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.11:www/py-django111@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ldap>0:net/py-ldap@${PY_FLAVOR} -NO_ARCH= yes USES= python USE_PYTHON= autoplist distutils +NO_ARCH= yes +PORTDOCS= * -.include +OPTIONS_DEFINE= DOCS +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR} +DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E" -.if ${PYTHON_REL} < 3000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ldap>0:net/py-ldap@${FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pyldap>0:net/py-pyldap@${FLAVOR} -.endif +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC}/build/sphinx/html && \ + ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \ + "! -name .buildinfo -and ! -name objects.inv") -.include +.include diff --git a/www/py-django-auth-ldap/distinfo b/www/py-django-auth-ldap/distinfo index c80b9603ae0..e1e4e66bda2 100644 --- a/www/py-django-auth-ldap/distinfo +++ b/www/py-django-auth-ldap/distinfo @@ -1,2 +1,3 @@ -SHA256 (django-auth-ldap-1.2.7.tar.gz) = ff6af43d5429fbd918f62c25a07e2bff916b053b46990c1b60e60de63d5f3f80 -SIZE (django-auth-ldap-1.2.7.tar.gz) = 131431 +TIMESTAMP = 1526287019 +SHA256 (django-auth-ldap-1.5.0.tar.gz) = a064f464600bcd7dd5718433d518c6fc34ccb9692f50f673e20c956acc5efab7 +SIZE (django-auth-ldap-1.5.0.tar.gz) = 46881 diff --git a/www/py-django-auth-ldap/pkg-descr b/www/py-django-auth-ldap/pkg-descr index 10c47b9129f..74682fda426 100644 --- a/www/py-django-auth-ldap/pkg-descr +++ b/www/py-django-auth-ldap/pkg-descr @@ -3,4 +3,4 @@ service. Configuration can be as simple as a single distinguished name template, but there are many rich configuration options for working with users, groups, and permissions. -WWW: http://pythonhosted.org/django-auth-ldap/ +WWW: https://github.com/django-auth-ldap/django-auth-ldap diff --git a/www/py-django-haystack/Makefile b/www/py-django-haystack/Makefile index bb2c00cf681..ce1dee53293 100644 --- a/www/py-django-haystack/Makefile +++ b/www/py-django-haystack/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= django-haystack -PORTVERSION= 2.5.0 +PORTVERSION= 2.8.1 CATEGORIES= www databases python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,10 +13,22 @@ COMMENT= Pluggable search for Django LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${PY_FLAVOR} -NO_ARCH= yes USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils concurrent autoplist +NO_ARCH= yes +PORTDOCS= * + +OPTIONS_DEFINE= DOCS +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} +DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E" + +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @(cd ${WRKSRC}/build/sphinx/html && \ + ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \ + "! -name .buildinfo -and ! -name objects.inv") .include diff --git a/www/py-django-haystack/distinfo b/www/py-django-haystack/distinfo index 6e85a98407a..4bfbceb02f1 100644 --- a/www/py-django-haystack/distinfo +++ b/www/py-django-haystack/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1475827847 -SHA256 (django-haystack-2.5.0.tar.gz) = 54f6aa03770aa11de30b7052cdbdfdb102f8d5be4342033a89e538b4bdc86d9b -SIZE (django-haystack-2.5.0.tar.gz) = 212172 +TIMESTAMP = 1525986110 +SHA256 (django-haystack-2.8.1.tar.gz) = 8b54bcc926596765d0a3383d693bcdd76109c7abb6b2323b3984a39e3576028c +SIZE (django-haystack-2.8.1.tar.gz) = 1553122 diff --git a/www/py-django-ldapdb/Makefile b/www/py-django-ldapdb/Makefile index abc9a3fdb37..9f532fae1a7 100644 --- a/www/py-django-ldapdb/Makefile +++ b/www/py-django-ldapdb/Makefile @@ -2,21 +2,29 @@ # $FreeBSD$ PORTNAME= django-ldapdb -PORTVERSION= 0.3.2 -PORTREVISION= 2 +PORTVERSION= 1.0.0 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= avk@vl.ru -COMMENT= Support for django models over LDAP +COMMENT= LDAP database backend for Django LICENSE= BSD2CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.6.0:www/py-django18@${FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}ldap>=2.0:net/py-ldap@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ldap>=2.4.25:net/py-ldap@${PY_FLAVOR} -USES= python:2.7 -USE_PYTHON= distutils autoplist +USES= python +USE_PYTHON= distutils concurrent autoplist +NO_ARCH= yes +PORTDOCS= README.rst + +OPTIONS_DEFINE= DOCS + +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README.rst ${STAGEDIR}${DOCSDIR} .include diff --git a/www/py-django-ldapdb/distinfo b/www/py-django-ldapdb/distinfo index da7610d2fdd..d89dc757d21 100644 --- a/www/py-django-ldapdb/distinfo +++ b/www/py-django-ldapdb/distinfo @@ -1,2 +1,3 @@ -SHA256 (django-ldapdb-0.3.2.tar.gz) = b6bab3a4501419ff9ba1e50076b67c5f92e1c0b3d4b2c8c40014aadb5c06cc6d -SIZE (django-ldapdb-0.3.2.tar.gz) = 11029 +TIMESTAMP = 1526299109 +SHA256 (django-ldapdb-1.0.0.tar.gz) = a3a2837a6ec9769fc76164b99b86ba2809c987e370bd8986b69018345f9ba682 +SIZE (django-ldapdb-1.0.0.tar.gz) = 16639 diff --git a/www/py-django-ldapdb/pkg-descr b/www/py-django-ldapdb/pkg-descr index 4f6a183b3b7..68a0864a6ac 100644 --- a/www/py-django-ldapdb/pkg-descr +++ b/www/py-django-ldapdb/pkg-descr @@ -1,8 +1,9 @@ -django-ldapdb is an LDAP database backend for Django. -It allows you to manipulate LDAP entries using Django's models. -Declaring models using the LDAP backend is very staightforward, - you simply inherit from ldapdb.models.Model and declare the fields - in the same way as for regular models. -You can even edit the LDAP entries using Django's admin interface. +django-ldapdb is an LDAP database backend for Django. It allows one to +manipulate LDAP entries using Django's models. -WWW: http://opensource.bolloretelecom.eu/projects/django-ldapdb/ +Declaring models using the LDAP backend is very staightforward, one simply +inherit from ldapdb.models.Model and declare the fields in the same way as for +regular models. One can even edit the LDAP entries using Django's admin +interface. + +WWW: https://github.com/django-ldapdb/django-ldapdb diff --git a/www/py-django-markdownx/Makefile b/www/py-django-markdownx/Makefile index 3636ac51d7e..893cafb3b4b 100644 --- a/www/py-django-markdownx/Makefile +++ b/www/py-django-markdownx/Makefile @@ -3,24 +3,23 @@ PORTNAME= django-markdownx PORTVERSION= 2.0.23 -DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= www python +MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= cs@FreeBSD.org COMMENT= Django Markdown editor with image uploads and live preview LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.11:www/py-django111@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} -USE_GITHUB= yes - -GH_ACCOUNT= neutronX USES= python USE_PYTHON= autoplist distutils - NO_ARCH= yes .include diff --git a/www/py-django-markdownx/distinfo b/www/py-django-markdownx/distinfo index 9eda0f0c497..24280c96180 100644 --- a/www/py-django-markdownx/distinfo +++ b/www/py-django-markdownx/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1525112908 -SHA256 (neutronX-django-markdownx-v2.0.23_GH0.tar.gz) = 20a6d50c3573ceb1605c235527b2182f31cf61c0ba68603755f003162b581fdb -SIZE (neutronX-django-markdownx-v2.0.23_GH0.tar.gz) = 5905691 +TIMESTAMP = 1526023240 +SHA256 (django-markdownx-2.0.23.tar.gz) = 245df601b26465acf9d29bf65736d7ca8202f7171fcf8b3b52c84ebd4c3c4764 +SIZE (django-markdownx-2.0.23.tar.gz) = 30963 diff --git a/www/py-django-markdownx/pkg-descr b/www/py-django-markdownx/pkg-descr index 235d045d0a2..7f303c13bd4 100644 --- a/www/py-django-markdownx/pkg-descr +++ b/www/py-django-markdownx/pkg-descr @@ -3,4 +3,4 @@ editing, live preview and image uploads (stored locally in MEDIA folder) with drag&drop functionality and auto tag insertion. Also, django-markdownx supports multiple editors on one page. -WWW: https://github.com/adi-/django-markdownx +WWW: https://github.com/neutronX/django-markdownx diff --git a/www/py-django-simple-history/Makefile b/www/py-django-simple-history/Makefile index 6f60166a0ba..f21ba5549ac 100644 --- a/www/py-django-simple-history/Makefile +++ b/www/py-django-simple-history/Makefile @@ -3,22 +3,29 @@ PORTNAME= django-simple-history PORTVERSION= 2.0 +PORTREVISION= 1 CATEGORIES= www python +MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= cs@FreeBSD.org COMMENT= Store model history and view/revert changes from admin site LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR} # >= 1.8 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.11:www/py-django111@${PY_FLAVOR} -USE_GITHUB= yes - -GH_ACCOUNT= treyhunner USES= python -USE_PYTHON= autoplist distutils - +USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes +PORTDOCS= *.rst + +OPTIONS_DEFINE= DOCS + +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/CHANGES.rst ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/*.rst ${STAGEDIR}${DOCSDIR} .include diff --git a/www/py-django-simple-history/distinfo b/www/py-django-simple-history/distinfo index 876661d6b42..4c170931bbc 100644 --- a/www/py-django-simple-history/distinfo +++ b/www/py-django-simple-history/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1525112467 -SHA256 (treyhunner-django-simple-history-2.0_GH0.tar.gz) = 6d51f76fc24829570814e58d2ee3439740183ede7031c86c45527ffe83fedf28 -SIZE (treyhunner-django-simple-history-2.0_GH0.tar.gz) = 180401 +TIMESTAMP = 1526024108 +SHA256 (django-simple-history-2.0.tar.gz) = 65de7b13b8df2d0eede3e6c0e2ebec69cb2a1f283109188b7a6c71b4e0d20980 +SIZE (django-simple-history-2.0.tar.gz) = 26943 diff --git a/www/py-feedgenerator/Makefile b/www/py-feedgenerator/Makefile index 557ed520455..f49d16919d0 100644 --- a/www/py-feedgenerator/Makefile +++ b/www/py-feedgenerator/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \ USES= python USE_PYTHON= distutils autoplist -regression-test: build +do-test: @cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test .include diff --git a/www/py-folium/Makefile b/www/py-folium/Makefile new file mode 100644 index 00000000000..64ae870e7a0 --- /dev/null +++ b/www/py-folium/Makefile @@ -0,0 +1,26 @@ +# Created by: Po-Chuan Hsieh +# $FreeBSD$ + +PORTNAME= folium +PORTVERSION= 0.5.0 +CATEGORIES= www python +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Make beautiful maps with Leaflet.js & Python + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE.txt + +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}branca>=0:www/py-branca@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} + +NO_ARCH= yes +USE_PYTHON= autoplist concurrent distutils +USES= python + +.include diff --git a/www/py-folium/distinfo b/www/py-folium/distinfo new file mode 100644 index 00000000000..3aca55ae7b7 --- /dev/null +++ b/www/py-folium/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1527223222 +SHA256 (folium-0.5.0.tar.gz) = 748944521146d85c6cd6230acf234e885864cd0f42fea3758d655488517e5e6e +SIZE (folium-0.5.0.tar.gz) = 79187 diff --git a/www/py-folium/pkg-descr b/www/py-folium/pkg-descr new file mode 100644 index 00000000000..0356ae8aa1f --- /dev/null +++ b/www/py-folium/pkg-descr @@ -0,0 +1,6 @@ +folium builds on the data wrangling strengths of the Python ecosystem and the +mapping strengths of the Leaflet.js library. Manipulate your data in Python, +then visualize it in a Leaflet map via folium. + +WWW: https://pypi.org/project/folium/ +WWW: https://github.com/python-visualization/folium diff --git a/www/py-google-api-core/Makefile b/www/py-google-api-core/Makefile index 1b41d7d73b2..4e8f5b7d3c1 100644 --- a/www/py-google-api-core/Makefile +++ b/www/py-google-api-core/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= google-api-core -PORTVERSION= 1.1.2 +PORTVERSION= 1.2.0 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-google-api-core/distinfo b/www/py-google-api-core/distinfo index ea733234f3d..7f0765dbcf2 100644 --- a/www/py-google-api-core/distinfo +++ b/www/py-google-api-core/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1525281379 -SHA256 (google-api-core-1.1.2.tar.gz) = 2000963305e95410a66e6ef6cfcc9f4627a4a95cb1c10abc98268814f2a6cd80 -SIZE (google-api-core-1.1.2.tar.gz) = 53253 +TIMESTAMP = 1527334315 +SHA256 (google-api-core-1.2.0.tar.gz) = 370d5dc108ac5dfea2eee8ef32b77693444bf957d4657820d12596ca5082e8ae +SIZE (google-api-core-1.2.0.tar.gz) = 53282 diff --git a/www/py-searx/Makefile b/www/py-searx/Makefile index d655eff79ac..699fdedd6be 100644 --- a/www/py-searx/Makefile +++ b/www/py-searx/Makefile @@ -25,8 +25,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}werkzeug>0:www/py-werkzeug@${PY_FLAVOR} -USES= python -USE_PYTHON= distutils autoplist noflavors +USES= python:2.7 +USE_PYTHON= distutils autoplist NO_ARCH= yes USE_RC_SUBR= searx diff --git a/www/rubygem-faraday/Makefile b/www/rubygem-faraday/Makefile index 5e8701a7f99..15c4135c8d7 100644 --- a/www/rubygem-faraday/Makefile +++ b/www/rubygem-faraday/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= faraday -PORTVERSION= 0.15.1 +PORTVERSION= 0.15.2 CATEGORIES= www rubygems MASTER_SITES= RG diff --git a/www/rubygem-faraday/distinfo b/www/rubygem-faraday/distinfo index 12d052551f0..6a7084c1026 100644 --- a/www/rubygem-faraday/distinfo +++ b/www/rubygem-faraday/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1526054527 -SHA256 (rubygem/faraday-0.15.1.gem) = bd5bd1ab8db9b3f99ed1113d80522dabf95941e40cc3107f9621546f6a357f60 -SIZE (rubygem/faraday-0.15.1.gem) = 39936 +TIMESTAMP = 1527232855 +SHA256 (rubygem/faraday-0.15.2.gem) = affa23f5e5ee27170cbb5045c580af9b396bac525516c6583661c2bb08038f92 +SIZE (rubygem/faraday-0.15.2.gem) = 39936 diff --git a/www/waterfox/Makefile b/www/waterfox/Makefile index d0ebaeca4e1..26318a9a993 100644 --- a/www/waterfox/Makefile +++ b/www/waterfox/Makefile @@ -3,7 +3,7 @@ PORTNAME= waterfox DISTVERSION= 56.2.0-13 DISTVERSIONSUFFIX= -gd2cdd42f4115b -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www ipv6 MAINTAINER= jbeich@FreeBSD.org diff --git a/www/waterfox/files/patch-bug1462682 b/www/waterfox/files/patch-bug1462682 new file mode 100644 index 00000000000..1580bb77741 --- /dev/null +++ b/www/waterfox/files/patch-bug1462682 @@ -0,0 +1,32 @@ +commit dc5382e1b765 +Author: Lee Salzman +Date: Fri May 25 00:57:45 2018 -0400 + + Bug 1462682 - Skia path bounds rounding fix. r=rhunt, a=RyanVM + + MozReview-Commit-ID: Lm0XhyLLCCV + + --HG-- + extra : source : 784deba1907770c8f4c3482509ae99d474c4439f +--- + gfx/skia/skia/src/core/SkScan_Path.cpp | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git gfx/skia/skia/src/core/SkScan_Path.cpp gfx/skia/skia/src/core/SkScan_Path.cpp +index 2373e62d46ff2..90a22305260f1 100644 +--- gfx/skia/skia/src/core/SkScan_Path.cpp ++++ gfx/skia/skia/src/core/SkScan_Path.cpp +@@ -564,7 +564,12 @@ static bool clip_to_limit(const SkRegion& orig, SkRegion* reduced) { + // Bias used for conservative rounding of float rects to int rects, to nudge the irects a little + // larger, so we don't "think" a path's bounds are inside a clip, when (due to numeric drift in + // the scan-converter) we might walk beyond the predicted limits. +-static const double kConservativeRoundBias = 0.5 + 0.5 / SK_FDot6One; ++// ++// This value has been determined trial and error: pick the smallest value (after the 0.5) that ++// fixes any problematic cases (e.g. crbug.com/844457) ++// NOTE: cubics appear to be the main reason for needing this slop. If we could (perhaps) have a ++// more accurate walker for cubics, we may be able to reduce this fudge factor. ++static const double kConservativeRoundBias = 0.5 + 1.5 / SK_FDot6One; + + /** + * Round the value down. This is used to round the top and left of a rectangle, diff --git a/www/waterfox/files/patch-bug1463244 b/www/waterfox/files/patch-bug1463244 new file mode 100644 index 00000000000..b1cdf82291e --- /dev/null +++ b/www/waterfox/files/patch-bug1463244 @@ -0,0 +1,161 @@ +commit 937a30033acb +Author: Lee Salzman +Date: Fri May 25 00:56:22 2018 -0400 + + Bug 1463244 - Cleanup of swizzle stride calculations. r=rhunt, a=RyanVM + + MozReview-Commit-ID: GMXRKnu8zHB + + --HG-- + extra : source : 2aaf8f2a1975c57f5467968734d110ac7becc7ee +--- + gfx/2d/DataSurfaceHelpers.cpp | 33 ++++++++++++++++++++++++--------- + gfx/2d/Swizzle.cpp | 34 +++++++++++++++++++++++++++------- + 2 files changed, 51 insertions(+), 16 deletions(-) + +diff --git gfx/2d/DataSurfaceHelpers.cpp gfx/2d/DataSurfaceHelpers.cpp +index f13be059c8ba0..7af32ff005771 100644 +--- gfx/2d/DataSurfaceHelpers.cpp ++++ gfx/2d/DataSurfaceHelpers.cpp +@@ -157,9 +157,16 @@ SurfaceToPackedBGRA(DataSourceSurface *aSurface) + } + + IntSize size = aSurface->GetSize(); +- +- UniquePtr imageBuffer( +- new (std::nothrow) uint8_t[size.width * size.height * sizeof(uint32_t)]); ++ if (size.width < 0 || size.width >= INT32_MAX / 4) { ++ return nullptr; ++ } ++ int32_t stride = size.width * 4; ++ CheckedInt bufferSize = ++ CheckedInt(stride) * CheckedInt(size.height); ++ if (!bufferSize.isValid()) { ++ return nullptr; ++ } ++ UniquePtr imageBuffer(new (std::nothrow) uint8_t[bufferSize.value()]); + if (!imageBuffer) { + return nullptr; + } +@@ -170,14 +177,14 @@ SurfaceToPackedBGRA(DataSourceSurface *aSurface) + } + + CopySurfaceDataToPackedArray(map.mData, imageBuffer.get(), size, +- map.mStride, 4 * sizeof(uint8_t)); ++ map.mStride, 4); + + aSurface->Unmap(); + + if (format == SurfaceFormat::B8G8R8X8) { + // Convert BGRX to BGRA by setting a to 255. +- SwizzleData(imageBuffer.get(), size.width * sizeof(uint32_t), SurfaceFormat::X8R8G8B8_UINT32, +- imageBuffer.get(), size.width * sizeof(uint32_t), SurfaceFormat::A8R8G8B8_UINT32, ++ SwizzleData(imageBuffer.get(), stride, SurfaceFormat::X8R8G8B8_UINT32, ++ imageBuffer.get(), stride, SurfaceFormat::A8R8G8B8_UINT32, + size); + } + +@@ -196,8 +203,16 @@ SurfaceToPackedBGR(DataSourceSurface *aSurface) + } + + IntSize size = aSurface->GetSize(); +- +- uint8_t* imageBuffer = new (std::nothrow) uint8_t[size.width * size.height * 3 * sizeof(uint8_t)]; ++ if (size.width < 0 || size.width >= INT32_MAX / 3) { ++ return nullptr; ++ } ++ int32_t stride = size.width * 3; ++ CheckedInt bufferSize = ++ CheckedInt(stride) * CheckedInt(size.height); ++ if (!bufferSize.isValid()) { ++ return nullptr; ++ } ++ uint8_t* imageBuffer = new (std::nothrow) uint8_t[bufferSize.value()]; + if (!imageBuffer) { + return nullptr; + } +@@ -209,7 +224,7 @@ SurfaceToPackedBGR(DataSourceSurface *aSurface) + } + + SwizzleData(map.mData, map.mStride, SurfaceFormat::B8G8R8X8, +- imageBuffer, size.width * 3, SurfaceFormat::B8G8R8, ++ imageBuffer, stride, SurfaceFormat::B8G8R8, + size); + + aSurface->Unmap(); +diff --git gfx/2d/Swizzle.cpp gfx/2d/Swizzle.cpp +index 99bd1e17662c4..acbe2cabf9819 100644 +--- gfx/2d/Swizzle.cpp ++++ gfx/2d/Swizzle.cpp +@@ -259,7 +259,8 @@ static inline IntSize + CollapseSize(const IntSize& aSize, int32_t aSrcStride, int32_t aDstStride) + { + if (aSrcStride == aDstStride && +- aSrcStride == 4 * aSize.width) { ++ (aSrcStride & 3) == 0 && ++ aSrcStride / 4 == aSize.width) { + CheckedInt32 area = CheckedInt32(aSize.width) * CheckedInt32(aSize.height); + if (area.isValid()) { + return IntSize(area.value(), 1); +@@ -268,6 +269,16 @@ CollapseSize(const IntSize& aSize, int32_t aSrcStride, int32_t aDstStride) + return aSize; + } + ++static inline int32_t ++GetStrideGap(int32_t aWidth, SurfaceFormat aFormat, int32_t aStride) ++{ ++ CheckedInt32 used = CheckedInt32(aWidth) * BytesPerPixel(aFormat); ++ if (!used.isValid() || used.value() < 0) { ++ return -1; ++ } ++ return aStride - used.value(); ++} ++ + bool + PremultiplyData(const uint8_t* aSrc, int32_t aSrcStride, SurfaceFormat aSrcFormat, + uint8_t* aDst, int32_t aDstStride, SurfaceFormat aDstFormat, +@@ -278,9 +289,12 @@ PremultiplyData(const uint8_t* aSrc, int32_t aSrcStride, SurfaceFormat aSrcForma + } + IntSize size = CollapseSize(aSize, aSrcStride, aDstStride); + // Find gap from end of row to the start of the next row. +- int32_t srcGap = aSrcStride - BytesPerPixel(aSrcFormat) * aSize.width; +- int32_t dstGap = aDstStride - BytesPerPixel(aDstFormat) * aSize.width; ++ int32_t srcGap = GetStrideGap(aSize.width, aSrcFormat, aSrcStride); ++ int32_t dstGap = GetStrideGap(aSize.width, aDstFormat, aDstStride); + MOZ_ASSERT(srcGap >= 0 && dstGap >= 0); ++ if (srcGap < 0 || dstGap < 0) { ++ return false; ++ } + + #define FORMAT_CASE_CALL(...) __VA_ARGS__(aSrc, srcGap, aDst, dstGap, size) + +@@ -404,9 +418,12 @@ UnpremultiplyData(const uint8_t* aSrc, int32_t aSrcStride, SurfaceFormat aSrcFor + } + IntSize size = CollapseSize(aSize, aSrcStride, aDstStride); + // Find gap from end of row to the start of the next row. +- int32_t srcGap = aSrcStride - BytesPerPixel(aSrcFormat) * aSize.width; +- int32_t dstGap = aDstStride - BytesPerPixel(aDstFormat) * aSize.width; ++ int32_t srcGap = GetStrideGap(aSize.width, aSrcFormat, aSrcStride); ++ int32_t dstGap = GetStrideGap(aSize.width, aDstFormat, aDstStride); + MOZ_ASSERT(srcGap >= 0 && dstGap >= 0); ++ if (srcGap < 0 || dstGap < 0) { ++ return false; ++ } + + #define FORMAT_CASE_CALL(...) __VA_ARGS__(aSrc, srcGap, aDst, dstGap, size) + +@@ -702,9 +719,12 @@ SwizzleData(const uint8_t* aSrc, int32_t aSrcStride, SurfaceFormat aSrcFormat, + } + IntSize size = CollapseSize(aSize, aSrcStride, aDstStride); + // Find gap from end of row to the start of the next row. +- int32_t srcGap = aSrcStride - BytesPerPixel(aSrcFormat) * aSize.width; +- int32_t dstGap = aDstStride - BytesPerPixel(aDstFormat) * aSize.width; ++ int32_t srcGap = GetStrideGap(aSize.width, aSrcFormat, aSrcStride); ++ int32_t dstGap = GetStrideGap(aSize.width, aDstFormat, aDstStride); + MOZ_ASSERT(srcGap >= 0 && dstGap >= 0); ++ if (srcGap < 0 || dstGap < 0) { ++ return false; ++ } + + #define FORMAT_CASE_CALL(...) __VA_ARGS__(aSrc, srcGap, aDst, dstGap, size) + diff --git a/www/wordpress/Makefile b/www/wordpress/Makefile index 0f76124ae73..60d6836c59b 100644 --- a/www/wordpress/Makefile +++ b/www/wordpress/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -DISTVERSION= 4.9.5 +DISTVERSION= 4.9.6 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= http://wordpress.org/ diff --git a/www/wordpress/distinfo b/www/wordpress/distinfo index 6f5ed5110b6..8923c08155f 100644 --- a/www/wordpress/distinfo +++ b/www/wordpress/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1524258288 -SHA256 (wordpress-4.9.5.tar.gz) = a1664b259755021adbfbe5e8f7fd78a98c015e92e1f985258abed19f759822cb -SIZE (wordpress-4.9.5.tar.gz) = 8565154 +TIMESTAMP = 1527283205 +SHA256 (wordpress-4.9.6.tar.gz) = 08256affe745ad68f4210d26dce932fa43ec2da16f0ec96c2e76cac9836bd77a +SIZE (wordpress-4.9.6.tar.gz) = 8740389 diff --git a/www/zenphoto/Makefile b/www/zenphoto/Makefile index 938628a3ac3..98ef9eb4192 100644 --- a/www/zenphoto/Makefile +++ b/www/zenphoto/Makefile @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= zenphoto -PORTVERSION= 1.4.14 -DISTVERSIONPREFIX= ${PORTNAME}- -PORTREVISION= 2 +PORTVERSION= 1.5 +DISTVERSIONPREFIX= v CATEGORIES= www PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} @@ -12,6 +11,7 @@ MAINTAINER= sunpoet@FreeBSD.org COMMENT= Simpler web photo gallery LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/LICENSE NO_ARCH= yes NO_BUILD= yes @@ -25,8 +25,7 @@ USE_GITHUB= yes post-extract: @${MKDIR} ${WRKSRC}/cache/ @${FIND} ${WRKSRC} -name '.git*' -delete - @${FIND} -s ${WRKSRC}/ -type d -empty | ${XARGS} -I % ${TOUCH} %/.keepme - @${RM} ${WRKSRC}/doc_files/Zenphoto\ license.txt ${WRKSRC}/doc_files/README.html ${WRKSRC}/zp-core/Zenphoto.package + @${RM} ${WRKSRC}/zp-core/Zenphoto.package do-install: ${MKDIR} ${STAGEDIR}${WWWDIR}/ @@ -34,19 +33,15 @@ do-install: # maintainer section: -MS_DIR= albums cache themes zp-core MS_PLIST= ${WRKDIR}/.ms-pkg-plist genplist: do-clean extract - ${ECHO_CMD} '@owner www' > ${MS_PLIST} - ${ECHO_CMD} '@group www' >> ${MS_PLIST} - cd ${WRKSRC}/ && ${FIND} * -type f | ${SORT} | ${SED} 's|^|%%WWWDIR%%/|' >> ${MS_PLIST} -.for dir in ${MS_DIR} - ${ECHO_CMD} '@dir %%WWWDIR%%/${dir}' >> ${MS_PLIST} -.endfor - ${ECHO_CMD} '@dir %%WWWDIR%%' >> ${MS_PLIST} - ${ECHO_CMD} '@owner' >> ${MS_PLIST} - ${ECHO_CMD} '@group' >> ${MS_PLIST} - ${INSTALL} -m 600 ${MS_PLIST} ${PLIST} + @${ECHO_CMD} '@owner www' > ${MS_PLIST} + @${ECHO_CMD} '@group www' >> ${MS_PLIST} + @cd ${WRKSRC}/ && ${FIND} * -type f | ${SORT} | ${SED} 's|^|%%WWWDIR%%/|' >> ${MS_PLIST} + @cd ${WRKSRC}/ && (${FIND} * -type d -empty | ${XARGS} -I _ ${ECHO_CMD} '@dir %%WWWDIR%%/_') >> ${MS_PLIST} + @${ECHO_CMD} '@owner' >> ${MS_PLIST} + @${ECHO_CMD} '@group' >> ${MS_PLIST} + @${INSTALL} -m 600 ${MS_PLIST} ${PLIST} .include diff --git a/www/zenphoto/distinfo b/www/zenphoto/distinfo index 9f65adb0944..05a2347f47e 100644 --- a/www/zenphoto/distinfo +++ b/www/zenphoto/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1492953198 -SHA256 (zenphoto-zenphoto-zenphoto-1.4.14_GH0.tar.gz) = ecd0efac214e60be9ed339977d7be946a34f6eeb5fe2adc6c20fa42bd450ebff -SIZE (zenphoto-zenphoto-zenphoto-1.4.14_GH0.tar.gz) = 9474221 +TIMESTAMP = 1527351961 +SHA256 (zenphoto-zenphoto-v1.5_GH0.tar.gz) = ec104f05fd7271163de88783964b37732760bf1dbf4d314be8fb5a3a7c6a5d97 +SIZE (zenphoto-zenphoto-v1.5_GH0.tar.gz) = 9207466 diff --git a/www/zenphoto/pkg-plist b/www/zenphoto/pkg-plist index e29f6e95928..1d23024609c 100644 --- a/www/zenphoto/pkg-plist +++ b/www/zenphoto/pkg-plist @@ -2,13 +2,8 @@ @group www %%WWWDIR%%/LICENSE %%WWWDIR%%/README.md -%%WWWDIR%%/albums/.keepme -%%WWWDIR%%/cache/.keepme %%WWWDIR%%/contributing.md %%WWWDIR%%/index.php -%%WWWDIR%%/plugins/gd_fonts/.keepme -%%WWWDIR%%/plugins/imagick_fonts/.keepme -%%WWWDIR%%/plugins/watermarks/.keepme %%WWWDIR%%/themes/basic/404.php %%WWWDIR%%/themes/basic/album.php %%WWWDIR%%/themes/basic/archive.php @@ -21,6 +16,7 @@ %%WWWDIR%%/themes/basic/images/admin-buttonback.jpg %%WWWDIR%%/themes/basic/images/img-bg.gif %%WWWDIR%%/themes/basic/images/tag.png +%%WWWDIR%%/themes/basic/inc-footer.php %%WWWDIR%%/themes/basic/index.php %%WWWDIR%%/themes/basic/password.php %%WWWDIR%%/themes/basic/register.php @@ -40,53 +36,6 @@ %%WWWDIR%%/themes/basic/tinymce4/config/dark_comment-ribbon.js.php %%WWWDIR%%/themes/basic/tinymce4/config/dark_comment-slim.js.php %%WWWDIR%%/themes/basic/tinymce4/config/dark_content.css -%%WWWDIR%%/themes/effervescence_plus/404.php -%%WWWDIR%%/themes/effervescence_plus/album.php -%%WWWDIR%%/themes/effervescence_plus/archive.php -%%WWWDIR%%/themes/effervescence_plus/base.css -%%WWWDIR%%/themes/effervescence_plus/colorbox/functions.php -%%WWWDIR%%/themes/effervescence_plus/common.css -%%WWWDIR%%/themes/effervescence_plus/contact.php -%%WWWDIR%%/themes/effervescence_plus/favorites.php -%%WWWDIR%%/themes/effervescence_plus/functions.php -%%WWWDIR%%/themes/effervescence_plus/gallery.php -%%WWWDIR%%/themes/effervescence_plus/image.php -%%WWWDIR%%/themes/effervescence_plus/image_gallery/functions.php -%%WWWDIR%%/themes/effervescence_plus/image_page/functions.php -%%WWWDIR%%/themes/effervescence_plus/images/25percent.png -%%WWWDIR%%/themes/effervescence_plus/images/50percent.png -%%WWWDIR%%/themes/effervescence_plus/images/admin-buttonback.jpg -%%WWWDIR%%/themes/effervescence_plus/images/arrow_right.png -%%WWWDIR%%/themes/effervescence_plus/images/dark-bullet.png -%%WWWDIR%%/themes/effervescence_plus/images/dark_arrow_right.png -%%WWWDIR%%/themes/effervescence_plus/images/effervescence.png -%%WWWDIR%%/themes/effervescence_plus/images/err-passwordprotected.png -%%WWWDIR%%/themes/effervescence_plus/images/imageDefault.png -%%WWWDIR%%/themes/effervescence_plus/images/search.png -%%WWWDIR%%/themes/effervescence_plus/images/zen-logo.jpg -%%WWWDIR%%/themes/effervescence_plus/index.php -%%WWWDIR%%/themes/effervescence_plus/indexpage.php -%%WWWDIR%%/themes/effervescence_plus/news.php -%%WWWDIR%%/themes/effervescence_plus/pages.php -%%WWWDIR%%/themes/effervescence_plus/password.php -%%WWWDIR%%/themes/effervescence_plus/register.php -%%WWWDIR%%/themes/effervescence_plus/search.php -%%WWWDIR%%/themes/effervescence_plus/sidebar.php -%%WWWDIR%%/themes/effervescence_plus/slideshow-controls.png -%%WWWDIR%%/themes/effervescence_plus/slideshow.css -%%WWWDIR%%/themes/effervescence_plus/slideshow.php -%%WWWDIR%%/themes/effervescence_plus/styles/blue and green play.txt -%%WWWDIR%%/themes/effervescence_plus/styles/effervescence.txt -%%WWWDIR%%/themes/effervescence_plus/styles/free chocolates.txt -%%WWWDIR%%/themes/effervescence_plus/styles/kish-my father.txt -%%WWWDIR%%/themes/effervescence_plus/styles/machu picchu.txt -%%WWWDIR%%/themes/effervescence_plus/styles/oktoberfest.txt -%%WWWDIR%%/themes/effervescence_plus/styles/poolside.txt -%%WWWDIR%%/themes/effervescence_plus/styles/rainbow.txt -%%WWWDIR%%/themes/effervescence_plus/styles/see you again.txt -%%WWWDIR%%/themes/effervescence_plus/theme.jpg -%%WWWDIR%%/themes/effervescence_plus/theme_description.php -%%WWWDIR%%/themes/effervescence_plus/themeoptions.php %%WWWDIR%%/themes/garland/404.php %%WWWDIR%%/themes/garland/album.php %%WWWDIR%%/themes/garland/archive.php @@ -383,7 +332,6 @@ %%WWWDIR%%/themes/zpmobile/theme.png %%WWWDIR%%/themes/zpmobile/theme_description.php %%WWWDIR%%/themes/zpmobile/themeoptions.php -%%WWWDIR%%/uploaded/.keepme %%WWWDIR%%/zp-core/404.php %%WWWDIR%%/zp-core/admin-albumsort.php %%WWWDIR%%/zp-core/admin-dynamic-album.php @@ -412,6 +360,7 @@ %%WWWDIR%%/zp-core/class-gallery.php %%WWWDIR%%/zp-core/class-image.php %%WWWDIR%%/zp-core/class-search.php +%%WWWDIR%%/zp-core/class-userdataexport.php %%WWWDIR%%/zp-core/classes.php %%WWWDIR%%/zp-core/controller.php %%WWWDIR%%/zp-core/cron_runner.php @@ -674,6 +623,7 @@ %%WWWDIR%%/zp-core/lib-auth.php %%WWWDIR%%/zp-core/lib-encryption.php %%WWWDIR%%/zp-core/lib-gettext/gettext.inc +%%WWWDIR%%/zp-core/lib-htmLawed.php %%WWWDIR%%/zp-core/lib-json.php %%WWWDIR%%/zp-core/lib-kses.php %%WWWDIR%%/zp-core/lib-pclzip.php @@ -761,6 +711,7 @@ %%WWWDIR%%/zp-core/utilities/refresh_database.php %%WWWDIR%%/zp-core/utilities/refresh_metadata.php %%WWWDIR%%/zp-core/utilities/reset_albumthumbs.php +%%WWWDIR%%/zp-core/utilities/user-data-export.php %%WWWDIR%%/zp-core/version.php %%WWWDIR%%/zp-core/watermarks/copyright.png %%WWWDIR%%/zp-core/watermarks/watermark-text.png @@ -809,11 +760,9 @@ %%WWWDIR%%/zp-core/zp-extensions/class-WEBdocs/tifDefault.png %%WWWDIR%%/zp-core/zp-extensions/class-textobject.php %%WWWDIR%%/zp-core/zp-extensions/class-textobject/class-textobject_core.php -%%WWWDIR%%/zp-core/zp-extensions/class-textobject/deprecated-functions.php %%WWWDIR%%/zp-core/zp-extensions/class-textobject/textDefault.png %%WWWDIR%%/zp-core/zp-extensions/class-video.php %%WWWDIR%%/zp-core/zp-extensions/class-video/3gpDefault.png -%%WWWDIR%%/zp-core/zp-extensions/class-video/deprecated-functions.php %%WWWDIR%%/zp-core/zp-extensions/class-video/flaDefault.png %%WWWDIR%%/zp-core/zp-extensions/class-video/flvDefault.png %%WWWDIR%%/zp-core/zp-extensions/class-video/getid3/getid3.lib.php @@ -909,7 +858,6 @@ %%WWWDIR%%/zp-core/zp-extensions/comment_form/admin-comments.php %%WWWDIR%%/zp-core/zp-extensions/comment_form/class-comment.php %%WWWDIR%%/zp-core/zp-extensions/comment_form/comment_form.php -%%WWWDIR%%/zp-core/zp-extensions/comment_form/deprecated-functions.php %%WWWDIR%%/zp-core/zp-extensions/comment_form/functions.php %%WWWDIR%%/zp-core/zp-extensions/common/adGallery/LICENSE.txt %%WWWDIR%%/zp-core/zp-extensions/common/adGallery/ad_next.png @@ -927,6 +875,9 @@ %%WWWDIR%%/zp-core/zp-extensions/common/oAuth/OAuth.php %%WWWDIR%%/zp-core/zp-extensions/contact_form.php %%WWWDIR%%/zp-core/zp-extensions/contact_form/form.php +%%WWWDIR%%/zp-core/zp-extensions/cookieconsent.php +%%WWWDIR%%/zp-core/zp-extensions/cookieconsent/cookieconsent.min.css +%%WWWDIR%%/zp-core/zp-extensions/cookieconsent/cookieconsent.min.js %%WWWDIR%%/zp-core/zp-extensions/crop_image.php %%WWWDIR%%/zp-core/zp-extensions/crop_image/crop_image.css %%WWWDIR%%/zp-core/zp-extensions/crop_image/swap.png @@ -939,7 +890,6 @@ %%WWWDIR%%/zp-core/zp-extensions/deprecated-functions/deprecated-functions.php %%WWWDIR%%/zp-core/zp-extensions/deprecated-functions/functions.php %%WWWDIR%%/zp-core/zp-extensions/downloadList.php -%%WWWDIR%%/zp-core/zp-extensions/downloadList/deprecated-functions.php %%WWWDIR%%/zp-core/zp-extensions/downloadList/download_statistics.php %%WWWDIR%%/zp-core/zp-extensions/dynamic-locale.php %%WWWDIR%%/zp-core/zp-extensions/dynamic-locale/locale.css @@ -1021,69 +971,8 @@ %%WWWDIR%%/zp-core/zp-extensions/elFinder/php/plugins/Watermark/plugin.php %%WWWDIR%%/zp-core/zp-extensions/email-newuser.php %%WWWDIR%%/zp-core/zp-extensions/exampleMacros.php -%%WWWDIR%%/zp-core/zp-extensions/externalFeed.php %%WWWDIR%%/zp-core/zp-extensions/favoritesHandler.php -%%WWWDIR%%/zp-core/zp-extensions/favoritesHandler/deprecated-functions.php %%WWWDIR%%/zp-core/zp-extensions/favoritesHandler/favoritesClass.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/Janrain Readme.txt -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/OpenID.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/OpenID/AX.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/OpenID/Association.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/OpenID/BigMath.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/OpenID/Consumer.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/OpenID/CryptUtil.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/OpenID/DatabaseConnection.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/OpenID/DiffieHellman.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/OpenID/Discover.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/OpenID/DumbStore.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/OpenID/Extension.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/OpenID/FileStore.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/OpenID/HMAC.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/OpenID/Interface.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/OpenID/KVForm.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/OpenID/MDB2Store.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/OpenID/MemcachedStore.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/OpenID/Message.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/OpenID/MySQLStore.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/OpenID/Nonce.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/OpenID/PAPE.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/OpenID/Parse.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/OpenID/PostgreSQLStore.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/OpenID/SQLStore.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/OpenID/SQLiteStore.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/OpenID/SReg.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/OpenID/Server.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/OpenID/ServerRequest.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/OpenID/TrustRoot.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/OpenID/URINorm.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/OpenID_detect.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/Yadis/HTTPFetcher.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/Yadis/Manager.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/Yadis/Misc.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/Yadis/ParanoidHTTPFetcher.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/Yadis/ParseHTML.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/Yadis/PlainHTTPFetcher.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/Yadis/XML.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/Yadis/XRDS.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/Yadis/XRI.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/Yadis/XRIRes.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Auth/Yadis/Yadis.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Google.png -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Google_logon.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/MyOpenID.png -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/MyOpenID_logon.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/OpenID.png -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/OpenID_common.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/OpenID_finish_auth.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/OpenID_logon.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/OpenID_try_auth.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Verisign.png -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Verisign_logon.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Yahoo.png -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/Yahoo_logon.php -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/federated_logon.css -%%WWWDIR%%/zp-core/zp-extensions/federated_logon/federated_logon_buttons.css %%WWWDIR%%/zp-core/zp-extensions/flag_thumbnail.php %%WWWDIR%%/zp-core/zp-extensions/flag_thumbnail/GPS.png %%WWWDIR%%/zp-core/zp-extensions/flag_thumbnail/action.png @@ -1091,50 +980,10 @@ %%WWWDIR%%/zp-core/zp-extensions/flag_thumbnail/new.png %%WWWDIR%%/zp-core/zp-extensions/galleryArticles.php %%WWWDIR%%/zp-core/zp-extensions/galleryArticles/combiNews.php -%%WWWDIR%%/zp-core/zp-extensions/googleVerify.php %%WWWDIR%%/zp-core/zp-extensions/hitcounter.php %%WWWDIR%%/zp-core/zp-extensions/html_meta_tags.php -%%WWWDIR%%/zp-core/zp-extensions/http_auth.php %%WWWDIR%%/zp-core/zp-extensions/image_album_statistics.php -%%WWWDIR%%/zp-core/zp-extensions/image_effects.php -%%WWWDIR%%/zp-core/zp-extensions/image_effects/bevel.txt -%%WWWDIR%%/zp-core/zp-extensions/image_effects/corner.txt -%%WWWDIR%%/zp-core/zp-extensions/image_effects/crippleedge.txt -%%WWWDIR%%/zp-core/zp-extensions/image_effects/curl.txt -%%WWWDIR%%/zp-core/zp-extensions/image_effects/desaturate.js -%%WWWDIR%%/zp-core/zp-extensions/image_effects/edges.js -%%WWWDIR%%/zp-core/zp-extensions/image_effects/emboss.js -%%WWWDIR%%/zp-core/zp-extensions/image_effects/filmed.txt -%%WWWDIR%%/zp-core/zp-extensions/image_effects/glossy.txt -%%WWWDIR%%/zp-core/zp-extensions/image_effects/highlight.txt -%%WWWDIR%%/zp-core/zp-extensions/image_effects/instant.txt -%%WWWDIR%%/zp-core/zp-extensions/image_effects/laplace.js -%%WWWDIR%%/zp-core/zp-extensions/image_effects/pixastic-desaturate.txt -%%WWWDIR%%/zp-core/zp-extensions/image_effects/pixastic-edges.txt -%%WWWDIR%%/zp-core/zp-extensions/image_effects/pixastic-emboss.txt -%%WWWDIR%%/zp-core/zp-extensions/image_effects/pixastic-laplace.txt -%%WWWDIR%%/zp-core/zp-extensions/image_effects/pixastic-posterize.txt -%%WWWDIR%%/zp-core/zp-extensions/image_effects/pixastic-sepia.txt -%%WWWDIR%%/zp-core/zp-extensions/image_effects/pixastic.core.js -%%WWWDIR%%/zp-core/zp-extensions/image_effects/pop_up.txt -%%WWWDIR%%/zp-core/zp-extensions/image_effects/posterize.js -%%WWWDIR%%/zp-core/zp-extensions/image_effects/reflex.txt -%%WWWDIR%%/zp-core/zp-extensions/image_effects/sepia.js -%%WWWDIR%%/zp-core/zp-extensions/image_effects/slided.txt -%%WWWDIR%%/zp-core/zp-extensions/image_effects/sphere.txt %%WWWDIR%%/zp-core/zp-extensions/ipBlocker.php -%%WWWDIR%%/zp-core/zp-extensions/jcarousel_thumb_nav.php -%%WWWDIR%%/zp-core/zp-extensions/jcarousel_thumb_nav/deprecated-functions.php -%%WWWDIR%%/zp-core/zp-extensions/jcarousel_thumb_nav/jcarousel.css -%%WWWDIR%%/zp-core/zp-extensions/jcarousel_thumb_nav/jcarousel.js -%%WWWDIR%%/zp-core/zp-extensions/jcarousel_thumb_nav/jcarousel_ajax.php -%%WWWDIR%%/zp-core/zp-extensions/jcarousel_thumb_nav/jcarousel_loading.gif -%%WWWDIR%%/zp-core/zp-extensions/jcarousel_thumb_nav/jcarousel_next.png -%%WWWDIR%%/zp-core/zp-extensions/jcarousel_thumb_nav/jcarousel_next_vertical.png -%%WWWDIR%%/zp-core/zp-extensions/jcarousel_thumb_nav/jcarousel_prev.png -%%WWWDIR%%/zp-core/zp-extensions/jcarousel_thumb_nav/jcarousel_prev_vertical.png -%%WWWDIR%%/zp-core/zp-extensions/jcarousel_thumb_nav/jquery.jcarousel.css -%%WWWDIR%%/zp-core/zp-extensions/jcarousel_thumb_nav/jquery.jcarousel.pack.js %%WWWDIR%%/zp-core/zp-extensions/jplayer.php %%WWWDIR%%/zp-core/zp-extensions/jplayer/js/jplayer.playlist.min.js %%WWWDIR%%/zp-core/zp-extensions/jplayer/js/jquery.jplayer.inspector.min.js @@ -1167,10 +1016,11 @@ %%WWWDIR%%/zp-core/zp-extensions/jplayer/skin/zenphotolight/jplayer.zenphoto.png %%WWWDIR%%/zp-core/zp-extensions/jplayer/skin/zenphotolight/jplayer.zenphoto.seeking.gif %%WWWDIR%%/zp-core/zp-extensions/jplayer/skin/zenphotolight/jplayer.zenphotolight.css -%%WWWDIR%%/zp-core/zp-extensions/legacySpam.php %%WWWDIR%%/zp-core/zp-extensions/macroList.php %%WWWDIR%%/zp-core/zp-extensions/macroList/macroList_tab.php %%WWWDIR%%/zp-core/zp-extensions/markRelease.php +%%WWWDIR%%/zp-core/zp-extensions/matomo.php +%%WWWDIR%%/zp-core/zp-extensions/matomo/matomo_tab.php %%WWWDIR%%/zp-core/zp-extensions/menu_manager.php %%WWWDIR%%/zp-core/zp-extensions/menu_manager/menu_manager-admin-functions.php %%WWWDIR%%/zp-core/zp-extensions/menu_manager/menu_tab.php @@ -1179,6 +1029,29 @@ %%WWWDIR%%/zp-core/zp-extensions/mobileTheme.php %%WWWDIR%%/zp-core/zp-extensions/mobileTheme/Mobile_Detect.php %%WWWDIR%%/zp-core/zp-extensions/multiple_layouts.php +%%WWWDIR%%/zp-core/zp-extensions/openstreetmap.php +%%WWWDIR%%/zp-core/zp-extensions/openstreetmap/Control.MiniMap.min.css +%%WWWDIR%%/zp-core/zp-extensions/openstreetmap/Control.MiniMap.min.js +%%WWWDIR%%/zp-core/zp-extensions/openstreetmap/L.Control.MousePosition.css +%%WWWDIR%%/zp-core/zp-extensions/openstreetmap/L.Control.MousePosition.js +%%WWWDIR%%/zp-core/zp-extensions/openstreetmap/MarkerCluster.Default.css +%%WWWDIR%%/zp-core/zp-extensions/openstreetmap/MarkerCluster.css +%%WWWDIR%%/zp-core/zp-extensions/openstreetmap/images/layers-2x.png +%%WWWDIR%%/zp-core/zp-extensions/openstreetmap/images/layers.png +%%WWWDIR%%/zp-core/zp-extensions/openstreetmap/images/loader.gif +%%WWWDIR%%/zp-core/zp-extensions/openstreetmap/images/marker-icon-2x.png +%%WWWDIR%%/zp-core/zp-extensions/openstreetmap/images/marker-icon-grey-2x.png +%%WWWDIR%%/zp-core/zp-extensions/openstreetmap/images/marker-icon-grey.png +%%WWWDIR%%/zp-core/zp-extensions/openstreetmap/images/marker-icon.png +%%WWWDIR%%/zp-core/zp-extensions/openstreetmap/images/marker-shadow.png +%%WWWDIR%%/zp-core/zp-extensions/openstreetmap/images/toggle.png +%%WWWDIR%%/zp-core/zp-extensions/openstreetmap/images/toggle.svg +%%WWWDIR%%/zp-core/zp-extensions/openstreetmap/leaflet-providers.js +%%WWWDIR%%/zp-core/zp-extensions/openstreetmap/leaflet.css +%%WWWDIR%%/zp-core/zp-extensions/openstreetmap/leaflet.js +%%WWWDIR%%/zp-core/zp-extensions/openstreetmap/leaflet.markercluster.js +%%WWWDIR%%/zp-core/zp-extensions/openstreetmap/openstreetmap.css +%%WWWDIR%%/zp-core/zp-extensions/openstreetmap/tile-definitions.js %%WWWDIR%%/zp-core/zp-extensions/paged_thumbs_nav.php %%WWWDIR%%/zp-core/zp-extensions/print_album_menu.php %%WWWDIR%%/zp-core/zp-extensions/publishContent.php @@ -1187,64 +1060,12 @@ %%WWWDIR%%/zp-core/zp-extensions/quota_manager.php %%WWWDIR%%/zp-core/zp-extensions/rating.php %%WWWDIR%%/zp-core/zp-extensions/rating/delete.png -%%WWWDIR%%/zp-core/zp-extensions/rating/deprecated-functions.php %%WWWDIR%%/zp-core/zp-extensions/rating/jquery.MetaData.js %%WWWDIR%%/zp-core/zp-extensions/rating/jquery.rating.css %%WWWDIR%%/zp-core/zp-extensions/rating/jquery.rating.js %%WWWDIR%%/zp-core/zp-extensions/rating/star.png %%WWWDIR%%/zp-core/zp-extensions/rating/update.php %%WWWDIR%%/zp-core/zp-extensions/reCaptcha.php -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/recaptchalib.php -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpBlack/audio.png -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpBlack/background.png -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpBlack/help.png -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpBlack/logo.png -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpBlack/reCaptcha.html -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpBlack/refresh.png -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpBlack/text.png -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpBlue/audio.png -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpBlue/help.png -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpBlue/logo.png -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpBlue/reCaptcha.html -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpBlue/refresh.png -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpBlue/text.png -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpBrown/audio.png -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpBrown/help.png -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpBrown/logo.png -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpBrown/reCaptcha.html -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpBrown/refresh.png -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpBrown/text.png -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpClean/audio.png -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpClean/help.png -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpClean/logo.png -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpClean/reCaptcha.html -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpClean/refresh.png -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpClean/text.png -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpGreen/audio.png -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpGreen/help.png -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpGreen/logo.png -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpGreen/reCaptcha.html -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpGreen/refresh.png -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpGreen/text.png -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpLightBlue/audio.png -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpLightBlue/help.png -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpLightBlue/logo.png -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpLightBlue/reCaptcha.html -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpLightBlue/refresh.png -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpLightBlue/text.png -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpRed/audio.png -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpRed/help.png -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpRed/logo.png -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpRed/reCaptcha.html -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpRed/refresh.png -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpRed/text.png -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpTextured/audio.png -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpTextured/background.png -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpTextured/help.png -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpTextured/logo.png -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpTextured/reCaptcha.html -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpTextured/refresh.png -%%WWWDIR%%/zp-core/zp-extensions/reCaptcha/zpTextured/text.png %%WWWDIR%%/zp-core/zp-extensions/register_user.php %%WWWDIR%%/zp-core/zp-extensions/register_user/register_user_form.php %%WWWDIR%%/zp-core/zp-extensions/related_items.php @@ -1254,8 +1075,15 @@ %%WWWDIR%%/zp-core/zp-extensions/rewriteTokens.php %%WWWDIR%%/zp-core/zp-extensions/rewriteTokens/admin_tab.php %%WWWDIR%%/zp-core/zp-extensions/rss.php -%%WWWDIR%%/zp-core/zp-extensions/rss/deprecated-functions.php %%WWWDIR%%/zp-core/zp-extensions/rss/rss.css +%%WWWDIR%%/zp-core/zp-extensions/scriptless-socialsharing.php +%%WWWDIR%%/zp-core/zp-extensions/scriptless-socialsharing/fonts/scriptless-socialbuttons.eot +%%WWWDIR%%/zp-core/zp-extensions/scriptless-socialsharing/fonts/scriptless-socialbuttons.svg +%%WWWDIR%%/zp-core/zp-extensions/scriptless-socialsharing/fonts/scriptless-socialbuttons.ttf +%%WWWDIR%%/zp-core/zp-extensions/scriptless-socialsharing/fonts/scriptless-socialbuttons.woff +%%WWWDIR%%/zp-core/zp-extensions/scriptless-socialsharing/selection.json +%%WWWDIR%%/zp-core/zp-extensions/scriptless-socialsharing/style.css +%%WWWDIR%%/zp-core/zp-extensions/scriptless-socialsharing/style.min.css %%WWWDIR%%/zp-core/zp-extensions/search_statistics.php %%WWWDIR%%/zp-core/zp-extensions/search_statistics/search_analysis.php %%WWWDIR%%/zp-core/zp-extensions/security-logger.php @@ -1271,13 +1099,6 @@ %%WWWDIR%%/zp-core/zp-extensions/site_upgrade/site_upgrade.php %%WWWDIR%%/zp-core/zp-extensions/sitemap-extended.php %%WWWDIR%%/zp-core/zp-extensions/sitemap-extended/sitemap-extended-admin.php -%%WWWDIR%%/zp-core/zp-extensions/slideshow.php -%%WWWDIR%%/zp-core/zp-extensions/slideshow/controls.png -%%WWWDIR%%/zp-core/zp-extensions/slideshow/deprecated-functions.php -%%WWWDIR%%/zp-core/zp-extensions/slideshow/jquery.cycle.all.js -%%WWWDIR%%/zp-core/zp-extensions/slideshow/slideshow-controls.png -%%WWWDIR%%/zp-core/zp-extensions/slideshow/slideshow-counter.php -%%WWWDIR%%/zp-core/zp-extensions/slideshow/slideshow.css %%WWWDIR%%/zp-core/zp-extensions/slideshow2.php %%WWWDIR%%/zp-core/zp-extensions/slideshow2/fonts/cycle2-icons.eot %%WWWDIR%%/zp-core/zp-extensions/slideshow2/fonts/cycle2-icons.svg @@ -1349,7 +1170,6 @@ %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/charmap/plugin.min.js %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/code/plugin.min.js %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/codesample/css/prism.css -%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/codesample/plugin.dev.js %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/codesample/plugin.min.js %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/colorpicker/plugin.min.js %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/compat3x/css/dialog.css @@ -1390,35 +1210,29 @@ %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/emoticons/img/smiley-wink.gif %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/emoticons/img/smiley-yell.gif %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/emoticons/plugin.min.js -%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/example/dialog.html -%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/example/plugin.min.js -%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/example_dependency/plugin.min.js %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/fullpage/plugin.min.js %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/fullscreen/plugin.min.js +%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/help/img/logo.png +%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/help/plugin.min.js %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/hr/plugin.min.js %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/image/plugin.min.js %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/imagetools/plugin.min.js %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/importcss/plugin.min.js %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/insertdatetime/plugin.min.js -%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/layer/plugin.min.js %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/legacyoutput/plugin.min.js %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/link/plugin.min.js %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/lists/plugin.min.js -%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/media/moxieplayer.swf %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/media/plugin.min.js %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/nonbreaking/plugin.min.js %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/noneditable/plugin.min.js %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/pagebreak/plugin.min.js -%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/paste/plugin.dev.js %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/paste/plugin.min.js %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/preview/plugin.min.js %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/print/plugin.min.js %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/save/plugin.min.js %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/searchreplace/plugin.min.js -%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/spellchecker/plugin.dev.js %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/spellchecker/plugin.min.js %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/tabfocus/plugin.min.js -%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/table/plugin.dev.js %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/table/plugin.min.js %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/template/plugin.min.js %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/textcolor/plugin.min.js @@ -1444,6 +1258,8 @@ %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/wordcount/plugin.min.js %%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/content.inline.min.css %%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/content.min.css +%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/content.mobile.min.css +%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/fonts/tinymce-mobile.woff %%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/fonts/tinymce-small.eot %%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/fonts/tinymce-small.svg %%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/fonts/tinymce-small.ttf @@ -1456,8 +1272,8 @@ %%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/img/loader.gif %%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/img/object.gif %%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/img/trans.gif -%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/skin.ie7.min.css %%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/skin.min.css +%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/skin.mobile.min.css %%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/tundora/content.inline.min.css %%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/tundora/content.min.css %%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/tundora/fonts/icomoon-small.eot @@ -1478,12 +1294,10 @@ %%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/tundora/skin.json %%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/tundora/skin.min.css %%WWWDIR%%/zp-core/zp-extensions/tinymce4/themes/inlite/theme.min.js +%%WWWDIR%%/zp-core/zp-extensions/tinymce4/themes/mobile/theme.min.js %%WWWDIR%%/zp-core/zp-extensions/tinymce4/themes/modern/theme.min.js %%WWWDIR%%/zp-core/zp-extensions/tinymce4/tinymce.min.js %%WWWDIR%%/zp-core/zp-extensions/trivialSpam.php -%%WWWDIR%%/zp-core/zp-extensions/tweet_news.php -%%WWWDIR%%/zp-core/zp-extensions/tweet_news/twitter_newbird_blue.png -%%WWWDIR%%/zp-core/zp-extensions/tweet_news/twitteroauth.php %%WWWDIR%%/zp-core/zp-extensions/uploader_http.php %%WWWDIR%%/zp-core/zp-extensions/uploader_http/httpupload.css %%WWWDIR%%/zp-core/zp-extensions/uploader_http/httpupload.js @@ -1507,16 +1321,12 @@ %%WWWDIR%%/zp-core/zp-extensions/user_groups/user_groups-tab.php %%WWWDIR%%/zp-core/zp-extensions/user_login-out.php %%WWWDIR%%/zp-core/zp-extensions/user_mailing_list.php -%%WWWDIR%%/zp-core/zp-extensions/viewer_size_image.php -%%WWWDIR%%/zp-core/zp-extensions/wordpress_import.php -%%WWWDIR%%/zp-core/zp-extensions/wordpress_import/wpmini-blue.png %%WWWDIR%%/zp-core/zp-extensions/xmpMetadata.php %%WWWDIR%%/zp-core/zp-extensions/zenpage.php %%WWWDIR%%/zp-core/zp-extensions/zenpage/admin-categories.php %%WWWDIR%%/zp-core/zp-extensions/zenpage/admin-edit.php %%WWWDIR%%/zp-core/zp-extensions/zenpage/admin-news-articles.php %%WWWDIR%%/zp-core/zp-extensions/zenpage/admin-pages.php -%%WWWDIR%%/zp-core/zp-extensions/zenpage/deprecated-functions.php %%WWWDIR%%/zp-core/zp-extensions/zenpage/images/add.png %%WWWDIR%%/zp-core/zp-extensions/zenpage/images/clock.png %%WWWDIR%%/zp-core/zp-extensions/zenpage/images/folder.png @@ -1537,13 +1347,12 @@ %%WWWDIR%%/zp-core/zp-extensions/zenphoto_news.php %%WWWDIR%%/zp-core/zp-extensions/zenphoto_news/rsslib.php %%WWWDIR%%/zp-core/zp-extensions/zenphoto_sendmail.php -%%WWWDIR%%/zp-core/zp-extensions/zpCaptcha.php -%%WWWDIR%%/zp-core/zp-extensions/zpCaptcha/c.php -%%WWWDIR%%/zp-data/.keepme -@dir %%WWWDIR%%/zp-core -@dir %%WWWDIR%%/themes -@dir %%WWWDIR%%/cache @dir %%WWWDIR%%/albums -@dir %%WWWDIR%% +@dir %%WWWDIR%%/cache +@dir %%WWWDIR%%/plugins/watermarks +@dir %%WWWDIR%%/plugins/gd_fonts +@dir %%WWWDIR%%/plugins/imagick_fonts +@dir %%WWWDIR%%/uploaded +@dir %%WWWDIR%%/zp-data @owner @group diff --git a/x11-fm/doublecmd/Makefile b/x11-fm/doublecmd/Makefile index 8b5ee9212ff..6fb847ade7e 100644 --- a/x11-fm/doublecmd/Makefile +++ b/x11-fm/doublecmd/Makefile @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= doublecmd -PORTVERSION= 0.8.1 -PORTREVISION= 1 +PORTVERSION= 0.8.2 CATEGORIES= x11-fm +PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX} MASTER_SITES= SF/${PORTNAME}/Double%20Commander%20Source DISTNAME= ${PORTNAME}-${PORTVERSION}-src DISTFILES= ${DISTNAME}.tar.gz ${PORTNAME}-help-${HELPVERSION}-src.tar.gz @@ -16,12 +16,9 @@ LICENSE= GPLv2 ONLY_FOR_ARCHS= amd64 i386 -BUILD_DEPENDS= lazbuild:editors/lazarus \ - fpcres:lang/fpc-utils - PORTDOCS= * -USES= dos2unix desktop-file-utils fpc +USES= dos2unix desktop-file-utils fpc lazarus:flavors USE_FPC= cairo chm fcl-base fcl-db fcl-image fcl-json fcl-registry \ fcl-xml iconvenc pasjpeg rtl-extra x11 regexpr USE_XORG= x11 @@ -29,19 +26,28 @@ DOS2UNIX_FILES= src/dmhelpmanager.pas PLIST= ${WRKDIR}/pkg-plist -PROJECT_FILE= src/doublecmd.lpi -LAZARUS_VER= 1.8.0 -LAZBUILD_CMD= ${LOCALBASE}/bin/lazbuild -d --pcp=${WRKSRC}/tmppcp -LAZARUS_DIR= ${LOCALBASE}/share/lazarus-${LAZARUS_VER} +LAZARUS_PROJECT_FILES= components/chsdet/chsdet.lpk +LAZARUS_PROJECT_FILES+= components/CmdLine/cmdbox.lpk +LAZARUS_PROJECT_FILES+= components/multithreadprocs/multithreadprocslaz.lpk +LAZARUS_PROJECT_FILES+= components/dcpcrypt/dcpcrypt.lpk +LAZARUS_PROJECT_FILES+= components/doublecmd/doublecmd_common.lpk +LAZARUS_PROJECT_FILES+= components/KASToolBar/kascomp.lpk +LAZARUS_PROJECT_FILES+= components/viewer/viewerpackage.lpk +LAZARUS_PROJECT_FILES+= components/gifanim/pkg_gifanim.lpk +LAZARUS_PROJECT_FILES+= components/synunihighlighter/synuni.lpk + +LAZARUS_NO_FLAVORS=qt5 +LAZBUILD_ARGS= -d --pcp=${WRKSRC}/tmppcp MAKE_ENV+= LDVER=ld.bfd # for DragonFly HELPVERSION= 0.6.0 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} DOCSRC= ${WRKDIR}/${PORTNAME}-help-${HELPVERSION} +gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt4 +qt4_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 + OPTIONS_DEFINE= DOCS DEBUG -OPTIONS_SINGLE= LCL -OPTIONS_SINGLE_LCL= GTK2 QT4 OPTIONS_GROUP= WCX WDX WFX WLX DSX OPTIONS_GROUP_WCX= WCX_CPIO \ WCX_DEB \ @@ -88,8 +94,7 @@ WLX_MPLAYER_DESC= Use MPlayer for multimedia files DSX_DESC= Search plugins DSX_LOCATE_DESC= Support locate command -OPTIONS_DEFAULT= GTK2 \ - WCX_CPIO \ +OPTIONS_DEFAULT= WCX_CPIO \ WCX_DEB \ WCX_RPM \ WCX_UNRAR \ @@ -105,36 +110,85 @@ OPTIONS_DEFAULT= GTK2 \ WFX_SAMBA \ DSX_LOCATE -GTK2_USE= fpc=gtk2 gnome=gtk20 -GTK2_BUILD_DEPENDS= ${LAZARUS_DIR}/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-gtk2 - -QT4_LIB_DEPENDS= libQt4Pas.so:x11-toolkits/qt4pas -QT4_BUILD_DEPENDS= ${LAZARUS_DIR}/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt -QT4_BROKEN= Does not build - WCX_UNRAR_LIB_DEPENDS= libunrar.so.5:archivers/libunrar5 WFX_SAMBA_USES= samba:lib WLX_MPLAYER_RUN_DEPENDS= mplayer:multimedia/mplayer .include -.if ${PORT_OPTIONS:MGTK2} -LCL_PLATFORM= gtk2 -USE_GNOME+= cairo gdkpixbuf2 -.elif ${PORT_OPTIONS:MQT4} -LCL_PLATFORM= qt -.endif - .if ${PORT_OPTIONS:MDEBUG} -BUILD_MODE= Debug +LAZBUILD_ARGS+= -bm="Debug" .else -BUILD_MODE= NoDebug Full Optimizations +LAZBUILD_ARGS+= -bm="NoDebug Full Optimizations" .endif .if ${PORT_OPTIONS:MWFX_FTP} USE_FPC+= fcl-net +LAZARUS_PROJECT_FILES+= plugins/wfx/ftp/src/ftp.lpi .endif +.if ${PORT_OPTIONS:MWCX_CPIO} +LAZARUS_PROJECT_FILES+= plugins/wcx/cpio/src/cpio.lpi +.endif + +.if ${PORT_OPTIONS:MWCX_DEB} +LAZARUS_PROJECT_FILES+= plugins/wcx/deb/src/deb.lpi +.endif + +.if ${PORT_OPTIONS:MWCX_UNBZ2} +LAZARUS_PROJECT_FILES+= plugins/wcx/unbz2/src/unbz2.lpi +.endif + +.if ${PORT_OPTIONS:MWCX_RPM} +LAZARUS_PROJECT_FILES+= plugins/wcx/rpm/src/rpm.lpi +.endif + +.if ${PORT_OPTIONS:MWCX_UNRAR} +LAZARUS_PROJECT_FILES+= plugins/wcx/unrar/src/unrar.lpi +.endif + +.if ${PORT_OPTIONS:MWCX_ZIP} +LAZARUS_PROJECT_FILES+= plugins/wcx/zip/src/Zip.lpi +.endif + +.if ${PORT_OPTIONS:MWDX_AUDIOINFO} +LAZARUS_PROJECT_FILES+= plugins/wdx/audioinfo/src/AudioInfo.lpi +.endif + +.if ${PORT_OPTIONS:MWDX_RPM} +LAZARUS_PROJECT_FILES+= plugins/wdx/rpm_wdx/src/rpm_wdx.lpi +.endif + +.if ${PORT_OPTIONS:MWDX_DEB} +LAZARUS_PROJECT_FILES+= plugins/wdx/deb_wdx/src/deb_wdx.lpi +.endif + +.if ${PORT_OPTIONS:MWDX_SVN} +LAZARUS_PROJECT_FILES+= plugins/wdx/svn_wdx/src/svn_wdx.lpi +.endif + +.if ${PORT_OPTIONS:MWDX_XPI} +LAZARUS_PROJECT_FILES+= plugins/wdx/xpi_wdx/src/xpi_wdx.lpi +.endif + +.if ${PORT_OPTIONS:MWDX_TEXTLINE} +LAZARUS_PROJECT_FILES+= plugins/wdx/textline/src/TextLine.lpi +.endif + +.if ${PORT_OPTIONS:MWFX_SAMBA} +LAZARUS_PROJECT_FILES+= plugins/wfx/samba/src/samba.lpi +.endif + +.if ${PORT_OPTIONS:MWLX_MPLAYER} +LAZARUS_PROJECT_FILES+= plugins/wlx/WlxMplayer/src/wlxMplayer.lpi +.endif + +.if ${PORT_OPTIONS:MDSX_LOCATE} +LAZARUS_PROJECT_FILES+= plugins/dsx/DSXLocate/src/DSXLocate.lpi +.endif + +LAZARUS_PROJECT_FILES+= src/doublecmd.lpi + pre-patch: ${TR} '\r' '\n' < ${WRKSRC}/src/uGlobsPaths.pas > ${WRKSRC}/src/uGlobsPaths.pas.unix ${MV} ${WRKSRC}/src/uGlobsPaths.pas.unix ${WRKSRC}/src/uGlobsPaths.pas @@ -144,86 +198,7 @@ post-patch: ${WRKSRC}/src/uGlobsPaths.pas @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/plugins/wlx/WlxMplayer/src/wlxMplayer.lpr - -do-build: -.for FILE in chsdet/chsdet.lpk CmdLine/cmdbox.lpk multithreadprocs/multithreadprocslaz.lpk \ - dcpcrypt/dcpcrypt.lpk doublecmd/doublecmd_common.lpk KASToolBar/kascomp.lpk \ - viewer/viewerpackage.lpk gifanim/pkg_gifanim.lpk synunihighlighter/synuni.lpk - @cd ${WRKSRC}/components && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "${FILE}" -.endfor - -.if ${PORT_OPTIONS:MWCX_CPIO} - @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wcx/cpio/src/cpio.lpi" -.endif -.if ${PORT_OPTIONS:MWCX_DEB} - @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wcx/deb/src/deb.lpi" -.endif -.if ${PORT_OPTIONS:MWCX_UNBZ2} - @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wcx/unbz2/src/unbz2.lpi" -.endif -.if ${PORT_OPTIONS:MWCX_RPM} - @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wcx/rpm/src/rpm.lpi" -.endif -.if ${PORT_OPTIONS:MWCX_UNRAR} - @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wcx/unrar/src/unrar.lpi" -.endif -.if ${PORT_OPTIONS:MWCX_ZIP} - @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wcx/zip/src/Zip.lpi" -.endif - -.if ${PORT_OPTIONS:MWDX_AUDIOINFO} - @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wdx/audioinfo/src/AudioInfo.lpi" -.endif -.if ${PORT_OPTIONS:MWDX_RPM} - @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wdx/rpm_wdx/src/rpm_wdx.lpi" -.endif -.if ${PORT_OPTIONS:MWDX_DEB} - @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wdx/deb_wdx/src/deb_wdx.lpi" -.endif -.if ${PORT_OPTIONS:MWDX_SVN} - @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wdx/svn_wdx/src/svn_wdx.lpi" -.endif -.if ${PORT_OPTIONS:MWDX_XPI} - @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wdx/xpi_wdx/src/xpi_wdx.lpi" -.endif -.if ${PORT_OPTIONS:MWDX_TEXTLINE} - @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wdx/textline/src/TextLine.lpi" -.endif - -.if ${PORT_OPTIONS:MWFX_FTP} - @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wfx/ftp/src/ftp.lpi" -.endif -.if ${PORT_OPTIONS:MWFX_SAMBA} - @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wfx/samba/src/samba.lpi" -.endif - -.if ${PORT_OPTIONS:MWLX_MPLAYER} - @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wlx/WlxMplayer/src/wlxMplayer.lpi" -.endif - -.if ${PORT_OPTIONS:MDSX_LOCATE} - @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "dsx/DSXLocate/src/DSXLocate.lpi" -.endif - - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --ws=${LCL_PLATFORM} --bm="${BUILD_MODE}" --lazarusdir=${LAZARUS_DIR} ${PROJECT_FILE} + @${REINPLACE_CMD} -e '3632d' ${WRKSRC}/src/fmain.pas post-build: @${RM} -r ${DOCSRC}/*/dev-help @@ -375,7 +350,7 @@ do-install: .if ${PORT_OPTIONS:MWFX_FTP} @${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wfx/ftp/ - ${INSTALL_LIB} ${WRKSRC}/plugins/wfx/ftp/lib/ftp.wfx ${STAGEDIR}${DATADIR}/plugins/wfx/ftp/ + ${INSTALL_LIB} ${WRKSRC}/plugins/wfx/ftp/ftp.wfx ${STAGEDIR}${DATADIR}/plugins/wfx/ftp/ .endif .if ${PORT_OPTIONS:MWFX_SAMBA} @${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wfx/samba/ diff --git a/x11-fm/doublecmd/distinfo b/x11-fm/doublecmd/distinfo index 2dacc1158c3..d6c5dbbb306 100644 --- a/x11-fm/doublecmd/distinfo +++ b/x11-fm/doublecmd/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1514048041 -SHA256 (doublecmd-0.8.1-src.tar.gz) = 7d6e26460b1e57c0af4b26f6fab0c9a38287672f8d5d92d84e2dc5d0e25e75a8 -SIZE (doublecmd-0.8.1-src.tar.gz) = 7566344 +TIMESTAMP = 1520360222 +SHA256 (doublecmd-0.8.2-src.tar.gz) = 57a3dd94e9aa00b381f2b844a9000fbc7f28dae1bdd6409b170b1c26b7b4ba43 +SIZE (doublecmd-0.8.2-src.tar.gz) = 7570292 SHA256 (doublecmd-help-0.6.0-src.tar.gz) = d50a58f0e8c25c07720f2afd987213f330dfce268e2aef349d1da3de2eef1c39 SIZE (doublecmd-help-0.6.0-src.tar.gz) = 11514996 diff --git a/x11-toolkits/girara/Makefile b/x11-toolkits/girara/Makefile index 064f9152c6d..4f8a6db55e9 100644 --- a/x11-toolkits/girara/Makefile +++ b/x11-toolkits/girara/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= girara -PORTVERSION= 0.2.9 +PORTVERSION= 0.3.0 CATEGORIES= x11-toolkits graphics MASTER_SITES= https://pwmt.org/projects/girara/download/ \ http://www.madpilot.net/~mad/pwmt.org/ diff --git a/x11-toolkits/girara/distinfo b/x11-toolkits/girara/distinfo index 85754d2b61f..cda2cda650d 100644 --- a/x11-toolkits/girara/distinfo +++ b/x11-toolkits/girara/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523953769 -SHA256 (girara-0.2.9.tar.xz) = a81f3e94c71a2ff92bf52295b402ede8175f82fbad1a27f29c1c05a4accb7d52 -SIZE (girara-0.2.9.tar.xz) = 57816 +TIMESTAMP = 1527194025 +SHA256 (girara-0.3.0.tar.xz) = b752fa5ff0a98cfa773bbcf66bb8a5e337a61cbb085d6577b3979178d17e41a2 +SIZE (girara-0.3.0.tar.xz) = 57820 diff --git a/x11-toolkits/hs-GLURaw/Makefile b/x11-toolkits/hs-GLURaw/Makefile index d2b22667c42..4b931f6681e 100644 --- a/x11-toolkits/hs-GLURaw/Makefile +++ b/x11-toolkits/hs-GLURaw/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= GLURaw -PORTVERSION= 2.0.0.3 -PORTREVISION= 1 +PORTVERSION= 2.0.0.4 CATEGORIES= x11-toolkits haskell MAINTAINER= haskell@FreeBSD.org diff --git a/x11-toolkits/hs-GLURaw/distinfo b/x11-toolkits/hs-GLURaw/distinfo index e446af03da0..2ef6947485d 100644 --- a/x11-toolkits/hs-GLURaw/distinfo +++ b/x11-toolkits/hs-GLURaw/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499538016 -SHA256 (cabal/GLURaw-2.0.0.3.tar.gz) = 582cf8c0c1b8c0123ee9a8a06eba65fffded6decfe4e2e08bfea308f55f7ccee -SIZE (cabal/GLURaw-2.0.0.3.tar.gz) = 10515 +TIMESTAMP = 1523908514 +SHA256 (cabal/GLURaw-2.0.0.4.tar.gz) = b863fd5cb26b1a37afb66ef8a81c0335bc073d33b0a67ec5190dfc62cb885dc4 +SIZE (cabal/GLURaw-2.0.0.4.tar.gz) = 10557 diff --git a/x11-toolkits/hs-GLUT/Makefile b/x11-toolkits/hs-GLUT/Makefile index 77ff76d56a0..75010f8ff61 100644 --- a/x11-toolkits/hs-GLUT/Makefile +++ b/x11-toolkits/hs-GLUT/Makefile @@ -3,7 +3,7 @@ PORTNAME= GLUT PORTVERSION= 2.7.0.12 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= x11-toolkits haskell diff --git a/x11-toolkits/hs-OpenGL/Makefile b/x11-toolkits/hs-OpenGL/Makefile index dc4a54e1130..3d0f71edfbc 100644 --- a/x11-toolkits/hs-OpenGL/Makefile +++ b/x11-toolkits/hs-OpenGL/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= OpenGL -PORTVERSION= 3.0.2.0 -PORTREVISION= 1 +PORTVERSION= 3.0.2.1 PORTEPOCH= 1 CATEGORIES= x11-toolkits haskell @@ -12,8 +11,7 @@ COMMENT= Binding for the OpenGL graphics system LICENSE= BSD3CLAUSE -USE_CABAL= GLURaw>=1.3 ObjectName>=1.1 OpenGLRaw>=2.1 StateVar>=1.1 \ - text>=0.1 +USE_CABAL= GLURaw>=1.3 ObjectName>=1.1 OpenGLRaw>=2.1 StateVar>=1.1 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/x11-toolkits/hs-OpenGL/distinfo b/x11-toolkits/hs-OpenGL/distinfo index 82f7f7194b5..8729dbecbcb 100644 --- a/x11-toolkits/hs-OpenGL/distinfo +++ b/x11-toolkits/hs-OpenGL/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499613084 -SHA256 (cabal/OpenGL-3.0.2.0.tar.gz) = faa99459724d614d2cf2d2b83c7bda4898ee71752a253bf4699c096822450efb -SIZE (cabal/OpenGL-3.0.2.0.tar.gz) = 130658 +TIMESTAMP = 1524406154 +SHA256 (cabal/OpenGL-3.0.2.1.tar.gz) = 7acb891b911de8bb6933afeaa7f8c5291cc986da5557c922c0fc1717c5a559bf +SIZE (cabal/OpenGL-3.0.2.1.tar.gz) = 130703 diff --git a/x11-toolkits/hs-OpenGLRaw/Makefile b/x11-toolkits/hs-OpenGLRaw/Makefile index ab565609d47..7d0e4e748db 100644 --- a/x11-toolkits/hs-OpenGLRaw/Makefile +++ b/x11-toolkits/hs-OpenGLRaw/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= OpenGLRaw -PORTVERSION= 3.2.4.0 -PORTREVISION= 1 +PORTVERSION= 3.3.0.0 CATEGORIES= x11-toolkits haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= Raw binding for the OpenGL graphics system LICENSE= BSD3CLAUSE -USE_CABAL= fixed half text +USE_CABAL= fixed half USE_GL= gl glut .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" diff --git a/x11-toolkits/hs-OpenGLRaw/distinfo b/x11-toolkits/hs-OpenGLRaw/distinfo index e3b92186d64..9b6fbe5fc05 100644 --- a/x11-toolkits/hs-OpenGLRaw/distinfo +++ b/x11-toolkits/hs-OpenGLRaw/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499444850 -SHA256 (cabal/OpenGLRaw-3.2.4.0.tar.gz) = e3f9910be96b375fdf30db5a2cb6d55869eab11d507aa14edee177495c7dcb2e -SIZE (cabal/OpenGLRaw-3.2.4.0.tar.gz) = 799693 +TIMESTAMP = 1523444916 +SHA256 (cabal/OpenGLRaw-3.3.0.0.tar.gz) = 17889867ae2bd67b98bc7d74f5df3b82abc4f01807c4d24d2efde84d9423b290 +SIZE (cabal/OpenGLRaw-3.3.0.0.tar.gz) = 857906 diff --git a/x11-toolkits/hs-gtk/Makefile b/x11-toolkits/hs-gtk/Makefile index 8fcd11d94f0..28d8f5ce7c1 100644 --- a/x11-toolkits/hs-gtk/Makefile +++ b/x11-toolkits/hs-gtk/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= gtk -PORTVERSION= 0.14.6 -PORTREVISION= 1 +PORTVERSION= 0.14.9 CATEGORIES= x11-toolkits haskell MAINTAINER= haskell@FreeBSD.org @@ -12,7 +11,7 @@ LICENSE= LGPL21 USES= pkgconfig USE_CABAL= cairo>=0.13.0.0 gio>=0.13.0 glib>=0.13.0.0 mtl \ - pango>=0.13.0.0 text>=0.11.0.6 + pango>=0.13.0.0 USE_GNOME= gtk20 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" diff --git a/x11-toolkits/hs-gtk/distinfo b/x11-toolkits/hs-gtk/distinfo index b4953c74943..3a319f7b2d3 100644 --- a/x11-toolkits/hs-gtk/distinfo +++ b/x11-toolkits/hs-gtk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625639 -SHA256 (cabal/gtk-0.14.6.tar.gz) = 707906120cb8f0aa704fb2045a33600b7636166d74442a9c27c4262bac708327 -SIZE (cabal/gtk-0.14.6.tar.gz) = 679274 +TIMESTAMP = 1524938622 +SHA256 (cabal/gtk-0.14.9.tar.gz) = bff7cdc93d66a3be9db038018c1315445411846beaa519f48107a8c7ab371fce +SIZE (cabal/gtk-0.14.9.tar.gz) = 677659 diff --git a/x11-toolkits/hs-gtk2hs/Makefile b/x11-toolkits/hs-gtk2hs/Makefile index 4e6f0877a6f..de703d66590 100644 --- a/x11-toolkits/hs-gtk2hs/Makefile +++ b/x11-toolkits/hs-gtk2hs/Makefile @@ -3,7 +3,7 @@ PORTNAME= gtk2hs PORTVERSION= 0.13.2.2 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= x11-toolkits haskell diff --git a/x11-toolkits/hs-gtksourceview2/Makefile b/x11-toolkits/hs-gtksourceview2/Makefile index 53a0316d99f..ccecdd1ad82 100644 --- a/x11-toolkits/hs-gtksourceview2/Makefile +++ b/x11-toolkits/hs-gtksourceview2/Makefile @@ -2,7 +2,7 @@ PORTNAME= gtksourceview2 PORTVERSION= 0.13.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,7 @@ COMMENT= Binding to the GtkSourceView library LICENSE= LGPL21 USES= pkgconfig -USE_CABAL= glib>=0.13 gtk>=0.13.0.0 mtl text +USE_CABAL= glib>=0.13 gtk>=0.13.0.0 mtl USE_GNOME= gtksourceview2 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" diff --git a/x11-toolkits/hs-pango/Makefile b/x11-toolkits/hs-pango/Makefile index e203981d84f..fa97c6580a3 100644 --- a/x11-toolkits/hs-pango/Makefile +++ b/x11-toolkits/hs-pango/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= pango -PORTVERSION= 0.13.3.1 -PORTREVISION= 1 +PORTVERSION= 0.13.5.0 CATEGORIES= x11-toolkits haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,7 @@ COMMENT= Binding to the Pango text rendering engine LICENSE= LGPL21 USES= pkgconfig -USE_CABAL= cairo>=0.13.0.0 glib>=0.13.0.0 mtl text>=0.11.0.6 +USE_CABAL= cairo>=0.13.0.0 glib>=0.13.0.0 mtl USE_GNOME= pango .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" diff --git a/x11-toolkits/hs-pango/distinfo b/x11-toolkits/hs-pango/distinfo index 1af1913cb90..537456e3ad5 100644 --- a/x11-toolkits/hs-pango/distinfo +++ b/x11-toolkits/hs-pango/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625640 -SHA256 (cabal/pango-0.13.3.1.tar.gz) = 306a4f17d2fe4053b2ddd841a48720513fe391df49080ce61a31b8a0f0633fbb -SIZE (cabal/pango-0.13.3.1.tar.gz) = 52564 +TIMESTAMP = 1524851066 +SHA256 (cabal/pango-0.13.5.0.tar.gz) = bf59b9273134e5d1c9c648a253e5a766cd1ef51afc2216175bce21a15b6d49e8 +SIZE (cabal/pango-0.13.5.0.tar.gz) = 52797 diff --git a/x11-toolkits/hs-vte/Makefile b/x11-toolkits/hs-vte/Makefile index 4c44deca46f..f7701c595ef 100644 --- a/x11-toolkits/hs-vte/Makefile +++ b/x11-toolkits/hs-vte/Makefile @@ -2,7 +2,7 @@ PORTNAME= vte PORTVERSION= 0.13.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits haskell MAINTAINER= haskell@FreeBSD.org diff --git a/x11-toolkits/hs-wx/Makefile b/x11-toolkits/hs-wx/Makefile index 1ac2fdcb4a4..c2536d580bd 100644 --- a/x11-toolkits/hs-wx/Makefile +++ b/x11-toolkits/hs-wx/Makefile @@ -2,14 +2,14 @@ PORTNAME= wx PORTVERSION= 0.92.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits haskell MAINTAINER= haskell@FreeBSD.org COMMENT= wxHaskell USES= dos2unix -USE_CABAL= stm wxcore>=0.91 +USE_CABAL= wxcore>=0.91 DOS2UNIX_FILES= src/Graphics/UI/WX/Window.hs USE_WX= 3.0 diff --git a/x11-toolkits/hs-wxc/Makefile b/x11-toolkits/hs-wxc/Makefile index b81f5323588..a05f4814747 100644 --- a/x11-toolkits/hs-wxc/Makefile +++ b/x11-toolkits/hs-wxc/Makefile @@ -16,6 +16,8 @@ WX_COMPS= wx IGNORE_DOCS= yes +IGNORE= Doesn't build with recent GHC version + post-patch:: @${REINPLACE_CMD} 's|"wx-config"|"wxgtk2u-3.0-config"| ; \ s|/sbin/ldconfig -n|/sbin/ldconfig -m| ; \ diff --git a/x11-toolkits/hs-wxcore/Makefile b/x11-toolkits/hs-wxcore/Makefile index e844d4f19b4..99f69a39f7c 100644 --- a/x11-toolkits/hs-wxcore/Makefile +++ b/x11-toolkits/hs-wxcore/Makefile @@ -2,13 +2,13 @@ PORTNAME= wxcore PORTVERSION= 0.92.3.0 -PORTREVISION= 1 +PORTREVISION= 3 CATEGORIES= x11-toolkits haskell MAINTAINER= haskell@FreeBSD.org COMMENT= wxHaskell core -USE_CABAL= parsec stm wxc>=0.91 wxdirect>=0.91 +USE_CABAL= wxc>=0.91 wxdirect>=0.91 USES= dos2unix pkgconfig DOS2UNIX_GLOB= *.hs diff --git a/x11-toolkits/hs-wxdirect/Makefile b/x11-toolkits/hs-wxdirect/Makefile index 37036845b6e..50fbc140b20 100644 --- a/x11-toolkits/hs-wxdirect/Makefile +++ b/x11-toolkits/hs-wxdirect/Makefile @@ -2,7 +2,7 @@ PORTNAME= wxdirect PORTVERSION= 0.92.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,7 @@ COMMENT= Helper tool for building wxHaskell LICENSE= BSD3CLAUSE USES= dos2unix -USE_CABAL= parsec>=2.1.0 strict +USE_CABAL= strict EXECUTABLE= wxdirect diff --git a/x11-toolkits/hs-wxdirect/files/patch-wxdirect.cabal b/x11-toolkits/hs-wxdirect/files/patch-wxdirect.cabal new file mode 100644 index 00000000000..b09a9129e57 --- /dev/null +++ b/x11-toolkits/hs-wxdirect/files/patch-wxdirect.cabal @@ -0,0 +1,11 @@ +--- wxdirect.cabal.orig 2018-04-16 18:38:04 UTC ++++ wxdirect.cabal +@@ -53,7 +53,7 @@ executable wxdirect + strict, + time >= 1.0, + filepath < 1.5, +- process >= 1.1 && < 1.5 ++ process >= 1.1 && < 1.7 + + if flag(splitBase) + build-depends: diff --git a/x11-toolkits/libXt/Makefile b/x11-toolkits/libXt/Makefile index dc42542302e..0f6a36fc0f5 100644 --- a/x11-toolkits/libXt/Makefile +++ b/x11-toolkits/libXt/Makefile @@ -9,10 +9,13 @@ CATEGORIES= x11-toolkits MAINTAINER= x11@FreeBSD.org COMMENT= X Toolkit library +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/COPYING + XORG_CAT= lib -USE_XORG= x11 sm xproto:both kbproto +USE_XORG= x11 sm ice xproto:both kbproto CONFIGURE_ARGS= --disable-specs -USES+= cpe +USES= cpe CPE_PRODUCT= libxt CPE_VENDOR= x diff --git a/x11-toolkits/libXt/pkg-descr b/x11-toolkits/libXt/pkg-descr index 0369c4fec06..b3acdb099a3 100644 --- a/x11-toolkits/libXt/pkg-descr +++ b/x11-toolkits/libXt/pkg-descr @@ -1,3 +1,3 @@ This package contains the X Toolkit library. -WWW: http://www.freedesktop.org/Software/xlibs +WWW: https://www.freedesktop.org/wiki/Software/xlibs/ diff --git a/x11-wm/hs-xmonad-contrib/Makefile b/x11-wm/hs-xmonad-contrib/Makefile index 41185b2f7cc..5667b080bca 100644 --- a/x11-wm/hs-xmonad-contrib/Makefile +++ b/x11-wm/hs-xmonad-contrib/Makefile @@ -3,7 +3,7 @@ PORTNAME= xmonad-contrib PORTVERSION= 0.13 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm haskell MAINTAINER= haskell@FreeBSD.org @@ -12,7 +12,7 @@ COMMENT= Third-party extensions for xmonad LICENSE= BSD3CLAUSE USE_CABAL= extensible-exceptions mtl>=1 old-time random utf8-string \ - X11>=1.6.1 X11-xft>=0.2 xmonad==0.13_2 + X11>=1.6.1 X11-xft>=0.2 xmonad USE_XORG= x11 RUN_DEPENDS+= bash:shells/bash diff --git a/x11-wm/hs-xmonad-contrib/files/patch-8.4.2-support b/x11-wm/hs-xmonad-contrib/files/patch-8.4.2-support new file mode 100644 index 00000000000..f54d82cd682 --- /dev/null +++ b/x11-wm/hs-xmonad-contrib/files/patch-8.4.2-support @@ -0,0 +1,95 @@ +diff --git XMonad/Hooks/FadeWindows.hs XMonad/Hooks/FadeWindows.hs +index 4b8e62b6..01d06792 100644 +--- XMonad/Hooks/FadeWindows.hs ++++ XMonad/Hooks/FadeWindows.hs +@@ -61,7 +61,8 @@ import Control.Monad.Reader (ask + ,asks) + import Control.Monad.State (gets) + import qualified Data.Map as M +-import Data.Monoid ++import Data.Monoid hiding ((<>)) ++import Data.Semigroup + + import Graphics.X11.Xlib.Extras (Event(..)) + +@@ -134,6 +135,9 @@ instance Monoid Opacity where + r `mappend` OEmpty = r + _ `mappend` r = r + ++instance Semigroup Opacity where ++ (<>) = mappend ++ + -- | A FadeHook is similar to a ManageHook, but records window opacity. + type FadeHook = Query Opacity + +diff --git XMonad/Hooks/WallpaperSetter.hs XMonad/Hooks/WallpaperSetter.hs +index 00a3b1c3..d4f5ccb2 100644 +--- XMonad/Hooks/WallpaperSetter.hs ++++ XMonad/Hooks/WallpaperSetter.hs +@@ -41,7 +41,8 @@ import Data.Ord (comparing) + import Control.Monad + import Control.Applicative + import Data.Maybe +-import Data.Monoid ++import Data.Monoid hiding ((<>)) ++import Data.Semigroup + + -- $usage + -- This module requires imagemagick and feh to be installed, as these are utilized +@@ -86,6 +87,9 @@ instance Monoid WallpaperList where + mappend (WallpaperList w1) (WallpaperList w2) = + WallpaperList $ M.toList $ (M.fromList w2) `M.union` (M.fromList w1) + ++instance Semigroup WallpaperList where ++ (<>) = mappend ++ + -- | Complete wallpaper configuration passed to the hook + data WallpaperConf = WallpaperConf { + wallpaperBaseDir :: FilePath -- ^ Where the wallpapers reside (if empty, will look in \~\/.wallpapers/) +diff --git XMonad/Layout/Mosaic.hs XMonad/Layout/Mosaic.hs +index 05655d4c..da44fc50 100644 +--- XMonad/Layout/Mosaic.hs ++++ XMonad/Layout/Mosaic.hs +@@ -38,7 +38,8 @@ import Control.Monad(mplus) + import Data.Foldable(Foldable,foldMap, sum) + import Data.Function(on) + import Data.List(sortBy) +-import Data.Monoid(Monoid,mempty, mappend) ++import Data.Monoid(Monoid,mempty, mappend, (<>)) ++import Data.Semigroup + + + -- $usage +@@ -202,6 +203,9 @@ instance Monoid (Tree a) where + mappend x Empty = x + mappend x y = Branch x y + ++instance Semigroup (Tree a) where ++ (<>) = mappend ++ + makeTree :: (Num a1, Ord a1) => (a -> a1) -> [a] -> Tree a + makeTree _ [] = Empty + makeTree _ [x] = Leaf x +diff --git xmonad-contrib.cabal xmonad-contrib.cabal +index dde3ccda..c401c6e6 100644 +--- xmonad-contrib.cabal ++++ xmonad-contrib.cabal +@@ -36,7 +36,7 @@ cabal-version: >= 1.6 + build-type: Simple + bug-reports: https://github.com/xmonad/xmonad-contrib/issues + +-tested-with: GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0.1 ++tested-with: GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0.1, GHC==8.2.2, GHC==8.4.1 + + source-repository head + type: git +@@ -66,7 +66,8 @@ library + unix, + X11>=1.6.1 && < 1.9, + xmonad>=0.13 && < 0.14, +- utf8-string ++ utf8-string, ++ semigroups + + if flag(use_xft) + build-depends: X11-xft >= 0.2 diff --git a/x11-wm/hs-xmonad/Makefile b/x11-wm/hs-xmonad/Makefile index a2c19f0ad17..9f7367d4742 100644 --- a/x11-wm/hs-xmonad/Makefile +++ b/x11-wm/hs-xmonad/Makefile @@ -3,7 +3,7 @@ PORTNAME= xmonad PORTVERSION= 0.13 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,7 @@ COMMENT= Tiling window manager LICENSE= BSD3CLAUSE -USE_CABAL= extensible-exceptions mtl setlocale utf8-string X11 +USE_CABAL= extensible-exceptions mtl semigroups setlocale utf8-string X11 USE_XORG= x11 MAN1PAGES= xmonad.1 diff --git a/x11-wm/hs-xmonad/files/patch-8.4.1-support b/x11-wm/hs-xmonad/files/patch-8.4.1-support new file mode 100644 index 00000000000..2dcf5baf645 --- /dev/null +++ b/x11-wm/hs-xmonad/files/patch-8.4.1-support @@ -0,0 +1,61 @@ +--- src/XMonad/Core.hs.orig 2017-02-09 02:46:45 UTC ++++ src/XMonad/Core.hs +@@ -39,6 +39,7 @@ import qualified Control.Exception.Extensible as E + import Control.Applicative + import Control.Monad.State + import Control.Monad.Reader ++import Data.Semigroup + import Data.Default + import System.FilePath + import System.IO +@@ -56,7 +57,7 @@ import Graphics.X11.Xlib.Extras (getWindowAttributes, + import Data.Typeable + import Data.List ((\\)) + import Data.Maybe (isJust,fromMaybe) +-import Data.Monoid ++import Data.Monoid hiding ((<>)) + + import qualified Data.Map as M + import qualified Data.Set as S +@@ -151,6 +152,9 @@ instance Applicative X where + pure = return + (<*>) = ap + ++instance Semigroup a => Semigroup (X a) where ++ (<>) = liftM2 (<>) ++ + instance (Monoid a) => Monoid (X a) where + mempty = return mempty + mappend = liftM2 mappend +@@ -164,6 +168,9 @@ newtype Query a = Query (ReaderT Window X a) + + runQuery :: Query a -> Window -> X a + runQuery (Query m) w = runReaderT m w ++ ++instance Semigroup a => Semigroup (Query a) where ++ (<>) = liftM2 (<>) + + instance Monoid a => Monoid (Query a) where + mempty = return mempty +--- xmonad.cabal.orig 2017-02-10 22:07:40 UTC ++++ xmonad.cabal +@@ -32,7 +32,8 @@ tested-with: + GHC==7.6.3, + GHC==7.8.4, + GHC==7.10.3, +- GHC==8.0.1 ++ GHC==8.0.1, ++ GHC==8.2.2 + + data-files: man/xmonad.hs, man/xmonad.1, man/xmonad.1.html + +@@ -78,7 +79,8 @@ library + process, + unix, + utf8-string >= 0.3 && < 1.1, +- X11>=1.8 && < 1.9 ++ X11>=1.8 && < 1.9, ++ semigroups + + if true + ghc-options: -funbox-strict-fields -Wall diff --git a/x11/hs-X11-xft/Makefile b/x11/hs-X11-xft/Makefile index af8826fb32f..ac674f17840 100644 --- a/x11/hs-X11-xft/Makefile +++ b/x11/hs-X11-xft/Makefile @@ -2,7 +2,7 @@ PORTNAME= X11-xft PORTVERSION= 0.3.1 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= x11 haskell MAINTAINER= haskell@FreeBSD.org diff --git a/x11/hs-X11/Makefile b/x11/hs-X11/Makefile index 66d1f3cbad9..2f6fd79f6a7 100644 --- a/x11/hs-X11/Makefile +++ b/x11/hs-X11/Makefile @@ -3,7 +3,7 @@ PORTNAME= X11 PORTVERSION= 1.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 haskell MAINTAINER= haskell@FreeBSD.org diff --git a/x11/hs-xmobar/Makefile b/x11/hs-xmobar/Makefile index 948c0898917..849ed238f30 100644 --- a/x11/hs-xmobar/Makefile +++ b/x11/hs-xmobar/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= xmobar -PORTVERSION= 0.24.5 +PORTVERSION= 0.26 PORTREVISION= 1 CATEGORIES= x11 haskell @@ -11,8 +11,7 @@ COMMENT= Minimalistic text-based status bar LICENSE= BSD3CLAUSE -USE_CABAL= HTTP>=4000.2.4 mtl>=2.1 parsec>=3.1 regex-compat stm>=2.3 \ - X11>=1.6.1 +USE_CABAL= HTTP>=4000.2.4 mtl>=2.1 regex-compat X11>=1.6.1 USE_XORG= xpm EXECUTABLE= xmobar diff --git a/x11/hs-xmobar/distinfo b/x11/hs-xmobar/distinfo index 2a61c187aab..9c549b53926 100644 --- a/x11/hs-xmobar/distinfo +++ b/x11/hs-xmobar/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625449 -SHA256 (cabal/xmobar-0.24.5.tar.gz) = 393aab8d86d09f218f5255bb8811ba12a4ca2f4eb64411c38b9713c58574bf69 -SIZE (cabal/xmobar-0.24.5.tar.gz) = 100658 +TIMESTAMP = 1524245719 +SHA256 (cabal/xmobar-0.26.tar.gz) = ff7dd9af151e0336d35fa4741a76fe8a95762649c11877442449b321f106e4a5 +SIZE (cabal/xmobar-0.26.tar.gz) = 101557 diff --git a/x11/kde-runtime-kde4/Makefile b/x11/kde-runtime-kde4/Makefile index 6f0dc7de847..e838283b4a6 100644 --- a/x11/kde-runtime-kde4/Makefile +++ b/x11/kde-runtime-kde4/Makefile @@ -9,6 +9,8 @@ PKGNAMESUFFIX= -kde4 MAINTAINER= kde@FreeBSD.org COMMENT= Runtime components for KDE Plasma Desktop +CONFLICTS_INSTALL= plasma5-kde-cli-tools + LIB_DEPENDS= libexiv2.so:graphics/exiv2 \ libwebp.so:graphics/webp \ libslp.so:net/openslp \ diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index 1361fecc44c..e1a69b90510 100644 --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -10,7 +10,7 @@ # slave ports instead (`x11/nvidia-driver-340' or `x11/nvidia-driver-304'). PORTNAME= nvidia-driver -DISTVERSION?= 390.48 +DISTVERSION?= 390.59 # Always try to set PORTREVISION as it can be overridden by the slave ports PORTREVISION?= 0 CATEGORIES= x11 diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo index b0415312f88..b0c72cf211f 100644 --- a/x11/nvidia-driver/distinfo +++ b/x11/nvidia-driver/distinfo @@ -1,8 +1,8 @@ TIMESTAMP = 1482026038 -SHA256 (NVIDIA-FreeBSD-x86_64-390.48.tar.gz) = 5b814322b80367158ced88723e53210a71b90c4062155ebd14d6c6dcc2fb5ca5 -SIZE (NVIDIA-FreeBSD-x86_64-390.48.tar.gz) = 63583858 -SHA256 (NVIDIA-FreeBSD-x86-390.48.tar.gz) = 6df907c4848948b96f372ab5da1f99dcedef23889c22f84f3b4d861d699dcf12 -SIZE (NVIDIA-FreeBSD-x86-390.48.tar.gz) = 64254145 +SHA256 (NVIDIA-FreeBSD-x86_64-390.59.tar.gz) = 6feeb1adb27ee6f50fb601848dcfbbac15952a294b54c0e66481e29213f37a53 +SIZE (NVIDIA-FreeBSD-x86_64-390.59.tar.gz) = 63602262 +SHA256 (NVIDIA-FreeBSD-x86-390.59.tar.gz) = 6d38ad845407ba3ad1b19cd2f6ef481601345b10bfde8b467e7ebc38c6670eb0 +SIZE (NVIDIA-FreeBSD-x86-390.59.tar.gz) = 64274727 SHA256 (NVIDIA-FreeBSD-x86_64-340.106.tar.gz) = 662ab7e0a785a47d754c1dd956427d9901a9c9916f8476b8c7bc7c79c790238b SIZE (NVIDIA-FreeBSD-x86_64-340.106.tar.gz) = 61169129 SHA256 (NVIDIA-FreeBSD-x86-340.106.tar.gz) = be4abc34c8084dbc0b35f2f48641831ccfbfa16c3f476bfba36e6a94b79e72fa diff --git a/x11/xorg-minimal/Makefile b/x11/xorg-minimal/Makefile index 3f6fc09d1d2..2e4d0803a05 100644 --- a/x11/xorg-minimal/Makefile +++ b/x11/xorg-minimal/Makefile @@ -6,7 +6,7 @@ PORTREVISION= 1 CATEGORIES= x11 x11-servers PKGNAMESUFFIX= -minimal -MAINTAINER= ports@FreeBSD.org +MAINTAINER= eadler@FreeBSD.org COMMENT= X.Org minimal distribution metaport USES= metaport @@ -22,13 +22,11 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/Xorg:x11-servers/xorg-server \ .if ${VIDEO_DRIVER} == "nvidia" RUN_DEPENDS+= ${LOCALBASE}/lib/xorg/modules/drivers/nvidia_drv.so:x11/nvidia-driver .elif ${VIDEO_DRIVER} == "intel29" -RUN_DEPENDS+= ${LOCALBASE}/lib/xorg/modules/drivers/intel_drv.so:x11-drivers/xf86-video-${VIDEO_DRIVER} +RUN_DEPENDS+= ${LOCALBASE}/lib/xorg/modules/drivers/intel_drv.so:x11-drivers/xf86-video-intel +.elif ${VIDEO_DRIVER} == "intel" +RUN_DEPENDS+= ${LOCALBASE}/lib/va/i965_drv_video.so:multimedia/libva-intel-driver .else RUN_DEPENDS+= ${LOCALBASE}/lib/xorg/modules/drivers/${VIDEO_DRIVER}_drv.so:x11-drivers/xf86-video-${VIDEO_DRIVER} .endif -.if ${VIDEO_DRIVER} == intel -RUN_DEPENDS+= ${LOCALBASE}/lib/va/i965_drv_video.so:multimedia/libva-intel-driver -.endif - .include