Ticket #48862: astyle-2.05.1.diff

Portfile

@@ -2 +2 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup           java 1.0
+PortGroup           muniversal 1.0
 
 name                astyle
-version             2.04
+version             2.05.1
 categories          devel
 license             LGPL-3+
 platforms           darwin
@@ -16 +18 @@
                     programming languages.
 
 homepage            http://astyle.sourceforge.net
-master_sites        sourceforge::macosx
-distfiles           ${name}_${version}_macosx.tar.gz:macosx
-checksums           rmd160  3acff3f6d604c50a4762db9bce8c5cb18088c4a0 \
-                    sha256  e0ba90723463172fd8a063897092284993eeebb87c63cf26ee36f555b0d89368
+master_sites        sourceforge:project/astyle/astyle/astyle%20${version}
+distname            ${name}_${version}_macosx
+checksums           rmd160  d153c0004c7a5d44dc68f235b5baa36e988afab3 \
+                    sha256  de66da286dee2b9de1dc1c05092cbf5368c0889f25d1e2ee8b51766aff8e4baf
 
 worksrcdir          ${name}/build/mac
+
 patchfiles          patch-Makefile.diff
+
 use_configure       no
-conflicts           astyle-dev
 
-variant universal   {}
+build.args-append   prefix=${prefix}
 
-build.target        release
-build.args-append   prefix=${prefix} \
-                    CXX="${configure.cxx} [get_canonical_archflags cxx]"
-
+destroot.target-append \
+                    install-lib
 destroot.args-append \
-                    prefix=${prefix} \
-                    CXX="${configure.cxx} [get_canonical_archflags cxx]"
+                    prefix=${prefix}
 
-variant lib description {Build and install the libraries} {
-    build.target-append shared static
-    destroot.target-append install-lib
+foreach arch ${configure.universal_archs} {
+    lappend merger_build_args(${arch}) CXX='${configure.cxx} -arch ${arch}'
+    lappend merger_destroot_args(${arch}) CXX='${configure.cxx} -arch ${arch}'
 }
 
+if {![variant_isset universal]} {
+    if {[info exists merger_build_args(${configure.build_arch})]} {
+        build.args-append $merger_build_args(${configure.build_arch})
+    }
+    if {[info exists merger_destroot_args(${configure.build_arch})]} {
+        destroot.args-append $merger_destroot_args(${configure.build_arch})
+    }
+}
+
 variant java description {Build and install the JNI library} {
     build.target-append java
     destroot.target-append install-jnilib