- Update to 4.2.12

PR:		58367
Submitted by:	maintainer

6 files changed, 77 insertions, 119 deletions

diff --git a/games/wolfpack/files/patch-ab b/games/wolfpack/files/patch-ab
deleted file mode 100644
index 24b36823a945..000000000000
--- a/games/wolfpack/files/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/lib/lwp/lwp.c.orig	Sat Dec 16 22:53:35 2000
-+++ src/lib/lwp/lwp.c	Sat Dec 16 22:54:05 2000
-@@ -23,7 +23,11 @@
- 
- #include <stdio.h>
- #include <signal.h>
-+#if defined(__FreeBSD__)
-+#include <stdlib.h>
-+#else
- #include <malloc.h>
-+#endif
- #include <string.h>
- #include "lwp.h"
- #include "lwpint.h"
diff --git a/games/wolfpack/files/patch-ac b/games/wolfpack/files/patch-ac
deleted file mode 100644
index 7ca0cc2e682d..000000000000
--- a/games/wolfpack/files/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/lib/lwp/sel.c.orig	Sat Dec 16 18:54:06 2000
-+++ src/lib/lwp/sel.c	Sat Dec 16 18:54:25 2000
-@@ -31,7 +31,11 @@
-  *     Dave Pare, 1994
-  */
- 
-+#if defined(__FreeBSD__)
-+#include <stdlib.h>
-+#else
- #include <malloc.h>
-+#endif
- #include <errno.h>
- #include <sys/types.h>
- #include <sys/uio.h>
diff --git a/games/wolfpack/files/patch-ad b/games/wolfpack/files/patch-ad
index 8cf145371aab..c906a66512e7 100644
--- a/games/wolfpack/files/patch-ad
+++ b/games/wolfpack/files/patch-ad
@@ -1,5 +1,5 @@
---- src/doconfig/doconfig.c.orig	Sat Dec 16 18:08:03 2000
-+++ src/doconfig/doconfig.c	Sat Dec 16 18:49:52 2000
+--- src/doconfig/doconfig.c.orig	Thu Jun 19 03:24:48 2003
++++ src/doconfig/doconfig.c	Wed Oct 22 16:02:33 2003
 @@ -90,12 +90,18 @@
  #endif
  
@@ -20,7 +20,7 @@
      if ((pathname = getcwd(NULL, 255)) == NULL) {
  		printf("Can't get current path!\n");
  		exit(-1);
-@@ -112,13 +118,15 @@
+@@ -112,30 +118,16 @@
      cp = (char *)rindex(pathname, '\\');
      *cp = '\0';
  #endif
@@ -32,15 +32,25 @@
      sprintf(buf, "%s/src/client/ipglob.c", pathname);
      wripglob(buf);
 -
-+    } else {
-+    printf("Installing...\n");
-     if (access(EP, 0)) {
- 		printf("making directory %s\n", EP);
- 		if (mkdir(EP, 493)) {
-@@ -136,6 +144,7 @@
-     }
-     sprintf(buf, "%s/data/auth", EP);
+-    if (access(EP, 0)) {
+-		printf("making directory %s\n", EP);
+-		if (mkdir(EP, 493)) {
+-			printf("mkdir failed on %s, exiting.\n", EP);
+-			exit(-1);
+-		}
+-    }
+-    sprintf(buf, "%s/data", EP);
+-    if (access(buf, 0)) {
+-		printf("making directory %s\n", buf);
+-		if (mkdir(buf, 493)) {
+-			printf("mkdir failed on %s, exiting.\n", buf);
+-			exit(-1);
+-		}
+-    }
+-    sprintf(buf, "%s/data/auth", EP);
++    sprintf(buf, "%s/data/auth", pathname);
      wrauth(buf);
 +    }
      exit(0);
  }
+ 
diff --git a/games/wolfpack/files/patch-ae b/games/wolfpack/files/patch-ae
deleted file mode 100644
index 5b0204f9ecf5..000000000000
--- a/games/wolfpack/files/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/lib/lwp/sem.c.orig	Sat Dec 16 18:54:39 2000
-+++ src/lib/lwp/sem.c	Sat Dec 16 18:55:01 2000
-@@ -20,7 +20,11 @@
-  * Imperial College of Science, Technology and Medicine, 180 Queen's
-  * Gate, London SW7 2BZ, England.
-  */
-+#if defined(__FreeBSD__)
-+#include <stdlib.h>
-+#else
- #include <malloc.h>
-+#endif
- #include <string.h>
- 
- #include "lwp.h"
diff --git a/games/wolfpack/files/patch-af b/games/wolfpack/files/patch-af
deleted file mode 100644
index f7c81c9c9a96..000000000000
--- a/games/wolfpack/files/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/lib/lwp/misc/echo.c.orig	Sat Dec 16 18:55:16 2000
-+++ src/lib/lwp/misc/echo.c	Sat Dec 16 18:55:41 2000
-@@ -5,7 +5,11 @@
-  *
-  */
- 
-+#if defined(__FreeBSD__)
-+#include <stdlib.h>
-+#else
- #include <malloc.h>
-+#endif
- #include <stdio.h>
- #include <sys/types.h>
- #include <sys/time.h>
diff --git a/games/wolfpack/files/patch-aa b/games/wolfpack/files/patch-aj
index 14d7a3c09ba2..0f445e325e74 100644
--- a/games/wolfpack/files/patch-aa
+++ b/games/wolfpack/files/patch-aj
@@ -1,15 +1,6 @@
---- Makefile.orig	Mon Sep 25 16:11:49 2000
-+++ Makefile	Sun Dec 17 00:12:03 2000
-@@ -34,7 +34,7 @@
- include Make.sysdefs
- 
- TOBUILD = all
--GENMASTER = $(TOBUILD) GLOBALCFLAGS="$(GLOBALCFLAGS)" GLOBALLFLAGS="$(GLOBALLFLAGS)"
-+GENMASTER = $(TOBUILD) GLOBALCFLAGS="$(CFLAGS) $(GLOBALCFLAGS)" GLOBALLFLAGS="$(GLOBALLFLAGS)"
- CLIENTLIBS = -ltermcap
- 
- 
-@@ -80,7 +80,6 @@
+--- Makefile.orig	Sat Aug 24 04:25:15 2002
++++ Makefile	Wed Oct 22 16:58:17 2003
+@@ -81,7 +81,6 @@
  	($(MAKE) genlibs $(ALPHAMASTER))
  	(cd src/lib/lwp; $(MAKE) $(ALPHAMASTER))
  	($(MAKE) binaries $(ALPHAMASTER))
@@ -17,7 +8,7 @@
  
  alpha-pthreads:
  	@echo 'building a $(WORLDX) by $(WORLDY) server...'
-@@ -88,7 +87,6 @@
+@@ -89,7 +88,6 @@
  	($(MAKE) genlibs $(ALPHAPOSMASTER))
  	(cd src/lib/lwp; $(MAKE) $(ALPHAPOSMASTER))
  	($(MAKE) binaries $(ALPHAPOSMASTER))
@@ -25,7 +16,7 @@
  
  apollo:
  	@echo 'building a $(WORLDX) by $(WORLDY) server...'
-@@ -96,7 +94,6 @@
+@@ -97,7 +95,6 @@
  	($(MAKE) genlibs $(APOLLOMASTER))
  	(cd src/lib/lwp; $(MAKE) $(APOLLOMASTER))
  	($(MAKE) binaries $(APOLLOMASTER))
@@ -33,7 +24,7 @@
  
  freebsd:
  	@echo 'building a $(WORLDX) by $(WORLDY) server...'
-@@ -104,7 +101,6 @@
+@@ -105,7 +102,6 @@
  	($(MAKE) genlibs $(FREEBSDMASTER))
  	(cd src/lib/lwp; $(MAKE) $(FREEBSDMASTER))
  	($(MAKE) binaries $(FREEBSDMASTER))
@@ -41,7 +32,7 @@
  
  hp:
  	@echo 'building a $(WORLDX) by $(WORLDY) server...'
-@@ -112,7 +108,6 @@
+@@ -113,7 +109,6 @@
  	($(MAKE) genlibs $(HPMASTER))
  	(cd src/lib/lwp; $(MAKE) $(HPMASTER))
  	($(MAKE) binaries $(HPMASTER))
@@ -49,7 +40,7 @@
  
  hpux:
  	@echo 'building a $(WORLDX) by $(WORLDY) server...'
-@@ -120,7 +115,6 @@
+@@ -121,7 +116,6 @@
  	($(MAKE) genlibs $(HPUXMASTER))
  	(cd src/lib/lwp; $(MAKE) $(HPUXMASTER))
  	($(MAKE) binaries $(HPUXMASTER) CLIENTLIBS="")
@@ -57,15 +48,22 @@
  
  next:
  	@echo 'building a $(WORLDX) by $(WORLDY) server...'
-@@ -128,7 +122,6 @@
+@@ -129,14 +123,12 @@
  	($(MAKE) genlibs $(NEXTMASTER))
  	(cd src/lib/lwp; $(MAKE) $(NEXTMASTER))
  	($(MAKE) binaries $(NEXTMASTER))
 -	($(MAKE) install)
  
+ osx:
+ 	@echo 'building a $(WORLDX) by $(WORLDY) server...'
+ 	(cd src/doconfig; $(MAKE) $(OSXMASTER))
+ 	($(MAKE) genlibs $(OSXMASTER))
+ 	($(MAKE) binaries TOBUILD=osx $(OSXMASTER) CLIENTLIBS="")
+-	($(MAKE) install)
+ 
  irix:
  	@echo 'building a $(WORLDX) by $(WORLDY) server...'
-@@ -136,7 +129,6 @@
+@@ -144,7 +136,6 @@
  	($(MAKE) genlibs $(IRIXMASTER))
  	(cd src/lib/lwp; $(MAKE) $(IRIXMASTER))
  	($(MAKE) binaries $(IRIXMASTER))
@@ -73,7 +71,7 @@
  
  irix5:
  	@echo 'building a $(WORLDX) by $(WORLDY) server...'
-@@ -144,7 +136,6 @@
+@@ -152,7 +143,6 @@
  	($(MAKE) genlibs $(IRIX5MASTER))
  	(cd src/lib/lwp; $(MAKE) $(IRIX5MASTER))
  	($(MAKE) binaries $(IRIX5MASTER))
@@ -81,7 +79,7 @@
  
  isi:
  	@echo 'building a $(WORLDX) by $(WORLDY) server...'
-@@ -152,7 +143,6 @@
+@@ -160,7 +150,6 @@
  	($(MAKE) genlibs $(ISIMASTER))
  	(cd src/lib/lwp; $(MAKE) $(ISIMASTER))
  	($(MAKE) binaries $(ISIMASTER))
@@ -89,7 +87,7 @@
  
  linux:
  	@echo 'building a $(WORLDX) by $(WORLDY) server...'
-@@ -162,7 +152,6 @@
+@@ -170,7 +159,6 @@
  	($(MAKE) genlibs $(LINUXMASTER))
  	(cd src/lib/lwp; $(MAKE) $(LINUXMASTER))
  	($(MAKE) binaries $(LINUXMASTER))
@@ -97,7 +95,7 @@
  
  linux-pthreads:
  	@echo 'building a $(WORLDX) by $(WORLDY) server...'
-@@ -170,7 +159,6 @@
+@@ -178,7 +166,6 @@
  	($(MAKE) genlibs $(LINUXPTHMASTER))
  	(cd src/lib/lwp; $(MAKE) $(LINUXPTHMASTER))
  	($(MAKE) binaries $(LINUXPTHMASTER))
@@ -105,7 +103,7 @@
  
  mipsbsd:
  	@echo 'building a $(WORLDX) by $(WORLDY) server...'
-@@ -178,7 +166,6 @@
+@@ -186,7 +173,6 @@
  	($(MAKE) genlibs $(MIPSBSDMASTER))
  	(cd src/lib/lwp; $(MAKE) mipsultrix $(MIPSBSDMASTER))
  	($(MAKE) binaries $(MIPSBSDMASTER))
@@ -113,7 +111,7 @@
  
  mach2.5:
  	@echo 'building a $(WORLDX) by $(WORLDY) server...'
-@@ -186,7 +173,6 @@
+@@ -194,7 +180,6 @@
  	($(MAKE) genlibs $(MACH25MASTER))
  	(cd src/lib/lwp; $(MAKE) mipsultrix $(MACH25MASTER))
  	($(MAKE) binaries $(MACH25MASTER))
@@ -121,7 +119,7 @@
  
  mipsultrix:
  	@echo 'building a $(WORLDX) by $(WORLDY) server...'
-@@ -194,7 +180,6 @@
+@@ -202,7 +187,6 @@
  	($(MAKE) genlibs $(MIPSULTMASTER))
  	(cd src/lib/lwp; $(MAKE) mipsultrix $(MIPSULTMASTER))
  	($(MAKE) binaries $(MIPSULTMASTER))
@@ -129,7 +127,7 @@
  
  mipsultrix.gcc:
  	@echo 'building a $(WORLDX) by $(WORLDY) server...'
-@@ -202,7 +187,6 @@
+@@ -210,7 +194,6 @@
  	($(MAKE) genlibs $(MIPSULTGMASTER))
  	(cd src/lib/lwp; $(MAKE) mipsultrix $(MIPSULTGMASTER))
  	($(MAKE) binaries $(MIPSULTGMASTER))
@@ -137,7 +135,7 @@
  
  nt:
  	@echo 'building a $(WORLDX) by $(WORLDY) server...'
-@@ -214,7 +198,6 @@
+@@ -222,7 +205,6 @@
  	$(MAKE) nt $(NTMASTER)
  	cd ../../..
  	$(MAKE) ntbinaries TOBUILD=nt $(NTMASTER)
@@ -145,7 +143,7 @@
  
  vaxultrix:
  	@echo 'building a $(WORLDX) by $(WORLDY) server...'
-@@ -222,7 +205,6 @@
+@@ -230,7 +212,6 @@
  	($(MAKE) genlibs $(VAXULTMASTER))
  	(cd src/lib/lwp; $(MAKE) $(VAXULTMASTER))
  	($(MAKE) binaries $(VAXULTMASTER))
@@ -153,7 +151,7 @@
  
  aix:
  	@echo 'building a $(WORLDX) by $(WORLDY) server...'
-@@ -230,7 +212,6 @@
+@@ -238,7 +219,6 @@
  	($(MAKE) genlibs $(AIXMASTER))
  	(cd src/lib/lwp; $(MAKE) aix $(AIXMASTER))
  	($(MAKE) binaries $(AIXMASTER))
@@ -161,7 +159,7 @@
  
  rtpc:
  	@echo 'building a $(WORLDX) by $(WORLDY) server...'
-@@ -238,7 +219,6 @@
+@@ -246,7 +226,6 @@
  	($(MAKE) genlibs $(RTPCMASTER))
  	(cd src/lib/lwp; $(MAKE) aix $(RTPCMASTER))
  	($(MAKE) binaries $(RTPCMASTER))
@@ -169,7 +167,7 @@
  
  sequent:
  	@echo 'building a $(WORLDX) by $(WORLDY) server...'
-@@ -246,7 +226,6 @@
+@@ -254,7 +233,6 @@
  	($(MAKE) genlibs $(SEQMASTER))
  	(cd src/lib/lwp; $(MAKE) $(SEQMASTER))
  	($(MAKE) binaries $(SEQMASTER))
@@ -177,7 +175,7 @@
  
  sequent.fpa:
  	@echo 'building a $(WORLDX) by $(WORLDY) server...'
-@@ -254,7 +233,6 @@
+@@ -262,7 +240,6 @@
  	($(MAKE) genlibs $(SEQFPAMASTER))
  	(cd src/lib/lwp; $(MAKE) $(SEQFPAMASTER))
  	($(MAKE) binaries $(SEQFPAMASTER))
@@ -185,7 +183,7 @@
  
  solaris:
  	@echo 'building a $(WORLDX) by $(WORLDY) server...'
-@@ -262,7 +240,6 @@
+@@ -270,7 +247,6 @@
  	($(MAKE) genlibs $(SOLMASTER))
  	(cd src/lib/lwp; $(MAKE) $(SOLMASTER))
  	($(MAKE) binaries $(SOLMASTER))
@@ -193,7 +191,7 @@
  
  sun3:
  	@echo 'building a $(WORLDX) by $(WORLDY) server...'
-@@ -270,7 +247,6 @@
+@@ -278,7 +254,6 @@
  	($(MAKE) genlibs $(SUN3MASTER))
  	(cd src/lib/lwp; $(MAKE) $(SUN3MASTER))
  	($(MAKE) binaries $(SUN3MASTER))
@@ -201,7 +199,7 @@
  
  sun4:
  	@echo 'building a $(WORLDX) by $(WORLDY) server...'
-@@ -278,7 +254,6 @@
+@@ -286,7 +261,6 @@
  	($(MAKE) genlibs $(SUN4MASTER))
  	(cd src/lib/lwp; $(MAKE) $(SUN4MASTER))
  	($(MAKE) binaries $(SUN4MASTER))
@@ -209,7 +207,7 @@
  
  sun4.opt:
  	@echo 'building a $(WORLDX) by $(WORLDY) server...'
-@@ -286,7 +261,6 @@
+@@ -294,7 +268,6 @@
  	($(MAKE) genlibs $(SUN4OPTMASTER))
  	(cd src/lib/lwp; $(MAKE) $(SUN4OPTMASTER))
  	($(MAKE) binaries $(SUN4OPTMASTER))
@@ -217,7 +215,7 @@
  
  sun4.debug:
  	@echo 'building a $(WORLDX) by $(WORLDY) server...'
-@@ -294,7 +268,6 @@
+@@ -302,7 +275,6 @@
  	($(MAKE) genlibs $(SUN4DBGMASTER))
  	(cd src/lib/lwp; $(MAKE) $(SUN4DBGMASTER))
  	($(MAKE) binaries $(SUN4DBGMASTER))
@@ -225,20 +223,26 @@
  
  #
  # Generic stuff that is called from the architecture specific stuff.
-@@ -528,9 +501,16 @@
- # data directory if you didn't have one before.
- 
- install:
-+	(cd src/doconfig; $(MAKE) install)
- 	(cd src/client; $(MAKE) install)
- 	(cd src/server; $(MAKE) install)
- 	(cd src/util; $(MAKE) install)
-+	cp README $(EMPDIR)
-+	cp -r info.nr $(EMPDIR)
-+	cp -r doc $(EMPDIR)
-+	cp -r scripts $(EMPDIR)
-+	cp man/*.1 $(PREFIX)/man/man1
-+	cp man/*.6 $(PREFIX)/man/man6
+@@ -542,6 +514,22 @@
  	-(mv $(EMPDIR)/data/econfig $(EMPDIR)/data/econfig.bak)
  	($(EMPDIR)/bin/pconfig > $(EMPDIR)/data/econfig)
  	-(mv $(EMPDIR)/data/econfig.bak $(EMPDIR)/data/econfig)
++	echo "# Wolfpack, 1996-2000" >$(EMPDIR)/data/auth
++	echo "#" >>$(EMPDIR)/data/auth
++	echo "# Empire Authorization File - Users listed will be allowed to log in as deities." >>$(EMPDIR)/data/auth
++	echo "#" >>$(EMPDIR)/data/auth
++	echo "# Format is:" >>$(EMPDIR)/data/auth
++	echo "# hostname that authorized user uses on a line" >>$(EMPDIR)/data/auth
++	echo "# username that authorized user uses on a line" >>$(EMPDIR)/data/auth
++	echo "#" >>$(EMPDIR)/data/auth
++	echo "# REMEMBER TO USE PAIRS OF LINES!" >>$(EMPDIR)/data/auth
++	echo "#" >>$(EMPDIR)/data/auth
++	echo "# Example:" >>$(EMPDIR)/data/auth
++	echo "#" >>$(EMPDIR)/data/auth
++	echo "localhost" >>$(EMPDIR)/data/auth
++	echo "$(USERNAME)" >>$(EMPDIR)/data/auth
++	echo "$(IPADDR)" >>$(EMPDIR)/data/auth
++	echo "$(USERNAME)" >>$(EMPDIR)/data/auth
+ 
+ ntinstall:
+ 	-(mkdir bin)