From 36450f1064562f0850d2613c3e325f5c65d3aaa8 Mon Sep 17 00:00:00 2001 From: pho Date: Fri, 23 Apr 2021 04:44:20 +0000 Subject: [PATCH] Update to happy-1.20.0 * Fix #121: the -i flag produces an .info file even if the %expect pragma is violated * Fix #131: qualify uses of Prelude functions in generated code * Fix #161: drop fewer parse items when generating an .info file * Introduce the %shift directive to resolve shift/reduce conflicts explicitly, useful in conjunction with %expect 0 * Remove the deprecated build configuration flag 'small_base' --- devel/happy/Makefile | 23 ++++++++++++++----- devel/happy/PLIST | 53 ++++++++++++++++++++++++++++++++++++++++++++ devel/happy/distinfo | 10 ++++----- 3 files changed, 75 insertions(+), 11 deletions(-) create mode 100644 devel/happy/PLIST diff --git a/devel/happy/Makefile b/devel/happy/Makefile index 50502f15b375..ab619cc5395c 100644 --- a/devel/happy/Makefile +++ b/devel/happy/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.3 2020/01/11 07:54:04 pho Exp $ +# $NetBSD: Makefile,v 1.4 2021/04/23 04:44:20 pho Exp $ -DISTNAME= happy-1.19.12 +DISTNAME= happy-1.20.0 PKGNAME= ${DISTNAME} CATEGORIES= devel @@ -8,15 +8,26 @@ MAINTAINER= esg@sdf.lonestar.org COMMENT= Parser generator for Haskell LICENSE= modified-bsd -USE_TOOLS+= autoconf - -INSTALLATION_DIRS+= ${PKGMANDIR}/man1 +USE_TOOLS+= autoconf gmake +BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl +BUILD_DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2 +BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt +CONFIGURE_ENV+= fp_cv_dir_docbook_xsl=${PREFIX}/share/xsl/docbook +CONFIGURE_ENV+= ac_cv_path_DbLatexCmd= # empty pre-configure: - cd ${WRKSRC}/doc && autoconf && ./configure + ${RUN}cd ${WRKSRC}/doc && autoconf && ${PKGSRC_SETENV} ${CONFIGURE_ENV} \ + ${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} ./configure + +post-build: + ${RUN}cd ${WRKSRC}/doc && ${GMAKE} +INSTALLATION_DIRS+= ${PKGMANDIR}/man1 ${PREFIX}/share/doc/${PKGBASE} post-install: ${INSTALL_MAN} ${WRKSRC}/doc/happy.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 + for f in ${WRKSRC}/doc/happy/*; do \ + ${INSTALL_DATA} "$$f" ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}/; \ + done .include "../../mk/haskell.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/happy/PLIST b/devel/happy/PLIST new file mode 100644 index 000000000000..09a722a8556c --- /dev/null +++ b/devel/happy/PLIST @@ -0,0 +1,53 @@ +@comment $NetBSD: PLIST,v 1.3 2021/04/23 04:44:20 pho Exp $ +bin/happy +man/man1/happy.1 +share/doc/happy/fptools.css +share/doc/happy/happy-introduction.html +share/doc/happy/index.html +share/doc/happy/ix01.html +share/doc/happy/sec-AtrributeGrammarsInHappy.html +share/doc/happy/sec-AttrGrammarLimits.html +share/doc/happy/sec-AttributeGrammar.html +share/doc/happy/sec-AttributeGrammarExample.html +share/doc/happy/sec-Precedences.html +share/doc/happy/sec-compilation-time.html +share/doc/happy/sec-conflict-tips.html +share/doc/happy/sec-directives.html +share/doc/happy/sec-error.html +share/doc/happy/sec-finding-errors.html +share/doc/happy/sec-glr-misc.html +share/doc/happy/sec-glr-semantics.html +share/doc/happy/sec-glr-using.html +share/doc/happy/sec-glr.html +share/doc/happy/sec-grammar-files.html +share/doc/happy/sec-grammar.html +share/doc/happy/sec-happy-ghci.html +share/doc/happy/sec-info-files-conflicts.html +share/doc/happy/sec-info-files.html +share/doc/happy/sec-invoking.html +share/doc/happy/sec-license.html +share/doc/happy/sec-module-header.html +share/doc/happy/sec-module-trailer.html +share/doc/happy/sec-monad-alex.html +share/doc/happy/sec-monads.html +share/doc/happy/sec-multiple-parsers.html +share/doc/happy/sec-obtaining.html +share/doc/happy/sec-reporting-bugs.html +share/doc/happy/sec-sequences.html +share/doc/happy/sec-tips.html +share/doc/happy/sec-type-signatures.html +share/doc/happy/sec-using.html +share/doc/${HS_PLATFORM}/${PKGNAME}/LICENSE +share/${HS_PLATFORM}/${PKGNAME}/GLR_Base +share/${HS_PLATFORM}/${PKGNAME}/GLR_Lib +share/${HS_PLATFORM}/${PKGNAME}/GLR_Lib-ghc +share/${HS_PLATFORM}/${PKGNAME}/GLR_Lib-ghc-debug +share/${HS_PLATFORM}/${PKGNAME}/HappyTemplate +share/${HS_PLATFORM}/${PKGNAME}/HappyTemplate-arrays +share/${HS_PLATFORM}/${PKGNAME}/HappyTemplate-arrays-coerce +share/${HS_PLATFORM}/${PKGNAME}/HappyTemplate-arrays-coerce-debug +share/${HS_PLATFORM}/${PKGNAME}/HappyTemplate-arrays-debug +share/${HS_PLATFORM}/${PKGNAME}/HappyTemplate-arrays-ghc +share/${HS_PLATFORM}/${PKGNAME}/HappyTemplate-arrays-ghc-debug +share/${HS_PLATFORM}/${PKGNAME}/HappyTemplate-coerce +share/${HS_PLATFORM}/${PKGNAME}/HappyTemplate-ghc diff --git a/devel/happy/distinfo b/devel/happy/distinfo index 13bd40c0e25b..23945595f18b 100644 --- a/devel/happy/distinfo +++ b/devel/happy/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2020/01/01 05:37:22 pho Exp $ +$NetBSD: distinfo,v 1.4 2021/04/23 04:44:20 pho Exp $ -SHA1 (happy-1.19.12.tar.gz) = 0e5bff9bcd1671eefef0ca7029ca590899385fd6 -RMD160 (happy-1.19.12.tar.gz) = 34fff4797b87496a0493960b784df96385d4d6c0 -SHA512 (happy-1.19.12.tar.gz) = 20f36b17adf7330852fd4c05335adbf31e6f19907b4ec247c85a40ee1f8496c6dc432055026696906b149cec7f982b88c9a2eeedf14a11d34b1f6f73272e5208 -Size (happy-1.19.12.tar.gz) = 183254 bytes +SHA1 (happy-1.20.0.tar.gz) = 7ac1ee4aab8d4abe206ffcaadc8a93d98a346264 +RMD160 (happy-1.20.0.tar.gz) = 6132dd3496fc22363d09dc7e307d93f779bfdc3e +SHA512 (happy-1.20.0.tar.gz) = 2c19e6e13032ead435495aab232192cf0ad9fe5e3e04c79b40b586272fb0208284815cf5c15d609f75387e7fe91ca0932b675bcaa95552f62ad08a12701649ce +Size (happy-1.20.0.tar.gz) = 184515 bytes