Index: head/devel/hs-alex/Makefile =================================================================== --- head/devel/hs-alex/Makefile (revision 458784) +++ head/devel/hs-alex/Makefile (revision 458785) @@ -1,24 +1,24 @@ # Created by: Volker Stolz # $FreeBSD$ PORTNAME= alex PORTVERSION= 3.2.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org COMMENT= Tool for generating lexical analysers in Haskell LICENSE= BSD3CLAUSE USE_CABAL= QuickCheck>=2 XMLDOCS= doc/alex:html -USE_AUTOTOOLS= autoconf:env +XMLDOCS_CONF= yes STANDALONE= yes EXECUTABLE= alex INSTALL_PORTEXAMPLES= cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR} .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: head/devel/hs-happy/files/patch-doc_configure.ac =================================================================== --- head/devel/hs-happy/files/patch-doc_configure.ac (revision 458784) +++ head/devel/hs-happy/files/patch-doc_configure.ac (nonexistent) @@ -1,11 +0,0 @@ ---- doc/configure.ac.orig 2009-07-13 20:16:47.000000000 +0000 -+++ doc/configure.ac 2009-07-13 20:18:47.000000000 +0000 -@@ -5,7 +5,7 @@ - - dnl ** check for DocBook toolchain - FP_CHECK_DOCBOOK_DTD --FP_DIR_DOCBOOK_XSL([/usr/share/xml/docbook/stylesheet/nwalsh/current /usr/share/xml/docbook/stylesheet/nwalsh /usr/share/sgml/docbook/docbook-xsl-stylesheets* /usr/share/sgml/docbook/xsl-stylesheets* /opt/kde?/share/apps/ksgmltools2/docbook/xsl /usr/share/docbook-xsl /usr/share/sgml/docbkxsl /usr/local/share/xsl/docbook /sw/share/xml/xsl/docbook-xsl]) -+FP_DIR_DOCBOOK_XSL([%%LOCALBASE%%/share/xsl/docbook /usr/share/xml/docbook/stylesheet/nwalsh/current /usr/share/xml/docbook/stylesheet/nwalsh /usr/share/sgml/docbook/docbook-xsl-stylesheets* /usr/share/sgml/docbook/xsl-stylesheets* /opt/kde?/share/apps/ksgmltools2/docbook/xsl /usr/share/docbook-xsl /usr/share/sgml/docbkxsl /usr/local/share/xsl/docbook /sw/share/xml/xsl/docbook-xsl]) - - AC_PATH_PROG(DbLatexCmd,dblatex) - Property changes on: head/devel/hs-happy/files/patch-doc_configure.ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/hs-happy/Makefile =================================================================== --- head/devel/hs-happy/Makefile (revision 458784) +++ head/devel/hs-happy/Makefile (revision 458785) @@ -1,25 +1,25 @@ # Created by: Simon Marlow # $FreeBSD$ PORTNAME= happy PORTVERSION= 1.19.5 PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org COMMENT= Happy is a parser generator for Haskell LICENSE= BSD3CLAUSE USE_CABAL= mtl>=1.0 XMLDOCS= doc/happy:html -USE_AUTOTOOLS= autoconf:env +XMLDOCS_CONF= yes STANDALONE= yes EXECUTABLE= happy INSTALL_PORTEXAMPLES= @(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}) .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: head/lang/ghc/bsd.cabal.mk =================================================================== --- head/lang/ghc/bsd.cabal.mk (revision 458784) +++ head/lang/ghc/bsd.cabal.mk (revision 458785) @@ -1,350 +1,354 @@ # $FreeBSD$ # # bsd.cabal.mk -- Support for ports based on Haskell Cabal. # # Created by: Gabor Pali , # Based on works of Giuseppe Pilichi and Ashish Shukla. # # Maintained by: haskell@FreeBSD.org # PACKAGE= ${PORTNAME}-${PORTVERSION} .if !defined(METAPORT) && !defined(USE_GITHUB) MASTER_SITES?= http://hackage.haskell.org/package/${PACKAGE}/:hackage DISTFILES?= ${DISTNAME}${EXTRACT_SUFX}:hackage EXTRACT_ONLY?= ${DISTNAME}${EXTRACT_SUFX} .endif .if defined(METAPORT) USES+= metaport .else DIST_SUBDIR?= cabal .endif # !METAPORT USE_LOCALE?= en_US.UTF-8 MAKE_ENV+= DESTDIR=${STAGEDIR} TMPDIR=${TMPDIR} SETUP_CMD?= ./setup ALEX_CMD?= ${LOCALBASE}/bin/alex HAPPY_CMD?= ${LOCALBASE}/bin/happy C2HS_CMD?= ${LOCALBASE}/bin/c2hs CPPHS_CMD?= ${LOCALBASE}/bin/cpphs # ./usr/local/lib/cabal/ghc-8.0.2/x86_64-freebsd-ghc-8.0.2/libHStransformers-compat-0.5.1.4-IuF CABAL_DIRS+= ${DATADIR} ${EXAMPLESDIR} \ ${CABAL_LIBDIR}/${CABAL_LIBSUBDIR} \ ${CABAL_LIBDIR}/${CABAL_ARCHSUBDIR} \ ${DOCSDIR} GHC_HADDOCK_CMD=${LOCALBASE}/bin/haddock-ghc-${GHC_VERSION} CABAL_DOCSDIR= ${PREFIX}/share/doc/cabal/ghc-${GHC_VERSION} CABAL_DOCSDIR_REL= ${CABAL_DOCSDIR:S,^${PREFIX}/,,} DATADIR= ${PREFIX}/share/cabal/ghc-${GHC_VERSION}/${PACKAGE} DOCSDIR= ${CABAL_DOCSDIR}/${PACKAGE} EXAMPLESDIR= ${PREFIX}/share/examples/cabal/ghc-${GHC_VERSION}/${PACKAGE} GHC_LIB_DOCSDIR_REL= share/doc/ghc-${GHC_VERSION}/html/libraries CABAL_LIBDIR= ${PREFIX}/lib/cabal/ghc-${GHC_VERSION} CABAL_LIBSUBDIR= ${PACKAGE} CABAL_ARCH= x86_64 .if ("${ARCH}" == "i386") CABAL_ARCH= i386 .endif CABAL_ARCHSUBDIR= ${CABAL_ARCH}-freebsd-ghc-${GHC_VERSION} CABAL_LIBDIR_REL= ${CABAL_LIBDIR:S,^${PREFIX}/,,} CONFIGURE_ARGS+= --libdir=${CABAL_LIBDIR} --libsubdir=${CABAL_LIBSUBDIR} # Inherited via lang/ghc we need to depend on iconv and libgmp.so (stage q/a) USES+= iconv:translit LIB_DEPENDS+= libgmp.so:math/gmp PLIST_SUB+= GHC_VERSION=${GHC_VERSION} \ PORTNAME=${PORTNAME} \ PORTVERSION=${PORTVERSION} \ LIBDIR_REL=${CABAL_LIBDIR_REL}/${CABAL_LIBSUBDIR} CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include INSTALL_PORTDATA?= INSTALL_PORTEXAMPLES?= LOCALBASE?= /usr/local TMPDIR?= ${WRKDIR}/tmp .if !defined(CABALOPTIONSMKINCLUDED) .include "bsd.cabal.options.mk" .endif .if !defined(STANDALONE) || ${PORT_OPTIONS:MDYNAMIC} BUILD_DEPENDS+= ghc:lang/ghc BUILD_DEPENDS+= ghc>=${GHC_VERSION}:lang/ghc RUN_DEPENDS+= ghc:lang/ghc RUN_DEPENDS+= ghc>=${GHC_VERSION}:lang/ghc .else BUILD_DEPENDS+= ghc:lang/ghc BUILD_DEPENDS+= ghc>=${GHC_VERSION}:lang/ghc .endif # LLVM is still not properly supported, further it does not make sense to have # to depend on old llvm ports that will be removed from the ports soon. # So for now, stick to GCC -- this might change with ghc-8.4. # https://ghc.haskell.org/trac/ghc/wiki/Commentary/Compiler/Backends/LLVM/Installing # We should however investigate whether base's clang is enough to build ghc&co. USE_GCC= yes CONFIGURE_ARGS+= --with-gcc=${CC} --with-ld=${LD} --with-ar=${AR} .if defined(USE_ALEX) BUILD_DEPENDS+= ${ALEX_CMD}:devel/hs-alex CONFIGURE_ARGS+= --with-alex=${ALEX_CMD} .endif .if defined(USE_HAPPY) BUILD_DEPENDS+= ${HAPPY_CMD}:devel/hs-happy CONFIGURE_ARGS+= --with-happy=${HAPPY_CMD} .endif .if defined(USE_C2HS) BUILD_DEPENDS+= ${C2HS_CMD}:devel/hs-c2hs CONFIGURE_ARGS+= --with-c2hs=${C2HS_CMD} .endif .if defined(USE_CPPHS) BUILD_DEPENDS+= ${CPPHS_CMD}:devel/hs-cpphs CONFIGURE_ARGS+= --with-cpphs=${CPPHS_CMD} .endif .if defined(EXECUTABLE) CONFIGURE_ARGS+= --enable-executable-stripping .endif .if defined(USE_CABAL) .include "bsd.hackage.mk" . for cabal_package in ${USE_CABAL} __u_h_r_package= ${cabal_package:C/[<=>].*$//g} __u_h_r_port= ${${__u_h_r_package}_port} __u_h_r_name= ${__u_h_r_port:C/.*\///g} . if empty(__u_h_r_port) IGNORE?= dependency fails: ${cabal_package} -> ${__u_h_r_package} is not known as a port . endif . if ${__u_h_r_port} != ${STAGE2_DUMMY} . if ${__u_h_r_package} == ${cabal_package} __u_h_r_version:= >=0 . else __u_h_r_version:= ${cabal_package:C/^[^<=>]*//g} . endif dependencies:= ${dependencies} \ ${HSPREFIX}${__u_h_r_package}${__u_h_r_version}:${__u_h_r_port} . else IGNORE?= dependency fail: ${__u_h_r_package} is part of lang/ghc . endif . endfor BUILD_DEPENDS+= ${dependencies} . if !defined(STANDALONE) || ${PORT_OPTIONS:MDYNAMIC} RUN_DEPENDS+= ${dependencies} . endif .endif .if ${PORT_OPTIONS:MDOCS} . if !defined(XMLDOCS) . if defined(HADDOCK_AVAILABLE) HADDOCK_OPTS= # empty . if ${PORT_OPTIONS:MHSCOLOUR} BUILD_DEPENDS+= HsColour:print/hs-hscolour HSCOLOUR_DATADIR= ${LOCALBASE}/share/cabal/ghc-${GHC_VERSION}/hscolour-${HSCOLOUR_VERSION} HADDOCK_OPTS+= --hyperlink-source --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css . endif # HSCOLOUR . endif # HADDOCK_AVAILABLE -. endif +. endif # !XMLDOCS . if defined(XMLDOCS) BUILD_DEPENDS+= docbook-xsl>0:textproc/docbook-xsl \ ${LOCALBASE}/bin/xsltproc:textproc/libxslt +. if defined(XMLDOCS_CONF) +BUILD_DEPENDS+= autoconf>0:devel/autoconf +. endif + USES+= gmake -. endif # !XMLDOCS +. endif # XMLDOCS .endif # DOCS __handle_datadir__= --datadir='${DATADIR}' --datasubdir='' --docdir='${DOCSDIR}' .if defined(HADDOCK_AVAILABLE) && !defined(XMLDOCS) && ${PORT_OPTIONS:MDOCS} CONFIGURE_ARGS+= --haddock-options=-w --with-haddock=${HADDOCK_CMD} .endif .if ${PORT_OPTIONS:MDYNAMIC} CONFIGURE_ARGS+= --enable-shared --enable-executable-dynamic .else CONFIGURE_ARGS+= --disable-shared --disable-executable-dynamic .endif .if ${PORT_OPTIONS:MPROFILE} CONFIGURE_ARGS+= --enable-executable-profiling --enable-library-profiling .else CONFIGURE_ARGS+= --disable-profiling --disable-library-profiling .endif .SILENT: post-patch:: -.if defined(XMLDOCS) && defined(USE_AUTOTOOLS) +.if defined(XMLDOCS) && defined(XMLDOCS_CONF) @${REINPLACE_CMD} -e 's|/usr/local/share/xsl/docbook|${LOCALBASE}/share/xsl/docbook|' \ ${WRKSRC}/doc/configure.ac .endif _BUILD_SETUP= ${GHC_CMD} -o ${SETUP_CMD} -package Cabal --make .if !defined(METAPORT) . if !target(do-configure) do-configure: @${MKDIR} ${TMPDIR} @if [ -f ${WRKSRC}/Setup.hs ]; then \ cd ${WRKSRC} && ${_BUILD_SETUP} Setup.hs; fi @if [ -f ${WRKSRC}/Setup.lhs ]; then \ cd ${WRKSRC} && ${_BUILD_SETUP} Setup.lhs; fi @if [ -f ${WRKSRC}/${SETUP_CMD} ]; then \ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ ${SETUP_CMD} configure --ghc --prefix=${PREFIX} \ --extra-include-dirs="${LOCALBASE}/include" --extra-lib-dirs="${LOCALBASE}/lib" \ ${__handle_datadir__} ${CONFIGURE_ARGS}; \ else \ ${ECHO_MSG} "===> ${PKGNAME} configure fails: no setup program could be created."; \ exit 1; \ fi . if ${PORT_OPTIONS:MDOCS} -. if defined(XMLDOCS) && defined(USE_AUTOTOOLS) - cd ${WRKSRC}/doc && ${AUTOCONF} && ./configure --prefix=${PREFIX} +. if defined(XMLDOCS) && defined(XMLDOCS_CONF) + cd ${WRKSRC}/doc && ${LOCALBASE}/bin/autoconf && ./configure --prefix=${PREFIX} . endif . endif # DOCS . endif # target(do-configure) .endif # !METAPORT .if !defined(METAPORT) . if !target(do-build) do-build: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SETUP_CMD} build . if !defined(STANDALONE) cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SETUP_CMD} register --gen-script . endif . if ${PORT_OPTIONS:MDOCS} . if defined(HADDOCK_AVAILABLE) && !defined(XMLDOCS) && !defined(STANDALONE) && ${PORT_OPTIONS:MDOCS} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SETUP_CMD} haddock ${HADDOCK_OPTS} . endif # STANDALONE . if defined(XMLDOCS) @(cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} html) . endif # XMLDOCS . endif # DOCS . endif # target(do-build) .endif # !METAPORT .for sect in 1 2 3 4 5 6 7 8 9 . if defined(MAN${sect}PAGES) . for man in ${MAN${sect}PAGES} PLIST_FILES+= man/man${sect}/${man}.gz . endfor . endif .endfor .if !defined(METAPORT) . if !target(do-install) do-install: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SETUP_CMD} copy --destdir=${STAGEDIR} . if !defined(STANDALONE) @${MKDIR} ${STAGEDIR}${CABAL_LIBDIR}/${CABAL_LIBSUBDIR} cd ${WRKSRC} && ${INSTALL_SCRIPT} register.sh ${STAGEDIR}${CABAL_LIBDIR}/${CABAL_LIBSUBDIR}/register.sh . endif . if !empty(INSTALL_PORTDATA) @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_PORTDATA} . endif . if !empty(INSTALL_PORTEXAMPLES) && ${PORT_OPTIONS:MEXAMPLES} @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_PORTEXAMPLES} . endif . for sect in 1 2 3 4 5 6 7 8 9 . if defined(MAN${sect}SRC) . for man in ${MAN${sect}PAGES} @${INSTALL_MAN} ${WRKSRC}/${MAN${sect}SRC}/${man} ${STAGEDIR}${MANPREFIX}/man/man${sect} . endfor . endif # MAN${sect}SRC . endfor . if ${PORT_OPTIONS:MDOCS} . if !empty(XMLDOCS) . for xmldoc in ${XMLDOCS} @(cd ${WRKSRC}/${xmldoc:C/:.*$//g} && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}/${xmldoc:C/^.*://g}) . endfor . endif # XMLDOCS . endif # DOCS . endif # target(do-install) .endif # !METAPORT .if !target(post-install-script) post-install-script: . if defined(EXECUTABLE) . for exe in ${EXECUTABLE} ${ECHO_CMD} 'bin/${exe}' >>${TMPPLIST} . endfor . endif # EXECUTABLE for dir in ${CABAL_DIRS}; do if [ -d ${STAGEDIR}$${dir} ]; then ${FIND} -ds ${STAGEDIR}$${dir} \ -type f -print | ${SED} -E -e 's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST}; fi ; done @${ECHO} "================ CONTENTS OF TMPPLIST =================== " cat ${TMPPLIST} @${ECHO} "========================================================= " .endif # target(post-install-script) .if !defined(METAPORT) add-plist-post: add-plist-cabal add-plist-cabal: . if !defined(STANDALONE) @${ECHO_CMD} '@postunexec ${LOCALBASE}/bin/ghc-pkg unregister --force ${PORTNAME}-${PORTVERSION}' >> ${TMPPLIST} . endif . if defined(HADDOCK_AVAILABLE) && ${PORT_OPTIONS:MDOCS} # GHC_LIB_DOCSDIR_REL= share/doc/ghc-${GHC_VERSION}/html/libraries (${ECHO} '@postexec ${LN} -s ${DOCSDIR}/html ${LOCALBASE}/${GHC_LIB_DOCSDIR_REL}/${PACKAGE} && \ cd ${LOCALBASE}/${GHC_LIB_DOCSDIR_REL} && \ ${RM} doc-index*.html && ./gen_contents_index') >> ${TMPPLIST} (${ECHO} '@postunexec ${RM} -r ${LOCALBASE}/${GHC_LIB_DOCSDIR_REL}/${PACKAGE}' ; \ ${ECHO} '@postunexec cd ${LOCALBASE}/${GHC_LIB_DOCSDIR_REL} && \ ${RM} doc-index*.html && ./gen_contents_index') >> ${TMPPLIST} # Don't install index files ${ECHO} "@comment share/doc/ghc-%%GHC_VERSION%%/html/libraries/index.html" >> ${TMPPLIST} . endif . if !defined(STANDALONE) @${ECHO_CMD} '@postexec ${SH} %D/${CABAL_LIBDIR_REL}/${CABAL_LIBSUBDIR}/register.sh > /dev/null' >> ${TMPPLIST} . endif .endif # !METAPORT