librsvg: use cargo PG

macports · Apr 27, 2018 · 968ddf5 · 968ddf5
1 parent 20e585f
commit 968ddf5
Showing 1 changed file with 3 additions and 27 deletions.
diff --git a/graphics/librsvg/Portfile b/graphics/librsvg/Portfile
@@ -64,36 +64,12 @@ if {${os.platform} eq "darwin" && ${os.major} < 13} {
                     port:cargo \
                     port:rust
 } else {
-    PortGroup           muniversal 1.0
+    PortGroup       cargo 1.0
+
+    cargo.worksrcdir_crates yes
 
     # when CARGO_BUILD_TARGET is set, directory structure changes
     patchfiles-append   patch-configure-rust_target_subdir.diff
-
-    if {![variant_isset universal]} {
-        if {${build_arch} eq "i386"} {
-            set arch_name i686
-        } else {
-            set arch_name ${build_arch}
-        }
-        set rust_platform ${arch_name}-apple-${os.platform}
-        configure.env-append \
-            CARGO_BUILD_TARGET=${rust_platform}
-        build.env-append \
-            CARGO_BUILD_TARGET=${rust_platform}
-    } else {
-        foreach arch ${universal_archs} {
-            if {${arch} eq "i386"} {
-                set arch_name i686
-            } else {
-                set arch_name ${build_arch}
-            }
-            set rust_platform ${arch_name}-apple-${os.platform}
-            lappend merger_configure_env(${arch}) \
-                CARGO_BUILD_TARGET=${rust_platform}
-            lappend merger_build_env(${arch}) \
-                CARGO_BUILD_TARGET=${rust_platform}
-        }
-    }
 }
 
 gobject_introspection yes