Merge branch 'master' into gnome-3.28gnome-3.28

16 files changed, 150 insertions, 130 deletions

diff --git a/games/bsdgames/files/patch-Makefile b/games/bsdgames/files/patch-Makefile
index 722d2e35a783..7dc20b6c97e9 100644
--- a/games/bsdgames/files/patch-Makefile
+++ b/games/bsdgames/files/patch-Makefile
@@ -1,16 +1,18 @@
---- Makefile.orig	2016-10-31 16:52:06 UTC
+--- Makefile.orig	2018-06-15 14:40:00 UTC
 +++ Makefile
-@@ -8,33 +8,21 @@ SUBDIR= adventure \
+@@ -5,35 +5,25 @@ SUBDIR= adventure \
+ 	arithmetic \
  	atc \
  	backgammon \
+-	banner \
  	battlestar \
--	bcd \
+ 	bcd \
  	bs \
+ 	boggle \
 -	caesar \
  	canfield \
  	cribbage \
  	colorbars \
--	dm \
 -	factor \
  	fish \
 -	fortune \
@@ -26,7 +28,7 @@
  	phantasia \
  	pig \
 -	pom \
--	ppt \
+ 	ppt \
 -	primes \
  	quiz \
  	rain \
diff --git a/games/bsdgames/files/patch-Makefile.inc b/games/bsdgames/files/patch-Makefile.inc
index 5d5f600ed37f..bfc9041ce92c 100644
--- a/games/bsdgames/files/patch-Makefile.inc
+++ b/games/bsdgames/files/patch-Makefile.inc
@@ -1,26 +1,45 @@
---- Makefile.inc.orig	2009-09-24 10:46:30.000000000 +0200
-+++ Makefile.inc	2009-11-25 23:07:35.000000000 +0100
-@@ -2,14 +2,40 @@
- # $FreeBSD: /tmp/pcvs/ports/games/bsdgames/files/patch-Makefile.inc,v 1.2 2009-11-26 14:45:24 miwi Exp $
- # $DragonFly: src/games/Makefile.inc,v 1.3 2006/10/08 16:22:34 pavalos Exp $
- 
+--- Makefile.inc.orig	2018-06-15 14:40:00 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 $
+-
 -BINDIR?=	/usr/games
-+PREFIX?=	/usr/local
-+BINDIR?=	${PREFIX}/bin
-+SHAREDIR=	${PREFIX}/share
-+MANDIR=		${PREFIX}/man/man
- FILESDIR?=	${SHAREDIR}/games
- WARNS?=		6
+-FILESDIR?=	${SHAREDIR}/games
+-WARNS?=		6
++# $DragonFly: src/games/Makefile.inc,v 1.3 2006/10/08 16:22:34 pavalos Exp $
  
--.if defined(HIDEGAME)
--ORIGBINDIR:=	${BINDIR}
--BINDIR:=	${BINDIR}/hide
--ORIGBINGRP:=	${BINGRP}
-+.if defined(SGIDGAME)
+ # 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
 +
diff --git a/games/bsdgames/files/patch-backgammon-teachgammon-Makefile b/games/bsdgames/files/patch-backgammon-teachgammon-Makefile
new file mode 100644
index 000000000000..3062dfd2195c
--- /dev/null
+++ b/games/bsdgames/files/patch-backgammon-teachgammon-Makefile
@@ -0,0 +1,11 @@
+--- backgammon/teachgammon/Makefile.orig	2018-06-15 14:40:00 UTC
++++ backgammon/teachgammon/Makefile
+@@ -1,7 +1,7 @@
+ #	@(#)Makefile	8.1 (Berkeley) 5/31/93
+ 
+ PROG=	teachgammon
+-NOMAN=	noman
++MK_MAN= no
+ CFLAGS+=-DTEACHGAMMON_TEXT -I${.CURDIR}/../common_source
+ SRCS=	allow.c board.c check.c data.c fancy.c init.c odds.c one.c save.c \
+ 	subs.c table.c teach.c ttext1.c ttext2.c tutor.c
diff --git a/games/bsdgames/files/patch-battlestar_externs.h b/games/bsdgames/files/patch-battlestar_externs.h
deleted file mode 100644
index c6bfa19de6b6..000000000000
--- a/games/bsdgames/files/patch-battlestar_externs.h
+++ /dev/null
@@ -1,23 +0,0 @@
---- battlestar/externs.h.orig	2012-05-25 11:57:52.000000000 +0200
-+++ battlestar/externs.h	2012-05-25 11:57:55.000000000 +0200
-@@ -44,15 +44,18 @@
- #include <string.h>
- #include <unistd.h>
- 
-+/* We use our own */
-+#undef setbit
-+#undef testbit
-+#undef clearbit
-+
- #define BITS (8)
- 
- #define OUTSIDE		(position > 68 && position < 246 && position != 218)
- #define rnd(x)          (random() % (x))
- #define max(a,b)	((a) < (b) ? (b) : (a))
- #define testbit(array, index)	(array[index/BITS] & (1 << (index % BITS)))
--#ifndef setbit
- #define setbit(array, index)	(array[index/BITS] |= (1 << (index % BITS)))
--#endif
- #define clearbit(array, index)	(array[index/BITS] &= ~(1 << (index % BITS)))
- 
- 	/* well known rooms */
diff --git a/games/bsdgames/files/patch-battlestar_fly.c b/games/bsdgames/files/patch-battlestar_fly.c
deleted file mode 100644
index 9cffa3f81bcf..000000000000
--- a/games/bsdgames/files/patch-battlestar_fly.c
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur battlestar.orig/fly.c battlestar/fly.c
---- battlestar.orig/fly.c	2012-03-22 13:59:00.000000000 +0100
-+++ battlestar/fly.c	2012-03-22 13:59:09.000000000 +0100
-@@ -286,6 +286,7 @@
- 	signal(SIGALRM, SIG_DFL);
- 	mvcur(0,COLS-1,LINES-1,0);
- 	endwin();
-+	setlinebuf(stdout);
- 	signal(SIGTSTP, SIG_DFL);
- 	signal(SIGINT, oldsig);
- }
diff --git a/games/bsdgames/files/patch-boggle-boggle-extern.h b/games/bsdgames/files/patch-boggle-boggle-extern.h
new file mode 100644
index 000000000000..bc745f165f26
--- /dev/null
+++ b/games/bsdgames/files/patch-boggle-boggle-extern.h
@@ -0,0 +1,10 @@
+--- boggle/boggle/extern.h.orig	2018-06-15 14:40:00 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
new file mode 100644
index 000000000000..cc29c189c45c
--- /dev/null
+++ b/games/bsdgames/files/patch-boggle-dictfiles-Makefile
@@ -0,0 +1,14 @@
+--- boggle/dictfiles/Makefile.orig	2018-06-15 14:40:00 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
new file mode 100644
index 000000000000..dc05c2b03a2e
--- /dev/null
+++ b/games/bsdgames/files/patch-boggle-mkdict-Makefile
@@ -0,0 +1,13 @@
+--- boggle/mkdict/Makefile.orig	2018-06-15 14:40:00 UTC
++++ boggle/mkdict/Makefile
+@@ -4,8 +4,8 @@
+ 
+ PROG=	mkdict
+ CFLAGS+=-I${.CURDIR}/../boggle
+-
++MK_MAN= no
+ # 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
new file mode 100644
index 000000000000..a3ebe580c5cb
--- /dev/null
+++ b/games/bsdgames/files/patch-boggle-mkindex-Makefile
@@ -0,0 +1,13 @@
+--- boggle/mkindex/Makefile.orig	2018-06-15 14:40:00 UTC
++++ boggle/mkindex/Makefile
+@@ -4,8 +4,9 @@
+ 
+ PROG=	mkindex
+ CFLAGS+=-I${.CURDIR}/../boggle
++MK_MAN= no
+ 
+ # 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
new file mode 100644
index 000000000000..5d18eb8f1e22
--- /dev/null
+++ b/games/bsdgames/files/patch-canfield-cfscores-Makefile
@@ -0,0 +1,11 @@
+--- canfield/cfscores/Makefile.orig	2018-06-15 14:40:00 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
new file mode 100644
index 000000000000..d7de8aaa4348
--- /dev/null
+++ b/games/bsdgames/files/patch-colorbars-colorbars.c
@@ -0,0 +1,13 @@
+--- colorbars/colorbars.c.orig	2018-06-15 14:40:00 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-colorbars_colorbars.c b/games/bsdgames/files/patch-colorbars_colorbars.c
deleted file mode 100644
index 2b6756f91d97..000000000000
--- a/games/bsdgames/files/patch-colorbars_colorbars.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- colorbars/colorbars.c.orig	2016-10-31 17:00:48 UTC
-+++ colorbars/colorbars.c
-@@ -31,6 +31,10 @@
- #include <err.h>
- #include <stdlib.h>
- 
-+#ifndef __arysize
-+#define __arysize(n) (sizeof(n)/sizeof((n)[0]))
-+#endif
-+
- int
- main(void)
- {
diff --git a/games/bsdgames/files/patch-hack_hack.unix.c b/games/bsdgames/files/patch-hack_hack.unix.c
deleted file mode 100644
index 39773be5ba9d..000000000000
--- a/games/bsdgames/files/patch-hack_hack.unix.c
+++ /dev/null
@@ -1,51 +0,0 @@
---- hack/hack.unix.c.orig	2014-07-22 09:54:22.000000000 -0400
-+++ hack/hack.unix.c	2014-07-22 10:20:43.000000000 -0400
-@@ -18,7 +18,9 @@
- 
- #include <sys/types.h>	/* for time_t and stat */
- #include <sys/stat.h>
-+#include <sys/param.h>
- #include <time.h>
-+#include <err.h>
- 
- static struct tm *getlt(void);
- static bool  veryold(int);
-@@ -94,13 +96,32 @@
- void
- gethdate(const char *name)
- {
--/* old version - for people short of space */
--	char *np;
-+	char *p, *np, *path;
-+	char filename[MAXPATHLEN+1];
- 
--	name = "/usr/games/hide/hack";
--	if (stat(name, &hbuf))
--		error("Cannot get status of %s.",
--		      (np = strrchr(name, '/')) ? np + 1 : name);
-+	if (strchr(name, '/') != NULL || (p = getenv("PATH")) == NULL)
-+		p = "";
-+	np = path = strdup(p);	/* Make a copy for strsep. */
-+	if (path == NULL)
-+		err(1, NULL);
-+
-+	for (;;) {
-+		if ((p = strsep(&np, ":")) == NULL)
-+			break;
-+		if (*p == '\0')			/* :: */
-+			(void) strlcpy(filename, name, sizeof filename);
-+		else
-+			(void) snprintf(filename, sizeof filename,
-+			    "%s/%s", p, name);
-+
-+		if (stat(filename, &hbuf) == 0) {
-+			free(path);
-+			return;
-+		}
-+	}
-+	error("Cannot get status of %s.",
-+		(p = strrchr(name, '/')) ? p+1 : name);
-+	free(path);
- }
- 
- bool
diff --git a/games/bsdgames/files/patch-primes-Makefile b/games/bsdgames/files/patch-primes-Makefile
new file mode 100644
index 000000000000..24bf9b75cecd
--- /dev/null
+++ b/games/bsdgames/files/patch-primes-Makefile
@@ -0,0 +1,11 @@
+--- primes/Makefile.orig	2018-06-15 14:40:00 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-rogue_inventory.c b/games/bsdgames/files/patch-rogue_inventory.c
deleted file mode 100644
index ff3e22d02d11..000000000000
--- a/games/bsdgames/files/patch-rogue_inventory.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- rogue/inventory.c.orig	2016-05-12 14:49:52 UTC
-+++ rogue/inventory.c
-@@ -417,6 +417,7 @@ mix_colors(void)
- 		k = get_rand(0, (POTIONS - 1));
- 		memcpy(t, id_potions[j].title, MAX_ID_TITLE_LEN);
- 		memcpy(id_potions[j].title, id_potions[k].title, MAX_ID_TITLE_LEN);
-+		memcpy(id_potions[k].title, t, MAX_ID_TITLE_LEN);
- 	}
- }
- 
diff --git a/games/bsdgames/files/patch-snake-snscore-Makefile b/games/bsdgames/files/patch-snake-snscore-Makefile
new file mode 100644
index 000000000000..0c8577626346
--- /dev/null
+++ b/games/bsdgames/files/patch-snake-snscore-Makefile
@@ -0,0 +1,11 @@
+--- snake/snscore/Makefile.orig	2018-06-15 14:40:00 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>