[89057] trunk/dports/games

[ryandesign at macports.org]

Revision: 89057
          http://trac.macports.org/changeset/89057
Author:   ryandesign at macports.org
Date:     2012-01-18 17:03:20 -0800 (Wed, 18 Jan 2012)
Log Message:
-----------
freeciv: incorporate freeciv-x11 as a subport

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

Removed Paths:
-------------
    trunk/dports/games/freeciv-x11/

Modified: trunk/dports/games/freeciv/Portfile
===================================================================
--- trunk/dports/games/freeciv/Portfile	2012-01-19 00:57:21 UTC (rev 89056)
+++ trunk/dports/games/freeciv/Portfile	2012-01-19 01:03:20 UTC (rev 89057)
@@ -2,11 +2,9 @@
 # $Id$
 
 PortSystem          1.0
-PortGroup           app 1.0
 
 name                freeciv
 version             2.3.0
-revision            1
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          games
 maintainers         nomaintainer
@@ -17,8 +15,6 @@
    and your mission is to lead your tribe from the stone age to the space \
    age...
 
-platforms           macosx
-
 homepage            http://www.freeciv.org/
 master_sites        sourceforge:project/${name}/Freeciv%20${branch}/${version}/ \
                     ftp://ftp.freeciv.org/freeciv/stable/
@@ -27,21 +23,54 @@
 checksums           rmd160  1f017139c5ac4c24d1b4b6767aca84e18b9db31b \
                     sha256  f380f7f89a3478e8b2a68033b37325539248618508d94edf55b84e5e979fbefa
 
-conflicts           freeciv-x11
+depends_lib         port:libiconv \
+                    port:libsdl_mixer \
+                    port:readline \
+                    port:zlib
 
-depends_lib         port:freetype port:libpng port:libsdl port:libsdl_image \
-                    port:libsdl_mixer port:readline port:libiconv port:zlib
-
 patchfiles          patch-client-options.c.diff
 
-configure.args      --enable-client=sdl --with-readline \
+configure.args      --with-readline \
                     --enable-nls --with-libiconv-prefix=${prefix} \
                     --mandir=${prefix}/share/man --with-sdl-prefix=${prefix} \
                     --disable-sdltest
 
-app.executable      freeciv-sdl
-app.icon            data/icons/128x128/freeciv-client.png
+subport freeciv {
+    conflicts               freeciv-x11
+    
+    revision                1
+    
+    platforms               macosx
+    
+    depends_lib-append      port:freetype \
+                            port:libpng \
+                            port:libsdl \
+                            port:libsdl_image
+    
+    configure.args-append   --enable-client=sdl
+    
+    PortGroup               app 1.0
+    app.executable          freeciv-sdl
+    app.icon                data/icons/128x128/freeciv-client.png
+}
 
-livecheck.type      regex
-livecheck.url       ${homepage}
-livecheck.regex     freeciv-(\[0-9\.\]+).tar.bz2
+subport freeciv-x11 {
+    conflicts               freeciv
+    
+    platforms               darwin
+    
+    depends_build-append    port:pkgconfig
+    
+    depends_lib-append      port:gettext \
+                            port:gtk2
+    
+    configure.args-append   --enable-client=gtk2 \
+                            --disable-gtktest
+}
+
+if {${name} == ${subport}} {
+    livecheck.type          regex
+    livecheck.regex         ${name}-(\[0-9.\]+)${extract.suffix}
+} else {
+    livecheck.type          none
+}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120118/e43f8682/attachment-0001.html>