[106872] trunk/dports
cal at macports.org
cal at macports.org
Sun Jun 9 06:23:06 PDT 2013
Revision: 106872
https://trac.macports.org/changeset/106872
Author: cal at macports.org
Date: 2013-06-09 06:23:06 -0700 (Sun, 09 Jun 2013)
Log Message:
-----------
c2hs: move to hs-c2hs, update to 0.16.4, forces rebuild with new GHC, add dependency language-c < 0.4, modify haskell portgroup to support not running register scripts
Modified Paths:
--------------
trunk/dports/_resources/port1.0/group/haskell-1.0.tcl
trunk/dports/devel/c2hs/Portfile
trunk/dports/devel/hs-c2hs/Portfile
trunk/dports/devel/hs-language-c-03/Portfile
Added Paths:
-----------
trunk/dports/devel/hs-c2hs/
trunk/dports/devel/hs-language-c-03/
Modified: trunk/dports/_resources/port1.0/group/haskell-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/haskell-1.0.tcl 2013-06-09 13:00:19 UTC (rev 106871)
+++ trunk/dports/_resources/port1.0/group/haskell-1.0.tcl 2013-06-09 13:23:06 UTC (rev 106872)
@@ -50,7 +50,7 @@
compiler ${prefix}/bin/ghc}
}
-proc haskell.setup {package version {compiler ghc}} {
+proc haskell.setup {package version {compiler ghc} {register_scripts "yes"}} {
global haskell.compiler_list
global haskell.compiler_configuration
global homepage prefix configure.cmd destroot worksrcpath name master_sites configure.cc
@@ -80,19 +80,21 @@
destroot.cmd ${configure.cmd}
destroot.destdir
destroot.target Setup copy --destdir=${destroot}
- post-destroot {
- system "cd ${worksrcpath} && ${configure.cmd} Setup register --gen-script"
- system "cd ${worksrcpath} && ${configure.cmd} Setup unregister --gen-script"
- xinstall -m 755 -d ${destroot}${prefix}/libexec/${name}
- xinstall -m 755 -W ${worksrcpath} register.sh unregister.sh \
- ${destroot}${prefix}/libexec/${name}
- }
- post-activate {
- system "${prefix}/libexec/${name}/register.sh"
- }
- pre-deactivate {
- system "${prefix}/libexec/${name}/unregister.sh"
- }
+ if {${register_scripts} == "yes"} {
+ post-destroot {
+ system "cd ${worksrcpath} && ${configure.cmd} Setup register --gen-script"
+ system "cd ${worksrcpath} && ${configure.cmd} Setup unregister --gen-script"
+ xinstall -m 755 -d ${destroot}${prefix}/libexec/${name}
+ xinstall -m 755 -W ${worksrcpath} register.sh unregister.sh \
+ ${destroot}${prefix}/libexec/${name}
+ }
+ post-activate {
+ system "${prefix}/libexec/${name}/register.sh"
+ }
+ pre-deactivate {
+ system "${prefix}/libexec/${name}/unregister.sh"
+ }
+ }
livecheck.type regex
livecheck.url http://hackage.haskell.org/cgi-bin/hackage-scripts/package/${package}
Modified: trunk/dports/devel/c2hs/Portfile
===================================================================
--- trunk/dports/devel/c2hs/Portfile 2013-06-09 13:00:19 UTC (rev 106871)
+++ trunk/dports/devel/c2hs/Portfile 2013-06-09 13:23:06 UTC (rev 106872)
@@ -1,46 +1,12 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
# $Id$
-PortSystem 1.0
+PortSystem 1.0
-name c2hs
-version 0.15.1
-categories devel haskell
-maintainers gwright
-platforms darwin
-
-description Yet Another Interface Generator for Haskell
-long_description \
- C->Haskell is an interface generator that simplifies \
- the development of Haskell bindings to C libraries. \
- The tool processes existing C header files that \
- determine data layout and function signatures on the \
- C side in conjunction with Haskell modules that specify \
- Haskell-side type signatures and marshaling details.
-
-homepage http://www.cse.unsw.edu.au/~chak/haskell/c2hs/
-master_sites ${homepage}/
-
-checksums md5 69f99fba67419edd471b77efb0bd644f \
- sha1 f690c87abf63329b6888cb2a3b8f4fb64d113150 \
- rmd160 e43c39437dd3320cdb714ef2219d7bed2d25afab
-
-depends_build port:ghc
-
-universal_variant no
-
-pre-configure {
- system "cd ${worksrcpath} && ghc -o Setup Setup.hs -package Cabal"
- }
-
-configure {
- system "cd ${worksrcpath} && ./Setup configure --ghc --prefix=${prefix}"
- }
-
-build {
- system "cd ${worksrcpath} && ./Setup build -v"
- }
-
-destroot {
- system "cd ${worksrcpath} && ./Setup copy --copy-prefix=${destroot}${prefix}"
- }
-
+name c2hs
+version 0.15.1
+revision 1
+categories devel haskell
+platforms darwin
+replaced_by hs-c2hs
+PortGroup obsolete 1.0
Modified: trunk/dports/devel/hs-c2hs/Portfile
===================================================================
--- trunk/dports/devel/hs-json/Portfile 2013-06-09 11:54:29 UTC (rev 106861)
+++ trunk/dports/devel/hs-c2hs/Portfile 2013-06-09 13:23:06 UTC (rev 106872)
@@ -4,24 +4,28 @@
PortSystem 1.0
PortGroup haskell 1.0
-haskell.setup json 0.7
-revision 2
-checksums rmd160 d3f9bdb2fcd0203d394e0c97a00353662209dcba \
- sha256 d3654272caa269bc65f6f2af82b583ef05434613fe5272d57053fb3bfada68a3
+haskell.setup c2hs 0.16.4 ghc no
+checksums rmd160 bc3ebe30c95828ffe8da9c0d0e4bcc1c6239c5b2 \
+ sha256 f1b15c18de884273eeab4400097a6fad8373849835e2a943d4583d9602fb1555
maintainers nomaintainer
platforms darwin
-license BSD
+license GPL-2
-description Support for serialising Haskell to and from JSON
+description C->Haskell FFI tool that gives some cross-language type safety
long_description \
- JSON (JavaScript Object Notation) is a lightweight data-interchange format. \
- It is easy for humans to read and write. It is easy for machines to parse \
- and generate. It is based on a subset of the JavaScript Programming \
- Language, Standard ECMA-262 3rd Edition - December 1999. This library \
- provides a parser and pretty printer for converting between Haskell values \
- and JSON.
+ C->Haskell assists in the development of Haskell bindings to C libraries. \
+ It extracts interface information from C header files and generates Haskell \
+ code with foreign imports and marshaling. Unlike writing foreign imports by \
+ hand (or using hsch2s), this ensures that C functions are imported with the \
+ correct Haskell types.
-depends_lib-append port:hs-mtl \
- port:hs-syb \
- port:hs-parsec
+depends_lib-append port:hs-language-c-03
+
+pre-activate {
+ # deactivate hack added 2013-06-09
+ if {![catch {set installed [lindex [registry_active c2hs] 0]}]} {
+ # this port used to be called c2hs
+ registry_deactivate_composite c2hs "" [list ports_nodepcheck 1]
+ }
+}
Modified: trunk/dports/devel/hs-language-c-03/Portfile
===================================================================
--- trunk/dports/devel/hs-language-c/Portfile 2013-06-09 11:54:29 UTC (rev 106861)
+++ trunk/dports/devel/hs-language-c-03/Portfile 2013-06-09 13:23:06 UTC (rev 106872)
@@ -4,10 +4,10 @@
PortSystem 1.0
PortGroup haskell 1.0
-haskell.setup language-c 0.4.2
-revision 2
-checksums rmd160 9c20128ec44585bbb3a7079ba78b802c173dabb9 \
- sha256 6384cf03a00008b65ad126c2582699b3de52de594468386d2c79cf63c926ee1e
+haskell.setup language-c 0.3.2.1
+name hs-language-c-03
+checksums rmd160 8a4b15dec3d1d498af5297c132d5d98ebcb88822 \
+ sha256 bdc6680ef0b66454989245b626c437d08e1b5378e522fa160b538a8bd03568e2
license BSD
maintainers nomaintainer
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130609/a4ffd91a/attachment-0001.html>
More information about the macports-changes
mailing list