Update abuse to 2.0nb1:

	Avoid gets() usage and add __sparc__ to alignment needing CPUs,
	allowing it to run on my ss5.

8 files changed, 118 insertions, 84 deletions

diff --git a/games/abuse/Makefile b/games/abuse/Makefile
index ecb4f361bb4..0f666f5d063 100644
--- a/games/abuse/Makefile
+++ b/games/abuse/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2001/02/16 15:10:41 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/07/02 15:30:59 abs Exp $
 
 DISTNAME=		abuse_pd
-PKGNAME=		abuse-2.0
+PKGNAME=		abuse-2.0nb1
 CATEGORIES=		games x11
 MASTER_SITES=		http://www.crack.com/games/abuse/
 DISTFILES=		${DISTNAME}.tgz abuse_data.tar.gz
diff --git a/games/abuse/distinfo b/games/abuse/distinfo
index 55a56580738..637a77ea947 100644
--- a/games/abuse/distinfo
+++ b/games/abuse/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 02:08:17 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/07/02 15:30:59 abs Exp $
 
 SHA1 (abuse_pd.tgz) = 52a703abea31d6f00937d4cc0160af7a454e6630
 Size (abuse_pd.tgz) = 2525552 bytes
 SHA1 (abuse_data.tar.gz) = 2e7fad6b866fbbc8f34e3ac68cf2689c91596e48
 Size (abuse_data.tar.gz) = 1593160 bytes
-SHA1 (patch-aa) = 78310a49fa028f0ba313bb182bd32e4e69252cd7
-SHA1 (patch-ab) = 3a6a9152e2b797ebe9ac09583d175fe52ecd0bfd
-SHA1 (patch-ac) = e0583190b67566a54868f6ca979ba35a1826803c
-SHA1 (patch-ad) = e52b68463d68b80f2ca334de262f24cadb34492c
-SHA1 (patch-ae) = 6a2810253a6a6fc2528a25cb0ef5f824a8e753d7
+SHA1 (patch-aa) = 971c7d24af2388a0c6ab12636a209bd8f3282ae1
+SHA1 (patch-ab) = 09461b393ca4956e3f582a853465368e0a965861
+SHA1 (patch-ac) = b30031db9a89d7bf7c025674e549b08d637a89ff
+SHA1 (patch-ad) = 9003fe5ddd04be69c1d40b96ba995f453429ccb8
+SHA1 (patch-ae) = 3720352c2b73ed62e943d3c271a8e6c1f7f896d1
+SHA1 (patch-af) = 0558623285241b78372a4088e61844aa7ece7649
diff --git a/games/abuse/patches/patch-aa b/games/abuse/patches/patch-aa
index 5a0d0f9b18b..43cc8744a07 100644
--- a/games/abuse/patches/patch-aa
+++ b/games/abuse/patches/patch-aa
@@ -1,12 +1,19 @@
-$NetBSD: patch-aa,v 1.1 1998/08/27 12:54:56 garbled Exp $
---- imlib/port/unix/timing.c.orig	Fri Jul 24 07:30:09 1998
-+++ imlib/port/unix/timing.c	Fri Jul 24 07:39:44 1998
-@@ -17,3 +17,7 @@
- {
--  struct timezone tz={0,DST_USA};     
-+#ifdef __NetBSD__
-+  struct timezone tz={0,0}; /* gettimeofday is deprecated */
-+#else
-+  struct timezone tz={0,DST_USA};
-+#endif
-   gettimeofday((struct timeval *)&seconds,&tz);
+$NetBSD: patch-aa,v 1.2 2001/07/02 15:30:59 abs Exp $
+
+--- Makefile.in.orig	Mon Jul  7 19:26:39 1997
++++ Makefile.in
+@@ -37,10 +37,10 @@
+ AUTOMAKE = @AUTOMAKE@
+ AUTOHEADER = @AUTOHEADER@
+ 
+-INSTALL = @INSTALL@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL = /usr/bin/install
++INSTALL_PROGRAM = $(INSTALL) -c -s -o bin -g games -m 2755 
++INSTALL_DATA = $(INSTALL) -c -o bin -g games -m 0664 
++INSTALL_SCRIPT = $(INSTALL) -c -o bin -g games -m 0755
+ transform = @program_transform_name@
+ 
+ NORMAL_INSTALL = true
diff --git a/games/abuse/patches/patch-ab b/games/abuse/patches/patch-ab
index b2c689c68b0..978c0e55bf1 100644
--- a/games/abuse/patches/patch-ab
+++ b/games/abuse/patches/patch-ab
@@ -1,14 +1,34 @@
-$NetBSD: patch-ab,v 1.1 1998/08/27 12:54:56 garbled Exp $
---- Makefile.in.orig	Fri Jul 24 07:58:56 1998
-+++ Makefile.in	Fri Jul 24 08:02:30 1998
-@@ -39,6 +39,6 @@
+$NetBSD: patch-ab,v 1.2 2001/07/02 15:30:59 abs Exp $
+
+--- abuse/Makefile.in.orig	Wed Jul  9 08:55:21 1997
++++ abuse/Makefile.in
+@@ -37,10 +37,10 @@
+ AUTOMAKE = @AUTOMAKE@
+ AUTOHEADER = @AUTOHEADER@
  
 -INSTALL = @INSTALL@
 -INSTALL_PROGRAM = @INSTALL_PROGRAM@
 -INSTALL_DATA = @INSTALL_DATA@
 -INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL = /usr/bin/install
-+INSTALL_PROGRAM = $(INSTALL) -c -s -o bin -g games -m 2755 
-+INSTALL_DATA = $(INSTALL) -c -o bin -g games -m 0664 
-+INSTALL_SCRIPT = $(INSTALL) -c -o bin -g games -m 0755
++INSTALL = /usr/bin/install -c
++INSTALL_PROGRAM = $(INSTALL) -s -o bin -g games -m 2755 
++INSTALL_DATA = $(INSTALL) -o bin -g games -m 0664
++INSTALL_SCRIPT = $(INSTALL) -o bin -g games -m 0755
  transform = @program_transform_name@
+ 
+ NORMAL_INSTALL = true
+@@ -239,11 +239,11 @@
+ 
+ install-pkglibPROGRAMS: $(pkglib_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(pkglibdir)
++	$(mkinstalldirs) $(bindir)
+ 	@list='$(pkglib_PROGRAMS)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    echo "  $(INSTALL_PROGRAM) $$p $(pkglibdir)/`echo $$p|sed '$(transform)'`"; \
+-	     $(INSTALL_PROGRAM) $$p $(pkglibdir)/`echo $$p|sed '$(transform)'`; \
++	    echo "  $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`"; \
++	     $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
+ 	  else :; fi; \
+ 	done
+ 
diff --git a/games/abuse/patches/patch-ac b/games/abuse/patches/patch-ac
index b25ee14fa72..38da909628c 100644
--- a/games/abuse/patches/patch-ac
+++ b/games/abuse/patches/patch-ac
@@ -1,33 +1,11 @@
-$NetBSD: patch-ac,v 1.2 1998/08/29 12:19:46 garbled Exp $
---- abuse/Makefile.in.orig	Wed Jul  9 00:55:21 1997
-+++ abuse/Makefile.in	Sat Aug 29 04:31:24 1998
-@@ -37,10 +37,10 @@
- AUTOMAKE = @AUTOMAKE@
- AUTOHEADER = @AUTOHEADER@
- 
--INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@
--INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL = /usr/bin/install -c
-+INSTALL_PROGRAM = $(INSTALL) -s -o bin -g games -m 2755 
-+INSTALL_DATA = $(INSTALL) -o bin -g games -m 0664
-+INSTALL_SCRIPT = $(INSTALL) -o bin -g games -m 0755
- transform = @program_transform_name@
- 
- NORMAL_INSTALL = true
-@@ -239,11 +239,11 @@
- 
- install-pkglibPROGRAMS: $(pkglib_PROGRAMS)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(pkglibdir)
-+	$(mkinstalldirs) $(bindir)
- 	@list='$(pkglib_PROGRAMS)'; for p in $$list; do \
- 	  if test -f $$p; then \
--	    echo "  $(INSTALL_PROGRAM) $$p $(pkglibdir)/`echo $$p|sed '$(transform)'`"; \
--	     $(INSTALL_PROGRAM) $$p $(pkglibdir)/`echo $$p|sed '$(transform)'`; \
-+	    echo "  $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`"; \
-+	     $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
- 	  else :; fi; \
- 	done
- 
+$NetBSD: patch-ac,v 1.3 2001/07/02 15:30:59 abs Exp $
+
+--- abuse/abuse.in.orig	Wed Jul  9 08:54:43 1997
++++ abuse/abuse.in
+@@ -27,5 +27,5 @@
+ if [ x$TERM = xlinux ]; then
+   abuse.console ${1:+"$@"}
+ else
+-  abuse.x11R6 ${1:+"$@"}
++  @exec_prefix@/bin/abuse.x11R6 ${1:+"$@"}
+ fi
diff --git a/games/abuse/patches/patch-ad b/games/abuse/patches/patch-ad
index c2c9a6181b1..86268e33cb3 100644
--- a/games/abuse/patches/patch-ad
+++ b/games/abuse/patches/patch-ad
@@ -1,10 +1,19 @@
-$NetBSD: patch-ad,v 1.2 1998/08/29 12:19:46 garbled Exp $
---- abuse/abuse.in.orig	Wed Jul  9 00:54:43 1997
-+++ abuse/abuse.in	Sat Aug 29 04:26:04 1998
-@@ -27,5 +27,5 @@
- if [ x$TERM = xlinux ]; then
-   abuse.console ${1:+"$@"}
- else
--  abuse.x11R6 ${1:+"$@"}
-+  @exec_prefix@/bin/abuse.x11R6 ${1:+"$@"}
- fi
+$NetBSD: patch-ad,v 1.3 2001/07/02 15:30:59 abs Exp $
+
+--- abuse/inc/bus_type.hpp.orig	Wed Jan 24 06:10:12 1996
++++ abuse/inc/bus_type.hpp
+@@ -1,6 +1,14 @@
+ #ifndef BUS_TYPE_HPP
+ #define BUS_TYPE_HPP
+ 
++#ifdef __arm__
++#define WORD_ALLIGN 1
++#endif
++
++#ifdef __sparc__
++#define WORD_ALLIGN 1
++#endif
++
+ #ifdef __sgi
+ #define WORD_ALLIGN 1
+ #endif
diff --git a/games/abuse/patches/patch-ae b/games/abuse/patches/patch-ae
index 94b26af9748..7fe11695cc1 100644
--- a/games/abuse/patches/patch-ae
+++ b/games/abuse/patches/patch-ae
@@ -1,15 +1,17 @@
-$NetBSD: patch-ae,v 1.1 2001/03/22 10:45:56 wiz Exp $
+$NetBSD: patch-ae,v 1.2 2001/07/02 15:30:59 abs Exp $
 
---- abuse/inc/bus_type.hpp.orig	Wed Jan 24 07:10:12 1996
-+++ abuse/inc/bus_type.hpp
-@@ -1,6 +1,10 @@
- #ifndef BUS_TYPE_HPP
- #define BUS_TYPE_HPP
+--- abuse/src/net/mac/tcpip.c.orig	Mon Jul  2 14:51:02 2001
++++ abuse/src/net/mac/tcpip.c
+@@ -118,8 +118,11 @@
+ 	  }
+ 	  else
+ 	  {
++		  char *ptr;
+ 		  printf("Enter ip address:");
+-		  gets(my_name);
++		  fgets(my_name, 100, stdin);
++		  if (ptr = strchr(my_name, '\n'))
++			*ptr = 0;
+ 	  }
+ 	}  
  
-+#ifdef __arm__
-+#define WORD_ALLIGN 1
-+#endif
-+
- #ifdef __sgi
- #define WORD_ALLIGN 1
- #endif
diff --git a/games/abuse/patches/patch-af b/games/abuse/patches/patch-af
new file mode 100644
index 00000000000..a497016396d
--- /dev/null
+++ b/games/abuse/patches/patch-af
@@ -0,0 +1,17 @@
+$NetBSD: patch-af,v 1.1 2001/07/02 15:30:59 abs Exp $
+
+--- imlib/port/unix/timing.c.orig	Sun Jul 23 11:14:13 1995
++++ imlib/port/unix/timing.c
+@@ -15,7 +15,11 @@
+ 
+ void time_marker::get_time()
+ {
+-  struct timezone tz={0,DST_USA};     
++#ifdef __NetBSD__
++  struct timezone tz={0,0}; /* gettimeofday is deprecated */
++#else
++  struct timezone tz={0,DST_USA};
++#endif
+   gettimeofday((struct timeval *)&seconds,&tz);
+ }
+