Get all the games compiling for iOS

7 files changed, 39 insertions, 16 deletions

diff --git a/hunt/Makefile b/hunt/Makefile
index 28a76a32..e7ac83df 100644
--- a/hunt/Makefile
+++ b/hunt/Makefile
@@ -1,5 +1,13 @@
 #	$NetBSD: Makefile,v 1.1 1997/10/04 09:11:14 mrg Exp $
 
 SUBDIR=	hunt huntd
+TOPTARGETS= all clean install
+GAME_PARAM=	-DRANDOM -DREFLECT -DMONITOR -DOOZE -DFLY -DVOLCANO -DBOOTS \
+		-DOTTO
 
-.include <bsd.subdir.mk>
+$(TOPTARGETS): $(SUBDIR)
+
+$(SUBDIR): 
+	+EXTRADEFS="$(GAME_PARAM) -DINTERNET -DLOG" $(MAKE) -C $@ $(MAKECMDGOALS)
+
+.PHONY: $(TOPTARGETS) $(SUBDIR)
diff --git a/hunt/hunt/Makefile b/hunt/hunt/Makefile
index e7584aa1..211b9619 100644
--- a/hunt/hunt/Makefile
+++ b/hunt/hunt/Makefile
@@ -3,12 +3,18 @@
 PROG=	hunt
 SRCS=	connect.c hunt.c otto.c playit.c server.c
 MAN=	hunt.6
-LDADD=	-lcurses -lterminfo
-DPADD=	${LIBCURSES} ${LIBTERMINFO}
-HIDEGAME=hidegame
 
-CPPFLAGS+=-I${.CURDIR}/../include
+all: $(PROG)
 
-COPTS.hunt.c+=	${GCC_NO_STRINGOP_TRUNCATION}
+$(PROG): $(SRCS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(SRCS) $(EXTRADEFS) -I../include -lncursesw
+	$(STRIP) $(PROG)
 
-.include <bsd.prog.mk>
+install: $(PROG) $(MAN)
+	$(GINSTALL) -Dm2755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
+	$(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
+
+clean:
+	rm -f $(CLEANFILES) $(PROG)
+
+.PHONY: all clean install
diff --git a/hunt/hunt/connect.c b/hunt/hunt/connect.c
index 4c2e2f7e..7bcb2759 100644
--- a/hunt/hunt/connect.c
+++ b/hunt/hunt/connect.c
@@ -39,6 +39,7 @@ __RCSID("$NetBSD: connect.c,v 1.11 2014/03/30 05:30:28 dholland Exp $");
 #include <signal.h>
 #include <unistd.h>
 #include <assert.h>
+#include <sys/_endian.h>
 
 #include "hunt_common.h"
 #include "hunt_private.h"
diff --git a/hunt/hunt/hunt.c b/hunt/hunt/hunt.c
index ec993fe0..4d0e89e5 100644
--- a/hunt/hunt/hunt.c
+++ b/hunt/hunt/hunt.c
@@ -48,6 +48,8 @@ __RCSID("$NetBSD: hunt.c,v 1.58 2014/03/30 09:11:50 skrll Exp $");
 #include <string.h>
 #include <unistd.h>
 #include <assert.h>
+#include <sys/_types/_socklen_t.h>
+#include <netdb.h>
 
 #include "hunt_common.h"
 #include "pathnames.h"
@@ -189,7 +191,7 @@ main(int ac, char **av)
 		case 'w':
 		case 'h':
 		case 'p':
-			wanrx("Need TCP/IP for S, q, w, h, and p options.");
+			warnx("Need TCP/IP for S, q, w, h, and p options.");
 			break;
 #endif
 		case 'c':
diff --git a/hunt/hunt/playit.c b/hunt/hunt/playit.c
index be0d5a21..a03dcf17 100644
--- a/hunt/hunt/playit.c
+++ b/hunt/hunt/playit.c
@@ -53,6 +53,7 @@ __RCSID("$NetBSD: playit.c,v 1.25 2014/03/30 05:48:35 dholland Exp $");
 #define FREAD	1
 #endif
 
+#define INFTIM (-1)
 
 static int nchar_send;
 #ifdef OTTO
diff --git a/hunt/huntd/Makefile b/hunt/huntd/Makefile
index 9bce5e39..c90d71db 100644
--- a/hunt/huntd/Makefile
+++ b/hunt/huntd/Makefile
@@ -5,13 +5,17 @@ SRCS=	answer.c draw.c driver.c execute.c expl.c \
 	extern.c makemaze.c shots.c support.c terminal.c
 MAN=	huntd.6
 
-CPPFLAGS+=-I${.CURDIR}/../include
+all: $(PROG)
 
-.include <bsd.own.mk>
+$(PROG): $(SRCS)
+	$(CC) $(CFLAGS) -o $(PROG) $(SRCS) $(EXTRADEFS) -I../include
+	$(STRIP) $(PROG)
 
-# Has fallthru comment that is missed
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
-COPTS.shots.c+=        -Wno-error=implicit-fallthrough
-.endif
+install: $(PROG) $(MAN)
+	$(GINSTALL) -Dm2755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
+	$(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
 
-.include <bsd.prog.mk>
+clean:
+	rm -f $(CLEANFILES) $(PROG)
+
+.PHONY: all clean install
diff --git a/hunt/huntd/driver.c b/hunt/huntd/driver.c
index 55dad68f..01fc5945 100644
--- a/hunt/huntd/driver.c
+++ b/hunt/huntd/driver.c
@@ -54,6 +54,7 @@ __RCSID("$NetBSD: driver.c,v 1.35 2014/03/30 01:44:37 dholland Exp $");
 
 #include "hunt.h"
 #include "pathnames.h"
+#define INFTIM (-1)
 
 /*
  * There are three listening sockets in this daemon:
@@ -375,7 +376,7 @@ init(void)
 #ifdef TIOCNOTTY
 	(void) ioctl(fileno(stdout), TIOCNOTTY, NULL);
 #endif
-	(void) setpgrp(getpid(), getpid());
+	(void) setpgid(getpid(), getpid());
 	(void) signal(SIGHUP, SIG_IGN);
 	(void) signal(SIGINT, SIG_IGN);
 	(void) signal(SIGQUIT, SIG_IGN);