From d9c55415d7fa89f093475f99fd5ac99e77176a11 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 22 Apr 2008 01:28:57 +0000 Subject: [PATCH 1/4] Initialize branch F-9 for wormux --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From e956ea7fe109da9114c082dec934feba66394361 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Sat, 8 Nov 2008 00:35:11 +0000 Subject: [PATCH 2/4] Remove obsolete patches --- wormux-0.7.9-cflags.patch | 51 -------------------------- wormux-0.7.9-gcc43.patch | 75 --------------------------------------- 2 files changed, 126 deletions(-) delete mode 100644 wormux-0.7.9-cflags.patch delete mode 100644 wormux-0.7.9-gcc43.patch diff --git a/wormux-0.7.9-cflags.patch b/wormux-0.7.9-cflags.patch deleted file mode 100644 index 3860805..0000000 --- a/wormux-0.7.9-cflags.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- wormux-0.7.9/configure.ac~ 2007-01-28 16:06:11.000000000 +0200 -+++ wormux-0.7.9/configure.ac 2007-03-24 12:59:34.000000000 +0200 -@@ -150,11 +150,8 @@ - GCC_FLAGS="$GCC_FLAGS -O2" - fi - -- dnl Ignore default options set by autoconf -- dnl CFLAGS="$CFLAGS $GCC_FLAGS" -- CFLAGS="$GCC_FLAGS" -- dnl CXXFLAGS="$CXXFLAGS $GCC_FLAGS" -- CXXFLAGS="$GCC_FLAGS" -+ CFLAGS="$GCC_FLAGS $CFLAGS" -+ CXXFLAGS="$GCC_FLAGS $CXXFLAGS" - - else - if test "x${debug}" = "xyes"; then ---- wormux-0.7.9/configure~ 2007-01-28 16:06:58.000000000 +0200 -+++ wormux-0.7.9/configure 2007-03-24 12:59:57.000000000 +0200 -@@ -7319,8 +7319,8 @@ - GCC_FLAGS="$GCC_FLAGS -O2" - fi - -- CFLAGS="$GCC_FLAGS" -- CXXFLAGS="$GCC_FLAGS" -+ CFLAGS="$GCC_FLAGS $CFLAGS" -+ CXXFLAGS="$GCC_FLAGS $CXXFLAGS" - - else - if test "x${debug}" = "xyes"; then ---- wormux-0.7.9/src/Makefile.am~ 2007-01-28 16:03:48.000000000 +0200 -+++ wormux-0.7.9/src/Makefile.am 2007-03-24 13:03:12.000000000 +0200 -@@ -176,7 +176,7 @@ - weapon/blowtorch.cpp weapon/blowtorch.h \ - weapon/syringe.cpp weapon/syringe.h - --AM_CXXFLAGS = -DINSTALL_DATADIR=\"$(pkgdatadir)\" -DINSTALL_LOCALEDIR=\"$(localedir)\" -DFONT_FILE=\"$(fontfile)\" -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" -Werror -+AM_CXXFLAGS = -DINSTALL_DATADIR=\"$(pkgdatadir)\" -DINSTALL_LOCALEDIR=\"$(localedir)\" -DFONT_FILE=\"$(fontfile)\" -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" - - - if WIN32 ---- wormux-0.7.9/src/Makefile.in~ 2007-01-28 16:06:57.000000000 +0200 -+++ wormux-0.7.9/src/Makefile.in 2007-03-24 13:03:28.000000000 +0200 -@@ -518,7 +518,7 @@ - weapon/submachine_gun.h weapon/polecat.cpp weapon/polecat.h \ - weapon/blowtorch.cpp weapon/blowtorch.h weapon/syringe.cpp \ - weapon/syringe.h $(am__append_1) --AM_CXXFLAGS = -DINSTALL_DATADIR=\"$(pkgdatadir)\" -DINSTALL_LOCALEDIR=\"$(localedir)\" -DFONT_FILE=\"$(fontfile)\" -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" -Werror -+AM_CXXFLAGS = -DINSTALL_DATADIR=\"$(pkgdatadir)\" -DINSTALL_LOCALEDIR=\"$(localedir)\" -DFONT_FILE=\"$(fontfile)\" -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" - all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive - diff --git a/wormux-0.7.9-gcc43.patch b/wormux-0.7.9-gcc43.patch deleted file mode 100644 index d182617..0000000 --- a/wormux-0.7.9-gcc43.patch +++ /dev/null @@ -1,75 +0,0 @@ ---- wormux-0.7.9/src/network/distant_cpu.cpp.orig 2008-02-10 11:52:30.000000000 -0800 -+++ wormux-0.7.9/src/network/distant_cpu.cpp 2008-02-10 11:52:43.000000000 -0800 -@@ -30,6 +30,7 @@ - #include "../team/teams_list.h" - #include "../tool/debug.h" - #include "../tool/i18n.h" -+#include - //----------------------------------------------------------------------------- - - DistantComputer::DistantComputer(TCPsocket new_sock) ---- wormux-0.7.9/src/weapon/launcher.cpp.orig 2008-02-10 12:10:59.000000000 -0800 -+++ wormux-0.7.9/src/weapon/launcher.cpp 2008-02-10 12:11:11.000000000 -0800 -@@ -22,6 +22,7 @@ - #include "launcher.h" - - #include -+#include - - #include "explosion.h" - #include "../game/config.h" ---- wormux-0.7.9/src/weapon/anvil.cpp.orig 2008-02-10 12:14:32.000000000 -0800 -+++ wormux-0.7.9/src/weapon/anvil.cpp 2008-02-10 12:14:45.000000000 -0800 -@@ -22,6 +22,7 @@ - #include "anvil.h" - //----------------------------------------------------------------------------- - #include -+#include - #include "../game/time.h" - #include "../team/teams_list.h" - #include "../graphic/video.h" ---- wormux-0.7.9/src/menu/map_selection_box.cpp.orig 2008-02-09 15:00:36.000000000 -0800 -+++ wormux-0.7.9/src/menu/map_selection_box.cpp 2008-02-09 15:20:34.000000000 -0800 -@@ -19,6 +19,8 @@ - * Map selection box - *****************************************************************************/ - -+#include -+#include - #include "map_selection_box.h" - #include "../include/action_handler.h" - #include "../map/maps_list.h" ---- wormux-0.7.9/src/menu/credits_menu.cpp.orig 2008-02-09 15:03:55.000000000 -0800 -+++ wormux-0.7.9/src/menu/credits_menu.cpp 2008-02-09 15:12:24.000000000 -0800 -@@ -23,6 +23,8 @@ - //----------------------------------------------------------------------------- - #include - #include -+#include -+#include - #include "../game/config.h" - #include "../include/app.h" - //----------------------------------------------------------------------------- ---- wormux-0.7.9/src/game/config.cpp.orig 2008-02-09 14:49:55.000000000 -0800 -+++ wormux-0.7.9/src/game/config.cpp 2008-02-09 14:51:19.000000000 -0800 -@@ -373,7 +373,7 @@ - */ - std::string Config::GetEnv(const std::string & name, const std::string &default_value) - { -- const char *env = std::getenv(name.c_str()); -+ const char *env = ::getenv(name.c_str()); - if (env != NULL) { - return env; - } else { ---- wormux-0.7.9/src/map/maps_list.cpp.orig 2008-02-09 15:31:53.000000000 -0800 -+++ wormux-0.7.9/src/map/maps_list.cpp 2008-02-09 15:32:07.000000000 -0800 -@@ -18,7 +18,8 @@ - ****************************************************************************** - * Maps list - *****************************************************************************/ -- -+#include -+#include - #include "maps_list.h" - #include "map.h" - #include "../game/config.h" From 74b8932883ee38dbd815a0d3ba2ea1d7bea072ae Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:18:38 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e98eb66..d2d1ddf 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := wormux SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From c8a1a2694ae74a4c6d61556da8b44a0312ac9925 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:25:28 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index d2d1ddf..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wormux -# $Id$ -NAME := wormux -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9