[117569] trunk/dports/lang

4 Mar 2014

Revision: 117569
          https://trac.macports.org/changeset/117569
Author:   takeshi@macports.org
Date:     2014-03-03 16:16:55 -0800 (Mon, 03 Mar 2014)
Log Message:
-----------
dmd, druntime, phobos, dmd-doc, dmd-tools: updated to 2.065.0

Modified Paths:
--------------
    trunk/dports/lang/dmd/Portfile
    trunk/dports/lang/dmd-doc/Portfile
    trunk/dports/lang/dmd-tools/Portfile
    trunk/dports/lang/druntime/Portfile
    trunk/dports/lang/phobos/Portfile

Added Paths:
-----------
    trunk/dports/lang/phobos/files/
    trunk/dports/lang/phobos/files/patch-gzlib.c.diff
    trunk/dports/lang/phobos/files/patch-posix.mak.diff

Modified: trunk/dports/lang/dmd/Portfile
===================================================================

--- trunk/dports/lang/dmd/Portfile	2014-03-03 23:04:49 UTC (rev 117568)
+++ trunk/dports/lang/dmd/Portfile	2014-03-04 00:16:55 UTC (rev 117569)
@@ -1,10 +1,10 @@
-# -*- 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
 PortGroup           github 1.0
 
-github.setup        D-Programming-Language dmd 2.064 v
+github.setup        D-Programming-Language dmd 2.065
 categories          lang
 platforms           darwin
 supported_archs     i386 x86_64
@@ -16,14 +16,13 @@
     It pragmatically combines efficiency, control, \
     and modeling power, with safety and programmer productivity.
 homepage            http://dlang.org/
-checksums           rmd160  ef73f20394318759eac02d1ee990092ff78b54e5 \
-                    sha256  245ad652250002d7b97343b6fb3a5eb4dddd330c3d824a8984be750ad10b6cf8
+checksums           rmd160  6ed3b7e960341fd8e1a9ba81d029eb715401e60c \
+                    sha256  622785f91547f71331ab207ef811411dda9c36085c573d7225a9f8585146bc5d
 post-patch {
     reinplace "s|gcc|${configure.cc}|" ${worksrcpath}/src/link.c
-    reinplace "s|-m\$(MODEL)||" ${worksrcpath}/src/posix.mak
-    reinplace "s|/etc|${prefix}/etc/${name}|" ${worksrcpath}/src/inifile.c
+    reinplace "s|/etc|${prefix}/etc/${name}|" ${worksrcpath}/src/posix.mak
     reinplace "s|/etc|${prefix}/etc/${name}|" ${worksrcpath}/docs/man/man1/${name}.1
-    reinplace "s|/etc|${prefix}/etc/${name}|" ${worksrcpath}/docs/man/man1/${name}.conf.5
+    reinplace "s|/etc|${prefix}/etc/${name}|" ${worksrcpath}/docs/man/man5/${name}.conf.5
 }
 
 use_configure       no
@@ -54,7 +53,7 @@
     xinstall -m 644 -W ${worksrcpath}/docs/man/man1 \
         dmd.1 dumpobj.1 obj2asm.1 rdmd.1 \
         ${destroot}${prefix}/share/man/man1
-    xinstall -m 644 ${worksrcpath}/docs/man/man1/dmd.conf.5 \
+    xinstall -m 644 ${worksrcpath}/docs/man/man5/dmd.conf.5 \
         ${destroot}${prefix}/share/man/man5
 # bin
     xinstall -m 755 -W ${destroot.dir} \

Modified: trunk/dports/lang/dmd-doc/Portfile
===================================================================
--- trunk/dports/lang/dmd-doc/Portfile	2014-03-03 23:04:49 UTC (rev 117568)
+++ trunk/dports/lang/dmd-doc/Portfile	2014-03-04 00:16:55 UTC (rev 117569)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 PortGroup           github 1.0
 
-github.setup        D-Programming-Language dlang.org 2.064 v
+github.setup        D-Programming-Language dlang.org 2.065
 name                dmd-doc
 categories          lang
 platforms           darwin
@@ -20,12 +20,9 @@
     This port provides the html files required to build the dman command of \
     the D programming language compiler.
 homepage            http://dlang.org/
-checksums           rmd160  173003a154eb1f2f59689940b01cea36da1d0980 \
-                    sha256  da1de870b1091fe49737bba51a3cd41415b24e1cf857dc0bd431da3f8df2c718
+checksums           rmd160  c7f0ade3763819825e205b2ff34017f67d1059e8 \
+                    sha256  5ae626d24479e3f5cbdbaea7617cc377457a1d19330e399139973ae5b4283343
 
-# remove this with the next version update
-distname            d-programming-language.org-${version}
-
 depends_lib         port:phobos
 
 use_configure       no

Modified: trunk/dports/lang/dmd-tools/Portfile
===================================================================
--- trunk/dports/lang/dmd-tools/Portfile	2014-03-03 23:04:49 UTC (rev 117568)
+++ trunk/dports/lang/dmd-tools/Portfile	2014-03-04 00:16:55 UTC (rev 117569)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 PortGroup           github 1.0
 
-github.setup        D-Programming-Language tools 2.064 v
+github.setup        D-Programming-Language tools 2.065
 name                dmd-${github.project}
 categories          lang
 platforms           darwin
@@ -17,29 +17,25 @@
     and modeling power, with safety and programmer productivity. \
     This port provides the ancilliary tools for the D programming language compiler.
 homepage            http://dlang.org/
-checksums           rmd160  6fd7af3edbe6d13c3a7aeb7ab5c99415b6030673 \
-                    sha256  45be05a4e66fab2c44c0b8bff1732755f2f6ceef5228eb40e3d9dc256878cb0f
+checksums           rmd160  2aaaa9711b77a97e6d65beed5857ec3bea0237df \
+                    sha256  a79d8afda8f2876219dd8de10027812b989985432492bf747e09f8181dc05c3d
 
-depends_lib         port:phobos
+depends_lib         port:phobos \
+                    lib:libcurl:curl
 depends_build       port:dmd-doc
 
 use_configure       no
 
 set bin "catdoc ddemangle detab findtags rdmd tolf"
 set dmd ${prefix}/bin/dmd
-set dflags "-O -d"
 
 if {${build_arch} eq "x86_64"} {
     set model 64
 } else {
     set model 32
 }
+set dflags "-m${model} -O -d"
 
-build.args          -f posix.mak \
-                    CC=${configure.cc} \
-                    DFLAGS=${dflags} \
-                    DMD=${dmd} \
-                    MODEL=${model}
 build {
     system -W ${worksrcpath} "
         for f in ${bin}; do
@@ -53,8 +49,14 @@
         "
     }
     system -W ${worksrcpath} "${dmd} ${dflags} -J. dman.d"
+    foreach f {dget changed} {
+        system -W ${worksrcpath} "
+            ${dmd} ${dflags} -of${f} ${f}.d -L-lcurl
+        "
+    }
+    system -W ${worksrcpath}/DustMite "${dmd} ${dflags} dustmite.d dsplit.d -ofdustmite"
 }
 
 destroot {
-    eval xinstall -W ${worksrcpath} -m 755 "${bin} dman" ${destroot}${prefix}/bin
+    eval xinstall -W ${worksrcpath} -m 755 "${bin} dman dget changed DustMite/dustmite" ${destroot}${prefix}/bin
 }

Modified: trunk/dports/lang/druntime/Portfile
===================================================================
--- trunk/dports/lang/druntime/Portfile	2014-03-03 23:04:49 UTC (rev 117568)
+++ trunk/dports/lang/druntime/Portfile	2014-03-04 00:16:55 UTC (rev 117569)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 PortGroup           github 1.0
 
-github.setup        D-Programming-Language druntime 2.064 v
+github.setup        D-Programming-Language druntime 2.065
 categories          lang
 platforms           darwin
 license             Boost-1
@@ -17,8 +17,8 @@
     startup/shutdown, etc.
 homepage            http://dlang.org/
 
-checksums           rmd160  ad0b6154da718ecc703b86066e22297709fa23bd \
-                    sha256  2efe394029457c58ec1f0626322078bded00955fe9c8d3e78c885abba9bc8f7e
+checksums           rmd160  bf4b341287b6fa13c060b82856ba2065d5722a26 \
+                    sha256  3140edaac0f48ec995a69d3cf615bcb0f209640380a9f9e6acd7b5480c489bfe
 
 depends_lib         port:dmd
 
@@ -34,12 +34,20 @@
                     CC=${configure.cc} \
                     DMD=${prefix}/bin/dmd \
                     MODEL=${model} \
+                    DRUNTIME_BASE=${name} \
                     CFLAGS=\"${configure.cflags}\"
-build.target
+build.target        ""
 
 destroot {
-    xinstall -m 644 ${worksrcpath}/lib/libdruntime-osx${model}.a \
-        ${destroot}${prefix}/lib/libdruntime.a
+    xinstall -m 644 ${worksrcpath}/lib/lib${name}.a ${destroot}${prefix}/lib
     xinstall -m 755 -d ${destroot}${prefix}/include
     file copy ${worksrcpath}/import ${destroot}${prefix}/include/${name}
+    xinstall -m 755 -d ${destroot}${prefix}/include/${name}/src
+    file copy ${worksrcpath}/src/test_runner.d ${destroot}${prefix}/include/${name}/src
+    xinstall -m 755 -d ${destroot}${prefix}/share/doc
+    xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
+    file copy ${worksrcpath}/LICENSE ${destroot}${prefix}/share/doc/${name}
+    foreach f [glob ${worksrcpath}/doc/*] {
+        file copy ${f} ${destroot}${prefix}/share/doc/${name}
+    }
 }

Modified: trunk/dports/lang/phobos/Portfile
===================================================================
--- trunk/dports/lang/phobos/Portfile	2014-03-03 23:04:49 UTC (rev 117568)
+++ trunk/dports/lang/phobos/Portfile	2014-03-04 00:16:55 UTC (rev 117569)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 PortGroup           github 1.0
 
-github.setup        D-Programming-Language phobos 2.064 v
+github.setup        D-Programming-Language phobos 2.065
 categories          lang
 platforms           darwin
 license             Boost-1
@@ -14,11 +14,13 @@
     Phobos is the standard runtime library that comes with the D language compiler.
 homepage            http://dlang.org/
 
-checksums           rmd160  f963b11a3cffea073cb1e040381cd0d6338238ff \
-                    sha256  b1f4896d28650f3cce9b60a0b33801fcb6247e72dc9ad80a2e3eb765438c50d2
+checksums           rmd160  a863a32c02bb3bb9135a42ee59da81256b203dac \
+                    sha256  fcaca9d7cc9ad1b2e3bf34e008dac1187533c36c4eca5ba81b4d9486f03808db
 
 depends_lib         port:druntime
 
+patchfiles          patch-gzlib.c.diff \
+                    patch-posix.mak.diff
 post-patch {
     reinplace "s|-m\$(MODEL)||" ${worksrcpath}/posix.mak
     reinplace "s|/import||" ${worksrcpath}/posix.mak
@@ -32,10 +34,15 @@
     set model 32
 }
 
+pre-build {
+    file mkdir ${workpath}/dmd
+    system "echo ${version} > ${workpath}/dmd/VERSION"
+}
 build.args          -f posix.mak \
                     DRUNTIME=${prefix}/lib/libdruntime.a \
+                    DRUNTIME_PATH=${prefix}/include/druntime \
                     CC=${configure.cc} \
-                    CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
+                    CFLAGS="${configure.cppflags} ${configure.cflags} [get_canonical_archflags cc]" \
                     DMD=${prefix}/bin/dmd \
                     DFLAGS="-w -d -m${model} -O -release" \
                     MODEL=${model}

Added: trunk/dports/lang/phobos/files/patch-gzlib.c.diff
===================================================================
--- trunk/dports/lang/phobos/files/patch-gzlib.c.diff	                        (rev 0)
+++ trunk/dports/lang/phobos/files/patch-gzlib.c.diff	2014-03-04 00:16:55 UTC (rev 117569)
@@ -0,0 +1,11 @@
+--- etc/c/zlib/gzlib.c.orig	2014-02-16 12:22:42.000000000 +0900
++++ etc/c/zlib/gzlib.c	2014-03-01 18:41:59.000000000 +0900
+@@ -2,7 +2,7 @@
+  * Copyright (C) 2004, 2010 Mark Adler
+  * For conditions of distribution and use, see copyright notice in zlib.h
+  */
+-
++#include <unistd.h>
+ #include "gzguts.h"
+ 
+ #if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0

Added: trunk/dports/lang/phobos/files/patch-posix.mak.diff
===================================================================
--- trunk/dports/lang/phobos/files/patch-posix.mak.diff	                        (rev 0)
+++ trunk/dports/lang/phobos/files/patch-posix.mak.diff	2014-03-04 00:16:55 UTC (rev 117569)
@@ -0,0 +1,11 @@
+--- posix.mak.orig	2014-02-16 12:22:42.000000000 +0900
++++ posix.mak	2014-03-03 11:14:06.000000000 +0900
+@@ -274,7 +274,7 @@
+ 	@[ -d $(dir $@) ] || mkdir -p $(dir $@) || [ -d $(dir $@) ]
+ 	$(CC) -c $(CFLAGS) $< -o$@
+ 
+-$(LIB) : $(OBJS) $(ALL_D_FILES) druntime_libs
++$(LIB) : $(OBJS) $(ALL_D_FILES)
+ 	$(DMD) $(DFLAGS) -lib -of$@ $(DRUNTIME) $(D_FILES) $(OBJS)
+ 
+ dll : $(ROOT)/libphobos2.so

    

takeshi＠macports.org

tags

participants (1)