diff options
| author | Gabor Pali <pgj@FreeBSD.org> | 2009-09-02 15:38:45 +0000 |
|---|---|---|
| committer | Gabor Pali <pgj@FreeBSD.org> | 2009-09-02 15:38:45 +0000 |
| commit | 7d5781e5ab3aa2c4d9f46985acec697caae1c173 (patch) | |
| tree | fb0e55efa60858746649977ee5813f549bfbad04 /devel | |
| parent | 9acc5ac910695e85c7d24401bfecd5d6e6da0d7f (diff) | |
| download | ports-7d5781e5ab3aa2c4d9f46985acec697caae1c173.tar.gz ports-7d5781e5ab3aa2c4d9f46985acec697caae1c173.zip | |
Notes
Diffstat (limited to 'devel')
108 files changed, 1885 insertions, 706 deletions
diff --git a/devel/Makefile b/devel/Makefile index 2d8afb56c169..61a9399131f3 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -504,6 +504,7 @@ SUBDIR += hp48cc SUBDIR += hp48xgcc SUBDIR += hptools + SUBDIR += hs-QuickCheck SUBDIR += hs-Stream SUBDIR += hs-alex SUBDIR += hs-binary-ghc @@ -511,16 +512,21 @@ SUBDIR += hs-cpphs SUBDIR += hs-dlist SUBDIR += hs-drift + SUBDIR += hs-ghc-paths + SUBDIR += hs-ghc-paths-docs SUBDIR += hs-haddock SUBDIR += hs-haddock-docs SUBDIR += hs-happy + SUBDIR += hs-haskeline SUBDIR += hs-hat SUBDIR += hs-hdoc SUBDIR += hs-hmake SUBDIR += hs-idoc SUBDIR += hs-language-c-ghc SUBDIR += hs-lazysmallcheck-ghc + SUBDIR += hs-mmap SUBDIR += hs-pcre-light-ghc + SUBDIR += hs-readline SUBDIR += hs-utf8-string-ghc SUBDIR += hs-uuagc SUBDIR += hs-uulib diff --git a/devel/darcs/Makefile b/devel/darcs/Makefile index 40ee4165bf97..98c1f6f743a2 100644 --- a/devel/darcs/Makefile +++ b/devel/darcs/Makefile @@ -7,7 +7,7 @@ PORTNAME= darcs PORTVERSION= 2.2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= http://darcs.net/ @@ -21,8 +21,7 @@ LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \ OPTIONS= SERVER "install server" on GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ - LDFLAGS="-L${LOCALBASE}/lib -L${PREFIX}/lib/ ${PTHREAD_LIBS}" \ - CFLAGS="" + LDFLAGS="-L${LOCALBASE}/lib -L${PREFIX}/lib/ ${PTHREAD_LIBS}" USE_GMAKE= yes MAKEFILE= GNUmakefile INSTALL_TARGET= install diff --git a/devel/darcs/pkg-plist b/devel/darcs/pkg-plist index 90fb275f77e6..5897cd25d12e 100644 --- a/devel/darcs/pkg-plist +++ b/devel/darcs/pkg-plist @@ -1,3 +1,4 @@ +@comment $FreeBSD$ bin/darcs etc/bash_completion.d/darcs %%SERVER%%%%CGIDIR%%/darcs.cgi diff --git a/devel/hs-QuickCheck/Makefile b/devel/hs-QuickCheck/Makefile new file mode 100644 index 000000000000..94e0eeaf91e6 --- /dev/null +++ b/devel/hs-QuickCheck/Makefile @@ -0,0 +1,74 @@ +# New ports collection makefile for: hs-QuickCheck +# Date created: July 09 2009 +# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com> +# +# $FreeBSD$ + +PORTNAME= QuickCheck +PORTVERSION= 2.1.0.1 +CATEGORIES= devel haskell +MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ +PKGNAMEPREFIX= hs- + +MAINTAINER= jacula@gmail.com +COMMENT= Library for random testing in haskell + +BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc +RUN_DEPENDS+= ghc:${PORTSDIR}/lang/ghc + +GHC_VERSION= 6.10.4 +QUICKCHECK_VERSION= ${PORTVERSION} + +GHC_CMD= ${LOCALBASE}/bin/ghc +SETUP_CMD= ./setup + +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +QUICKCHECK_LIBDIR_REL= lib/${DISTNAME} + +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + QUICKCHECK_VERSION=${QUICKCHECK_VERSION} \ + QUICKCHECK_LIBDIR_REL=${QUICKCHECK_LIBDIR_REL} + +.if defined(NOPORTDOCS) +PLIST_SUB+= NOPORTDOCS="" +.else +PLIST_SUB+= NOPORTDOCS="@comment " +.endif + +.if !defined(NOPORTDOCS) + +PORT_HADDOCK!= (cd ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK) +.if !empty(PORT_HADDOCK:M?0) +BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock +.endif +BUILD_DEPENDS+= HsColour:${PORTSDIR}/print/hs-hscolour + +HSCOLOUR_VERSION= 1.13 +HSCOLOUR_DATADIR= ${PREFIX}/share/hscolour-${HSCOLOUR_VERSION} + +PORTDOCS= * +.endif + +.SILENT: + +do-configure: + cd ${WRKSRC} && ${GHC_CMD} --make Setup.lhs -o setup -package Cabal \ + && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX} + +do-build: + cd ${WRKSRC} && ${SETUP_CMD} build \ + && ${SETUP_CMD} register --gen-script + +.if !defined(NOPORTDOCS) + cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \ + --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css +.endif + +do-install: + cd ${WRKSRC} && ${SETUP_CMD} install \ + && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${QUICKCHECK_LIBDIR_REL}/register.sh + +post-install: + ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old + +.include <bsd.port.mk> diff --git a/devel/hs-QuickCheck/distinfo b/devel/hs-QuickCheck/distinfo new file mode 100644 index 000000000000..584b4c8a437f --- /dev/null +++ b/devel/hs-QuickCheck/distinfo @@ -0,0 +1,3 @@ +MD5 (QuickCheck-2.1.0.1.tar.gz) = 9fbf2948ef7fefc8a6e5dd945156a7dd +SHA256 (QuickCheck-2.1.0.1.tar.gz) = f99edf1a45315e90c9ec672d5d959d5878dcc1de65678c6aed85829a896b75f1 +SIZE (QuickCheck-2.1.0.1.tar.gz) = 17476 diff --git a/devel/hs-QuickCheck/files/patch-QuickCheck.cabal b/devel/hs-QuickCheck/files/patch-QuickCheck.cabal new file mode 100644 index 000000000000..69fd96db9f44 --- /dev/null +++ b/devel/hs-QuickCheck/files/patch-QuickCheck.cabal @@ -0,0 +1,11 @@ +--- QuickCheck.cabal.orig 2009-07-15 09:22:34.000000000 +0000 ++++ QuickCheck.cabal 2009-07-15 09:22:38.000000000 +0000 +@@ -30,7 +30,7 @@ + library + Build-depends: mtl + if flag(splitBase) +- Build-depends: base >= 3, random ++ Build-depends: base >= 3, base < 4, random + else + Build-depends: base < 3 + Exposed-Modules: diff --git a/devel/hs-QuickCheck/pkg-descr b/devel/hs-QuickCheck/pkg-descr new file mode 100644 index 000000000000..f940f045d589 --- /dev/null +++ b/devel/hs-QuickCheck/pkg-descr @@ -0,0 +1,10 @@ +QuickCheck is a library for random testing of program properties. The programmer +provides a specification of the program, in the form of properties which +functions should satisfy, and QuickCheck then tests that the properties hold in +a large number of randomly generated cases. + +Specifications are expressed in Haskell, using combinators defined in the +QuickCheck library. QuickCheck provides combinators to define properties, +observe the distribution of test data, and define test data generators. + +WWWW: http://www.cs.chalmers.se/~koen diff --git a/devel/hs-QuickCheck/pkg-plist b/devel/hs-QuickCheck/pkg-plist new file mode 100644 index 000000000000..665c1f7baa83 --- /dev/null +++ b/devel/hs-QuickCheck/pkg-plist @@ -0,0 +1,25 @@ +@comment $FreeBSD$ +%%QUICKCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSQuickCheck-%%QUICKCHECK_VERSION%%.o +%%QUICKCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/QuickCheck.hi +%%QUICKCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/QuickCheck/Arbitrary.hi +%%QUICKCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/QuickCheck/Exception.hi +%%QUICKCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/QuickCheck/Function.hi +%%QUICKCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/QuickCheck/Gen.hi +%%QUICKCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/QuickCheck/Monadic.hi +%%QUICKCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/QuickCheck/Poly.hi +%%QUICKCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/QuickCheck/Property.hi +%%QUICKCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/QuickCheck/State.hi +%%QUICKCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/QuickCheck/Test.hi +%%QUICKCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/QuickCheck/Text.hi +%%QUICKCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSQuickCheck-%%QUICKCHECK_VERSION%%.a +%%QUICKCHECK_LIBDIR_REL%%/register.sh +%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE +%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrm %%QUICKCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/QuickCheck +@dirrm %%QUICKCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test +@dirrm %%QUICKCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%% +@dirrm %%QUICKCHECK_LIBDIR_REL%% +@exec /bin/sh %D/%%QUICKCHECK_LIBDIR_REL%%/register.sh +@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old +@unexec %D/bin/ghc-pkg unregister QuickCheck-%%QUICKCHECK_VERSION%% +@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old diff --git a/devel/hs-Stream/Makefile b/devel/hs-Stream/Makefile index a611daba372f..9a2bcbdd1050 100644 --- a/devel/hs-Stream/Makefile +++ b/devel/hs-Stream/Makefile @@ -5,8 +5,7 @@ # $FreeBSD$ PORTNAME= Stream -PORTVERSION= 0.2.6 -PORTREVISION= 1 +PORTVERSION= 0.3.2 CATEGORIES= devel haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ \ http://carte.kerneled.org/mirror/ @@ -15,24 +14,67 @@ PKGNAMEPREFIX= hs- MAINTAINER= haskell@FreeBSD.org COMMENT= A Haskell library for manipulating infinite lists -BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc +BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \ + hs-QuickCheck>=2.0:${PORTSDIR}/devel/hs-QuickCheck \ + hs-lazysmallcheck-ghc>=0.3:${PORTSDIR}/devel/hs-lazysmallcheck-ghc +RUN_DEPENDS+= ghc:${PORTSDIR}/lang/ghc \ + hs-QuickCheck>=2.0:${PORTSDIR}/devel/hs-QuickCheck \ + hs-lazysmallcheck-ghc>=0.3:${PORTSDIR}/devel/hs-lazysmallcheck-ghc LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4 -CABAL= ${LOCALBASE}/bin/runghc Setup.lhs -GHC_VERSION= `${LOCALBASE}/bin/ghc --numeric-version` -SUBDIR= lib/${PORTNAME}-${PORTVERSION} -PLIST_SUB= GHC_VERSION="${GHC_VERSION}" \ - PORTVERSION=${PORTVERSION} \ - SUBDIR=${SUBDIR} +GHC_VERSION= 6.10.4 +STREAM_VERSION= ${PORTVERSION} + +GHC_CMD= ${LOCALBASE}/bin/ghc +SETUP_CMD= ./setup + +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +STREAM_LIBDIR_REL= lib/${DISTNAME} + +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + STREAM_VERSION=${STREAM_VERSION} \ + STREAM_LIBDIR_REL=${STREAM_LIBDIR_REL} + +.if defined(NOPORTDOCS) +PLIST_SUB+= NOPORTDOCS="" +.else +PLIST_SUB+= NOPORTDOCS="@comment " +.endif + +.if !defined(NOPORTDOCS) + +PORT_HADDOCK!= (cd ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK) +.if !empty(PORT_HADDOCK:M?0) +BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock +.endif +BUILD_DEPENDS+= HsColour:${PORTSDIR}/print/hs-hscolour + +HSCOLOUR_VERSION= 1.13 +HSCOLOUR_DATADIR= ${PREFIX}/share/hscolour-${HSCOLOUR_VERSION} + +PORTDOCS= * +.endif + +.SILENT: do-configure: - cd ${WRKSRC} && ${CABAL} configure --prefix=${PREFIX} --ghc + cd ${WRKSRC} && ${GHC_CMD} --make Setup.lhs -o setup -package Cabal \ + && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX} do-build: - cd ${WRKSRC} && ${CABAL} build && ${CABAL} register --gen-script + cd ${WRKSRC} && ${SETUP_CMD} build \ + && ${SETUP_CMD} register --gen-script + +.if !defined(NOPORTDOCS) + cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \ + --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css +.endif do-install: - cd ${WRKSRC} && ${CABAL} install - ${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${PREFIX}/${SUBDIR}/register.sh + cd ${WRKSRC} && ${SETUP_CMD} install \ + && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${STREAM_LIBDIR_REL}/register.sh + +post-install: + ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old .include <bsd.port.mk> diff --git a/devel/hs-Stream/distinfo b/devel/hs-Stream/distinfo index b0a810ee98de..5fdcbc3c2be2 100644 --- a/devel/hs-Stream/distinfo +++ b/devel/hs-Stream/distinfo @@ -1,3 +1,3 @@ -MD5 (Stream-0.2.6.tar.gz) = 04a52fe84381c60c8830dac83915ae83 -SHA256 (Stream-0.2.6.tar.gz) = ce2b94a81a91497d024177654521d219aaab4462a381eb70c8199fefbb52edde -SIZE (Stream-0.2.6.tar.gz) = 4885 +MD5 (Stream-0.3.2.tar.gz) = ff6546da67f3e7e024e69ba31c427460 +SHA256 (Stream-0.3.2.tar.gz) = 2a9a394ffd8f0172c4491181c4b5977804b33d6465faad0cd5684bbf99721f4b +SIZE (Stream-0.3.2.tar.gz) = 5899 diff --git a/devel/hs-Stream/pkg-plist b/devel/hs-Stream/pkg-plist index 374bf4bba375..b2dd98089cc1 100644 --- a/devel/hs-Stream/pkg-plist +++ b/devel/hs-Stream/pkg-plist @@ -1,13 +1,14 @@ -%%SUBDIR%%/ghc-%%GHC_VERSION%%/libHSStream-%%PORTVERSION%%.a -%%SUBDIR%%/ghc-%%GHC_VERSION%%/HSStream-%%PORTVERSION%%.o -%%SUBDIR%%/ghc-%%GHC_VERSION%%/Data/Stream.hi -%%SUBDIR%%/register.sh -share/doc/Stream-%%PORTVERSION%%/LICENSE -@dirrm share/doc/Stream-%%PORTVERSION%% -@dirrm lib/Stream-%%PORTVERSION%%/ghc-%%GHC_VERSION%%/Data -@dirrm lib/Stream-%%PORTVERSION%%/ghc-%%GHC_VERSION%% -@dirrm lib/Stream-%%PORTVERSION%% -@exec /bin/sh %D/%%SUBDIR%%/register.sh +@comment $FreeBSD$ +%%STREAM_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Stream.hi +%%STREAM_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSStream-%%STREAM_VERSION%%.o +%%STREAM_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSStream-%%STREAM_VERSION%%.a +%%STREAM_LIBDIR_REL%%/register.sh +%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE +%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrm %%STREAM_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data +@dirrm %%STREAM_LIBDIR_REL%%/ghc-%%GHC_VERSION%% +@dirrm %%STREAM_LIBDIR_REL%% +@exec /bin/sh %D/%%STREAM_LIBDIR_REL%%/register.sh @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old @unexec %D/bin/ghc-pkg unregister Stream @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old diff --git a/devel/hs-alex/Makefile b/devel/hs-alex/Makefile index ab4bc067650f..39ed628b053b 100644 --- a/devel/hs-alex/Makefile +++ b/devel/hs-alex/Makefile @@ -6,7 +6,7 @@ PORTNAME= alex PORTVERSION= 2.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/alex/${PORTVERSION}/ PKGNAMEPREFIX= hs- @@ -15,6 +15,7 @@ MAINTAINER= haskell@FreeBSD.org COMMENT= Alex is a tool for generating lexical analysers in Haskell BUILD_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc +LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4 .if !defined(NOPORTDOCS) BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/html:${PORTSDIR}/textproc/docbook-xsl \ diff --git a/devel/hs-alex/pkg-plist b/devel/hs-alex/pkg-plist index 85bf58ac4e24..59f5fa1f6abb 100644 --- a/devel/hs-alex/pkg-plist +++ b/devel/hs-alex/pkg-plist @@ -1,3 +1,4 @@ +@comment $FreeBSD$ bin/alex %%SUBDIR%%/AlexTemplate %%SUBDIR%%/AlexTemplate-debug diff --git a/devel/hs-binary-ghc/Makefile b/devel/hs-binary-ghc/Makefile index b3ab4a926f01..fb6993993b6f 100644 --- a/devel/hs-binary-ghc/Makefile +++ b/devel/hs-binary-ghc/Makefile @@ -7,6 +7,7 @@ PORTNAME= binary PORTVERSION= 0.5.0.1 +PORTREVISION= 1 CATEGORIES= devel haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ PKGNAMEPREFIX= hs- @@ -18,38 +19,60 @@ COMMENT= Efficient binary serialisation for Haskell BUILD_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc RUN_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc -GHC_VERSION= 6.8.3 -CABALCMD= ${LOCALBASE}/bin/runghc Setup.lhs -CABALDIR= lib/ghc-${GHC_VERSION}/cabal +GHC_VERSION= 6.10.4 -SUBDIR= lib/${PORTNAME}-${PORTVERSION} -PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ - PORTNAME=${PORTNAME} \ - PORTVERSION=${PORTVERSION} \ - SUBDIR=${CABALDIR} -DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION} -PORTDOCS= LICENSE html +BINARY_VERSION= ${PORTVERSION} -CONFIGURE_ARGS= --ghc --prefix=${PREFIX} --libdir=${PREFIX}/${CABALDIR} --libsubdir='' --datasubdir='' +GHC_CMD= ${LOCALBASE}/bin/ghc +SETUP_CMD= ./setup + +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +BINARY_LIBDIR_REL= lib/${DISTNAME} + +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + BINARY_VERSION=${BINARY_VERSION} \ + BINARY_LIBDIR_REL=${BINARY_LIBDIR_REL} + +.if defined(NOPORTDOCS) +PLIST_SUB+= NOPORTDOCS="" +.else +PLIST_SUB+= NOPORTDOCS="@comment " +.endif .if !defined(NOPORTDOCS) + +PORT_HADDOCK!= (cd ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK) +.if !empty(PORT_HADDOCK:M?0) BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock -PLIST_SUB+= RMLIC="@comment " -.else -PLIST_SUB+= RMLIC="" .endif +BUILD_DEPENDS+= HsColour:${PORTSDIR}/print/hs-hscolour +HSCOLOUR_VERSION= 1.13 +HSCOLOUR_DATADIR= ${PREFIX}/share/hscolour-${HSCOLOUR_VERSION} + +PORTDOCS= * +.endif + +.SILENT: + do-configure: - cd ${WRKSRC} && ${CABALCMD} configure ${CONFIGURE_ARGS} + cd ${WRKSRC} && ${GHC_CMD} --make Setup.lhs -o setup -package Cabal \ + && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX} do-build: - cd ${WRKSRC} && ${CABALCMD} build && ${CABALCMD} --gen-script register + cd ${WRKSRC} && ${SETUP_CMD} build \ + && ${SETUP_CMD} register --gen-script + .if !defined(NOPORTDOCS) - cd ${WRKSRC} && ${CABALCMD} haddock + cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \ + --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css .endif do-install: - cd ${WRKSRC} && ${CABALCMD} install - ${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${PREFIX}/${CABALDIR}/${PORTNAME}-register.sh + cd ${WRKSRC} && ${SETUP_CMD} install \ + && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${BINARY_LIBDIR_REL}/register.sh + +post-install: + ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old .include <bsd.port.mk> diff --git a/devel/hs-binary-ghc/pkg-plist b/devel/hs-binary-ghc/pkg-plist index f8567b76455e..63c22b11f80d 100644 --- a/devel/hs-binary-ghc/pkg-plist +++ b/devel/hs-binary-ghc/pkg-plist @@ -1,16 +1,18 @@ @comment $FreeBSD$ -%%SUBDIR%%/Data/Binary.hi -%%SUBDIR%%/Data/Binary/Builder.hi -%%SUBDIR%%/Data/Binary/Get.hi -%%SUBDIR%%/Data/Binary/Put.hi -%%SUBDIR%%/HS%%PORTNAME%%-%%PORTVERSION%%.o -%%SUBDIR%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a -%%SUBDIR%%/%%PORTNAME%%-register.sh -@dirrmtry %%SUBDIR%%/Data/Binary -@dirrmtry %%SUBDIR%%/Data -%%RMLIC%%%%DOCSDIR%%/LICENSE -%%RMLIC%%@dirrm %%DOCSDIR%% -@exec sh %D/%%SUBDIR%%/%%PORTNAME%%-register.sh -@exec rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old -@unexec ghc-pkg unregister %%PORTNAME%% -@unexec rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old +%%BINARY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Binary.hi +%%BINARY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Binary/Builder.hi +%%BINARY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Binary/Get.hi +%%BINARY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Binary/Put.hi +%%BINARY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSbinary-%%BINARY_VERSION%%.o +%%BINARY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSbinary-%%BINARY_VERSION%%.a +%%BINARY_LIBDIR_REL%%/register.sh +%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE +%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrm %%BINARY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Binary +@dirrm %%BINARY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data +@dirrm %%BINARY_LIBDIR_REL%%/ghc-%%GHC_VERSION%% +@dirrm %%BINARY_LIBDIR_REL%% +@exec /bin/sh %D/%%BINARY_LIBDIR_REL%%/register.sh +@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old +@unexec %D/bin/ghc-pkg unregister binary +@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old diff --git a/devel/hs-binary/Makefile b/devel/hs-binary/Makefile index b3ab4a926f01..fb6993993b6f 100644 --- a/devel/hs-binary/Makefile +++ b/devel/hs-binary/Makefile @@ -7,6 +7,7 @@ PORTNAME= binary PORTVERSION= 0.5.0.1 +PORTREVISION= 1 CATEGORIES= devel haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ PKGNAMEPREFIX= hs- @@ -18,38 +19,60 @@ COMMENT= Efficient binary serialisation for Haskell BUILD_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc RUN_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc -GHC_VERSION= 6.8.3 -CABALCMD= ${LOCALBASE}/bin/runghc Setup.lhs -CABALDIR= lib/ghc-${GHC_VERSION}/cabal +GHC_VERSION= 6.10.4 -SUBDIR= lib/${PORTNAME}-${PORTVERSION} -PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ - PORTNAME=${PORTNAME} \ - PORTVERSION=${PORTVERSION} \ - SUBDIR=${CABALDIR} -DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION} -PORTDOCS= LICENSE html +BINARY_VERSION= ${PORTVERSION} -CONFIGURE_ARGS= --ghc --prefix=${PREFIX} --libdir=${PREFIX}/${CABALDIR} --libsubdir='' --datasubdir='' +GHC_CMD= ${LOCALBASE}/bin/ghc +SETUP_CMD= ./setup + +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +BINARY_LIBDIR_REL= lib/${DISTNAME} + +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + BINARY_VERSION=${BINARY_VERSION} \ + BINARY_LIBDIR_REL=${BINARY_LIBDIR_REL} + +.if defined(NOPORTDOCS) +PLIST_SUB+= NOPORTDOCS="" +.else +PLIST_SUB+= NOPORTDOCS="@comment " +.endif .if !defined(NOPORTDOCS) + +PORT_HADDOCK!= (cd ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK) +.if !empty(PORT_HADDOCK:M?0) BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock -PLIST_SUB+= RMLIC="@comment " -.else -PLIST_SUB+= RMLIC="" .endif +BUILD_DEPENDS+= HsColour:${PORTSDIR}/print/hs-hscolour +HSCOLOUR_VERSION= 1.13 +HSCOLOUR_DATADIR= ${PREFIX}/share/hscolour-${HSCOLOUR_VERSION} + +PORTDOCS= * +.endif + +.SILENT: + do-configure: - cd ${WRKSRC} && ${CABALCMD} configure ${CONFIGURE_ARGS} + cd ${WRKSRC} && ${GHC_CMD} --make Setup.lhs -o setup -package Cabal \ + && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX} do-build: - cd ${WRKSRC} && ${CABALCMD} build && ${CABALCMD} --gen-script register + cd ${WRKSRC} && ${SETUP_CMD} build \ + && ${SETUP_CMD} register --gen-script + .if !defined(NOPORTDOCS) - cd ${WRKSRC} && ${CABALCMD} haddock + cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \ + --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css .endif do-install: - cd ${WRKSRC} && ${CABALCMD} install - ${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${PREFIX}/${CABALDIR}/${PORTNAME}-register.sh + cd ${WRKSRC} && ${SETUP_CMD} install \ + && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${BINARY_LIBDIR_REL}/register.sh + +post-install: + ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old .include <bsd.port.mk> diff --git a/devel/hs-binary/pkg-plist b/devel/hs-binary/pkg-plist index f8567b76455e..63c22b11f80d 100644 --- a/devel/hs-binary/pkg-plist +++ b/devel/hs-binary/pkg-plist @@ -1,16 +1,18 @@ @comment $FreeBSD$ -%%SUBDIR%%/Data/Binary.hi -%%SUBDIR%%/Data/Binary/Builder.hi -%%SUBDIR%%/Data/Binary/Get.hi -%%SUBDIR%%/Data/Binary/Put.hi -%%SUBDIR%%/HS%%PORTNAME%%-%%PORTVERSION%%.o -%%SUBDIR%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a -%%SUBDIR%%/%%PORTNAME%%-register.sh -@dirrmtry %%SUBDIR%%/Data/Binary -@dirrmtry %%SUBDIR%%/Data -%%RMLIC%%%%DOCSDIR%%/LICENSE -%%RMLIC%%@dirrm %%DOCSDIR%% -@exec sh %D/%%SUBDIR%%/%%PORTNAME%%-register.sh -@exec rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old -@unexec ghc-pkg unregister %%PORTNAME%% -@unexec rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old +%%BINARY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Binary.hi +%%BINARY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Binary/Builder.hi +%%BINARY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Binary/Get.hi +%%BINARY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Binary/Put.hi +%%BINARY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSbinary-%%BINARY_VERSION%%.o +%%BINARY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSbinary-%%BINARY_VERSION%%.a +%%BINARY_LIBDIR_REL%%/register.sh +%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE +%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrm %%BINARY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Binary +@dirrm %%BINARY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data +@dirrm %%BINARY_LIBDIR_REL%%/ghc-%%GHC_VERSION%% +@dirrm %%BINARY_LIBDIR_REL%% +@exec /bin/sh %D/%%BINARY_LIBDIR_REL%%/register.sh +@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old +@unexec %D/bin/ghc-pkg unregister binary +@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old diff --git a/devel/hs-c2hs/Makefile b/devel/hs-c2hs/Makefile index 83cfd273e6b0..64ca31528b98 100644 --- a/devel/hs-c2hs/Makefile +++ b/devel/hs-c2hs/Makefile @@ -7,7 +7,7 @@ PORTNAME= c2hs PORTVERSION= 0.16.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ PKGNAMEPREFIX= hs- @@ -20,34 +20,56 @@ BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \ RUN_DEPENDS= ghc:${PORTSDIR}/lang/ghc LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4 -.include <bsd.port.pre.mk> +GHC_VERSION= 6.10.4 +C2HS_VERSION= ${PORTVERSION} -GHC_VERSION= 6.8.3 +GHC_CMD= ${LOCALBASE}/bin/ghc +SETUP_CMD= ./setup -# 'owned' by lang/ghc: -CABALDIR= ${PREFIX}/${SUBDIR} -CABALCMD= ${LOCALBASE}/bin/runghc Setup.hs -SUBDIR= lib/ghc-${GHC_VERSION}/cabal +DATADIR= ${PREFIX}/share/${DISTNAME} +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +C2HS_LIBDIR_REL= lib/${DISTNAME} -PLIST_FILES= bin/c2hs ${SUBDIR}/${PORTNAME}/C2HS.hs \ - ${SUBDIR}/${PORTNAME}/doc/c2hs-${PORTVERSION}/COPYING -PLIST_DIRS= ${SUBDIR}/${PORTNAME}/doc/c2hs-${PORTVERSION} ${SUBDIR}/${PORTNAME}/doc \ - ${SUBDIR}/${PORTNAME} +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + C2HS_VERSION=${C2HS_VERSION} \ + C2HS_LIBDIR_REL=${C2HS_LIBDIR_REL} -CONFIGURE_ARGS= --ghc --prefix=${PREFIX} --libdir=${CABALDIR} \ - --datadir=${CABALDIR}/${PORTNAME} \ - --libsubdir='' --datasubdir='' +MAN1= c2hs.1 + +.if defined(NOPORTDOCS) +PLIST_SUB+= NOPORTDOCS="" +.else +PLIST_SUB+= NOPORTDOCS="@comment " +.endif + +.if !defined(NOPORTDOCS) +BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/html:${PORTSDIR}/textproc/docbook-xsl \ + ${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt +USE_GMAKE= yes +PORTDOCS= COPYING users_guide +.endif + +.SILENT: do-configure: - cd ${WRKSRC} && ${CABALCMD} configure ${CONFIGURE_ARGS} + cd ${WRKSRC} && ${GHC_CMD} --make Setup.hs -o setup -package Cabal \ + && ${SETUP_CMD} configure --prefix=${PREFIX} do-build: - cd ${WRKSRC} && ${CABALCMD} build + cd ${WRKSRC} && ${SETUP_CMD} build + +.if !defined(NOPORTDOCS) + @(cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} html) +.endif do-install: - cd ${WRKSRC} && ${CABALCMD} install + cd ${WRKSRC} && ${SETUP_CMD} install \ + && ${INSTALL_MAN} ${WRKSRC}/doc/man1/c2hs.1 ${PREFIX}/man/man1 +.if !defined(NOPORTDOCS) + @(cd ${WRKSRC}/doc && ${CP} -R users_guide ${DOCSDIR}) +.endif post-install: - @${STRIP_CMD} ${PREFIX}/bin/c2hs + ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/hs-c2hs/pkg-plist b/devel/hs-c2hs/pkg-plist new file mode 100644 index 000000000000..6b2a303cac68 --- /dev/null +++ b/devel/hs-c2hs/pkg-plist @@ -0,0 +1,6 @@ +@comment $FreeBSD$ +bin/c2hs +%%DATADIR%%/C2HS.hs +%%NOPORTDOCS%%%%DOCSDIR%%/COPYING +%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrm %%DATADIR%% diff --git a/devel/hs-cpphs/Makefile b/devel/hs-cpphs/Makefile index 09d85b1d1b05..7676e04e0d95 100644 --- a/devel/hs-cpphs/Makefile +++ b/devel/hs-cpphs/Makefile @@ -6,8 +6,7 @@ # PORTNAME= cpphs -PORTVERSION= 1.6 -PORTREVISION= 1 +PORTVERSION= 1.7 CATEGORIES= devel haskell MASTER_SITES= http://www.cs.york.ac.uk/fp/cpphs/ PKGNAMEPREFIX= hs- @@ -16,17 +15,68 @@ MAINTAINER= haskell@FreeBSD.org COMMENT= A simplified re-implementation of cpp in Haskell BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc +RUN_DEPENDS= ghc:${PORTSDIR}/lang/ghc LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4 -PLIST_FILES= bin/cpphs +GHC_VERSION= 6.10.4 +CPPHS_VERSION= ${PORTVERSION} + +GHC_CMD= ${LOCALBASE}/bin/ghc +SETUP_CMD= ./setup + +DATADIR= ${PREFIX}/share/${DISTNAME} +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +CPPHS_LIBDIR_REL= lib/${DISTNAME} + +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + CPPHS_VERSION=${CPPHS_VERSION} \ + CPPHS_LIBDIR_REL=${CPPHS_LIBDIR_REL} MAN1= cpphs.1 +.if defined(NOPORTDOCS) +PLIST_SUB+= NOPORTDOCS="" +.else +PLIST_SUB+= NOPORTDOCS="@comment " +.endif + +.if !defined(NOPORTDOCS) + +PORT_HADDOCK!= (cd ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK) +.if !empty(PORT_HADDOCK:M?0) +BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock +.endif + +BUILD_DEPENDS+= HsColour:${PORTSDIR}/print/hs-hscolour +HSCOLOUR_VERSION= 1.13 +HSCOLOUR_DATADIR= ${PREFIX}/share/hscolour-${HSCOLOUR_VERSION} + +PORTDOCS= * +.endif + +.SILENT: + +do-configure: + cd ${WRKSRC} && ${GHC_CMD} --make Setup.hs -o setup -package Cabal \ + && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX} + do-build: - @(cd ${WRKSRC} && ghc -o cpphs --make cpphs) + cd ${WRKSRC} && ${SETUP_CMD} build \ + && ${SETUP_CMD} register --gen-script + +.if !defined(NOPORTDOCS) + cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source --executables \ + --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css +.endif do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/cpphs ${PREFIX}/bin/cpphs + cd ${WRKSRC} && ${SETUP_CMD} install \ + && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${CPPHS_LIBDIR_REL}/register.sh @${INSTALL_MAN} ${WRKSRC}/docs/cpphs.1 ${PREFIX}/man/man1 + @${MKDIR} ${DATADIR} && ${INSTALL_DATA} ${WRKSRC}/docs/index.html ${DATADIR} \ + && ${INSTALL_DATA} ${WRKSRC}/docs/design ${DATADIR} + +post-install: + ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old .include <bsd.port.mk> diff --git a/devel/hs-cpphs/distinfo b/devel/hs-cpphs/distinfo index 7229b6f1afd4..38a920099ce4 100644 --- a/devel/hs-cpphs/distinfo +++ b/devel/hs-cpphs/distinfo @@ -1,3 +1,3 @@ -MD5 (cpphs-1.6.tar.gz) = 8a7565ff3b2d7bdb594af4c10c594951 -SHA256 (cpphs-1.6.tar.gz) = 2e7c430fde17adbb3905e6d2a3c3845a40349c61a53fcfa40c733e8b43e73295 -SIZE (cpphs-1.6.tar.gz) = 110723 +MD5 (cpphs-1.7.tar.gz) = e76cba8387e7f4747b21fbca4881a78a +SHA256 (cpphs-1.7.tar.gz) = 5c8c94f7a8f6c8441b908532288339196e02141dac1d7c69ea045fd4ac3a6944 +SIZE (cpphs-1.7.tar.gz) = 113724 diff --git a/devel/hs-cpphs/pkg-plist b/devel/hs-cpphs/pkg-plist new file mode 100644 index 000000000000..80cbaac78ecf --- /dev/null +++ b/devel/hs-cpphs/pkg-plist @@ -0,0 +1,33 @@ +@comment $FreeBSD$ +bin/cpphs +%%CPPHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HScpphs-%%CPPHS_VERSION%%.o +%%CPPHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Preprocessor/Cpphs.hi +%%CPPHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Preprocessor/Cpphs/CppIfdef.hi +%%CPPHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Preprocessor/Cpphs/HashDefine.hi +%%CPPHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Preprocessor/Cpphs/MacroPass.hi +%%CPPHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Preprocessor/Cpphs/Options.hi +%%CPPHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Preprocessor/Cpphs/Position.hi +%%CPPHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Preprocessor/Cpphs/ReadFirst.hi +%%CPPHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Preprocessor/Cpphs/RunCpphs.hi +%%CPPHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Preprocessor/Cpphs/SymTab.hi +%%CPPHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Preprocessor/Cpphs/Tokenise.hi +%%CPPHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Preprocessor/Unlit.hi +%%CPPHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/HuttonMeijer.hi +%%CPPHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHScpphs-%%CPPHS_VERSION%%.a +%%CPPHS_LIBDIR_REL%%/register.sh +%%DATADIR%%/design +%%DATADIR%%/index.html +%%NOPORTDOCS%%%%DOCSDIR%%/LICENCE-LGPL +%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrm %%CPPHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators +@dirrm %%CPPHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text +@dirrm %%CPPHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Preprocessor/Cpphs +@dirrm %%CPPHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Preprocessor +@dirrm %%CPPHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language +@dirrm %%CPPHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%% +@dirrm %%CPPHS_LIBDIR_REL%% +@dirrmtry %%DATADIR%% +@exec /bin/sh %D/%%CPPHS_LIBDIR_REL%%/register.sh +@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old +@unexec %D/bin/ghc-pkg unregister cpphs +@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old diff --git a/devel/hs-darcs/Makefile b/devel/hs-darcs/Makefile index 40ee4165bf97..98c1f6f743a2 100644 --- a/devel/hs-darcs/Makefile +++ b/devel/hs-darcs/Makefile @@ -7,7 +7,7 @@ PORTNAME= darcs PORTVERSION= 2.2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= http://darcs.net/ @@ -21,8 +21,7 @@ LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \ OPTIONS= SERVER "install server" on GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ - LDFLAGS="-L${LOCALBASE}/lib -L${PREFIX}/lib/ ${PTHREAD_LIBS}" \ - CFLAGS="" + LDFLAGS="-L${LOCALBASE}/lib -L${PREFIX}/lib/ ${PTHREAD_LIBS}" USE_GMAKE= yes MAKEFILE= GNUmakefile INSTALL_TARGET= install diff --git a/devel/hs-darcs/pkg-plist b/devel/hs-darcs/pkg-plist index 90fb275f77e6..5897cd25d12e 100644 --- a/devel/hs-darcs/pkg-plist +++ b/devel/hs-darcs/pkg-plist @@ -1,3 +1,4 @@ +@comment $FreeBSD$ bin/darcs etc/bash_completion.d/darcs %%SERVER%%%%CGIDIR%%/darcs.cgi diff --git a/devel/hs-dlist/Makefile b/devel/hs-dlist/Makefile index 3c46ed3b6a5f..16eff35b3f6b 100644 --- a/devel/hs-dlist/Makefile +++ b/devel/hs-dlist/Makefile @@ -5,8 +5,7 @@ # $FreeBSD$ PORTNAME= dlist -PORTVERSION= 0.4.1 -PORTREVISION= 1 +PORTVERSION= 0.5 CATEGORIES= devel haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ \ http://carte.kerneled.org/mirror/ @@ -15,24 +14,62 @@ PKGNAMEPREFIX= hs- MAINTAINER= haskell@FreeBSD.org COMMENT= A list-like type supporting O(1) append for Haskell -BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc -LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4 +BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc +RUN_DEPENDS+= ghc:${PORTSDIR}/lang/ghc -CABAL= ${LOCALBASE}/bin/runghc Setup.lhs -GHC_VERSION= `${LOCALBASE}/bin/ghc --numeric-version` -SUBDIR= lib/${PORTNAME}-${PORTVERSION} -PLIST_SUB= GHC_VERSION="${GHC_VERSION}" \ - PORTVERSION=${PORTVERSION} \ - SUBDIR=${SUBDIR} +GHC_VERSION= 6.10.4 +DLIST_VERSION= ${PORTVERSION} + +GHC_CMD= ${LOCALBASE}/bin/ghc +SETUP_CMD= ./setup + +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +DLIST_LIBDIR_REL= lib/${DISTNAME} + +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + DLIST_VERSION=${DLIST_VERSION} \ + DLIST_LIBDIR_REL=${DLIST_LIBDIR_REL} + +.if defined(NOPORTDOCS) +PLIST_SUB+= NOPORTDOCS="" +.else +PLIST_SUB+= NOPORTDOCS="@comment " +.endif + +.if !defined(NOPORTDOCS) + +PORT_HADDOCK!= (cd ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK) +.if !empty(PORT_HADDOCK:M?0) +BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock +.endif +BUILD_DEPENDS+= HsColour:${PORTSDIR}/print/hs-hscolour + +HSCOLOUR_VERSION= 1.13 +HSCOLOUR_DATADIR= ${PREFIX}/share/hscolour-${HSCOLOUR_VERSION} + +PORTDOCS= * +.endif + +.SILENT: do-configure: - cd ${WRKSRC} && ${CABAL} configure --prefix=${PREFIX} --ghc + cd ${WRKSRC} && ${GHC_CMD} --make Setup.lhs -o setup -package Cabal \ + && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX} do-build: - cd ${WRKSRC} && ${CABAL} build && ${CABAL} register --gen-script + cd ${WRKSRC} && ${SETUP_CMD} build \ + && ${SETUP_CMD} register --gen-script + +.if !defined(NOPORTDOCS) + cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \ + --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css +.endif do-install: - cd ${WRKSRC} && ${CABAL} install - ${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${PREFIX}/${SUBDIR}/register.sh + cd ${WRKSRC} && ${SETUP_CMD} install \ + && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${DLIST_LIBDIR_REL}/register.sh + +post-install: + ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old .include <bsd.port.mk> diff --git a/devel/hs-dlist/distinfo b/devel/hs-dlist/distinfo index b48ed2a18362..28c8d5c8fec2 100644 --- a/devel/hs-dlist/distinfo +++ b/devel/hs-dlist/distinfo @@ -1,3 +1,3 @@ -MD5 (dlist-0.4.1.tar.gz) = c1d0bcebbb62a60f56a42cfdc1b32758 -SHA256 (dlist-0.4.1.tar.gz) = 5e3271b7962e002a86c62cd13aa27960ef643cdf87908324a781e9a437898b10 -SIZE (dlist-0.4.1.tar.gz) = 5841 +MD5 (dlist-0.5.tar.gz) = 54f6c18ff689b7ef54e3229dc4a94107 +SHA256 (dlist-0.5.tar.gz) = 4780e5409eff55bbfdd7470ef802a087a04048c9cd5efe0482c82878292f19ea +SIZE (dlist-0.5.tar.gz) = 5962 diff --git a/devel/hs-dlist/pkg-descr b/devel/hs-dlist/pkg-descr index 363c837fd492..1d56e5b0e9b7 100644 --- a/devel/hs-dlist/pkg-descr +++ b/devel/hs-dlist/pkg-descr @@ -1,5 +1,5 @@ Differences lists are a list-like type supporting O(1) append. This is particularly useful for efficient logging and pretty printing, (e.g. -with the Writer monad), where list append quickly becomes too expensive. +with the Writer monad), where list append quickly becomes too expensive. WWW: http://code.haskell.org/~dons/code/dlist/ diff --git a/devel/hs-dlist/pkg-plist b/devel/hs-dlist/pkg-plist index cbb4384f880a..53c530aa32cd 100644 --- a/devel/hs-dlist/pkg-plist +++ b/devel/hs-dlist/pkg-plist @@ -1,13 +1,14 @@ -%%SUBDIR%%/ghc-%%GHC_VERSION%%/libHSdlist-%%PORTVERSION%%.a -%%SUBDIR%%/ghc-%%GHC_VERSION%%/HSdlist-%%PORTVERSION%%.o -%%SUBDIR%%/ghc-%%GHC_VERSION%%/Data/DList.hi -%%SUBDIR%%/register.sh -share/doc/dlist-%%PORTVERSION%%/LICENSE -@dirrm share/doc/dlist-%%PORTVERSION%% -@dirrm lib/dlist-%%PORTVERSION%%/ghc-%%GHC_VERSION%%/Data -@dirrm lib/dlist-%%PORTVERSION%%/ghc-%%GHC_VERSION%% -@dirrm lib/dlist-%%PORTVERSION%% -@exec /bin/sh %D/%%SUBDIR%%/register.sh +@comment $FreeBSD$ +%%DLIST_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/DList.hi +%%DLIST_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSdlist-%%DLIST_VERSION%%.o +%%DLIST_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSdlist-%%DLIST_VERSION%%.a +%%DLIST_LIBDIR_REL%%/register.sh +%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE +%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrm %%DLIST_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data +@dirrm %%DLIST_LIBDIR_REL%%/ghc-%%GHC_VERSION%% +@dirrm %%DLIST_LIBDIR_REL%% +@exec /bin/sh %D/%%DLIST_LIBDIR_REL%%/register.sh @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old @unexec %D/bin/ghc-pkg unregister dlist @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old diff --git a/devel/hs-drift/Makefile b/devel/hs-drift/Makefile index f9adaf0a4264..032d08a91b85 100644 --- a/devel/hs-drift/Makefile +++ b/devel/hs-drift/Makefile @@ -6,6 +6,7 @@ PORTNAME= drift PORTVERSION= 2.2.3 +PORTREVISION= 1 CATEGORIES= devel haskell MASTER_SITES= http://repetae.net/computer/haskell/DrIFT/drop/ PKGNAMEPREFIX= hs- @@ -21,6 +22,7 @@ OPTIONS= NHC98 "Build with nhc98" off \ .if !defined(WITH_NHC98) BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc +LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4 .else BUILD_DEPENDS= nhc98:${PORTSDIR}/lang/nhc98 BROKEN= Does not build diff --git a/devel/hs-ghc-paths-docs/Makefile b/devel/hs-ghc-paths-docs/Makefile new file mode 100644 index 000000000000..42fefe1d2cc6 --- /dev/null +++ b/devel/hs-ghc-paths-docs/Makefile @@ -0,0 +1,46 @@ +# New ports collection makefile for: hs-ghc-paths-docs +# Date created: July 09 2009 +# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com> +# +# $FreeBSD$ + +PORTNAME= ghc-paths +PORTVERSION= 0.1.0.5 +CATEGORIES= devel haskell +MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ +PKGNAMEPREFIX= hs- +PKGNAMESUFFIX= -doc + +MAINTAINER= jacula@gmail.com +COMMENT= Documentation for ghc-paths + +BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \ + HsColour:${PORTSDIR}/print/hs-hscolour +RUN_DEPENDS= hs-ghc-paths=${PORTVERSION}:${PORTSDIR}/devel/hs-ghc-paths + +PORT_HADDOCK!= (cd ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK) +.if !empty(PORT_HADDOCK:M?0) +BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock +.endif + +HSCOLOUR_VERSION= 1.13 +HSCOLOUR_DATADIR= ${PREFIX}/share/hscolour-${HSCOLOUR_VERSION} + +CABAL_CMD= runghc Setup.hs + +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} + +.SILENT: + +do-configure: + cd ${WRKSRC} && ${CABAL_CMD} configure --ghc --haddock-options=-w --prefix=${PREFIX} + +do-build: + cd ${WRKSRC} && ${CABAL_CMD} haddock --executables --hyperlink-source \ + --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css + +do-install: + ${MKDIR} ${DOCSDIR}/html + cd ${WRKSRC}/dist/doc/html/ghc-paths && ${COPYTREE_SHARE} \* ${DOCSDIR}/html + +.include <bsd.port.mk> diff --git a/devel/hs-ghc-paths-docs/distinfo b/devel/hs-ghc-paths-docs/distinfo new file mode 100644 index 000000000000..97b714ae50b3 --- /dev/null +++ b/devel/hs-ghc-paths-docs/distinfo @@ -0,0 +1,3 @@ +MD5 (ghc-paths-0.1.0.5.tar.gz) = 8fdc122e65845d2d53734f78e22c5155 +SHA256 (ghc-paths-0.1.0.5.tar.gz) = ea9e97425894e3dbd7915e00e107e2e7fc07b6e8293fd2dd66a813f0673cba10 +SIZE (ghc-paths-0.1.0.5.tar.gz) = 2304 diff --git a/devel/hs-ghc-paths-docs/pkg-descr b/devel/hs-ghc-paths-docs/pkg-descr new file mode 100644 index 000000000000..5c414bbc3ccf --- /dev/null +++ b/devel/hs-ghc-paths-docs/pkg-descr @@ -0,0 +1,2 @@ +Hyperlinked documentation for the Ghc-Paths libraries. +This documentaion is generated by HsColour and haddock. diff --git a/devel/hs-ghc-paths-docs/pkg-plist b/devel/hs-ghc-paths-docs/pkg-plist new file mode 100644 index 000000000000..82043f7091bd --- /dev/null +++ b/devel/hs-ghc-paths-docs/pkg-plist @@ -0,0 +1,18 @@ +@comment $FreeBSD$ +%%DOCSDIR%%/html/GHC-Paths.html +%%DOCSDIR%%/html/doc-index.html +%%DOCSDIR%%/html/frames.html +%%DOCSDIR%%/html/ghc-paths.haddock +%%DOCSDIR%%/html/haddock-util.js +%%DOCSDIR%%/html/haddock.css +%%DOCSDIR%%/html/haskell_icon.gif +%%DOCSDIR%%/html/index-frames.html +%%DOCSDIR%%/html/index.html +%%DOCSDIR%%/html/mini_GHC-Paths.html +%%DOCSDIR%%/html/minus.gif +%%DOCSDIR%%/html/plus.gif +%%DOCSDIR%%/html/src/GHC-Paths.html +%%DOCSDIR%%/html/src/hscolour.css +@dirrm %%DOCSDIR%%/html/src +@dirrm %%DOCSDIR%%/html +@dirrmtry %%DOCSDIR%% diff --git a/devel/hs-ghc-paths/Makefile b/devel/hs-ghc-paths/Makefile new file mode 100644 index 000000000000..93dc86eac76b --- /dev/null +++ b/devel/hs-ghc-paths/Makefile @@ -0,0 +1,55 @@ +# New ports collection makefile for: hs-ghc-paths +# Date created: July 09 2009 +# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com> +# +# $FreeBSD$ + +PORTNAME= ghc-paths +PORTVERSION= 0.1.0.5 +CATEGORIES= devel haskell +MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ +PKGNAMEPREFIX= hs- + +MAINTAINER= jacula@gmail.com +COMMENT= Utility looking for GHC installation directories + +.if !defined(SLAVE) +BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc +RUN_DEPENDS= ghc:${PORTSDIR}/lang/ghc +.else +NO_PKG_REGISTER= +.endif + +GHC_VERSION= 6.10.4 +GHC-PATHS_VERSION= ${PORTVERSION} + +CABAL_CMD= runghc Setup.hs + +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +GHC-PATHS_LIBDIR_REL= lib/${DISTNAME} + +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + GHC-PATHS_VERSION=${GHC-PATHS_VERSION} \ + GHC-PATHS_LIBDIR_REL=${GHC-PATHS_LIBDIR_REL} + +.SILENT: + +do-configure: + cd ${WRKSRC} && ${CABAL_CMD} configure --ghc --prefix=${PREFIX} + +do-build: + cd ${WRKSRC} && ${CABAL_CMD} build +.if !defined(SLAVE) + cd ${WRKSRC} && ${CABAL_CMD} register --gen-script +.endif + +do-install: + cd ${WRKSRC} && ${CABAL_CMD} install + +post-install: +.if !defined(SLAVE) + ${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${PREFIX}/${GHC-PATHS_LIBDIR_REL}/register.sh +.endif + ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old + +.include <bsd.port.mk> diff --git a/devel/hs-ghc-paths/distinfo b/devel/hs-ghc-paths/distinfo new file mode 100644 index 000000000000..97b714ae50b3 --- /dev/null +++ b/devel/hs-ghc-paths/distinfo @@ -0,0 +1,3 @@ +MD5 (ghc-paths-0.1.0.5.tar.gz) = 8fdc122e65845d2d53734f78e22c5155 +SHA256 (ghc-paths-0.1.0.5.tar.gz) = ea9e97425894e3dbd7915e00e107e2e7fc07b6e8293fd2dd66a813f0673cba10 +SIZE (ghc-paths-0.1.0.5.tar.gz) = 2304 diff --git a/devel/hs-ghc-paths/pkg-descr b/devel/hs-ghc-paths/pkg-descr new file mode 100644 index 000000000000..7ebe02750896 --- /dev/null +++ b/devel/hs-ghc-paths/pkg-descr @@ -0,0 +1,3 @@ +Knowledge of GHC's installation directories. + +WWW: http://hackage.haskell.org/packages/archive/ghc-paths diff --git a/devel/hs-ghc-paths/pkg-plist b/devel/hs-ghc-paths/pkg-plist new file mode 100644 index 000000000000..7068c570320c --- /dev/null +++ b/devel/hs-ghc-paths/pkg-plist @@ -0,0 +1,14 @@ +@comment $FreeBSD$ +%%GHC-PATHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/GHC/Paths.hi +%%GHC-PATHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSghc-paths-%%GHC-PATHS_VERSION%%.o +%%GHC-PATHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSghc-paths-%%GHC-PATHS_VERSION%%.a +%%GHC-PATHS_LIBDIR_REL%%/register.sh +%%DOCSDIR%%/LICENSE +@dirrmtry %%DOCSDIR%% +@dirrm %%GHC-PATHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/GHC +@dirrm %%GHC-PATHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%% +@dirrm %%GHC-PATHS_LIBDIR_REL%% +@exec /bin/sh %D/%%GHC-PATHS_LIBDIR_REL%%/register.sh +@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old +@unexec %D/bin/ghc-pkg unregister ghc-paths +@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old diff --git a/devel/hs-haddock-docs/Makefile b/devel/hs-haddock-docs/Makefile index 51df0fdf1719..f1d53b19e870 100644 --- a/devel/hs-haddock-docs/Makefile +++ b/devel/hs-haddock-docs/Makefile @@ -5,13 +5,13 @@ # $FreeBSD$ # -PORTNAME= haddock-docs -PORTVERSION= 2.1.0 -PORTREVISION= 4 +PORTNAME= haddock +PORTVERSION= 2.4.2 CATEGORIES= devel haskell -MASTER_SITES= http://www.haskell.org/haddock/dist/ +MASTER_SITES= http://www.haskell.org/haddock/dist/ \ + http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ PKGNAMEPREFIX= hs- -DISTNAME= haddock-${PORTVERSION} +PKGNAMESUFFIX= -doc MAINTAINER= haskell@FreeBSD.org COMMENT= Documentation for Haddock @@ -19,22 +19,29 @@ COMMENT= Documentation for Haddock USE_GMAKE= yes USE_AUTOTOOLS= autoconf:262:env -BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc \ - haddock:${PORTSDIR}/devel/hs-haddock \ - HsColour:${PORTSDIR}/print/hs-hscolour - -BUILD_DEPENDS+= ${LOCALBASE}/share/sgml/docbook/dsssl/modular:${PORTSDIR}/textproc/dsssl-docbook-modular \ - docbook<2:${PORTSDIR}/textproc/docbook \ - ${LOCALBASE}/share/sgml/iso8879:${PORTSDIR}/textproc/iso8879 \ - ${LOCALBASE}/share/sgml/docbook/3.1:${PORTSDIR}/textproc/docbook-310 \ - ${LOCALBASE}/share/xsl/docbook/catalog:${PORTSDIR}/textproc/docbook-xsl \ - jade:${PORTSDIR}/textproc/jade \ - xsltproc:${PORTSDIR}/textproc/libxslt +BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \ + HsColour:${PORTSDIR}/print/hs-hscolour \ + hs-ghc-paths>=0.1.0.5:${PORTSDIR}/devel/hs-ghc-paths + +PORT_HADDOCK!= (cd ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK) +.if ${PORT_HADDOCK} == 11 +ECHO_MSG= ${PRINTF} "%b" +IGNORE+= \n\t The ${LOCALBASE}/bin/haddock executable was already installed\n +IGNORE+= \t by the lang/ghc port, setting the option WITH_HADDOCK.\n +IGNORE+= \t You have to reinstall this last one with the right option\n +IGNORE+= \t WITHOUT_HADDOCK.\n\c +.else +BUILD_DEPENDS+= hs-haddock=${PORTVERSION}:${PORTSDIR}/devel/hs-haddock +RUN_DEPENDS= hs-haddock=${PORTVERSION}:${PORTSDIR}/devel/hs-haddock +.endif + +BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/html:${PORTSDIR}/textproc/docbook-xsl \ + ${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//g} CONFIGURE_ARGS= --prefix=${PREFIX} -HSCOLOUR_VERSION= 1.12 +HSCOLOUR_VERSION= 1.13 HSCOLOUR_DATADIR= ${PREFIX}/share/hscolour-${HSCOLOUR_VERSION} CABAL_CMD= runghc Setup.lhs @@ -53,7 +60,7 @@ do-configure: cd ${WRKSRC}/doc && ${AUTOCONF} && ./configure ${CONFIGURE_ARGS} do-build: - cd ${WRKSRC} && ${CABAL_CMD} haddock --executables --hyperlink-source \ + cd ${WRKSRC} && ${CABAL_CMD} haddock --executables --hyperlink-source --executables \ --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css cd ${WRKSRC}/doc && \ ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} html diff --git a/devel/hs-haddock-docs/distinfo b/devel/hs-haddock-docs/distinfo index f2d7b7d109ac..13ad4cb9404e 100644 --- a/devel/hs-haddock-docs/distinfo +++ b/devel/hs-haddock-docs/distinfo @@ -1,3 +1,3 @@ -MD5 (haddock-2.1.0.tar.gz) = 8971b42827758aa06519aeeecbfa30e6 -SHA256 (haddock-2.1.0.tar.gz) = 1b67869e493e56366207a128949998851f975d821e0952c2c717840d2eadaca7 -SIZE (haddock-2.1.0.tar.gz) = 95531 +MD5 (haddock-2.4.2.tar.gz) = c1d5238faac72727921130eb792041a2 +SHA256 (haddock-2.4.2.tar.gz) = dbf0a7d0103a3ce6a91b2a3b96148c1b9c13ea7f8bd74260c21fe98df7839547 +SIZE (haddock-2.4.2.tar.gz) = 103033 diff --git a/devel/hs-haddock-docs/files/patch-src-Haddock-GHC-Typecheck.hs b/devel/hs-haddock-docs/files/patch-src-Haddock-GHC-Typecheck.hs deleted file mode 100644 index dad648dbb311..000000000000 --- a/devel/hs-haddock-docs/files/patch-src-Haddock-GHC-Typecheck.hs +++ /dev/null @@ -1,27 +0,0 @@ ---- src/Haddock/GHC/Typecheck.hs.orig 2008-05-01 15:13:13.000000000 +0200 -+++ src/Haddock/GHC/Typecheck.hs 2008-06-22 16:52:52.000000000 +0200 -@@ -23,6 +23,7 @@ - - import Data.List - -+import FastString - - type CheckedMod = (Module, FilePath, FullyCheckedMod) - -@@ -69,7 +70,7 @@ - mkGhcModule (mod, file, checkedMod) dynflags = GhcModule { - ghcModule = mod, - ghcFilename = file, -- ghcMbDocOpts = mbOpts, -+ ghcMbDocOpts = fmap unpackFS mbOpts, - ghcHaddockModInfo = info, - ghcMbDoc = mbDoc, - ghcGroup = group, -@@ -79,6 +80,6 @@ - ghcInstances = modInfoInstances modInfo - } - where -- HsModule _ _ _ _ _ mbOpts _ _ = unLoc parsed -+ HsModule _ _ _ _ mbOpts _ _ = unLoc parsed - (group, _, mbExports, mbDoc, info) = renamed - (parsed, renamed, _, modInfo) = checkedMod diff --git a/devel/hs-haddock-docs/pkg-message b/devel/hs-haddock-docs/pkg-message index 95365a86cc12..941bf125540c 100644 --- a/devel/hs-haddock-docs/pkg-message +++ b/devel/hs-haddock-docs/pkg-message @@ -3,9 +3,7 @@ WARNING: if the lang/ghc port doesn't install the hyperlinkable documentation for its libraries, then haddock can't know about these. But also in this case haddock can't handle recursive - modules currently, so the lang/ghc port can't install the - hyperlinkable documentation of the HSghc libraries, and then - haddock can't know about these last. + modules currently. In general haddock detects and reports as an error recursive modules and emits chatting warnings listing all the identifiers it couldn't resolve. diff --git a/devel/hs-haddock-docs/pkg-plist b/devel/hs-haddock-docs/pkg-plist index 8b7593649fa9..cec54ce8190e 100644 --- a/devel/hs-haddock-docs/pkg-plist +++ b/devel/hs-haddock-docs/pkg-plist @@ -1,7 +1,7 @@ +@comment $FreeBSD$ %%DOCSDIR%%/html/Distribution-Haddock.html -%%DOCSDIR%%/html/Haddock-DocName.html -%%DOCSDIR%%/html/Haddock-GHC-Utils.html %%DOCSDIR%%/html/doc-index.html +%%DOCSDIR%%/html/frames.html %%DOCSDIR%%/html/haddock-util.js %%DOCSDIR%%/html/haddock.css %%DOCSDIR%%/html/haddock.haddock @@ -11,10 +11,8 @@ %%DOCSDIR%%/html/haddock/Haddock-Backends-HaddockDB.html %%DOCSDIR%%/html/haddock/Haddock-Backends-Hoogle.html %%DOCSDIR%%/html/haddock/Haddock-Backends-Html.html -%%DOCSDIR%%/html/haddock/Haddock-DocName.html %%DOCSDIR%%/html/haddock/Haddock-Exception.html %%DOCSDIR%%/html/haddock/Haddock-GHC-Typecheck.html -%%DOCSDIR%%/html/haddock/Haddock-GHC-Utils.html %%DOCSDIR%%/html/haddock/Haddock-GHC.html %%DOCSDIR%%/html/haddock/Haddock-Interface-AttachInstances.html %%DOCSDIR%%/html/haddock/Haddock-Interface-Create.html @@ -23,7 +21,6 @@ %%DOCSDIR%%/html/haddock/Haddock-InterfaceFile.html %%DOCSDIR%%/html/haddock/Haddock-ModuleTree.html %%DOCSDIR%%/html/haddock/Haddock-Options.html -%%DOCSDIR%%/html/haddock/Haddock-Types.html %%DOCSDIR%%/html/haddock/Haddock-Utils-BlockTable.html %%DOCSDIR%%/html/haddock/Haddock-Utils-FastMutInt2.html %%DOCSDIR%%/html/haddock/Haddock-Utils-Html.html @@ -32,10 +29,35 @@ %%DOCSDIR%%/html/haddock/Main.html %%DOCSDIR%%/html/haddock/Paths_haddock.html %%DOCSDIR%%/html/haddock/doc-index.html +%%DOCSDIR%%/html/haddock/frames.html %%DOCSDIR%%/html/haddock/haddock-util.js %%DOCSDIR%%/html/haddock/haddock.css %%DOCSDIR%%/html/haddock/haskell_icon.gif +%%DOCSDIR%%/html/haddock/index-frames.html %%DOCSDIR%%/html/haddock/index.html +%%DOCSDIR%%/html/haddock/mini_Haddock-Backends-DevHelp.html +%%DOCSDIR%%/html/haddock/mini_Haddock-Backends-HH.html +%%DOCSDIR%%/html/haddock/mini_Haddock-Backends-HH2.html +%%DOCSDIR%%/html/haddock/mini_Haddock-Backends-HaddockDB.html +%%DOCSDIR%%/html/haddock/mini_Haddock-Backends-Hoogle.html +%%DOCSDIR%%/html/haddock/mini_Haddock-Backends-Html.html +%%DOCSDIR%%/html/haddock/mini_Haddock-Exception.html +%%DOCSDIR%%/html/haddock/mini_Haddock-GHC-Typecheck.html +%%DOCSDIR%%/html/haddock/mini_Haddock-GHC.html +%%DOCSDIR%%/html/haddock/mini_Haddock-Interface-AttachInstances.html +%%DOCSDIR%%/html/haddock/mini_Haddock-Interface-Create.html +%%DOCSDIR%%/html/haddock/mini_Haddock-Interface-Rename.html +%%DOCSDIR%%/html/haddock/mini_Haddock-Interface.html +%%DOCSDIR%%/html/haddock/mini_Haddock-InterfaceFile.html +%%DOCSDIR%%/html/haddock/mini_Haddock-ModuleTree.html +%%DOCSDIR%%/html/haddock/mini_Haddock-Options.html +%%DOCSDIR%%/html/haddock/mini_Haddock-Utils-BlockTable.html +%%DOCSDIR%%/html/haddock/mini_Haddock-Utils-FastMutInt2.html +%%DOCSDIR%%/html/haddock/mini_Haddock-Utils-Html.html +%%DOCSDIR%%/html/haddock/mini_Haddock-Utils.html +%%DOCSDIR%%/html/haddock/mini_Haddock-Version.html +%%DOCSDIR%%/html/haddock/mini_Main.html +%%DOCSDIR%%/html/haddock/mini_Paths_haddock.html %%DOCSDIR%%/html/haddock/minus.gif %%DOCSDIR%%/html/haddock/plus.gif %%DOCSDIR%%/html/haddock/src/Haddock-Backends-DevHelp.html @@ -65,13 +87,18 @@ %%DOCSDIR%%/html/haddock/src/Main.html %%DOCSDIR%%/html/haddock/src/hscolour.css %%DOCSDIR%%/html/haskell_icon.gif +%%DOCSDIR%%/html/index-frames.html %%DOCSDIR%%/html/index.html +%%DOCSDIR%%/html/mini_Distribution-Haddock.html %%DOCSDIR%%/html/minus.gif %%DOCSDIR%%/html/plus.gif %%DOCSDIR%%/html/src/Distribution-Haddock.html +%%DOCSDIR%%/html/src/Haddock-DocName.html %%DOCSDIR%%/html/src/Haddock-Exception.html +%%DOCSDIR%%/html/src/Haddock-GHC-Utils.html %%DOCSDIR%%/html/src/Haddock-InterfaceFile.html %%DOCSDIR%%/html/src/Haddock-Types.html +%%DOCSDIR%%/html/src/Haddock-Utils.html %%DOCSDIR%%/html/src/hscolour.css %%DOCSDIR%%/users_guide/ch01s03.html %%DOCSDIR%%/users_guide/ch03s02.html diff --git a/devel/hs-haddock/Makefile b/devel/hs-haddock/Makefile index 55e9b0d735b3..f65f3035e217 100644 --- a/devel/hs-haddock/Makefile +++ b/devel/hs-haddock/Makefile @@ -5,29 +5,28 @@ # $FreeBSD$ PORTNAME= haddock -PORTVERSION= 2.1.0 -PORTREVISION= 2 +PORTVERSION= 2.4.2 CATEGORIES= devel haskell -MASTER_SITES= http://hackage.haskell.org/packages/archive/haddock/${PORTVERSION}/ +MASTER_SITES= http://www.haskell.org/haddock/dist/ \ + http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ PKGNAMEPREFIX= hs- MAINTAINER= haskell@FreeBSD.org COMMENT= A documentation tool for Haskell .if !defined(SLAVE) -BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc - -.if exists(${LOCALBASE}/lib/libreadline.so.6) -LIB_DEPENDS+= readline.6:${PORTSDIR}/devel/readline -.endif - +BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \ + hs-ghc-paths>=0.1.0.5:${PORTSDIR}/devel/hs-ghc-paths +RUN_DEPENDS= ghc:${PORTSDIR}/lang/ghc \ + hs-ghc-paths>=0.1.0.5:${PORTSDIR}/devel/hs-ghc-paths +LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4 .else NO_PKG_REGISTER= .endif WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//g} -GHC_VERSION= 6.8.3 +GHC_VERSION= 6.10.4 HADDOCK_VERSION= ${PORTVERSION} CABAL_CMD= runghc Setup.lhs @@ -42,13 +41,36 @@ PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ HADDOCK_VERSION=${HADDOCK_VERSION} \ DOCSDIR_REL=${DOCSDIR_REL} +.include <bsd.port.pre.mk> + +.if !defined(SLAVE) +PORT_HADDOCK!= (cd ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK) +.if ${PORT_HADDOCK} == 11 +ECHO_MSG= ${PRINTF} "%b" +IGNORE+= \n\t The ${LOCALBASE}/bin/haddock executable was already installed\n +IGNORE+= \t by the lang/ghc port, setting the option WITH_HADDOCK.\n +IGNORE+= \t You have to reinstall this last one with the right option\n +IGNORE+= \t WITHOUT_HADDOCK.\n\c +.elif ${PORT_HADDOCK} == 01 +ECHO_MSG= ${PRINTF} "%b" +IGNORE+= \n\t This port depends on the lang/ghc port, which will install\n +IGNORE+= \t the ${LOCALBASE}/bin/haddock executable, for the WITH_HADDOCK\n +IGNORE+= \t option was set in it. You have to set the WITHOUT_HADDOCK\n +IGNORE+= \t options in lang/ghc before to install devel/hs-haddock.\n\c +.endif +.endif + .SILENT: +post-patch: + @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ + ${WRKSRC}/doc/configure.ac + do-configure: cd ${WRKSRC} && ${CABAL_CMD} configure --ghc --prefix=${PREFIX} do-build: - cd ${WRKSRC} && ${CABAL_CMD} build --ghc-option="-package process-1.0.0.1" + cd ${WRKSRC} && ${CABAL_CMD} build .if !defined(SLAVE) cd ${WRKSRC} && ${CABAL_CMD} register --gen-script .endif @@ -63,4 +85,4 @@ post-install: .endif @${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/devel/hs-haddock/distinfo b/devel/hs-haddock/distinfo index f2d7b7d109ac..13ad4cb9404e 100644 --- a/devel/hs-haddock/distinfo +++ b/devel/hs-haddock/distinfo @@ -1,3 +1,3 @@ -MD5 (haddock-2.1.0.tar.gz) = 8971b42827758aa06519aeeecbfa30e6 -SHA256 (haddock-2.1.0.tar.gz) = 1b67869e493e56366207a128949998851f975d821e0952c2c717840d2eadaca7 -SIZE (haddock-2.1.0.tar.gz) = 95531 +MD5 (haddock-2.4.2.tar.gz) = c1d5238faac72727921130eb792041a2 +SHA256 (haddock-2.4.2.tar.gz) = dbf0a7d0103a3ce6a91b2a3b96148c1b9c13ea7f8bd74260c21fe98df7839547 +SIZE (haddock-2.4.2.tar.gz) = 103033 diff --git a/devel/hs-haddock/files/patch-src-Haddock-GHC-Typecheck.hs b/devel/hs-haddock/files/patch-src-Haddock-GHC-Typecheck.hs deleted file mode 100644 index dad648dbb311..000000000000 --- a/devel/hs-haddock/files/patch-src-Haddock-GHC-Typecheck.hs +++ /dev/null @@ -1,27 +0,0 @@ ---- src/Haddock/GHC/Typecheck.hs.orig 2008-05-01 15:13:13.000000000 +0200 -+++ src/Haddock/GHC/Typecheck.hs 2008-06-22 16:52:52.000000000 +0200 -@@ -23,6 +23,7 @@ - - import Data.List - -+import FastString - - type CheckedMod = (Module, FilePath, FullyCheckedMod) - -@@ -69,7 +70,7 @@ - mkGhcModule (mod, file, checkedMod) dynflags = GhcModule { - ghcModule = mod, - ghcFilename = file, -- ghcMbDocOpts = mbOpts, -+ ghcMbDocOpts = fmap unpackFS mbOpts, - ghcHaddockModInfo = info, - ghcMbDoc = mbDoc, - ghcGroup = group, -@@ -79,6 +80,6 @@ - ghcInstances = modInfoInstances modInfo - } - where -- HsModule _ _ _ _ _ mbOpts _ _ = unLoc parsed -+ HsModule _ _ _ _ mbOpts _ _ = unLoc parsed - (group, _, mbExports, mbDoc, info) = renamed - (parsed, renamed, _, modInfo) = checkedMod diff --git a/devel/hs-haddock/pkg-descr b/devel/hs-haddock/pkg-descr index 51e5466f6a41..309f42816e19 100644 --- a/devel/hs-haddock/pkg-descr +++ b/devel/hs-haddock/pkg-descr @@ -1,11 +1,8 @@ Haddock is a tool for automatically generating documentation from annotated Haskell source code. The documentation generated by Haddock is fully hyperlinked. + Haddock can generate documentation in multiple formats; currently HTML is implemented, and there is partial support for generating DocBook. -author: Simon Marlow, David Waern -maintainer: David Waern <david.waern@gmail.com> -license: BSD3 -exposed-modules: Distribution.Haddock -WWW: http://www.haskell.org/haddock/ +WWW: http://www.haskell.org/haddock/ diff --git a/devel/hs-haddock/pkg-plist b/devel/hs-haddock/pkg-plist index 4c3f560b60c3..c38e4b2b0a98 100644 --- a/devel/hs-haddock/pkg-plist +++ b/devel/hs-haddock/pkg-plist @@ -1,12 +1,17 @@ +@comment $FreeBSD$ bin/haddock %%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Distribution/Haddock.hi %%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HShaddock-%%HADDOCK_VERSION%%.o +%%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/DocName.hi %%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/Exception.hi +%%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/GHC/Utils.hi %%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/InterfaceFile.hi %%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/Types.hi +%%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/Utils.hi %%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHShaddock-%%HADDOCK_VERSION%%.a %%HADDOCK_LIBDIR_REL%%/register.sh %%DOCSDIR%%/LICENSE +%%DATADIR_REL%%/html/frames.html %%DATADIR_REL%%/html/haddock-DEBUG.css %%DATADIR_REL%%/html/haddock-util.js %%DATADIR_REL%%/html/haddock.css @@ -15,12 +20,13 @@ bin/haddock %%DATADIR_REL%%/html/plus.gif @dirrm %%DATADIR_REL%%/html @dirrm %%DATADIR_REL%% -@dirrm %%DOCSDIR%% +@dirrmtry %%DOCSDIR%% +@dirrm %%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/GHC @dirrm %%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock @dirrm %%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Distribution @dirrm %%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%% @dirrm %%HADDOCK_LIBDIR_REL%% -@exec /bin/sh %D/%%HADDOCK_LIBDIR_REL%%/register.sh -@exec rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old -@unexec if [ -x %D/bin/ghc-pkg ]; then %D/bin/ghc-pkg unregister haddock || /usr/bin/true; fi -@unexec if [ -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old ]; then rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old || /usr/bin/true; fi +@exec /bin/sh %%LOCALBASE%%/%%HADDOCK_LIBDIR_REL%%/register.sh +@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old +@unexec %%LOCALBASE%%/bin/ghc-pkg unregister haddock +@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old diff --git a/devel/hs-happy/Makefile b/devel/hs-happy/Makefile index d6a62011b526..5a5932fd6707 100644 --- a/devel/hs-happy/Makefile +++ b/devel/hs-happy/Makefile @@ -5,16 +5,16 @@ # $FreeBSD$ PORTNAME= happy -PORTVERSION= 1.18.2 +PORTVERSION= 1.18.4 CATEGORIES= devel haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ PKGNAMEPREFIX= hs- -DISTNAME= ${PORTNAME}-${PORTVERSION} MAINTAINER= haskell@FreeBSD.org COMMENT= An LALR(1) parser generator for the functional language Haskell BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc +LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4 .if !defined(NOPORTDOCS) BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/html:${PORTSDIR}/textproc/docbook-xsl \ ${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt @@ -23,7 +23,6 @@ PLIST_SUB+= RMLIC="@comment " PLIST_SUB+= RMLIC="" .endif -WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//g} PLIST_SUB+= SUBDIR=share/${PORTNAME}-${PORTVERSION} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION} PORTDOCS= LICENSE html diff --git a/devel/hs-happy/distinfo b/devel/hs-happy/distinfo index d5d637cf0a61..ee24939dbf2b 100644 --- a/devel/hs-happy/distinfo +++ b/devel/hs-happy/distinfo @@ -1,3 +1,3 @@ -MD5 (happy-1.18.2.tar.gz) = adb1679a1fa8cec74a6e621a4a277e98 -SHA256 (happy-1.18.2.tar.gz) = 7515922f3cfd32cd844a0abfefe0b4871f403f0d869b8644bf9cbfc0b67996ae -SIZE (happy-1.18.2.tar.gz) = 158782 +MD5 (happy-1.18.4.tar.gz) = 614e3ef9623dbeefc4c8ca699912efb4 +SHA256 (happy-1.18.4.tar.gz) = 909bec4541a92d3765e74756f752514d2d03ec7a5d3e74c18268a57fe7ffa832 +SIZE (happy-1.18.4.tar.gz) = 157585 diff --git a/devel/hs-happy/files/patch-configure b/devel/hs-happy/files/patch-doc_configure.ac index eefbeb1437f1..cebed39431ec 100644 --- a/devel/hs-happy/files/patch-configure +++ b/devel/hs-happy/files/patch-doc_configure.ac @@ -1,14 +1,11 @@ - -$FreeBSD$ - ---- doc/configure.ac.orig -+++ doc/configure.ac +--- 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]) - FP_PROG_FO_PROCESSOR - AC_CONFIG_FILES([config.mk]) + AC_PATH_PROG(DbLatexCmd,dblatex) + diff --git a/devel/hs-happy/pkg-descr b/devel/hs-happy/pkg-descr index b9cc4c2fc14b..1459d7de8e51 100644 --- a/devel/hs-happy/pkg-descr +++ b/devel/hs-happy/pkg-descr @@ -13,6 +13,6 @@ As of version 1.5, Happy is capable of parsing full Haskell. We have a Haskell parser that uses Happy, which will shortly be part of the library collection distributed with GHC. -WWW: http://www.haskell.org/happy/ +WWW: http://www.haskell.org/happy/ -- Simon Marlow <simonmar@microsoft.com> diff --git a/devel/hs-happy/pkg-plist b/devel/hs-happy/pkg-plist index 3130ee00fb6f..702020b2d524 100644 --- a/devel/hs-happy/pkg-plist +++ b/devel/hs-happy/pkg-plist @@ -1,3 +1,4 @@ +@comment $FreeBSD$ bin/happy %%SUBDIR%%/GLR_Base %%SUBDIR%%/GLR_Lib diff --git a/devel/hs-haskeline/Makefile b/devel/hs-haskeline/Makefile new file mode 100644 index 000000000000..b2aaedb45659 --- /dev/null +++ b/devel/hs-haskeline/Makefile @@ -0,0 +1,79 @@ +# New ports collection makefile for: hs-haskeline +# Date created: July 09 2009 +# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com> +# +# $FreeBSD$ + +PORTNAME= haskeline +PORTVERSION= 0.6.1.6 +CATEGORIES= devel haskell +MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ +PKGNAMEPREFIX= hs- + +MAINTAINER= jacula@gmail.com +COMMENT= A command-line interface for user input, written in Haskell + +BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \ + hs-utf8-string-ghc>=0.3:${PORTSDIR}/devel/hs-utf8-string-ghc +RUN_DEPENDS= ghc:${PORTSDIR}/lang/ghc \ + hs-utf8-string-ghc>=0.3:${PORTSDIR}/devel/hs-utf8-string-ghc + +GHC_VERSION= 6.10.4 +HASKELINE_VERSION= ${PORTVERSION} + +GHC_CMD= ${LOCALBASE}/bin/ghc +SETUP_CMD= ./setup + +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +HASKELINE_LIBDIR_REL= lib/${DISTNAME} + +USE_ICONV= yes + +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + HASKELINE_VERSION=${HASKELINE_VERSION} \ + HASKELINE_LIBDIR_REL=${HASKELINE_LIBDIR_REL} + +.if defined(NOPORTDOCS) +PLIST_SUB+= NOPORTDOCS="" +.else +PLIST_SUB+= NOPORTDOCS="@comment " +.endif + +.if !defined(NOPORTDOCS) + +PORT_HADDOCK!= (cd ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK) +.if !empty(PORT_HADDOCK:M?0) +BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock +.endif +BUILD_DEPENDS+= HsColour:${PORTSDIR}/print/hs-hscolour + +HSCOLOUR_VERSION= 1.13 +HSCOLOUR_DATADIR= ${PREFIX}/share/hscolour-${HSCOLOUR_VERSION} + +PORTDOCS= * +.endif + +.SILENT: + +do-configure: + cd ${WRKSRC} && ${GHC_CMD} --make Setup.hs -o setup -package Cabal \ + && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX} \ + --extra-include-dirs="${LOCALBASE}/include" --extra-lib-dirs="${LOCALBASE}/lib" + +do-build: + cd ${WRKSRC} && ${SETUP_CMD} build \ + && ${SETUP_CMD} register --gen-script + +.if !defined(NOPORTDOCS) + cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \ + --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css +.endif + +do-install: + cd ${WRKSRC} && ${SETUP_CMD} install \ + && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${HASKELINE_LIBDIR_REL}/register.sh + +post-install: + ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old + +.include <bsd.port.mk> diff --git a/devel/hs-haskeline/distinfo b/devel/hs-haskeline/distinfo new file mode 100644 index 000000000000..d4e55e84db94 --- /dev/null +++ b/devel/hs-haskeline/distinfo @@ -0,0 +1,3 @@ +MD5 (haskeline-0.6.1.6.tar.gz) = 9147ccdf85e7532066e5edfa580a2916 +SHA256 (haskeline-0.6.1.6.tar.gz) = d3206b73937eeea638f3f1035969161af9182396699af8790a5455a8b5bbcde1 +SIZE (haskeline-0.6.1.6.tar.gz) = 41906 diff --git a/devel/hs-haskeline/pkg-descr b/devel/hs-haskeline/pkg-descr new file mode 100644 index 000000000000..50be300a6741 --- /dev/null +++ b/devel/hs-haskeline/pkg-descr @@ -0,0 +1,7 @@ +Haskeline provides a user interface for line input in command-line programs. +This library is similar in purpose to readline, but since it is written in +Haskell it is (hopefully) more easily used in other Haskell programs. + +Haskeline runs both on POSIX-compatible systems and on Windows. + +WWW: http://trac.haskell.org/haskeline diff --git a/devel/hs-haskeline/pkg-plist b/devel/hs-haskeline/pkg-plist new file mode 100644 index 000000000000..89453ed1ea11 --- /dev/null +++ b/devel/hs-haskeline/pkg-plist @@ -0,0 +1,42 @@ +@comment $FreeBSD$ +%%HASKELINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HShaskeline-%%HASKELINE_VERSION%%.o +%%HASKELINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline.hi +%%HASKELINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/Backend.hi +%%HASKELINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/Backend/DumbTerm.hi +%%HASKELINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/Backend/IConv.hi +%%HASKELINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/Backend/Posix.hi +%%HASKELINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/Command.hi +%%HASKELINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/Command/Completion.hi +%%HASKELINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/Command/History.hi +%%HASKELINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/Command/Undo.hi +%%HASKELINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/Completion.hi +%%HASKELINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/Directory.hi +%%HASKELINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/Emacs.hi +%%HASKELINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/Encoding.hi +%%HASKELINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/History.hi +%%HASKELINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/IO.hi +%%HASKELINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/InputT.hi +%%HASKELINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/Key.hi +%%HASKELINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/LineState.hi +%%HASKELINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/MonadException.hi +%%HASKELINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/Monads.hi +%%HASKELINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/Prefs.hi +%%HASKELINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/Term.hi +%%HASKELINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/Vi.hi +%%HASKELINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include/h_iconv.h +%%HASKELINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHShaskeline-%%HASKELINE_VERSION%%.a +%%HASKELINE_LIBDIR_REL%%/register.sh +%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE +%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrm %%HASKELINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include +@dirrm %%HASKELINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/Command +@dirrm %%HASKELINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/Backend +@dirrm %%HASKELINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline +@dirrm %%HASKELINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console +@dirrm %%HASKELINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System +@dirrm %%HASKELINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%% +@dirrm %%HASKELINE_LIBDIR_REL%% +@exec /bin/sh %D/%%HASKELINE_LIBDIR_REL%%/register.sh +@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old +@unexec %D/bin/ghc-pkg unregister haskeline +@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old diff --git a/devel/hs-hat/Makefile b/devel/hs-hat/Makefile index 38dda22d4366..4a010517130e 100644 --- a/devel/hs-hat/Makefile +++ b/devel/hs-hat/Makefile @@ -7,6 +7,7 @@ PORTNAME= hat PORTVERSION= 2.06 +PORTREVISION= 1 CATEGORIES= devel haskell MASTER_SITES= ftp://ftp.cs.york.ac.uk/pub/haskell/${PORTNAME}/ PKGNAMEPREFIX= hs- @@ -18,8 +19,8 @@ USE_GMAKE= yes HAS_CONFIGURE= yes USE_GNOME= glib12 -OPTIONS= GHC "Build with GHC" on \ - NHC98 "Build with NHC98" off +OPTIONS= GHC "Build with GHC" off \ + NHC98 "Build with NHC98" on .include <bsd.port.pre.mk> @@ -32,7 +33,11 @@ IGNORE= can be compiled only with one of the compilers. Please (re)run 'make co .endif .if defined(WITH_NHC98) && ${ARCH} == "amd64" -IGNORE= on AMD64 is only supported by GHC. Please (re)run 'make config' and choose GHC +IGNORE= is not supported on AMD64 by NHC98. +.endif + +.if defined(WITH_GHC) +IGNORE= is only supported by NHC98. Please (re)run 'make config' and choose NHC98 .endif .if ${ARCH} == "i386" @@ -76,7 +81,7 @@ PLIST_SUB+= GHC="@comment " .endif .if defined(WITH_GHC) -GHC_VERSION= 6.8.3 +GHC_VERSION= 6.10.4 PLIST_SUB+= NHC98="@comment " PLIST_SUB+= GHC="" PLIST_SUB+= GHC_VER="608" diff --git a/devel/hs-hdoc/Makefile b/devel/hs-hdoc/Makefile index 450ed74fb329..19aa85386496 100644 --- a/devel/hs-hdoc/Makefile +++ b/devel/hs-hdoc/Makefile @@ -6,7 +6,7 @@ PORTNAME= hdoc PORTVERSION= 0.8.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MASTER_SITES= http://staff.fmi.uni-passau.de/~groessli/hdoc/ PKGNAMEPREFIX= hs- @@ -15,12 +15,26 @@ MAINTAINER= haskell@FreeBSD.org COMMENT= HTML documentation tool for Haskell BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc +LIB_DEPENDS+= gmp.8:${PORTSDIR}/math/libgmp4 + +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} PLIST_FILES= bin/hdoc +.if !defined(NOPORTDOCS) +PLIST_DIRS= share/doc/${DISTNAME} +PLIST_FILES+= share/doc/${DISTNAME}/hdoc.pdf +.endif + GNU_CONFIGURE= yes USE_GMAKE= yes CONFIGURE_ARGS+= --prefix=${PREFIX} ALL_TARGET= # empty +post-install: +.if !defined(NOPORTDOCS) + ${MKDIR} ${DOCSDIR} && \ + cd ${WRKSRC}/docs && ${INSTALL_DATA} hdoc.pdf ${DOCSDIR} +.endif + .include <bsd.port.mk> diff --git a/devel/hs-hdoc/pkg-descr b/devel/hs-hdoc/pkg-descr index e57ff794ae59..426f9952dbc9 100644 --- a/devel/hs-hdoc/pkg-descr +++ b/devel/hs-hdoc/pkg-descr @@ -2,7 +2,7 @@ HDoc generates documentation in HTML format for Haskell modules. The generated documents are cross linked and include summaries and detailed descriptions for the documented functions, data types, type classes and instance declarations. -WWW: http://staff.fmi.uni-passau.de/~groessli/hdoc/ +WWW: http://staff.fmi.uni-passau.de/~groessli/hdoc/ -- Oliver Braun obraun@FreeBSD.org diff --git a/devel/hs-hmake/Makefile b/devel/hs-hmake/Makefile index 3df8f10ffb65..89c1f0e9a0cc 100644 --- a/devel/hs-hmake/Makefile +++ b/devel/hs-hmake/Makefile @@ -7,7 +7,7 @@ PORTNAME= hmake PORTVERSION= 3.14 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MASTER_SITES= http://www.haskell.org/hmake/ \ ftp://ftp.cs.york.ac.uk/pub/haskell/hmake/ \ @@ -17,11 +17,10 @@ PKGNAMEPREFIX= hs- MAINTAINER= haskell@FreeBSD.org COMMENT= Intelligent compilation management tool for Haskell programs -BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc -.if exists(${LOCALBASE}/lib/libreadline.so) -LIB_DEPENDS= readline.6:${PORTSDIR}/devel/readline -.endif +BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \ + hs-readline>=1.0.1.0:${PORTSDIR}/devel/hs-readline RUN_DEPENDS= ${BUILD_DEPENDS} +LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4 HAS_CONFIGURE= YES CONFIGURE_ARGS+= --prefix=${PREFIX} @@ -35,6 +34,10 @@ PLIST_SUB+= ARCH=ix86 PLIST_SUB+= ARCH=amd64 .endif +.if exists(${LOCALBASE}/lib/libreadline.so) +LIB_DEPENDS= readline.6:${PORTSDIR}/devel/readline +.endif + do-install: # cheat a bit, otherwise LIBDIR gets clobbered (cd ${WRKSRC} && ./configure --install) diff --git a/devel/hs-hmake/files/patch-src_hmake_Config.hs b/devel/hs-hmake/files/patch-src_hmake_Config.hs new file mode 100644 index 000000000000..322bd0ca7bf2 --- /dev/null +++ b/devel/hs-hmake/files/patch-src_hmake_Config.hs @@ -0,0 +1,20 @@ +--- src/hmake/Config.hs.orig 2007-11-23 14:26:05.000000000 +0000 ++++ src/hmake/Config.hs 2009-07-16 07:56:15.000000000 +0000 +@@ -272,14 +272,14 @@ + ok <- doesFileExist ghcpkg0 + let ghcpkg = if ok then ghcpkg0 else dirname fullpath++"/ghc-pkg" + -- pkgs <- runAndReadStdout (ghcpkg++" --list-packages") +- pkgs <- runAndReadStdout (ghcpkg++" -l") ++ pkgs <- runAndReadStdout (ghcpkg++" list") + let pkgsOK = filter (\p-> any (`isPrefixOf` p) + ["std","base","haskell98"]) + (deComma pkgs) + idirs <- mapM (\p-> runAndReadStdout +- (ghcpkg++" --show-package=" ++ (ghcpkg++" field " + ++deVersion (ghcsym>=604) p +- ++" --field=import_dirs")) ++ ++" import_dirs")) + pkgsOK + return config{ includePaths = pkgDirs libdir (nub idirs) } + where diff --git a/devel/hs-hmake/files/patch-src_hmake_MkConfig.hs b/devel/hs-hmake/files/patch-src_hmake_MkConfig.hs new file mode 100644 index 000000000000..37e20a61b1f2 --- /dev/null +++ b/devel/hs-hmake/files/patch-src_hmake_MkConfig.hs @@ -0,0 +1,20 @@ +--- src/hmake/MkConfig.hs.orig 2006-07-07 16:01:16.000000000 +0000 ++++ src/hmake/MkConfig.hs 2009-07-16 07:56:44.000000000 +0000 +@@ -258,14 +258,14 @@ + ok <- doesFileExist ghcpkg0 + let ghcpkg = if ok then ghcpkg0 else dirname fullpath++"/ghc-pkg" + -- pkgs <- runAndReadStdout (ghcpkg++" --list-packages") +- pkgs <- runAndReadStdout (ghcpkg++" -l") ++ pkgs <- runAndReadStdout (ghcpkg++" list") + let pkgsOK = filter (\p-> any (`isPrefixOf` p) + ["std","base","haskell98"]) + (deComma pkgs) + idirs <- mapM (\p-> runAndReadStdout +- (ghcpkg++" --show-package=" ++ (ghcpkg++" field " + ++deVersion (ghcsym>=604) p +- ++" --field=import_dirs")) ++ ++" import_dirs")) + pkgsOK + return config{ includePaths = pkgDirs libdir (nub idirs) } + else do ioError (userError ("Can't find ghc includes at "++incdir1)) diff --git a/devel/hs-hmake/files/patch-src_hmake_PackageConfig.hs b/devel/hs-hmake/files/patch-src_hmake_PackageConfig.hs new file mode 100644 index 000000000000..ed21f08cac62 --- /dev/null +++ b/devel/hs-hmake/files/patch-src_hmake_PackageConfig.hs @@ -0,0 +1,22 @@ +--- src/hmake/PackageConfig.hs.orig 2008-04-25 10:28:08.000000000 +0000 ++++ src/hmake/PackageConfig.hs 2009-07-16 07:57:07.000000000 +0000 +@@ -55,7 +55,7 @@ + -- ghcpkg <- runAndReadStdout + -- ("echo `" ++ ghc ++ " --print-libdir`/bin/ghc-pkg") + -- pkgs <- runAndReadStdout (ghcpkg++" --list-packages") +- pkgs <- runAndReadStdout (ghcpkg++" -l") ++ pkgs <- runAndReadStdout (ghcpkg++" list") + let (ok,bad) = partition (\p-> elemBy versionMatch p (deComma pkgs)) + packages + when (not (null bad)) +@@ -63,8 +63,8 @@ + ++concat (intersperse ", " bad) + ++" not available (according to ghc-pkg)")) + idirs <- mapM (\p-> runAndReadStdout +- (ghcpkg++" --show-package="++p +- ++" --field=import_dirs")) ++ (ghcpkg++" field "++p ++ ++" import_dirs")) + ok + return (pkgDirs libdir idirs) + where diff --git a/devel/hs-hmake/pkg-plist b/devel/hs-hmake/pkg-plist index 6cbfd8ae1ca1..7e6c27a24876 100644 --- a/devel/hs-hmake/pkg-plist +++ b/devel/hs-hmake/pkg-plist @@ -1,3 +1,4 @@ +@comment $FreeBSD$ bin/harch bin/hi bin/hmake diff --git a/devel/hs-idoc/Makefile b/devel/hs-idoc/Makefile index 662597e21ad5..e656a731040a 100644 --- a/devel/hs-idoc/Makefile +++ b/devel/hs-idoc/Makefile @@ -6,7 +6,7 @@ PORTNAME= idoc PORTVERSION= 0.2.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MASTER_SITES= http://www.cse.unsw.edu.au/~chak/haskell/idoc/ PKGNAMEPREFIX= hs- @@ -15,6 +15,7 @@ MAINTAINER= haskell@FreeBSD.org COMMENT= A No Frills Haskell Interface Documentation System BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc +LIB_DEPENDS+= gmp.8:${PORTSDIR}/math/libgmp4 PLIST_FILES= bin/idoc USE_GMAKE= yes diff --git a/devel/hs-idoc/pkg-descr b/devel/hs-idoc/pkg-descr index 57ec58f50933..98a1b59fbd52 100644 --- a/devel/hs-idoc/pkg-descr +++ b/devel/hs-idoc/pkg-descr @@ -5,7 +5,7 @@ visually non-imposing when displaying the source in a text editor. Interface documentation is rendered in standard markup languages (currently, only HTML is supported). IDoc has been designed to be simple to use and install. -WWW: http://www.cse.unsw.edu.au/~chak/haskell/idoc/ +WWW: http://www.cse.unsw.edu.au/~chak/haskell/idoc/ -- Oliver Braun obraun@FreeBSD.org diff --git a/devel/hs-language-c-ghc/Makefile b/devel/hs-language-c-ghc/Makefile index 22695a9f67f0..1a2f4787db31 100644 --- a/devel/hs-language-c-ghc/Makefile +++ b/devel/hs-language-c-ghc/Makefile @@ -7,6 +7,7 @@ PORTNAME= language-c PORTVERSION= 0.3.1.1 +PORTREVISION= 1 CATEGORIES= devel haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ PKGNAMEPREFIX= hs- @@ -20,38 +21,59 @@ BUILD_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc \ happy:${PORTSDIR}/devel/hs-happy RUN_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc -GHC_VERSION= 6.8.3 -CABALCMD= ${LOCALBASE}/bin/runghc Setup.hs -CABALDIR= lib/ghc-${GHC_VERSION}/cabal +GHC_VERSION= 6.10.4 +LANGUAGEC_VERSION= ${PORTVERSION} -SUBDIR= lib/${PORTNAME}-${PORTVERSION} -PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ - PORTNAME=${PORTNAME} \ - PORTVERSION=${PORTVERSION} \ - SUBDIR=${CABALDIR} -DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION} -PORTDOCS= LICENSE html +GHC_CMD= ${LOCALBASE}/bin/ghc +SETUP_CMD= ./setup -CONFIGURE_ARGS= --ghc --prefix=${PREFIX} --libdir=${PREFIX}/${CABALDIR} --libsubdir='' --datasubdir='' +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +LANGUAGEC_LIBDIR_REL= lib/${DISTNAME} + +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + LANGUAGEC_VERSION=${LANGUAGEC_VERSION} \ + LANGUAGEC_LIBDIR_REL=${LANGUAGEC_LIBDIR_REL} + +.if defined(NOPORTDOCS) +PLIST_SUB+= NOPORTDOCS="" +.else +PLIST_SUB+= NOPORTDOCS="@comment " +.endif .if !defined(NOPORTDOCS) + +PORT_HADDOCK!= (cd ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK) +.if !empty(PORT_HADDOCK:M?0) BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock -PLIST_SUB+= RMLIC="@comment " -.else -PLIST_SUB+= RMLIC="" .endif +BUILD_DEPENDS+= HsColour:${PORTSDIR}/print/hs-hscolour + +HSCOLOUR_VERSION= 1.13 +HSCOLOUR_DATADIR= ${PREFIX}/share/hscolour-${HSCOLOUR_VERSION} + +PORTDOCS= * +.endif + +.SILENT: do-configure: - cd ${WRKSRC} && ${CABALCMD} configure ${CONFIGURE_ARGS} + cd ${WRKSRC} && ${GHC_CMD} --make Setup.hs -o setup -package Cabal \ + && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX} do-build: - cd ${WRKSRC} && ${CABALCMD} build && ${CABALCMD} --gen-script register + cd ${WRKSRC} && ${SETUP_CMD} build \ + && ${SETUP_CMD} register --gen-script + .if !defined(NOPORTDOCS) - cd ${WRKSRC} && ${CABALCMD} haddock + cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \ + --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css .endif do-install: - cd ${WRKSRC} && ${CABALCMD} install - ${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${PREFIX}/${CABALDIR}/${PORTNAME}-register.sh + cd ${WRKSRC} && ${SETUP_CMD} install \ + && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${LANGUAGEC_LIBDIR_REL}/register.sh + +post-install: + ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old .include <bsd.port.mk> diff --git a/devel/hs-language-c-ghc/pkg-plist b/devel/hs-language-c-ghc/pkg-plist index 9710c4be8b0a..f6ae49bbf4a8 100644 --- a/devel/hs-language-c-ghc/pkg-plist +++ b/devel/hs-language-c-ghc/pkg-plist @@ -1,49 +1,51 @@ @comment $FreeBSD$ -%%SUBDIR%%/Language/C.hi -%%SUBDIR%%/Language/C/Analysis/AstAnalysis.hi -%%SUBDIR%%/Language/C/Analysis/Debug.hi -%%SUBDIR%%/Language/C/Analysis/DeclAnalysis.hi -%%SUBDIR%%/Language/C/Analysis/DefTable.hi -%%SUBDIR%%/Language/C/Analysis/Export.hi -%%SUBDIR%%/Language/C/Analysis/NameSpaceMap.hi -%%SUBDIR%%/Language/C/Analysis/SemError.hi -%%SUBDIR%%/Language/C/Analysis/SemRep.hi -%%SUBDIR%%/Language/C/Analysis/TravMonad.hi -%%SUBDIR%%/Language/C/Data/Error.hi -%%SUBDIR%%/Language/C/Data/Ident.hi -%%SUBDIR%%/Language/C/Data/InputStream.hi -%%SUBDIR%%/Language/C/Data/Name.hi -%%SUBDIR%%/Language/C/Data/Node.hi -%%SUBDIR%%/Language/C/Data/Position.hi -%%SUBDIR%%/Language/C/Data/RList.hi -%%SUBDIR%%/Language/C/Parser/Builtin.hi -%%SUBDIR%%/Language/C/Parser/Lexer.hi -%%SUBDIR%%/Language/C/Parser/Parser.hi -%%SUBDIR%%/Language/C/Parser/ParserMonad.hi -%%SUBDIR%%/Language/C/Parser/Tokens.hi -%%SUBDIR%%/Language/C/Syntax/AST.hi -%%SUBDIR%%/Language/C/Syntax/Constants.hi -%%SUBDIR%%/Language/C/Syntax/Ops.hi -%%SUBDIR%%/Language/C/System/GCC.hi -%%SUBDIR%%/Language/C/System/Preprocess.hi -%%SUBDIR%%/Language/C/Analysis.hi -%%SUBDIR%%/Language/C/Data.hi -%%SUBDIR%%/Language/C/Parser.hi -%%SUBDIR%%/Language/C/Pretty.hi -%%SUBDIR%%/Language/C/Syntax.hi -%%SUBDIR%%/HS%%PORTNAME%%-%%PORTVERSION%%.o -%%SUBDIR%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a -%%SUBDIR%%/%%PORTNAME%%-register.sh -@dirrm %%SUBDIR%%/Language/C/Analysis -@dirrm %%SUBDIR%%/Language/C/Data -@dirrm %%SUBDIR%%/Language/C/Parser -@dirrm %%SUBDIR%%/Language/C/Syntax -@dirrm %%SUBDIR%%/Language/C/System -@dirrm %%SUBDIR%%/Language/C -@dirrmtry %%SUBDIR%%/Language -%%RMLIC%%%%DOCSDIR%%/LICENSE -%%RMLIC%%@dirrm %%DOCSDIR%% -@exec sh %D/%%SUBDIR%%/%%PORTNAME%%-register.sh -@exec rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old -@unexec ghc-pkg unregister %%PORTNAME%% -@unexec rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSlanguage-c-%%LANGUAGEC_VERSION%%.o +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis/AstAnalysis.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis/Debug.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis/DeclAnalysis.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis/DefTable.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis/Export.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis/NameSpaceMap.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis/SemError.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis/SemRep.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis/TravMonad.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Data.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Data/Error.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Data/Ident.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Data/InputStream.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Data/Name.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Data/Node.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Data/Position.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Data/RList.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Parser.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Parser/Builtin.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Parser/Lexer.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Parser/Parser.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Parser/ParserMonad.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Parser/Tokens.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Pretty.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Syntax.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Syntax/AST.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Syntax/Constants.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Syntax/Ops.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/System/GCC.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/System/Preprocess.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSlanguage-c-%%LANGUAGEC_VERSION%%.a +%%LANGUAGEC_LIBDIR_REL%%/register.sh +%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE +%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrm %%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/System +@dirrm %%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Syntax +@dirrm %%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Parser +@dirrm %%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Data +@dirrm %%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis +@dirrm %%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C +@dirrm %%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language +@dirrm %%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%% +@dirrm %%LANGUAGEC_LIBDIR_REL%% +@exec /bin/sh %D/%%LANGUAGEC_LIBDIR_REL%%/register.sh +@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old +@unexec %D/bin/ghc-pkg unregister language-c +@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old diff --git a/devel/hs-language-c/Makefile b/devel/hs-language-c/Makefile index 22695a9f67f0..1a2f4787db31 100644 --- a/devel/hs-language-c/Makefile +++ b/devel/hs-language-c/Makefile @@ -7,6 +7,7 @@ PORTNAME= language-c PORTVERSION= 0.3.1.1 +PORTREVISION= 1 CATEGORIES= devel haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ PKGNAMEPREFIX= hs- @@ -20,38 +21,59 @@ BUILD_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc \ happy:${PORTSDIR}/devel/hs-happy RUN_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc -GHC_VERSION= 6.8.3 -CABALCMD= ${LOCALBASE}/bin/runghc Setup.hs -CABALDIR= lib/ghc-${GHC_VERSION}/cabal +GHC_VERSION= 6.10.4 +LANGUAGEC_VERSION= ${PORTVERSION} -SUBDIR= lib/${PORTNAME}-${PORTVERSION} -PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ - PORTNAME=${PORTNAME} \ - PORTVERSION=${PORTVERSION} \ - SUBDIR=${CABALDIR} -DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION} -PORTDOCS= LICENSE html +GHC_CMD= ${LOCALBASE}/bin/ghc +SETUP_CMD= ./setup -CONFIGURE_ARGS= --ghc --prefix=${PREFIX} --libdir=${PREFIX}/${CABALDIR} --libsubdir='' --datasubdir='' +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +LANGUAGEC_LIBDIR_REL= lib/${DISTNAME} + +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + LANGUAGEC_VERSION=${LANGUAGEC_VERSION} \ + LANGUAGEC_LIBDIR_REL=${LANGUAGEC_LIBDIR_REL} + +.if defined(NOPORTDOCS) +PLIST_SUB+= NOPORTDOCS="" +.else +PLIST_SUB+= NOPORTDOCS="@comment " +.endif .if !defined(NOPORTDOCS) + +PORT_HADDOCK!= (cd ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK) +.if !empty(PORT_HADDOCK:M?0) BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock -PLIST_SUB+= RMLIC="@comment " -.else -PLIST_SUB+= RMLIC="" .endif +BUILD_DEPENDS+= HsColour:${PORTSDIR}/print/hs-hscolour + +HSCOLOUR_VERSION= 1.13 +HSCOLOUR_DATADIR= ${PREFIX}/share/hscolour-${HSCOLOUR_VERSION} + +PORTDOCS= * +.endif + +.SILENT: do-configure: - cd ${WRKSRC} && ${CABALCMD} configure ${CONFIGURE_ARGS} + cd ${WRKSRC} && ${GHC_CMD} --make Setup.hs -o setup -package Cabal \ + && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX} do-build: - cd ${WRKSRC} && ${CABALCMD} build && ${CABALCMD} --gen-script register + cd ${WRKSRC} && ${SETUP_CMD} build \ + && ${SETUP_CMD} register --gen-script + .if !defined(NOPORTDOCS) - cd ${WRKSRC} && ${CABALCMD} haddock + cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \ + --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css .endif do-install: - cd ${WRKSRC} && ${CABALCMD} install - ${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${PREFIX}/${CABALDIR}/${PORTNAME}-register.sh + cd ${WRKSRC} && ${SETUP_CMD} install \ + && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${LANGUAGEC_LIBDIR_REL}/register.sh + +post-install: + ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old .include <bsd.port.mk> diff --git a/devel/hs-language-c/pkg-plist b/devel/hs-language-c/pkg-plist index 9710c4be8b0a..f6ae49bbf4a8 100644 --- a/devel/hs-language-c/pkg-plist +++ b/devel/hs-language-c/pkg-plist @@ -1,49 +1,51 @@ @comment $FreeBSD$ -%%SUBDIR%%/Language/C.hi -%%SUBDIR%%/Language/C/Analysis/AstAnalysis.hi -%%SUBDIR%%/Language/C/Analysis/Debug.hi -%%SUBDIR%%/Language/C/Analysis/DeclAnalysis.hi -%%SUBDIR%%/Language/C/Analysis/DefTable.hi -%%SUBDIR%%/Language/C/Analysis/Export.hi -%%SUBDIR%%/Language/C/Analysis/NameSpaceMap.hi -%%SUBDIR%%/Language/C/Analysis/SemError.hi -%%SUBDIR%%/Language/C/Analysis/SemRep.hi -%%SUBDIR%%/Language/C/Analysis/TravMonad.hi -%%SUBDIR%%/Language/C/Data/Error.hi -%%SUBDIR%%/Language/C/Data/Ident.hi -%%SUBDIR%%/Language/C/Data/InputStream.hi -%%SUBDIR%%/Language/C/Data/Name.hi -%%SUBDIR%%/Language/C/Data/Node.hi -%%SUBDIR%%/Language/C/Data/Position.hi -%%SUBDIR%%/Language/C/Data/RList.hi -%%SUBDIR%%/Language/C/Parser/Builtin.hi -%%SUBDIR%%/Language/C/Parser/Lexer.hi -%%SUBDIR%%/Language/C/Parser/Parser.hi -%%SUBDIR%%/Language/C/Parser/ParserMonad.hi -%%SUBDIR%%/Language/C/Parser/Tokens.hi -%%SUBDIR%%/Language/C/Syntax/AST.hi -%%SUBDIR%%/Language/C/Syntax/Constants.hi -%%SUBDIR%%/Language/C/Syntax/Ops.hi -%%SUBDIR%%/Language/C/System/GCC.hi -%%SUBDIR%%/Language/C/System/Preprocess.hi -%%SUBDIR%%/Language/C/Analysis.hi -%%SUBDIR%%/Language/C/Data.hi -%%SUBDIR%%/Language/C/Parser.hi -%%SUBDIR%%/Language/C/Pretty.hi -%%SUBDIR%%/Language/C/Syntax.hi -%%SUBDIR%%/HS%%PORTNAME%%-%%PORTVERSION%%.o -%%SUBDIR%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a -%%SUBDIR%%/%%PORTNAME%%-register.sh -@dirrm %%SUBDIR%%/Language/C/Analysis -@dirrm %%SUBDIR%%/Language/C/Data -@dirrm %%SUBDIR%%/Language/C/Parser -@dirrm %%SUBDIR%%/Language/C/Syntax -@dirrm %%SUBDIR%%/Language/C/System -@dirrm %%SUBDIR%%/Language/C -@dirrmtry %%SUBDIR%%/Language -%%RMLIC%%%%DOCSDIR%%/LICENSE -%%RMLIC%%@dirrm %%DOCSDIR%% -@exec sh %D/%%SUBDIR%%/%%PORTNAME%%-register.sh -@exec rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old -@unexec ghc-pkg unregister %%PORTNAME%% -@unexec rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSlanguage-c-%%LANGUAGEC_VERSION%%.o +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis/AstAnalysis.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis/Debug.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis/DeclAnalysis.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis/DefTable.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis/Export.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis/NameSpaceMap.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis/SemError.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis/SemRep.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis/TravMonad.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Data.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Data/Error.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Data/Ident.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Data/InputStream.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Data/Name.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Data/Node.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Data/Position.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Data/RList.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Parser.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Parser/Builtin.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Parser/Lexer.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Parser/Parser.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Parser/ParserMonad.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Parser/Tokens.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Pretty.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Syntax.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Syntax/AST.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Syntax/Constants.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Syntax/Ops.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/System/GCC.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/System/Preprocess.hi +%%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSlanguage-c-%%LANGUAGEC_VERSION%%.a +%%LANGUAGEC_LIBDIR_REL%%/register.sh +%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE +%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrm %%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/System +@dirrm %%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Syntax +@dirrm %%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Parser +@dirrm %%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Data +@dirrm %%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis +@dirrm %%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C +@dirrm %%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language +@dirrm %%LANGUAGEC_LIBDIR_REL%%/ghc-%%GHC_VERSION%% +@dirrm %%LANGUAGEC_LIBDIR_REL%% +@exec /bin/sh %D/%%LANGUAGEC_LIBDIR_REL%%/register.sh +@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old +@unexec %D/bin/ghc-pkg unregister language-c +@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old diff --git a/devel/hs-lazysmallcheck-ghc/Makefile b/devel/hs-lazysmallcheck-ghc/Makefile index aa62399d16a6..ec544a1ad919 100644 --- a/devel/hs-lazysmallcheck-ghc/Makefile +++ b/devel/hs-lazysmallcheck-ghc/Makefile @@ -7,6 +7,7 @@ PORTNAME= lazysmallcheck PORTVERSION= 0.3 +PORTREVISION= 1 CATEGORIES= devel haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ PKGNAMEPREFIX= hs- @@ -18,38 +19,59 @@ COMMENT= A library for demand-driven testing of Haskell programs BUILD_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc RUN_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc -GHC_VERSION= 6.8.3 -CABALCMD= ${LOCALBASE}/bin/runghc Setup.hs -CABALDIR= lib/ghc-${GHC_VERSION}/cabal +GHC_VERSION= 6.10.4 +LAZYSMALLCHECK_VERSION= ${PORTVERSION} -SUBDIR= lib/${PORTNAME}-${PORTVERSION} -PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ - PORTNAME=${PORTNAME} \ - PORTVERSION=${PORTVERSION} \ - SUBDIR=${CABALDIR} -DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION} -PORTDOCS= LICENSE html +GHC_CMD= ${LOCALBASE}/bin/ghc +SETUP_CMD= ./setup -CONFIGURE_ARGS= --ghc --prefix=${PREFIX} --libdir=${PREFIX}/${CABALDIR} --libsubdir='' --datasubdir='' +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +LAZYSMALLCHECK_LIBDIR_REL= lib/${DISTNAME} + +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + LAZYSMALLCHECK_VERSION=${LAZYSMALLCHECK_VERSION} \ + LAZYSMALLCHECK_LIBDIR_REL=${LAZYSMALLCHECK_LIBDIR_REL} + +.if defined(NOPORTDOCS) +PLIST_SUB+= NOPORTDOCS="" +.else +PLIST_SUB+= NOPORTDOCS="@comment " +.endif .if !defined(NOPORTDOCS) + +PORT_HADDOCK!= (cd ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK) +.if !empty(PORT_HADDOCK:M?0) BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock -PLIST_SUB+= RMLIC="@comment " -.else -PLIST_SUB+= RMLIC="" .endif +BUILD_DEPENDS+= HsColour:${PORTSDIR}/print/hs-hscolour + +HSCOLOUR_VERSION= 1.13 +HSCOLOUR_DATADIR= ${PREFIX}/share/hscolour-${HSCOLOUR_VERSION} + +PORTDOCS= * +.endif + +.SILENT: do-configure: - cd ${WRKSRC} && ${CABALCMD} configure ${CONFIGURE_ARGS} + cd ${WRKSRC} && ${GHC_CMD} --make Setup.hs -o setup -package Cabal \ + && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX} do-build: - cd ${WRKSRC} && ${CABALCMD} build && ${CABALCMD} --gen-script register + cd ${WRKSRC} && ${SETUP_CMD} build \ + && ${SETUP_CMD} register --gen-script + .if !defined(NOPORTDOCS) - cd ${WRKSRC} && ${CABALCMD} haddock + cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \ + --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css .endif do-install: - cd ${WRKSRC} && ${CABALCMD} install - ${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${PREFIX}/${CABALDIR}/${PORTNAME}-register.sh + cd ${WRKSRC} && ${SETUP_CMD} install \ + && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${LAZYSMALLCHECK_LIBDIR_REL}/register.sh + +post-install: + ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old .include <bsd.port.mk> diff --git a/devel/hs-lazysmallcheck-ghc/files/patch-lazysmallcheck.cabal b/devel/hs-lazysmallcheck-ghc/files/patch-lazysmallcheck.cabal new file mode 100644 index 000000000000..55446d2616cd --- /dev/null +++ b/devel/hs-lazysmallcheck-ghc/files/patch-lazysmallcheck.cabal @@ -0,0 +1,11 @@ +--- lazysmallcheck.cabal.orig 2009-07-15 09:45:12.000000000 +0000 ++++ lazysmallcheck.cabal 2009-07-15 09:45:44.000000000 +0000 +@@ -16,7 +16,7 @@ + significantly fewer test-cases to verify a property for all inputs up + to a given depth. + Category: Testing +-Build-Depends: base, haskell98 ++Build-Depends: base < 4, haskell98 + Build-Type: Simple + Extra-Source-Files: + examples/Catch.hs diff --git a/devel/hs-lazysmallcheck-ghc/pkg-plist b/devel/hs-lazysmallcheck-ghc/pkg-plist index 8faf59b6756e..1ab46c70ca5c 100644 --- a/devel/hs-lazysmallcheck-ghc/pkg-plist +++ b/devel/hs-lazysmallcheck-ghc/pkg-plist @@ -1,14 +1,16 @@ @comment $FreeBSD$ -%%SUBDIR%%/Test/LazySmallCheck.hi -%%SUBDIR%%/Test/LazySmallCheck/Generic.hi -%%SUBDIR%%/HS%%PORTNAME%%-%%PORTVERSION%%.o -%%SUBDIR%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a -%%SUBDIR%%/%%PORTNAME%%-register.sh -@dirrm %%SUBDIR%%/Test/LazySmallCheck -@dirrmtry %%SUBDIR%%/Test -%%RMLIC%%%%DOCSDIR%%/LICENSE -%%RMLIC%%@dirrm %%DOCSDIR%% -@exec sh %D/%%SUBDIR%%/%%PORTNAME%%-register.sh -@exec rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old -@unexec ghc-pkg unregister %%PORTNAME%% -@unexec rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old +%%LAZYSMALLCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSlazysmallcheck-%%LAZYSMALLCHECK_VERSION%%.o +%%LAZYSMALLCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/LazySmallCheck.hi +%%LAZYSMALLCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/LazySmallCheck/Generic.hi +%%LAZYSMALLCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSlazysmallcheck-%%LAZYSMALLCHECK_VERSION%%.a +%%LAZYSMALLCHECK_LIBDIR_REL%%/register.sh +%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE +%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrm %%LAZYSMALLCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/LazySmallCheck +@dirrm %%LAZYSMALLCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test +@dirrm %%LAZYSMALLCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%% +@dirrm %%LAZYSMALLCHECK_LIBDIR_REL%% +@exec /bin/sh %D/%%LAZYSMALLCHECK_LIBDIR_REL%%/register.sh +@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old +@unexec %D/bin/ghc-pkg unregister lazysmallcheck +@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old diff --git a/devel/hs-lazysmallcheck/Makefile b/devel/hs-lazysmallcheck/Makefile index aa62399d16a6..ec544a1ad919 100644 --- a/devel/hs-lazysmallcheck/Makefile +++ b/devel/hs-lazysmallcheck/Makefile @@ -7,6 +7,7 @@ PORTNAME= lazysmallcheck PORTVERSION= 0.3 +PORTREVISION= 1 CATEGORIES= devel haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ PKGNAMEPREFIX= hs- @@ -18,38 +19,59 @@ COMMENT= A library for demand-driven testing of Haskell programs BUILD_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc RUN_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc -GHC_VERSION= 6.8.3 -CABALCMD= ${LOCALBASE}/bin/runghc Setup.hs -CABALDIR= lib/ghc-${GHC_VERSION}/cabal +GHC_VERSION= 6.10.4 +LAZYSMALLCHECK_VERSION= ${PORTVERSION} -SUBDIR= lib/${PORTNAME}-${PORTVERSION} -PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ - PORTNAME=${PORTNAME} \ - PORTVERSION=${PORTVERSION} \ - SUBDIR=${CABALDIR} -DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION} -PORTDOCS= LICENSE html +GHC_CMD= ${LOCALBASE}/bin/ghc +SETUP_CMD= ./setup -CONFIGURE_ARGS= --ghc --prefix=${PREFIX} --libdir=${PREFIX}/${CABALDIR} --libsubdir='' --datasubdir='' +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +LAZYSMALLCHECK_LIBDIR_REL= lib/${DISTNAME} + +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + LAZYSMALLCHECK_VERSION=${LAZYSMALLCHECK_VERSION} \ + LAZYSMALLCHECK_LIBDIR_REL=${LAZYSMALLCHECK_LIBDIR_REL} + +.if defined(NOPORTDOCS) +PLIST_SUB+= NOPORTDOCS="" +.else +PLIST_SUB+= NOPORTDOCS="@comment " +.endif .if !defined(NOPORTDOCS) + +PORT_HADDOCK!= (cd ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK) +.if !empty(PORT_HADDOCK:M?0) BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock -PLIST_SUB+= RMLIC="@comment " -.else -PLIST_SUB+= RMLIC="" .endif +BUILD_DEPENDS+= HsColour:${PORTSDIR}/print/hs-hscolour + +HSCOLOUR_VERSION= 1.13 +HSCOLOUR_DATADIR= ${PREFIX}/share/hscolour-${HSCOLOUR_VERSION} + +PORTDOCS= * +.endif + +.SILENT: do-configure: - cd ${WRKSRC} && ${CABALCMD} configure ${CONFIGURE_ARGS} + cd ${WRKSRC} && ${GHC_CMD} --make Setup.hs -o setup -package Cabal \ + && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX} do-build: - cd ${WRKSRC} && ${CABALCMD} build && ${CABALCMD} --gen-script register + cd ${WRKSRC} && ${SETUP_CMD} build \ + && ${SETUP_CMD} register --gen-script + .if !defined(NOPORTDOCS) - cd ${WRKSRC} && ${CABALCMD} haddock + cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \ + --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css .endif do-install: - cd ${WRKSRC} && ${CABALCMD} install - ${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${PREFIX}/${CABALDIR}/${PORTNAME}-register.sh + cd ${WRKSRC} && ${SETUP_CMD} install \ + && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${LAZYSMALLCHECK_LIBDIR_REL}/register.sh + +post-install: + ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old .include <bsd.port.mk> diff --git a/devel/hs-lazysmallcheck/files/patch-lazysmallcheck.cabal b/devel/hs-lazysmallcheck/files/patch-lazysmallcheck.cabal new file mode 100644 index 000000000000..55446d2616cd --- /dev/null +++ b/devel/hs-lazysmallcheck/files/patch-lazysmallcheck.cabal @@ -0,0 +1,11 @@ +--- lazysmallcheck.cabal.orig 2009-07-15 09:45:12.000000000 +0000 ++++ lazysmallcheck.cabal 2009-07-15 09:45:44.000000000 +0000 +@@ -16,7 +16,7 @@ + significantly fewer test-cases to verify a property for all inputs up + to a given depth. + Category: Testing +-Build-Depends: base, haskell98 ++Build-Depends: base < 4, haskell98 + Build-Type: Simple + Extra-Source-Files: + examples/Catch.hs diff --git a/devel/hs-lazysmallcheck/pkg-plist b/devel/hs-lazysmallcheck/pkg-plist index 8faf59b6756e..1ab46c70ca5c 100644 --- a/devel/hs-lazysmallcheck/pkg-plist +++ b/devel/hs-lazysmallcheck/pkg-plist @@ -1,14 +1,16 @@ @comment $FreeBSD$ -%%SUBDIR%%/Test/LazySmallCheck.hi -%%SUBDIR%%/Test/LazySmallCheck/Generic.hi -%%SUBDIR%%/HS%%PORTNAME%%-%%PORTVERSION%%.o -%%SUBDIR%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a -%%SUBDIR%%/%%PORTNAME%%-register.sh -@dirrm %%SUBDIR%%/Test/LazySmallCheck -@dirrmtry %%SUBDIR%%/Test -%%RMLIC%%%%DOCSDIR%%/LICENSE -%%RMLIC%%@dirrm %%DOCSDIR%% -@exec sh %D/%%SUBDIR%%/%%PORTNAME%%-register.sh -@exec rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old -@unexec ghc-pkg unregister %%PORTNAME%% -@unexec rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old +%%LAZYSMALLCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSlazysmallcheck-%%LAZYSMALLCHECK_VERSION%%.o +%%LAZYSMALLCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/LazySmallCheck.hi +%%LAZYSMALLCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/LazySmallCheck/Generic.hi +%%LAZYSMALLCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSlazysmallcheck-%%LAZYSMALLCHECK_VERSION%%.a +%%LAZYSMALLCHECK_LIBDIR_REL%%/register.sh +%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE +%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrm %%LAZYSMALLCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/LazySmallCheck +@dirrm %%LAZYSMALLCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test +@dirrm %%LAZYSMALLCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%% +@dirrm %%LAZYSMALLCHECK_LIBDIR_REL%% +@exec /bin/sh %D/%%LAZYSMALLCHECK_LIBDIR_REL%%/register.sh +@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old +@unexec %D/bin/ghc-pkg unregister lazysmallcheck +@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old diff --git a/devel/hs-mmap/Makefile b/devel/hs-mmap/Makefile new file mode 100644 index 000000000000..f044c6c7cee3 --- /dev/null +++ b/devel/hs-mmap/Makefile @@ -0,0 +1,74 @@ +# New ports collection makefile for: hs-mmap +# Date created: July 09 2009 +# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com> +# +# $FreeBSD$ + +PORTNAME= mmap +PORTVERSION= 0.4.1 +CATEGORIES= devel haskell +MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ +PKGNAMEPREFIX= hs- + +MAINTAINER= jacula@gmail.com +COMMENT= Memory mapped files for POSIX and Windows + +BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc +RUN_DEPENDS+= ghc:${PORTSDIR}/lang/ghc + +GHC_VERSION= 6.10.4 +MMAP_VERSION= ${PORTVERSION} + +GHC_CMD= ${LOCALBASE}/bin/ghc +SETUP_CMD= ./setup + +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +MMAP_LIBDIR_REL= lib/${DISTNAME} + +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + MMAP_VERSION=${MMAP_VERSION} \ + MMAP_LIBDIR_REL=${MMAP_LIBDIR_REL} + +.if defined(NOPORTDOCS) +PLIST_SUB+= NOPORTDOCS="" +.else +PLIST_SUB+= NOPORTDOCS="@comment " +.endif + +.if !defined(NOPORTDOCS) + +PORT_HADDOCK!= (cd ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK) +.if !empty(PORT_HADDOCK:M?0) +BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock +.endif +BUILD_DEPENDS+= HsColour:${PORTSDIR}/print/hs-hscolour + +HSCOLOUR_VERSION= 1.13 +HSCOLOUR_DATADIR= ${PREFIX}/share/hscolour-${HSCOLOUR_VERSION} + +PORTDOCS= * +.endif + +.SILENT: + +do-configure: + cd ${WRKSRC} && ${GHC_CMD} --make Setup.hs -o setup -package Cabal \ + && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX} + +do-build: + cd ${WRKSRC} && ${SETUP_CMD} build \ + && ${SETUP_CMD} register --gen-script + +.if !defined(NOPORTDOCS) + cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \ + --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css +.endif + +do-install: + cd ${WRKSRC} && ${SETUP_CMD} install \ + && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${MMAP_LIBDIR_REL}/register.sh + +post-install: + ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old + +.include <bsd.port.mk> diff --git a/devel/hs-mmap/distinfo b/devel/hs-mmap/distinfo new file mode 100644 index 000000000000..c321c49e264b --- /dev/null +++ b/devel/hs-mmap/distinfo @@ -0,0 +1,3 @@ +MD5 (mmap-0.4.1.tar.gz) = 2ebe9772a0efd0a6febfbc67c02faab2 +SHA256 (mmap-0.4.1.tar.gz) = 792b8ecfb0cce1f8588f0d2a63c6893ff98a2479c06745583da8166d5a46ead9 +SIZE (mmap-0.4.1.tar.gz) = 5956 diff --git a/devel/hs-mmap/pkg-descr b/devel/hs-mmap/pkg-descr new file mode 100644 index 000000000000..8d89b67e0f4a --- /dev/null +++ b/devel/hs-mmap/pkg-descr @@ -0,0 +1,6 @@ +This library provides a wrapper to mmap(2) or MapViewOfFile, allowing files or +devices to be lazily loaded into memory as strict or lazy ByteStrings, +ForeignPtrs or plain Ptrs, using the virtual memory subsystem to do on-demand +loading. + +WWW: http://hackage.haskell.org/packages/archive/mmap diff --git a/devel/hs-mmap/pkg-plist b/devel/hs-mmap/pkg-plist new file mode 100644 index 000000000000..b8a2abd6641e --- /dev/null +++ b/devel/hs-mmap/pkg-plist @@ -0,0 +1,15 @@ +@comment $FreeBSD$ +%%MMAP_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSmmap-%%MMAP_VERSION%%.o +%%MMAP_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/IO/MMap.hi +%%MMAP_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSmmap-%%MMAP_VERSION%%.a +%%MMAP_LIBDIR_REL%%/register.sh +%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE +%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrm %%MMAP_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/IO +@dirrm %%MMAP_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System +@dirrm %%MMAP_LIBDIR_REL%%/ghc-%%GHC_VERSION%% +@dirrm %%MMAP_LIBDIR_REL%% +@exec /bin/sh %D/%%MMAP_LIBDIR_REL%%/register.sh +@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old +@unexec %D/bin/ghc-pkg unregister mmap +@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old diff --git a/devel/hs-pcre-light-ghc/Makefile b/devel/hs-pcre-light-ghc/Makefile index 1b80dc3662ca..db219098037e 100644 --- a/devel/hs-pcre-light-ghc/Makefile +++ b/devel/hs-pcre-light-ghc/Makefile @@ -7,7 +7,7 @@ PORTNAME= pcre-light PORTVERSION= 0.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ PKGNAMEPREFIX= hs- @@ -20,38 +20,61 @@ BUILD_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre RUN_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc -GHC_VERSION= 6.8.3 -CABALCMD= ${LOCALBASE}/bin/runghc Setup.lhs -CABALDIR= lib/ghc-${GHC_VERSION}/cabal +GHC_VERSION= 6.10.4 +PCRELIGHT_VERSION= ${PORTVERSION} -SUBDIR= lib/${PORTNAME}-${PORTVERSION} -PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ - PORTNAME=${PORTNAME} \ - PORTVERSION=${PORTVERSION} \ - SUBDIR=${CABALDIR} -DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION} -PORTDOCS= LICENSE html +GHC_CMD= ${LOCALBASE}/bin/ghc +SETUP_CMD= ./setup -CONFIGURE_ARGS= --ghc --prefix=${PREFIX} --libdir=${PREFIX}/${CABALDIR} --libsubdir='' --datasubdir='' +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +PCRELIGHT_LIBDIR_REL= lib/${DISTNAME} + +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + PCRELIGHT_VERSION=${PCRELIGHT_VERSION} \ + PCRELIGHT_LIBDIR_REL=${PCRELIGHT_LIBDIR_REL} + +.if defined(NOPORTDOCS) +PLIST_SUB+= NOPORTDOCS="" +.else +PLIST_SUB+= NOPORTDOCS="@comment " +.endif .if !defined(NOPORTDOCS) + +PORT_HADDOCK!= (cd ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK) +.if !empty(PORT_HADDOCK:M?0) BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock -.else -PLIST_DIRS+= %%DOCSDIR%% -PLIST_FILES+= %%DOCSDIR%%/LICENSE .endif +BUILD_DEPENDS+= HsColour:${PORTSDIR}/print/hs-hscolour + +HSCOLOUR_VERSION= 1.13 +HSCOLOUR_DATADIR= ${PREFIX}/share/hscolour-${HSCOLOUR_VERSION} + +PORTDOCS= * +.endif + +.SILENT: do-configure: - cd ${WRKSRC} && ${CABALCMD} configure ${CONFIGURE_ARGS} + cd ${WRKSRC} && ${GHC_CMD} --make Setup.lhs -o setup -package Cabal \ + && ${SETUP_CMD} configure --haddock-options=-w \ + --extra-include-dirs=${LOCALBASE}/include \ + --extra-lib-dirs=${LOCALBASE}/lib --prefix=${PREFIX} do-build: - cd ${WRKSRC} && ${CABALCMD} build && ${CABALCMD} --gen-script register + cd ${WRKSRC} && ${SETUP_CMD} build \ + && ${SETUP_CMD} register --gen-script + .if !defined(NOPORTDOCS) - cd ${WRKSRC} && ${CABALCMD} haddock + cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \ + --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css .endif do-install: - cd ${WRKSRC} && ${CABALCMD} install - ${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${PREFIX}/${CABALDIR}/${PORTNAME}-register.sh + cd ${WRKSRC} && ${SETUP_CMD} install \ + && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${PCRELIGHT_LIBDIR_REL}/register.sh + +post-install: + ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old .include <bsd.port.mk> diff --git a/devel/hs-pcre-light-ghc/pkg-descr b/devel/hs-pcre-light-ghc/pkg-descr index 7018663a7db1..b4cc9d1c14dc 100644 --- a/devel/hs-pcre-light-ghc/pkg-descr +++ b/devel/hs-pcre-light-ghc/pkg-descr @@ -1,5 +1,5 @@ -A small, efficient and portable Haskell regex library for Perl 5 -compatible regular expressions. +A small, efficient and portable Haskell regex library for Perl 5 compatible +regular expressions. The PCRE library is a set of functions that implement regular expression pattern matching using the same syntax and semantics as Perl 5. diff --git a/devel/hs-pcre-light-ghc/pkg-plist b/devel/hs-pcre-light-ghc/pkg-plist index 655486b56580..77c2f52f2ba0 100644 --- a/devel/hs-pcre-light-ghc/pkg-plist +++ b/devel/hs-pcre-light-ghc/pkg-plist @@ -1,14 +1,19 @@ -%%SUBDIR%%/Text/Regex/PCRE/Light.hi -%%SUBDIR%%/Text/Regex/PCRE/Light/Base.hi -%%SUBDIR%%/Text/Regex/PCRE/Light/Char8.hi -%%SUBDIR%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a -%%SUBDIR%%/HS%%PORTNAME%%-%%PORTVERSION%%.o -%%SUBDIR%%/%%PORTNAME%%-register.sh -@dirrmtry %%SUBDIR%%/Text/Regex/PCRE/Light -@dirrmtry %%SUBDIR%%/Text/Regex/PCRE -@dirrmtry %%SUBDIR%%/Text/Regex -@dirrmtry %%SUBDIR%%/Text -@exec sh %D/%%SUBDIR%%/%%PORTNAME%%-register.sh -@exec rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old -@unexec ghc-pkg unregister %%PORTNAME%% -@unexec rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old +@comment $FreeBSD$ +%%PCRELIGHT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSpcre-light-%%PCRELIGHT_VERSION%%.o +%%PCRELIGHT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Regex/PCRE/Light.hi +%%PCRELIGHT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Regex/PCRE/Light/Base.hi +%%PCRELIGHT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Regex/PCRE/Light/Char8.hi +%%PCRELIGHT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSpcre-light-%%PCRELIGHT_VERSION%%.a +%%PCRELIGHT_LIBDIR_REL%%/register.sh +%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE +%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrm %%PCRELIGHT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Regex/PCRE/Light +@dirrm %%PCRELIGHT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Regex/PCRE +@dirrm %%PCRELIGHT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Regex +@dirrm %%PCRELIGHT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text +@dirrm %%PCRELIGHT_LIBDIR_REL%%/ghc-%%GHC_VERSION%% +@dirrm %%PCRELIGHT_LIBDIR_REL%% +@exec /bin/sh %D/%%PCRELIGHT_LIBDIR_REL%%/register.sh +@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old +@unexec %D/bin/ghc-pkg unregister pcre-light +@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old diff --git a/devel/hs-pcre-light/Makefile b/devel/hs-pcre-light/Makefile index 1b80dc3662ca..db219098037e 100644 --- a/devel/hs-pcre-light/Makefile +++ b/devel/hs-pcre-light/Makefile @@ -7,7 +7,7 @@ PORTNAME= pcre-light PORTVERSION= 0.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ PKGNAMEPREFIX= hs- @@ -20,38 +20,61 @@ BUILD_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre RUN_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc -GHC_VERSION= 6.8.3 -CABALCMD= ${LOCALBASE}/bin/runghc Setup.lhs -CABALDIR= lib/ghc-${GHC_VERSION}/cabal +GHC_VERSION= 6.10.4 +PCRELIGHT_VERSION= ${PORTVERSION} -SUBDIR= lib/${PORTNAME}-${PORTVERSION} -PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ - PORTNAME=${PORTNAME} \ - PORTVERSION=${PORTVERSION} \ - SUBDIR=${CABALDIR} -DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION} -PORTDOCS= LICENSE html +GHC_CMD= ${LOCALBASE}/bin/ghc +SETUP_CMD= ./setup -CONFIGURE_ARGS= --ghc --prefix=${PREFIX} --libdir=${PREFIX}/${CABALDIR} --libsubdir='' --datasubdir='' +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +PCRELIGHT_LIBDIR_REL= lib/${DISTNAME} + +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + PCRELIGHT_VERSION=${PCRELIGHT_VERSION} \ + PCRELIGHT_LIBDIR_REL=${PCRELIGHT_LIBDIR_REL} + +.if defined(NOPORTDOCS) +PLIST_SUB+= NOPORTDOCS="" +.else +PLIST_SUB+= NOPORTDOCS="@comment " +.endif .if !defined(NOPORTDOCS) + +PORT_HADDOCK!= (cd ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK) +.if !empty(PORT_HADDOCK:M?0) BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock -.else -PLIST_DIRS+= %%DOCSDIR%% -PLIST_FILES+= %%DOCSDIR%%/LICENSE .endif +BUILD_DEPENDS+= HsColour:${PORTSDIR}/print/hs-hscolour + +HSCOLOUR_VERSION= 1.13 +HSCOLOUR_DATADIR= ${PREFIX}/share/hscolour-${HSCOLOUR_VERSION} + +PORTDOCS= * +.endif + +.SILENT: do-configure: - cd ${WRKSRC} && ${CABALCMD} configure ${CONFIGURE_ARGS} + cd ${WRKSRC} && ${GHC_CMD} --make Setup.lhs -o setup -package Cabal \ + && ${SETUP_CMD} configure --haddock-options=-w \ + --extra-include-dirs=${LOCALBASE}/include \ + --extra-lib-dirs=${LOCALBASE}/lib --prefix=${PREFIX} do-build: - cd ${WRKSRC} && ${CABALCMD} build && ${CABALCMD} --gen-script register + cd ${WRKSRC} && ${SETUP_CMD} build \ + && ${SETUP_CMD} register --gen-script + .if !defined(NOPORTDOCS) - cd ${WRKSRC} && ${CABALCMD} haddock + cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \ + --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css .endif do-install: - cd ${WRKSRC} && ${CABALCMD} install - ${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${PREFIX}/${CABALDIR}/${PORTNAME}-register.sh + cd ${WRKSRC} && ${SETUP_CMD} install \ + && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${PCRELIGHT_LIBDIR_REL}/register.sh + +post-install: + ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old .include <bsd.port.mk> diff --git a/devel/hs-pcre-light/pkg-descr b/devel/hs-pcre-light/pkg-descr index 7018663a7db1..b4cc9d1c14dc 100644 --- a/devel/hs-pcre-light/pkg-descr +++ b/devel/hs-pcre-light/pkg-descr @@ -1,5 +1,5 @@ -A small, efficient and portable Haskell regex library for Perl 5 -compatible regular expressions. +A small, efficient and portable Haskell regex library for Perl 5 compatible +regular expressions. The PCRE library is a set of functions that implement regular expression pattern matching using the same syntax and semantics as Perl 5. diff --git a/devel/hs-pcre-light/pkg-plist b/devel/hs-pcre-light/pkg-plist index 655486b56580..77c2f52f2ba0 100644 --- a/devel/hs-pcre-light/pkg-plist +++ b/devel/hs-pcre-light/pkg-plist @@ -1,14 +1,19 @@ -%%SUBDIR%%/Text/Regex/PCRE/Light.hi -%%SUBDIR%%/Text/Regex/PCRE/Light/Base.hi -%%SUBDIR%%/Text/Regex/PCRE/Light/Char8.hi -%%SUBDIR%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a -%%SUBDIR%%/HS%%PORTNAME%%-%%PORTVERSION%%.o -%%SUBDIR%%/%%PORTNAME%%-register.sh -@dirrmtry %%SUBDIR%%/Text/Regex/PCRE/Light -@dirrmtry %%SUBDIR%%/Text/Regex/PCRE -@dirrmtry %%SUBDIR%%/Text/Regex -@dirrmtry %%SUBDIR%%/Text -@exec sh %D/%%SUBDIR%%/%%PORTNAME%%-register.sh -@exec rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old -@unexec ghc-pkg unregister %%PORTNAME%% -@unexec rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old +@comment $FreeBSD$ +%%PCRELIGHT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSpcre-light-%%PCRELIGHT_VERSION%%.o +%%PCRELIGHT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Regex/PCRE/Light.hi +%%PCRELIGHT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Regex/PCRE/Light/Base.hi +%%PCRELIGHT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Regex/PCRE/Light/Char8.hi +%%PCRELIGHT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSpcre-light-%%PCRELIGHT_VERSION%%.a +%%PCRELIGHT_LIBDIR_REL%%/register.sh +%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE +%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrm %%PCRELIGHT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Regex/PCRE/Light +@dirrm %%PCRELIGHT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Regex/PCRE +@dirrm %%PCRELIGHT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Regex +@dirrm %%PCRELIGHT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text +@dirrm %%PCRELIGHT_LIBDIR_REL%%/ghc-%%GHC_VERSION%% +@dirrm %%PCRELIGHT_LIBDIR_REL%% +@exec /bin/sh %D/%%PCRELIGHT_LIBDIR_REL%%/register.sh +@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old +@unexec %D/bin/ghc-pkg unregister pcre-light +@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old diff --git a/devel/hs-readline/Makefile b/devel/hs-readline/Makefile new file mode 100644 index 000000000000..c509bedbb5e1 --- /dev/null +++ b/devel/hs-readline/Makefile @@ -0,0 +1,74 @@ +# New ports collection makefile for: hs-readline +# Date created: July 09 2009 +# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com> +# +# $FreeBSD$ + +PORTNAME= readline +PORTVERSION= 1.0.1.0 +CATEGORIES= devel haskell +MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ +PKGNAMEPREFIX= hs- + +MAINTAINER= jacula@gmail.com +COMMENT= Haskell interface to the GNU readline library + +BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc +RUN_DEPENDS= ghc:${PORTSDIR}/lang/ghc + +GHC_VERSION= 6.10.4 +HSREADLINE_VERSION= ${PORTVERSION} + +GHC_CMD= ${LOCALBASE}/bin/ghc +SETUP_CMD= ./setup + +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +HSREADLINE_LIBDIR_REL= lib/${DISTNAME} + +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + HSREADLINE_VERSION=${HSREADLINE_VERSION} \ + HSREADLINE_LIBDIR_REL=${HSREADLINE_LIBDIR_REL} + +.if defined(NOPORTDOCS) +PLIST_SUB+= NOPORTDOCS="" +.else +PLIST_SUB+= NOPORTDOCS="@comment " +.endif + +.if !defined(NOPORTDOCS) + +PORT_HADDOCK!= (cd ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK) +.if !empty(PORT_HADDOCK:M?0) +BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock +.endif +BUILD_DEPENDS+= HsColour:${PORTSDIR}/print/hs-hscolour + +HSCOLOUR_VERSION= 1.13 +HSCOLOUR_DATADIR= ${PREFIX}/share/hscolour-${HSCOLOUR_VERSION} + +PORTDOCS= * +.endif + +.SILENT: + +do-configure: + cd ${WRKSRC} && ${GHC_CMD} --make Setup.hs -o setup -package Cabal \ + && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX} + +do-build: + cd ${WRKSRC} && ${SETUP_CMD} build \ + && ${SETUP_CMD} register --gen-script + +.if !defined(NOPORTDOCS) + cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \ + --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css +.endif + +do-install: + cd ${WRKSRC} && ${SETUP_CMD} install \ + && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${HSREADLINE_LIBDIR_REL}/register.sh + +post-install: + ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old + +.include <bsd.port.mk> diff --git a/devel/hs-readline/distinfo b/devel/hs-readline/distinfo new file mode 100644 index 000000000000..70db17e19cba --- /dev/null +++ b/devel/hs-readline/distinfo @@ -0,0 +1,3 @@ +MD5 (readline-1.0.1.0.tar.gz) = eade9576def53ed293628a2f8580007e +SHA256 (readline-1.0.1.0.tar.gz) = 07f2f039f32bf18838a4875d0f3caa3ed9436dd52b962b2061f0bb8a3316fa1d +SIZE (readline-1.0.1.0.tar.gz) = 52394 diff --git a/devel/hs-readline/files/patch-Setup.hs b/devel/hs-readline/files/patch-Setup.hs new file mode 100644 index 000000000000..cc3d6bccc53c --- /dev/null +++ b/devel/hs-readline/files/patch-Setup.hs @@ -0,0 +1,8 @@ +--- Setup.hs.orig 2009-07-16 09:03:11.000000000 +0000 ++++ Setup.hs 2009-07-16 09:03:29.000000000 +0000 +@@ -3,4 +3,4 @@ + import Distribution.Simple + + main :: IO () +-main = defaultMainWithHooks defaultUserHooks ++main = defaultMainWithHooks autoconfUserHooks diff --git a/devel/hs-readline/pkg-descr b/devel/hs-readline/pkg-descr new file mode 100644 index 000000000000..c80da8f32ec9 --- /dev/null +++ b/devel/hs-readline/pkg-descr @@ -0,0 +1,4 @@ +An interface to the GNU readline library. More information on readline can be +found at <http://www.gnu.org/directory/readline.html>. + +WWW: http://hackage.haskell.org/package/readline diff --git a/devel/hs-readline/pkg-plist b/devel/hs-readline/pkg-plist new file mode 100644 index 000000000000..3e1414d88292 --- /dev/null +++ b/devel/hs-readline/pkg-plist @@ -0,0 +1,19 @@ +@comment $FreeBSD$ +%%HSREADLINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSreadline-%%HSREADLINE_VERSION%%.o +%%HSREADLINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Readline.hi +%%HSREADLINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/SimpleLineEditor.hi +%%HSREADLINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include/HsReadline.h +%%HSREADLINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include/HsReadlineConfig.h +%%HSREADLINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSreadline-%%HSREADLINE_VERSION%%.a +%%HSREADLINE_LIBDIR_REL%%/register.sh +%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE +%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrm %%HSREADLINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include +@dirrm %%HSREADLINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console +@dirrm %%HSREADLINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System +@dirrm %%HSREADLINE_LIBDIR_REL%%/ghc-%%GHC_VERSION%% +@dirrm %%HSREADLINE_LIBDIR_REL%% +@exec /bin/sh %D/%%HSREADLINE_LIBDIR_REL%%/register.sh +@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old +@unexec %D/bin/ghc-pkg unregister readline +@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old diff --git a/devel/hs-utf8-string-ghc/Makefile b/devel/hs-utf8-string-ghc/Makefile index 11ac8b19b71d..840dcfee7823 100644 --- a/devel/hs-utf8-string-ghc/Makefile +++ b/devel/hs-utf8-string-ghc/Makefile @@ -6,7 +6,7 @@ # PORTNAME= utf8-string -PORTVERSION= 0.3.4 +PORTVERSION= 0.3.5 CATEGORIES= devel haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ PKGNAMEPREFIX= hs- @@ -18,37 +18,59 @@ COMMENT= Support for reading/writing UTF8 strings for Haskell programs BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc RUN_DEPENDS= ghc:${PORTSDIR}/lang/ghc -CABALCMD= ${LOCALBASE}/bin/runghc Setup.lhs -CABALDIR= ${PREFIX}/lib/ghc-${GHC_VERSION}/cabal -GHC_VERSION= 6.8.3 -SUBDIR= lib/${PORTNAME}-${PORTVERSION} -PLIST_SUB+= GHC_VERSION=${GHC_VERSION} \ - PORTVERSION=${PORTVERSION} \ - PORTNAME=${PORTNAME} \ - SUBDIR=lib/ghc-${GHC_VERSION}/cabal -DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION} -PORTDOCS= LICENSE html +GHC_VERSION= 6.10.4 +UTF8STR_VERSION= ${PORTVERSION} -CONFIGURE_ARGS= --ghc --prefix=${PREFIX} --libdir=${CABALDIR} --libsubdir='' --datasubdir='' +GHC_CMD= ${LOCALBASE}/bin/ghc +SETUP_CMD= ./setup + +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +UTF8STR_LIBDIR_REL= lib/${DISTNAME} + +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + UTF8STR_VERSION=${UTF8STR_VERSION} \ + UTF8STR_LIBDIR_REL=${UTF8STR_LIBDIR_REL} + +.if defined(NOPORTDOCS) +PLIST_SUB+= NOPORTDOCS="" +.else +PLIST_SUB+= NOPORTDOCS="@comment " +.endif .if !defined(NOPORTDOCS) + +PORT_HADDOCK!= (cd ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK) +.if !empty(PORT_HADDOCK:M?0) BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock -.else -PLIST_DIRS+= %%DOCSDIR%% -PLIST_FILES+= %%DOCSDIR%%/LICENSE .endif +BUILD_DEPENDS+= HsColour:${PORTSDIR}/print/hs-hscolour + +HSCOLOUR_VERSION= 1.13 +HSCOLOUR_DATADIR= ${PREFIX}/share/hscolour-${HSCOLOUR_VERSION} + +PORTDOCS= * +.endif + +.SILENT: do-configure: - cd ${WRKSRC} && ${CABALCMD} configure ${CONFIGURE_ARGS} + cd ${WRKSRC} && ${GHC_CMD} --make Setup.lhs -o setup -package Cabal \ + && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX} do-build: - cd ${WRKSRC} && ${CABALCMD} build && ${CABALCMD} --gen-script register + cd ${WRKSRC} && ${SETUP_CMD} build \ + && ${SETUP_CMD} register --gen-script + .if !defined(NOPORTDOCS) - cd ${WRKSRC} && ${CABALCMD} haddock + cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \ + --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css .endif do-install: - cd ${WRKSRC} && ${CABALCMD} install \ - && ${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${CABALDIR}/${PORTNAME}-register.sh + cd ${WRKSRC} && ${SETUP_CMD} install \ + && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${UTF8STR_LIBDIR_REL}/register.sh + +post-install: + ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old .include <bsd.port.mk> diff --git a/devel/hs-utf8-string-ghc/distinfo b/devel/hs-utf8-string-ghc/distinfo index 85d6c5076db1..e8f11ef97472 100644 --- a/devel/hs-utf8-string-ghc/distinfo +++ b/devel/hs-utf8-string-ghc/distinfo @@ -1,3 +1,3 @@ -MD5 (utf8-string-0.3.4.tar.gz) = 72d13d9453cdf721dd95bc18144a120a -SHA256 (utf8-string-0.3.4.tar.gz) = f97027354f0b88af9bf3638aee0eb3bb72c05ec44f4af4c1abe070597059a5bd -SIZE (utf8-string-0.3.4.tar.gz) = 8063 +MD5 (utf8-string-0.3.5.tar.gz) = d5198209bd81ea4f8af7692e2467336c +SHA256 (utf8-string-0.3.5.tar.gz) = 41f99b3e9f61ab5309c93f98d45f1ba2e475a8504c5202a350720c27fb82d07a +SIZE (utf8-string-0.3.5.tar.gz) = 8758 diff --git a/devel/hs-utf8-string-ghc/pkg-descr b/devel/hs-utf8-string-ghc/pkg-descr index 2a19919f8879..52a189edfd36 100644 --- a/devel/hs-utf8-string-ghc/pkg-descr +++ b/devel/hs-utf8-string-ghc/pkg-descr @@ -1,5 +1,5 @@ -A UTF8 layer for IO and Strings. The utf8-string package -provides operations for encoding UTF8 strings to Word8 lists -and back, and for reading and writing UTF8 without truncation. +A UTF8 layer for IO and Strings. The utf8-string package provides operations for +encoding UTF8 strings to Word8 lists and back, and for reading and writing UTF8 +without truncation. -WWW: http://github.com/glguy/utf8-string/ +WWW: http://github.com/glguy/utf8-string/ diff --git a/devel/hs-utf8-string-ghc/pkg-plist b/devel/hs-utf8-string-ghc/pkg-plist index 1dc9435721bb..ccda5fa99128 100644 --- a/devel/hs-utf8-string-ghc/pkg-plist +++ b/devel/hs-utf8-string-ghc/pkg-plist @@ -1,22 +1,29 @@ -%%SUBDIR%%/Codec/Binary/UTF8/Generic.hi -%%SUBDIR%%/Codec/Binary/UTF8/String.hi -%%SUBDIR%%/Data/ByteString/Lazy/UTF8.hi -%%SUBDIR%%/Data/ByteString/UTF8.hi -%%SUBDIR%%/Data/String/UTF8.hi -%%SUBDIR%%/System/IO/UTF8.hi -%%SUBDIR%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a -%%SUBDIR%%/HS%%PORTNAME%%-%%PORTVERSION%%.o -%%SUBDIR%%/%%PORTNAME%%-register.sh -@dirrmtry %%SUBDIR%%/System/IO -@dirrmtry %%SUBDIR%%/System -@dirrmtry %%SUBDIR%%/Data/String -@dirrmtry %%SUBDIR%%/Data/ByteString/Lazy -@dirrmtry %%SUBDIR%%/Data/ByteString -@dirrmtry %%SUBDIR%%/Data -@dirrmtry %%SUBDIR%%/Codec/Binary/UTF8 -@dirrmtry %%SUBDIR%%/Codec/Binary -@dirrmtry %%SUBDIR%%/Codec -@exec /bin/sh %D/%%SUBDIR%%/%%PORTNAME%%-register.sh +@comment $FreeBSD$ +%%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Binary/UTF8/Generic.hi +%%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Binary/UTF8/String.hi +%%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString/Lazy/UTF8.hi +%%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString/UTF8.hi +%%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/String/UTF8.hi +%%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSutf8-string-%%UTF8STR_VERSION%%.o +%%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Environment/UTF8.hi +%%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/IO/UTF8.hi +%%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSutf8-string-%%UTF8STR_VERSION%%.a +%%UTF8STR_LIBDIR_REL%%/register.sh +%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE +%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrm %%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/IO +@dirrm %%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Environment +@dirrm %%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System +@dirrm %%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/String +@dirrm %%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString/Lazy +@dirrm %%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString +@dirrm %%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data +@dirrm %%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Binary/UTF8 +@dirrm %%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Binary +@dirrm %%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec +@dirrm %%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%% +@dirrm %%UTF8STR_LIBDIR_REL%% +@exec /bin/sh %D/%%UTF8STR_LIBDIR_REL%%/register.sh @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old -@unexec %D/bin/ghc-pkg unregister %%PORTNAME%% +@unexec %D/bin/ghc-pkg unregister utf8-string @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old diff --git a/devel/hs-utf8-string/Makefile b/devel/hs-utf8-string/Makefile index 11ac8b19b71d..840dcfee7823 100644 --- a/devel/hs-utf8-string/Makefile +++ b/devel/hs-utf8-string/Makefile @@ -6,7 +6,7 @@ # PORTNAME= utf8-string -PORTVERSION= 0.3.4 +PORTVERSION= 0.3.5 CATEGORIES= devel haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ PKGNAMEPREFIX= hs- @@ -18,37 +18,59 @@ COMMENT= Support for reading/writing UTF8 strings for Haskell programs BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc RUN_DEPENDS= ghc:${PORTSDIR}/lang/ghc -CABALCMD= ${LOCALBASE}/bin/runghc Setup.lhs -CABALDIR= ${PREFIX}/lib/ghc-${GHC_VERSION}/cabal -GHC_VERSION= 6.8.3 -SUBDIR= lib/${PORTNAME}-${PORTVERSION} -PLIST_SUB+= GHC_VERSION=${GHC_VERSION} \ - PORTVERSION=${PORTVERSION} \ - PORTNAME=${PORTNAME} \ - SUBDIR=lib/ghc-${GHC_VERSION}/cabal -DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION} -PORTDOCS= LICENSE html +GHC_VERSION= 6.10.4 +UTF8STR_VERSION= ${PORTVERSION} -CONFIGURE_ARGS= --ghc --prefix=${PREFIX} --libdir=${CABALDIR} --libsubdir='' --datasubdir='' +GHC_CMD= ${LOCALBASE}/bin/ghc +SETUP_CMD= ./setup + +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +UTF8STR_LIBDIR_REL= lib/${DISTNAME} + +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + UTF8STR_VERSION=${UTF8STR_VERSION} \ + UTF8STR_LIBDIR_REL=${UTF8STR_LIBDIR_REL} + +.if defined(NOPORTDOCS) +PLIST_SUB+= NOPORTDOCS="" +.else +PLIST_SUB+= NOPORTDOCS="@comment " +.endif .if !defined(NOPORTDOCS) + +PORT_HADDOCK!= (cd ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK) +.if !empty(PORT_HADDOCK:M?0) BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock -.else -PLIST_DIRS+= %%DOCSDIR%% -PLIST_FILES+= %%DOCSDIR%%/LICENSE .endif +BUILD_DEPENDS+= HsColour:${PORTSDIR}/print/hs-hscolour + +HSCOLOUR_VERSION= 1.13 +HSCOLOUR_DATADIR= ${PREFIX}/share/hscolour-${HSCOLOUR_VERSION} + +PORTDOCS= * +.endif + +.SILENT: do-configure: - cd ${WRKSRC} && ${CABALCMD} configure ${CONFIGURE_ARGS} + cd ${WRKSRC} && ${GHC_CMD} --make Setup.lhs -o setup -package Cabal \ + && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX} do-build: - cd ${WRKSRC} && ${CABALCMD} build && ${CABALCMD} --gen-script register + cd ${WRKSRC} && ${SETUP_CMD} build \ + && ${SETUP_CMD} register --gen-script + .if !defined(NOPORTDOCS) - cd ${WRKSRC} && ${CABALCMD} haddock + cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \ + --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css .endif do-install: - cd ${WRKSRC} && ${CABALCMD} install \ - && ${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${CABALDIR}/${PORTNAME}-register.sh + cd ${WRKSRC} && ${SETUP_CMD} install \ + && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${UTF8STR_LIBDIR_REL}/register.sh + +post-install: + ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old .include <bsd.port.mk> diff --git a/devel/hs-utf8-string/distinfo b/devel/hs-utf8-string/distinfo index 85d6c5076db1..e8f11ef97472 100644 --- a/devel/hs-utf8-string/distinfo +++ b/devel/hs-utf8-string/distinfo @@ -1,3 +1,3 @@ -MD5 (utf8-string-0.3.4.tar.gz) = 72d13d9453cdf721dd95bc18144a120a -SHA256 (utf8-string-0.3.4.tar.gz) = f97027354f0b88af9bf3638aee0eb3bb72c05ec44f4af4c1abe070597059a5bd -SIZE (utf8-string-0.3.4.tar.gz) = 8063 +MD5 (utf8-string-0.3.5.tar.gz) = d5198209bd81ea4f8af7692e2467336c +SHA256 (utf8-string-0.3.5.tar.gz) = 41f99b3e9f61ab5309c93f98d45f1ba2e475a8504c5202a350720c27fb82d07a +SIZE (utf8-string-0.3.5.tar.gz) = 8758 diff --git a/devel/hs-utf8-string/pkg-descr b/devel/hs-utf8-string/pkg-descr index 2a19919f8879..52a189edfd36 100644 --- a/devel/hs-utf8-string/pkg-descr +++ b/devel/hs-utf8-string/pkg-descr @@ -1,5 +1,5 @@ -A UTF8 layer for IO and Strings. The utf8-string package -provides operations for encoding UTF8 strings to Word8 lists -and back, and for reading and writing UTF8 without truncation. +A UTF8 layer for IO and Strings. The utf8-string package provides operations for +encoding UTF8 strings to Word8 lists and back, and for reading and writing UTF8 +without truncation. -WWW: http://github.com/glguy/utf8-string/ +WWW: http://github.com/glguy/utf8-string/ diff --git a/devel/hs-utf8-string/pkg-plist b/devel/hs-utf8-string/pkg-plist index 1dc9435721bb..ccda5fa99128 100644 --- a/devel/hs-utf8-string/pkg-plist +++ b/devel/hs-utf8-string/pkg-plist @@ -1,22 +1,29 @@ -%%SUBDIR%%/Codec/Binary/UTF8/Generic.hi -%%SUBDIR%%/Codec/Binary/UTF8/String.hi -%%SUBDIR%%/Data/ByteString/Lazy/UTF8.hi -%%SUBDIR%%/Data/ByteString/UTF8.hi -%%SUBDIR%%/Data/String/UTF8.hi -%%SUBDIR%%/System/IO/UTF8.hi -%%SUBDIR%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a -%%SUBDIR%%/HS%%PORTNAME%%-%%PORTVERSION%%.o -%%SUBDIR%%/%%PORTNAME%%-register.sh -@dirrmtry %%SUBDIR%%/System/IO -@dirrmtry %%SUBDIR%%/System -@dirrmtry %%SUBDIR%%/Data/String -@dirrmtry %%SUBDIR%%/Data/ByteString/Lazy -@dirrmtry %%SUBDIR%%/Data/ByteString -@dirrmtry %%SUBDIR%%/Data -@dirrmtry %%SUBDIR%%/Codec/Binary/UTF8 -@dirrmtry %%SUBDIR%%/Codec/Binary -@dirrmtry %%SUBDIR%%/Codec -@exec /bin/sh %D/%%SUBDIR%%/%%PORTNAME%%-register.sh +@comment $FreeBSD$ +%%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Binary/UTF8/Generic.hi +%%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Binary/UTF8/String.hi +%%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString/Lazy/UTF8.hi +%%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString/UTF8.hi +%%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/String/UTF8.hi +%%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSutf8-string-%%UTF8STR_VERSION%%.o +%%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Environment/UTF8.hi +%%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/IO/UTF8.hi +%%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSutf8-string-%%UTF8STR_VERSION%%.a +%%UTF8STR_LIBDIR_REL%%/register.sh +%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE +%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrm %%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/IO +@dirrm %%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Environment +@dirrm %%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System +@dirrm %%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/String +@dirrm %%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString/Lazy +@dirrm %%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString +@dirrm %%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data +@dirrm %%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Binary/UTF8 +@dirrm %%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Binary +@dirrm %%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec +@dirrm %%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%% +@dirrm %%UTF8STR_LIBDIR_REL%% +@exec /bin/sh %D/%%UTF8STR_LIBDIR_REL%%/register.sh @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old -@unexec %D/bin/ghc-pkg unregister %%PORTNAME%% +@unexec %D/bin/ghc-pkg unregister utf8-string @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old diff --git a/devel/hs-uuagc/Makefile b/devel/hs-uuagc/Makefile index 2f16e0607427..87f91f90be4c 100644 --- a/devel/hs-uuagc/Makefile +++ b/devel/hs-uuagc/Makefile @@ -6,8 +6,7 @@ # PORTNAME= uuagc -PORTVERSION= 0.9.7 -PORTREVISION= 1 +PORTVERSION= 0.9.10 CATEGORIES= devel haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ PKGNAMEPREFIX= hs- @@ -19,7 +18,7 @@ BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc \ hs-uulib>=0.9.5:${PORTSDIR}/devel/hs-uulib LIB_DEPENDS+= gmp.8:${PORTSDIR}/math/libgmp4 -GHC_VERSION= 6.8.3 +GHC_VERSION= 6.10.4 GHC_CMD= ${LOCALBASE}/bin/ghc SETUP_CMD= ./setup diff --git a/devel/hs-uuagc/distinfo b/devel/hs-uuagc/distinfo index 2be2acfac7ba..743c505b826d 100644 --- a/devel/hs-uuagc/distinfo +++ b/devel/hs-uuagc/distinfo @@ -1,3 +1,3 @@ -MD5 (uuagc-0.9.7.tar.gz) = 9e11b40c0a1d4f829dfa7802e62e93ad -SHA256 (uuagc-0.9.7.tar.gz) = 7479ddbc8dc4b04cae278a942a50d7d76f06011aca06c56bcd26bdeba6eeb2d6 -SIZE (uuagc-0.9.7.tar.gz) = 190381 +MD5 (uuagc-0.9.10.tar.gz) = 4be7fb2b0e7477b929e88977ab2c66f9 +SHA256 (uuagc-0.9.10.tar.gz) = cdbe78b6138a67bbc612f0f667f70ba483ebbdaa4d0c87c5508cfb5e68a49dcb +SIZE (uuagc-0.9.10.tar.gz) = 191213 diff --git a/devel/hs-uuagc/pkg-descr b/devel/hs-uuagc/pkg-descr index 0d8869076f85..d0d0a26f1695 100644 --- a/devel/hs-uuagc/pkg-descr +++ b/devel/hs-uuagc/pkg-descr @@ -1,12 +1,9 @@ -UUAG is the Utrecht University Attribute Grammar system. -It generates Haskell files from an attribute grammar specification. +UUAG is the Utrecht University Attribute Grammar system. It generates Haskell +files from an attribute grammar specification. It is a preprocessor for Haskell which makes it easy to write catamorphisms (that is, functions that do to any datatype what foldr does to lists). You can define tree walks using the intuitive concepts of inherited and synthesized attributes, while keeping the full expressive power of Haskell. -maintainer: Arie Middelkoop <ariem@cs.uu.nl> -license: GPL-2 -WWW: http://www.cs.uu.nl/wiki/HUT/AttributeGrammarSystem -package-url: http://nix.cs.uu.nl/dist/hut/ +WWW: http://www.cs.uu.nl/wiki/HUT/AttributeGrammarSystem diff --git a/devel/hs-uuagc/pkg-plist b/devel/hs-uuagc/pkg-plist index f2ca2c9f06ad..11b417f5d194 100644 --- a/devel/hs-uuagc/pkg-plist +++ b/devel/hs-uuagc/pkg-plist @@ -1,3 +1,4 @@ +@comment $FreeBSD$ bin/uuagc %%DOCSDIR%%/LICENSE @dirrm %%DOCSDIR%% diff --git a/devel/hs-uulib/Makefile b/devel/hs-uulib/Makefile index f9cdad3b9881..10e47d039d23 100644 --- a/devel/hs-uulib/Makefile +++ b/devel/hs-uulib/Makefile @@ -6,8 +6,7 @@ # PORTNAME= uulib -PORTVERSION= 0.9.5 -PORTREVISION= 1 +PORTVERSION= 0.9.10 CATEGORIES= devel haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ PKGNAMEPREFIX= hs- @@ -16,8 +15,9 @@ MAINTAINER= jacula@gmail.com COMMENT= Haskell Utrecht Tools Library BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc +RUN_DEPENDS+= ghc:${PORTSDIR}/lang/ghc -GHC_VERSION= 6.8.3 +GHC_VERSION= 6.10.4 UULIB_VERSION= ${PORTVERSION} GHC_CMD= ${LOCALBASE}/bin/ghc @@ -30,16 +30,41 @@ PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ UULIB_VERSION=${UULIB_VERSION} \ UULIB_LIBDIR_REL=${UULIB_LIBDIR_REL} +.if defined(NOPORTDOCS) +PLIST_SUB+= NOPORTDOCS="" +.else +PLIST_SUB+= NOPORTDOCS="@comment " +.endif + +.if !defined(NOPORTDOCS) + +PORT_HADDOCK!= (cd ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK) +.if !empty(PORT_HADDOCK:M?0) +BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock +.endif +BUILD_DEPENDS+= HsColour:${PORTSDIR}/print/hs-hscolour + +HSCOLOUR_VERSION= 1.13 +HSCOLOUR_DATADIR= ${PREFIX}/share/hscolour-${HSCOLOUR_VERSION} + +PORTDOCS= * +.endif + .SILENT: do-configure: cd ${WRKSRC} && ${GHC_CMD} --make Setup.hs -o setup -package Cabal \ - && ${SETUP_CMD} configure --prefix=${PREFIX} + && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX} do-build: cd ${WRKSRC} && ${SETUP_CMD} build \ && ${SETUP_CMD} register --gen-script +.if !defined(NOPORTDOCS) + cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \ + --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css +.endif + do-install: cd ${WRKSRC} && ${SETUP_CMD} install \ && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${UULIB_LIBDIR_REL}/register.sh diff --git a/devel/hs-uulib/distinfo b/devel/hs-uulib/distinfo index dcd0eacdaba7..af002f2ee7f9 100644 --- a/devel/hs-uulib/distinfo +++ b/devel/hs-uulib/distinfo @@ -1,3 +1,3 @@ -MD5 (uulib-0.9.5.tar.gz) = 606dec3a8ea8797421e795336392f02f -SHA256 (uulib-0.9.5.tar.gz) = 38415725133af464de582dadc7d7e60b1aeb96344b18b239d176bf2181f98563 -SIZE (uulib-0.9.5.tar.gz) = 93618 +MD5 (uulib-0.9.10.tar.gz) = 5db835e7ee4accd902a54eb26c4762d8 +SHA256 (uulib-0.9.10.tar.gz) = 1df7336ed76c278323c2e25ab53ec1afc9eba6a7c918c826e9f783e84479e08f +SIZE (uulib-0.9.10.tar.gz) = 96312 diff --git a/devel/hs-uulib/pkg-descr b/devel/hs-uulib/pkg-descr index 05502b0220e5..081fe1e02175 100644 --- a/devel/hs-uulib/pkg-descr +++ b/devel/hs-uulib/pkg-descr @@ -1,24 +1,4 @@ -Fast Parser Combinators and Pretty Printing Combinators -libraries by the Utrecht University. +Fast Parser Combinators and Pretty Printing Combinators libraries by the +Utrecht University. -author: -maintainer: Arie Middelkoop <ariem@cs.uu.nl> -license: LGPL-2.1 -WWW: http://www.cs.uu.nl/wiki/HUT/AttributeGrammarSystem -package-url: http://nix.cs.uu.nl/dist/hut/ - -exposed-modules: - UU.Parsing.CharParser UU.Parsing.Derived - UU.Parsing.Interface UU.Parsing.MachineInterface - UU.Parsing.Merge UU.Parsing.Offside UU.Parsing.Perms - UU.Parsing.StateParser UU.Parsing UU.DData.IntBag - UU.DData.Map UU.DData.MultiSet UU.DData.Queue - UU.DData.Scc UU.DData.Seq UU.DData.Set UU.PPrint - UU.Pretty.Ext UU.Pretty UU.Scanner.GenToken UU.Scanner.GenTokenOrd - UU.Scanner.GenTokenParser UU.Scanner.GenTokenSymbol - UU.Scanner.Position UU.Scanner.Scanner - UU.Scanner.Token UU.Scanner.TokenParser UU.Scanner.TokenShow - UU.Scanner UU.Util.BinaryTrees UU.Util.PermTree UU.Util.Utils - UU.Pretty.Basic UU.Parsing.Machine - UU.DData.IntMap - UU.DData.IntSet +WWW: http://www.cs.uu.nl/wiki/HUT/AttributeGrammarSystem diff --git a/devel/hs-uulib/pkg-plist b/devel/hs-uulib/pkg-plist index c1c11961d535..50f2d18d2c55 100644 --- a/devel/hs-uulib/pkg-plist +++ b/devel/hs-uulib/pkg-plist @@ -1,3 +1,4 @@ +@comment $FreeBSD$ %%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSuulib-%%UULIB_VERSION%%.o %%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/DData/IntBag.hi %%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/DData/IntMap.hi @@ -37,8 +38,8 @@ %%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Util/Utils.hi %%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSuulib-%%UULIB_VERSION%%.a %%UULIB_LIBDIR_REL%%/register.sh -%%DOCSDIR%%/COPYRIGHT -@dirrm %%DOCSDIR%% +%%NOPORTDOCS%%%%DOCSDIR%%/COPYRIGHT +%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%% @dirrm %%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Util @dirrm %%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Scanner @dirrm %%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Pretty @@ -48,6 +49,6 @@ @dirrm %%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%% @dirrm %%UULIB_LIBDIR_REL%% @exec /bin/sh %D/%%UULIB_LIBDIR_REL%%/register.sh -@exec rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old -@unexec if [ -x %D/bin/ghc-pkg ]; then %D/bin/ghc-pkg unregister uulib || /usr/bin/true; fi -@unexec if [ -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old ]; then rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old || /usr/bin/true; fi +@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old +@unexec %D/bin/ghc-pkg unregister uulib +@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old diff --git a/devel/lhs2TeX/Makefile b/devel/lhs2TeX/Makefile index 9d1e1871c93c..a7a569363d4d 100644 --- a/devel/lhs2TeX/Makefile +++ b/devel/lhs2TeX/Makefile @@ -8,7 +8,7 @@ PORTNAME= lhs2tex PORTVERSION= 1.14 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MASTER_SITES= http://people.cs.uu.nl/andres/${PORTNAME}/ @@ -31,16 +31,18 @@ PORTDOCS= * DATADIR=${PREFIX}/share/${PORTNAME}-${PORTVERSION} PORTDATA= * +BROKEN= Does not compile with GHC 6.10 + .include <bsd.port.pre.mk> -INSTALL_TARGET= install +INSTALL_TARGET= install .if !defined(NOPORTDOCS) -INSTALL_TARGET+= install-doc +INSTALL_TARGET+= install-doc .endif .if !defined(NOPORTDATA) -INSTALL_TARGET+= install-data +INSTALL_TARGET+= install-data .endif MAN1= lhs2TeX.1 |