Revision
124906
Author
ryandesign@macports.org
Date
2014-08-30 15:49:47 -0700 (Sat, 30 Aug 2014)

Log Message

angband: remove unused ncurses and cctools dependencies in aqua variant; remove unused imake dependency in x11 variant; x11 and aqua variants conflict; aqua variant has supported_archs i386 x86_64 and requires universal variant; use ${applications_dir} in aqua variant and create lib/info directory in the right place using destroot.keepdirs; aqua variant doesn't need to run configure script; remove unrecognized --with-libpath configure argument; use port:-style dependency for xorg-libXaw in x11 variant

Modified Paths

Diff

Modified: trunk/dports/games/angband/Portfile (124905 => 124906)


--- trunk/dports/games/angband/Portfile	2014-08-30 21:08:33 UTC (rev 124905)
+++ trunk/dports/games/angband/Portfile	2014-08-30 22:49:47 UTC (rev 124906)
@@ -19,45 +19,49 @@
 dungeon, kill monsters, try to equip yourself with the best weapons and \
 armor you can find, and finally face Morgoth - The Dark Enemy.
 
-homepage            http://rephial.org
+homepage            http://rephial.org/
+master_sites        ${homepage}downloads/${branch}
 
-master_sites        http://rephial.org/downloads/${branch}
-
 distname            ${name}-v${version}
 
 checksums           rmd160  c017577796c8a3d9d1455108678118d2f137f020 \
                     sha256  3d3c3a8839ef97613d5e29c116c5e88c93b913485768106ad4906c75069085ec
 
-depends_lib-append  port:ncurses
+if {![variant_isset aqua]} {
+    depends_lib-append  port:ncurses
+}
 
 post-patch {
     addgroup games
 }
 
-configure.args      --with-setgid=games --with-libpath=${prefix}/var/games/angband --bindir=${prefix}/bin --without-x
+configure.args      --with-setgid=games --bindir=${prefix}/bin --without-x
 
 notes "
-If you receive this error 'Angband requires UTF-8 support', you need to set
+If you receive the error 'Angband requires UTF-8 support', you need to set\
 LANG to a valid UTF-8 language such as:
+
 export LANG=en_US.UTF-8
 "
 
-variant x11 {
-    depends_build-append  port:imake
-    depends_lib-append lib:libXaw:xorg-libXaw
-    configure.args-delete --without-x
-    configure.args-append --with-x
+variant x11 conflicts aqua {
+    depends_lib-append      port:xorg-libXaw
+
+    configure.args-replace  --without-x --with-x
 }
 
-variant aqua description {Build the Cocoa front-end} {
-    depends_build-append  port:cctools
+variant aqua conflicts x11 requires universal description {Build the Cocoa front-end} {
+    # Makefile.osx hardcodes an x86_64/i386 universal build
+    supported_archs         i386 x86_64
+
+    use_configure           no
+
     build {
         system -W ${worksrcpath}/src "make -f Makefile.osx"
     }
 
+    destroot.keepdirs       ${destroot}${applications_dir}/Angband.app/Contents/Resources/lib/info
     destroot {
-         xinstall -d ${destroot}/Applications/MacPorts/
-         system "cp -r ${worksrcpath}/Angband.app ${destroot}/Applications/MacPorts/." }
-         xinstall -d ${destroot}/Applications/MacPorts/Resources/lib/info
+        copy ${worksrcpath}/Angband.app ${destroot}${applications_dir}
+    }
 }
-