Modified: trunk/dports/lang/dmd-tools/Portfile (148219 => 148220)

--- trunk/dports/lang/dmd-tools/Portfile	2016-04-30 15:40:28 UTC (rev 148219)
+++ trunk/dports/lang/dmd-tools/Portfile	2016-04-30 15:43:58 UTC (rev 148220)
@@ -3,6 +3,7 @@
 
 PortSystem          1.0
 PortGroup           github 1.0
+PortGroup           muniversal 1.0
 
 github.setup        D-Programming-Language tools 2.069.2 v
 name                dmd-${github.project}
@@ -27,23 +28,36 @@
 
 use_configure       no
 
-if {${build_arch} eq "x86_64"} {
-    set model 64
-} else {
-    set model 32
-}
+patchfiles          patch-posix.diff
 
 build.args          -f posix.mak \
                     DRUNTIME=${prefix}/lib/libdruntime.a \
                     DRUNTIME_PATH=${prefix}/include/druntime \
-                    DMD=${prefix}/bin/dmd \
-                    DFLAGS="-w -d -m${model} -O -release" \
-                    MODEL=${model}
+                    DMD=${prefix}/bin/dmd
 build.target        ""
 
-destroot.args       -f posix.mak \
-                    INSTALL_DIR=${destroot}${prefix} \
-                    MODEL=${model}
+destroot.args       -f posix.mak PREFIX=${prefix}
+
+if { ![variant_isset universal] } {
+    if { ${build_arch} eq "x86_64" || ${build_arch} eq "ppc64" } {
+        build.args-append    MODEL=64
+        destroot.args-append MODEL=64
+    } else {
+        build.args-append    MODEL=32
+        destroot.args-append MODEL=32
+    }
+} else {
+    lappend merger_build_args(x86_64)    MODEL=64
+    lappend merger_build_args(i386)      MODEL=32
+    lappend merger_build_args(ppc64)     MODEL=64
+    lappend merger_build_args(ppc)       MODEL=32
+
+    lappend merger_destroot_args(x86_64) MODEL=64
+    lappend merger_destroot_args(i386)   MODEL=32
+    lappend merger_destroot_args(ppc64)  MODEL=64
+    lappend merger_destroot_args(ppc)    MODEL=32
+}
+
 post-destroot {
     xinstall -W ${worksrcpath} -m 644 man/man1/rdmd.1 ${destroot}${prefix}/share/man/man1
 }