summaryrefslogtreecommitdiff
path: root/lang/ghc
diff options
context:
space:
mode:
authorGabor Pali <pgj@FreeBSD.org>2013-03-29 22:43:58 +0000
committerGabor Pali <pgj@FreeBSD.org>2013-03-29 22:43:58 +0000
commitbd8d410bbe561cb06cef8e6439398148ea172996 (patch)
treebb6acd9e4d75e5dd918d3f6f723ca485c7f0dd6f /lang/ghc
parent- Fix and update COMMENT. (diff)
- Update Haskell ports from the development repository
- Avoid self-dependency for print/hs-hscolour (when HSCOLOUR is set) Contributed by: ashish New ports (5): devel/hs-geniplate 0.6.0.3 devel/hs-uuid 1.2.9 net/hs-maccatcher 2.1.5 net/hs-publicsuffixlist 0.0.3 textproc/hs-regex-tdfa 1.1.8 Removed ports (1): math/hs-Agda-executable 2.3.0.1_3 Updated ports (115): archivers/hs-zip-archive 0.1.3.3 --> 0.1.3.4 archivers/hs-zlib-conduit 0.5.0.3_1 --> 1.0.0 audio/hs-OpenAL 1.4.0.1_3 --> 1.4.0.2 databases/hs-persistent 1.1.4 --> 1.1.5.1 databases/hs-persistent-sqlite 1.1.2 --> 1.1.5 databases/hs-persistent-template 1.1.2.1 --> 1.1.2.4 devel/hs-Boolean 0.1.2 --> 0.2 devel/hs-ansi-terminal 0.5.5.1 --> 0.6 devel/hs-base64-bytestring 1.0.0.0_1 --> 1.0.0.1 devel/hs-base64-conduit 0.5.1 --> 1.0.0 devel/hs-basic-prelude 0.3.2.0 --> 0.3.4.0 devel/hs-bifunctors 3.2 --> 3.2.0.1 devel/hs-blaze-builder-conduit 0.5.0.3_1 --> 1.0.0 devel/hs-classy-prelude 0.4.3 --> 0.5.3 devel/hs-classy-prelude-conduit 0.4.3 --> 0.5.3 devel/hs-cmdargs 0.10.1_1 --> 0.10.2 devel/hs-conduit 0.5.6 --> 1.0.2 devel/hs-darcs 2.8.3_1 --> 2.8.4 devel/hs-either 3.1 --> 3.4 devel/hs-errors 1.3.1 --> 1.4.1 devel/hs-filestore 0.6 --> 0.6.0.1 devel/hs-filesystem-conduit 0.5.0.2_1 --> 1.0.0 devel/hs-git-annex 3.20130124 --> 4.20130323 devel/hs-hashtables 1.0.1.8_1 --> 1.1.0.2 devel/hs-haskeline 0.6.4.7_3 --> 0.7.0.3 devel/hs-hint 0.3.3.5_1 --> 0.3.3.6 devel/hs-hoogle 4.2.15 --> 4.2.16 devel/hs-hspec 1.4.3 --> 1.4.4 devel/hs-lens 3.8.5 --> 3.8.7.3 devel/hs-logict 0.5.0.2_1 --> 0.6 devel/hs-monad-logger 0.2.3.2 --> 0.3.0.1 devel/hs-monad-par 0.3_3 --> 0.3.4.1 devel/hs-mueval 0.8.2_3 --> 0.9 devel/hs-profunctors 3.2 --> 3.3 devel/hs-project-template 0.1.1 --> 0.1.3 devel/hs-readline 1.0.1.0_8 --> 1.0.3.0 devel/hs-reflection 1.1.6 --> 1.1.7 devel/hs-resourcet 0.4.4_1 --> 0.4.5 devel/hs-show 0.4.1.2_4 --> 0.5 devel/hs-simple-reflect 0.2_1 --> 0.3.1 devel/hs-smallcheck 0.6.2 --> 1.0.2 devel/hs-testpack 2.1.2_3 --> 2.1.2.1 devel/hs-threads 0.5.0.1_1 --> 0.5.0.2 devel/hs-time-compat 0.1.0.2_1 --> 0.1.0.3 devel/hs-unix-time 0.1.4_1 --> 0.1.5 devel/hs-uulib 0.9.14_4 --> 0.9.15 mail/hs-email-validate 0.3.2_1 --> 1.0.0 mail/hs-mime-types 0.1.0.2 --> 0.1.0.3 math/hs-Agda 2.3.0.1_3 --> 2.3.2 math/hs-NumInstances 1.0_4 --> 1.2 math/hs-comonad 3.0.1.1 --> 3.0.2 math/hs-contravariant 0.2.0.2_3 --> 0.4 math/hs-distributive 0.3 --> 0.3.1 math/hs-math-functions 0.1.1.2_1 --> 0.1.3.0 net/hs-network-conduit 0.6.2.2 --> 1.0.0 net/hs-sendfile 0.7.8_1 --> 0.7.9 net/hs-simple-sendfile 0.2.10 --> 0.2.11 net/hs-socks 0.4.2_1 --> 0.5.0 security/hs-crypto-api 0.10.2_3 --> 0.11 security/hs-crypto-conduit 0.4.3 --> 0.5.0 security/hs-monadcryptorandom 0.5_1 --> 0.5.1 security/hs-skein 0.1.0.11 --> 0.1.0.12 security/hs-tls 1.1.1 --> 1.1.2 textproc/hs-HStringTemplate 0.6.12_1 --> 0.7.1 textproc/hs-attoparsec 0.10.3.0 --> 0.10.4.0 textproc/hs-attoparsec-conduit 0.5.0.3_1 --> 1.0.0 textproc/hs-blaze-html 0.5.1.3 --> 0.6.0.0 textproc/hs-case-insensitive 0.4.0.4 --> 1.0 textproc/hs-citeproc-hs 0.3.7 --> 0.3.8 textproc/hs-highlighting-kate 0.5.3.5 --> 0.5.3.8 textproc/hs-hs-bibutils 4.16 --> 4.17 textproc/hs-html-conduit 0.1.0.4_1 --> 1.1.0 textproc/hs-hxt-regex-xmlschema 9.0.4_4 --> 9.1.0 textproc/hs-pandoc 1.9.4.5_1 --> 1.11.1 textproc/hs-pandoc-types 1.9.1_3 --> 1.10 textproc/hs-tagstream-conduit 0.5.3_1 --> 0.5.4 textproc/hs-xml-conduit 1.0.3.3_1 --> 1.1.0.3 textproc/hs-xmlhtml 0.2.0.3_1 --> 0.2.1 textproc/hs-yaml 0.8.2 --> 0.8.2.3 www/hs-activehs 0.3.0.1_1 --> 0.3.1 www/hs-authenticate 1.3.2_1 --> 1.3.2.6 www/hs-fastcgi 3001.0.2.3_7 --> 3001.0.2.4 www/hs-gitit 0.10.1.2 --> 0.10.3.1 www/hs-hS3 0.5.6_5 --> 0.5.7 www/hs-hamlet 1.1.3.1 --> 1.1.6.3 www/hs-happstack-server 7.1.1_1 --> 7.1.7 www/hs-heist 0.11.0 --> 0.11.1 www/hs-hjsmin 0.1.4 --> 0.1.4.1 www/hs-http-conduit 1.8.7 --> 1.9.0 www/hs-http-reverse-proxy 0.1.1.1 --> 0.1.1.3 www/hs-http-server 1.0.1_1 --> 1.0.2 www/hs-http-types 0.7.3.0.1_1 --> 0.8.0 www/hs-shakespeare 1.0.2_1 --> 1.0.3.1 www/hs-shakespeare-css 1.0.2_1 --> 1.0.3 www/hs-shakespeare-js 1.1.1 --> 1.1.2.1 www/hs-snap 0.11.0 --> 0.11.2 www/hs-snap-core 0.9.2.2_1 --> 0.9.3.1 www/hs-snap-server 0.9.2.4_1 --> 0.9.3.3 www/hs-wai 1.3.0.1_1 --> 1.4.0 www/hs-wai-app-static 1.3.1_1 --> 1.3.1.2 www/hs-wai-extra 1.3.2 --> 1.3.2.4 www/hs-wai-test 1.3.0_1 --> 1.3.0.4 www/hs-warp 1.3.7.1 --> 1.3.7.4 www/hs-yesod 1.1.7.2 --> 1.1.9.2 www/hs-yesod-auth 1.1.3 --> 1.1.5.3 www/hs-yesod-core 1.1.7.1 --> 1.1.8.2 www/hs-yesod-default 1.1.3 --> 1.1.3.2 www/hs-yesod-form 1.2.0.2 --> 1.2.1.3 www/hs-yesod-json 1.1.2_1 --> 1.1.2.1 www/hs-yesod-platform 1.1.7.2 --> 1.1.8 www/hs-yesod-routes 1.1.1.1_1 --> 1.1.2 www/hs-yesod-static 1.1.1.2 --> 1.1.2.2 www/hs-yesod-test 0.3.3 --> 0.3.5 x11-wm/hs-xmonad-contrib 0.11 --> 0.11.1 x11/hs-X11 1.6.0.2 --> 1.6.1.1 Please note that port revisions for dependent ports are bumped. Obtained from: FreeBSD Haskell
Notes
Notes: svn path=/head/; revision=315580
Diffstat (limited to 'lang/ghc')
-rw-r--r--lang/ghc/bsd.cabal.options.mk7
-rw-r--r--lang/ghc/bsd.hackage.mk6
2 files changed, 11 insertions, 2 deletions
diff --git a/lang/ghc/bsd.cabal.options.mk b/lang/ghc/bsd.cabal.options.mk
index 1310cff6636e..53ad1d0da701 100644
--- a/lang/ghc/bsd.cabal.options.mk
+++ b/lang/ghc/bsd.cabal.options.mk
@@ -16,6 +16,7 @@ PKGNAMEPREFIX?= ${HSPREFIX}
LOCALBASE?= /usr/local
GHC_CMD?= ${LOCALBASE}/bin/ghc
HADDOCK_CMD?= ${LOCALBASE}/bin/haddock
+HSCOLOUR_CMD?= ${LOCALBASE}/bin/HsColour
GHC_VERSION= 7.4.2
HSCOLOUR_DESC?= Colorize generated documentation by HsColour
@@ -32,8 +33,12 @@ OPTIONS_DEFINE+= PROFILE
.endif
.if !exists(${GHC_CMD}) || ((exists(${HADDOCK_CMD}) && exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/html)) && !defined(NOPORTDOCS))
-OPTIONS_DEFINE+= DOCS HSCOLOUR
+OPTIONS_DEFINE+= DOCS
OPTIONS_DEFAULT+= DOCS
+
+.if (${PORTNAME} != hscolour || exists(${HSCOLOUR_CMD})) && !defined(IGNORE_HSCOLOUR)
+OPTIONS_DEFINE+= HSCOLOUR
+.endif
.endif
.if defined(OPTIONSMKINCLUDED)
diff --git a/lang/ghc/bsd.hackage.mk b/lang/ghc/bsd.hackage.mk
index 749258a2e05b..b724a4c7eb79 100644
--- a/lang/ghc/bsd.hackage.mk
+++ b/lang/ghc/bsd.hackage.mk
@@ -17,7 +17,6 @@ activehs_port= www/hs-activehs
activehs-base_port= devel/hs-activehs-base
aeson_port= converters/hs-aeson
Agda_port= math/hs-Agda # executable
-Agda-executable_port= math/hs-Agda-executable # executable
alex_port= devel/hs-alex # executable
ALUT_port= audio/hs-ALUT
angel_port= sysutils/hs-angel
@@ -131,6 +130,7 @@ filesystem-conduit_port= devel/hs-filesystem-conduit
fsnotify_port= devel/hs-fsnotify
gconf_port= devel/hs-gconf
generic-deriving_port= devel/hs-generic-deriving
+geniplate_port= devel/hs-geniplate
ghc-events_port= devel/hs-ghc-events # executable
ghc-mtl_port= devel/hs-ghc-mtl
ghc-paths_port= devel/hs-ghc-paths
@@ -207,6 +207,7 @@ libxml_port= textproc/hs-libxml
lifted-base_port= devel/hs-lifted-base
List_port= devel/hs-List
logict_port= devel/hs-logict
+maccatcher_port= net/hs-maccatcher
math-functions_port= math/hs-math-functions
MaybeT_port= devel/hs-MaybeT
MemoTrie_port= devel/hs-MemoTrie
@@ -261,6 +262,7 @@ profunctor-extras_port= devel/hs-profunctor-extras
profunctors_port= devel/hs-profunctors
project-template_port= devel/hs-project-template
PSQueue_port= devel/hs-PSQueue
+publicsuffixlist_port= net/hs-publicsuffixlist
pureMD5_port= security/hs-pureMD5
pwstore-fast_port= security/hs-pwstore-fast
QuickCheck_port= devel/hs-QuickCheck
@@ -275,6 +277,7 @@ regex-base_port= textproc/hs-regex-base
regex-compat_port= textproc/hs-regex-compat
regex-pcre-builtin_port= textproc/hs-regex-pcre-builtin
regex-posix_port= textproc/hs-regex-posix
+regex-tdfa_port= textproc/hs-regex-tdfa
resource-pool_port= devel/hs-resource-pool
resourcet_port= devel/hs-resourcet
RSA_port= security/hs-RSA
@@ -352,6 +355,7 @@ utility-ht_port= devel/hs-utility-ht
uuagc_port= devel/hs-uuagc # executable
uuagc-bootstrap_port= devel/hs-uuagc-bootstrap # executable
uuagc-cabal_port= devel/hs-uuagc-cabal
+uuid_port= devel/hs-uuid
uulib_port= devel/hs-uulib
vault_port= devel/hs-vault
vector_port= devel/hs-vector
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-18 23:21:01 +0000