Fix build on SunOS. Make it more likely that other OPSYS can build this

package too.

4 files changed, 27 insertions, 16 deletions

diff --git a/games/wormz/Makefile b/games/wormz/Makefile
index 3e9086723e1..f0648d06477 100644
--- a/games/wormz/Makefile
+++ b/games/wormz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2013/01/11 13:26:20 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2014/09/25 12:25:07 jperkin Exp $
 #
 
 DISTNAME=		Wormz-1.0b5
@@ -17,10 +17,8 @@ USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake
 
 post-extract:
-	${MKDIR} ${WRKSRC}/NetBSD
-	${TOUCH} ${WRKSRC}/NetBSD/.depend
-	${MKDIR} ${WRKSRC}/DragonFly
-	${TOUCH} ${WRKSRC}/DragonFly/.depend
+	${MKDIR} ${WRKSRC}/${OPSYS}
+	${TOUCH} ${WRKSRC}/${OPSYS}/.depend
 
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} depend
diff --git a/games/wormz/distinfo b/games/wormz/distinfo
index c4d548d0f6d..62603d76c63 100644
--- a/games/wormz/distinfo
+++ b/games/wormz/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.13 2013/01/11 13:26:20 joerg Exp $
+$NetBSD: distinfo,v 1.14 2014/09/25 12:25:07 jperkin Exp $
 
 SHA1 (Wormz-1.0b5.tar.gz) = a5e45e90fcc0eb4d188508bdffe71220ddcd20a4
 RMD160 (Wormz-1.0b5.tar.gz) = 38411dcc3611d70d5873bf512439cd707372ef9e
 Size (Wormz-1.0b5.tar.gz) = 436954 bytes
-SHA1 (patch-aa) = 4aaf583300a445de33651983433199c3c503e77c
-SHA1 (patch-ab) = b549a5afb22695695bbc1f6c07836632ea57bc65
+SHA1 (patch-aa) = 4b591f9ac5bc4bf4b7864e4400ff6f0b5cd6ed20
+SHA1 (patch-ab) = d62c08ae21475f43f9e0ef25421b672943b24ed4
 SHA1 (patch-ac) = 7a7764b24bd5c1c6f5121508b9bf618a71cdc8de
 SHA1 (patch-ad) = 8754a4a826273354e5b98586c44add9b818a3d53
 SHA1 (patch-ae) = deaf33d7d7e584965e9496f8214a9a2505e75caa
diff --git a/games/wormz/patches/patch-aa b/games/wormz/patches/patch-aa
index 1d9dbcdc341..28321178906 100644
--- a/games/wormz/patches/patch-aa
+++ b/games/wormz/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2011/05/25 06:11:46 obache Exp $
+$NetBSD: patch-aa,v 1.6 2014/09/25 12:25:07 jperkin Exp $
 
 --- Makefile.orig	1998-07-14 13:41:40.000000000 +0000
 +++ Makefile
@@ -13,6 +13,19 @@ $NetBSD: patch-aa,v 1.5 2011/05/25 06:11:46 obache Exp $
  
  #AllDepths=16
  AllDepths=8 16 24
+@@ -18,9 +18,9 @@ ifndef TYPEOS
+ TYPEOS=$(shell uname)
+ endif
+ 
+-ifeq ($(TYPEOS),Solaris)
+-ARCH=Solaris
+-EXTRALIBS=-lsocket -lnsl -lm -lstdc++ -lucb -lposix4
++ifeq ($(TYPEOS),SunOS)
++ARCH=SunOS
++EXTRALIBS=-lsocket -lnsl -lm
+ else
+ ifeq ($(TYPEOS),IRIX)
+ ARCH=Irix
 @@ -29,13 +29,23 @@ else
  ifeq ($(TYPEOS),Linux)
  ARCH=Linux
diff --git a/games/wormz/patches/patch-ab b/games/wormz/patches/patch-ab
index 5fc2491a6eb..82b459e6c91 100644
--- a/games/wormz/patches/patch-ab
+++ b/games/wormz/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2006/04/21 09:00:23 joerg Exp $
+$NetBSD: patch-ab,v 1.4 2014/09/25 12:25:07 jperkin Exp $
 
---- ./include/Compat.hh.orig	Tue Jul  7 23:02:01 1998
-+++ ./include/Compat.hh	Sat Feb  5 18:55:12 2000
-@@ -14,7 +14,8 @@
+--- include/Compat.hh.orig	1998-07-07 21:02:01.000000000 +0000
++++ include/Compat.hh
+@@ -14,7 +14,8 @@ int gethostname(char * name, int namelen
  
  #ifndef Linux
  
@@ -12,17 +12,17 @@ $NetBSD: patch-ab,v 1.3 2006/04/21 09:00:23 joerg Exp $
  #include <string.h>
  
  inline void bzero(void * data, int size)
-@@ -22,7 +23,9 @@
+@@ -22,7 +23,9 @@ inline void bzero(void * data, int size)
  	memset(data, 0, size);
  }
  
-+#if !defined(__NetBSD__) && !defined(__DragonFly__)
++#if !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__sun)
  const double PI=3.1415926535797;
 +#endif
  
  inline int byteswap(int old)
  {
-@@ -34,12 +37,15 @@
+@@ -34,12 +37,15 @@ inline int byteswap(int old)
  
  inline int byteswapshort(unsigned short old)
  {