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

[jake_goerzen at users.sourceforge.net]

Revision: 9178
          http://gar.svn.sourceforge.net/gar/?rev=9178&view=rev
Author:   jake_goerzen
Date:     2010-03-15 01:23:06 +0000 (Mon, 15 Mar 2010)

Log Message:
-----------
add sys\/types.h to time.hpp; add -lresolv to LIBS

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

Added Paths:
-----------
    csw/mgar/pkg/wesnoth/trunk/files/time.hpp.diff

Modified: csw/mgar/pkg/wesnoth/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wesnoth/trunk/Makefile	2010-03-14 22:11:55 UTC (rev 9177)
+++ csw/mgar/pkg/wesnoth/trunk/Makefile	2010-03-15 01:23:06 UTC (rev 9178)
@@ -2,7 +2,7 @@
 GARVERSION = 1.6.5
 CATEGORIES = apps
 
-DESCRIPTION = a free turn-based strategy game with a fanasy theme
+DESCRIPTION = A free turn-based strategy game with a fanasy theme
 define BLURB
   Build up a great army, gradually turning raw recruits into hardened veterans. In later games, recall your toughest warriors and form a deadly host against whom none can stand! Choose units from a large pool of specialists, and hand-pick a force with the right strengths to fight well on different terrains against all manner of opposition.  
 endef
@@ -22,11 +22,15 @@
 PATCHFILES += image.cpp.diff
 PATCHFILES += marked-up_text.cpp.diff
 PATCHFILES += simple_wml.cpp.diff
+PATCHFILES += time.hpp.diff
 
 RUNTIME_DEP_PKGS_CSWwesnoth = CSWboostrt
-RUNTIME_DEP_PKGS_CSWwesnoth += CSWftype2
+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
@@ -37,12 +41,6 @@
 RUNTIME_DEP_PKGS_CSWwesnoth += CSWsunmath
 RUNTIME_DEP_PKGS_CSWwesnoth += CSWzlib
 
-CHECKPKG_OVERRIDES_CSWwesnoth += symbol-not-found|campaignd
-CHECKPKG_OVERRIDES_CSWwesnoth += symbol-not-found|exploder
-CHECKPKG_OVERRIDES_CSWwesnoth += symbol-not-found|cutter
-CHECKPKG_OVERRIDES_CSWwesnoth += symbol-not-found|wesnoth_editor
-CHECKPKG_OVERRIDES_CSWwesnoth += symbol-not-found|wesnoth
-CHECKPKG_OVERRIDES_CSWwesnoth += symbol-not-found|wesnothd
 CHECKPKG_OVERRIDES_CSWwesnoth += missing-dependency|CSWperl
 CHECKPKG_OVERRIDES_CSWwesnoth += missing-dependency|CSWruby
 
@@ -51,16 +49,15 @@
 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 -lboost_iostreams -lsunmath -lSDL_ttf -lcairo -lpango-1.0 -lpangocairo-1.0'
+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-campaign-server
-#CONFIGURE_ARGS += --enable-tools
-#CONFIGURE_ARGS += --enable-editor
+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

Modified: csw/mgar/pkg/wesnoth/trunk/checksums
===================================================================
--- csw/mgar/pkg/wesnoth/trunk/checksums	2010-03-14 22:11:55 UTC (rev 9177)
+++ csw/mgar/pkg/wesnoth/trunk/checksums	2010-03-15 01:23:06 UTC (rev 9178)
@@ -5,4 +5,5 @@
 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

Added: csw/mgar/pkg/wesnoth/trunk/files/time.hpp.diff
===================================================================
--- csw/mgar/pkg/wesnoth/trunk/files/time.hpp.diff	                        (rev 0)
+++ csw/mgar/pkg/wesnoth/trunk/files/time.hpp.diff	2010-03-15 01:23:06 UTC (rev 9178)
@@ -0,0 +1,13 @@
+--- wesnoth-1.6.5/src/time.hpp	2009-01-01 11:27:41.000000000 +0100
++++ wesnoth-1.6.5.new/src/time.hpp	2010-03-14 19:17:14.451509148 +0100
+@@ -16,6 +16,10 @@
+ #define TIME_HPP_INCLUDED
+ #include <cstdlib>
+ 
++#if defined (__SVR4)  && defined (__sun)
++#include <sys/types.h>
++#endif
++
+ namespace ntime {
+ 
+ 	const int frames_to_remember = 6;


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