Date: Mon, 11 Mar 2019 14:02:13 +0000 (UTC) From: Rodrigo Osorio <rodrigo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495354 - in head/games/bsdgames: . files Message-ID: <201903111402.x2BE2Dk6091071@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rodrigo Date: Mon Mar 11 14:02:12 2019 New Revision: 495354 URL: https://svnweb.freebsd.org/changeset/ports/495354 Log: 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> Added: head/games/bsdgames/files/patch-adventure_adventure_Makefile (contents, props changed) head/games/bsdgames/files/patch-adventure_setup_Makefile (contents, props changed) head/games/bsdgames/files/patch-backgammon_teachgammon_Makefile (contents, props changed) head/games/bsdgames/files/patch-boggle_boggle_extern.h (contents, props changed) head/games/bsdgames/files/patch-boggle_dictfiles_Makefile (contents, props changed) head/games/bsdgames/files/patch-boggle_mkdict_Makefile (contents, props changed) head/games/bsdgames/files/patch-boggle_mkindex_Makefile (contents, props changed) head/games/bsdgames/files/patch-canfield_cfscores_Makefile (contents, props changed) head/games/bsdgames/files/patch-colorbars_colorbars.c (contents, props changed) head/games/bsdgames/files/patch-hack_hack_Makefile (contents, props changed) head/games/bsdgames/files/patch-hack_makedefs_Makefile (contents, props changed) head/games/bsdgames/files/patch-phantasia_phantasia_Makefile (contents, props changed) head/games/bsdgames/files/patch-phantasia_setup_Makefile (contents, props changed) head/games/bsdgames/files/patch-primes_Makefile (contents, props changed) head/games/bsdgames/files/patch-sail_pathnames.h (contents, props changed) head/games/bsdgames/files/patch-snake_snscore_Makefile (contents, props changed) Deleted: head/games/bsdgames/files/patch-backgammon-teachgammon-Makefile head/games/bsdgames/files/patch-boggle-boggle-extern.h head/games/bsdgames/files/patch-boggle-dictfiles-Makefile head/games/bsdgames/files/patch-boggle-mkdict-Makefile head/games/bsdgames/files/patch-boggle-mkindex-Makefile head/games/bsdgames/files/patch-canfield-cfscores-Makefile head/games/bsdgames/files/patch-colorbars-colorbars.c head/games/bsdgames/files/patch-primes-Makefile head/games/bsdgames/files/patch-snake-snscore-Makefile Modified: head/games/bsdgames/Makefile head/games/bsdgames/distinfo head/games/bsdgames/pkg-descr Modified: head/games/bsdgames/Makefile ============================================================================== --- head/games/bsdgames/Makefile Mon Mar 11 13:54:02 2019 (r495353) +++ head/games/bsdgames/Makefile Mon Mar 11 14:02:12 2019 (r495354) @@ -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> Modified: head/games/bsdgames/distinfo ============================================================================== --- head/games/bsdgames/distinfo Mon Mar 11 13:54:02 2019 (r495353) +++ head/games/bsdgames/distinfo Mon Mar 11 14:02:12 2019 (r495354) @@ -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 Added: head/games/bsdgames/files/patch-adventure_adventure_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/bsdgames/files/patch-adventure_adventure_Makefile Mon Mar 11 14:02:12 2019 (r495354) @@ -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> Added: head/games/bsdgames/files/patch-adventure_setup_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/bsdgames/files/patch-adventure_setup_Makefile Mon Mar 11 14:02:12 2019 (r495354) @@ -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> Added: head/games/bsdgames/files/patch-backgammon_teachgammon_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/bsdgames/files/patch-backgammon_teachgammon_Makefile Mon Mar 11 14:02:12 2019 (r495354) @@ -0,0 +1,11 @@ +--- 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 + + 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 Added: head/games/bsdgames/files/patch-boggle_boggle_extern.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/bsdgames/files/patch-boggle_boggle_extern.h Mon Mar 11 14:02:12 2019 (r495354) @@ -0,0 +1,10 @@ +--- 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; Added: head/games/bsdgames/files/patch-boggle_dictfiles_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/bsdgames/files/patch-boggle_dictfiles_Makefile Mon Mar 11 14:02:12 2019 (r495354) @@ -0,0 +1,14 @@ +--- 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> Added: head/games/bsdgames/files/patch-boggle_mkdict_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/bsdgames/files/patch-boggle_mkdict_Makefile Mon Mar 11 14:02:12 2019 (r495354) @@ -0,0 +1,15 @@ +--- 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> Added: head/games/bsdgames/files/patch-boggle_mkindex_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/bsdgames/files/patch-boggle_mkindex_Makefile Mon Mar 11 14:02:12 2019 (r495354) @@ -0,0 +1,15 @@ +--- 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> Added: head/games/bsdgames/files/patch-canfield_cfscores_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/bsdgames/files/patch-canfield_cfscores_Makefile Mon Mar 11 14:02:12 2019 (r495354) @@ -0,0 +1,11 @@ +--- 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> Added: head/games/bsdgames/files/patch-colorbars_colorbars.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/bsdgames/files/patch-colorbars_colorbars.c Mon Mar 11 14:02:12 2019 (r495354) @@ -0,0 +1,13 @@ +--- 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) + { Added: head/games/bsdgames/files/patch-hack_hack_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/bsdgames/files/patch-hack_hack_Makefile Mon Mar 11 14:02:12 2019 (r495354) @@ -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 \ Added: head/games/bsdgames/files/patch-hack_makedefs_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/bsdgames/files/patch-hack_makedefs_Makefile Mon Mar 11 14:02:12 2019 (r495354) @@ -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> Added: head/games/bsdgames/files/patch-phantasia_phantasia_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/bsdgames/files/patch-phantasia_phantasia_Makefile Mon Mar 11 14:02:12 2019 (r495354) @@ -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} Added: head/games/bsdgames/files/patch-phantasia_setup_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/bsdgames/files/patch-phantasia_setup_Makefile Mon Mar 11 14:02:12 2019 (r495354) @@ -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> Added: head/games/bsdgames/files/patch-primes_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/bsdgames/files/patch-primes_Makefile Mon Mar 11 14:02:12 2019 (r495354) @@ -0,0 +1,11 @@ +--- 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 + Added: head/games/bsdgames/files/patch-sail_pathnames.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/bsdgames/files/patch-sail_pathnames.h Mon Mar 11 14:02:12 2019 (r495354) @@ -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" Added: head/games/bsdgames/files/patch-snake_snscore_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/bsdgames/files/patch-snake_snscore_Makefile Mon Mar 11 14:02:12 2019 (r495354) @@ -0,0 +1,11 @@ +--- 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> Modified: head/games/bsdgames/pkg-descr ============================================================================== --- head/games/bsdgames/pkg-descr Mon Mar 11 13:54:02 2019 (r495353) +++ head/games/bsdgames/pkg-descr Mon Mar 11 14:02:12 2019 (r495354) @@ -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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903111402.x2BE2Dk6091071>