Upgrade games/bsdgames from v5.2.2 to v5.5.0

Update to DragonflyBSD 5.5.0 sources.
Pulled sail from NetBSD, since it wasn't working.
Remake patches

PR:		236377
Submitted by:	Joachim Werner <jockl@pianojockl.org>

19 files changed, 125 insertions, 32 deletions

diff --git a/games/bsdgames/Makefile b/games/bsdgames/Makefile
index 711585af3d87..a22025185e0f 100644
--- a/games/bsdgames/Makefile
+++ b/games/bsdgames/Makefile
@@ -2,10 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	bsdgames
-PORTVERSION=	5.2.2
+PORTVERSION=	5.5.0
 PORTEPOCH=	1
 CATEGORIES=	games
-MASTER_SITES=	LOCAL/swills
+MASTER_SITES=	https://github.com/DragonFlyBSD/DragonFlyBSD/archive/ \
+		https://deb.debian.org/debian/pool/main/b/bsdgames/
+DISTFILES=	v${PORTVERSION}.zip \
+		${PORTNAME}_2.17.orig.tar.gz
 
 MAINTAINER=	jockl@pianojockl.org
 COMMENT=	Traditional BSD games taken from DragonFly BSD
@@ -73,17 +76,12 @@ post-install:
 	@${TOUCH} ${STAGEDIR}/var/games/atc_score
 	@${FIND} ${STAGEDIR}/var/games -type f -exec ${MV} {} {}.sample \;
 
-dist:
-	${FETCH_CMD} -o- https://github.com/DragonFlyBSD/DragonFlyBSD/archive/v${PORTVERSION}.zip | \
-		${TAR_CMD} xfv - DragonFlyBSD-${PORTVERSION}/games/\*
-	${MV} DragonFlyBSD-${PORTVERSION}/games bsdgames-${PORTVERSION}
-	${RMDIR} DragonFlyBSD-${PORTVERSION}
-	${TAR_CMD} -cvf bsdgames-${PORTVERSION}.tar bsdgames-${PORTVERSION}
-	${XZ_CMD} -v bsdgames-${PORTVERSION}.tar
-	@${ECHO_CMD}
-	@${ECHO_CMD} '======================================='
-	@${ECHO_CMD} ' UPLOAD THE DISTFILE BEFORE YOU FORGET '
-	@${ECHO_CMD} '======================================='
-	@${ECHO_CMD} 'bsdgames-${PORTVERSION} can be deleted!'
+do-extract:
+	${MKDIR} ${WRKDIR}
+	${TAR} -xzf ${DISTDIR}/v${PORTVERSION}.zip -C ${WRKDIR}
+	${TAR} -xzf ${DISTDIR}/${PORTNAME}_2.17.orig.tar.gz -C ${WRKDIR}
+	${MV} ${WRKDIR}/DragonFlyBSD-${PORTVERSION}/games  ${WRKSRC}
+	${MV} ${WRKDIR}/bsd-games-2.17/sail/*.[ch] ${WRKSRC}/sail/
+	${MV} ${WRKDIR}/bsd-games-2.17/sail/pathnames.h.in ${WRKSRC}/sail/pathnames.h
 
 .include <bsd.port.post.mk>
diff --git a/games/bsdgames/distinfo b/games/bsdgames/distinfo
index b39ae6399fd3..8d6d8ab47976 100644
--- a/games/bsdgames/distinfo
+++ b/games/bsdgames/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1538837076
-SHA256 (bsdgames-5.2.2.tar.xz) = f80bcac0838e9cee60b4c6ab86dee95ba039034691ddf1c28ce26d3a05943f15
-SIZE (bsdgames-5.2.2.tar.xz) = 1773360
+TIMESTAMP = 1552233173
+SHA256 (v5.5.0.zip) = c6afd51d0283e9d5f0911f046824bddf41926c277ce995ab78e128b32737e400
+SIZE (v5.5.0.zip) = 169083630
+SHA256 (bsdgames_2.17.orig.tar.gz) = 066f924aef6c1c5ea946f588e36f303021f5dfc093944738f025d8edbc6fff60
+SIZE (bsdgames_2.17.orig.tar.gz) = 2563311
diff --git a/games/bsdgames/files/patch-adventure_adventure_Makefile b/games/bsdgames/files/patch-adventure_adventure_Makefile
new file mode 100644
index 000000000000..e68c7cb1d8f8
--- /dev/null
+++ b/games/bsdgames/files/patch-adventure_adventure_Makefile
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 000000000000..0725fcfa357b
--- /dev/null
+++ b/games/bsdgames/files/patch-adventure_setup_Makefile
@@ -0,0 +1,15 @@
+--- 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-backgammon-teachgammon-Makefile b/games/bsdgames/files/patch-backgammon_teachgammon_Makefile
index 3062dfd2195c..021c95251439 100644
--- a/games/bsdgames/files/patch-backgammon-teachgammon-Makefile
+++ b/games/bsdgames/files/patch-backgammon_teachgammon_Makefile
@@ -1,4 +1,4 @@
---- backgammon/teachgammon/Makefile.orig	2018-06-15 14:40:00 UTC
+--- backgammon/teachgammon/Makefile.orig	2019-03-07 17:01:43 UTC
 +++ backgammon/teachgammon/Makefile
 @@ -1,7 +1,7 @@
  #	@(#)Makefile	8.1 (Berkeley) 5/31/93
diff --git a/games/bsdgames/files/patch-boggle-boggle-extern.h b/games/bsdgames/files/patch-boggle_boggle_extern.h
index bc745f165f26..60e5266a99cc 100644
--- a/games/bsdgames/files/patch-boggle-boggle-extern.h
+++ b/games/bsdgames/files/patch-boggle_boggle_extern.h
@@ -1,4 +1,4 @@
---- boggle/boggle/extern.h.orig	2018-06-15 14:40:00 UTC
+--- boggle/boggle/extern.h.orig	2019-03-07 16:44:58 UTC
 +++ boggle/boggle/extern.h
 @@ -33,6 +33,7 @@
   */
diff --git a/games/bsdgames/files/patch-boggle-dictfiles-Makefile b/games/bsdgames/files/patch-boggle_dictfiles_Makefile
index cc29c189c45c..8f4666958c79 100644
--- a/games/bsdgames/files/patch-boggle-dictfiles-Makefile
+++ b/games/bsdgames/files/patch-boggle_dictfiles_Makefile
@@ -1,4 +1,4 @@
---- boggle/dictfiles/Makefile.orig	2018-06-15 14:40:00 UTC
+--- 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
diff --git a/games/bsdgames/files/patch-boggle-mkdict-Makefile b/games/bsdgames/files/patch-boggle_mkdict_Makefile
index dc05c2b03a2e..b8d468875764 100644
--- a/games/bsdgames/files/patch-boggle-mkdict-Makefile
+++ b/games/bsdgames/files/patch-boggle_mkdict_Makefile
@@ -1,11 +1,13 @@
---- boggle/mkdict/Makefile.orig	2018-06-15 14:40:00 UTC
+--- boggle/mkdict/Makefile.orig	2019-03-07 16:39:47 UTC
 +++ boggle/mkdict/Makefile
-@@ -4,8 +4,8 @@
+@@ -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:
  
diff --git a/games/bsdgames/files/patch-boggle-mkindex-Makefile b/games/bsdgames/files/patch-boggle_mkindex_Makefile
index a3ebe580c5cb..480905067e7d 100644
--- a/games/bsdgames/files/patch-boggle-mkindex-Makefile
+++ b/games/bsdgames/files/patch-boggle_mkindex_Makefile
@@ -1,11 +1,13 @@
---- boggle/mkindex/Makefile.orig	2018-06-15 14:40:00 UTC
+--- boggle/mkindex/Makefile.orig	2018-11-23 03:38:50 UTC
 +++ boggle/mkindex/Makefile
-@@ -4,8 +4,9 @@
+@@ -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:
  
diff --git a/games/bsdgames/files/patch-canfield-cfscores-Makefile b/games/bsdgames/files/patch-canfield_cfscores_Makefile
index 5d18eb8f1e22..f43aabcc470e 100644
--- a/games/bsdgames/files/patch-canfield-cfscores-Makefile
+++ b/games/bsdgames/files/patch-canfield_cfscores_Makefile
@@ -1,4 +1,4 @@
---- canfield/cfscores/Makefile.orig	2018-06-15 14:40:00 UTC
+--- canfield/cfscores/Makefile.orig	2018-11-23 03:38:50 UTC
 +++ canfield/cfscores/Makefile
 @@ -3,7 +3,7 @@
  
diff --git a/games/bsdgames/files/patch-colorbars-colorbars.c b/games/bsdgames/files/patch-colorbars_colorbars.c
index d7de8aaa4348..ce8d83688687 100644
--- a/games/bsdgames/files/patch-colorbars-colorbars.c
+++ b/games/bsdgames/files/patch-colorbars_colorbars.c
@@ -1,4 +1,4 @@
---- colorbars/colorbars.c.orig	2018-06-15 14:40:00 UTC
+--- colorbars/colorbars.c.orig	2018-11-23 03:38:50 UTC
 +++ colorbars/colorbars.c
 @@ -33,6 +33,10 @@
  
diff --git a/games/bsdgames/files/patch-hack_hack_Makefile b/games/bsdgames/files/patch-hack_hack_Makefile
new file mode 100644
index 000000000000..6bf396df058a
--- /dev/null
+++ b/games/bsdgames/files/patch-hack_hack_Makefile
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..01941e45de57
--- /dev/null
+++ b/games/bsdgames/files/patch-hack_makedefs_Makefile
@@ -0,0 +1,15 @@
+--- 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
new file mode 100644
index 000000000000..0450c7335a35
--- /dev/null
+++ b/games/bsdgames/files/patch-phantasia_phantasia_Makefile
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..f9d4f95a78bc
--- /dev/null
+++ b/games/bsdgames/files/patch-phantasia_setup_Makefile
@@ -0,0 +1,16 @@
+--- 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
index 24bf9b75cecd..d8da40c266a1 100644
--- a/games/bsdgames/files/patch-primes-Makefile
+++ b/games/bsdgames/files/patch-primes_Makefile
@@ -1,4 +1,4 @@
---- primes/Makefile.orig	2018-06-15 14:40:00 UTC
+--- primes/Makefile.orig	2018-11-23 03:38:50 UTC
 +++ primes/Makefile
 @@ -3,7 +3,7 @@
  
diff --git a/games/bsdgames/files/patch-sail_pathnames.h b/games/bsdgames/files/patch-sail_pathnames.h
new file mode 100644
index 000000000000..b782ef6b79d8
--- /dev/null
+++ b/games/bsdgames/files/patch-sail_pathnames.h
@@ -0,0 +1,12 @@
+--- 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
index 0c8577626346..24e3008a7e90 100644
--- a/games/bsdgames/files/patch-snake-snscore-Makefile
+++ b/games/bsdgames/files/patch-snake_snscore_Makefile
@@ -1,4 +1,4 @@
---- snake/snscore/Makefile.orig	2018-06-15 14:40:00 UTC
+--- snake/snscore/Makefile.orig	2018-11-23 03:38:50 UTC
 +++ snake/snscore/Makefile
 @@ -3,7 +3,7 @@
  
diff --git a/games/bsdgames/pkg-descr b/games/bsdgames/pkg-descr
index 4f55314ab702..c9d5ac6ccdb2 100644
--- a/games/bsdgames/pkg-descr
+++ b/games/bsdgames/pkg-descr
@@ -1,5 +1,4 @@
 This is a port of the BSD "standard" games from Dragonfly BSD which
 includes many improvements and cleanups from NetBSD and OpenBSD.
-
-This source was formerly a part of the FreeBSD base system, but has
-survived in the Dragonfly BSD repository.
+Sail is pulled from NetBSD sources, since the Dragonfly version 
+wasn't working.