[csw-devel] SF.net SVN: gar:[17789] csw/mgar/pkg/wesnoth/trunk

[jake_goerzen at users.sourceforge.net]

Revision: 17789
          http://gar.svn.sourceforge.net/gar/?rev=17789&view=rev
Author:   jake_goerzen
Date:     2012-04-20 17:57:09 +0000 (Fri, 20 Apr 2012)
Log Message:
-----------
wesnoth/trunk: update to version 1.10.2

Modified Paths:
--------------
    csw/mgar/pkg/wesnoth/trunk/Makefile
    csw/mgar/pkg/wesnoth/trunk/checksums

Modified: csw/mgar/pkg/wesnoth/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wesnoth/trunk/Makefile	2012-04-20 13:04:52 UTC (rev 17788)
+++ csw/mgar/pkg/wesnoth/trunk/Makefile	2012-04-20 17:57:09 UTC (rev 17789)
@@ -1,5 +1,8 @@
+# NOTE: Autotools build depreciated switching to cmake.
+# NOTE: cmake finds boost library but "mgar build" step can't find boost 
+#	headers and setting EXTRA_INC or EXTRA_CPPFLAGS doesn't help.
 NAME = wesnoth
-VERSION = 1.6.5
+VERSION = 1.10.2
 CATEGORIES = apps
 GARTYPE = v2
 
@@ -16,53 +19,20 @@
 UPSTREAM_USE_SF = 1
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*)
 
-PATCHFILES = language.cpp.diff
-PATCHFILES += configure.diff
-PATCHFILES += global.hpp.diff
-PATCHFILES += generator_private.hpp.diff
-PATCHFILES += image.cpp.diff
-PATCHFILES += marked-up_text.cpp.diff
-PATCHFILES += simple_wml.cpp.diff
-PATCHFILES += time.hpp.diff
+NOGITPATCH = 1
 
-RUNTIME_DEP_PKGS_CSWwesnoth = CSWboostrt
-RUNTIME_DEP_PKGS_CSWwesnoth += CSWfconfig
-RUNTIME_DEP_PKGS_CSWwesnoth += CSWggettextrt
-RUNTIME_DEP_PKGS_CSWwesnoth += CSWglib2
-RUNTIME_DEP_PKGS_CSWwesnoth += CSWlibcairo
-RUNTIME_DEP_PKGS_CSWwesnoth += CSWlibsdl
-RUNTIME_DEP_PKGS_CSWwesnoth += CSWpango
-RUNTIME_DEP_PKGS_CSWwesnoth += CSWpng
-RUNTIME_DEP_PKGS_CSWwesnoth += CSWpython
-RUNTIME_DEP_PKGS_CSWwesnoth += CSWsdlimage
-RUNTIME_DEP_PKGS_CSWwesnoth += CSWsdlmixer
-RUNTIME_DEP_PKGS_CSWwesnoth += CSWsdlnet
-RUNTIME_DEP_PKGS_CSWwesnoth += CSWsdlttf
-RUNTIME_DEP_PKGS_CSWwesnoth += CSWstlport
-RUNTIME_DEP_PKGS_CSWwesnoth += CSWsunmath
-RUNTIME_DEP_PKGS_CSWwesnoth += CSWzlib
+EXTRA_INC = /opt/csw/gxx/include
 
-CHECKPKG_OVERRIDES_CSWwesnoth += missing-dependency|CSWperl
-CHECKPKG_OVERRIDES_CSWwesnoth += missing-dependency|CSWruby
+GARCOMPILER = GNU
 
-EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so -L.
-
-CONFIGURE_ARGS = --prefix=$(prefix)
-CONFIGURE_ARGS += PKG_CONFIG_PATH=/opt/csw/X11/lib/pkgconfig
-CONFIGURE_ARGS += CXXFLAGS='-features=extensions -library=stlport4'
-CONFIGURE_ARGS += LIBS='-lstlport -lintl -lsocket -lnsl -lresolv -lboost_iostreams -lsunmath -lSDL_ttf -lcairo -lpango-1.0 -lpangocairo-1.0'
-CONFIGURE_ARGS += PANGO_CFLAGS='-I/opt/csw/include/pango-1.0 -I/opt/csw/include/glib-2.0 -I/opt/csw/lib/glib-2.0/include -I/opt/csw/include/cairo'
-CONFIGURE_ARGS += PANGO_LIBS='-L/opt/csw/lib -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lintl'
-CONFIGURE_ARGS += LUA_CFLAGS=-I/opt/csw/include
-CONFIGURE_ARGS += LUA_LIBS=-L/opt/csw/lib
-CONFIGURE_ARGS += --with-fifodir=/var/opt/csw/run
-CONFIGURE_ARGS += --enable-server
-CONFIGURE_ARGS += --enable-tools
-CONFIGURE_ARGS += --enable-editor
-CONFIGURE_ARGS += --with-boost=/opt/csw
-CONFIGURE_ARGS += --disable-strict-compilation
-CONFIGURE_ARGS += --with-zlib-prefix=/opt/csw
-
 TEST_SCRIPTS =
 
+CONFIGURE_SCRIPTS = custom
+
 include gar/category.mk
+
+# Autotools build depreciated now using cmake
+configure-custom:
+
+	cd $(WORKSRC) && /opt/csw/bin/cmake -DCMAKE_INSTALL_PREFIX=/opt/csw -DBOOST_INCLUDEDIR=/opt/csw/gxx/include .
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/wesnoth/trunk/checksums
===================================================================
--- csw/mgar/pkg/wesnoth/trunk/checksums	2012-04-20 13:04:52 UTC (rev 17788)
+++ csw/mgar/pkg/wesnoth/trunk/checksums	2012-04-20 17:57:09 UTC (rev 17789)
@@ -1,9 +1 @@
-89db4313293372653371a66171268e4a  configure.diff
-160398f59781477186c4ae0502d3beb2  generator_private.hpp.diff
-21dfaf10701d0f3a58c25d79a99cff1a  global.hpp.diff
-5c51a1a28e56d5725f99841dbbc30530  image.cpp.diff
-59968804e93a18220d7d18e8252fff8d  language.cpp.diff
-29edd308920e8e44317fffb92eb19eb4  marked-up_text.cpp.diff
-3a8d9b365df3c142bac7dd4188e963b5  simple_wml.cpp.diff
-57b2396fad674a80f0dd1edab3e3063c  time.hpp.diff
-493826bbd9ba355930765a7e8fe3749a  wesnoth-1.6.5.tar.bz2
+61f93437ba13a27a048e5ee2ee63736a  wesnoth-1.10.2.tar.bz2

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.