Update 0.7 --> 0.75, fixing ncurses 6.2 build issues.

PR:		244568
Submitted by:	Joachim Werner <jockl at pianojockl.org> (maintainer)
Reported by:	Joachim Werner <jockl at pianojockl.org> (maintainer)
Approved by:	maintainer (implicit)
MFH:		2020Q2

20 files changed, 31 insertions, 300 deletions

diff --git a/games/bsdgames/Makefile b/games/bsdgames/Makefile
index 1ed3cb3b6466..cbcdf6347e6a 100644
--- a/games/bsdgames/Makefile
+++ b/games/bsdgames/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bsdgames
-PORTVERSION=	0.7
+PORTVERSION=	0.75
 DISTVERSIONPREFIX=	v
 PORTEPOCH=	2
 CATEGORIES=	games
diff --git a/games/bsdgames/distinfo b/games/bsdgames/distinfo
index ecab8ca3f2e1..0409b048ec99 100644
--- a/games/bsdgames/distinfo
+++ b/games/bsdgames/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1574784789
-SHA256 (pianojockl-bsdgames-v0.7_GH0.tar.gz) = f79dec751ac78cfef5f80453e6c771052eaa9e9e55ab779799b78a82b6e004fc
-SIZE (pianojockl-bsdgames-v0.7_GH0.tar.gz) = 2349706
+TIMESTAMP = 1583224301
+SHA256 (pianojockl-bsdgames-v0.75_GH0.tar.gz) = e0b40634300598db73d8ee5fa38cc52098770850c3f0538042b9e4402115a65e
+SIZE (pianojockl-bsdgames-v0.75_GH0.tar.gz) = 2500764
diff --git a/games/bsdgames/files/patch-Makefile b/games/bsdgames/files/patch-Makefile
deleted file mode 100644
index 7dc20b6c97e9..000000000000
--- a/games/bsdgames/files/patch-Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
---- Makefile.orig	2018-06-15 14:40:00 UTC
-+++ Makefile
-@@ -5,35 +5,25 @@ SUBDIR= adventure \
- 	arithmetic \
- 	atc \
- 	backgammon \
--	banner \
- 	battlestar \
- 	bcd \
- 	bs \
- 	boggle \
--	caesar \
- 	canfield \
- 	cribbage \
- 	colorbars \
--	factor \
- 	fish \
--	fortune \
--	grdc \
- 	hack \
- 	hals_end \
- 	hangman \
- 	hunt \
- 	larn \
- 	mille \
--	morse \
--	number \
- 	phantasia \
- 	pig \
--	pom \
- 	ppt \
--	primes \
- 	quiz \
- 	rain \
--	random \
- 	robots \
- 	rogue \
- 	sail \
diff --git a/games/bsdgames/files/patch-Makefile.inc b/games/bsdgames/files/patch-Makefile.inc
deleted file mode 100644
index cdef802de91e..000000000000
--- a/games/bsdgames/files/patch-Makefile.inc
+++ /dev/null
@@ -1,68 +0,0 @@
---- Makefile.inc.orig	2018-11-23 03:38:50 UTC
-+++ Makefile.inc
-@@ -1,19 +1,16 @@
- #	@(#)Makefile.inc	8.1 (Berkeley) 5/31/93
- # $FreeBSD: src/games/Makefile.inc,v 1.10.2.2 2002/02/18 16:02:39 ru Exp $
-+# $DragonFly: src/games/Makefile.inc,v 1.3 2006/10/08 16:22:34 pavalos Exp $
- 
--BINDIR?=	/usr/games
--FILESDIR?=	${SHAREDIR}/games
--WARNS?=		6
--
- # These games write to /var/games/
- .if defined(VARGAMES)
- BINGRP=		games
--BINMODE=	550
-+BINMODE=	2555
- .endif
- 
- # Handle libcrypto dependency
- .if defined(GAMESCRYPTO)
--LDADD+=		-lprivate_crypto
-+LDADD+=		-lcrypto
- DPADD+=		${LIBCRYPTO}
- CFLAGS+=	-I${_SHLIBDIRPREFIX}/usr/include/priv
- LDFLAGS+=       ${PRIVATELIB_LDFLAGS}
-@@ -22,7 +19,40 @@ LDFLAGS+=       ${PRIVATELIB_LDFLAGS}
- # Handle libncurses dependency
- .if defined(GAMESCURSES)
- DPADD+=		${LIBNCURSES}
--LDADD+=		-lprivate_ncurses
--CFLAGS+=	-I${_SHLIBDIRPREFIX}/usr/include/priv/ncurses
-+LDADD+=		-lncurses
-+CFLAGS+=	-I${_SHLIBDIRPREFIX}/usr/include/ncurses
- LDFLAGS+=	${PRIVATELIB_LDFLAGS}
- .endif
-+
-+PREFIX?=	/usr/local
-+BINDIR?=	${PREFIX}/bin
-+SHAREDIR=	${PREFIX}/share
-+MANDIR=		${PREFIX}/man/man
-+FILESDIR?=	${SHAREDIR}/games
-+WARNS?=		6
-+
-+# cribbed from DragonflyBSD build system
-+
-+NXCC?=		${CC}
-+NXCFLAGS?=	${CFLAGS:N-mtune*:N-mcpu*:N-march*}
-+
-+.SUFFIXES: .nx .no
-+
-+# .no == native object file, for helper code when cross building.
-+#
-+.c.no:
-+	${NXCC} ${_${.IMPSRC:T}_FLAGS} ${NXCFLAGS} -c ${.IMPSRC} -o ${.TARGET}
-+
-+.y.no:
-+	${YACC} ${YFLAGS} ${.IMPSRC}
-+	${NXCC} ${NXCFLAGS} -c y.tab.c -o ${.TARGET}
-+	rm -f y.tab.c
-+
-+.l.no:
-+	${LEX} ${LFLAGS} -o${.TARGET}.c ${.IMPSRC}
-+	${NXCC} ${NXCFLAGS} -c ${.TARGET}.c -o ${.TARGET}
-+	rm -f ${.TARGET}.c
-+
-+.no.nx .c.nx:
-+	${NXCC} ${_${.IMPSRC:T}_FLAGS} ${NXCFLAGS} ${NXLDFLAGS} ${.IMPSRC} \
-+	    ${NXLDLIBS} -o ${.TARGET}
diff --git a/games/bsdgames/files/patch-adventure_adventure_Makefile b/games/bsdgames/files/patch-adventure_adventure_Makefile
deleted file mode 100644
index e68c7cb1d8f8..000000000000
--- a/games/bsdgames/files/patch-adventure_adventure_Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
---- adventure/adventure/Makefile.orig	2019-03-07 17:13:52 UTC
-+++ adventure/adventure/Makefile
-@@ -9,6 +9,6 @@ MAN=	adventure.6
- CLEANFILES=data.c
- 
- data.c: glorkz setup.c
--	${.OBJDIR}/../setup/setup.nx ${.CURDIR}/../glorkz > data.c
-+	${.OBJDIR}/../setup/setup ${.CURDIR}/../glorkz > data.c
- 
- .include <bsd.prog.mk>
diff --git a/games/bsdgames/files/patch-adventure_setup_Makefile b/games/bsdgames/files/patch-adventure_setup_Makefile
deleted file mode 100644
index 0725fcfa357b..000000000000
--- a/games/bsdgames/files/patch-adventure_setup_Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
---- adventure/setup/Makefile.orig	2019-03-07 16:48:05 UTC
-+++ adventure/setup/Makefile
-@@ -2,10 +2,11 @@
- 
- PROG=	setup
- CFLAGS+=-I${.CURDIR}/..
-+MK_MAN= no
- 
- build-tools: setup.nx
- 
- # this setup is used in place, it is not installed anywhere
- install:
- 
--.include <bsd.hostprog.mk>
-+.include <bsd.prog.mk>
diff --git a/games/bsdgames/files/patch-battlestar_BSDmakefile b/games/bsdgames/files/patch-battlestar_BSDmakefile
new file mode 100644
index 000000000000..c378a3184928
--- /dev/null
+++ b/games/bsdgames/files/patch-battlestar_BSDmakefile
@@ -0,0 +1,27 @@
+--- battlestar/BSDmakefile.orig	2020-02-26 16:22:47 UTC
++++ battlestar/BSDmakefile
+@@ -1,5 +1,5 @@
+-#	$NetBSD: Makefile,v 1.9 2001/10/19 03:06:09 tv Exp $
+ #	@(#)Makefile	8.1 (Berkeley) 5/31/93
++# $FreeBSD: src/games/battlestar/Makefile,v 1.5.2.3 2002/08/07 16:31:41 ru Exp $
+ 
+ PROG=	battlestar
+ SRCS=	battlestar.c command1.c command2.c command3.c command4.c \
+@@ -7,9 +7,13 @@ SRCS=	battlestar.c command1.c command2.c command3.c co
+ 	init.c cypher.c getcom.c parse.c room.c save.c fly.c misc.c \
+ 	globals.c dayfile.c nightfile.c dayobjs.c nightobjs.c words.c
+ MAN=	battlestar.6
+-DPADD=	${LIBCURSES}
+-LDADD=	-lcurses
+-HIDEGAME=hidegame
+-SETGIDGAME=yes
++VARGAMES=
++GAMESCURSES=
++
++beforeinstall:
++.if !exists(${DESTDIR}/var/games/battlestar.log)
++	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
++	    ${DESTDIR}/var/games/battlestar.log
++.endif
+ 
+ .include <bsd.prog.mk>
diff --git a/games/bsdgames/files/patch-boggle_boggle_extern.h b/games/bsdgames/files/patch-boggle_boggle_extern.h
deleted file mode 100644
index 60e5266a99cc..000000000000
--- a/games/bsdgames/files/patch-boggle_boggle_extern.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- boggle/boggle/extern.h.orig	2019-03-07 16:44:58 UTC
-+++ boggle/boggle/extern.h
-@@ -33,6 +33,7 @@
-  */
- 
- #include <setjmp.h>
-+#include <time.h>
- 
- extern int tlimit;
- extern time_t start_t;
diff --git a/games/bsdgames/files/patch-boggle_dictfiles_Makefile b/games/bsdgames/files/patch-boggle_dictfiles_Makefile
deleted file mode 100644
index 8f4666958c79..000000000000
--- a/games/bsdgames/files/patch-boggle_dictfiles_Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
---- boggle/dictfiles/Makefile.orig	2018-11-23 03:38:50 UTC
-+++ boggle/dictfiles/Makefile
-@@ -13,9 +13,9 @@ FILESDIR=	${SHAREDIR}/games/boggle
- CLEANFILES=	dictindex dictionary
- 
- dictionary:
--	${.OBJDIR}/../mkdict/mkdict.nx < ${BOOGLEWORDS} > ${.TARGET}
-+	${.OBJDIR}/../mkdict/mkdict < ${BOOGLEWORDS} > ${.TARGET}
- 
- dictindex: dictionary
--	${.OBJDIR}/../mkindex/mkindex.nx < ${.ALLSRC} > ${.TARGET}
-+	${.OBJDIR}/../mkindex/mkindex < ${.ALLSRC} > ${.TARGET}
- 
- .include <bsd.prog.mk>
diff --git a/games/bsdgames/files/patch-boggle_mkdict_Makefile b/games/bsdgames/files/patch-boggle_mkdict_Makefile
deleted file mode 100644
index b8d468875764..000000000000
--- a/games/bsdgames/files/patch-boggle_mkdict_Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
---- boggle/mkdict/Makefile.orig	2019-03-07 16:39:47 UTC
-+++ boggle/mkdict/Makefile
-@@ -4,10 +4,11 @@
- 
- PROG=	mkdict
- CFLAGS+=-I${.CURDIR}/../boggle
-+MK_MAN= no
- 
- build-tools: mkdict.nx
- 
- # this mkdict is used in place, it is not installed anywhere
- install:
- 
--.include <bsd.hostprog.mk>
-+.include <bsd.prog.mk>
diff --git a/games/bsdgames/files/patch-boggle_mkindex_Makefile b/games/bsdgames/files/patch-boggle_mkindex_Makefile
deleted file mode 100644
index 480905067e7d..000000000000
--- a/games/bsdgames/files/patch-boggle_mkindex_Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
---- boggle/mkindex/Makefile.orig	2018-11-23 03:38:50 UTC
-+++ boggle/mkindex/Makefile
-@@ -4,10 +4,11 @@
- 
- PROG=	mkindex
- CFLAGS+=-I${.CURDIR}/../boggle
-+MK_MAN= no
- 
- build-tools: mkindex.nx
- 
- # this mkindex is used in place, it is not installed anywhere
- install:
- 
--.include <bsd.hostprog.mk>
-+.include <bsd.prog.mk>
diff --git a/games/bsdgames/files/patch-canfield_cfscores_Makefile b/games/bsdgames/files/patch-canfield_cfscores_Makefile
deleted file mode 100644
index f43aabcc470e..000000000000
--- a/games/bsdgames/files/patch-canfield_cfscores_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- canfield/cfscores/Makefile.orig	2018-11-23 03:38:50 UTC
-+++ canfield/cfscores/Makefile
-@@ -3,7 +3,7 @@
- 
- PROG=	cfscores
- CFLAGS+=-I${.CURDIR}/../canfield
--NOMAN=	noman
-+MK_MAN= no
- 
- .include "../../Makefile.inc"
- .include <bsd.prog.mk>
diff --git a/games/bsdgames/files/patch-colorbars_colorbars.c b/games/bsdgames/files/patch-colorbars_colorbars.c
deleted file mode 100644
index ce8d83688687..000000000000
--- a/games/bsdgames/files/patch-colorbars_colorbars.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- colorbars/colorbars.c.orig	2018-11-23 03:38:50 UTC
-+++ colorbars/colorbars.c
-@@ -33,6 +33,10 @@
- 
- #include <sys/param.h>
- 
-+#ifndef NELEM
-+#define NELEM(n) (sizeof(n)/sizeof((n)[0]))
-+#endif
-+
- int
- main(void)
- {
diff --git a/games/bsdgames/files/patch-hack_hack_Makefile b/games/bsdgames/files/patch-hack_hack_Makefile
deleted file mode 100644
index 6bf396df058a..000000000000
--- a/games/bsdgames/files/patch-hack_hack_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- hack/hack/Makefile.orig	2019-03-07 17:20:31 UTC
-+++ hack/hack/Makefile
-@@ -30,7 +30,7 @@ FILESDIR=	/var/games/hackdir
- CLEANFILES=	hack.onames.h
- 
- hack.onames.h: def.objects.h makedefs.c
--	${.OBJDIR}/../makedefs/makedefs.nx ${.CURDIR}/../def.objects.h > hack.onames.h
-+	${.OBJDIR}/../makedefs/makedefs ${.CURDIR}/../def.objects.h > hack.onames.h
- 
- beforeinstall:
- 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} /dev/null \
diff --git a/games/bsdgames/files/patch-hack_makedefs_Makefile b/games/bsdgames/files/patch-hack_makedefs_Makefile
deleted file mode 100644
index 01941e45de57..000000000000
--- a/games/bsdgames/files/patch-hack_makedefs_Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
---- hack/makedefs/Makefile.orig	2018-11-23 03:38:50 UTC
-+++ hack/makedefs/Makefile
-@@ -1,10 +1,11 @@
- .PATH: ${.CURDIR}/..
- 
- PROG=	makedefs
-+MK_MAN= no
- 
- build-tools: makedefs.nx
- 
- # this makedefs is used in place, it is not installed anywhere
- install:
- 
--.include <bsd.hostprog.mk>
-+.include <bsd.prog.mk>
diff --git a/games/bsdgames/files/patch-phantasia_phantasia_Makefile b/games/bsdgames/files/patch-phantasia_phantasia_Makefile
deleted file mode 100644
index 0450c7335a35..000000000000
--- a/games/bsdgames/files/patch-phantasia_phantasia_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- phantasia/phantasia/Makefile.orig	2019-03-07 17:21:59 UTC
-+++ phantasia/phantasia/Makefile
-@@ -21,7 +21,7 @@ FILESDIR=	/var/games/phantasia
- 
- .ORDER: monsters ${DATAFILES}
- monsters ${DATAFILES}: monsters.asc setup.c
--	${.OBJDIR}/../setup/setup.nx -m ${.CURDIR}/../monsters.asc
-+	${.OBJDIR}/../setup/setup -m ${.CURDIR}/../monsters.asc
- 
- beforeinstall:
- .for file in ${DATAFILES}
diff --git a/games/bsdgames/files/patch-phantasia_setup_Makefile b/games/bsdgames/files/patch-phantasia_setup_Makefile
deleted file mode 100644
index f9d4f95a78bc..000000000000
--- a/games/bsdgames/files/patch-phantasia_setup_Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
---- phantasia/setup/Makefile.orig	2019-03-07 17:21:37 UTC
-+++ phantasia/setup/Makefile
-@@ -2,6 +2,7 @@
- 
- PROG=	setup
- SRCS=	phantglobs.c setup.c
-+MK_MAN= no
- 
- # for floor()
- LDADD+=	-lm
-@@ -13,4 +14,4 @@ build-tools: setup.nx
- # this setup is used in place, it is not installed anywhere
- install:
- 
--.include <bsd.hostprog.mk>
-+.include <bsd.prog.mk>
diff --git a/games/bsdgames/files/patch-primes_Makefile b/games/bsdgames/files/patch-primes_Makefile
deleted file mode 100644
index d8da40c266a1..000000000000
--- a/games/bsdgames/files/patch-primes_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- primes/Makefile.orig	2018-11-23 03:38:50 UTC
-+++ primes/Makefile
-@@ -3,7 +3,7 @@
- 
- PROG=	primes
- SRCS=	pattern.c pr_tbl.c primes.c
--NOMAN=	noman
-+MK_MAN= no
- DPADD=	${LIBM}
- LDADD=	-lm
- 
diff --git a/games/bsdgames/files/patch-sail_pathnames.h b/games/bsdgames/files/patch-sail_pathnames.h
deleted file mode 100644
index b782ef6b79d8..000000000000
--- a/games/bsdgames/files/patch-sail_pathnames.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- sail/pathnames.h.orig	2019-03-07 20:11:21 UTC
-+++ sail/pathnames.h
-@@ -31,6 +31,6 @@
-  *	@(#)pathnames.h	8.1 (Berkeley) 5/31/93
-  */
- 
--#define	_PATH_LOGFILE	"@sail_scorefile@"
--#define	_PATH_SYNC	"@sail_dir@/#sailsink.%d"
--#define	_PATH_LOCK	"@sail_dir@/#saillock.%d"
-+#define	_PATH_LOGFILE	"/var/games/saillog"
-+#define	_PATH_SYNC	"/tmp/#sailsink.%d"
-+#define	_PATH_LOCK	"/tmp/#saillock.%d"
diff --git a/games/bsdgames/files/patch-snake_snscore_Makefile b/games/bsdgames/files/patch-snake_snscore_Makefile
deleted file mode 100644
index 24e3008a7e90..000000000000
--- a/games/bsdgames/files/patch-snake_snscore_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- snake/snscore/Makefile.orig	2018-11-23 03:38:50 UTC
-+++ snake/snscore/Makefile
-@@ -3,7 +3,7 @@
- 
- PROG=	snscore
- CFLAGS+= -I${.CURDIR}/../snake
--NOMAN=
-+MK_MAN= no
- 
- .include "../../Makefile.inc"
- .include <bsd.prog.mk>