Index: head/ftp/hs-curl/Makefile
===================================================================
--- head/ftp/hs-curl/Makefile	(revision 409205)
+++ head/ftp/hs-curl/Makefile	(revision 409206)
@@ -1,18 +1,16 @@
 # $FreeBSD$
 
 PORTNAME=	curl
 PORTVERSION=	1.3.8
 PORTREVISION=	10
 CATEGORIES=	ftp haskell
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	Haskell binding to libcurl
 
 LICENSE=	BSD3CLAUSE
 
 LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
 
-USE_GHC_NATIVE=	yes
-
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
Index: head/lang/ghc/bsd.cabal.mk
===================================================================
--- head/lang/ghc/bsd.cabal.mk	(revision 409205)
+++ head/lang/ghc/bsd.cabal.mk	(revision 409206)
@@ -1,350 +1,347 @@
 #
 # $FreeBSD$
 #
 # bsd.cabal.mk -- Support for ports based on Haskell Cabal.
 #
 # Created by: Gabor Pali <pgj@FreeBSD.org>,
 # 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/${PORTNAME}-${PORTVERSION}/:hackage
+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
 
 MAKE_ENV+=	LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 DESTDIR=${STAGEDIR} \
 		TMPDIR=${TMPDIR}
 
 SETUP_CMD?=	./setup
 
 ALEX_CMD?=	${LOCALBASE}/bin/alex
 HAPPY_CMD?=	${LOCALBASE}/bin/happy
 C2HS_CMD?=	${LOCALBASE}/bin/c2hs
 
 CABAL_DIRS+=	${DATADIR} ${EXAMPLESDIR} ${CABAL_LIBDIR}/${CABAL_LIBSUBDIR} \
 		${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}/${DISTNAME}
-DOCSDIR=	${CABAL_DOCSDIR}/${DISTNAME}
-EXAMPLESDIR=	${PREFIX}/share/examples/cabal/ghc-${GHC_VERSION}/${DISTNAME}
 
+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=	${DISTNAME}
+CABAL_LIBSUBDIR=	${PACKAGE}
 CABAL_LIBDIR_REL=	${CABAL_LIBDIR:S,^${PREFIX}/,,}
 
 CONFIGURE_ARGS+=	--libdir=${CABAL_LIBDIR} --libsubdir=${CABAL_LIBSUBDIR}
 
 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:${PORTSDIR}/lang/ghc
 BUILD_DEPENDS+=	ghc>=${GHC_VERSION}:${PORTSDIR}/lang/ghc
 RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
 RUN_DEPENDS+=	ghc>=${GHC_VERSION}:${PORTSDIR}/lang/ghc
 .else
 BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
 BUILD_DEPENDS+=	ghc>=${GHC_VERSION}:${PORTSDIR}/lang/ghc
 .endif
 
 
 .if ${PORT_OPTIONS:MPCLANG}
 BUILD_DEPENDS+=	${LOCALBASE}/bin/clang${LLVM_VERSION}:${PORTSDIR}/lang/clang${LLVM_VERSION}
 RUN_DEPENDS+=	${LOCALBASE}/bin/clang${LLVM_VERSION}:${PORTSDIR}/lang/clang${LLVM_VERSION}
 CC=		${LOCALBASE}/bin/clang${LLVM_VERSION}
 CXX=		${LOCALBASE}/bin/clang++${LLVM_VERSION}
 CPP=		${LOCALBASE}/bin/clang-cpp${LLVM_VERSION}
 CFLAGS+=	-Qunused-arguments
 LDFLAGS+=	-B${LOCALBASE}/bin
 CONFIGURE_ARGS+=	--ghc-option=-optl=-B${LOCALBASE}/bin
 USE_BINUTILS=	yes
 .elif ${PORT_OPTIONS:MBCLANG}
 CC=		/usr/bin/clang
 CXX=		/usr/bin/clang++
 CPP=		/usr/bin/clang-cpp
 CFLAGS+=	-Qunused-arguments
 .else # GCC
 USE_GCC=	yes
 .endif
 
 CONFIGURE_ARGS+=	--with-gcc=${CC} --with-ld=${LD} --with-ar=${AR}
 
 .if ${PORT_OPTIONS:MLLVM}
 CONFIGURE_ARGS+=	--ghc-option=-fllvm \
 			--ghc-option=-pgmlo --ghc-option=${LOCALBASE}/bin/opt${LLVM_VERSION} \
 			--ghc-option=-pgmlc --ghc-option=${LOCALBASE}/bin/llc${LLVM_VERSION}
 
 BUILD_DEPENDS+=		${LOCALBASE}/bin/opt${LLVM_VERSION}:${PORTSDIR}/devel/llvm${LLVM_VERSION}
 .endif
 
 .if defined(USE_ALEX)
 BUILD_DEPENDS+=	${ALEX_CMD}:${PORTSDIR}/devel/hs-alex
 CONFIGURE_ARGS+=	 --with-alex=${ALEX_CMD}
 .endif
 
 .if defined(USE_HAPPY)
 BUILD_DEPENDS+=	${HAPPY_CMD}:${PORTSDIR}/devel/hs-happy
 CONFIGURE_ARGS+=	 --with-happy=${HAPPY_CMD}
 .endif
 
 .if defined(USE_C2HS)
 BUILD_DEPENDS+=	${C2HS_CMD}:${PORTSDIR}/devel/hs-c2hs
 CONFIGURE_ARGS+=	--with-c2hs=${C2HS_CMD}
 .endif
 
 .if defined(EXECUTABLE)
 LIB_DEPENDS+=	libgmp.so:${PORTSDIR}/math/gmp
 USES+=		iconv
 
 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:C/[<=>].*$//g} is not known as a port
 .endif
 
 .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}:${PORTSDIR}/${__u_h_r_port}
 .endfor
 
 BUILD_DEPENDS+=	${dependencies}
 
 .if !defined(STANDALONE) || ${PORT_OPTIONS:MDYNAMIC}
 RUN_DEPENDS+=	${dependencies}
 .endif
 
 .endif
 
-.if defined(USE_GHC_NATIVE)
-USES+=		perl5
-USE_PERL5=	build
-.endif
-
 .if ${PORT_OPTIONS:MDOCS}
 .if !defined(XMLDOCS)
 
 .if defined(HADDOCK_AVAILABLE)
 HADDOCK_OPTS=	# empty
 
 .if ${PORT_OPTIONS:MHSCOLOUR}
 BUILD_DEPENDS+=	HsColour:${PORTSDIR}/print/hs-hscolour
 
-HSCOLOUR_VERSION=	1.23
 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
 
 .if defined(XMLDOCS)
 BUILD_DEPENDS+=	docbook-xsl>0:${PORTSDIR}/textproc/docbook-xsl \
 		${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt
 
 USES+=		gmake
 
 .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-executable-profiling --disable-library-profiling
 .endif
 
 .SILENT:
 
 post-patch::
 .if defined(XMLDOCS) && defined(USE_AUTOTOOLS)
 	@${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}
 .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
 .endif # target(post-install-script)
 
 .if !defined(METAPORT)
 add-plist-post: add-plist-cabal
 add-plist-cabal:
 
 .if !defined(STANDALONE)
 	@${ECHO_CMD} '@unexec ${LOCALBASE}/bin/ghc-pkg unregister --force ${PORTNAME}-${PORTVERSION}' >> ${TMPPLIST}
 .endif
 
 .if defined(HADDOCK_AVAILABLE) && ${PORT_OPTIONS:MDOCS}
-	@(${ECHO_CMD} '@unexec ${RM} ${LOCALBASE}/${GHC_LIB_DOCSDIR_REL}/${DISTNAME}' ; \
+	@(${ECHO_CMD} '@unexec ${RM} ${LOCALBASE}/${GHC_LIB_DOCSDIR_REL}/${PACKAGE}' ; \
 	  ${ECHO_CMD} '@unexec cd ${LOCALBASE}/${GHC_LIB_DOCSDIR_REL} && \
 	    ${RM} doc-index*.html && ./gen_contents_index') >> ${TMPPLIST}
 .endif
 
 .if !defined(STANDALONE)
 	@${ECHO_CMD} '@exec ${SH} %D/${CABAL_LIBDIR_REL}/${CABAL_LIBSUBDIR}/register.sh > /dev/null' >> ${TMPPLIST}
 .endif
 
 .if defined(HADDOCK_AVAILABLE) && ${PORT_OPTIONS:MDOCS}
-	@(${ECHO_CMD} '@exec ${LN} -s ${DOCSDIR}/html ${LOCALBASE}/${GHC_LIB_DOCSDIR_REL}/${DISTNAME} && \
+	@(${ECHO_CMD} '@exec ${LN} -s ${DOCSDIR}/html ${LOCALBASE}/${GHC_LIB_DOCSDIR_REL}/${PACKAGE} && \
 	  cd ${LOCALBASE}/${GHC_LIB_DOCSDIR_REL} && \
 	  ${RM} doc-index*.html && ./gen_contents_index') >> ${TMPPLIST}
 .endif
 
 .endif # !METAPORT
Index: head/lang/ghc/bsd.cabal.options.mk
===================================================================
--- head/lang/ghc/bsd.cabal.options.mk	(revision 409205)
+++ head/lang/ghc/bsd.cabal.options.mk	(revision 409206)
@@ -1,134 +1,136 @@
 #
 # $FreeBSD$
 #
 # bsd.cabal.options.mk -- Support options for ports based on Haskell Cabal.
 #
 # Created by: Gabor Pali <pgj@FreeBSD.org>
 #
 # Maintained by: haskell@FreeBSD.org
 #
 
 CABALOPTIONSMKINCLUDED=	yes
 
 HSPREFIX=		hs-
 PKGNAMEPREFIX?=		${HSPREFIX}
 
 LOCALBASE?=	/usr/local
 GHC_CMD?=	${LOCALBASE}/bin/ghc
 HADDOCK_CMD?=	${LOCALBASE}/bin/haddock
 HSCOLOUR_CMD?=	${LOCALBASE}/bin/HsColour
 
 GHC_VERSION?=	7.10.2
 LLVM_VERSION=	35
 
+HSCOLOUR_VERSION=	1.23
+
 HSCOLOUR_DESC?=	Colorize generated documentation by HsColour
 DYNAMIC_DESC?=	Add support for dynamic linking
 PROFILE_DESC?=	Add support for profiling
 LLVM_DESC?=	Use the LLVM backend for code generation
 PCLANG_DESC=		Build with Clang from ports
 BCLANG_DESC=		Build with Clang from base
 
 OPTIONS_SINGLE+=		C_Compiler
 OPTIONS_SINGLE_C_Compiler=	GCC PCLANG BCLANG
 OPTIONS_DEFAULT+=		GCC
 
 .if (!exists(${GHC_CMD}) || exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/rts/libHSrts-ghc${GHC_VERSION}.so)) && !defined(IGNORE_DYNAMIC)
 OPTIONS_DEFINE+=	DYNAMIC
 OPTIONS_DEFAULT+=	DYNAMIC
 .endif
 
 .if (!exists(${GHC_CMD}) || exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/rts/libHSrts_p.a)) && !defined(IGNORE_PROFILE)
 OPTIONS_DEFINE+=	PROFILE
 .endif
 
 .if !defined(IGNORE_LLVM)
 OPTIONS_DEFINE+=	LLVM
 .endif
 
 .if ((!exists(${GHC_CMD}) || exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/html)) || exists(${HADDOCK_CMD})) && !defined(IGNORE_DOCS)
 OPTIONS_DEFINE+=	DOCS
 OPTIONS_DEFAULT+=	DOCS
 HADDOCK_AVAILABLE=	yes
 
 .if (${PORTNAME} != hscolour || exists(${HSCOLOUR_CMD})) && !defined(IGNORE_HSCOLOUR)
 OPTIONS_DEFINE+=	HSCOLOUR
 .endif
 .endif
 
 .if defined(OPTIONSMKINCLUDED)
 IGNORE?=	options fail: bsd.cabal.mk already includes bsd.options.mk
 .endif
 
 OPTIONS_DEFINE+=	${FLAGS_DEFINE}
 OPTIONS_SINGLE+=	${FLAGS_SINGLE}
 OPTIONS_MULTI+=		${FLAGS_MULTI}
 OPTIONS_DEFAULT+=	${FLAGS_DEFAULT}
 
 _ALL_FLAGS:=		${FLAGS_DEFINE} ${FLAGS_SINGLE} ${FLAGS_MULTI}
 _COMPLETE_FLAGS=	${_ALL_FLAGS}
 
 .for f in ${_ALL_FLAGS}
 .  if defined(FLAGS_SINGLE_${f})
 _COMPLETE_FLAGS+=	${FLAGS_SINGLE_${f}}
 OPTIONS_SINGLE_${f}=	${FLAGS_SINGLE_${f}}
 .  endif
 .  if defined(FLAGS_MULTI_${f})
 _COMPLETE_FLAGS+=	${FLAGS_MULTI_${f}}
 OPTIONS_MULTI_${f}=	${FLAGS_MULTI_${f}}
 .  endif
 .endfor
 
 .include <bsd.port.options.mk>
 
 .for f in ${_COMPLETE_FLAGS}
 .  if defined(${f}_FLAG_DEPENDS)
 .    for r in ${${f}_FLAG_DEPENDS}
 .      if !${PORT_OPTIONS:M${r}}
 _${f}_DEPENDS_FAIL=	yes
 .      endif
 .    endfor
 .  endif
 .  if ${PORT_OPTIONS:M${f}} && !defined(_${f}_DEPENDS_FAIL)
 .    if defined(${f}_FLAG_ENABLE)
 CONFIGURE_ARGS+=	--flags="${${f}_FLAG_ENABLE}"
 .    endif
 .    if defined(${f}_FLAG_CONFIGURE_ON)
 CONFIGURE_ARGS+=	${${f}_FLAG_CONFIGURE_ON}
 .    endif
 .    if defined(${f}_FLAG_CABAL)
 USE_CABAL+=		${${f}_FLAG_CABAL}
 .    endif
 .    if defined(${f}_FLAG_EXECUTABLE)
 EXECUTABLE+=		${${f}_FLAG_EXECUTABLE}
 .    endif
 .    if defined(${f}_FLAG_LIB)
 LIB_DEPENDS+=		${${f}_FLAG_LIB}
 .    endif
 .    if defined(${f}_FLAG_XORG)
 USE_XORG+=		${${f}_FLAG_XORG}
 .    endif
 .    if defined(${f}_BROKEN)
 BROKEN=			${${f}_BROKEN} with the ${f} flag enabled
 .    endif
 .    if defined(${f}_DYNAMIC_BROKEN) && ${PORT_OPTIONS:MDYNAMIC}
 BROKEN=			${${f}_DYNAMIC_BROKEN}
 .    endif
 .  else
 .    if defined(${f}_FLAG_ENABLE)
 CONFIGURE_ARGS+=	--flags="-${${f}_FLAG_ENABLE}"
 .    endif
 .    if defined(${f}_FLAG_CONFIGURE_OFF)
 CONFIGURE_ARGS+=	${${f}_FLAG_CONFIGURE_OFF}
 .    endif
 .  endif
 .endfor
 
 .if defined(FLAGS_ENABLE)
 CONFIGURE_ARGS+=	--flags="${FLAGS_ENABLE}"
 .endif
 
 .if defined(FLAGS_DISABLE)
 .  for f in ${FLAGS_DISABLE}
 CONFIGURE_ARGS+=	--flags="-${f}"
 .  endfor
 .endif
Index: head/print/hs-hscolour/Makefile
===================================================================
--- head/print/hs-hscolour/Makefile	(revision 409205)
+++ head/print/hs-hscolour/Makefile	(revision 409206)
@@ -1,17 +1,17 @@
 # Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	hscolour
-PORTVERSION=	1.23
+PORTVERSION=	${HSCOLOUR_VERSION}
 PORTEPOCH=	1
 CATEGORIES=	print haskell
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	Colourise Haskell code
 
 LICENSE=	GPLv2
 
 EXECUTABLE=	HsColour
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>