>From ab38b32929931de0fe91185dcd84155bb8cc7123 Mon Sep 17 00:00:00 2001 From: Greg Steuck <g...@nest.cx> Date: Sat, 22 Aug 2020 15:27:27 -0700 Subject: [PATCH 1/7] Use devel/cabal module for devel/alex and upgrade to 3.2.5
--- devel/alex/Makefile | 22 ++++++------- devel/alex/distinfo | 4 +-- devel/alex/pkg/PLIST | 77 +++++++++++++++++++++++--------------------- 3 files changed, 52 insertions(+), 51 deletions(-) diff --git a/devel/alex/Makefile b/devel/alex/Makefile index 7b8b5d667a3..e19050f77f0 100644 --- a/devel/alex/Makefile +++ b/devel/alex/Makefile @@ -2,13 +2,10 @@ COMMENT = lexical analyser generator for Haskell -# Dependency of meta/haskell-platform. -# Please do *not* update without thinking. -PORTROACH = ignore:1 - -DISTNAME = alex-3.1.7 +MODCABAL_STEM = alex +MODCABAL_VERSION = 3.2.5 +MODCABAL_DATA_DIR = data CATEGORIES = devel -REVISION = 0 HOMEPAGE = http://www.haskell.org/alex/ @@ -17,8 +14,7 @@ PERMIT_PACKAGE = Yes WANTLIB = c charset ffi gmp iconv m pthread util -MODULES = lang/ghc -MODGHC_BUILD = cabal hackage nort +MODULES = devel/cabal LIB_DEPENDS = converters/libiconv \ devel/gmp \ @@ -31,8 +27,7 @@ AUTOCONF_VERSION = 2.61 AUTOCONF_DIR = ${WRKSRC}/doc WRKCONF = ${AUTOCONF_DIR} -BUILD_DEPENDS += devel/hs-QuickCheck>=2 \ - textproc/docbook-xsl +BUILD_DEPENDS += textproc/docbook-xsl post-build: @cd ${WRKBUILD}/doc && exec ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} html @@ -42,7 +37,10 @@ post-install: cd ${WRKBUILD}/doc && umask 022 && pax -rw alex ${PREFIX}/share/doc do-test: - cd ${WRKBUILD}/tests && exec ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \ - all + cd ${WRKBUILD}/tests && exec ${SETENV} ${MAKE_ENV} \ + ${MAKE_PROGRAM} ALEX=${MODCABAL_BUILT_EXECUTABLE_alex} \ + TEST_ALEX_OPTS=--template=../data \ + -j ${MAKE_JOBS} all + .include <bsd.port.mk> diff --git a/devel/alex/distinfo b/devel/alex/distinfo index d3ce2e457cf..0dbe0647154 100644 --- a/devel/alex/distinfo +++ b/devel/alex/distinfo @@ -1,2 +1,2 @@ -SHA256 (ghc/alex-3.1.7.tar.gz) = iaGhPabMvrAGSI2VdDguiRz3wFZ3UrMwzIYW10i/KNE= -SIZE (ghc/alex-3.1.7.tar.gz) = 103624 +SHA256 (hackage/alex-3.2.5.tar.gz) = t3yKEnB2fGTirbIabpHufNkEuhftrhe8IP0D2lJW4OM= +SIZE (hackage/alex-3.2.5.tar.gz) = 108531 diff --git a/devel/alex/pkg/PLIST b/devel/alex/pkg/PLIST index 2e8e08fd666..3339a386db7 100644 --- a/devel/alex/pkg/PLIST +++ b/devel/alex/pkg/PLIST @@ -1,38 +1,41 @@ @comment $OpenBSD: PLIST,v 1.6 2013/07/18 21:58:00 kili Exp $ -@bin bin/alex -share/${DISTNAME}/ -share/${DISTNAME}/AlexTemplate -share/${DISTNAME}/AlexTemplate-debug -share/${DISTNAME}/AlexTemplate-ghc -share/${DISTNAME}/AlexTemplate-ghc-debug -share/${DISTNAME}/AlexTemplate-ghc-nopred -share/${DISTNAME}/AlexWrapper-basic -share/${DISTNAME}/AlexWrapper-basic-bytestring -share/${DISTNAME}/AlexWrapper-gscan -share/${DISTNAME}/AlexWrapper-monad -share/${DISTNAME}/AlexWrapper-monad-bytestring -share/${DISTNAME}/AlexWrapper-monadUserState -share/${DISTNAME}/AlexWrapper-monadUserState-bytestring -share/${DISTNAME}/AlexWrapper-posn -share/${DISTNAME}/AlexWrapper-posn-bytestring -share/${DISTNAME}/AlexWrapper-strict-bytestring -share/doc/alex/ -@comment share/doc/${DISTNAME}/ -@comment share/doc/${DISTNAME}/LICENSE -share/doc/alex/about.html -share/doc/alex/alex-files.html -share/doc/alex/api.html -share/doc/alex/basic-api.html -share/doc/alex/bug-reports.html -share/doc/alex/charsets.html -share/doc/alex/fptools.css -share/doc/alex/index.html -share/doc/alex/introduction.html -share/doc/alex/invoking.html -share/doc/alex/license.html -share/doc/alex/regexps.html -share/doc/alex/relnotes-20.html -share/doc/alex/relnotes-210.html -share/doc/alex/relnotes-22.html -share/doc/alex/syntax.html -share/doc/alex/wrappers.html +bin/${MODCABAL_STEM} +libexec/cabal/ +@bin libexec/cabal/${MODCABAL_STEM} +share/${PKGNAME}/ +share/${PKGNAME}/AlexTemplate +share/${PKGNAME}/AlexTemplate-debug +share/${PKGNAME}/AlexTemplate-ghc +share/${PKGNAME}/AlexTemplate-ghc-debug +share/${PKGNAME}/AlexTemplate-ghc-nopred +share/${PKGNAME}/AlexWrapper-basic +share/${PKGNAME}/AlexWrapper-basic-bytestring +share/${PKGNAME}/AlexWrapper-gscan +share/${PKGNAME}/AlexWrapper-monad +share/${PKGNAME}/AlexWrapper-monad-bytestring +share/${PKGNAME}/AlexWrapper-monadUserState +share/${PKGNAME}/AlexWrapper-monadUserState-bytestring +share/${PKGNAME}/AlexWrapper-posn +share/${PKGNAME}/AlexWrapper-posn-bytestring +share/${PKGNAME}/AlexWrapper-strict-bytestring +share/doc/${MODCABAL_STEM}/ +@comment share/doc/${PKGNAME}/ +@comment share/doc/${PKGNAME}/LICENSE +share/doc/${MODCABAL_STEM}/about.html +share/doc/${MODCABAL_STEM}/${MODCABAL_STEM}-files.html +share/doc/${MODCABAL_STEM}/api.html +share/doc/${MODCABAL_STEM}/basic-api.html +share/doc/${MODCABAL_STEM}/bug-reports.html +share/doc/${MODCABAL_STEM}/charsets.html +share/doc/${MODCABAL_STEM}/fptools.css +share/doc/${MODCABAL_STEM}/index.html +share/doc/${MODCABAL_STEM}/introduction.html +share/doc/${MODCABAL_STEM}/invoking.html +share/doc/${MODCABAL_STEM}/license.html +share/doc/${MODCABAL_STEM}/regexps.html +share/doc/${MODCABAL_STEM}/relnotes-20.html +share/doc/${MODCABAL_STEM}/relnotes-210.html +share/doc/${MODCABAL_STEM}/relnotes-22.html +share/doc/${MODCABAL_STEM}/syntax.html +share/doc/${MODCABAL_STEM}/types.html +share/doc/${MODCABAL_STEM}/wrappers.html -- 2.30.1
