kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- A couple of fixes for bsd.cabal.mk:

Browse source 
- Retire USE_GHC_NATIVE: it is not needed any more
  - Do not rely on DISTNAME for setting CABAL_LIBSUBDIR: this caused problems
    when using USE_GITHUB
  - Improve integration with print/hs-hscolour

Obtained from:	FreeBSD Haskell
This commit is contained in:
Gabor Pali 2016-02-19 20:49:11 +00:00
parent 885b4d44ee
commit dc08613aa9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=409206
4 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ftp/hs-curl/Makefile
View file

@ -12,7 +12,5 @@ LICENSE= BSD3CLAUSE
LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl
USE_GHC_NATIVE= yes
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>

23
lang/ghc/bsd.cabal.mk
View file

@ -9,8 +9,10 @@
# 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
@ -38,14 +40,15 @@ 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}
@ -161,11 +164,6 @@ RUN_DEPENDS+= ${dependencies}
.endif
.if defined(USE_GHC_NATIVE)
USES+= perl5
USE_PERL5= build
.endif
.if ${PORT_OPTIONS:MDOCS}
.if !defined(XMLDOCS)
@ -175,7 +173,6 @@ 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
@ -332,7 +329,7 @@ add-plist-cabal:
.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
@ -342,7 +339,7 @@ add-plist-cabal:
.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

2
lang/ghc/bsd.cabal.options.mk
View file

@ -21,6 +21,8 @@ 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

2
print/hs-hscolour/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= hscolour
PORTVERSION= 1.23
PORTVERSION= ${HSCOLOUR_VERSION}
PORTEPOCH= 1
CATEGORIES= print haskell