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 /textproc | |
| parent | 9acc5ac910695e85c7d24401bfecd5d6e6da0d7f (diff) | |
| download | ports-7d5781e5ab3aa2c4d9f46985acec697caae1c173.tar.gz ports-7d5781e5ab3aa2c4d9f46985acec697caae1c173.zip | |
Notes
Diffstat (limited to 'textproc')
29 files changed, 750 insertions, 507 deletions
diff --git a/textproc/hs-HaXml/Makefile b/textproc/hs-HaXml/Makefile index 683609e93b02..965eff907048 100644 --- a/textproc/hs-HaXml/Makefile +++ b/textproc/hs-HaXml/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ PORTNAME= haxml -PORTVERSION= 1.19.6 +PORTVERSION= 1.19.7 CATEGORIES= textproc haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/HaXml/${PORTVERSION}/ PKGNAMEPREFIX= hs- @@ -18,38 +18,66 @@ BUILD_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc \ hs-polyparse-ghc>=1.1:${PORTSDIR}/textproc/hs-polyparse-ghc RUN_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc \ hs-polyparse-ghc>=1.1:${PORTSDIR}/textproc/hs-polyparse-ghc +LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4 -CONFIGURE_ARGS= --ghc --prefix=${PREFIX} +GHC_VERSION= 6.10.4 +HAXML_VERSION= ${PORTVERSION} -GHC_VERSION= 6.8.3 -PLIST_SUB+= GHC_VERSION=${GHC_VERSION} \ - HAXMLDIR=lib/HaXml-${PORTVERSION} \ - GHCDIR=ghc-${GHC_VERSION} \ - SUBDIR=lib/HaXml-${PORTVERSION}/ghc-${GHC_VERSION} \ - PORTVERSION=${PORTVERSION} -DOCSDIR= ${PREFIX}/share/doc/HaXml-${PORTVERSION} -PORTDOCS= * +GHC_CMD= ${LOCALBASE}/bin/ghc +SETUP_CMD= ./setup -.if !defined(NOPORTDOCS) -PLIST_SUB+= RMLIC="@comment " +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +HAXML_LIBDIR_REL= lib/${DISTNAME} + +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + HAXML_VERSION=${HAXML_VERSION} \ + HAXML_LIBDIR_REL=${HAXML_LIBDIR_REL} + +.if defined(NOPORTDOCS) +PLIST_SUB+= NOPORTDOCS="" .else -PLIST_SUB+= RMLIC="" +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 + +PYSHARE= ${SH} -c '(${FIND} -d $$0 $$2)' + +.SILENT: + do-configure: - @cd ${WRKSRC} && ${LOCALBASE}/bin/runhaskell Setup.hs 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} && ${LOCALBASE}/bin/runhaskell Setup.hs build + cd ${WRKSRC} && ${SETUP_CMD} build \ + && ${SETUP_CMD} register --gen-script -do-install: - @cd ${WRKSRC} && ${LOCALBASE}/bin/runhaskell Setup.hs install +.if !defined(NOPORTDOCS) + cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \ + --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css +.endif -post-install: - @${INSTALL_DATA} ${WRKSRC}/dist/installed-pkg-config ${PREFIX}/lib/HaXml-${PORTVERSION}/ghc-${GHC_VERSION}/HaXml.pkgconf +do-install: + cd ${WRKSRC} && ${SETUP_CMD} install \ + && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${HAXML_LIBDIR_REL}/register.sh .if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @(cd ${WRKSRC} && ${CP} -R docs/ ${DOCSDIR}) + cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* ${DOCSDIR} " -not -regex HaXml.* " .endif +post-install: + ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old + .include <bsd.port.mk> diff --git a/textproc/hs-HaXml/distinfo b/textproc/hs-HaXml/distinfo index 3eb8e4ec43c7..e1ff7f4445bd 100644 --- a/textproc/hs-HaXml/distinfo +++ b/textproc/hs-HaXml/distinfo @@ -1,3 +1,3 @@ -MD5 (HaXml-1.19.6.tar.gz) = 7715780943dd3df6f19a7200783bc4cf -SHA256 (HaXml-1.19.6.tar.gz) = a0311682502666f36cb7f276c684b1547678dda10c5c450bd428bddc6bb5cdbe -SIZE (HaXml-1.19.6.tar.gz) = 630102 +MD5 (HaXml-1.19.7.tar.gz) = be31052aeeb4c6d509d6b6071f619242 +SHA256 (HaXml-1.19.7.tar.gz) = 3968bc9da06c4465bf6d63100245fc0d688f7646216b9380c90b970cb2890290 +SIZE (HaXml-1.19.7.tar.gz) = 630148 diff --git a/textproc/hs-HaXml/files/patch-HaXml.cabal b/textproc/hs-HaXml/files/patch-HaXml.cabal new file mode 100644 index 000000000000..6b0c0befd78f --- /dev/null +++ b/textproc/hs-HaXml/files/patch-HaXml.cabal @@ -0,0 +1,11 @@ +--- HaXml.cabal.orig 2009-07-14 10:01:24.000000000 +0000 ++++ HaXml.cabal 2009-07-14 10:02:19.000000000 +0000 +@@ -52,7 +52,7 @@ + Text.XML.HaXml.Xtract.Lex, + Text.XML.HaXml.Xtract.Parse + hs-source-dirs: src +- build-depends: base, haskell98, polyparse==1.2, filepath ++ build-depends: base, haskell98, polyparse >=1.2, filepath + if flag(splitBase) + build-depends: base >= 3, pretty, random, containers + else diff --git a/textproc/hs-HaXml/pkg-descr b/textproc/hs-HaXml/pkg-descr index fa8aa6c1f593..706847f35887 100644 --- a/textproc/hs-HaXml/pkg-descr +++ b/textproc/hs-HaXml/pkg-descr @@ -2,4 +2,4 @@ HaXml is a collection of utilities for using Haskell and XML together. It includes a parser for XML, a separate error-correcting parser for HTML, and pretty-printers for XML and HTML. -WWW: http://www.haskell.org/HaXml/ +WWW: http://www.haskell.org/HaXml/ diff --git a/textproc/hs-HaXml/pkg-plist b/textproc/hs-HaXml/pkg-plist index 5218955cc6b6..4ec160996a47 100644 --- a/textproc/hs-HaXml/pkg-plist +++ b/textproc/hs-HaXml/pkg-plist @@ -1,3 +1,4 @@ +@comment $FreeBSD$ bin/Canonicalise bin/CanonicaliseLazy bin/DtdToHaskell @@ -5,52 +6,52 @@ bin/MkOneOf bin/Validate bin/Xtract bin/XtractLazy -%%SUBDIR%%/HaXml.pkgconf -%%SUBDIR%%/Text/XML/HaXml/DtdToHaskell/Convert.hi -%%SUBDIR%%/Text/XML/HaXml/DtdToHaskell/Instance.hi -%%SUBDIR%%/Text/XML/HaXml/DtdToHaskell/TypeDef.hi -%%SUBDIR%%/Text/XML/HaXml/Html/Generate.hi -%%SUBDIR%%/Text/XML/HaXml/Html/Parse.hi -%%SUBDIR%%/Text/XML/HaXml/Html/ParseLazy.hi -%%SUBDIR%%/Text/XML/HaXml/Html/Pretty.hi -%%SUBDIR%%/Text/XML/HaXml/XmlContent/Parser.hi -%%SUBDIR%%/Text/XML/HaXml/XmlContent/Haskell.hi -%%SUBDIR%%/Text/XML/HaXml/Xtract/Combinators.hi -%%SUBDIR%%/Text/XML/HaXml/Xtract/Lex.hi -%%SUBDIR%%/Text/XML/HaXml/Xtract/Parse.hi -%%SUBDIR%%/Text/XML/HaXml/ByteStringPP.hi -%%SUBDIR%%/Text/XML/HaXml/Combinators.hi -%%SUBDIR%%/Text/XML/HaXml/Escape.hi -%%SUBDIR%%/Text/XML/HaXml/Lex.hi -%%SUBDIR%%/Text/XML/HaXml/OneOfN.hi -%%SUBDIR%%/Text/XML/HaXml/Parse.hi -%%SUBDIR%%/Text/XML/HaXml/ParseLazy.hi -%%SUBDIR%%/Text/XML/HaXml/Posn.hi -%%SUBDIR%%/Text/XML/HaXml/Pretty.hi -%%SUBDIR%%/Text/XML/HaXml/SAX.hi -%%SUBDIR%%/Text/XML/HaXml/ShowXmlLazy.hi -%%SUBDIR%%/Text/XML/HaXml/TypeMapping.hi -%%SUBDIR%%/Text/XML/HaXml/Types.hi -%%SUBDIR%%/Text/XML/HaXml/Util.hi -%%SUBDIR%%/Text/XML/HaXml/Validate.hi -%%SUBDIR%%/Text/XML/HaXml/Verbatim.hi -%%SUBDIR%%/Text/XML/HaXml/Wrappers.hi -%%SUBDIR%%/Text/XML/HaXml/XmlContent.hi -%%SUBDIR%%/Text/XML/HaXml.hi -%%SUBDIR%%/HSHaXml-%%PORTVERSION%%.o -%%SUBDIR%%/libHSHaXml-%%PORTVERSION%%.a -@dirrm %%SUBDIR%%/Text/XML/HaXml/DtdToHaskell -@dirrm %%SUBDIR%%/Text/XML/HaXml/Html -@dirrm %%SUBDIR%%/Text/XML/HaXml/XmlContent -@dirrm %%SUBDIR%%/Text/XML/HaXml/Xtract -@dirrm %%SUBDIR%%/Text/XML/HaXml -@dirrmtry %%SUBDIR%%/Text/XML -@dirrmtry %%SUBDIR%%/Text -@dirrm %%HAXMLDIR%%/%%GHCDIR%% -@dirrm %%HAXMLDIR%% -%%RMLIC%%%%DOCSDIR%%/COPYRIGHT -%%RMLIC%%@dirrm %%DOCSDIR%% -@exec ghc-pkg register %D/%%SUBDIR%%/HaXml.pkgconf +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSHaXml-%%HAXML_VERSION%%.o +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/ByteStringPP.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Combinators.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/DtdToHaskell/Convert.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/DtdToHaskell/Instance.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/DtdToHaskell/TypeDef.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Escape.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Html/Generate.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Html/Parse.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Html/ParseLazy.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Html/Pretty.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Lex.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/OneOfN.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Parse.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/ParseLazy.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Posn.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Pretty.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/SAX.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/ShowXmlLazy.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/TypeMapping.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Types.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Util.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Validate.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Verbatim.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Wrappers.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/XmlContent.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/XmlContent/Haskell.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/XmlContent/Parser.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Xtract/Combinators.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Xtract/Lex.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Xtract/Parse.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSHaXml-%%HAXML_VERSION%%.a +%%HAXML_LIBDIR_REL%%/register.sh +%%NOPORTDOCS%%%%DOCSDIR%%/COPYRIGHT +%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrm %%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Xtract +@dirrm %%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/XmlContent +@dirrm %%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Html +@dirrm %%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/DtdToHaskell +@dirrm %%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml +@dirrm %%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML +@dirrm %%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text +@dirrm %%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%% +@dirrm %%HAXML_LIBDIR_REL%% +@exec /bin/sh %D/%%HAXML_LIBDIR_REL%%/register.sh @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old -@unexec ghc-pkg unregister HaXml +@unexec %D/bin/ghc-pkg unregister HaXml @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old diff --git a/textproc/hs-bytestring-csv/Makefile b/textproc/hs-bytestring-csv/Makefile index 22e7a86cf167..a52c43a39338 100644 --- a/textproc/hs-bytestring-csv/Makefile +++ b/textproc/hs-bytestring-csv/Makefile @@ -6,7 +6,7 @@ PORTNAME= bytestring-csv PORTVERSION= 0.1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ \ http://carte.kerneled.org/mirror/ @@ -15,25 +15,64 @@ PKGNAMEPREFIX= hs- MAINTAINER= haskell@FreeBSD.org COMMENT= Parse CSV formatted data efficiently with Haskell -BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \ +BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \ hs-dlist>=0.4.1:${PORTSDIR}/devel/hs-dlist -LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4 +RUN_DEPENDS= ghc:${PORTSDIR}/lang/ghc \ + hs-dlist>=0.4.1:${PORTSDIR}/devel/hs-dlist + +GHC_VERSION= 6.10.4 +BYTESTRINGCSV_VERSION= ${PORTVERSION} + +GHC_CMD= ${LOCALBASE}/bin/ghc +SETUP_CMD= ./setup + +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +BYTESTRINGCSV_LIBDIR_REL= lib/${DISTNAME} + +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + BYTESTRINGCSV_VERSION=${BYTESTRINGCSV_VERSION} \ + BYTESTRINGCSV_LIBDIR_REL=${BYTESTRINGCSV_LIBDIR_REL} + +.if defined(NOPORTDOCS) +PLIST_SUB+= NOPORTDOCS="" +.else +PLIST_SUB+= NOPORTDOCS="@comment " +.endif -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} +.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}/${BYTESTRINGCSV_LIBDIR_REL}/register.sh + +post-install: + ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old .include <bsd.port.mk> diff --git a/textproc/hs-bytestring-csv/pkg-plist b/textproc/hs-bytestring-csv/pkg-plist index b387328cd569..4be298095ae3 100644 --- a/textproc/hs-bytestring-csv/pkg-plist +++ b/textproc/hs-bytestring-csv/pkg-plist @@ -1,16 +1,17 @@ -%%SUBDIR%%/ghc-%%GHC_VERSION%%/libHSbytestring-csv-%%PORTVERSION%%.a -%%SUBDIR%%/ghc-%%GHC_VERSION%%/HSbytestring-csv-%%PORTVERSION%%.o -%%SUBDIR%%/ghc-%%GHC_VERSION%%/Text/CSV/ByteString.hi -%%SUBDIR%%/ghc-%%GHC_VERSION%%/Text/CSV/ByteString/Lex.hi -%%SUBDIR%%/register.sh -share/doc/bytestring-csv-%%PORTVERSION%%/LICENSE -@dirrm share/doc/bytestring-csv-%%PORTVERSION%% -@dirrm lib/bytestring-csv-%%PORTVERSION%%/ghc-%%GHC_VERSION%%/Text/CSV/ByteString -@dirrm lib/bytestring-csv-%%PORTVERSION%%/ghc-%%GHC_VERSION%%/Text/CSV -@dirrm lib/bytestring-csv-%%PORTVERSION%%/ghc-%%GHC_VERSION%%/Text -@dirrm lib/bytestring-csv-%%PORTVERSION%%/ghc-%%GHC_VERSION%% -@dirrm lib/bytestring-csv-%%PORTVERSION%% -@exec /bin/sh %D/%%SUBDIR%%/register.sh +@comment $FreeBSD$ +%%BYTESTRINGCSV_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSbytestring-csv-%%BYTESTRINGCSV_VERSION%%.o +%%BYTESTRINGCSV_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/CSV/ByteString.hi +%%BYTESTRINGCSV_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/CSV/ByteString/Lex.hi +%%BYTESTRINGCSV_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSbytestring-csv-%%BYTESTRINGCSV_VERSION%%.a +%%BYTESTRINGCSV_LIBDIR_REL%%/register.sh +%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE +%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrm %%BYTESTRINGCSV_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/CSV/ByteString +@dirrm %%BYTESTRINGCSV_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/CSV +@dirrm %%BYTESTRINGCSV_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text +@dirrm %%BYTESTRINGCSV_LIBDIR_REL%%/ghc-%%GHC_VERSION%% +@dirrm %%BYTESTRINGCSV_LIBDIR_REL%% +@exec /bin/sh %D/%%BYTESTRINGCSV_LIBDIR_REL%%/register.sh @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old -@unexec %D/bin/ghc-pkg unregister bytestring-csv +@unexec %D/bin/ghc-pkg unregister bytestring-csv @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old diff --git a/textproc/hs-haxml/Makefile b/textproc/hs-haxml/Makefile index 683609e93b02..965eff907048 100644 --- a/textproc/hs-haxml/Makefile +++ b/textproc/hs-haxml/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ PORTNAME= haxml -PORTVERSION= 1.19.6 +PORTVERSION= 1.19.7 CATEGORIES= textproc haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/HaXml/${PORTVERSION}/ PKGNAMEPREFIX= hs- @@ -18,38 +18,66 @@ BUILD_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc \ hs-polyparse-ghc>=1.1:${PORTSDIR}/textproc/hs-polyparse-ghc RUN_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc \ hs-polyparse-ghc>=1.1:${PORTSDIR}/textproc/hs-polyparse-ghc +LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4 -CONFIGURE_ARGS= --ghc --prefix=${PREFIX} +GHC_VERSION= 6.10.4 +HAXML_VERSION= ${PORTVERSION} -GHC_VERSION= 6.8.3 -PLIST_SUB+= GHC_VERSION=${GHC_VERSION} \ - HAXMLDIR=lib/HaXml-${PORTVERSION} \ - GHCDIR=ghc-${GHC_VERSION} \ - SUBDIR=lib/HaXml-${PORTVERSION}/ghc-${GHC_VERSION} \ - PORTVERSION=${PORTVERSION} -DOCSDIR= ${PREFIX}/share/doc/HaXml-${PORTVERSION} -PORTDOCS= * +GHC_CMD= ${LOCALBASE}/bin/ghc +SETUP_CMD= ./setup -.if !defined(NOPORTDOCS) -PLIST_SUB+= RMLIC="@comment " +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +HAXML_LIBDIR_REL= lib/${DISTNAME} + +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + HAXML_VERSION=${HAXML_VERSION} \ + HAXML_LIBDIR_REL=${HAXML_LIBDIR_REL} + +.if defined(NOPORTDOCS) +PLIST_SUB+= NOPORTDOCS="" .else -PLIST_SUB+= RMLIC="" +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 + +PYSHARE= ${SH} -c '(${FIND} -d $$0 $$2)' + +.SILENT: + do-configure: - @cd ${WRKSRC} && ${LOCALBASE}/bin/runhaskell Setup.hs 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} && ${LOCALBASE}/bin/runhaskell Setup.hs build + cd ${WRKSRC} && ${SETUP_CMD} build \ + && ${SETUP_CMD} register --gen-script -do-install: - @cd ${WRKSRC} && ${LOCALBASE}/bin/runhaskell Setup.hs install +.if !defined(NOPORTDOCS) + cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \ + --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css +.endif -post-install: - @${INSTALL_DATA} ${WRKSRC}/dist/installed-pkg-config ${PREFIX}/lib/HaXml-${PORTVERSION}/ghc-${GHC_VERSION}/HaXml.pkgconf +do-install: + cd ${WRKSRC} && ${SETUP_CMD} install \ + && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${HAXML_LIBDIR_REL}/register.sh .if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @(cd ${WRKSRC} && ${CP} -R docs/ ${DOCSDIR}) + cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* ${DOCSDIR} " -not -regex HaXml.* " .endif +post-install: + ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old + .include <bsd.port.mk> diff --git a/textproc/hs-haxml/distinfo b/textproc/hs-haxml/distinfo index 3eb8e4ec43c7..e1ff7f4445bd 100644 --- a/textproc/hs-haxml/distinfo +++ b/textproc/hs-haxml/distinfo @@ -1,3 +1,3 @@ -MD5 (HaXml-1.19.6.tar.gz) = 7715780943dd3df6f19a7200783bc4cf -SHA256 (HaXml-1.19.6.tar.gz) = a0311682502666f36cb7f276c684b1547678dda10c5c450bd428bddc6bb5cdbe -SIZE (HaXml-1.19.6.tar.gz) = 630102 +MD5 (HaXml-1.19.7.tar.gz) = be31052aeeb4c6d509d6b6071f619242 +SHA256 (HaXml-1.19.7.tar.gz) = 3968bc9da06c4465bf6d63100245fc0d688f7646216b9380c90b970cb2890290 +SIZE (HaXml-1.19.7.tar.gz) = 630148 diff --git a/textproc/hs-haxml/files/patch-HaXml.cabal b/textproc/hs-haxml/files/patch-HaXml.cabal new file mode 100644 index 000000000000..6b0c0befd78f --- /dev/null +++ b/textproc/hs-haxml/files/patch-HaXml.cabal @@ -0,0 +1,11 @@ +--- HaXml.cabal.orig 2009-07-14 10:01:24.000000000 +0000 ++++ HaXml.cabal 2009-07-14 10:02:19.000000000 +0000 +@@ -52,7 +52,7 @@ + Text.XML.HaXml.Xtract.Lex, + Text.XML.HaXml.Xtract.Parse + hs-source-dirs: src +- build-depends: base, haskell98, polyparse==1.2, filepath ++ build-depends: base, haskell98, polyparse >=1.2, filepath + if flag(splitBase) + build-depends: base >= 3, pretty, random, containers + else diff --git a/textproc/hs-haxml/pkg-descr b/textproc/hs-haxml/pkg-descr index fa8aa6c1f593..706847f35887 100644 --- a/textproc/hs-haxml/pkg-descr +++ b/textproc/hs-haxml/pkg-descr @@ -2,4 +2,4 @@ HaXml is a collection of utilities for using Haskell and XML together. It includes a parser for XML, a separate error-correcting parser for HTML, and pretty-printers for XML and HTML. -WWW: http://www.haskell.org/HaXml/ +WWW: http://www.haskell.org/HaXml/ diff --git a/textproc/hs-haxml/pkg-plist b/textproc/hs-haxml/pkg-plist index 5218955cc6b6..4ec160996a47 100644 --- a/textproc/hs-haxml/pkg-plist +++ b/textproc/hs-haxml/pkg-plist @@ -1,3 +1,4 @@ +@comment $FreeBSD$ bin/Canonicalise bin/CanonicaliseLazy bin/DtdToHaskell @@ -5,52 +6,52 @@ bin/MkOneOf bin/Validate bin/Xtract bin/XtractLazy -%%SUBDIR%%/HaXml.pkgconf -%%SUBDIR%%/Text/XML/HaXml/DtdToHaskell/Convert.hi -%%SUBDIR%%/Text/XML/HaXml/DtdToHaskell/Instance.hi -%%SUBDIR%%/Text/XML/HaXml/DtdToHaskell/TypeDef.hi -%%SUBDIR%%/Text/XML/HaXml/Html/Generate.hi -%%SUBDIR%%/Text/XML/HaXml/Html/Parse.hi -%%SUBDIR%%/Text/XML/HaXml/Html/ParseLazy.hi -%%SUBDIR%%/Text/XML/HaXml/Html/Pretty.hi -%%SUBDIR%%/Text/XML/HaXml/XmlContent/Parser.hi -%%SUBDIR%%/Text/XML/HaXml/XmlContent/Haskell.hi -%%SUBDIR%%/Text/XML/HaXml/Xtract/Combinators.hi -%%SUBDIR%%/Text/XML/HaXml/Xtract/Lex.hi -%%SUBDIR%%/Text/XML/HaXml/Xtract/Parse.hi -%%SUBDIR%%/Text/XML/HaXml/ByteStringPP.hi -%%SUBDIR%%/Text/XML/HaXml/Combinators.hi -%%SUBDIR%%/Text/XML/HaXml/Escape.hi -%%SUBDIR%%/Text/XML/HaXml/Lex.hi -%%SUBDIR%%/Text/XML/HaXml/OneOfN.hi -%%SUBDIR%%/Text/XML/HaXml/Parse.hi -%%SUBDIR%%/Text/XML/HaXml/ParseLazy.hi -%%SUBDIR%%/Text/XML/HaXml/Posn.hi -%%SUBDIR%%/Text/XML/HaXml/Pretty.hi -%%SUBDIR%%/Text/XML/HaXml/SAX.hi -%%SUBDIR%%/Text/XML/HaXml/ShowXmlLazy.hi -%%SUBDIR%%/Text/XML/HaXml/TypeMapping.hi -%%SUBDIR%%/Text/XML/HaXml/Types.hi -%%SUBDIR%%/Text/XML/HaXml/Util.hi -%%SUBDIR%%/Text/XML/HaXml/Validate.hi -%%SUBDIR%%/Text/XML/HaXml/Verbatim.hi -%%SUBDIR%%/Text/XML/HaXml/Wrappers.hi -%%SUBDIR%%/Text/XML/HaXml/XmlContent.hi -%%SUBDIR%%/Text/XML/HaXml.hi -%%SUBDIR%%/HSHaXml-%%PORTVERSION%%.o -%%SUBDIR%%/libHSHaXml-%%PORTVERSION%%.a -@dirrm %%SUBDIR%%/Text/XML/HaXml/DtdToHaskell -@dirrm %%SUBDIR%%/Text/XML/HaXml/Html -@dirrm %%SUBDIR%%/Text/XML/HaXml/XmlContent -@dirrm %%SUBDIR%%/Text/XML/HaXml/Xtract -@dirrm %%SUBDIR%%/Text/XML/HaXml -@dirrmtry %%SUBDIR%%/Text/XML -@dirrmtry %%SUBDIR%%/Text -@dirrm %%HAXMLDIR%%/%%GHCDIR%% -@dirrm %%HAXMLDIR%% -%%RMLIC%%%%DOCSDIR%%/COPYRIGHT -%%RMLIC%%@dirrm %%DOCSDIR%% -@exec ghc-pkg register %D/%%SUBDIR%%/HaXml.pkgconf +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSHaXml-%%HAXML_VERSION%%.o +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/ByteStringPP.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Combinators.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/DtdToHaskell/Convert.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/DtdToHaskell/Instance.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/DtdToHaskell/TypeDef.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Escape.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Html/Generate.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Html/Parse.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Html/ParseLazy.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Html/Pretty.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Lex.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/OneOfN.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Parse.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/ParseLazy.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Posn.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Pretty.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/SAX.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/ShowXmlLazy.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/TypeMapping.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Types.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Util.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Validate.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Verbatim.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Wrappers.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/XmlContent.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/XmlContent/Haskell.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/XmlContent/Parser.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Xtract/Combinators.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Xtract/Lex.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Xtract/Parse.hi +%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSHaXml-%%HAXML_VERSION%%.a +%%HAXML_LIBDIR_REL%%/register.sh +%%NOPORTDOCS%%%%DOCSDIR%%/COPYRIGHT +%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrm %%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Xtract +@dirrm %%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/XmlContent +@dirrm %%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Html +@dirrm %%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/DtdToHaskell +@dirrm %%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml +@dirrm %%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML +@dirrm %%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text +@dirrm %%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%% +@dirrm %%HAXML_LIBDIR_REL%% +@exec /bin/sh %D/%%HAXML_LIBDIR_REL%%/register.sh @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old -@unexec ghc-pkg unregister HaXml +@unexec %D/bin/ghc-pkg unregister HaXml @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old diff --git a/textproc/hs-highlighting-kate-ghc/Makefile b/textproc/hs-highlighting-kate-ghc/Makefile index 92af6a8aebcf..5412b129307e 100644 --- a/textproc/hs-highlighting-kate-ghc/Makefile +++ b/textproc/hs-highlighting-kate-ghc/Makefile @@ -6,7 +6,7 @@ # PORTNAME= highlighting-kate -PORTVERSION= 0.2.4 +PORTVERSION= 0.2.5 CATEGORIES= textproc haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ PKGNAMEPREFIX= hs- @@ -20,38 +20,59 @@ BUILD_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc \ RUN_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc \ hs-pcre-light-ghc>=0.3:${PORTSDIR}/devel/hs-pcre-light-ghc -GHC_VERSION= 6.8.3 -CABALCMD= ${LOCALBASE}/bin/runghc Setup.lhs -CABALDIR= lib/ghc-${GHC_VERSION}/cabal +GHC_VERSION= 6.10.4 +HLKATE_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} +HLKATE_LIBDIR_REL= lib/${DISTNAME} + +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + HLKATE_VERSION=${HLKATE_VERSION} \ + HLKATE_LIBDIR_REL=${HLKATE_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}/${HLKATE_LIBDIR_REL}/register.sh + +post-install: + ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old .include <bsd.port.mk> diff --git a/textproc/hs-highlighting-kate-ghc/distinfo b/textproc/hs-highlighting-kate-ghc/distinfo index 18ed9f06e214..992f7b60513e 100644 --- a/textproc/hs-highlighting-kate-ghc/distinfo +++ b/textproc/hs-highlighting-kate-ghc/distinfo @@ -1,3 +1,3 @@ -MD5 (highlighting-kate-0.2.4.tar.gz) = b09bed7dc1e31e415881eb3436178349 -SHA256 (highlighting-kate-0.2.4.tar.gz) = bcc0d8233b5f1cb9325cbb666710750872093130bcf944fda1a05c7588dff488 -SIZE (highlighting-kate-0.2.4.tar.gz) = 420683 +MD5 (highlighting-kate-0.2.5.tar.gz) = 3b8f22acad47bd5e72a3609f1ec086de +SHA256 (highlighting-kate-0.2.5.tar.gz) = 0a11f29a61b9c907d3b79540e0b2ac3b6194bd4bc37b6405973cd9eeb7a9a868 +SIZE (highlighting-kate-0.2.5.tar.gz) = 421954 diff --git a/textproc/hs-highlighting-kate-ghc/pkg-descr b/textproc/hs-highlighting-kate-ghc/pkg-descr index 0e4a93674836..90fa84209837 100644 --- a/textproc/hs-highlighting-kate-ghc/pkg-descr +++ b/textproc/hs-highlighting-kate-ghc/pkg-descr @@ -10,9 +10,10 @@ Bibtex, C, Cmake, Coldfusion, Commonlisp, Cpp, Css, D, Djangotemplate, Doxygen, Dtd, Eiffel, Erlang, Fortran, Haskell, Html, Java, Javadoc, Javascript, Json, Latex, Lex, LiterateHaskell, Lua, Makefile, Matlab, Mediawiki, Modula3, Nasm, Objectivec, Ocaml, Pascal, Perl, Php, -Postscript, Prolog, Python, Rhtml, Ruby, Scala, Scheme, Sgml, Sql, -SqlMysql, SqlPostgresql, Tcl, Texinfo, Xml, Xslt, Yacc. +Postscript, Prolog, Python, RelaxNG compact, Rhtml, Ruby, Scala, Scheme, +Sgml, Sql, SqlMysql, SqlPostgresql, Tcl, Texinfo, Xml, Xslt, Yacc Ada, +Asp, Awk, Bash, -[1] http://kate-editor.org +[1] <http://kate-editor.org> WWW: http://johnmacfarlane.net/highlighting-kate diff --git a/textproc/hs-highlighting-kate-ghc/pkg-plist b/textproc/hs-highlighting-kate-ghc/pkg-plist index a3be38b46ab5..351ae1a0cf93 100644 --- a/textproc/hs-highlighting-kate-ghc/pkg-plist +++ b/textproc/hs-highlighting-kate-ghc/pkg-plist @@ -1,74 +1,77 @@ @comment $FreeBSD$ -%%SUBDIR%%/Text/Highlighting/Kate.hi -%%SUBDIR%%/Text/Highlighting/Kate/Common.hi -%%SUBDIR%%/Text/Highlighting/Kate/Definitions.hi -%%SUBDIR%%/Text/Highlighting/Kate/Format.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Ada.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Alert.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Asp.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Awk.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Bash.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Bibtex.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/C.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Cmake.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Coldfusion.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Commonlisp.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Cpp.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Css.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/D.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Djangotemplate.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Doxygen.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Dtd.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Eiffel.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Erlang.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Fortran.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Haskell.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Html.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Java.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Javadoc.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Javascript.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Json.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Latex.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Lex.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/LiterateHaskell.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Lua.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Makefile.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Matlab.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Mediawiki.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Modula3.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Nasm.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Objectivec.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Ocaml.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Pascal.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Perl.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Php.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Postscript.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Prolog.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Python.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Rhtml.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Ruby.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Scala.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Scheme.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Sgml.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Sql.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/SqlMysql.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/SqlPostgresql.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Tcl.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Texinfo.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Xml.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Xslt.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Yacc.hi -%%SUBDIR%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a -%%SUBDIR%%/HS%%PORTNAME%%-%%PORTVERSION%%.o -%%SUBDIR%%/%%PORTNAME%%-register.sh -@dirrmtry %%SUBDIR%%/Text/Highlighting/Kate/Syntax -@dirrmtry %%SUBDIR%%/Text/Highlighting/Kate -@dirrmtry %%SUBDIR%%/Text/Highlighting -@dirrmtry %%SUBDIR%%/Text -%%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 +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HShighlighting-kate-%%HLKATE_VERSION%%.o +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Common.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Definitions.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Format.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Ada.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Alert.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Asp.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Awk.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Bash.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Bibtex.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/C.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Cmake.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Coldfusion.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Commonlisp.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Cpp.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Css.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/D.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Djangotemplate.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Doxygen.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Dtd.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Eiffel.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Erlang.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Fortran.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Haskell.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Html.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Java.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Javadoc.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Javascript.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Json.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Latex.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Lex.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/LiterateHaskell.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Lua.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Makefile.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Matlab.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Mediawiki.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Modula3.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Nasm.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Objectivec.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Ocaml.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Pascal.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Perl.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Php.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Postscript.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Prolog.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Python.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Relaxngcompact.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Rhtml.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Ruby.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Scala.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Scheme.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Sgml.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Sql.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/SqlMysql.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/SqlPostgresql.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Tcl.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Texinfo.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Xml.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Xslt.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Yacc.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHShighlighting-kate-%%HLKATE_VERSION%%.a +%%HLKATE_LIBDIR_REL%%/register.sh +%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE +%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrm %%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax +@dirrm %%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate +@dirrm %%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting +@dirrm %%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text +@dirrm %%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%% +@dirrm %%HLKATE_LIBDIR_REL%% +@exec /bin/sh %D/%%HLKATE_LIBDIR_REL%%/register.sh +@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old +@unexec %D/bin/ghc-pkg unregister highlighting-kate +@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old diff --git a/textproc/hs-highlighting-kate/Makefile b/textproc/hs-highlighting-kate/Makefile index 92af6a8aebcf..5412b129307e 100644 --- a/textproc/hs-highlighting-kate/Makefile +++ b/textproc/hs-highlighting-kate/Makefile @@ -6,7 +6,7 @@ # PORTNAME= highlighting-kate -PORTVERSION= 0.2.4 +PORTVERSION= 0.2.5 CATEGORIES= textproc haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ PKGNAMEPREFIX= hs- @@ -20,38 +20,59 @@ BUILD_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc \ RUN_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc \ hs-pcre-light-ghc>=0.3:${PORTSDIR}/devel/hs-pcre-light-ghc -GHC_VERSION= 6.8.3 -CABALCMD= ${LOCALBASE}/bin/runghc Setup.lhs -CABALDIR= lib/ghc-${GHC_VERSION}/cabal +GHC_VERSION= 6.10.4 +HLKATE_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} +HLKATE_LIBDIR_REL= lib/${DISTNAME} + +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + HLKATE_VERSION=${HLKATE_VERSION} \ + HLKATE_LIBDIR_REL=${HLKATE_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}/${HLKATE_LIBDIR_REL}/register.sh + +post-install: + ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old .include <bsd.port.mk> diff --git a/textproc/hs-highlighting-kate/distinfo b/textproc/hs-highlighting-kate/distinfo index 18ed9f06e214..992f7b60513e 100644 --- a/textproc/hs-highlighting-kate/distinfo +++ b/textproc/hs-highlighting-kate/distinfo @@ -1,3 +1,3 @@ -MD5 (highlighting-kate-0.2.4.tar.gz) = b09bed7dc1e31e415881eb3436178349 -SHA256 (highlighting-kate-0.2.4.tar.gz) = bcc0d8233b5f1cb9325cbb666710750872093130bcf944fda1a05c7588dff488 -SIZE (highlighting-kate-0.2.4.tar.gz) = 420683 +MD5 (highlighting-kate-0.2.5.tar.gz) = 3b8f22acad47bd5e72a3609f1ec086de +SHA256 (highlighting-kate-0.2.5.tar.gz) = 0a11f29a61b9c907d3b79540e0b2ac3b6194bd4bc37b6405973cd9eeb7a9a868 +SIZE (highlighting-kate-0.2.5.tar.gz) = 421954 diff --git a/textproc/hs-highlighting-kate/pkg-descr b/textproc/hs-highlighting-kate/pkg-descr index 0e4a93674836..90fa84209837 100644 --- a/textproc/hs-highlighting-kate/pkg-descr +++ b/textproc/hs-highlighting-kate/pkg-descr @@ -10,9 +10,10 @@ Bibtex, C, Cmake, Coldfusion, Commonlisp, Cpp, Css, D, Djangotemplate, Doxygen, Dtd, Eiffel, Erlang, Fortran, Haskell, Html, Java, Javadoc, Javascript, Json, Latex, Lex, LiterateHaskell, Lua, Makefile, Matlab, Mediawiki, Modula3, Nasm, Objectivec, Ocaml, Pascal, Perl, Php, -Postscript, Prolog, Python, Rhtml, Ruby, Scala, Scheme, Sgml, Sql, -SqlMysql, SqlPostgresql, Tcl, Texinfo, Xml, Xslt, Yacc. +Postscript, Prolog, Python, RelaxNG compact, Rhtml, Ruby, Scala, Scheme, +Sgml, Sql, SqlMysql, SqlPostgresql, Tcl, Texinfo, Xml, Xslt, Yacc Ada, +Asp, Awk, Bash, -[1] http://kate-editor.org +[1] <http://kate-editor.org> WWW: http://johnmacfarlane.net/highlighting-kate diff --git a/textproc/hs-highlighting-kate/pkg-plist b/textproc/hs-highlighting-kate/pkg-plist index a3be38b46ab5..351ae1a0cf93 100644 --- a/textproc/hs-highlighting-kate/pkg-plist +++ b/textproc/hs-highlighting-kate/pkg-plist @@ -1,74 +1,77 @@ @comment $FreeBSD$ -%%SUBDIR%%/Text/Highlighting/Kate.hi -%%SUBDIR%%/Text/Highlighting/Kate/Common.hi -%%SUBDIR%%/Text/Highlighting/Kate/Definitions.hi -%%SUBDIR%%/Text/Highlighting/Kate/Format.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Ada.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Alert.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Asp.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Awk.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Bash.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Bibtex.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/C.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Cmake.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Coldfusion.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Commonlisp.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Cpp.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Css.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/D.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Djangotemplate.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Doxygen.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Dtd.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Eiffel.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Erlang.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Fortran.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Haskell.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Html.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Java.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Javadoc.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Javascript.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Json.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Latex.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Lex.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/LiterateHaskell.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Lua.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Makefile.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Matlab.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Mediawiki.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Modula3.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Nasm.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Objectivec.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Ocaml.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Pascal.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Perl.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Php.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Postscript.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Prolog.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Python.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Rhtml.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Ruby.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Scala.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Scheme.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Sgml.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Sql.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/SqlMysql.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/SqlPostgresql.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Tcl.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Texinfo.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Xml.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Xslt.hi -%%SUBDIR%%/Text/Highlighting/Kate/Syntax/Yacc.hi -%%SUBDIR%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a -%%SUBDIR%%/HS%%PORTNAME%%-%%PORTVERSION%%.o -%%SUBDIR%%/%%PORTNAME%%-register.sh -@dirrmtry %%SUBDIR%%/Text/Highlighting/Kate/Syntax -@dirrmtry %%SUBDIR%%/Text/Highlighting/Kate -@dirrmtry %%SUBDIR%%/Text/Highlighting -@dirrmtry %%SUBDIR%%/Text -%%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 +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HShighlighting-kate-%%HLKATE_VERSION%%.o +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Common.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Definitions.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Format.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Ada.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Alert.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Asp.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Awk.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Bash.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Bibtex.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/C.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Cmake.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Coldfusion.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Commonlisp.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Cpp.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Css.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/D.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Djangotemplate.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Doxygen.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Dtd.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Eiffel.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Erlang.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Fortran.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Haskell.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Html.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Java.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Javadoc.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Javascript.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Json.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Latex.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Lex.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/LiterateHaskell.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Lua.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Makefile.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Matlab.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Mediawiki.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Modula3.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Nasm.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Objectivec.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Ocaml.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Pascal.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Perl.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Php.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Postscript.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Prolog.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Python.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Relaxngcompact.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Rhtml.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Ruby.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Scala.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Scheme.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Sgml.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Sql.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/SqlMysql.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/SqlPostgresql.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Tcl.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Texinfo.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Xml.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Xslt.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Yacc.hi +%%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHShighlighting-kate-%%HLKATE_VERSION%%.a +%%HLKATE_LIBDIR_REL%%/register.sh +%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE +%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrm %%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax +@dirrm %%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate +@dirrm %%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting +@dirrm %%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text +@dirrm %%HLKATE_LIBDIR_REL%%/ghc-%%GHC_VERSION%% +@dirrm %%HLKATE_LIBDIR_REL%% +@exec /bin/sh %D/%%HLKATE_LIBDIR_REL%%/register.sh +@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old +@unexec %D/bin/ghc-pkg unregister highlighting-kate +@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old diff --git a/textproc/hs-lhs2tex/Makefile b/textproc/hs-lhs2tex/Makefile index 9d1e1871c93c..a7a569363d4d 100644 --- a/textproc/hs-lhs2tex/Makefile +++ b/textproc/hs-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 diff --git a/textproc/hs-polyparse-ghc/Makefile b/textproc/hs-polyparse-ghc/Makefile index 478d78867724..57cd7d5e8d36 100644 --- a/textproc/hs-polyparse-ghc/Makefile +++ b/textproc/hs-polyparse-ghc/Makefile @@ -6,7 +6,7 @@ # PORTNAME= polyparse -PORTVERSION= 1.1 +PORTVERSION= 1.3 CATEGORIES= textproc haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ PKGNAMEPREFIX= hs- @@ -15,41 +15,62 @@ PKGNAMESUFFIX= -ghc MAINTAINER= haskell@FreeBSD.org COMMENT= Alternative parser combinator libraries for Haskell -BUILD_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc -RUN_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc +BUILD_DEPENDS= ghc>=6.10:${PORTSDIR}/lang/ghc +RUN_DEPENDS= ghc>=6.10:${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 +POLY_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= COPYRIGHT html +GHC_CMD= ${LOCALBASE}/bin/ghc +SETUP_CMD= ./setup -CONFIGURE_ARGS= --ghc --prefix=${PREFIX} --libdir=${PREFIX}/${CABALDIR} --libsubdir='' --datasubdir='' +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +POLY_LIBDIR_REL= lib/${DISTNAME} + +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + POLY_LIBDIR_REL=${POLY_LIBDIR_REL} \ + POLY_VERSION=${POLY_VERSION} + +.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}/${POLY_LIBDIR_REL}/register.sh + +post-install: + ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old .include <bsd.port.mk> diff --git a/textproc/hs-polyparse-ghc/distinfo b/textproc/hs-polyparse-ghc/distinfo index 4c297ba654df..b87d32203856 100644 --- a/textproc/hs-polyparse-ghc/distinfo +++ b/textproc/hs-polyparse-ghc/distinfo @@ -1,3 +1,3 @@ -MD5 (polyparse-1.1.tar.gz) = 3d01daae5ca692b24729093dc45aa94c -SHA256 (polyparse-1.1.tar.gz) = 87eab9c8f2bee72d0c3a00d002e442405da016794e125f6c47c66607e1983957 -SIZE (polyparse-1.1.tar.gz) = 112884 +MD5 (polyparse-1.3.tar.gz) = f8c6f4f12ff2c7d29fed91b3189d785a +SHA256 (polyparse-1.3.tar.gz) = 6d82f08634f0856c7919c9413199f4d5f91e753a6d796a0b61e46d7cd1ce4a24 +SIZE (polyparse-1.3.tar.gz) = 108981 diff --git a/textproc/hs-polyparse-ghc/pkg-plist b/textproc/hs-polyparse-ghc/pkg-plist index 7c34f162e0cb..43efe58cd81e 100644 --- a/textproc/hs-polyparse-ghc/pkg-plist +++ b/textproc/hs-polyparse-ghc/pkg-plist @@ -1,29 +1,24 @@ -%%SUBDIR%%/Text/Parse.hi -%%SUBDIR%%/Text/ParserCombinators/HuttonMeijer.hi -%%SUBDIR%%/Text/ParserCombinators/HuttonMeijerWallace.hi -%%SUBDIR%%/Text/ParserCombinators/Poly.hi -%%SUBDIR%%/Text/ParserCombinators/PolyLazy.hi -%%SUBDIR%%/Text/ParserCombinators/PolyState.hi -%%SUBDIR%%/Text/ParserCombinators/PolyStateLazy.hi -%%SUBDIR%%/Text/ParserCombinators/Poly/Base.hi -%%SUBDIR%%/Text/ParserCombinators/Poly/Lazy.hi -%%SUBDIR%%/Text/ParserCombinators/Poly/Plain.hi -%%SUBDIR%%/Text/ParserCombinators/Poly/State.hi -%%SUBDIR%%/Text/ParserCombinators/Poly/StateLazy.hi -%%SUBDIR%%/Text/ParserCombinators/Poly/NoLeak/Lazy.hi -%%SUBDIR%%/Text/ParserCombinators/Poly/NoLeak/Plain.hi -%%SUBDIR%%/Text/ParserCombinators/Poly/NoLeak/State.hi -%%SUBDIR%%/Text/ParserCombinators/Poly/NoLeak/StateLazy.hi -%%SUBDIR%%/HS%%PORTNAME%%-%%PORTVERSION%%.o -%%SUBDIR%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a -%%SUBDIR%%/%%PORTNAME%%-register.sh -%%RMLIC%%%%DOCSDIR%%/COPYRIGHT -%%RMLIC%%@dirrm %%DOCSDIR%% -@dirrmtry %%SUBDIR%%/Text/ParserCombinators/Poly/NoLeak -@dirrmtry %%SUBDIR%%/Text/ParserCombinators/Poly -@dirrmtry %%SUBDIR%%/Text/ParserCombinators -@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$ +%%POLY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSpolyparse-%%POLY_VERSION%%.o +%%POLY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Parse.hi +%%POLY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/HuttonMeijer.hi +%%POLY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/HuttonMeijerWallace.hi +%%POLY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/Poly.hi +%%POLY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/Poly/Base.hi +%%POLY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/Poly/Lazy.hi +%%POLY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/Poly/Plain.hi +%%POLY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/Poly/State.hi +%%POLY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/Poly/StateLazy.hi +%%POLY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSpolyparse-%%POLY_VERSION%%.a +%%POLY_LIBDIR_REL%%/register.sh +%%NOPORTDOCS%%%%DOCSDIR%%/COPYRIGHT +%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrm %%POLY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/Poly +@dirrm %%POLY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators +@dirrm %%POLY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text +@dirrm %%POLY_LIBDIR_REL%%/ghc-%%GHC_VERSION%% +@dirrm %%POLY_LIBDIR_REL%% +@exec /bin/sh %D/%%POLY_LIBDIR_REL%%/register.sh +@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old +@unexec %D/bin/ghc-pkg unregister polyparse +@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old diff --git a/textproc/hs-polyparse/Makefile b/textproc/hs-polyparse/Makefile index 478d78867724..57cd7d5e8d36 100644 --- a/textproc/hs-polyparse/Makefile +++ b/textproc/hs-polyparse/Makefile @@ -6,7 +6,7 @@ # PORTNAME= polyparse -PORTVERSION= 1.1 +PORTVERSION= 1.3 CATEGORIES= textproc haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ PKGNAMEPREFIX= hs- @@ -15,41 +15,62 @@ PKGNAMESUFFIX= -ghc MAINTAINER= haskell@FreeBSD.org COMMENT= Alternative parser combinator libraries for Haskell -BUILD_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc -RUN_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc +BUILD_DEPENDS= ghc>=6.10:${PORTSDIR}/lang/ghc +RUN_DEPENDS= ghc>=6.10:${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 +POLY_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= COPYRIGHT html +GHC_CMD= ${LOCALBASE}/bin/ghc +SETUP_CMD= ./setup -CONFIGURE_ARGS= --ghc --prefix=${PREFIX} --libdir=${PREFIX}/${CABALDIR} --libsubdir='' --datasubdir='' +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +POLY_LIBDIR_REL= lib/${DISTNAME} + +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + POLY_LIBDIR_REL=${POLY_LIBDIR_REL} \ + POLY_VERSION=${POLY_VERSION} + +.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}/${POLY_LIBDIR_REL}/register.sh + +post-install: + ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old .include <bsd.port.mk> diff --git a/textproc/hs-polyparse/distinfo b/textproc/hs-polyparse/distinfo index 4c297ba654df..b87d32203856 100644 --- a/textproc/hs-polyparse/distinfo +++ b/textproc/hs-polyparse/distinfo @@ -1,3 +1,3 @@ -MD5 (polyparse-1.1.tar.gz) = 3d01daae5ca692b24729093dc45aa94c -SHA256 (polyparse-1.1.tar.gz) = 87eab9c8f2bee72d0c3a00d002e442405da016794e125f6c47c66607e1983957 -SIZE (polyparse-1.1.tar.gz) = 112884 +MD5 (polyparse-1.3.tar.gz) = f8c6f4f12ff2c7d29fed91b3189d785a +SHA256 (polyparse-1.3.tar.gz) = 6d82f08634f0856c7919c9413199f4d5f91e753a6d796a0b61e46d7cd1ce4a24 +SIZE (polyparse-1.3.tar.gz) = 108981 diff --git a/textproc/hs-polyparse/pkg-plist b/textproc/hs-polyparse/pkg-plist index 7c34f162e0cb..43efe58cd81e 100644 --- a/textproc/hs-polyparse/pkg-plist +++ b/textproc/hs-polyparse/pkg-plist @@ -1,29 +1,24 @@ -%%SUBDIR%%/Text/Parse.hi -%%SUBDIR%%/Text/ParserCombinators/HuttonMeijer.hi -%%SUBDIR%%/Text/ParserCombinators/HuttonMeijerWallace.hi -%%SUBDIR%%/Text/ParserCombinators/Poly.hi -%%SUBDIR%%/Text/ParserCombinators/PolyLazy.hi -%%SUBDIR%%/Text/ParserCombinators/PolyState.hi -%%SUBDIR%%/Text/ParserCombinators/PolyStateLazy.hi -%%SUBDIR%%/Text/ParserCombinators/Poly/Base.hi -%%SUBDIR%%/Text/ParserCombinators/Poly/Lazy.hi -%%SUBDIR%%/Text/ParserCombinators/Poly/Plain.hi -%%SUBDIR%%/Text/ParserCombinators/Poly/State.hi -%%SUBDIR%%/Text/ParserCombinators/Poly/StateLazy.hi -%%SUBDIR%%/Text/ParserCombinators/Poly/NoLeak/Lazy.hi -%%SUBDIR%%/Text/ParserCombinators/Poly/NoLeak/Plain.hi -%%SUBDIR%%/Text/ParserCombinators/Poly/NoLeak/State.hi -%%SUBDIR%%/Text/ParserCombinators/Poly/NoLeak/StateLazy.hi -%%SUBDIR%%/HS%%PORTNAME%%-%%PORTVERSION%%.o -%%SUBDIR%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a -%%SUBDIR%%/%%PORTNAME%%-register.sh -%%RMLIC%%%%DOCSDIR%%/COPYRIGHT -%%RMLIC%%@dirrm %%DOCSDIR%% -@dirrmtry %%SUBDIR%%/Text/ParserCombinators/Poly/NoLeak -@dirrmtry %%SUBDIR%%/Text/ParserCombinators/Poly -@dirrmtry %%SUBDIR%%/Text/ParserCombinators -@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$ +%%POLY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSpolyparse-%%POLY_VERSION%%.o +%%POLY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Parse.hi +%%POLY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/HuttonMeijer.hi +%%POLY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/HuttonMeijerWallace.hi +%%POLY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/Poly.hi +%%POLY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/Poly/Base.hi +%%POLY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/Poly/Lazy.hi +%%POLY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/Poly/Plain.hi +%%POLY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/Poly/State.hi +%%POLY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/Poly/StateLazy.hi +%%POLY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSpolyparse-%%POLY_VERSION%%.a +%%POLY_LIBDIR_REL%%/register.sh +%%NOPORTDOCS%%%%DOCSDIR%%/COPYRIGHT +%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrm %%POLY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/Poly +@dirrm %%POLY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators +@dirrm %%POLY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text +@dirrm %%POLY_LIBDIR_REL%%/ghc-%%GHC_VERSION%% +@dirrm %%POLY_LIBDIR_REL%% +@exec /bin/sh %D/%%POLY_LIBDIR_REL%%/register.sh +@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old +@unexec %D/bin/ghc-pkg unregister polyparse +@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old diff --git a/textproc/hs-stringsearch/Makefile b/textproc/hs-stringsearch/Makefile index 8943fec47c38..88e24a62f12e 100644 --- a/textproc/hs-stringsearch/Makefile +++ b/textproc/hs-stringsearch/Makefile @@ -6,7 +6,7 @@ PORTNAME= stringsearch PORTVERSION= 0.2.1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/stringsearch/${PORTVERSION}/ \ http://kerneled.org/tmp/ @@ -16,23 +16,61 @@ MAINTAINER= haskell@FreeBSD.org COMMENT= Boyer-Moore/Knuth-Morris-Pratt string search library BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc -LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4 +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 +STRINGSEARCH_VERSION= ${PORTVERSION} + +GHC_CMD= ${LOCALBASE}/bin/ghc +SETUP_CMD= ./setup + +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +STRINGSEARCH_LIBDIR_REL= lib/${DISTNAME} + +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + STRINGSEARCH_VERSION=${STRINGSEARCH_VERSION} \ + STRINGSEARCH_LIBDIR_REL=${STRINGSEARCH_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}/${STRINGSEARCH_LIBDIR_REL}/register.sh + +post-install: + ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old .include <bsd.port.mk> diff --git a/textproc/hs-stringsearch/pkg-plist b/textproc/hs-stringsearch/pkg-plist index bc2a60f9c82a..2274c1cb0212 100644 --- a/textproc/hs-stringsearch/pkg-plist +++ b/textproc/hs-stringsearch/pkg-plist @@ -1,16 +1,17 @@ -%%SUBDIR%%/ghc-%%GHC_VERSION%%/libHSstringsearch-%%PORTVERSION%%.a -%%SUBDIR%%/ghc-%%GHC_VERSION%%/HSstringsearch-%%PORTVERSION%%.o -%%SUBDIR%%/ghc-%%GHC_VERSION%%/Data/ByteString/Search/BoyerMoore.hi -%%SUBDIR%%/ghc-%%GHC_VERSION%%/Data/ByteString/Search/KnuthMorrisPratt.hi -%%SUBDIR%%/register.sh -share/doc/stringsearch-%%PORTVERSION%%/LICENSE -@dirrm share/doc/stringsearch-%%PORTVERSION%% -@dirrm lib/stringsearch-%%PORTVERSION%%/ghc-%%GHC_VERSION%%/Data/ByteString/Search -@dirrm lib/stringsearch-%%PORTVERSION%%/ghc-%%GHC_VERSION%%/Data/ByteString -@dirrm lib/stringsearch-%%PORTVERSION%%/ghc-%%GHC_VERSION%%/Data -@dirrm lib/stringsearch-%%PORTVERSION%%/ghc-%%GHC_VERSION%% -@dirrm lib/stringsearch-%%PORTVERSION%% -@exec /bin/sh %D/%%SUBDIR%%/register.sh +@comment $FreeBSD$ +%%STRINGSEARCH_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString/Search/BoyerMoore.hi +%%STRINGSEARCH_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString/Search/KnuthMorrisPratt.hi +%%STRINGSEARCH_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSstringsearch-%%STRINGSEARCH_VERSION%%.o +%%STRINGSEARCH_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSstringsearch-%%STRINGSEARCH_VERSION%%.a +%%STRINGSEARCH_LIBDIR_REL%%/register.sh +%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE +%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrm %%STRINGSEARCH_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString/Search +@dirrm %%STRINGSEARCH_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString +@dirrm %%STRINGSEARCH_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data +@dirrm %%STRINGSEARCH_LIBDIR_REL%%/ghc-%%GHC_VERSION%% +@dirrm %%STRINGSEARCH_LIBDIR_REL%% +@exec /bin/sh %D/%%STRINGSEARCH_LIBDIR_REL%%/register.sh @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old -@unexec %D/bin/ghc-pkg unregister stringsearch +@unexec %D/bin/ghc-pkg unregister stringsearch @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old |