svn commit: r458785 - in head: devel/hs-alex devel/hs-happy devel/hs-happy/files lang/ghc

[Tijl Coosemans]

Author: tijl
Date: Thu Jan 11 20:31:44 2018
New Revision: 458785
URL: https://svnweb.freebsd.org/changeset/ports/458785

Log:
  Eliminate USE_AUTOTOOLS from Haskell ports.  Let these ports set
  XMLDOCS_CONF=yes instead and add support for that to bsd.cabal.mk.
  Remove a patch from devel/hs-happy that is already handled by post-patch
  in bsd.cabal.mk.

Deleted:
  head/devel/hs-happy/files/
Modified:
  head/devel/hs-alex/Makefile
  head/devel/hs-happy/Makefile
  head/lang/ghc/bsd.cabal.mk

Modified: head/devel/hs-alex/Makefile
==============================================================================
--- head/devel/hs-alex/Makefile	Thu Jan 11 20:29:52 2018	(r458784)
+++ head/devel/hs-alex/Makefile	Thu Jan 11 20:31:44 2018	(r458785)
@@ -13,7 +13,7 @@ LICENSE=	BSD3CLAUSE
 USE_CABAL=	QuickCheck>=2
 
 XMLDOCS=	doc/alex:html
-USE_AUTOTOOLS=	autoconf:env
+XMLDOCS_CONF=	yes
 
 STANDALONE=	yes
 EXECUTABLE=	alex

Modified: head/devel/hs-happy/Makefile
==============================================================================
--- head/devel/hs-happy/Makefile	Thu Jan 11 20:29:52 2018	(r458784)
+++ head/devel/hs-happy/Makefile	Thu Jan 11 20:31:44 2018	(r458785)
@@ -14,7 +14,7 @@ LICENSE=	BSD3CLAUSE
 USE_CABAL=	mtl>=1.0
 
 XMLDOCS=	doc/happy:html
-USE_AUTOTOOLS=	autoconf:env
+XMLDOCS_CONF=	yes
 
 STANDALONE=	yes
 EXECUTABLE=	happy

Modified: head/lang/ghc/bsd.cabal.mk
==============================================================================
--- head/lang/ghc/bsd.cabal.mk	Thu Jan 11 20:29:52 2018	(r458784)
+++ head/lang/ghc/bsd.cabal.mk	Thu Jan 11 20:31:44 2018	(r458785)
@@ -178,15 +178,19 @@ HADDOCK_OPTS+=		--hyperlink-source --hscolour-css=${HS
 .      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
 
@@ -211,7 +215,7 @@ CONFIGURE_ARGS+=	--disable-profiling --disable-library
 .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
@@ -237,8 +241,8 @@ do-configure:
 	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)