Ticket #47807: ljpeg-turbo.diff

graphics/libjpeg-turbo/Portfile

@@ -4 +4 @@
 PortGroup           muniversal 1.0
 
 name                libjpeg-turbo
-version             1.3.1
+version             1.4.0
 categories          graphics
 conflicts           jpeg mozjpeg
 platforms           darwin
@@ -18 +18 @@
 license             BSD
 homepage            http://www.${name}.org
 master_sites        sourceforge:project/${name}/${version}/
+checksums           rmd160  25234e8f0ee7d1f5fa77868e161ecdf66091b064 \
+                    sha256  d93ad8546b510244f863b39b4c0da0fa4c0d53a77b61a8a3880f258c232bbbee
 
-checksums           rmd160  ee7989a93ff6ba2426e113ce62c69fc9184db0ae \
-                    sha256  c132907417ddc40ed552fe53d6b91d5fecbb14a356a60ddc7ea50d6be9666fb9
-
-depends_lib         port:nasm
+depends_build       bin:nasm:nasm
 use_autoreconf      yes
 autoreconf.args     -fvi
 
 configure.args-append   --with-jpeg8 NASM=${prefix}/bin/nasm
-switch ${build_arch} {
-    i386 {
-        configure.args-append --host i686-apple-darwin
-    }
-    x86_64 {
-        configure.args-append --host x86_64-apple-darwin
-    }
+if {[variant_exists universal] && [variant_isset universal]} {
+    set merger_host(x86_64) x86_64-apple-${os.platform}${os.major}
+    set merger_host(i386) i686-apple-${os.platform}${os.major}
+    set merger_configure_args(x86_64) --build=x86_64-apple-${os.platform}${os.major}
+    set merger_configure_args(i386) --build=i686-apple-${os.platform}${os.major}
 }
 
 post-destroot {