Index: head/Mk/Uses/cabal.mk =================================================================== --- head/Mk/Uses/cabal.mk +++ head/Mk/Uses/cabal.mk @@ -28,6 +28,9 @@ # and "-${opt_CABAL_FLAGS}" otherwise. # opt_EXECUTABLES Variant of EXECUTABLES to be used with options framework. # +# FOO_DATADIR_VARS Additional environment vars to add to FOO executable's +# wrapper script. +# # MAINTAINER: haskell@FreeBSD.org .if !defined(_INCLUDE_USES_CABAL_MK) @@ -134,10 +137,20 @@ . if !target(do-install) do-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/cabal . for exe in ${EXECUTABLES} ${INSTALL_PROGRAM} \ $$(find ${WRKSRC}/dist-newstyle -name ${exe} -type f -perm +111) \ - ${STAGEDIR}${PREFIX}/bin + ${STAGEDIR}${PREFIX}/libexec/cabal/${exe} + ${ECHO} '#!/bin/sh' > ${STAGEDIR}${PREFIX}/bin/${exe} + ${ECHO} '' >> ${STAGEDIR}${PREFIX}/bin/${exe} + ${ECHO} 'export ${exe:S/-/_/}_datadir=${DATADIR}' >> ${STAGEDIR}${PREFIX}/bin/${exe} +. for dep in ${${exe}_DATADIR_VARS} + ${ECHO} 'export ${dep:S/-/_/}_datadir=${DATADIR}' >> ${STAGEDIR}${PREFIX}/bin/${exe} +. endfor + ${ECHO} '' >> ${STAGEDIR}${PREFIX}/bin/${exe} + ${ECHO} '${PREFIX}/libexec/cabal/${exe} $$*' >> ${STAGEDIR}${PREFIX}/bin/${exe} + ${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/${exe} . endfor . endif @@ -145,6 +158,7 @@ cabal-post-install-script: . for exe in ${EXECUTABLES} ${ECHO_CMD} 'bin/${exe}' >> ${TMPPLIST} + ${ECHO_CMD} 'libexec/cabal/${exe}' >> ${TMPPLIST} . endfor . endif Index: head/converters/hs-aeson-pretty/Makefile =================================================================== --- head/converters/hs-aeson-pretty/Makefile +++ head/converters/hs-aeson-pretty/Makefile @@ -2,7 +2,7 @@ PORTNAME= aeson-pretty PORTVERSION= 0.8.7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= converters haskell MAINTAINER= haskell@FreeBSD.org Index: head/devel/hs-ShellCheck/Makefile =================================================================== --- head/devel/hs-ShellCheck/Makefile +++ head/devel/hs-ShellCheck/Makefile @@ -2,7 +2,7 @@ PORTNAME= ShellCheck DISTVERSION= 0.6.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= pizzamig@FreeBSD.org Index: head/devel/hs-alex/Makefile =================================================================== --- head/devel/hs-alex/Makefile +++ head/devel/hs-alex/Makefile @@ -3,6 +3,7 @@ PORTNAME= alex PORTVERSION= 3.2.4 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: head/devel/hs-bytestring-nums/Makefile =================================================================== --- head/devel/hs-bytestring-nums/Makefile +++ head/devel/hs-bytestring-nums/Makefile @@ -2,7 +2,7 @@ PORTNAME= bytestring-nums PORTVERSION= 0.3.6 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: head/devel/hs-c2hs/Makefile =================================================================== --- head/devel/hs-c2hs/Makefile +++ head/devel/hs-c2hs/Makefile @@ -3,7 +3,7 @@ PORTNAME= c2hs PORTVERSION= 0.28.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: head/devel/hs-cpphs/Makefile =================================================================== --- head/devel/hs-cpphs/Makefile +++ head/devel/hs-cpphs/Makefile @@ -3,7 +3,7 @@ PORTNAME= cpphs PORTVERSION= 1.20.8 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: head/devel/hs-darcs/Makefile =================================================================== --- head/devel/hs-darcs/Makefile +++ head/devel/hs-darcs/Makefile @@ -3,6 +3,7 @@ PORTNAME= darcs PORTVERSION= 2.14.2 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: head/devel/hs-ghc-events/Makefile =================================================================== --- head/devel/hs-ghc-events/Makefile +++ head/devel/hs-ghc-events/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= ghc-events -PORTVERSION= 0.8.0.1 -PORTREVISION= 2 +PORTVERSION= 0.9.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: head/devel/hs-ghc-events/distinfo =================================================================== --- head/devel/hs-ghc-events/distinfo +++ head/devel/hs-ghc-events/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1550306545 -SHA256 (cabal/ghc-events-0.8.0.1.tar.gz) = 29c5f07f1f0fbf64f8f74b806a5ce3b3ad39bbd443bb7241451e91ad48a6a898 -SIZE (cabal/ghc-events-0.8.0.1.tar.gz) = 1441899 +TIMESTAMP = 1559892080 +SHA256 (cabal/ghc-events-0.9.0.tar.gz) = 20d4e10bcbe8d1dadbd5d1e6bb786d621a25c1117f57d954bd14780cb1748d00 +SIZE (cabal/ghc-events-0.9.0.tar.gz) = 1450026 SHA256 (cabal/primitive-0.6.4.0/primitive-0.6.4.0.tar.gz) = 4cbeaf7924dd79221f327ea101a29bf35c4976dc3319df157ff46ea68e6a0c64 SIZE (cabal/primitive-0.6.4.0/primitive-0.6.4.0.tar.gz) = 45937 SHA256 (cabal/primitive-0.6.4.0/revision/1.cabal) = 5b6a2c3cc70a35aabd4565fcb9bb1dd78fe2814a36e62428a9a1aae8c32441a1 Index: head/devel/hs-git-annex/Makefile =================================================================== --- head/devel/hs-git-annex/Makefile +++ head/devel/hs-git-annex/Makefile @@ -3,6 +3,7 @@ PORTNAME= git-annex PORTVERSION= 7.20190129 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -123,55 +124,58 @@ -benchmark -debuglocks EXECUTABLES= git-annex -#EXECUTABLES= git-annex git-annex-shell git-remote-tor-annex -MAN1PAGES= git-annex-add.1 git-annex-expire.1 git-annex-lookupkey.1 \ - git-annex-remotedaemon.1 git-annex-ungroup.1 \ - git-annex-addunused.1 git-annex-find.1 git-annex-map.1 \ - git-annex-repair.1 git-annex-uninit.1 git-annex-addurl.1 \ - git-annex-findref.1 git-annex-matchexpression.1 \ - git-annex-required.1 git-annex-unlock.1 git-annex-adjust.1 \ - git-annex-fix.1 git-annex-matching-options.1 \ - git-annex-resolvemerge.1 git-annex-untrust.1 \ - git-annex-assistant.1 git-annex-forget.1 git-annex-merge.1 \ - git-annex-rmurl.1 git-annex-unused.1 git-annex-calckey.1 \ - git-annex-fromkey.1 git-annex-metadata.1 git-annex-schedule.1 \ - git-annex-upgrade.1 git-annex-checkpresentkey.1 \ - git-annex-fsck.1 git-annex-migrate.1 git-annex-semitrust.1 \ - git-annex-vadd.1 git-annex-contentlocation.1 \ - git-annex-fuzztest.1 git-annex-mirror.1 git-annex-setkey.1 \ - git-annex-vcycle.1 git-annex-copy.1 git-annex-get.1 \ - git-annex-move.1 git-annex-setpresentkey.1 \ - git-annex-version.1 git-annex-dead.1 git-annex-group.1 \ - git-annex-multicast.1 git-annex-shell.1 git-annex-vfilter.1 \ - git-annex-describe.1 git-annex-groupwanted.1 \ - git-annex-numcopies.1 git-annex-smudge.1 git-annex-vicfg.1 \ - git-annex-diffdriver.1 git-annex-import.1 git-annex-p2p.1 \ - git-annex-status.1 git-annex-view.1 git-annex-direct.1 \ - git-annex-importfeed.1 git-annex-pre-commit.1 \ - git-annex-sync.1 git-annex-vpop.1 git-annex-drop.1 \ - git-annex-indirect.1 git-annex-preferred-content.1 \ - git-annex-test.1 git-annex-wanted.1 git-annex-dropkey.1 \ - git-annex-info.1 git-annex-proxy.1 git-annex-testremote.1 \ - git-annex-watch.1 git-annex-dropunused.1 git-annex-init.1 \ - git-annex-readpresentkey.1 git-annex-transferkey.1 \ - git-annex-webapp.1 git-annex-edit.1 git-annex-initremote.1 \ - git-annex-registerurl.1 git-annex-transferkeys.1 \ - git-annex-whereis.1 git-annex-enable-tor.1 git-annex-list.1 \ - git-annex-reinit.1 git-annex-trust.1 git-annex.1 \ - git-annex-enableremote.1 git-annex-lock.1 \ - git-annex-reinject.1 git-annex-unannex.1 \ - git-remote-tor-annex.1 git-annex-examinekey.1 git-annex-log.1 \ - git-annex-rekey.1 git-annex-undo.1 +MAN1PAGES= git-annex-add git-annex-expire git-annex-lookupkey \ + git-annex-remotedaemon git-annex-ungroup \ + git-annex-addunused git-annex-find git-annex-map \ + git-annex-repair git-annex-uninit git-annex-addurl \ + git-annex-findref git-annex-matchexpression \ + git-annex-required git-annex-unlock git-annex-adjust \ + git-annex-fix git-annex-matching-options \ + git-annex-resolvemerge git-annex-untrust \ + git-annex-assistant git-annex-forget git-annex-merge \ + git-annex-rmurl git-annex-unused git-annex-calckey \ + git-annex-fromkey git-annex-metadata git-annex-schedule \ + git-annex-upgrade git-annex-checkpresentkey \ + git-annex-fsck git-annex-migrate git-annex-semitrust \ + git-annex-vadd git-annex-contentlocation \ + git-annex-fuzztest git-annex-mirror git-annex-setkey \ + git-annex-vcycle git-annex-copy git-annex-get \ + git-annex-move git-annex-setpresentkey \ + git-annex-version git-annex-dead git-annex-group \ + git-annex-multicast git-annex-shell git-annex-vfilter \ + git-annex-describe git-annex-groupwanted \ + git-annex-numcopies git-annex-smudge git-annex-vicfg \ + git-annex-diffdriver git-annex-import git-annex-p2p \ + git-annex-status git-annex-view git-annex-direct \ + git-annex-importfeed git-annex-pre-commit \ + git-annex-sync git-annex-vpop git-annex-drop \ + git-annex-indirect git-annex-preferred-content \ + git-annex-test git-annex-wanted git-annex-dropkey \ + git-annex-info git-annex-proxy git-annex-testremote \ + git-annex-watch git-annex-dropunused git-annex-init \ + git-annex-readpresentkey git-annex-transferkey \ + git-annex-webapp git-annex-edit git-annex-initremote \ + git-annex-registerurl git-annex-transferkeys \ + git-annex-whereis git-annex-enable-tor git-annex-list \ + git-annex-reinit git-annex-trust git-annex \ + git-annex-enableremote git-annex-lock \ + git-annex-reinject git-annex-unannex \ + git-remote-tor-annex git-annex-examinekey git-annex-log \ + git-annex-rekey git-annex-undo -PLIST_FILES= bin/git-annex-shell bin/git-remote-tor-annex +post-build: +.for man in ${MAN1PAGES} + ${WRKSRC}/Build/mdwn2man ${man} 1 ${WRKSRC}/doc/${man}.mdwn > ${WRKSRC}/doc/${man}.1 +.endfor -post-stage: - ${LN} -sf ${PREFIX}/bin/git-annex ${STAGEDIR}${PREFIX}/bin/git-annex-shell - ${LN} -sf ${PREFIX}/bin/git-annex ${STAGEDIR}${PREFIX}/bin/git-remote-tor-annex +post-install: +.for man in ${MAN1PAGES} + ${INSTALL_MAN} ${WRKSRC}/doc/${man}.1 ${STAGEDIR}${MANPREFIX}/man/man1/ +.endfor -# .for man in ${MAN1PAGES} -# ${INSTALL_MAN} ${WRKSRC}/${man} ${STAGEDIR}${MANPREFIX}/man/man1/ -# .endfor +post-stage: + ${LN} -sf git-annex ${STAGEDIR}${PREFIX}/bin/git-annex-shell + ${LN} -sf git-annex ${STAGEDIR}${PREFIX}/bin/git-remote-tor-annex .include Index: head/devel/hs-git-annex/pkg-plist =================================================================== --- head/devel/hs-git-annex/pkg-plist +++ head/devel/hs-git-annex/pkg-plist @@ -0,0 +1,101 @@ +bin/git-annex-shell +bin/git-remote-tor-annex +man/man1/git-annex-add.1.gz +man/man1/git-annex-addunused.1.gz +man/man1/git-annex-addurl.1.gz +man/man1/git-annex-adjust.1.gz +man/man1/git-annex-assistant.1.gz +man/man1/git-annex-calckey.1.gz +man/man1/git-annex-checkpresentkey.1.gz +man/man1/git-annex-contentlocation.1.gz +man/man1/git-annex-copy.1.gz +man/man1/git-annex-dead.1.gz +man/man1/git-annex-describe.1.gz +man/man1/git-annex-diffdriver.1.gz +man/man1/git-annex-direct.1.gz +man/man1/git-annex-drop.1.gz +man/man1/git-annex-dropkey.1.gz +man/man1/git-annex-dropunused.1.gz +man/man1/git-annex-edit.1.gz +man/man1/git-annex-enable-tor.1.gz +man/man1/git-annex-enableremote.1.gz +man/man1/git-annex-examinekey.1.gz +man/man1/git-annex-expire.1.gz +man/man1/git-annex-find.1.gz +man/man1/git-annex-findref.1.gz +man/man1/git-annex-fix.1.gz +man/man1/git-annex-forget.1.gz +man/man1/git-annex-fromkey.1.gz +man/man1/git-annex-fsck.1.gz +man/man1/git-annex-fuzztest.1.gz +man/man1/git-annex-get.1.gz +man/man1/git-annex-group.1.gz +man/man1/git-annex-groupwanted.1.gz +man/man1/git-annex-import.1.gz +man/man1/git-annex-importfeed.1.gz +man/man1/git-annex-indirect.1.gz +man/man1/git-annex-info.1.gz +man/man1/git-annex-init.1.gz +man/man1/git-annex-initremote.1.gz +man/man1/git-annex-list.1.gz +man/man1/git-annex-lock.1.gz +man/man1/git-annex-log.1.gz +man/man1/git-annex-lookupkey.1.gz +man/man1/git-annex-map.1.gz +man/man1/git-annex-matchexpression.1.gz +man/man1/git-annex-matching-options.1.gz +man/man1/git-annex-merge.1.gz +man/man1/git-annex-metadata.1.gz +man/man1/git-annex-migrate.1.gz +man/man1/git-annex-mirror.1.gz +man/man1/git-annex-move.1.gz +man/man1/git-annex-multicast.1.gz +man/man1/git-annex-numcopies.1.gz +man/man1/git-annex-p2p.1.gz +man/man1/git-annex-pre-commit.1.gz +man/man1/git-annex-preferred-content.1.gz +man/man1/git-annex-proxy.1.gz +man/man1/git-annex-readpresentkey.1.gz +man/man1/git-annex-registerurl.1.gz +man/man1/git-annex-reinit.1.gz +man/man1/git-annex-reinject.1.gz +man/man1/git-annex-rekey.1.gz +man/man1/git-annex-remotedaemon.1.gz +man/man1/git-annex-repair.1.gz +man/man1/git-annex-required.1.gz +man/man1/git-annex-resolvemerge.1.gz +man/man1/git-annex-rmurl.1.gz +man/man1/git-annex-schedule.1.gz +man/man1/git-annex-semitrust.1.gz +man/man1/git-annex-setkey.1.gz +man/man1/git-annex-setpresentkey.1.gz +man/man1/git-annex-shell.1.gz +man/man1/git-annex-smudge.1.gz +man/man1/git-annex-status.1.gz +man/man1/git-annex-sync.1.gz +man/man1/git-annex-test.1.gz +man/man1/git-annex-testremote.1.gz +man/man1/git-annex-transferkey.1.gz +man/man1/git-annex-transferkeys.1.gz +man/man1/git-annex-trust.1.gz +man/man1/git-annex-unannex.1.gz +man/man1/git-annex-undo.1.gz +man/man1/git-annex-ungroup.1.gz +man/man1/git-annex-uninit.1.gz +man/man1/git-annex-unlock.1.gz +man/man1/git-annex-untrust.1.gz +man/man1/git-annex-unused.1.gz +man/man1/git-annex-upgrade.1.gz +man/man1/git-annex-vadd.1.gz +man/man1/git-annex-vcycle.1.gz +man/man1/git-annex-version.1.gz +man/man1/git-annex-vfilter.1.gz +man/man1/git-annex-vicfg.1.gz +man/man1/git-annex-view.1.gz +man/man1/git-annex-vpop.1.gz +man/man1/git-annex-wanted.1.gz +man/man1/git-annex-watch.1.gz +man/man1/git-annex-webapp.1.gz +man/man1/git-annex-whereis.1.gz +man/man1/git-annex.1.gz +man/man1/git-remote-tor-annex.1.gz Index: head/devel/hs-haddock/Makefile =================================================================== --- head/devel/hs-haddock/Makefile +++ head/devel/hs-haddock/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= haddock -PORTVERSION= 2.21.0 -PORTREVISION= 3 +PORTVERSION= 2.22.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -13,6 +12,11 @@ USES= cabal -USE_CABAL= ghc-paths-0.1.0.9_4 haddock-api-2.21.0 haddock-library-1.7.0 +USE_CABAL= ghc-paths-0.1.0.9_4 haddock-api-${PORTVERSION} haddock-library-1.7.0 + +haddock_DATADIR_VARS= haddock-api + +post-install: + cd ${WRKSRC}/haddock-api-${PORTVERSION}/resources/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR} .include Index: head/devel/hs-haddock/distinfo =================================================================== --- head/devel/hs-haddock/distinfo +++ head/devel/hs-haddock/distinfo @@ -1,11 +1,11 @@ -TIMESTAMP = 1550307107 -SHA256 (cabal/haddock-2.21.0.tar.gz) = 0863cea77db75032ea8eb3b31e363300cf59ce347c56bd0d3aa64b0b298378b6 -SIZE (cabal/haddock-2.21.0.tar.gz) = 264884 +TIMESTAMP = 1559901036 +SHA256 (cabal/haddock-2.22.0.tar.gz) = 66c556e9b5cf5666acda3d0cb03637d72addc563495dc446a2199402bff882cc +SIZE (cabal/haddock-2.22.0.tar.gz) = 266319 SHA256 (cabal/ghc-paths-0.1.0.9/ghc-paths-0.1.0.9.tar.gz) = afa68fb86123004c37c1dc354286af2d87a9dcfb12ddcb80e8bd0cd55bc87945 SIZE (cabal/ghc-paths-0.1.0.9/ghc-paths-0.1.0.9.tar.gz) = 2402 SHA256 (cabal/ghc-paths-0.1.0.9/revision/4.cabal) = ed18df7b53699446dabd66f6e019e5b156820f0301d8dec0d6385f13b797e0ba SIZE (cabal/ghc-paths-0.1.0.9/revision/4.cabal) = 656 -SHA256 (cabal/haddock-api-2.21.0/haddock-api-2.21.0.tar.gz) = dcaeb11b9fa22544b932492198b373abf598c87fedc3ea05ae125a6230ecd148 -SIZE (cabal/haddock-api-2.21.0/haddock-api-2.21.0.tar.gz) = 177939 +SHA256 (cabal/haddock-api-2.22.0/haddock-api-2.22.0.tar.gz) = 24804f7e9da006a97712822da8afd7b24b00a9135638457266fc54e2e8273891 +SIZE (cabal/haddock-api-2.22.0/haddock-api-2.22.0.tar.gz) = 186601 SHA256 (cabal/haddock-library-1.7.0/haddock-library-1.7.0.tar.gz) = e7c2794a7eb352824f098cafa07bc0506f2c3633808bfbf4c64aef0ba664d011 SIZE (cabal/haddock-library-1.7.0/haddock-library-1.7.0.tar.gz) = 26315 Index: head/devel/hs-haddock/pkg-plist =================================================================== --- head/devel/hs-haddock/pkg-plist +++ head/devel/hs-haddock/pkg-plist @@ -1,2 +1,15 @@ -@postexec /bin/ln -sf %%EXECUTABLE%% %%HADDOCK%% -@postunexec [ -f %%GHC_HADDOCK_CMD%% ] && /bin/ln -sf %%GHC_HADDOCK_CMD%% %%HADDOCK%% || rm -f %%HADDOCK%% +%%DATADIR%%/html/Classic.theme/haskell_icon.gif +%%DATADIR%%/html/Classic.theme/minus.gif +%%DATADIR%%/html/Classic.theme/plus.gif +%%DATADIR%%/html/Classic.theme/xhaddock.css +%%DATADIR%%/html/Ocean.std-theme/hslogo-16.png +%%DATADIR%%/html/Ocean.std-theme/minus.gif +%%DATADIR%%/html/Ocean.std-theme/ocean.css +%%DATADIR%%/html/Ocean.std-theme/plus.gif +%%DATADIR%%/html/Ocean.std-theme/synopsis.png +%%DATADIR%%/html/haddock-bundle.min.js +%%DATADIR%%/html/highlight.js +%%DATADIR%%/html/quick-jump.css +%%DATADIR%%/html/quick-jump.min.js +%%DATADIR%%/html/solarized.css +%%DATADIR%%/latex/haddock.sty Index: head/devel/hs-happy/Makefile =================================================================== --- head/devel/hs-happy/Makefile +++ head/devel/hs-happy/Makefile @@ -3,6 +3,7 @@ PORTNAME= happy PORTVERSION= 1.19.10 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -19,5 +20,9 @@ post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR} + +post-install: + @${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} $$(find ${WRKSRC} -name 'HappyTemplate*') ${STAGEDIR}${DATADIR} .include Index: head/devel/hs-happy/pkg-plist =================================================================== --- head/devel/hs-happy/pkg-plist +++ head/devel/hs-happy/pkg-plist @@ -0,0 +1,9 @@ +%%DATADIR%%/HappyTemplate +%%DATADIR%%/HappyTemplate-arrays +%%DATADIR%%/HappyTemplate-arrays-coerce +%%DATADIR%%/HappyTemplate-arrays-coerce-debug +%%DATADIR%%/HappyTemplate-arrays-debug +%%DATADIR%%/HappyTemplate-arrays-ghc +%%DATADIR%%/HappyTemplate-arrays-ghc-debug +%%DATADIR%%/HappyTemplate-coerce +%%DATADIR%%/HappyTemplate-ghc Index: head/devel/hs-hasktags/Makefile =================================================================== --- head/devel/hs-hasktags/Makefile +++ head/devel/hs-hasktags/Makefile @@ -2,6 +2,7 @@ PORTNAME= hasktags PORTVERSION= 0.71.2 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: head/devel/hs-hlint/Makefile =================================================================== --- head/devel/hs-hlint/Makefile +++ head/devel/hs-hlint/Makefile @@ -2,7 +2,7 @@ PORTNAME= hlint PORTVERSION= 2.1.12 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: head/devel/hs-hoogle/Makefile =================================================================== --- head/devel/hs-hoogle/Makefile +++ head/devel/hs-hoogle/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= hoogle -PORTVERSION= 5.0.17.4 -PORTREVISION= 2 +PORTVERSION= 5.0.17.9 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -12,14 +11,15 @@ LICENSE= BSD3CLAUSE BUILD_DEPENDS= happy:devel/hs-happy +RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss USES= cabal USE_CABAL= ListLike-4.6_2 QuickCheck-2.12.6.1_1 aeson-1.4.2.0_1 appar-0.1.7 \ asn1-encoding-0.9.5 asn1-parse-0.9.4 asn1-types-0.3.2 async-2.2.1_1 \ attoparsec-0.13.2.2 auto-update-0.1.4 base-compat-0.10.5 \ - base-orphans-0.8 basement-0.0.10_1 blaze-builder-0.4.1.0 \ - bsb-http-chunked-0.0.0.4 byteable-0.1.1 byteorder-1.0.4 \ + base-orphans-0.8 basement-0.0.10_1 blaze-builder-0.4.1.0 blaze-html-0.9.1.1 \ + blaze-markup-0.8.2.2_1 bsb-http-chunked-0.0.0.4 byteable-0.1.1 byteorder-1.0.4 \ cabal-doctest-1.0.6_2 case-insensitive-1.2.0.11 cereal-0.5.8.0 \ clock-0.7.2 cmdargs-0.10.20 conduit-1.3.1 conduit-extra-1.3.0 \ connection-0.2.8 cookie-0.4.4 cryptonite-0.25 \ Index: head/devel/hs-hoogle/distinfo =================================================================== --- head/devel/hs-hoogle/distinfo +++ head/devel/hs-hoogle/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1553675419 -SHA256 (cabal/hoogle-5.0.17.4.tar.gz) = 499b2b7a77806ed486d7ed8daad29c3827cec38a32dbd02769b72fba87f62d15 -SIZE (cabal/hoogle-5.0.17.4.tar.gz) = 93902 +TIMESTAMP = 1559909386 +SHA256 (cabal/hoogle-5.0.17.9.tar.gz) = df207e0cc1214ba3eb83240907d9f3c15b34e2c9a384ef01a37278ada3409768 +SIZE (cabal/hoogle-5.0.17.9.tar.gz) = 96318 SHA256 (cabal/ListLike-4.6/ListLike-4.6.tar.gz) = c1cdec79a5f585a5839eea26a2afe6a37aab5ed2f402a16e7d59fe9a4e925a9a SIZE (cabal/ListLike-4.6/ListLike-4.6.tar.gz) = 30544 SHA256 (cabal/ListLike-4.6/revision/2.cabal) = 0fc4f9b6d6da1eab7102310f37379c4fc751ec94ac4c36096cd87ef948168ad5 @@ -39,6 +39,12 @@ SIZE (cabal/basement-0.0.10/revision/1.cabal) = 5595 SHA256 (cabal/blaze-builder-0.4.1.0/blaze-builder-0.4.1.0.tar.gz) = 91fc8b966f3e9dc9461e1675c7566b881740f99abc906495491a3501630bc814 SIZE (cabal/blaze-builder-0.4.1.0/blaze-builder-0.4.1.0.tar.gz) = 61365 +SHA256 (cabal/blaze-html-0.9.1.1/blaze-html-0.9.1.1.tar.gz) = ea0e944298dbbd692b41af4f15dbd1a1574aec7b8f91f38391d25106b143bb1b +SIZE (cabal/blaze-html-0.9.1.1/blaze-html-0.9.1.1.tar.gz) = 81502 +SHA256 (cabal/blaze-markup-0.8.2.2/blaze-markup-0.8.2.2.tar.gz) = c6f0cf8fd707ba8c0b700e0c5ad6a1212c8b57d46a9cbdfb904d8bf585ad82e1 +SIZE (cabal/blaze-markup-0.8.2.2/blaze-markup-0.8.2.2.tar.gz) = 14458 +SHA256 (cabal/blaze-markup-0.8.2.2/revision/1.cabal) = fda3582c37167b7b26a3e973f8501e0889041de01416add83c592cf03bbb7a47 +SIZE (cabal/blaze-markup-0.8.2.2/revision/1.cabal) = 2231 SHA256 (cabal/bsb-http-chunked-0.0.0.4/bsb-http-chunked-0.0.0.4.tar.gz) = 148309e23eb8b261c1de374712372d62d8c8dc8ee504c392809c7ec33c0a0e7c SIZE (cabal/bsb-http-chunked-0.0.0.4/bsb-http-chunked-0.0.0.4.tar.gz) = 6630 SHA256 (cabal/byteable-0.1.1/byteable-0.1.1.tar.gz) = 243b34a1b5b64b39e39fe58f75c18f6cad5b668b10cabcd86816cbde27783fe2 Index: head/devel/hs-hspec-discover/Makefile =================================================================== --- head/devel/hs-hspec-discover/Makefile +++ head/devel/hs-hspec-discover/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= hspec-discover -PORTVERSION= 2.6.1 +PORTVERSION= 2.7.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: head/devel/hs-hspec-discover/distinfo =================================================================== --- head/devel/hs-hspec-discover/distinfo +++ head/devel/hs-hspec-discover/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1550317272 -SHA256 (cabal/hspec-discover-2.6.1.tar.gz) = 9d569a9587d2034272d287442855490a06266192eba1da871cae7d971b922fa1 -SIZE (cabal/hspec-discover-2.6.1.tar.gz) = 6719 +TIMESTAMP = 1559911407 +SHA256 (cabal/hspec-discover-2.7.1.tar.gz) = 0b31c29b37d7d446d44b3559f794cd62b09ee5fc3f30862eccd8284e52758764 +SIZE (cabal/hspec-discover-2.7.1.tar.gz) = 6755 Index: head/devel/hs-mueval/Makefile =================================================================== --- head/devel/hs-mueval/Makefile +++ head/devel/hs-mueval/Makefile @@ -3,7 +3,7 @@ PORTNAME= mueval PORTVERSION= 0.9.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: head/devel/hs-shake/Makefile =================================================================== --- head/devel/hs-shake/Makefile +++ head/devel/hs-shake/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= shake -PORTVERSION= 0.17.5 +PORTVERSION= 0.18.2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -11,8 +11,9 @@ USES= cabal -USE_CABAL= clock-0.7.2 extra-1.6.14 hashable-1.2.7.0_1 js-flot-0.8.3 \ - js-jquery-3.3.1 primitive-0.6.4.0_1 random-1.1_1 \ - unordered-containers-0.2.10.0 utf8-string-1.0.1.1_3 +USE_CABAL= clock-0.7.2 extra-1.6.14 filepattern-0.1.1 hashable-1.2.7.0_1 \ + heaps-0.3.6.1 js-dgtable-0.5.2 js-flot-0.8.3 js-jquery-3.3.1 \ + primitive-0.6.4.0_1 random-1.1_1 unordered-containers-0.2.10.0 \ + utf8-string-1.0.1.1_3 .include Index: head/devel/hs-shake/distinfo =================================================================== --- head/devel/hs-shake/distinfo +++ head/devel/hs-shake/distinfo @@ -1,14 +1,20 @@ -TIMESTAMP = 1553452122 -SHA256 (cabal/shake-0.17.5.tar.gz) = dff71cf56f7ef75045419b3084f9ef2481023df2ba3541a6f4e84e50dea42a20 -SIZE (cabal/shake-0.17.5.tar.gz) = 562751 +TIMESTAMP = 1559912465 +SHA256 (cabal/shake-0.18.2.tar.gz) = 28fecc26cb8a994d35482a673cee4dbe02c8e20d49a875ebd009037935673fb7 +SIZE (cabal/shake-0.18.2.tar.gz) = 257358 SHA256 (cabal/clock-0.7.2/clock-0.7.2.tar.gz) = 886601978898d3a91412fef895e864576a7125d661e1f8abc49a2a08840e691f SIZE (cabal/clock-0.7.2/clock-0.7.2.tar.gz) = 7465 SHA256 (cabal/extra-1.6.14/extra-1.6.14.tar.gz) = a60641530d96653ecc365aa042f4061892154995915d91f432ea5a2e3aaf129c SIZE (cabal/extra-1.6.14/extra-1.6.14.tar.gz) = 41074 +SHA256 (cabal/filepattern-0.1.1/filepattern-0.1.1.tar.gz) = f7fc5bdcfef0d43a793a3c64e7c0fd3b1d35eea97a37f0e69d6612ab255c9b4b +SIZE (cabal/filepattern-0.1.1/filepattern-0.1.1.tar.gz) = 14868 SHA256 (cabal/hashable-1.2.7.0/hashable-1.2.7.0.tar.gz) = ecb5efc0586023f5a0dc861100621c1dbb4cbb2f0516829a16ebac39f0432abf SIZE (cabal/hashable-1.2.7.0/hashable-1.2.7.0.tar.gz) = 30182 SHA256 (cabal/hashable-1.2.7.0/revision/1.cabal) = 03b6836ca9cd3ad0e5a2f3cce989b001dd0e05f306a873db3196037adb30e0a4 SIZE (cabal/hashable-1.2.7.0/revision/1.cabal) = 5215 +SHA256 (cabal/heaps-0.3.6.1/heaps-0.3.6.1.tar.gz) = 91d552f3c8992f745607de39239b950db78295b533eda43d083699872a4ee36d +SIZE (cabal/heaps-0.3.6.1/heaps-0.3.6.1.tar.gz) = 12440 +SHA256 (cabal/js-dgtable-0.5.2/js-dgtable-0.5.2.tar.gz) = e28dd65bee8083b17210134e22e01c6349dc33c3b7bd17705973cd014e9f20ac +SIZE (cabal/js-dgtable-0.5.2/js-dgtable-0.5.2.tar.gz) = 49085 SHA256 (cabal/js-flot-0.8.3/js-flot-0.8.3.tar.gz) = 1ba2f2a6b8d85da76c41f526c98903cbb107f8642e506c072c1e7e3c20fe5e7a SIZE (cabal/js-flot-0.8.3/js-flot-0.8.3.tar.gz) = 662691 SHA256 (cabal/js-jquery-3.3.1/js-jquery-3.3.1.tar.gz) = e0e0681f0da1130ede4e03a051630ea439c458cb97216cdb01771ebdbe44069b Index: head/devel/hs-threadscope/Makefile =================================================================== --- head/devel/hs-threadscope/Makefile +++ head/devel/hs-threadscope/Makefile @@ -2,7 +2,7 @@ PORTNAME= threadscope PORTVERSION= 0.2.11.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: head/devel/stack/Makefile =================================================================== --- head/devel/stack/Makefile +++ head/devel/stack/Makefile @@ -1,16 +1,9 @@ # Created by: Tobias Kortkamp # $FreeBSD$ -# To update this port first go to -# 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.9.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: head/games/hedgewars-server/Makefile =================================================================== --- head/games/hedgewars-server/Makefile +++ head/games/hedgewars-server/Makefile @@ -2,6 +2,7 @@ PORTNAME= hedgewars PORTVERSION= 0.9.25 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.hedgewars.org/download/releases/ \ http://mirror.amdmi3.ru/distfiles/ Index: head/games/hs-scroll/Makefile =================================================================== --- head/games/hs-scroll/Makefile +++ head/games/hs-scroll/Makefile @@ -3,7 +3,7 @@ PORTNAME= scroll PORTVERSION= 1.20180421 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games haskell MAINTAINER= haskell@FreeBSD.org Index: head/lang/hs-brainfuck/Makefile =================================================================== --- head/lang/hs-brainfuck/Makefile +++ head/lang/hs-brainfuck/Makefile @@ -3,7 +3,7 @@ PORTNAME= brainfuck PORTVERSION= 0.1.0.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= lang haskell MAINTAINER= haskell@FreeBSD.org Index: head/lang/hs-unlambda/Makefile =================================================================== --- head/lang/hs-unlambda/Makefile +++ head/lang/hs-unlambda/Makefile @@ -3,7 +3,7 @@ PORTNAME= unlambda PORTVERSION= 0.1.4.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= lang haskell MAINTAINER= haskell@FreeBSD.org Index: head/print/hs-hscolour/Makefile =================================================================== --- head/print/hs-hscolour/Makefile +++ head/print/hs-hscolour/Makefile @@ -3,7 +3,7 @@ PORTNAME= hscolour PORTVERSION= 1.24.4 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= print haskell Index: head/textproc/cgrep/Makefile =================================================================== --- head/textproc/cgrep/Makefile +++ head/textproc/cgrep/Makefile @@ -3,7 +3,7 @@ PORTNAME= cgrep PORTVERSION= 6.6.25 -PORTREVISION= 3 +PORTREVISION= 1 CATEGORIES= textproc MAINTAINER= lwhsu@FreeBSD.org Index: head/textproc/hs-lhs2tex/Makefile =================================================================== --- head/textproc/hs-lhs2tex/Makefile +++ head/textproc/hs-lhs2tex/Makefile @@ -3,7 +3,7 @@ PORTNAME= lhs2tex PORTVERSION= 1.22 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org Index: head/textproc/hs-pandoc-citeproc/Makefile =================================================================== --- head/textproc/hs-pandoc-citeproc/Makefile +++ head/textproc/hs-pandoc-citeproc/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pandoc-citeproc -PORTVERSION= 0.16.1 +PORTVERSION= 0.16.2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -65,5 +65,10 @@ xml-types-0.3.6 yaml-0.11.0.0 zip-archive-0.4 zlib-0.6.2 CABAL_FLAGS= -test_citeproc -debug + +post-install: + ${INSTALL_MAN} ${WRKSRC}/man/man1/pandoc-citeproc.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 + cd ${WRKSRC} && ${COPYTREE_SHARE} locales ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/chicago-author-date.csl ${STAGEDIR}${DATADIR} .include Index: head/textproc/hs-pandoc-citeproc/distinfo =================================================================== --- head/textproc/hs-pandoc-citeproc/distinfo +++ head/textproc/hs-pandoc-citeproc/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1553686178 -SHA256 (cabal/pandoc-citeproc-0.16.1.tar.gz) = a3f12beef8dc8cd24c1365462a5d310a452f29ba6f9109e14ff974ff9b9fc36e -SIZE (cabal/pandoc-citeproc-0.16.1.tar.gz) = 326662 +TIMESTAMP = 1559921430 +SHA256 (cabal/pandoc-citeproc-0.16.2.tar.gz) = 5b6725b003474f19fd7de65f3371a015a7b210b42543fe952f2bc4c7d509b596 +SIZE (cabal/pandoc-citeproc-0.16.2.tar.gz) = 353416 SHA256 (cabal/Glob-0.10.0/Glob-0.10.0.tar.gz) = 473355bd6ba0a97902e0edada1acbc0d76cfda77596f0188b2cc0ae34272a324 SIZE (cabal/Glob-0.10.0/Glob-0.10.0.tar.gz) = 29500 SHA256 (cabal/HTTP-4000.3.12/HTTP-4000.3.12.tar.gz) = a3ff6a9c93771079121083f1691188fe45f84380118e0f76bc4578153c361990 Index: head/textproc/hs-pandoc-citeproc/pkg-plist =================================================================== --- head/textproc/hs-pandoc-citeproc/pkg-plist +++ head/textproc/hs-pandoc-citeproc/pkg-plist @@ -0,0 +1,54 @@ +man/man1/pandoc-citeproc.1.gz +%%DATADIR%%/chicago-author-date.csl +%%DATADIR%%/locales/locales-af-ZA.xml +%%DATADIR%%/locales/locales-ar.xml +%%DATADIR%%/locales/locales-bg-BG.xml +%%DATADIR%%/locales/locales-ca-AD.xml +%%DATADIR%%/locales/locales-cs-CZ.xml +%%DATADIR%%/locales/locales-cy-GB.xml +%%DATADIR%%/locales/locales-da-DK.xml +%%DATADIR%%/locales/locales-de-AT.xml +%%DATADIR%%/locales/locales-de-CH.xml +%%DATADIR%%/locales/locales-de-DE.xml +%%DATADIR%%/locales/locales-el-GR.xml +%%DATADIR%%/locales/locales-en-GB.xml +%%DATADIR%%/locales/locales-en-US.xml +%%DATADIR%%/locales/locales-es-CL.xml +%%DATADIR%%/locales/locales-es-ES.xml +%%DATADIR%%/locales/locales-es-MX.xml +%%DATADIR%%/locales/locales-et-EE.xml +%%DATADIR%%/locales/locales-eu.xml +%%DATADIR%%/locales/locales-fa-IR.xml +%%DATADIR%%/locales/locales-fi-FI.xml +%%DATADIR%%/locales/locales-fr-CA.xml +%%DATADIR%%/locales/locales-fr-FR.xml +%%DATADIR%%/locales/locales-he-IL.xml +%%DATADIR%%/locales/locales-hr-HR.xml +%%DATADIR%%/locales/locales-hu-HU.xml +%%DATADIR%%/locales/locales-id-ID.xml +%%DATADIR%%/locales/locales-is-IS.xml +%%DATADIR%%/locales/locales-it-IT.xml +%%DATADIR%%/locales/locales-ja-JP.xml +%%DATADIR%%/locales/locales-km-KH.xml +%%DATADIR%%/locales/locales-ko-KR.xml +%%DATADIR%%/locales/locales-lt-LT.xml +%%DATADIR%%/locales/locales-lv-LV.xml +%%DATADIR%%/locales/locales-mn-MN.xml +%%DATADIR%%/locales/locales-nb-NO.xml +%%DATADIR%%/locales/locales-nl-NL.xml +%%DATADIR%%/locales/locales-nn-NO.xml +%%DATADIR%%/locales/locales-pl-PL.xml +%%DATADIR%%/locales/locales-pt-BR.xml +%%DATADIR%%/locales/locales-pt-PT.xml +%%DATADIR%%/locales/locales-ro-RO.xml +%%DATADIR%%/locales/locales-ru-RU.xml +%%DATADIR%%/locales/locales-sk-SK.xml +%%DATADIR%%/locales/locales-sl-SI.xml +%%DATADIR%%/locales/locales-sr-RS.xml +%%DATADIR%%/locales/locales-sv-SE.xml +%%DATADIR%%/locales/locales-th-TH.xml +%%DATADIR%%/locales/locales-tr-TR.xml +%%DATADIR%%/locales/locales-uk-UA.xml +%%DATADIR%%/locales/locales-vi-VN.xml +%%DATADIR%%/locales/locales-zh-CN.xml +%%DATADIR%%/locales/locales-zh-TW.xml Index: head/textproc/hs-pandoc/Makefile =================================================================== --- head/textproc/hs-pandoc/Makefile +++ head/textproc/hs-pandoc/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= pandoc -PORTVERSION= 2.7.1 -PORTREVISION= 1 +PORTVERSION= 2.7.2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -14,7 +13,6 @@ USES= cabal OPTIONS_DEFINE= EMBED_DATA TRYPANDOC -OPTIONS_DEFAULT= EMBED_DATA EMBED_DATA_DESC= Embed data files in binary for relocatable executable EMBED_DATA_CABAL_FLAGS= embed_data_files @@ -64,9 +62,8 @@ CABAL_FLAGS= -static derive_json_via_th -PLIST_FILES= man/man1/pandoc.1.gz - post-install: + cd ${WRKSRC} && ${COPYTREE_SHARE} data ${STAGEDIR}${DATADIR} ${INSTALL_MAN} ${WRKSRC}/man/pandoc.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 .include Index: head/textproc/hs-pandoc/distinfo =================================================================== --- head/textproc/hs-pandoc/distinfo +++ head/textproc/hs-pandoc/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1553835888 -SHA256 (cabal/pandoc-2.7.1.tar.gz) = 5e2a51f130e0fb39f615f7b9705f8e152156e30de4a71e1c900d1ae2ec8d1eb8 -SIZE (cabal/pandoc-2.7.1.tar.gz) = 10403643 +TIMESTAMP = 1559917331 +SHA256 (cabal/pandoc-2.7.2.tar.gz) = 2080b3bf83e4a1fd4984fc1143da6d18a565a2fc63d7abf0091d7234ff5154e2 +SIZE (cabal/pandoc-2.7.2.tar.gz) = 11262235 SHA256 (cabal/Glob-0.10.0/Glob-0.10.0.tar.gz) = 473355bd6ba0a97902e0edada1acbc0d76cfda77596f0188b2cc0ae34272a324 SIZE (cabal/Glob-0.10.0/Glob-0.10.0.tar.gz) = 29500 SHA256 (cabal/HTTP-4000.3.12/HTTP-4000.3.12.tar.gz) = a3ff6a9c93771079121083f1691188fe45f84380118e0f76bc4578153c361990 Index: head/textproc/hs-pandoc/pkg-plist =================================================================== --- head/textproc/hs-pandoc/pkg-plist +++ head/textproc/hs-pandoc/pkg-plist @@ -0,0 +1,166 @@ +man/man1/pandoc.1.gz +%%DATADIR%%/data/abbreviations +%%DATADIR%%/data/bash_completion.tpl +%%DATADIR%%/data/docx/[Content_Types].xml +%%DATADIR%%/data/docx/_rels/.rels +%%DATADIR%%/data/docx/docProps/app.xml +%%DATADIR%%/data/docx/docProps/core.xml +%%DATADIR%%/data/docx/docProps/custom.xml +%%DATADIR%%/data/docx/word/_rels/document.xml.rels +%%DATADIR%%/data/docx/word/_rels/footnotes.xml.rels +%%DATADIR%%/data/docx/word/comments.xml +%%DATADIR%%/data/docx/word/document.xml +%%DATADIR%%/data/docx/word/fontTable.xml +%%DATADIR%%/data/docx/word/footnotes.xml +%%DATADIR%%/data/docx/word/numbering.xml +%%DATADIR%%/data/docx/word/settings.xml +%%DATADIR%%/data/docx/word/styles.xml +%%DATADIR%%/data/docx/word/theme/theme1.xml +%%DATADIR%%/data/docx/word/webSettings.xml +%%DATADIR%%/data/dzslides/template.html +%%DATADIR%%/data/epub.css +%%DATADIR%%/data/init.lua +%%DATADIR%%/data/jats.csl +%%DATADIR%%/data/odt/Configurations2/accelerator/current.xml +%%DATADIR%%/data/odt/META-INF/manifest.xml +%%DATADIR%%/data/odt/Thumbnails/thumbnail.png +%%DATADIR%%/data/odt/content.xml +%%DATADIR%%/data/odt/manifest.rdf +%%DATADIR%%/data/odt/meta.xml +%%DATADIR%%/data/odt/mimetype +%%DATADIR%%/data/odt/settings.xml +%%DATADIR%%/data/odt/styles.xml +%%DATADIR%%/data/pandoc.List.lua +%%DATADIR%%/data/pandoc.lua +%%DATADIR%%/data/pptx/[Content_Types].xml +%%DATADIR%%/data/pptx/_rels/.rels +%%DATADIR%%/data/pptx/docProps/app.xml +%%DATADIR%%/data/pptx/docProps/core.xml +%%DATADIR%%/data/pptx/ppt/_rels/presentation.xml.rels +%%DATADIR%%/data/pptx/ppt/notesMasters/_rels/notesMaster1.xml.rels +%%DATADIR%%/data/pptx/ppt/notesMasters/notesMaster1.xml +%%DATADIR%%/data/pptx/ppt/notesSlides/_rels/notesSlide1.xml.rels +%%DATADIR%%/data/pptx/ppt/notesSlides/_rels/notesSlide2.xml.rels +%%DATADIR%%/data/pptx/ppt/notesSlides/notesSlide1.xml +%%DATADIR%%/data/pptx/ppt/notesSlides/notesSlide2.xml +%%DATADIR%%/data/pptx/ppt/presProps.xml +%%DATADIR%%/data/pptx/ppt/presentation.xml +%%DATADIR%%/data/pptx/ppt/slideLayouts/_rels/slideLayout1.xml.rels +%%DATADIR%%/data/pptx/ppt/slideLayouts/_rels/slideLayout10.xml.rels +%%DATADIR%%/data/pptx/ppt/slideLayouts/_rels/slideLayout11.xml.rels +%%DATADIR%%/data/pptx/ppt/slideLayouts/_rels/slideLayout2.xml.rels +%%DATADIR%%/data/pptx/ppt/slideLayouts/_rels/slideLayout3.xml.rels +%%DATADIR%%/data/pptx/ppt/slideLayouts/_rels/slideLayout4.xml.rels +%%DATADIR%%/data/pptx/ppt/slideLayouts/_rels/slideLayout5.xml.rels +%%DATADIR%%/data/pptx/ppt/slideLayouts/_rels/slideLayout6.xml.rels +%%DATADIR%%/data/pptx/ppt/slideLayouts/_rels/slideLayout7.xml.rels +%%DATADIR%%/data/pptx/ppt/slideLayouts/_rels/slideLayout8.xml.rels +%%DATADIR%%/data/pptx/ppt/slideLayouts/_rels/slideLayout9.xml.rels +%%DATADIR%%/data/pptx/ppt/slideLayouts/slideLayout1.xml +%%DATADIR%%/data/pptx/ppt/slideLayouts/slideLayout10.xml +%%DATADIR%%/data/pptx/ppt/slideLayouts/slideLayout11.xml +%%DATADIR%%/data/pptx/ppt/slideLayouts/slideLayout2.xml +%%DATADIR%%/data/pptx/ppt/slideLayouts/slideLayout3.xml +%%DATADIR%%/data/pptx/ppt/slideLayouts/slideLayout4.xml +%%DATADIR%%/data/pptx/ppt/slideLayouts/slideLayout5.xml +%%DATADIR%%/data/pptx/ppt/slideLayouts/slideLayout6.xml +%%DATADIR%%/data/pptx/ppt/slideLayouts/slideLayout7.xml +%%DATADIR%%/data/pptx/ppt/slideLayouts/slideLayout8.xml +%%DATADIR%%/data/pptx/ppt/slideLayouts/slideLayout9.xml +%%DATADIR%%/data/pptx/ppt/slideMasters/_rels/slideMaster1.xml.rels +%%DATADIR%%/data/pptx/ppt/slideMasters/slideMaster1.xml +%%DATADIR%%/data/pptx/ppt/slides/_rels/slide1.xml.rels +%%DATADIR%%/data/pptx/ppt/slides/_rels/slide2.xml.rels +%%DATADIR%%/data/pptx/ppt/slides/_rels/slide3.xml.rels +%%DATADIR%%/data/pptx/ppt/slides/_rels/slide4.xml.rels +%%DATADIR%%/data/pptx/ppt/slides/slide1.xml +%%DATADIR%%/data/pptx/ppt/slides/slide2.xml +%%DATADIR%%/data/pptx/ppt/slides/slide3.xml +%%DATADIR%%/data/pptx/ppt/slides/slide4.xml +%%DATADIR%%/data/pptx/ppt/tableStyles.xml +%%DATADIR%%/data/pptx/ppt/theme/theme1.xml +%%DATADIR%%/data/pptx/ppt/theme/theme2.xml +%%DATADIR%%/data/pptx/ppt/viewProps.xml +%%DATADIR%%/data/sample.lua +%%DATADIR%%/data/templates/default.asciidoc +%%DATADIR%%/data/templates/default.asciidoctor +%%DATADIR%%/data/templates/default.commonmark +%%DATADIR%%/data/templates/default.context +%%DATADIR%%/data/templates/default.docbook4 +%%DATADIR%%/data/templates/default.docbook5 +%%DATADIR%%/data/templates/default.dokuwiki +%%DATADIR%%/data/templates/default.dzslides +%%DATADIR%%/data/templates/default.epub2 +%%DATADIR%%/data/templates/default.epub3 +%%DATADIR%%/data/templates/default.haddock +%%DATADIR%%/data/templates/default.html4 +%%DATADIR%%/data/templates/default.html5 +%%DATADIR%%/data/templates/default.icml +%%DATADIR%%/data/templates/default.jats +%%DATADIR%%/data/templates/default.latex +%%DATADIR%%/data/templates/default.man +%%DATADIR%%/data/templates/default.markdown +%%DATADIR%%/data/templates/default.mediawiki +%%DATADIR%%/data/templates/default.ms +%%DATADIR%%/data/templates/default.muse +%%DATADIR%%/data/templates/default.opendocument +%%DATADIR%%/data/templates/default.opml +%%DATADIR%%/data/templates/default.org +%%DATADIR%%/data/templates/default.plain +%%DATADIR%%/data/templates/default.revealjs +%%DATADIR%%/data/templates/default.rst +%%DATADIR%%/data/templates/default.rtf +%%DATADIR%%/data/templates/default.s5 +%%DATADIR%%/data/templates/default.slideous +%%DATADIR%%/data/templates/default.slidy +%%DATADIR%%/data/templates/default.tei +%%DATADIR%%/data/templates/default.texinfo +%%DATADIR%%/data/templates/default.textile +%%DATADIR%%/data/templates/default.xwiki +%%DATADIR%%/data/templates/default.zimwiki +%%DATADIR%%/data/translations/am.yaml +%%DATADIR%%/data/translations/ar.yaml +%%DATADIR%%/data/translations/bg.yaml +%%DATADIR%%/data/translations/bn.yaml +%%DATADIR%%/data/translations/ca.yaml +%%DATADIR%%/data/translations/cs.yaml +%%DATADIR%%/data/translations/da.yaml +%%DATADIR%%/data/translations/de.yaml +%%DATADIR%%/data/translations/el.yaml +%%DATADIR%%/data/translations/en.yaml +%%DATADIR%%/data/translations/eo.yaml +%%DATADIR%%/data/translations/es.yaml +%%DATADIR%%/data/translations/et.yaml +%%DATADIR%%/data/translations/eu.yaml +%%DATADIR%%/data/translations/fa.yaml +%%DATADIR%%/data/translations/fi.yaml +%%DATADIR%%/data/translations/fr.yaml +%%DATADIR%%/data/translations/he.yaml +%%DATADIR%%/data/translations/hi.yaml +%%DATADIR%%/data/translations/hr.yaml +%%DATADIR%%/data/translations/hu.yaml +%%DATADIR%%/data/translations/is.yaml +%%DATADIR%%/data/translations/it.yaml +%%DATADIR%%/data/translations/km.yaml +%%DATADIR%%/data/translations/ko.yaml +%%DATADIR%%/data/translations/lo.yaml +%%DATADIR%%/data/translations/lt.yaml +%%DATADIR%%/data/translations/lv.yaml +%%DATADIR%%/data/translations/nl.yaml +%%DATADIR%%/data/translations/no.yaml +%%DATADIR%%/data/translations/pl.yaml +%%DATADIR%%/data/translations/pt.yaml +%%DATADIR%%/data/translations/rm.yaml +%%DATADIR%%/data/translations/ro.yaml +%%DATADIR%%/data/translations/ru.yaml +%%DATADIR%%/data/translations/sk.yaml +%%DATADIR%%/data/translations/sl.yaml +%%DATADIR%%/data/translations/sq.yaml +%%DATADIR%%/data/translations/sr-cyrl.yaml +%%DATADIR%%/data/translations/sr.yaml +%%DATADIR%%/data/translations/sv.yaml +%%DATADIR%%/data/translations/th.yaml +%%DATADIR%%/data/translations/tr.yaml +%%DATADIR%%/data/translations/uk.yaml +%%DATADIR%%/data/translations/ur.yaml +%%DATADIR%%/data/translations/vi.yaml Index: head/textproc/hs-yaml/Makefile =================================================================== --- head/textproc/hs-yaml/Makefile +++ head/textproc/hs-yaml/Makefile @@ -2,7 +2,7 @@ PORTNAME= yaml PORTVERSION= 0.11.0.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org Index: head/www/hs-DAV/Makefile =================================================================== --- head/www/hs-DAV/Makefile +++ head/www/hs-DAV/Makefile @@ -2,6 +2,7 @@ PORTNAME= DAV PORTVERSION= 1.3.3 +PORTREVISION= 1 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org Index: head/www/hs-hjsmin/Makefile =================================================================== --- head/www/hs-hjsmin/Makefile +++ head/www/hs-hjsmin/Makefile @@ -2,7 +2,7 @@ PORTNAME= hjsmin PORTVERSION= 0.2.0.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org Index: head/www/hs-wai-app-static/Makefile =================================================================== --- head/www/hs-wai-app-static/Makefile +++ head/www/hs-wai-app-static/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= wai-app-static -PORTVERSION= 3.1.6.2 -PORTREVISION= 3 +PORTVERSION= 3.1.6.3 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org Index: head/www/hs-wai-app-static/distinfo =================================================================== --- head/www/hs-wai-app-static/distinfo +++ head/www/hs-wai-app-static/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1553624567 -SHA256 (cabal/wai-app-static-3.1.6.2.tar.gz) = d0b0a566be61ef4c8f800922a71dbc4de64287f8f73782b1461cd5d294c1dc3e -SIZE (cabal/wai-app-static-3.1.6.2.tar.gz) = 22509 +TIMESTAMP = 1559927442 +SHA256 (cabal/wai-app-static-3.1.6.3.tar.gz) = 8cb091eab6b4b303b3cd3a5cb90c81c19ce4792d3e706bd749c7cbfacabfcb68 +SIZE (cabal/wai-app-static-3.1.6.3.tar.gz) = 22673 SHA256 (cabal/aeson-1.4.2.0/aeson-1.4.2.0.tar.gz) = 75ce71814a33d5e5568208e6806a8847e7ba47fea74d30f6a8b1b56ecb318bd0 SIZE (cabal/aeson-1.4.2.0/aeson-1.4.2.0.tar.gz) = 268052 SHA256 (cabal/aeson-1.4.2.0/revision/1.cabal) = 8166752a9669597db375343df19805069595fed9c613f98504e418849f40fe18 Index: head/www/hs-yesod-bin/Makefile =================================================================== --- head/www/hs-yesod-bin/Makefile +++ head/www/hs-yesod-bin/Makefile @@ -2,7 +2,7 @@ PORTNAME= yesod-bin PORTVERSION= 1.6.0.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org Index: head/x11/hs-xmobar/Makefile =================================================================== --- head/x11/hs-xmobar/Makefile +++ head/x11/hs-xmobar/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= xmobar -PORTVERSION= 0.29.4 -PORTREVISION= 4 +PORTVERSION= 0.29.5 CATEGORIES= x11 haskell MAINTAINER= haskell@FreeBSD.org Index: head/x11/hs-xmobar/distinfo =================================================================== --- head/x11/hs-xmobar/distinfo +++ head/x11/hs-xmobar/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1553705725 -SHA256 (cabal/xmobar-0.29.4.tar.gz) = 59378f117d41dbf5312bd1eaaf7b2d82d09e95652c6d777b64e300de2fd17122 -SIZE (cabal/xmobar-0.29.4.tar.gz) = 115342 +TIMESTAMP = 1559929281 +SHA256 (cabal/xmobar-0.29.5.tar.gz) = 15fc38acd2ff62d44a899bcd243af9b166e97291c3d6e23a34d2aa1df295b04c +SIZE (cabal/xmobar-0.29.5.tar.gz) = 115733 SHA256 (cabal/X11-1.9/X11-1.9.tar.gz) = 10138e863d8c6f860aad1755a6f1a36949cc02d83e5afacf6677fb3999f10db9 SIZE (cabal/X11-1.9/X11-1.9.tar.gz) = 191779 SHA256 (cabal/X11-xft-0.3.1/X11-xft-0.3.1.tar.gz) = 4eba3fee62570e06447654030a62fb55f19587884bc2cef77a9c3b2c3458f8d1 Index: head/x11/hs-xmobar/files/patch-fix_bug378.diff =================================================================== --- head/x11/hs-xmobar/files/patch-fix_bug378.diff +++ head/x11/hs-xmobar/files/patch-fix_bug378.diff @@ -1,104 +0,0 @@ -Index: src/Xmobar/Plugins/Monitors/Weather.hs -============================================================================== ---- src/Xmobar/Plugins/Monitors/Weather.hs.orig 2018-11-21 23:52:35 UTC -+++ src/Xmobar/Plugins/Monitors/Weather.hs -@@ -19,14 +19,10 @@ import Xmobar.Plugins.Monitors.Common - - import qualified Control.Exception as CE - --#ifdef HTTP_CONDUIT - import Network.HTTP.Conduit - import Network.HTTP.Types.Status - import Network.HTTP.Types.Method - import qualified Data.ByteString.Lazy.Char8 as B --#else --import Network.HTTP --#endif - - import Text.ParserCombinators.Parsec - -@@ -190,7 +186,6 @@ stationUrl :: String -> String - stationUrl station = defUrl ++ station ++ ".TXT" - - getData :: String -> IO String --#ifdef HTTP_CONDUIT - getData station = CE.catch (do - manager <- newManager tlsManagerSettings - request <- parseUrl $ stationUrl station -@@ -199,13 +194,6 @@ getData station = CE.catch (do - ) errHandler - where errHandler :: CE.SomeException -> IO String - errHandler _ = return "" --#else --getData station = do -- let request = getRequest (stationUrl station) -- CE.catch (simpleHTTP request >>= getResponseBody) errHandler -- where errHandler :: CE.IOException -> IO String -- errHandler _ = return "" --#endif - - formatWeather :: [WeatherInfo] -> Monitor String - formatWeather [WI st ss y m d h (WindInfo wc wa wm wk wkh wms) v sk tC tF dC dF r p] = -@@ -221,7 +209,6 @@ runWeather str = - formatWeather i - - weatherReady :: [String] -> Monitor Bool --#ifdef HTTP_CONDUIT - weatherReady str = do - initRequest <- parseUrl $ stationUrl $ head str - let request = initRequest{method = methodHead} -@@ -235,21 +222,3 @@ weatherReady str = do - | statusIsServerError status = False - | statusIsClientError status = False - | otherwise = True --#else --weatherReady str = do -- let station = head str -- request = headRequest (stationUrl station) -- io $ CE.catch (simpleHTTP request >>= checkResult) errHandler -- where errHandler :: CE.IOException -> IO Bool -- errHandler _ = return False -- checkResult result = -- case result of -- Left _ -> return False -- Right response -> -- case rspCode response of -- -- Permission or network errors are failures; anything -- -- else is recoverable. -- (4, _, _) -> return False -- (5, _, _) -> return False -- (_, _, _) -> return True --#endif -Index: xmobar.cabal -============================================================================== ---- xmobar.cabal.orig 2018-12-24 02:06:23 UTC -+++ xmobar.cabal -@@ -87,10 +87,6 @@ flag with_weather - description: Enable weather plugin. - default: True - --flag with_conduit -- description: Use http-conduits for weather data, used only if with_weather. -- default: False -- - library - hs-source-dirs: src - -@@ -251,15 +247,11 @@ library - cpp-options: -DXPM - - if flag(with_weather) || flag(all_extensions) -- build-depends: HTTP >= 4000.2.4 - exposed-modules: Xmobar.Plugins.Monitors.Weather - cpp-options: -DWEATHER -- if flag(with_conduit) -- -- use http-conduit instead of simple-http -- build-depends: http-conduit, http-types -- cpp-options: -DHTTP_CONDUIT -+ build-depends: http-conduit, http-types - -- if flag(with_uvmeter) && flag(with_conduit) -+ if flag(with_uvmeter) - exposed-modules: Xmobar.Plugins.Monitors.UVMeter - build-depends: http-conduit, http-types - cpp-options: -DUVMETER