Thu Sep 25 12:25:07 2014 UTC ()
Fix build on SunOS.  Make it more likely that other OPSYS can build this
package too.


(jperkin)
diff -r1.24 -r1.25 pkgsrc/games/wormz/Makefile
diff -r1.13 -r1.14 pkgsrc/games/wormz/distinfo
diff -r1.5 -r1.6 pkgsrc/games/wormz/patches/patch-aa
diff -r1.3 -r1.4 pkgsrc/games/wormz/patches/patch-ab
cvs diff -r1.24 -r1.25 pkgsrc/games/wormz/Makefile (expand / switch to unified diff)

--- pkgsrc/games/wormz/Makefile 2013/01/11 13:26:20 1.24
+++ pkgsrc/games/wormz/Makefile 2014/09/25 12:25:07 1.25
@@ -1,29 +1,27 @@ @@ -1,29 +1,27 @@
1# $NetBSD: Makefile,v 1.24 2013/01/11 13:26:20 joerg Exp $ 1# $NetBSD: Makefile,v 1.25 2014/09/25 12:25:07 jperkin Exp $
2# 2#
3 3
4DISTNAME= Wormz-1.0b5 4DISTNAME= Wormz-1.0b5
5PKGNAME= wormz-1.0b5 5PKGNAME= wormz-1.0b5
6PKGREVISION= 2 6PKGREVISION= 2
7CATEGORIES= games x11 7CATEGORIES= games x11
8MASTER_SITES= http://lide.punknet.cz/miri/ 8MASTER_SITES= http://lide.punknet.cz/miri/
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://lide.punknet.cz/miri/Wormz.html 11HOMEPAGE= http://lide.punknet.cz/miri/Wormz.html
12COMMENT= Networked game for X11 12COMMENT= Networked game for X11
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15WRKSRC= ${WRKDIR}/Wormz 15WRKSRC= ${WRKDIR}/Wormz
16USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
17USE_TOOLS+= gmake 17USE_TOOLS+= gmake
18 18
19post-extract: 19post-extract:
20 ${MKDIR} ${WRKSRC}/NetBSD 20 ${MKDIR} ${WRKSRC}/${OPSYS}
21 ${TOUCH} ${WRKSRC}/NetBSD/.depend 21 ${TOUCH} ${WRKSRC}/${OPSYS}/.depend
22 ${MKDIR} ${WRKSRC}/DragonFly 
23 ${TOUCH} ${WRKSRC}/DragonFly/.depend 
24 22
25do-configure: 23do-configure:
26 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} depend 24 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} depend
27 25
28.include "../../x11/libXext/buildlink3.mk" 26.include "../../x11/libXext/buildlink3.mk"
29.include "../../mk/bsd.pkg.mk" 27.include "../../mk/bsd.pkg.mk"
cvs diff -r1.13 -r1.14 pkgsrc/games/wormz/distinfo (expand / switch to unified diff)

--- pkgsrc/games/wormz/distinfo 2013/01/11 13:26:20 1.13
+++ pkgsrc/games/wormz/distinfo 2014/09/25 12:25:07 1.14
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: distinfo,v 1.13 2013/01/11 13:26:20 joerg Exp $ 1$NetBSD: distinfo,v 1.14 2014/09/25 12:25:07 jperkin Exp $
2 2
3SHA1 (Wormz-1.0b5.tar.gz) = a5e45e90fcc0eb4d188508bdffe71220ddcd20a4 3SHA1 (Wormz-1.0b5.tar.gz) = a5e45e90fcc0eb4d188508bdffe71220ddcd20a4
4RMD160 (Wormz-1.0b5.tar.gz) = 38411dcc3611d70d5873bf512439cd707372ef9e 4RMD160 (Wormz-1.0b5.tar.gz) = 38411dcc3611d70d5873bf512439cd707372ef9e
5Size (Wormz-1.0b5.tar.gz) = 436954 bytes 5Size (Wormz-1.0b5.tar.gz) = 436954 bytes
6SHA1 (patch-aa) = 4aaf583300a445de33651983433199c3c503e77c 6SHA1 (patch-aa) = 4b591f9ac5bc4bf4b7864e4400ff6f0b5cd6ed20
7SHA1 (patch-ab) = b549a5afb22695695bbc1f6c07836632ea57bc65 7SHA1 (patch-ab) = d62c08ae21475f43f9e0ef25421b672943b24ed4
8SHA1 (patch-ac) = 7a7764b24bd5c1c6f5121508b9bf618a71cdc8de 8SHA1 (patch-ac) = 7a7764b24bd5c1c6f5121508b9bf618a71cdc8de
9SHA1 (patch-ad) = 8754a4a826273354e5b98586c44add9b818a3d53 9SHA1 (patch-ad) = 8754a4a826273354e5b98586c44add9b818a3d53
10SHA1 (patch-ae) = deaf33d7d7e584965e9496f8214a9a2505e75caa 10SHA1 (patch-ae) = deaf33d7d7e584965e9496f8214a9a2505e75caa
11SHA1 (patch-af) = 0ff265b68256d11581cb10a7a68234f9c3de834e 11SHA1 (patch-af) = 0ff265b68256d11581cb10a7a68234f9c3de834e
12SHA1 (patch-ag) = d1e50491f1dcdcc6e35540f4bebc40504263c8a3 12SHA1 (patch-ag) = d1e50491f1dcdcc6e35540f4bebc40504263c8a3
13SHA1 (patch-ah) = e3386f64aadbd8d6a1d9f1ed9a8677351321a5e1 13SHA1 (patch-ah) = e3386f64aadbd8d6a1d9f1ed9a8677351321a5e1
14SHA1 (patch-ai) = 74bcb1fbb9ff8f3c7343e0a88a29b588306298c3 14SHA1 (patch-ai) = 74bcb1fbb9ff8f3c7343e0a88a29b588306298c3
15SHA1 (patch-aj) = 08e2f50d2eda949f5280032dc261da7d17507d06 15SHA1 (patch-aj) = 08e2f50d2eda949f5280032dc261da7d17507d06
16SHA1 (patch-ak) = ee385419310c476d27703b856b8a11f9eddcae9d 16SHA1 (patch-ak) = ee385419310c476d27703b856b8a11f9eddcae9d
17SHA1 (patch-al) = 77ccd9a3d087024b66c9b9d77e742e3c8ed767ce 17SHA1 (patch-al) = 77ccd9a3d087024b66c9b9d77e742e3c8ed767ce
18SHA1 (patch-am) = aa0b9f0b06998f1138795a1d13cd2e968cf48c49 18SHA1 (patch-am) = aa0b9f0b06998f1138795a1d13cd2e968cf48c49
19SHA1 (patch-an) = 14c9c4ef9f8ee9faf010b797dec0c8dc57234a71 19SHA1 (patch-an) = 14c9c4ef9f8ee9faf010b797dec0c8dc57234a71
20SHA1 (patch-ao) = 90e77ae1d2f1e606eba06ee985b504e4fa4431c8 20SHA1 (patch-ao) = 90e77ae1d2f1e606eba06ee985b504e4fa4431c8
cvs diff -r1.5 -r1.6 pkgsrc/games/wormz/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/games/wormz/patches/patch-aa 2011/05/25 06:11:46 1.5
+++ pkgsrc/games/wormz/patches/patch-aa 2014/09/25 12:25:07 1.6
@@ -1,28 +1,41 @@ @@ -1,28 +1,41 @@
1$NetBSD: patch-aa,v 1.5 2011/05/25 06:11:46 obache Exp $ 1$NetBSD: patch-aa,v 1.6 2014/09/25 12:25:07 jperkin Exp $
2 2
3--- Makefile.orig 1998-07-14 13:41:40.000000000 +0000 3--- Makefile.orig 1998-07-14 13:41:40.000000000 +0000
4+++ Makefile 4+++ Makefile
5@@ -3,8 +3,8 @@ 5@@ -3,8 +3,8 @@
6  6
7 #BinInstallPath=$(ARCH)/ 7 #BinInstallPath=$(ARCH)/
8 #LibInstallPath=images/ 8 #LibInstallPath=images/
9-BinInstallPath=/usr/X11R6/bin/ 9-BinInstallPath=/usr/X11R6/bin/
10-LibInstallPath=/usr/lib/Wormz/ 10-LibInstallPath=/usr/lib/Wormz/
11+BinInstallPath=$(PREFIX)/bin/ 11+BinInstallPath=$(PREFIX)/bin/
12+LibInstallPath=$(PREFIX)/share/Wormz/ 12+LibInstallPath=$(PREFIX)/share/Wormz/
13  13
14 #AllDepths=16 14 #AllDepths=16
15 AllDepths=8 16 24 15 AllDepths=8 16 24
 16@@ -18,9 +18,9 @@ ifndef TYPEOS
 17 TYPEOS=$(shell uname)
 18 endif
 19
 20-ifeq ($(TYPEOS),Solaris)
 21-ARCH=Solaris
 22-EXTRALIBS=-lsocket -lnsl -lm -lstdc++ -lucb -lposix4
 23+ifeq ($(TYPEOS),SunOS)
 24+ARCH=SunOS
 25+EXTRALIBS=-lsocket -lnsl -lm
 26 else
 27 ifeq ($(TYPEOS),IRIX)
 28 ARCH=Irix
16@@ -29,13 +29,23 @@ else 29@@ -29,13 +29,23 @@ else
17 ifeq ($(TYPEOS),Linux) 30 ifeq ($(TYPEOS),Linux)
18 ARCH=Linux 31 ARCH=Linux
19 EXTRALIBS=-lm 32 EXTRALIBS=-lm
20+else 33+else
21+ifeq ($(TYPEOS),NetBSD) 34+ifeq ($(TYPEOS),NetBSD)
22+ARCH=NetBSD 35+ARCH=NetBSD
23+EXTRALIBS=-lm 36+EXTRALIBS=-lm
24+else 37+else
25+ifeq ($(TYPEOS),DragonFly) 38+ifeq ($(TYPEOS),DragonFly)
26+ARCH=DragonFly 39+ARCH=DragonFly
27+EXTRALIBS=-lm 40+EXTRALIBS=-lm
28+else 41+else
cvs diff -r1.3 -r1.4 pkgsrc/games/wormz/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/games/wormz/patches/patch-ab 2006/04/21 09:00:23 1.3
+++ pkgsrc/games/wormz/patches/patch-ab 2014/09/25 12:25:07 1.4
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1$NetBSD: patch-ab,v 1.3 2006/04/21 09:00:23 joerg Exp $ 1$NetBSD: patch-ab,v 1.4 2014/09/25 12:25:07 jperkin Exp $
2 2
3--- ./include/Compat.hh.orig Tue Jul 7 23:02:01 1998 3--- include/Compat.hh.orig 1998-07-07 21:02:01.000000000 +0000
4+++ ./include/Compat.hh Sat Feb 5 18:55:12 2000 4+++ include/Compat.hh
5@@ -14,7 +14,8 @@ 5@@ -14,7 +14,8 @@ int gethostname(char * name, int namelen
6  6
7 #ifndef Linux 7 #ifndef Linux
8  8
9-#include <bool.h> 9-#include <bool.h>
10+#define TRUE 1 10+#define TRUE 1
11+#define FALSE 0 11+#define FALSE 0
12 #include <string.h> 12 #include <string.h>
13  13
14 inline void bzero(void * data, int size) 14 inline void bzero(void * data, int size)
15@@ -22,7 +23,9 @@ 15@@ -22,7 +23,9 @@ inline void bzero(void * data, int size)
16 memset(data, 0, size); 16 memset(data, 0, size);
17 } 17 }
18  18
19+#if !defined(__NetBSD__) && !defined(__DragonFly__) 19+#if !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__sun)
20 const double PI=3.1415926535797; 20 const double PI=3.1415926535797;
21+#endif 21+#endif
22  22
23 inline int byteswap(int old) 23 inline int byteswap(int old)
24 { 24 {
25@@ -34,12 +37,15 @@ 25@@ -34,12 +37,15 @@ inline int byteswap(int old)
26  26
27 inline int byteswapshort(unsigned short old) 27 inline int byteswapshort(unsigned short old)
28 { 28 {
29- return ((old & 0xff) << 8) 29- return ((old & 0xff) << 8)
30- + ((old & 0xff00) >> 8); 30- + ((old & 0xff00) >> 8);
31+/* return ((old & 0xff) << 8) 31+/* return ((old & 0xff) << 8)
32+ + ((old & 0xff00) >> 8);*/ 32+ + ((old & 0xff00) >> 8);*/
33+ return(old); 33+ return(old);
34 } 34 }
35+#if !defined(__NetBSD__) && !defined(__DragonFly__) 35+#if !defined(__NetBSD__) && !defined(__DragonFly__)
36 extern "C" { 36 extern "C" {
37 int usleep(unsigned int); 37 int usleep(unsigned int);
38 } 38 }