upgrade to wesnoth-1.0rc1;

This commit is contained in:
robert 2005-10-03 13:40:14 +00:00
parent 4c6c24dfc0
commit 9b9fa3c1a4
9 changed files with 1111 additions and 353 deletions

View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.2 2005/04/07 12:05:53 robert Exp $
# $OpenBSD: Makefile,v 1.3 2005/10/03 13:40:14 robert Exp $
COMMENT= "strategy game with fantasy theme"
DISTNAME= wesnoth-0.8.11
DISTNAME= wesnoth-1.0rc1
CATEGORIES= games x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wesnoth/}
@ -36,8 +36,10 @@ FLAVOR?=
CONFIGURE_ARGS+=--enable-lite
.endif
CONFIGURE_ENV+=LDFLAGS=-L${LOCALBASE}/lib
CONFIGURE_ARGS+=--enable-server --enable-campaign-server --enable-editor
CONFIGURE_ENV+= CPPFLAGS=-I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib
CONFIGURE_ARGS+=--enable-server --enable-campaign-server --enable-editor \
--with-fifodir=/var/run --enable-tinygui
MAKE_FLAGS=LIBINTL='-L${LOCALBASE}/lib -lintl -liconv'

View File

@ -1,4 +1,4 @@
MD5 (wesnoth-0.8.11.tar.gz) = 929c65818cc2fb47227929f253fb1f8c
RMD160 (wesnoth-0.8.11.tar.gz) = a61b963ed1bd6b7d37c10dca0cc7c415ed4ea5a8
SHA1 (wesnoth-0.8.11.tar.gz) = 14c50a4424305e9db9044310e2f6a488faa3ad8a
SIZE (wesnoth-0.8.11.tar.gz) = 33034379
MD5 (wesnoth-1.0rc1.tar.gz) = 9a12505fbbb81d91a2975f73b0788174
RMD160 (wesnoth-1.0rc1.tar.gz) = 6bff338f7ca96b2c569d73c87abb8bf9faf29899
SHA1 (wesnoth-1.0rc1.tar.gz) = d49c2e2ab459e69b457269f487a5d1be6256473b
SIZE (wesnoth-1.0rc1.tar.gz) = 37156399

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-src_Makefile_in,v 1.1 2005/10/03 13:40:14 robert Exp $
--- src/Makefile.in.orig Thu Jul 21 22:44:46 2005
+++ src/Makefile.in Mon Aug 8 23:03:00 2005
@@ -817,7 +817,7 @@
serialization/string_utils.hpp \
zipios++/xcoll.hpp
-wesnothd_LDADD = @SDL_NET_LIBS@ @SDL_LIBS@ $(LIBZIPIOS) $(LIBINTL)
+wesnothd_LDADD = @SDL_NET_LIBS@ @SDL_LIBS@ $(LIBZIPIOS) $(LIBINTL) $(LTLIBINTL)
#############################################################################
# Campaign Server #
@@ -856,7 +856,7 @@
tstring.hpp \
zipios++/xcoll.hpp
-campaignd_LDADD = @SDL_NET_LIBS@ @SDL_LIBS@ $(LIBZIPIOS) $(LIBINTL)
+campaignd_LDADD = @SDL_NET_LIBS@ @SDL_LIBS@ $(LIBZIPIOS) $(LIBINTL) $(LTLIBINTL)
#############################################################################
# Castle building helpers #

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_campaign_server_Makefile_in,v 1.1.1.1 2005/02/19 21:48:44 espie Exp $
--- src/campaign_server/Makefile.in.orig Sat Feb 19 13:46:37 2005
+++ src/campaign_server/Makefile.in Sat Feb 19 13:46:48 2005
@@ -71,7 +71,7 @@ am_campaignd_OBJECTS = campaign_server.$
network_worker.$(OBJEXT) publish_campaign.$(OBJEXT) \
thread.$(OBJEXT) xcoll.$(OBJEXT)
campaignd_OBJECTS = $(am_campaignd_OBJECTS)
-campaignd_LDADD = $(LDADD)
+campaignd_LDADD = $(LDADD) $(LTLIBINTL)
am__DEPENDENCIES_1 =
campaignd_DEPENDENCIES = $(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_server_Makefile_in,v 1.1.1.1 2005/02/19 21:48:44 espie Exp $
--- src/server/Makefile.in.orig Sat Feb 19 13:32:20 2005
+++ src/server/Makefile.in Sat Feb 19 13:32:44 2005
@@ -72,7 +72,7 @@ am_wesnothd_OBJECTS = game.$(OBJEXT) inp
network.$(OBJEXT) network_worker.$(OBJEXT) thread.$(OBJEXT) \
xcoll.$(OBJEXT)
wesnothd_OBJECTS = $(am_wesnothd_OBJECTS)
-wesnothd_LDADD = $(LDADD)
+wesnothd_LDADD = $(LDADD) $(LTLIBINTL)
am__DEPENDENCIES_1 =
wesnothd_DEPENDENCIES = $(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_server_server_cpp,v 1.1 2005/10/03 13:40:14 robert Exp $
--- src/server/server.cpp.orig Wed May 25 20:06:47 2005
+++ src/server/server.cpp Wed May 25 20:07:08 2005
@@ -875,7 +875,7 @@
#ifndef FIFODIR
# define FIFODIR "/var/run/wesnothd"
#endif
- std::string fifo_path = std::string(FIFODIR) + "/socket";
+ std::string fifo_path = std::string(FIFODIR) + "/wesnothd.sock";
for(int arg = 1; arg != argc; ++arg) {
const std::string val(argv[arg]);

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_zip_Makefile_in,v 1.1.1.1 2005/02/19 21:48:44 espie Exp $
--- src/zip/Makefile.in.orig Sat Feb 19 14:05:12 2005
+++ src/zip/Makefile.in Sat Feb 19 14:05:51 2005
@@ -69,7 +69,7 @@ am_wesnoth_zip_OBJECTS = zip.$(OBJEXT) c
filesystem.$(OBJEXT) game_config.$(OBJEXT) gettext.$(OBJEXT) \
log.$(OBJEXT) network.$(OBJEXT) variable.$(OBJEXT)
wesnoth_zip_OBJECTS = $(am_wesnoth_zip_OBJECTS)
-wesnoth_zip_LDADD = $(LDADD)
+wesnoth_zip_LDADD = $(LDADD) $(LTLIBINTL) $(LIBZIPIOS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles

View File

@ -1,10 +0,0 @@
$OpenBSD: patch-src_zip_zip_cpp,v 1.1.1.1 2005/02/19 21:48:44 espie Exp $
--- src/zip/zip.cpp.orig Sat Feb 19 13:50:47 2005
+++ src/zip/zip.cpp Sat Feb 19 13:50:55 2005
@@ -1,5 +1,6 @@
#include "../config.hpp"
#include "../game_config.hpp"
+#include "../filesystem.hpp"
#include <iostream>
#include <sstream>
#include <vector>

File diff suppressed because it is too large Load Diff