Revision
60953
Author
blb@macports.org
Date
2009-11-29 13:07:01 -0800 (Sun, 29 Nov 2009)

Log Message

games/freeciv and games/freeciv-x11 - update to 2.1.10, properly note they conflict with one another

Modified Paths

Diff

Modified: trunk/dports/games/freeciv/Portfile (60952 => 60953)


--- trunk/dports/games/freeciv/Portfile	2009-11-29 20:54:03 UTC (rev 60952)
+++ trunk/dports/games/freeciv/Portfile	2009-11-29 21:07:01 UTC (rev 60953)
@@ -3,7 +3,7 @@
 
 PortSystem          1.0
 name                freeciv
-version             2.1.9
+version             2.1.10
 categories          games
 maintainers         nomaintainer
 description         An empire-building strategy game
@@ -19,17 +19,15 @@
 master_sites        sourceforge ftp://ftp.freeciv.org/freeciv/stable/
 use_bzip2           yes
 
-checksums           md5     caffaa201b2f5dfdfe00b6e6c3f32fb1 \
-                    sha1    01a3500a9d0f9d9c9b95b7c4b57f2446f671a900 \
-                    rmd160  cbe12facbbf00a85410e1324eb6ba3f2351ea1f1
+checksums           md5     a2aa9b247d7f1581eff9e66786f4f747 \
+                    sha1    94a0e9039d12142394df30148a7e1edd685da058 \
+                    rmd160  ce9a35a984b7130d04d2df37ccb7f61648143062
 
+conflicts           freeciv-x11
+
 depends_lib         port:freetype port:libpng port:libsdl port:libsdl_image \
                     port:libsdl_mixer port:readline port:libiconv port:zlib
 
-pre-fetch {
-   ui_msg  "Please note that this port conflicts with port:freeciv-x11."
-}
-
 configure.args      --enable-client=sdl --with-readline --with-zlib \
                     --enable-nls --with-libiconv-prefix=${prefix} \
                     --with-sdl-prefix=${prefix} --mandir=${prefix}/share/man

Modified: trunk/dports/games/freeciv-x11/Portfile (60952 => 60953)


--- trunk/dports/games/freeciv-x11/Portfile	2009-11-29 20:54:03 UTC (rev 60952)
+++ trunk/dports/games/freeciv-x11/Portfile	2009-11-29 21:07:01 UTC (rev 60953)
@@ -2,7 +2,7 @@
 
 PortSystem          1.0
 name                freeciv-x11
-version             2.1.9
+version             2.1.10
 categories          games
 maintainers         nomaintainer
 description         A civilisation clone for X11
@@ -20,10 +20,12 @@
 dist_subdir         freeciv
 use_bzip2           yes
 
-checksums           md5     caffaa201b2f5dfdfe00b6e6c3f32fb1 \
-                    sha1    01a3500a9d0f9d9c9b95b7c4b57f2446f671a900 \
-                    rmd160  cbe12facbbf00a85410e1324eb6ba3f2351ea1f1
+checksums           md5     a2aa9b247d7f1581eff9e66786f4f747 \
+                    sha1    94a0e9039d12142394df30148a7e1edd685da058 \
+                    rmd160  ce9a35a984b7130d04d2df37ccb7f61648143062
 
+conflicts           freeciv
+
 depends_lib         port:gettext port:libiconv port:readline port:gtk2 \
                     port:zlib