[146369] trunk/dports/games/angband/Portfile

ryandesign at macports.org ryandesign at macports.org
Sun Mar 6 10:12:55 PST 2016


Revision: 146369
          https://trac.macports.org/changeset/146369
Author:   ryandesign at macports.org
Date:     2016-03-06 10:12:54 -0800 (Sun, 06 Mar 2016)
Log Message:
-----------
angband: make the aqua variant available on Darwin only; fixes parsing error on non-Darwin systems

Modified Paths:
--------------
    trunk/dports/games/angband/Portfile

Modified: trunk/dports/games/angband/Portfile
===================================================================
--- trunk/dports/games/angband/Portfile	2016-03-06 16:27:05 UTC (rev 146368)
+++ trunk/dports/games/angband/Portfile	2016-03-06 18:12:54 UTC (rev 146369)
@@ -29,10 +29,6 @@
                     port:automake \
                     port:libtool
 
-if {![variant_isset aqua]} {
-    depends_lib-append  port:ncurses
-}
-
 post-patch {
     addgroup games
 }
@@ -50,31 +46,38 @@
 "
 
 variant x11 conflicts aqua universal {
-    depends_lib-append      port:xorg-libXaw
+    depends_lib-append      port:ncurses \
+                            port:xorg-libXaw
 
     configure.args-replace  --without-x --with-x
 }
 
-variant aqua conflicts x11 requires universal description {Build the Cocoa front-end} {
-    # Makefile.osx hardcodes an i386/x86_64 universal build
-    supported_archs         i386 x86_64
-    configure.universal_archs i386 x86_64
+if {${os.platform} ne "darwin"} {
+    default_variants +x11
+}
 
-    use_configure           no
+platform darwin {
+    variant aqua conflicts x11 requires universal description {Build the Cocoa front-end} {
+        # Makefile.osx hardcodes an i386/x86_64 universal build
+        supported_archs         i386 x86_64
+        configure.universal_archs i386 x86_64
 
-    build {
-        system -W ${worksrcpath}/src "make -f Makefile.osx"
+        use_configure       no
+
+        build {
+            system -W ${worksrcpath}/src "make -f Makefile.osx"
+        }
+
+        destroot.keepdirs   ${destroot}${applications_dir}/Angband.app/Contents/Resources/lib/info
+        destroot {
+            copy ${worksrcpath}/Angband.app ${destroot}${applications_dir}
+        }
     }
 
-    destroot.keepdirs       ${destroot}${applications_dir}/Angband.app/Contents/Resources/lib/info
-    destroot {
-        copy ${worksrcpath}/Angband.app ${destroot}${applications_dir}
+    if {![variant_isset x11]} {
+        default_variants +aqua +universal
     }
 }
 
-if {![variant_isset x11]} {
-    default_variants +aqua +universal
-}
-
 livecheck.type      regex
 livecheck.regex     ${name}-v(\[0-9.\]+)${extract.suffix}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160306/a2adfc89/attachment.html>


More information about the macports-changes mailing list