[94484] trunk/dports/games/wesnoth
ryandesign at macports.org
ryandesign at macports.org
Wed Jun 20 11:43:52 PDT 2012
Revision: 94484
https://trac.macports.org/changeset/94484
Author: ryandesign at macports.org
Date: 2012-06-20 11:43:52 -0700 (Wed, 20 Jun 2012)
Log Message:
-----------
wesnoth: update to 1.10.3 (#33655)
Modified Paths:
--------------
trunk/dports/games/wesnoth/Portfile
Added Paths:
-----------
trunk/dports/games/wesnoth/files/patch-cmake-FindFriBiDi.cmake.diff
Removed Paths:
-------------
trunk/dports/games/wesnoth/files/patch-configure.ac.diff
trunk/dports/games/wesnoth/files/patch-m4-boost.m4.diff
Modified: trunk/dports/games/wesnoth/Portfile
===================================================================
--- trunk/dports/games/wesnoth/Portfile 2012-06-20 18:33:39 UTC (rev 94483)
+++ trunk/dports/games/wesnoth/Portfile 2012-06-20 18:43:52 UTC (rev 94484)
@@ -2,9 +2,10 @@
PortSystem 1.0
PortGroup app 1.0
+PortGroup cmake 1.0
name wesnoth
-version 1.8.6
+version 1.10.3
set branch [join [lrange [split ${version} .] 0 1] .]
categories games
platforms darwin
@@ -14,7 +15,6 @@
master_sites sourceforge:project/wesnoth/wesnoth-${branch}/wesnoth-${version}
use_bzip2 yes
use_parallel_build yes
-supported_archs i386 ppc
description A fantasy turn-based strategy game
@@ -26,10 +26,11 @@
levels, and are carried over from one scenario to the \
next campaign.
-checksums rmd160 2190efe45d554df59052db1a58fcc3bdf766c47e \
- sha256 4fe603fa984ac76a384dc94ba28bd99fe2d1adf02ddf1706f2fa1b82b40f8081
+checksums rmd160 d27f5771a2311b7ea0d0eca57491a33c8e44fb5a \
+ sha256 b348f99c0ef810fb1f59b5e6ac6f0bb376922edb2552f4a11eb03b5cc658da78
-depends_build port:pkgconfig
+depends_build-append port:pkgconfig
+
depends_lib port:xorg-libX11 \
port:boost \
path:lib/pkgconfig/sdl.pc:libsdl \
@@ -46,23 +47,12 @@
port:gettext \
port:zlib
-patchfiles patch-m4-boost.m4.diff \
- patch-configure.ac.diff
+patchfiles patch-cmake-FindFriBiDi.cmake.diff
-use_autoreconf yes
+post-patch {
+ reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/cmake/FindFriBiDi.cmake
+}
-configure.args --with-libiconv-prefix=${prefix} \
- --with-libintl-prefix=${prefix} \
- --with-zlib-prefix=${prefix} \
- --disable-dbus \
- --disable-desktop-entry \
- --disable-sdltest \
- --disable-server \
- --disable-strict-compilation \
- --with-boost=${prefix}
-
-configure.cppflags-append -DBOOST_IOSTREAMS_USE_DEPRECATED
-
app.icon icons/wesnoth-icon-Mac.png
livecheck.type sourceforge
Added: trunk/dports/games/wesnoth/files/patch-cmake-FindFriBiDi.cmake.diff
===================================================================
--- trunk/dports/games/wesnoth/files/patch-cmake-FindFriBiDi.cmake.diff (rev 0)
+++ trunk/dports/games/wesnoth/files/patch-cmake-FindFriBiDi.cmake.diff 2012-06-20 18:43:52 UTC (rev 94484)
@@ -0,0 +1,20 @@
+--- cmake/FindFriBiDi.cmake.orig 2011-03-06 04:09:51.000000000 -0600
++++ cmake/FindFriBiDi.cmake 2012-06-20 12:30:11.000000000 -0500
+@@ -19,15 +19,14 @@
+ # Set variable in temp var, otherwise FIND_PATH might fail
+ # unset isn't present in the required version of cmake.
+ FIND_PATH(xFRIBIDI_INCLUDE_DIR fribidi.h
+- /usr/local/include/fribidi
+- /usr/include/fribidi
++ @PREFIX@/include/fribidi
+ )
+ set(FRIBIDI_INCLUDE_DIR ${xFRIBIDI_INCLUDE_DIR})
+
+ SET(FRIBIDI_NAMES ${FRIBIDI_NAMES} fribidi libfribidi)
+ FIND_LIBRARY(FRIBIDI_LIBRARY
+ NAMES ${FRIBIDI_NAMES}
+- PATHS /usr/lib /usr/local/lib
++ PATHS @PREFIX@/lib
+ )
+
+ IF (FRIBIDI_LIBRARY AND FRIBIDI_INCLUDE_DIR)
Deleted: trunk/dports/games/wesnoth/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/games/wesnoth/files/patch-configure.ac.diff 2012-06-20 18:33:39 UTC (rev 94483)
+++ trunk/dports/games/wesnoth/files/patch-configure.ac.diff 2012-06-20 18:43:52 UTC (rev 94484)
@@ -1,30 +0,0 @@
---- configure.ac.orig 2010-09-25 03:37:41.000000000 +1000
-+++ configure.ac 2011-08-15 14:42:09.000000000 +1000
-@@ -769,11 +769,12 @@
-
- CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
- CFLAGS="$CFLAGS $SDL_CFLAGS"
--LIBS="$LIBS $SDL_LIBS $SDL_IMAGE_LIBS -lz"
-+LIBS="`echo $LIBS $SDL_LIBS $SDL_IMAGE_LIBS -lz | sed 's/-lSDLmain//'`"
-
- ac_link="$LDPREFIX $ac_link"
- AC_RUN_IFELSE([AC_LANG_SOURCE([
- #include <SDL_image.h>
-+#undef main
- #include <stdlib.h>
-
- int main(int argc, char **argv)
-@@ -813,11 +814,12 @@
-
- CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
- CFLAGS="$CFLAGS $SDL_CFLAGS"
-- LIBS="$LIBS $SDL_LIBS $SDL_MIXER_LIBS"
-+ LIBS="`echo $LIBS $SDL_LIBS $SDL_MIXER_LIBS | sed 's/-lSDLmain//'`"
-
- ac_link="$LDPREFIX $ac_link"
- AC_RUN_IFELSE([AC_LANG_SOURCE([
- #include <SDL_mixer.h>
-+ #undef main
- #include <stdlib.h>
-
- int main(int argc, char **argv)
Deleted: trunk/dports/games/wesnoth/files/patch-m4-boost.m4.diff
===================================================================
--- trunk/dports/games/wesnoth/files/patch-m4-boost.m4.diff 2012-06-20 18:33:39 UTC (rev 94483)
+++ trunk/dports/games/wesnoth/files/patch-m4-boost.m4.diff 2012-06-20 18:43:52 UTC (rev 94484)
@@ -1,18 +0,0 @@
---- m4/boost.m4.orig 2010-05-27 02:42:52.000000000 -0500
-+++ m4/boost.m4 2010-09-14 02:32:34.000000000 -0500
-@@ -96,7 +96,6 @@
- && B_V_MIN == $boost_version_minor \
- && B_V_SUB < $boost_version_subminor)"
- for boost_dir in "$with_boost/include" '' \
-- /opt/local/include /usr/local/include /opt/include /usr/include \
- "$with_boost" C:/Boost/include
- do
- # Without --layout=system, Boost (or at least some versions) installs
-@@ -301,7 +300,6 @@
- boost_tmp_lib=$with_boost
- test x"$with_boost" = x && boost_tmp_lib=${boost_cv_inc_path%/include}
- for boost_ldpath in "$boost_tmp_lib/lib" '' \
-- /opt/local/lib /usr/local/lib /opt/lib /usr/lib \
- "$with_boost" C:/Boost/lib /lib /usr/lib64 /lib64
- do
- test -e "$boost_ldpath" || continue
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120620/b52b8a15/attachment.html>
More information about the macports-changes
mailing list