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 /print | |
parent | - fix a dependency (diff) |
- Update GHC and Haskell ports to 6.10.4 (for both i386 and amd64), bump
port revision where appropriate
- Add devel/hs-ghc-paths
- Add devel/hs-QuickCheck
- Add devel/hs-readline
- Add devel/hs-haskeline
- Add devel/hs-mmap
- Remove lang/ghc-doc
- Mark devel/lhs2TeX broken as it does not compile with GHC 6.10.4
- Set NHC98 as default compiler for devel/hs-hat as it does not compile
with GHC 6.10.4
PR: ports/137055, ports/137058, ports/137059, ports/137060, ports/137061,
ports/137062, ports/137063, ports/137063, ports/137064, ports/137065,
ports/137066, ports/137067, ports/137068, ports/137069, ports/137070,
ports/137071, ports/137072, ports/137074, ports/137075, ports/137076,
ports/137077, ports/137078, ports/137079, ports/137080, ports/137081,
ports/137082, ports/137083, ports/137084, ports/137085, ports/137086,
ports/137087, ports/137088, ports/137090, ports/137091, ports/137092,
ports/137093, ports/137094, ports/137095, ports/137096, ports/137097,
ports/137098, ports/137099, ports/137102, ports/137103, ports/137104,
ports/137107, ports/137108, ports/137109, ports/137110, ports/137111
Submitted by: Jacula Modyun (jacula (at) gmail (dot) com),
Ashish Shukla (wahjava (at) gmail (dot) com) (amd64 support)
Supported by: wxs (review, amd64 testing), tabthorpe (8.x testing)
Approved by: tabthorpe (mentor), respective maintainers
Notes
Notes:
svn path=/head/; revision=240717
Diffstat (limited to 'print')
-rw-r--r-- | print/hs-hscolour-docs/Makefile | 13 | ||||
-rw-r--r-- | print/hs-hscolour-docs/distinfo | 6 | ||||
-rw-r--r-- | print/hs-hscolour-docs/pkg-plist | 39 | ||||
-rw-r--r-- | print/hs-hscolour/Makefile | 9 | ||||
-rw-r--r-- | print/hs-hscolour/distinfo | 6 | ||||
-rw-r--r-- | print/hs-hscolour/pkg-descr | 37 | ||||
-rw-r--r-- | print/hs-hscolour/pkg-plist | 8 |
7 files changed, 71 insertions, 47 deletions
diff --git a/print/hs-hscolour-docs/Makefile b/print/hs-hscolour-docs/Makefile index 42ac4e77467d..2fb7de8b1522 100644 --- a/print/hs-hscolour-docs/Makefile +++ b/print/hs-hscolour-docs/Makefile @@ -5,20 +5,25 @@ # $FreeBSD$ # -PORTNAME= hscolour-docs -PORTVERSION= 1.12 +PORTNAME= hscolour +PORTVERSION= 1.13 CATEGORIES= print haskell MASTER_SITES= ftp://ftp.cs.york.ac.uk/pub/haskell/contrib/ \ http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ PKGNAMEPREFIX= hs- -DISTNAME= hscolour-${PORTVERSION} +PKGNAMESUFFIX= -doc MAINTAINER= jacula@gmail.com COMMENT= Documentation for HsColour BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc \ - haddock:${PORTSDIR}/devel/hs-haddock \ HsColour:${PORTSDIR}/print/hs-hscolour +RUN_DEPENDS= hs-hscolour=${PORTVERSION}:${PORTSDIR}/print/hs-hscolour + +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= ${PORTVERSION} HSCOLOUR_DATADIR= ${PREFIX}/share/hscolour-${HSCOLOUR_VERSION} diff --git a/print/hs-hscolour-docs/distinfo b/print/hs-hscolour-docs/distinfo index a0a9d02bb343..000d9e7b0fd1 100644 --- a/print/hs-hscolour-docs/distinfo +++ b/print/hs-hscolour-docs/distinfo @@ -1,3 +1,3 @@ -MD5 (hscolour-1.12.tar.gz) = 4328a84b87b245693bcf10b49c608e43 -SHA256 (hscolour-1.12.tar.gz) = b80a446c0b27d1eaca172d07e7a5d814e4b3a63db0bc8689e60a3db2fc92cfc0 -SIZE (hscolour-1.12.tar.gz) = 54116 +MD5 (hscolour-1.13.tar.gz) = a48b90999b0b28903e774e53fb4ec4e6 +SHA256 (hscolour-1.13.tar.gz) = f52f978dbd0e31101c514968e0d2c0302683a38f72b47f054e99a11e465243e8 +SIZE (hscolour-1.13.tar.gz) = 56410 diff --git a/print/hs-hscolour-docs/pkg-plist b/print/hs-hscolour-docs/pkg-plist index 0af9fa1c8bb2..ebcb65f9e3f5 100644 --- a/print/hs-hscolour-docs/pkg-plist +++ b/print/hs-hscolour-docs/pkg-plist @@ -1,3 +1,4 @@ +@comment $FreeBSD$ %%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-ANSI.html %%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-Anchors.html %%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-CSS.html @@ -6,6 +7,7 @@ %%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-Colourise.html %%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-General.html %%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-HTML.html +%%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-InlineCSS.html %%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-LaTeX.html %%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-MIRC.html %%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-Options.html @@ -14,10 +16,28 @@ %%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour.html %%DOCSDIR%%/html/HsColour/Main.html %%DOCSDIR%%/html/HsColour/doc-index.html +%%DOCSDIR%%/html/HsColour/frames.html %%DOCSDIR%%/html/HsColour/haddock-util.js %%DOCSDIR%%/html/HsColour/haddock.css %%DOCSDIR%%/html/HsColour/haskell_icon.gif +%%DOCSDIR%%/html/HsColour/index-frames.html %%DOCSDIR%%/html/HsColour/index.html +%%DOCSDIR%%/html/HsColour/mini_Language-Haskell-HsColour-ANSI.html +%%DOCSDIR%%/html/HsColour/mini_Language-Haskell-HsColour-Anchors.html +%%DOCSDIR%%/html/HsColour/mini_Language-Haskell-HsColour-CSS.html +%%DOCSDIR%%/html/HsColour/mini_Language-Haskell-HsColour-Classify.html +%%DOCSDIR%%/html/HsColour/mini_Language-Haskell-HsColour-ColourHighlight.html +%%DOCSDIR%%/html/HsColour/mini_Language-Haskell-HsColour-Colourise.html +%%DOCSDIR%%/html/HsColour/mini_Language-Haskell-HsColour-General.html +%%DOCSDIR%%/html/HsColour/mini_Language-Haskell-HsColour-HTML.html +%%DOCSDIR%%/html/HsColour/mini_Language-Haskell-HsColour-InlineCSS.html +%%DOCSDIR%%/html/HsColour/mini_Language-Haskell-HsColour-LaTeX.html +%%DOCSDIR%%/html/HsColour/mini_Language-Haskell-HsColour-MIRC.html +%%DOCSDIR%%/html/HsColour/mini_Language-Haskell-HsColour-Options.html +%%DOCSDIR%%/html/HsColour/mini_Language-Haskell-HsColour-Output.html +%%DOCSDIR%%/html/HsColour/mini_Language-Haskell-HsColour-TTY.html +%%DOCSDIR%%/html/HsColour/mini_Language-Haskell-HsColour.html +%%DOCSDIR%%/html/HsColour/mini_Main.html %%DOCSDIR%%/html/HsColour/minus.gif %%DOCSDIR%%/html/HsColour/plus.gif %%DOCSDIR%%/html/HsColour/src/Main.html @@ -30,6 +50,7 @@ %%DOCSDIR%%/html/Language-Haskell-HsColour-Colourise.html %%DOCSDIR%%/html/Language-Haskell-HsColour-General.html %%DOCSDIR%%/html/Language-Haskell-HsColour-HTML.html +%%DOCSDIR%%/html/Language-Haskell-HsColour-InlineCSS.html %%DOCSDIR%%/html/Language-Haskell-HsColour-LaTeX.html %%DOCSDIR%%/html/Language-Haskell-HsColour-MIRC.html %%DOCSDIR%%/html/Language-Haskell-HsColour-Options.html @@ -37,11 +58,28 @@ %%DOCSDIR%%/html/Language-Haskell-HsColour-TTY.html %%DOCSDIR%%/html/Language-Haskell-HsColour.html %%DOCSDIR%%/html/doc-index.html +%%DOCSDIR%%/html/frames.html %%DOCSDIR%%/html/haddock-util.js %%DOCSDIR%%/html/haddock.css %%DOCSDIR%%/html/haskell_icon.gif %%DOCSDIR%%/html/hscolour.haddock +%%DOCSDIR%%/html/index-frames.html %%DOCSDIR%%/html/index.html +%%DOCSDIR%%/html/mini_Language-Haskell-HsColour-ANSI.html +%%DOCSDIR%%/html/mini_Language-Haskell-HsColour-Anchors.html +%%DOCSDIR%%/html/mini_Language-Haskell-HsColour-CSS.html +%%DOCSDIR%%/html/mini_Language-Haskell-HsColour-Classify.html +%%DOCSDIR%%/html/mini_Language-Haskell-HsColour-ColourHighlight.html +%%DOCSDIR%%/html/mini_Language-Haskell-HsColour-Colourise.html +%%DOCSDIR%%/html/mini_Language-Haskell-HsColour-General.html +%%DOCSDIR%%/html/mini_Language-Haskell-HsColour-HTML.html +%%DOCSDIR%%/html/mini_Language-Haskell-HsColour-InlineCSS.html +%%DOCSDIR%%/html/mini_Language-Haskell-HsColour-LaTeX.html +%%DOCSDIR%%/html/mini_Language-Haskell-HsColour-MIRC.html +%%DOCSDIR%%/html/mini_Language-Haskell-HsColour-Options.html +%%DOCSDIR%%/html/mini_Language-Haskell-HsColour-Output.html +%%DOCSDIR%%/html/mini_Language-Haskell-HsColour-TTY.html +%%DOCSDIR%%/html/mini_Language-Haskell-HsColour.html %%DOCSDIR%%/html/minus.gif %%DOCSDIR%%/html/plus.gif %%DOCSDIR%%/html/src/Language-Haskell-HsColour-ANSI.html @@ -52,6 +90,7 @@ %%DOCSDIR%%/html/src/Language-Haskell-HsColour-Colourise.html %%DOCSDIR%%/html/src/Language-Haskell-HsColour-General.html %%DOCSDIR%%/html/src/Language-Haskell-HsColour-HTML.html +%%DOCSDIR%%/html/src/Language-Haskell-HsColour-InlineCSS.html %%DOCSDIR%%/html/src/Language-Haskell-HsColour-LaTeX.html %%DOCSDIR%%/html/src/Language-Haskell-HsColour-MIRC.html %%DOCSDIR%%/html/src/Language-Haskell-HsColour-Options.html diff --git a/print/hs-hscolour/Makefile b/print/hs-hscolour/Makefile index 66943076d5a4..b377ac9221df 100644 --- a/print/hs-hscolour/Makefile +++ b/print/hs-hscolour/Makefile @@ -6,8 +6,7 @@ # PORTNAME= hscolour -PORTVERSION= 1.12 -PORTREVISION= 1 +PORTVERSION= 1.13 CATEGORIES= print haskell MASTER_SITES= ftp://ftp.cs.york.ac.uk/pub/haskell/contrib/ \ http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ @@ -16,15 +15,15 @@ PKGNAMEPREFIX= hs- MAINTAINER= jacula@gmail.com COMMENT= Colourise Haskell code -LIB_DEPENDS+= gmp.8:${PORTSDIR}/math/libgmp4 - .if !defined(SLAVE) BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc +RUN_DEPENDS+= ghc:${PORTSDIR}/lang/ghc +LIB_DEPENDS+= gmp.8:${PORTSDIR}/math/libgmp4 .else NO_PKG_REGISTER= .endif -GHC_VERSION= 6.8.3 +GHC_VERSION= 6.10.4 HSCOLOUR_VERSION= ${PORTVERSION} CABAL_CMD= runghc Setup.hs diff --git a/print/hs-hscolour/distinfo b/print/hs-hscolour/distinfo index a0a9d02bb343..000d9e7b0fd1 100644 --- a/print/hs-hscolour/distinfo +++ b/print/hs-hscolour/distinfo @@ -1,3 +1,3 @@ -MD5 (hscolour-1.12.tar.gz) = 4328a84b87b245693bcf10b49c608e43 -SHA256 (hscolour-1.12.tar.gz) = b80a446c0b27d1eaca172d07e7a5d814e4b3a63db0bc8689e60a3db2fc92cfc0 -SIZE (hscolour-1.12.tar.gz) = 54116 +MD5 (hscolour-1.13.tar.gz) = a48b90999b0b28903e774e53fb4ec4e6 +SHA256 (hscolour-1.13.tar.gz) = f52f978dbd0e31101c514968e0d2c0302683a38f72b47f054e99a11e465243e8 +SIZE (hscolour-1.13.tar.gz) = 56410 diff --git a/print/hs-hscolour/pkg-descr b/print/hs-hscolour/pkg-descr index ffe4a83b63d6..68195cc9163b 100644 --- a/print/hs-hscolour/pkg-descr +++ b/print/hs-hscolour/pkg-descr @@ -1,32 +1,11 @@ hscolour is a small Haskell script to colourise Haskell code. -It currently has five output formats: +It currently has six output formats: -- ANSI terminal codes -- HTML 3.2 with <font> tags -- HTML 4.01 with CSS -- LaTeX -- mIRC chat codes + - ANSI terminal codes, + - HTML 3.2 with <font> tags, + - HTML 4.01 with CSS, + - XHTML 1.0 with inline CSS styling, + - LaTeX, + - and mIRC chat codes. -author: Malcolm Wallace -maintainer: Malcolm Wallace -license: GPL -WWW: http://www.cs.york.ac.uk/fp/darcs/hscolour -package-url: ftp://ftp.cs.york.ac.uk/pub/haskell/contrib - -Exposed-Modules: - Language.Haskell.HsColour - Language.Haskell.HsColour.ANSI - Language.Haskell.HsColour.Anchors - Language.Haskell.HsColour.Classify - Language.Haskell.HsColour.ColourHighlight - Language.Haskell.HsColour.Colourise - Language.Haskell.HsColour.TTY - Language.Haskell.HsColour.HTML - Language.Haskell.HsColour.LaTeX - Language.Haskell.HsColour.General - Language.Haskell.HsColour.MIRC - Language.Haskell.HsColour.CSS - Language.Haskell.HsColour.Output - Language.Haskell.HsColour.Options - -Executable: HsColour +WWW: http://www.cs.york.ac.uk/fp/darcs/hscolour/ diff --git a/print/hs-hscolour/pkg-plist b/print/hs-hscolour/pkg-plist index 5d1be4bfd029..5ce6fa58d01b 100644 --- a/print/hs-hscolour/pkg-plist +++ b/print/hs-hscolour/pkg-plist @@ -1,3 +1,4 @@ +@comment $FreeBSD$ bin/HsColour %%HSCOLOUR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HShscolour-%%HSCOLOUR_VERSION%%.o %%HSCOLOUR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour.hi @@ -9,6 +10,7 @@ bin/HsColour %%HSCOLOUR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour/Colourise.hi %%HSCOLOUR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour/General.hi %%HSCOLOUR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour/HTML.hi +%%HSCOLOUR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour/InlineCSS.hi %%HSCOLOUR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour/LaTeX.hi %%HSCOLOUR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour/MIRC.hi %%HSCOLOUR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour/Options.hi @@ -20,13 +22,13 @@ bin/HsColour %%DOCSDIR%%/README %%DATADIR%%/hscolour.css @dirrm %%DATADIR%% -@dirrm %%DOCSDIR%% +@dirrmtry %%DOCSDIR%% @dirrm %%HSCOLOUR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour @dirrm %%HSCOLOUR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell @dirrm %%HSCOLOUR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language @dirrm %%HSCOLOUR_LIBDIR_REL%%/ghc-%%GHC_VERSION%% @dirrm %%HSCOLOUR_LIBDIR_REL%% -@exec /bin/sh %D/%%HSCOLOUR_LIBDIR_REL%%/register.sh +@exec /bin/sh %%LOCALBASE%%/%%HSCOLOUR_LIBDIR_REL%%/register.sh @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old -@unexec %D/bin/ghc-pkg unregister hscolour +@unexec %%LOCALBASE%%/bin/ghc-pkg unregister hscolour @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old |