- orphaned, outdated

Changed files:
    bzflag-CFLAGS.patch -> 1.2
    bzflag-home_etc.patch -> 1.2
    bzflag-lookups.patch -> 1.2
    bzflag-paths.patch -> 1.2

diff --git a/bzflag-CFLAGS.patch b/bzflag-CFLAGS.patch
deleted file mode 100644 (file)
index adc858e..0000000
--- a/bzflag-CFLAGS.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -durN bzflag.orig/configs/config-linux bzflag/configs/config-linux
---- bzflag.orig/configs/config-linux   Thu Mar 15 14:31:03 2001
-+++ bzflag/configs/config-linux        Thu Mar 15 14:35:39 2001
-@@ -64,8 +64,8 @@
- #
- PCOPTS   = -Wall -W -ansi $(ACOPTS)
- PCXXOPTS = -Wall -W -fno-exceptions -fno-rtti $(ACXXOPTS)
--COPT     = -DNDEBUG -O2
--CXXOPT   = -DNDEBUG -O2 -ffast-math -fomit-frame-pointer -fnonnull-objects \
-+COPT     = $(COPTFLAGS) -DNDEBUG
-+CXXOPT   = $(COPTFLAGS) -DNDEBUG -ffast-math -fomit-frame-pointer -fnonnull-objects \
-               -fexpensive-optimizations
- CDEBUG   = -DDEBUG -g
- CXXDEBUG = -DDEBUG -g

diff --git a/bzflag-home_etc.patch b/bzflag-home_etc.patch
deleted file mode 100644 (file)
index b5656cd..0000000
--- a/bzflag-home_etc.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -Nru bzflag-1.7g0/src/bzflag/bzflag.cxx bzflag-1.7g0.new/src/bzflag/bzflag.cxx
---- bzflag-1.7g0/src/bzflag/bzflag.cxx Thu Dec  5 17:22:44 2002
-+++ bzflag-1.7g0.new/src/bzflag/bzflag.cxx     Sun Mar 23 19:21:11 2003
-@@ -117,12 +117,18 @@
- #if !defined(_WIN32) & !defined(macintosh)
- 
-   BzfString name;
--  struct passwd* pwent = getpwuid(getuid());
--  if (pwent && pwent->pw_dir) {
--    name += BzfString(pwent->pw_dir);
--    name += "/";
-+  char *config_dir = getenv("CONFIG_DIR");
-+  if (config_dir != NULL) {
-+    name += BzfString(config_dir);
-+    name += "/bzflag";
-+  } else {
-+    struct passwd* pwent = getpwuid(getuid());
-+    if (pwent && pwent->pw_dir) {
-+      name += BzfString(pwent->pw_dir);
-+      name += "/";
-+    }
-+    name += ".bzflag";
-   }
--  name += ".bzflag";
- 
-   // add in hostname on UNIX
-   if (getenv("HOST")) {
-@@ -168,12 +174,18 @@
- static BzfString      getConfigFileName2()
- {
-   BzfString name;
--  struct passwd* pwent = getpwuid(getuid());
--  if (pwent && pwent->pw_dir) {
--    name += BzfString(pwent->pw_dir);
--    name += "/";
-+  const char *config_dir = getenv("CONFIG_DIR");
-+  if (config_dir) {
-+    name += BzfString(config_dir);
-+    name += "/bzflag";
-+  } else {
-+    struct passwd* pwent = getpwuid(getuid());
-+    if (pwent && pwent->pw_dir) {
-+      name += BzfString(pwent->pw_dir);
-+      name += "/";
-+    }
-+    name += ".bzflag";
-   }
--  name += ".bzflag";
-   return name;
- }
- #endif
-diff -Nru bzflag-1.7g0/src/bzflag/playing.cxx bzflag-1.7g0.new/src/bzflag/playing.cxx
---- bzflag-1.7g0/src/bzflag/playing.cxx        Sat Dec  7 08:25:08 2002
-+++ bzflag-1.7g0.new/src/bzflag/playing.cxx    Sun Mar 23 19:23:20 2003
-@@ -3419,12 +3419,18 @@
-   return "";
- #else
-   BzfString name;
--  struct passwd *pwent = getpwuid(getuid());
--  if (pwent && pwent->pw_dir) {
--    name += BzfString(pwent->pw_dir);
--    name += "/";
-+  const char *config_dir = getenv("CONFIG_DIR");
-+  if (config_dir) {
-+    name += BzfString(config_dir);
-+    name += "/bzflag-cache";
-+  } else {
-+    struct passwd *pwent = getpwuid(getuid());
-+    if (pwent && pwent->pw_dir) {
-+      name += BzfString(pwent->pw_dir);
-+      name += "/";
-+    }
-+    name += ".bzflag-cache";
-   }
--  name += ".bzflag-cache";
- 
-   // add in hostname on UNIX
-   if (getenv("HOST")) {

diff --git a/bzflag-lookups.patch b/bzflag-lookups.patch
deleted file mode 100644 (file)
index 0118a2b..0000000
--- a/bzflag-lookups.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -durN bzflag.orig/src/net/Address.cxx bzflag/src/net/Address.cxx
---- bzflag.orig/src/net/Address.cxx    Fri Mar  9 02:12:55 2001
-+++ bzflag/src/net/Address.cxx Thu Mar 15 15:16:22 2001
-@@ -98,7 +98,7 @@
-   return BzfString(inet_ntoa(addr));
- }
- 
--#if !defined(_WIN32)
-+#if 0
- static jmp_buf alarmEnv;
- static void           onAlarm(int)
- {
-@@ -126,7 +126,7 @@
-     return a;
-   }
-   else {                              // non-local address
--#if !defined(_WIN32)
-+#if 0
-     // set alarm to avoid waiting too long
-     SIG_PF oldAlarm = bzSignal(SIGALRM, SIG_PF(onAlarm));
-     if (oldAlarm != SIG_ERR) {
-@@ -144,7 +144,7 @@
- 
-     hent = gethostbyname(hname);
- 
--#if !defined(_WIN32)
-+#if 0
-     if (oldAlarm != SIG_ERR) {
-       alarm(0);
-       bzSignal(SIGALRM, oldAlarm);
-@@ -163,7 +163,7 @@
- 
- BzfString             Address::getHostByAddress(InAddr addr)
- {
--#if !defined(_WIN32)
-+#if 0
-   // set alarm to avoid waiting too long
-   SIG_PF oldAlarm = bzSignal(SIGALRM, SIG_PF(onAlarm));
-   if (oldAlarm != SIG_ERR) {
-@@ -180,7 +180,7 @@
-   int addrLen = sizeof(addr);
-   struct hostent* hent = gethostbyaddr((char*)&addr, addrLen, AF_INET);
- 
--#if !defined(_WIN32)
-+#if 0
-   if (oldAlarm != SIG_ERR) {
-     alarm(0);
-     bzSignal(SIGALRM, oldAlarm);

diff --git a/bzflag-paths.patch b/bzflag-paths.patch
deleted file mode 100644 (file)
index a8a7996..0000000
--- a/bzflag-paths.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -durN bzflag.orig/Make-common bzflag/Make-common
---- bzflag.orig/Make-common    Tue Jan 11 05:00:15 2000
-+++ bzflag/Make-common Sun Apr  9 14:11:35 2000
-@@ -28,7 +28,7 @@
- #
- # default install directories (configs can override these)
- #
--INSTALL_DATA_DIR = /usr/local/lib/bzflag
-+INSTALL_DATA_DIR = /usr/X11R6/share/bzflag
- 
- #
- # C options
-diff -durN bzflag.orig/configs/config-linux bzflag/configs/config-linux
---- bzflag.orig/configs/config-linux   Sat Jan 15 19:39:35 2000
-+++ bzflag/configs/config-linux        Sun Apr  9 14:10:28 2000
-@@ -23,7 +23,7 @@
- #
- # install locations
- #
--INSTALL_DATA_DIR = /usr/X11R6/lib/X11/bzflag/data
-+INSTALL_DATA_DIR = /usr/X11R6/share/bzflag
- 
- #
- # tools