diff --git a/Mk/Uses/cabal.mk b/Mk/Uses/cabal.mk index 8d5308673f0b..7d2aafc1534a 100644 --- a/Mk/Uses/cabal.mk +++ b/Mk/Uses/cabal.mk @@ -1,311 +1,326 @@ # Provide support for building Haskell packages using Cabal. # # Feature: cabal # Usage: USES=cabal or USES=cabal:ARGS # Valid ARGS: hpack, nodefault # # hpack: The port doesn't have a .cabal file and needs devel/hs-hpack to # generate it from package.yaml file # nodefault: Do not fetch the default distribution file from Hackage. If # USE_GITHUB or USE_GITLAB is specified in the port, this argument # is implied. # # Variables, which can be set by the port: # # USE_CABAL List of Haskell packages required to build a port. # Should be listed along with version, like profunctors-5.3 # Package revision can be specified too with # usual "_" syntax: invariant-0.5.1_1 # When creating a new port, the initial list can be built # using make-use-cabal auxiliary target. # +# CABAL_REVISION Specifies a Haskell package revision. Set this to an +# integer to pull in revised .cabal file from Hackage. +# # CABAL_FLAGS List of Cabal flags to be passed verbatim into --flags # argument of cabal-install utility. Used for both # cabal configure and cabal build. # # CABAL_EXECUTABLES List of executable Cabal targets to be built and installed. # Consult the .cabal file of the project being ported to find # out possible values for this variable. # default: ${PORTNAME} # # opt_USE_CABAL Variant of USE_CABAL to be used with options framework. # opt_CABAL_FLAGS Variant of CABAL_FLAGS to be used with options framework. # Note that it works a bit differently from CABAL_FLAGS: # it appends "${opt_CABAL_FLAGS}" when the option is enabled # and "-${opt_CABAL_FLAGS}" otherwise. # opt_CABAL_EXECUTABLES Variant of CABAL_EXECUTABLES to be used with # options framework. # # CABAL_WRAPPER_SCRIPTS A subset of ${CABAL_EXECUTABLES} containing Haskell # programs to be wrapped into a shell script that sets # *_datadir environment variables before running the program. # This is needed for Haskell programs that install their # data files under share/ directory. # # FOO_DATADIR_VARS Additional environment vars to add to FOO executable's # wrapper script. # # CABAL_PROJECT Sets how to treat existing cabal.project file. Possible # values are "remove" and "append". # # SKIP_CABAL_PLIST Set to "yes" to prevent Haskell executables from being # added to the pkg-plist automatically. # # MAINTAINER: haskell@FreeBSD.org .if !defined(_INCLUDE_USES_CABAL_MK) _INCLUDE_USES_CABAL_MK= yes _valid_ARGS= hpack nodefault _cabal_project_valid_VALUES= append remove . for arg in ${cabal_ARGS} . if !${_valid_ARGS:M${arg}} IGNORE= USES=cabal: invalid arguments: ${arg} . endif . endfor . if defined(CABAL_PROJECT) && !${_cabal_project_valid_VALUES:M${CABAL_PROJECT}} IGNORE= CABAL_PROJECT: invalid value: ${CABAL_PROJECT} . endif . if ${ARCH} == i386 && defined(USE_CABAL) && ${USE_CABAL:Mbasement-0.0.1[4-5]} # Upstream issue: https://github.com/haskell-foundation/foundation/issues/565 BROKEN= ${USE_CABAL:Mbasement-0.0.1[4-5]} package doesn't compile on i386 . endif PKGNAMEPREFIX?= hs- CABAL_EXECUTABLES?= ${PORTNAME} CABAL_CMD?= cabal CABAL_PORT= devel/hs-cabal-install CABAL_HOME= ${WRKDIR}/cabal-home CABAL_LIBEXEC= libexec/cabal CABAL_EXTRACT_SUFX= .tar.gz CABAL_ARCH= ${ARCH:S/amd64/x86_64/:C/armv.*/arm/:S/powerpc64/ppc64/} CABAL_DEPSDIR= ${WRKSRC}/${CABAL_DEPS_SUBDIR} CABAL_DEPS_SUBDIR= _cabal_deps # A special cookie used to signify that the user is a maintainer updating the port # using cabal-* targets. The presense of this cookie disables cabal-post-patch. CABAL_COOKIE= ${WRKDIR}/.cabal_update_done.${PORTNAME}.${PREFIX:S/\//_/g} HPACK_CMD?= hpack _CABAL2TUPLE_CMD= cabal2tuple . if defined(BUILD_DEPENDS) && ${BUILD_DEPENDS:Mghc?*\:lang/ghc?*} CABAL_WITH_ARGS= --with-compiler=${BUILD_DEPENDS:Mghc?*\:lang/ghc?*:C/\:.*//} \ --with-hsc2hs=${LOCALBASE}/bin/hsc2hs-${BUILD_DEPENDS:Mghc?*\:lang/ghc?*:C/\:.*//} . else BUILD_DEPENDS+= ghc:lang/ghc . endif . if "${PORTNAME}" != "cabal-install" BUILD_DEPENDS+= cabal:${CABAL_PORT} . endif . if ${cabal_ARGS:Mhpack} EXTRACT_DEPENDS+= hpack:devel/hs-hpack . endif # Inherited via lang/ghc we need to depend on libffi.so and libgmp.so (stage q/a) LIB_DEPENDS+= libgmp.so:math/gmp \ libffi.so:devel/libffi DIST_SUBDIR?= cabal . if !defined(USE_GITHUB) && !defined(USE_GITLAB) && !${cabal_ARGS:Mnodefault} _hackage_is_default= yes . else _hackage_is_default= no . endif MASTER_SITES+= https://hackage.haskell.org/package/${_hackage_group} \ http://hackage.haskell.org/package/${_hackage_group} . if ${_hackage_is_default} == yes DISTFILES+= ${PORTNAME}-${PORTVERSION}/${PORTNAME}-${PORTVERSION}${CABAL_EXTRACT_SUFX} +. ifdef CABAL_REVISION +DISTFILES+= ${PORTNAME}-${PORTVERSION}/revision/${CABAL_REVISION}.cabal +. endif . else _hackage_group= :cabal_mk_hackage . endif _USES_extract= 701:cabal-post-extract _USES_patch= 701:cabal-post-patch _USES_configure=301:cabal-pre-configure _USES_stage= 751:cabal-post-install-script BUILD_TARGET?= ${CABAL_EXECUTABLES:S/^/exe:&/} _use_cabal= ${USE_CABAL:O:u} . for package in ${_use_cabal} . for pkg_name xrev in ${package:C/_[0-9]+//} x${package:C/[^_]*//:S/_//} DISTFILES+= ${pkg_name}/${pkg_name}${CABAL_EXTRACT_SUFX}${_hackage_group} . if ${xrev} != "x" DISTFILES+= ${pkg_name}/revision/${xrev:S/x//}.cabal${_hackage_group} . endif _CABAL_EXTRACT_ONLY+= ${pkg_name}/${pkg_name}${CABAL_EXTRACT_SUFX} . endfor . endfor . if !defined(EXTRACT_ONLY) EXTRACT_ONLY= ${_DISTFILES:N*\.cabal} . else . if !defined(SKIP_CABAL_EXTRACT) EXTRACT_ONLY+= ${_CABAL_EXTRACT_ONLY} . endif . endif # Auxiliary targets used during port creation/updating. # Populates Haskell package list from Hackage. # Fetches and unpacks package source from Hackage using only PORTNAME and PORTVERSION. # If Hackage isn't a default MASTER_SITE (for instance, when USE_GITHUB is present) # this target requires distinfo to be present too. cabal-extract: check-cabal . if ${_hackage_is_default} == no @${ECHO_MSG} "===> Recursing down to make extract" @${MAKE} -C ${.CURDIR} extract SKIP_CABAL_EXTRACT=yes USE_CABAL= ${RM} -rf ${CABAL_HOME} . endif @${ECHO_MSG} "===> Fetching Cabal package index into ${CABAL_HOME}/.cabal" @${SETENV} HOME=${CABAL_HOME} ${CABAL_CMD} update . if ${_hackage_is_default} == yes @cd ${WRKDIR} && \ ${SETENV} ${MAKE_ENV} HOME=${CABAL_HOME} ${CABAL_CMD} get ${PORTNAME}-${PORTVERSION} . else . if ${cabal_ARGS:Mhpack} @${ECHO_MSG} "===> Running ${HPACK_CMD} to generate .cabal file" @cd ${WRKSRC} && ${SETENV} HOME=${CABAL_HOME} ${HPACK_CMD} . endif . endif # Remove Haskell dependencies that come from GH_TUPLE @${RM} -r ${WRKSRC}/dist-newstyle # Create a cookie for cabal-post-patch @${TOUCH} ${EXTRACT_COOKIE} ${CABAL_COOKIE} # Calls cabal build --dry-run on the Haskell package located in ${WRKSRC} # This is a Cabal way of doing configure step of the building process # This pulls in all source dependencies, resolves them and generates build plan cabal-configure: check-cabal cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} HOME=${CABAL_HOME} ${CABAL_CMD} build --dry-run --disable-benchmarks --disable-tests --flags="${CABAL_FLAGS}" ${CABAL_WITH_ARGS} ${BUILD_ARGS} ${BUILD_TARGET} # Calls cabal build on the Haskell package located in ${WRKSRC} cabal-build: check-cabal cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} HOME=${CABAL_HOME} ${CABAL_CMD} build --disable-benchmarks --disable-tests ${CABAL_WITH_ARGS} ${BUILD_ARGS} ${BUILD_TARGET} # Generates USE_CABAL= ... line ready to be pasted into the port based on the plan.json file generated by cabal configure. make-use-cabal: check-cabal2tuple @${ECHO_MSG} "===> Processing plan.json" @${_CABAL2TUPLE_CMD} ${WRKSRC} || (${ECHO_CMD} "Did you forget to make cabal-configure ?" ; exit 1) +. if ${_hackage_is_default} == yes + @if ${GREP} -q 'x-revision' ${WRKSRC}/*.cabal; then \ + ${ECHO_MSG} "Downloaded .cabal file contains x-revision, make sure to add CABAL_REVISION=" `${GREP} 'x-revision' ${WRKSRC}/*.cabal | ${SED} -e s/x-revision://`; \ + fi +. endif check-cabal: @if ! type ${CABAL_CMD} > /dev/null 2>&1; then \ ${ECHO_MSG} "===> cabal executable not found, install ${CABAL_PORT} or set CABAL_CMD"; exit 1; \ fi; \ check-cabal2tuple: @if ! type ${_CABAL2TUPLE_CMD} > /dev/null 2>&1; then \ ${ECHO_MSG} "===> cabal2tuple executable not found, install \"ports-mgmt/hs-cabal2tuple\""; exit 1; \ fi # Main targets implementation. cabal-post-extract: . if !defined(SKIP_CABAL_EXTRACT) . if "${CABAL_PROJECT}" == "remove" # Remove the project file if requested ${RM} ${WRKSRC}/cabal.project . endif . ifndef(CABAL_PROJECT) @${TEST} ! -f ${WRKSRC}/cabal.project || \ (${ECHO_CMD} "cabal.project file is already present in WRKSRC! Set CABAL_PROJECT variable." && false) . endif +# Copy revised .cabal file if present +. if defined(CABAL_REVISION) && ${_hackage_is_default} == yes + ${CP} ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-${PORTVERSION}/revision/${CABAL_REVISION}.cabal `find ${WRKSRC} -name '*.cabal' -depth 1` +. endif # Move extracted dependencies into ${CABAL_DEPSDIR} directory ${MKDIR} ${CABAL_DEPSDIR} . for package in ${_use_cabal} . for pkg_name xrev in ${package:C/_[0-9]+//} x${package:C/[^_]*//:S/_//} # Copy revised .cabal file if present . if ${xrev} != "x" - cp ${DISTDIR}/${DIST_SUBDIR}/${pkg_name}/revision/${xrev:S/x//}.cabal `find ${WRKDIR}/${pkg_name} -name '*.cabal' -depth 1` + ${CP} ${DISTDIR}/${DIST_SUBDIR}/${pkg_name}/revision/${xrev:S/x//}.cabal `find ${WRKDIR}/${pkg_name} -name '*.cabal' -depth 1` . endif # Move the dependency source itself cd ${WRKDIR} && \ - mv ${pkg_name} ${CABAL_DEPSDIR}/ + ${MV} ${pkg_name} ${CABAL_DEPSDIR}/ . endfor . endfor # Create the cabal-install config ${MKDIR} ${CABAL_HOME}/.cabal ${ECHO_CMD} "jobs: ${MAKE_JOBS_NUMBER}" > ${CABAL_HOME}/.cabal/config . endif # SKIP_CABAL_EXTRACT cabal-post-patch: . if !defined(SKIP_CABAL_EXTRACT) @${TEST} ! -f ${CABAL_COOKIE} || \ (${ECHO_CMD} "===> Patching done, skipping cabal-post-patch" && false) # Append our stuff to possibly existing cabal.project.local ${ECHO_CMD} "" >> ${WRKSRC}/cabal.project.local ${ECHO_CMD} "-- added by USES=cabal" >> ${WRKSRC}/cabal.project.local ${ECHO_CMD} "packages:" >> ${WRKSRC}/cabal.project.local . for package in ${_use_cabal} . for pkg_name in ${package:C/_[0-9]+//} ${ECHO_CMD} " ${CABAL_DEPS_SUBDIR}/${pkg_name}" >> ${WRKSRC}/cabal.project.local . endfor . endfor . endif # SKIP_CABAL_EXTRACT && !CABAL_COOKIE cabal-pre-configure: # Generate .cabal file with hpack if requested . if ${cabal_ARGS:Mhpack} cd ${WRKSRC} && ${SETENV} HOME=${CABAL_HOME} hpack . endif . if !target(do-build) do-build: cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} HOME=${CABAL_HOME} ${CABAL_CMD} build --offline --disable-benchmarks --disable-tests ${CABAL_WITH_ARGS} --flags "${CABAL_FLAGS}" ${BUILD_ARGS} ${BUILD_TARGET} . endif . if !target(do-install) do-install: . if defined(CABAL_WRAPPER_SCRIPTS) && !empty(CABAL_WRAPPER_SCRIPTS) ${MKDIR} ${STAGEDIR}${PREFIX}/${CABAL_LIBEXEC} . endif . for exe in ${CABAL_EXECUTABLES} . if defined(CABAL_WRAPPER_SCRIPTS) && ${CABAL_WRAPPER_SCRIPTS:M${exe}} ${INSTALL_PROGRAM} \ $$(find ${WRKSRC}/dist-newstyle -name ${exe} -type f -perm +111) \ ${STAGEDIR}${PREFIX}/${CABAL_LIBEXEC}/${exe} ${ECHO_CMD} '#!/bin/sh' > ${STAGEDIR}${PREFIX}/bin/${exe} ${ECHO_CMD} '' >> ${STAGEDIR}${PREFIX}/bin/${exe} ${ECHO_CMD} 'export ${exe:S/-/_/g}_datadir=${DATADIR}' >> ${STAGEDIR}${PREFIX}/bin/${exe} . for dep in ${${exe}_DATADIR_VARS} ${ECHO_CMD} 'export ${dep:S/-/_/g}_datadir=${DATADIR}' >> ${STAGEDIR}${PREFIX}/bin/${exe} . endfor ${ECHO_CMD} '' >> ${STAGEDIR}${PREFIX}/bin/${exe} ${ECHO_CMD} 'exec ${PREFIX}/${CABAL_LIBEXEC}/${exe} "$$@"' >> ${STAGEDIR}${PREFIX}/bin/${exe} ${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/${exe} . else ${INSTALL_PROGRAM} \ $$(find ${WRKSRC}/dist-newstyle -name ${exe} -type f -perm +111) \ ${STAGEDIR}${PREFIX}/bin/${exe} . endif . endfor . endif . if !defined(SKIP_CABAL_PLIST) cabal-post-install-script: . for exe in ${CABAL_EXECUTABLES} ${ECHO_CMD} 'bin/${exe}' >> ${TMPPLIST} . if defined(CABAL_WRAPPER_SCRIPTS) && ${CABAL_WRAPPER_SCRIPTS:M${exe}} ${ECHO_CMD} '${CABAL_LIBEXEC}/${exe}' >> ${TMPPLIST} . endif . endfor . endif .endif diff --git a/converters/hs-aeson-pretty/Makefile b/converters/hs-aeson-pretty/Makefile index 8b1bb8cab451..465a27a47f71 100644 --- a/converters/hs-aeson-pretty/Makefile +++ b/converters/hs-aeson-pretty/Makefile @@ -1,54 +1,55 @@ PORTNAME= aeson-pretty PORTVERSION= 0.8.9 PORTREVISION= 1 CATEGORIES= converters haskell MAINTAINER= haskell@FreeBSD.org COMMENT= JSON pretty-printing command-line tool WWW= https://github.com/informatikr/aeson-pretty LICENSE= BSD3CLAUSE USES= cabal +CABAL_REVISION= 2 USE_CABAL= OneTuple-0.3.1_3 \ QuickCheck-2.14.2 \ StateVar-1.2.2 \ aeson-2.1.1.0 \ assoc-1.0.2_3 \ attoparsec-0.14.4_2 \ base-compat-0.12.2 \ base-compat-batteries-0.12.2 \ base-orphans-0.8.7 \ bifunctors-5.5.13 \ cmdargs-0.10.21 \ comonad-5.0.8_1 \ contravariant-1.5.5 \ data-fix-0.3.2_3 \ distributive-0.6.2.1_1 \ dlist-1.0 \ generically-0.1 \ hashable-1.4.1.0 \ indexed-traversable-0.1.2_2 \ indexed-traversable-instances-0.1.1.1 \ integer-logarithms-1.0.3.1_3 \ primitive-0.7.4.0 \ random-1.2.1.1 \ scientific-0.3.7.0_3 \ semialign-1.2.0.1_3 \ semigroupoids-5.3.7 \ splitmix-0.1.0.4_1 \ strict-0.4.0.1_4 \ tagged-0.8.6.1_3 \ text-short-0.1.5_1 \ th-abstraction-0.4.5.0 \ these-1.1.1.1_6 \ time-compat-1.9.6.1_4 \ transformers-compat-0.7.2 \ unordered-containers-0.2.19.1_1 \ uuid-types-1.0.5_3 \ vector-0.13.0.0_1 \ vector-stream-0.1.0.0_1 \ witherable-0.4.2_3 .include diff --git a/converters/hs-aeson-pretty/distinfo b/converters/hs-aeson-pretty/distinfo index c25637488155..767fee52f961 100644 --- a/converters/hs-aeson-pretty/distinfo +++ b/converters/hs-aeson-pretty/distinfo @@ -1,123 +1,125 @@ -TIMESTAMP = 1668511709 +TIMESTAMP = 1668587368 SHA256 (cabal/aeson-pretty-0.8.9/aeson-pretty-0.8.9.tar.gz) = 5dbc4f451dfa1e667b2c6ec5170714fed1905dc9cae6a1134b3376f355fa2a08 SIZE (cabal/aeson-pretty-0.8.9/aeson-pretty-0.8.9.tar.gz) = 5802 +SHA256 (cabal/aeson-pretty-0.8.9/revision/2.cabal) = f7b1808efab1b9edd0efbdfc2cd47e7dfe8bbd42ee970d1d3780112a4de125a1 +SIZE (cabal/aeson-pretty-0.8.9/revision/2.cabal) = 2559 SHA256 (cabal/OneTuple-0.3.1/OneTuple-0.3.1.tar.gz) = 98853682d52fb4cc37a45cd186fbd77cf2565d3df5171acc4cf026427e103eef SIZE (cabal/OneTuple-0.3.1/OneTuple-0.3.1.tar.gz) = 5148 SHA256 (cabal/OneTuple-0.3.1/revision/3.cabal) = fc32cb744477befa450a538ea4975cc523f0a2f1585cb5a36e9936a3d18e9a3c SIZE (cabal/OneTuple-0.3.1/revision/3.cabal) = 2276 SHA256 (cabal/QuickCheck-2.14.2/QuickCheck-2.14.2.tar.gz) = d87b6c85696b601175274361fa62217894401e401e150c3c5d4013ac53cd36f3 SIZE (cabal/QuickCheck-2.14.2/QuickCheck-2.14.2.tar.gz) = 75246 SHA256 (cabal/StateVar-1.2.2/StateVar-1.2.2.tar.gz) = 5e4b39da395656a59827b0280508aafdc70335798b50e5d6fd52596026251825 SIZE (cabal/StateVar-1.2.2/StateVar-1.2.2.tar.gz) = 5048 SHA256 (cabal/aeson-2.1.1.0/aeson-2.1.1.0.tar.gz) = a3ae978d67cd8554a6dc11d1e5a4c46280dc90bbc50f3a8787fdd2278524b6ad SIZE (cabal/aeson-2.1.1.0/aeson-2.1.1.0.tar.gz) = 301830 SHA256 (cabal/assoc-1.0.2/assoc-1.0.2.tar.gz) = d8988dc6e8718c7a3456515b769c9336aeeec730cf86fc5175247969ff8f144f SIZE (cabal/assoc-1.0.2/assoc-1.0.2.tar.gz) = 3047 SHA256 (cabal/assoc-1.0.2/revision/3.cabal) = 93b8d43aa081e4205116a139f7cf690f608968161d19ebfb23d884d19b082b57 SIZE (cabal/assoc-1.0.2/revision/3.cabal) = 1253 SHA256 (cabal/attoparsec-0.14.4/attoparsec-0.14.4.tar.gz) = 3f337fe58624565de12426f607c23e60c7b09c86b4e3adfc827ca188c9979e6c SIZE (cabal/attoparsec-0.14.4/attoparsec-0.14.4.tar.gz) = 160701 SHA256 (cabal/attoparsec-0.14.4/revision/2.cabal) = c0569d86c02cadd403017ea414dcb5e4f7de5380de0d8a92b9337cad84cd5e02 SIZE (cabal/attoparsec-0.14.4/revision/2.cabal) = 5811 SHA256 (cabal/base-compat-0.12.2/base-compat-0.12.2.tar.gz) = a62adc883a5ac436f80e4ae02c3c56111cf1007492f267c291139a668d2150bd SIZE (cabal/base-compat-0.12.2/base-compat-0.12.2.tar.gz) = 36393 SHA256 (cabal/base-compat-batteries-0.12.2/base-compat-batteries-0.12.2.tar.gz) = ede9092e07f904e0759160bf1ecd3fb7eb043bae6dc89a37c3dc94829ec5eb99 SIZE (cabal/base-compat-batteries-0.12.2/base-compat-batteries-0.12.2.tar.gz) = 17645 SHA256 (cabal/base-orphans-0.8.7/base-orphans-0.8.7.tar.gz) = 888fd67f0dbe932778f5b170922ce80d0dcab1680ee98f1d6fcc362f20d9e447 SIZE (cabal/base-orphans-0.8.7/base-orphans-0.8.7.tar.gz) = 25083 SHA256 (cabal/bifunctors-5.5.13/bifunctors-5.5.13.tar.gz) = 26cc27ade3796cf03bd680f98ebb7b8c0d7fd1b67c1894dc3635f734fba7dbd7 SIZE (cabal/bifunctors-5.5.13/bifunctors-5.5.13.tar.gz) = 46171 SHA256 (cabal/cmdargs-0.10.21/cmdargs-0.10.21.tar.gz) = f7d8ea5c4e6af368d9b5d2eb994fc29235406fbe91916a6dc63bd883025eca75 SIZE (cabal/cmdargs-0.10.21/cmdargs-0.10.21.tar.gz) = 64892 SHA256 (cabal/comonad-5.0.8/comonad-5.0.8.tar.gz) = ef6cdf2cc292cc43ee6aa96c581b235fdea8ab44a0bffb24dc79ae2b2ef33d13 SIZE (cabal/comonad-5.0.8/comonad-5.0.8.tar.gz) = 15227 SHA256 (cabal/comonad-5.0.8/revision/1.cabal) = 1f1aabd73ec7f80f20cf078a748a60cd48d8e57277802fdf6a9ab3601a9b8f7e SIZE (cabal/comonad-5.0.8/revision/1.cabal) = 3631 SHA256 (cabal/contravariant-1.5.5/contravariant-1.5.5.tar.gz) = 062fd66580d7aad0b5ba93e644ffa7feee69276ef50f20d4ed9f1deb7642dffa SIZE (cabal/contravariant-1.5.5/contravariant-1.5.5.tar.gz) = 13815 SHA256 (cabal/data-fix-0.3.2/data-fix-0.3.2.tar.gz) = 3a172d3bc0639c327345e965f9d9023e099425814b28dcdb7b60ff66d66219cc SIZE (cabal/data-fix-0.3.2/data-fix-0.3.2.tar.gz) = 5842 SHA256 (cabal/data-fix-0.3.2/revision/3.cabal) = bdea17f6b17c1d327f53ae6806e1bc3ca7813b46742a93c6088c72837c8ae77c SIZE (cabal/data-fix-0.3.2/revision/3.cabal) = 1706 SHA256 (cabal/distributive-0.6.2.1/distributive-0.6.2.1.tar.gz) = d7351392e078f58caa46630a4b9c643e1e2e9dddee45848c5c8358e7b1316b91 SIZE (cabal/distributive-0.6.2.1/distributive-0.6.2.1.tar.gz) = 8140 SHA256 (cabal/distributive-0.6.2.1/revision/1.cabal) = 0f99f5541cca04acf89b64432b03422b6408e830a8dff30e6c4334ef1a48680c SIZE (cabal/distributive-0.6.2.1/revision/1.cabal) = 2996 SHA256 (cabal/dlist-1.0/dlist-1.0.tar.gz) = 173d637328bb173fcc365f30d29ff4a94292a1e0e5558aeb3dfc11de81510115 SIZE (cabal/dlist-1.0/dlist-1.0.tar.gz) = 18667 SHA256 (cabal/generically-0.1/generically-0.1.tar.gz) = d5b72880e1d00b24b6c221978d060bea620acc412cdcb62521f3016cbd3f2b71 SIZE (cabal/generically-0.1/generically-0.1.tar.gz) = 2572 SHA256 (cabal/hashable-1.4.1.0/hashable-1.4.1.0.tar.gz) = e1b305c280e66ad827edeaedd6933b9fc4174f626882877eab2a08344e665e87 SIZE (cabal/hashable-1.4.1.0/hashable-1.4.1.0.tar.gz) = 25599 SHA256 (cabal/indexed-traversable-0.1.2/indexed-traversable-0.1.2.tar.gz) = 516858ee7198b1fed1b93c665157f9855fd947379db7f115d48c1b0d670e698d SIZE (cabal/indexed-traversable-0.1.2/indexed-traversable-0.1.2.tar.gz) = 8685 SHA256 (cabal/indexed-traversable-0.1.2/revision/2.cabal) = 52a1b708abd921f91a5977f6ae53c4aa2b33f7c30be0fff17173f658b34c5350 SIZE (cabal/indexed-traversable-0.1.2/revision/2.cabal) = 2533 SHA256 (cabal/indexed-traversable-instances-0.1.1.1/indexed-traversable-instances-0.1.1.1.tar.gz) = 895ee5063d59e2b58930ca6fa54885bb11f19c8b7c7ba6c7b014f9431cdcc0b0 SIZE (cabal/indexed-traversable-instances-0.1.1.1/indexed-traversable-instances-0.1.1.1.tar.gz) = 3751 SHA256 (cabal/integer-logarithms-1.0.3.1/integer-logarithms-1.0.3.1.tar.gz) = 9b0a9f9fab609b15cd015865721fb05f744a1bc77ae92fd133872de528bbea7f SIZE (cabal/integer-logarithms-1.0.3.1/integer-logarithms-1.0.3.1.tar.gz) = 9023 SHA256 (cabal/integer-logarithms-1.0.3.1/revision/3.cabal) = d59bfd1d39808217af2b68789d3c0e57cb7199d47405a276060d88fef4f4017d SIZE (cabal/integer-logarithms-1.0.3.1/revision/3.cabal) = 3246 SHA256 (cabal/primitive-0.7.4.0/primitive-0.7.4.0.tar.gz) = 5b2d6dc2812eb2f6a115f05fcbe3e723d3aeff7894b012c617e075130581add5 SIZE (cabal/primitive-0.7.4.0/primitive-0.7.4.0.tar.gz) = 56575 SHA256 (cabal/random-1.2.1.1/random-1.2.1.1.tar.gz) = 3e1272f7ed6a4d7bd1712b90143ec326fee9b225789222379fea20a9c90c9b76 SIZE (cabal/random-1.2.1.1/random-1.2.1.1.tar.gz) = 47109 SHA256 (cabal/scientific-0.3.7.0/scientific-0.3.7.0.tar.gz) = a3a121c4b3d68fb8b9f8c709ab012e48f090ed553609247a805ad070d6b343a9 SIZE (cabal/scientific-0.3.7.0/scientific-0.3.7.0.tar.gz) = 24723 SHA256 (cabal/scientific-0.3.7.0/revision/3.cabal) = 517444c944dad9db8235d7b311d7b9a0839a519ee3178288b5a9606256e0c7d8 SIZE (cabal/scientific-0.3.7.0/revision/3.cabal) = 4840 SHA256 (cabal/semialign-1.2.0.1/semialign-1.2.0.1.tar.gz) = d900697041ae4b0cca3243273a2b3e80bcf74d937405d6a5ff34dc33ee952132 SIZE (cabal/semialign-1.2.0.1/semialign-1.2.0.1.tar.gz) = 10371 SHA256 (cabal/semialign-1.2.0.1/revision/3.cabal) = ee3468e349e72ec0a604ae05573a4de7181d97d10366254244a0cca8a76d6c35 SIZE (cabal/semialign-1.2.0.1/revision/3.cabal) = 2852 SHA256 (cabal/semigroupoids-5.3.7/semigroupoids-5.3.7.tar.gz) = 6d45cdb6c58c75ca588859b80b2c92b6f48590a03e065c24ce5d767a6a963799 SIZE (cabal/semigroupoids-5.3.7/semigroupoids-5.3.7.tar.gz) = 35349 SHA256 (cabal/splitmix-0.1.0.4/splitmix-0.1.0.4.tar.gz) = 6d065402394e7a9117093dbb4530a21342c9b1e2ec509516c8a8d0ffed98ecaa SIZE (cabal/splitmix-0.1.0.4/splitmix-0.1.0.4.tar.gz) = 22382 SHA256 (cabal/splitmix-0.1.0.4/revision/1.cabal) = 804e2574bc7e32d08cbab91e47ee6287b4df7d50851d73f9e778f94a9a7814c7 SIZE (cabal/splitmix-0.1.0.4/revision/1.cabal) = 6521 SHA256 (cabal/strict-0.4.0.1/strict-0.4.0.1.tar.gz) = dff6abc08ad637e51891bb8b475778c40926c51219eda60fd64f0d9680226241 SIZE (cabal/strict-0.4.0.1/strict-0.4.0.1.tar.gz) = 12488 SHA256 (cabal/strict-0.4.0.1/revision/4.cabal) = d6205a748eb8db4cd17a7179be970c94598809709294ccfa43159c7f3cc4bf5d SIZE (cabal/strict-0.4.0.1/revision/4.cabal) = 4187 SHA256 (cabal/tagged-0.8.6.1/tagged-0.8.6.1.tar.gz) = f5e0fcf95f0bb4aa63f428f2c01955a41ea1a42cfcf39145ed631f59a9616c02 SIZE (cabal/tagged-0.8.6.1/tagged-0.8.6.1.tar.gz) = 9842 SHA256 (cabal/tagged-0.8.6.1/revision/3.cabal) = 8a24aef29b8e35447ccc56658ea07c2aded30bfa8130ea057e382936e17c74a6 SIZE (cabal/tagged-0.8.6.1/revision/3.cabal) = 2874 SHA256 (cabal/text-short-0.1.5/text-short-0.1.5.tar.gz) = a35ec6cde2ada084c1a050dc5885be5ab01f851b93d744cf0facbc1c18002dda SIZE (cabal/text-short-0.1.5/text-short-0.1.5.tar.gz) = 25113 SHA256 (cabal/text-short-0.1.5/revision/1.cabal) = ebb77383743e214138cf9387875bc7d2665c5584b2e489fe1461240f19e7b53e SIZE (cabal/text-short-0.1.5/revision/1.cabal) = 3161 SHA256 (cabal/th-abstraction-0.4.5.0/th-abstraction-0.4.5.0.tar.gz) = 00d5e24f247e328bd9898d5af5915c1e86b134b4d40baa680258635f95031526 SIZE (cabal/th-abstraction-0.4.5.0/th-abstraction-0.4.5.0.tar.gz) = 39515 SHA256 (cabal/these-1.1.1.1/these-1.1.1.1.tar.gz) = d798c9f56e17def441e8f51e54cc11afdb3e76c6a9d1e9ee154e9a78da0bf508 SIZE (cabal/these-1.1.1.1/these-1.1.1.1.tar.gz) = 9804 SHA256 (cabal/these-1.1.1.1/revision/6.cabal) = 2991c13e264b0c35c696c8f5f85c428c53bc42e93b1dfbd19a582052112d948a SIZE (cabal/these-1.1.1.1/revision/6.cabal) = 2748 SHA256 (cabal/time-compat-1.9.6.1/time-compat-1.9.6.1.tar.gz) = ad07bb00eb9678c2136d3680752b00acc4cbc522654bb3199bf31c61ef1e6b80 SIZE (cabal/time-compat-1.9.6.1/time-compat-1.9.6.1.tar.gz) = 59964 SHA256 (cabal/time-compat-1.9.6.1/revision/4.cabal) = 5cf5fa19d32742816fa1423085cbfd626aef433101c0b97bf0e8f720a6f369d8 SIZE (cabal/time-compat-1.9.6.1/revision/4.cabal) = 5047 SHA256 (cabal/transformers-compat-0.7.2/transformers-compat-0.7.2.tar.gz) = b62c7304c9f3cbc9463d0739aa85cb9489f217ea092b9d625d417514fbcc9d6a SIZE (cabal/transformers-compat-0.7.2/transformers-compat-0.7.2.tar.gz) = 46485 SHA256 (cabal/unordered-containers-0.2.19.1/unordered-containers-0.2.19.1.tar.gz) = 1b27bec5e0d522b27a6029ebf4c4a6d40acbc083c787008e32fb55c4b1d128d2 SIZE (cabal/unordered-containers-0.2.19.1/unordered-containers-0.2.19.1.tar.gz) = 58030 SHA256 (cabal/unordered-containers-0.2.19.1/revision/1.cabal) = db11042bb0356c0adea277d0794743829125b4c99455af6af2bd5f7bd5e88a39 SIZE (cabal/unordered-containers-0.2.19.1/revision/1.cabal) = 3797 SHA256 (cabal/uuid-types-1.0.5/uuid-types-1.0.5.tar.gz) = ad68b89b7a64c07dd5c250a11be2033ee929318ff51ec7b4e4b54e1b4deba7dd SIZE (cabal/uuid-types-1.0.5/uuid-types-1.0.5.tar.gz) = 11922 SHA256 (cabal/uuid-types-1.0.5/revision/3.cabal) = 9ca76986e3950af5e908502be2373e2292d6dc57ec10f5aeb41d7dc3a1961782 SIZE (cabal/uuid-types-1.0.5/revision/3.cabal) = 2622 SHA256 (cabal/vector-0.13.0.0/vector-0.13.0.0.tar.gz) = c5d3167d15e12f52e00879ddf304a591672a74e369cc47bc5c7fa1d5a8d15b4f SIZE (cabal/vector-0.13.0.0/vector-0.13.0.0.tar.gz) = 154509 SHA256 (cabal/vector-0.13.0.0/revision/1.cabal) = 54528e95501742b99462cc543891f21177e7db34d960ce8e3cbb25afb16a9c89 SIZE (cabal/vector-0.13.0.0/revision/1.cabal) = 9112 SHA256 (cabal/vector-stream-0.1.0.0/vector-stream-0.1.0.0.tar.gz) = a888210f6467f155090653734be5cc920406a07227e0d3adb59096716fdb806c SIZE (cabal/vector-stream-0.1.0.0/vector-stream-0.1.0.0.tar.gz) = 12377 SHA256 (cabal/vector-stream-0.1.0.0/revision/1.cabal) = 09b0f8dc4e51936b9d6b04791f0aa03f7c9759b5fb7140eac8a9461cda1e55a3 SIZE (cabal/vector-stream-0.1.0.0/revision/1.cabal) = 1404 SHA256 (cabal/witherable-0.4.2/witherable-0.4.2.tar.gz) = 790d2bb274283419173bd89104439860675a9410f70f21912973ecd9098b4104 SIZE (cabal/witherable-0.4.2/witherable-0.4.2.tar.gz) = 11876 SHA256 (cabal/witherable-0.4.2/revision/3.cabal) = cccb36175e088abb4291ee5044b8c04d71acd5c36636902d2520f91508dd4bb8 SIZE (cabal/witherable-0.4.2/revision/3.cabal) = 2294 diff --git a/converters/hs-aeson-pretty/files/patch-aeson-pretty.cabal b/converters/hs-aeson-pretty/files/patch-aeson-pretty.cabal deleted file mode 100644 index d018ee11b2e0..000000000000 --- a/converters/hs-aeson-pretty/files/patch-aeson-pretty.cabal +++ /dev/null @@ -1,27 +0,0 @@ ---- aeson-pretty.cabal.orig 2001-09-09 01:46:40 UTC -+++ aeson-pretty.cabal -@@ -1,6 +1,7 @@ version: 0.8.9 - cabal-version: 2.0 - name: aeson-pretty - version: 0.8.9 -+x-revision: 2 - license: BSD3 - license-file: LICENSE - category: Text, Web, JSON, Pretty Printer -@@ -41,14 +42,14 @@ library - Data.Aeson.Encode.Pretty - - build-depends: -- aeson ^>= 1.0 || ^>=1.1 || ^>=1.2 || ^>=1.3 || ^>=1.4 || ^>=1.5 || ^>=2.0, -+ aeson ^>= 1.0 || ^>=1.1 || ^>=1.2 || ^>=1.3 || ^>=1.4 || ^>=1.5 || ^>=2.0 || ^>=2.1, - base >= 4.5, - base-compat >= 0.9, - bytestring >= 0.9, - scientific >= 0.3, - vector >= 0.9, - text >= 0.11, -- unordered-containers >= 0.1.3.0 -+ unordered-containers >= 0.2.14.0 - - if !impl(ghc >= 8.0) - build-depends: diff --git a/devel/hs-cpphs/Makefile b/devel/hs-cpphs/Makefile index 7a6e08146066..9f65f515fca1 100644 --- a/devel/hs-cpphs/Makefile +++ b/devel/hs-cpphs/Makefile @@ -1,16 +1,17 @@ PORTNAME= cpphs PORTVERSION= 1.20.9.1 PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org COMMENT= Liberalised re-implementation of cpp, the C pre-processor WWW= https://projects.haskell.org/cpphs/ LICENSE= LGPL21 USES= cabal +CABAL_REVISION= 1 USE_CABAL= polyparse-1.13_5 .include diff --git a/devel/hs-cpphs/distinfo b/devel/hs-cpphs/distinfo index 456fcdce1b71..7c2a33e14962 100644 --- a/devel/hs-cpphs/distinfo +++ b/devel/hs-cpphs/distinfo @@ -1,7 +1,9 @@ -TIMESTAMP = 1668511758 +TIMESTAMP = 1668595648 SHA256 (cabal/cpphs-1.20.9.1/cpphs-1.20.9.1.tar.gz) = 7f59b10bc3374004cee3c04fa4ee4a1b90d0dca84a3d0e436d5861a1aa3b919f SIZE (cabal/cpphs-1.20.9.1/cpphs-1.20.9.1.tar.gz) = 45496 +SHA256 (cabal/cpphs-1.20.9.1/revision/1.cabal) = 0ad26fef4e6be4cb13e1df93aab7bdbe9c3d3bc6c63b84d9e29cc0f691fe12b9 +SIZE (cabal/cpphs-1.20.9.1/revision/1.cabal) = 3331 SHA256 (cabal/polyparse-1.13/polyparse-1.13.tar.gz) = 1c4c72980e1e5a4f07fea65ca08b2399581d2a6aa21eb1078f7ad286c279707b SIZE (cabal/polyparse-1.13/polyparse-1.13.tar.gz) = 33144 SHA256 (cabal/polyparse-1.13/revision/5.cabal) = aca2fc54c5c90eaa85e59368ae3533cdc8a4bb85bb9d3e6de885f8e66eb11917 SIZE (cabal/polyparse-1.13/revision/5.cabal) = 2785 diff --git a/devel/hs-cpphs/files/patch-cpphs.cabal b/devel/hs-cpphs/files/patch-cpphs.cabal deleted file mode 100644 index c73f98026239..000000000000 --- a/devel/hs-cpphs/files/patch-cpphs.cabal +++ /dev/null @@ -1,20 +0,0 @@ ---- cpphs.cabal.orig 2001-09-09 01:46:40 UTC -+++ cpphs.cabal -@@ -52,7 +52,7 @@ Library - Hs-Source-Dirs: . old - - else -- Build-Depends: time >=1.5 && <1.11 -+ Build-Depends: time >=1.5 - Hs-Source-Dirs: . new - - Exposed-Modules: -@@ -81,7 +81,7 @@ Executable cpphs - Hs-Source-Dirs: . old - - else -- Build-Depends: time >=1.5 && <1.11 -+ Build-Depends: time >=1.5 - Hs-Source-Dirs: . new - - Other-Modules: diff --git a/devel/hs-hasktags/Makefile b/devel/hs-hasktags/Makefile index b75b4458b957..d541b72e93f1 100644 --- a/devel/hs-hasktags/Makefile +++ b/devel/hs-hasktags/Makefile @@ -1,34 +1,35 @@ PORTNAME= hasktags PORTVERSION= 0.72.0 PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org COMMENT= Produces ctags "tags" and etags "TAGS" files for Haskell programs WWW= https://github.com/MarcWeber/hasktags LICENSE= BSD3CLAUSE USES= cabal +CABAL_REVISION= 2 USE_CABAL= ansi-terminal-0.11.3 \ ansi-wl-pprint-0.6.9_3 \ colour-2.3.6 \ hashable-1.4.1.0 \ json-0.10_1 \ microlens-0.4.13.0 \ microlens-ghc-0.4.14.0 \ microlens-mtl-0.2.0.2 \ microlens-platform-0.4.3.2 \ microlens-th-0.4.3.10_1 \ optparse-applicative-0.17.0.0 \ primitive-0.7.4.0 \ syb-0.7.2.2 \ th-abstraction-0.4.5.0 \ transformers-compat-0.7.2 \ unordered-containers-0.2.19.1_1 \ utf8-string-1.0.2 \ vector-0.13.0.0_1 \ vector-stream-0.1.0.0_1 .include diff --git a/devel/hs-hasktags/distinfo b/devel/hs-hasktags/distinfo index 2a45860883e2..e3e52afa6c3f 100644 --- a/devel/hs-hasktags/distinfo +++ b/devel/hs-hasktags/distinfo @@ -1,53 +1,55 @@ -TIMESTAMP = 1668511776 +TIMESTAMP = 1668595900 SHA256 (cabal/hasktags-0.72.0/hasktags-0.72.0.tar.gz) = adadb5800ab2996f0198a6fc6af959dee6d69339c204cc9789f83e67024fe726 SIZE (cabal/hasktags-0.72.0/hasktags-0.72.0.tar.gz) = 59000 +SHA256 (cabal/hasktags-0.72.0/revision/2.cabal) = 1d3cb246cf1b374bcbf5dfab2dd0f99c9c0898412281583ef89fe9bdc6347b38 +SIZE (cabal/hasktags-0.72.0/revision/2.cabal) = 2866 SHA256 (cabal/ansi-terminal-0.11.3/ansi-terminal-0.11.3.tar.gz) = f4d563ecf71fb1d304bcdcad478d97efd9f61f6d9d4797a5d56e7722a92a9e6b SIZE (cabal/ansi-terminal-0.11.3/ansi-terminal-0.11.3.tar.gz) = 37868 SHA256 (cabal/ansi-wl-pprint-0.6.9/ansi-wl-pprint-0.6.9.tar.gz) = a7b2e8e7cd3f02f2954e8b17dc60a0ccd889f49e2068ebb15abfa1d42f7a4eac SIZE (cabal/ansi-wl-pprint-0.6.9/ansi-wl-pprint-0.6.9.tar.gz) = 16723 SHA256 (cabal/ansi-wl-pprint-0.6.9/revision/3.cabal) = 212144ea0623b1170807a4162db05d87f26cf10b334aeadd0edb377aba06a1ce SIZE (cabal/ansi-wl-pprint-0.6.9/revision/3.cabal) = 2425 SHA256 (cabal/colour-2.3.6/colour-2.3.6.tar.gz) = 2cd35dcd6944a5abc9f108a5eb5ee564b6b1fa98a9ec79cefcc20b588991f871 SIZE (cabal/colour-2.3.6/colour-2.3.6.tar.gz) = 20675 SHA256 (cabal/hashable-1.4.1.0/hashable-1.4.1.0.tar.gz) = e1b305c280e66ad827edeaedd6933b9fc4174f626882877eab2a08344e665e87 SIZE (cabal/hashable-1.4.1.0/hashable-1.4.1.0.tar.gz) = 25599 SHA256 (cabal/json-0.10/json-0.10.tar.gz) = 0c046a3c03c9332816d3c9e50319b1d1eb3c2c1baba1123a7650d047b26856ba SIZE (cabal/json-0.10/json-0.10.tar.gz) = 22622 SHA256 (cabal/json-0.10/revision/1.cabal) = d9fc6b07ce92b8894825a17d2cf14799856767eb30c8bf55962baa579207d799 SIZE (cabal/json-0.10/revision/1.cabal) = 3210 SHA256 (cabal/microlens-0.4.13.0/microlens-0.4.13.0.tar.gz) = fc21d0f0ea30a3c73c681c2a2f5093dbebea8f3075243dcf2b8d234aacb210a3 SIZE (cabal/microlens-0.4.13.0/microlens-0.4.13.0.tar.gz) = 27372 SHA256 (cabal/microlens-ghc-0.4.14.0/microlens-ghc-0.4.14.0.tar.gz) = 618fc86da128ac23e27d384e8d889486c13b9922884a6633a03199369f1592c7 SIZE (cabal/microlens-ghc-0.4.14.0/microlens-ghc-0.4.14.0.tar.gz) = 6666 SHA256 (cabal/microlens-mtl-0.2.0.2/microlens-mtl-0.2.0.2.tar.gz) = 66971668f376717fdbe75e3b8ac99d2efd89c746b41355f6d388a63352a43278 SIZE (cabal/microlens-mtl-0.2.0.2/microlens-mtl-0.2.0.2.tar.gz) = 9056 SHA256 (cabal/microlens-platform-0.4.3.2/microlens-platform-0.4.3.2.tar.gz) = 52075123128d894ab43e89aef94d079c2465c07035e40738052553202fe5d38a SIZE (cabal/microlens-platform-0.4.3.2/microlens-platform-0.4.3.2.tar.gz) = 5012 SHA256 (cabal/microlens-th-0.4.3.10/microlens-th-0.4.3.10.tar.gz) = 2c50100235949c00defcdb8c01d8eb5e2e45e524a9b552d3c0c8bb8224ece2b5 SIZE (cabal/microlens-th-0.4.3.10/microlens-th-0.4.3.10.tar.gz) = 24189 SHA256 (cabal/microlens-th-0.4.3.10/revision/1.cabal) = a2126f80b68c56c2fb7561caebbe17e0a1193fafa6e1624cab9814c4b69e5c90 SIZE (cabal/microlens-th-0.4.3.10/revision/1.cabal) = 2357 SHA256 (cabal/optparse-applicative-0.17.0.0/optparse-applicative-0.17.0.0.tar.gz) = 825b2e4d3dafe0ba64a073366a88062b3712b81f851793d9ce2327bee70af724 SIZE (cabal/optparse-applicative-0.17.0.0/optparse-applicative-0.17.0.0.tar.gz) = 59409 SHA256 (cabal/primitive-0.7.4.0/primitive-0.7.4.0.tar.gz) = 5b2d6dc2812eb2f6a115f05fcbe3e723d3aeff7894b012c617e075130581add5 SIZE (cabal/primitive-0.7.4.0/primitive-0.7.4.0.tar.gz) = 56575 SHA256 (cabal/syb-0.7.2.2/syb-0.7.2.2.tar.gz) = 8143c6983b6248d57f00e47ec3cd16541acbaa55eb8093fedd5b7cee9a95b2e3 SIZE (cabal/syb-0.7.2.2/syb-0.7.2.2.tar.gz) = 40058 SHA256 (cabal/th-abstraction-0.4.5.0/th-abstraction-0.4.5.0.tar.gz) = 00d5e24f247e328bd9898d5af5915c1e86b134b4d40baa680258635f95031526 SIZE (cabal/th-abstraction-0.4.5.0/th-abstraction-0.4.5.0.tar.gz) = 39515 SHA256 (cabal/transformers-compat-0.7.2/transformers-compat-0.7.2.tar.gz) = b62c7304c9f3cbc9463d0739aa85cb9489f217ea092b9d625d417514fbcc9d6a SIZE (cabal/transformers-compat-0.7.2/transformers-compat-0.7.2.tar.gz) = 46485 SHA256 (cabal/unordered-containers-0.2.19.1/unordered-containers-0.2.19.1.tar.gz) = 1b27bec5e0d522b27a6029ebf4c4a6d40acbc083c787008e32fb55c4b1d128d2 SIZE (cabal/unordered-containers-0.2.19.1/unordered-containers-0.2.19.1.tar.gz) = 58030 SHA256 (cabal/unordered-containers-0.2.19.1/revision/1.cabal) = db11042bb0356c0adea277d0794743829125b4c99455af6af2bd5f7bd5e88a39 SIZE (cabal/unordered-containers-0.2.19.1/revision/1.cabal) = 3797 SHA256 (cabal/utf8-string-1.0.2/utf8-string-1.0.2.tar.gz) = ee48deada7600370728c4156cb002441de770d0121ae33a68139a9ed9c19b09a SIZE (cabal/utf8-string-1.0.2/utf8-string-1.0.2.tar.gz) = 10726 SHA256 (cabal/vector-0.13.0.0/vector-0.13.0.0.tar.gz) = c5d3167d15e12f52e00879ddf304a591672a74e369cc47bc5c7fa1d5a8d15b4f SIZE (cabal/vector-0.13.0.0/vector-0.13.0.0.tar.gz) = 154509 SHA256 (cabal/vector-0.13.0.0/revision/1.cabal) = 54528e95501742b99462cc543891f21177e7db34d960ce8e3cbb25afb16a9c89 SIZE (cabal/vector-0.13.0.0/revision/1.cabal) = 9112 SHA256 (cabal/vector-stream-0.1.0.0/vector-stream-0.1.0.0.tar.gz) = a888210f6467f155090653734be5cc920406a07227e0d3adb59096716fdb806c SIZE (cabal/vector-stream-0.1.0.0/vector-stream-0.1.0.0.tar.gz) = 12377 SHA256 (cabal/vector-stream-0.1.0.0/revision/1.cabal) = 09b0f8dc4e51936b9d6b04791f0aa03f7c9759b5fb7140eac8a9461cda1e55a3 SIZE (cabal/vector-stream-0.1.0.0/revision/1.cabal) = 1404 diff --git a/devel/hs-hasktags/files/patch-hasktags.cabal b/devel/hs-hasktags/files/patch-hasktags.cabal deleted file mode 100644 index dcf7a7c235bf..000000000000 --- a/devel/hs-hasktags/files/patch-hasktags.cabal +++ /dev/null @@ -1,216 +0,0 @@ ---- hasktags.cabal.orig 2001-09-09 01:46:40 UTC -+++ hasktags.cabal -@@ -1,106 +1,107 @@ --Name: hasktags --Version: 0.72.0 --Copyright: The University Court of the University of Glasgow --License: BSD3 --License-File: LICENSE --Author: The GHC Team --Maintainer: -- Jack Henahan , -- Marc Weber , -- Marco Túlio Pimenta Gontijo --homepage: http://github.com/MarcWeber/hasktags --bug-reports: http://github.com/MarcWeber/hasktags/issues --Synopsis: Produces ctags "tags" and etags "TAGS" files for Haskell programs --Description: -- Produces ctags "tags" and etags "TAGS" files for Haskell programs. --Category: Development --build-type: Simple --cabal-version: >=1.10 --extra-source-files: -- README.md, -- TODO, -- testcases/HUnitBase.lhs -- testcases/Repair.lhs -- testcases/blockcomment.hs -- testcases/constructor.hs -- testcases/module.hs -- testcases/space.hs -- testcases/substring.hs -- testcases/tabs.hs -- testcases/testcase1.hs -- testcases/testcase2.hs -- testcases/testcase3.lhs -- testcases/testcase4.hs -- testcases/testcase8.hs -- testcases/twoblockcommentshs.hs -- testcases/twoblockcommentslhs.lhs -- testcases/twoblockcommentstogether.hs -- testcases/typesig.hs -- testcases/expected_failures_testing_suite.hs -- testcases/testcase9.hs -- testcases/testcase10.hs -- testcases/testcase11.hs -- testcases/simple.hs -- testcases/monad-base-control.hs -- testcases/16-regression.hs -- testcases/9.hs -- testcases/9-too.hs -- --Flag debug -- Default: False -- Description: When set to true tokens will be print at various places. This helps understanding why hasktags does not behave the way it should -- --source-repository head -- type: git -- location: http://github.com/MarcWeber/hasktags -- --library -- default-language: Haskell2010 -- hs-source-dirs: src -- ghc-options: -Wall -- exposed-modules: Hasktags -- other-modules: Tags, DebugShow -- build-depends: -- utf8-string, -- base >= 4 && < 5, -- bytestring >= 0.9 && < 0.11, -- directory >= 1.2.6 && < 1.4, -- filepath, -- json >= 0.5 && < 0.11, -- microlens-platform >= 0.3.8.0 && < 0.5 -- --Executable hasktags -- Main-Is: src/Main.hs -- Build-Depends: -- base, -- directory, -- filepath, -- hasktags, -- optparse-applicative, -- containers -- other-modules: Paths_hasktags -- ghc-options: -Wall -- default-language: Haskell2010 -- -- if flag(debug) -- cpp-options: -Ddebug -- --Test-Suite testsuite -- Type: exitcode-stdio-1.0 -- Main-Is: Test.hs -- hs-source-dirs: src, tests -- Build-Depends: -- utf8-string, -- base, -- bytestring, -- directory, -- filepath, -- json, -- HUnit, -- microlens-platform -- other-modules: Tags, Hasktags, DebugShow -- ghc-options: -Wall -- default-language: Haskell2010 -- -- if flag(debug) -- cpp-options: -Ddebug -+Name: hasktags -+Version: 0.72.0 -+x-revision: 2 -+Copyright: The University Court of the University of Glasgow -+License: BSD3 -+License-File: LICENSE -+Author: The GHC Team -+Maintainer: -+ Jack Henahan , -+ Marc Weber , -+ Marco Túlio Pimenta Gontijo -+homepage: http://github.com/MarcWeber/hasktags -+bug-reports: http://github.com/MarcWeber/hasktags/issues -+Synopsis: Produces ctags "tags" and etags "TAGS" files for Haskell programs -+Description: -+ Produces ctags "tags" and etags "TAGS" files for Haskell programs. -+Category: Development -+build-type: Simple -+cabal-version: >=1.10 -+extra-source-files: -+ README.md, -+ TODO, -+ testcases/HUnitBase.lhs -+ testcases/Repair.lhs -+ testcases/blockcomment.hs -+ testcases/constructor.hs -+ testcases/module.hs -+ testcases/space.hs -+ testcases/substring.hs -+ testcases/tabs.hs -+ testcases/testcase1.hs -+ testcases/testcase2.hs -+ testcases/testcase3.lhs -+ testcases/testcase4.hs -+ testcases/testcase8.hs -+ testcases/twoblockcommentshs.hs -+ testcases/twoblockcommentslhs.lhs -+ testcases/twoblockcommentstogether.hs -+ testcases/typesig.hs -+ testcases/expected_failures_testing_suite.hs -+ testcases/testcase9.hs -+ testcases/testcase10.hs -+ testcases/testcase11.hs -+ testcases/simple.hs -+ testcases/monad-base-control.hs -+ testcases/16-regression.hs -+ testcases/9.hs -+ testcases/9-too.hs -+ -+Flag debug -+ Default: False -+ Description: When set to true tokens will be print at various places. This helps understanding why hasktags does not behave the way it should -+ -+source-repository head -+ type: git -+ location: http://github.com/MarcWeber/hasktags -+ -+library -+ default-language: Haskell2010 -+ hs-source-dirs: src -+ ghc-options: -Wall -+ exposed-modules: Hasktags -+ other-modules: Tags, DebugShow -+ build-depends: -+ utf8-string, -+ base >= 4.8 && < 5, -+ bytestring >= 0.9 && < 0.12, -+ directory >= 1.2.6 && < 1.4, -+ filepath, -+ json >= 0.5 && < 0.11, -+ microlens-platform >= 0.3.8.0 && < 0.5 -+ -+Executable hasktags -+ Main-Is: src/Main.hs -+ Build-Depends: -+ base, -+ directory, -+ filepath, -+ hasktags, -+ optparse-applicative, -+ containers -+ other-modules: Paths_hasktags -+ ghc-options: -Wall -+ default-language: Haskell2010 -+ -+ if flag(debug) -+ cpp-options: -Ddebug -+ -+Test-Suite testsuite -+ Type: exitcode-stdio-1.0 -+ Main-Is: Test.hs -+ hs-source-dirs: src, tests -+ Build-Depends: -+ utf8-string, -+ base, -+ bytestring, -+ directory, -+ filepath, -+ json, -+ HUnit, -+ microlens-platform -+ other-modules: Tags, Hasktags, DebugShow -+ ghc-options: -Wall -+ default-language: Haskell2010 -+ -+ if flag(debug) -+ cpp-options: -Ddebug diff --git a/www/hs-hjsmin/Makefile b/www/hs-hjsmin/Makefile index 72ca9f2c7ea2..980aaafd6946 100644 --- a/www/hs-hjsmin/Makefile +++ b/www/hs-hjsmin/Makefile @@ -1,27 +1,28 @@ PORTNAME= hjsmin PORTVERSION= 0.2.0.4 PORTREVISION= 4 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org COMMENT= Haskell implementation of a javascript minifier WWW= https://github.com/erikd/hjsmin LICENSE= BSD3CLAUSE USES= cabal USE_LOCALE= en_US.UTF-8 +CABAL_REVISION= 2 USE_CABAL= alex-3.2.7.1 \ ansi-terminal-0.11.3 \ ansi-wl-pprint-0.6.9_3 \ blaze-builder-0.4.2.2_1 \ colour-2.3.6 \ happy-1.20.0_1 \ language-javascript-0.7.1.0 \ optparse-applicative-0.17.0.0 \ transformers-compat-0.7.2 \ utf8-string-1.0.2 .include diff --git a/www/hs-hjsmin/distinfo b/www/hs-hjsmin/distinfo index 1cf398d1a8bb..2c9c804d166e 100644 --- a/www/hs-hjsmin/distinfo +++ b/www/hs-hjsmin/distinfo @@ -1,29 +1,31 @@ -TIMESTAMP = 1668511823 +TIMESTAMP = 1668598670 SHA256 (cabal/hjsmin-0.2.0.4/hjsmin-0.2.0.4.tar.gz) = 81b9947714d8d2b73d0aba9e2e02af7e30c13b2cf8144df8904564d9642e57e4 SIZE (cabal/hjsmin-0.2.0.4/hjsmin-0.2.0.4.tar.gz) = 5233 +SHA256 (cabal/hjsmin-0.2.0.4/revision/2.cabal) = 4e81260f019081f1bdd7e4e285b35f2f09eea83ff9cd721aaa4e0ba979228fa0 +SIZE (cabal/hjsmin-0.2.0.4/revision/2.cabal) = 2237 SHA256 (cabal/alex-3.2.7.1/alex-3.2.7.1.tar.gz) = 9bd2f1a27e8f1b2ffdb5b2fbd3ed82b6f0e85191459a1b24ffcbef4e68a81bec SIZE (cabal/alex-3.2.7.1/alex-3.2.7.1.tar.gz) = 108229 SHA256 (cabal/ansi-terminal-0.11.3/ansi-terminal-0.11.3.tar.gz) = f4d563ecf71fb1d304bcdcad478d97efd9f61f6d9d4797a5d56e7722a92a9e6b SIZE (cabal/ansi-terminal-0.11.3/ansi-terminal-0.11.3.tar.gz) = 37868 SHA256 (cabal/ansi-wl-pprint-0.6.9/ansi-wl-pprint-0.6.9.tar.gz) = a7b2e8e7cd3f02f2954e8b17dc60a0ccd889f49e2068ebb15abfa1d42f7a4eac SIZE (cabal/ansi-wl-pprint-0.6.9/ansi-wl-pprint-0.6.9.tar.gz) = 16723 SHA256 (cabal/ansi-wl-pprint-0.6.9/revision/3.cabal) = 212144ea0623b1170807a4162db05d87f26cf10b334aeadd0edb377aba06a1ce SIZE (cabal/ansi-wl-pprint-0.6.9/revision/3.cabal) = 2425 SHA256 (cabal/blaze-builder-0.4.2.2/blaze-builder-0.4.2.2.tar.gz) = 2cdc998c021d3a5f2a66a95138b93386271c26a117e7676d78264a90e536af67 SIZE (cabal/blaze-builder-0.4.2.2/blaze-builder-0.4.2.2.tar.gz) = 60707 SHA256 (cabal/blaze-builder-0.4.2.2/revision/1.cabal) = f0017df374c330de0ebe0eb15eae8c48427bddefa1d81a3cb31c0a4812ecdb08 SIZE (cabal/blaze-builder-0.4.2.2/revision/1.cabal) = 3685 SHA256 (cabal/colour-2.3.6/colour-2.3.6.tar.gz) = 2cd35dcd6944a5abc9f108a5eb5ee564b6b1fa98a9ec79cefcc20b588991f871 SIZE (cabal/colour-2.3.6/colour-2.3.6.tar.gz) = 20675 SHA256 (cabal/happy-1.20.0/happy-1.20.0.tar.gz) = 3b1d3a8f93a2723b554d9f07b2cd136be1a7b2fcab1855b12b7aab5cbac8868c SIZE (cabal/happy-1.20.0/happy-1.20.0.tar.gz) = 184515 SHA256 (cabal/happy-1.20.0/revision/1.cabal) = 5d47dc221a9fe964e36aaaa2e1ab7e8f085a225fd6528d6eff310b92360bbe99 SIZE (cabal/happy-1.20.0/revision/1.cabal) = 5732 SHA256 (cabal/language-javascript-0.7.1.0/language-javascript-0.7.1.0.tar.gz) = d1a036aa4c747fa7a347e78dc6d3609a3d51dc28580ff6b897a27646ca7ad168 SIZE (cabal/language-javascript-0.7.1.0/language-javascript-0.7.1.0.tar.gz) = 76438 SHA256 (cabal/optparse-applicative-0.17.0.0/optparse-applicative-0.17.0.0.tar.gz) = 825b2e4d3dafe0ba64a073366a88062b3712b81f851793d9ce2327bee70af724 SIZE (cabal/optparse-applicative-0.17.0.0/optparse-applicative-0.17.0.0.tar.gz) = 59409 SHA256 (cabal/transformers-compat-0.7.2/transformers-compat-0.7.2.tar.gz) = b62c7304c9f3cbc9463d0739aa85cb9489f217ea092b9d625d417514fbcc9d6a SIZE (cabal/transformers-compat-0.7.2/transformers-compat-0.7.2.tar.gz) = 46485 SHA256 (cabal/utf8-string-1.0.2/utf8-string-1.0.2.tar.gz) = ee48deada7600370728c4156cb002441de770d0121ae33a68139a9ed9c19b09a SIZE (cabal/utf8-string-1.0.2/utf8-string-1.0.2.tar.gz) = 10726 diff --git a/www/hs-hjsmin/files/patch-hjsmin.cabal b/www/hs-hjsmin/files/patch-hjsmin.cabal deleted file mode 100644 index ff696287318c..000000000000 --- a/www/hs-hjsmin/files/patch-hjsmin.cabal +++ /dev/null @@ -1,27 +0,0 @@ ---- hjsmin.cabal.orig 2001-09-09 01:46:40 UTC -+++ hjsmin.cabal -@@ -1,5 +1,6 @@ version: 0.2.0.4 - name: hjsmin - version: 0.2.0.4 -+x-revision: 2 - license: BSD3 - license-file: LICENSE - author: Alan Zimmerman -@@ -30,7 +31,7 @@ library - exposed-modules: Text.Jasmine - - build-depends: base >= 4.8 && < 5 -- , bytestring == 0.10.* -+ , bytestring >= 0.10 && < 0.12 - , language-javascript >= 0.6 && < 0.8 - , text == 1.2.* - -@@ -45,7 +46,7 @@ executable hjsmin - other-modules: Text.Jasmine - - build-depends: base >= 4.8 && < 5 -- , bytestring == 0.10.* -+ , bytestring - , language-javascript - , optparse-applicative >= 0.7 - , text