svn commit: r483675 - in head/games/bsdgames: . files
Steve Wills
swills at FreeBSD.org
Thu Nov 1 15:10:33 UTC 2018
Author: swills
Date: Thu Nov 1 15:10:29 2018
New Revision: 483675
URL: https://svnweb.freebsd.org/changeset/ports/483675
Log:
games/bsdgames: update to 5.2.2
Added bcd, boggle, ppt, tetris
Pet portlint
While here, pass maintainership to submitter
PR: 232051
Submitted by: Joachim Werner <jockl at pianojockl.org>
Added:
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-primes-Makefile (contents, props changed)
head/games/bsdgames/files/patch-snake-snscore-Makefile (contents, props changed)
Deleted:
head/games/bsdgames/files/patch-battlestar_externs.h
head/games/bsdgames/files/patch-battlestar_fly.c
head/games/bsdgames/files/patch-colorbars_colorbars.c
head/games/bsdgames/files/patch-hack_hack.unix.c
head/games/bsdgames/files/patch-rogue_inventory.c
Modified:
head/games/bsdgames/Makefile (contents, props changed)
head/games/bsdgames/distinfo (contents, props changed)
head/games/bsdgames/files/patch-Makefile (contents, props changed)
head/games/bsdgames/files/patch-Makefile.inc (contents, props changed)
head/games/bsdgames/pkg-plist (contents, props changed)
Modified: head/games/bsdgames/Makefile
==============================================================================
--- head/games/bsdgames/Makefile Thu Nov 1 15:08:38 2018 (r483674)
+++ head/games/bsdgames/Makefile Thu Nov 1 15:10:29 2018 (r483675)
@@ -2,25 +2,28 @@
# $FreeBSD$
PORTNAME= bsdgames
-PORTVERSION= 4.8.1
+PORTVERSION= 5.2.2
PORTEPOCH= 1
CATEGORIES= games
-MASTER_SITES= LOCAL/adamw
+MASTER_SITES= LOCAL/swills
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= jockl at pianojockl.org
COMMENT= Traditional BSD games taken from DragonFly BSD
LICENSE= BSD3CLAUSE
+USES= ncurses tar:xz uidfix
+
CONFLICTS= hangman-[0-9]*
-USES= ncurses tar:xz uidfix
MAKE_ENV= NO_WERROR=1
MAKE_ARGS= BINGRP=${BINGRP}
# contain /usr/share/games
SHAREPATH_FILES=atc/atc.6 \
atc/pathnames.h \
+ boggle/boggle/bog.h \
+ boggle/boggle/boggle.6 \
cribbage/cribbage.6 \
cribbage/pathnames.h \
fish/pathnames.h \
@@ -40,19 +43,9 @@ GAMESPATH_FILES=backgammon/backgammon/backgammon.6 \
phantasia/pathnames.h \
wargames/wargames.sh
-# These keep score in /var/games
-SGID_BINARIES= atc battlestar canfield/canfield cribbage hack phantasia \
- robots sail snake/snake
-
.include <bsd.port.pre.mk>
post-patch:
- @${REINPLACE_CMD} -e "s/NOMAN/NO_MAN/" \
- ${WRKSRC}/backgammon/teachgammon/Makefile \
- ${WRKSRC}/canfield/cfscores/Makefile \
- ${WRKSRC}/snake/snscore/Makefile \
- ${WRKSRC}/fortune/unstr/Makefile \
- ${WRKSRC}/primes/Makefile
@for f in ${SHAREPATH_FILES}; do \
${REINPLACE_CMD} -e 's|/usr/share/games|${PREFIX}/share/games|g' \
${WRKSRC}/$${f}; \
@@ -61,15 +54,9 @@ post-patch:
${REINPLACE_CMD} -e 's|/usr/games|${PREFIX}/bin|g' \
${WRKSRC}/$${f}; \
done
- @for f in ${SGID_BINARIES}; do \
- ${REINPLACE_CMD} -e 's/HIDEGAME/SGIDGAME/' \
- ${WRKSRC}/$${f}/Makefile; \
- done
- @${FIND} ${WRKSRC} -type f -name Makefile \
- | ${XARGS} ${REINPLACE_CMD} -e 's/-lprivate_ncurses/-lncurses/'
pre-install:
-.for d in atc larn quiz.db
+.for d in atc larn quiz.db boggle
@${MKDIR} ${STAGEDIR}${PREFIX}/share/games/$d
.endfor
.for d in atc battlestar hackdir/save larn phantasia
@@ -87,13 +74,16 @@ post-install:
@${FIND} ${STAGEDIR}/var/games -type f -exec ${MV} {} {}.sample \;
dist:
- fetch -o- https://github.com/DragonFlyBSD/DragonFlyBSD/archive/v${PORTVERSION}.zip | \
- unzip - DragonFlyBSD-${PORTVERSION}/games/\*
- mv DragonFlyBSD-${PORTVERSION}/games bsdgames-${PORTVERSION}
- tar -cvf bsdgames-${PORTVERSION}.tar bsdgames-${PORTVERSION}
- xz -v bsdgames-${PORTVERSION}.tar
- @echo
- @echo 'UPLOAD THE DISTFILE BEFORE YOU FORGET'
- @echo '====================================='
+ ${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!'
.include <bsd.port.post.mk>
Modified: head/games/bsdgames/distinfo
==============================================================================
--- head/games/bsdgames/distinfo Thu Nov 1 15:08:38 2018 (r483674)
+++ head/games/bsdgames/distinfo Thu Nov 1 15:10:29 2018 (r483675)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1506702661
-SHA256 (bsdgames-4.8.1.tar.xz) = 31a27fcd003cc04f942078a278618e1bb5d472f68d52dcc1a26a3fcf74b4532b
-SIZE (bsdgames-4.8.1.tar.xz) = 1745908
+TIMESTAMP = 1538837076
+SHA256 (bsdgames-5.2.2.tar.xz) = f80bcac0838e9cee60b4c6ab86dee95ba039034691ddf1c28ce26d3a05943f15
+SIZE (bsdgames-5.2.2.tar.xz) = 1773360
Modified: head/games/bsdgames/files/patch-Makefile
==============================================================================
--- head/games/bsdgames/files/patch-Makefile Thu Nov 1 15:08:38 2018 (r483674)
+++ head/games/bsdgames/files/patch-Makefile Thu Nov 1 15:10:29 2018 (r483675)
@@ -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 \
Modified: head/games/bsdgames/files/patch-Makefile.inc
==============================================================================
--- head/games/bsdgames/files/patch-Makefile.inc Thu Nov 1 15:08:38 2018 (r483674)
+++ head/games/bsdgames/files/patch-Makefile.inc Thu Nov 1 15:10:29 2018 (r483675)
@@ -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
+
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 Thu Nov 1 15:10:29 2018 (r483675)
@@ -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
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 Thu Nov 1 15:10:29 2018 (r483675)
@@ -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;
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 Thu Nov 1 15:10:29 2018 (r483675)
@@ -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>
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 Thu Nov 1 15:10:29 2018 (r483675)
@@ -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>
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 Thu Nov 1 15:10:29 2018 (r483675)
@@ -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>
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 Thu Nov 1 15:10:29 2018 (r483675)
@@ -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>
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 Thu Nov 1 15:10:29 2018 (r483675)
@@ -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)
+ {
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 Thu Nov 1 15:10:29 2018 (r483675)
@@ -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
+
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 Thu Nov 1 15:10:29 2018 (r483675)
@@ -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>
Modified: head/games/bsdgames/pkg-plist
==============================================================================
--- head/games/bsdgames/pkg-plist Thu Nov 1 15:08:38 2018 (r483674)
+++ head/games/bsdgames/pkg-plist Thu Nov 1 15:10:29 2018 (r483675)
@@ -3,6 +3,8 @@ bin/arithmetic
@(,games,2555) bin/atc
bin/backgammon
@(,games,2555) bin/battlestar
+bin/bcd
+bin/boggle
bin/bs-game
@(,games,2555) bin/canfield
bin/cfscores
@@ -14,18 +16,20 @@ bin/hals_end
bin/hangman
bin/hunt
bin/huntd
-bin/larn
+@(,games,2555) bin/larn
bin/mille
@(,games,2555) bin/phantasia
bin/pig
+bin/ppt
bin/quiz
bin/rain
@(,games,2555) bin/robots
-bin/rogue
+@(,games,2555) bin/rogue
@(,games,2555) bin/sail
@(,games,2555) bin/snake
bin/snscore
bin/teachgammon
+bin/tetris
bin/trek
bin/wargames
bin/worm
@@ -36,6 +40,8 @@ man/man6/arithmetic.6.gz
man/man6/atc.6.gz
man/man6/backgammon.6.gz
man/man6/battlestar.6.gz
+man/man6/bcd.6.gz
+man/man6/boggle.6.gz
man/man6/bs-game.6.gz
man/man6/canfield.6.gz
man/man6/cfscores.6.gz
@@ -51,6 +57,7 @@ man/man6/larn.6.gz
man/man6/mille.6.gz
man/man6/phantasia.6.gz
man/man6/pig.6.gz
+man/man6/ppt.6.gz
man/man6/quiz.6.gz
man/man6/rain.6.gz
man/man6/robots.6.gz
@@ -58,6 +65,7 @@ man/man6/rogue.6.gz
man/man6/sail.6.gz
man/man6/snake.6.gz
man/man6/snscore.6.gz
+man/man6/tetris.6.gz
man/man6/trek.6.gz
man/man6/wargames.6.gz
man/man6/worm.6.gz
@@ -69,9 +77,14 @@ share/games/atc/crossover
share/games/atc/default
share/games/atc/easy
share/games/atc/game_2
+share/games/boggle/dictindex
+share/games/boggle/dictionary
+share/games/boggle/helpfile
+share/games/cribbage.instr
+share/games/fish.instr
+share/games/larn/larn.help
share/games/larn/larnmaze
share/games/larn/larnopts
-share/games/larn/larn.help
share/games/quiz.db/africa
share/games/quiz.db/america
share/games/quiz.db/areas
@@ -105,37 +118,35 @@ share/games/quiz.db/spell
share/games/quiz.db/state
share/games/quiz.db/trek
share/games/quiz.db/ucc
-share/games/cribbage.instr
-share/games/fish.instr
share/games/wump.info
@sample(,games,0664) /var/games/atc_score.sample
@sample(,games,0664) /var/games/battlestar.log.sample
@sample(,games,0664) /var/games/cfscores.sample
@sample(,games,0664) /var/games/criblog.sample
+ at sample(,games,0664) /var/games/hackdir/data.sample
@sample(,games,0664) /var/games/hackdir/help.sample
@sample(,games,0664) /var/games/hackdir/hh.sample
- at sample(,games,0664) /var/games/hackdir/data.sample
@sample(,games,0664) /var/games/hackdir/perm.sample
@sample(,games,0664) /var/games/hackdir/record.sample
@sample(,games,0664) /var/games/hackdir/rumors.sample
- at sample(,games,0664) /var/games/larn/lscore12.0.sample
@sample(,games,0664) /var/games/larn/llog12.0.sample
- at sample(,games,0664) /var/games/phantasia/monsters.sample
- at sample(,games,0664) /var/games/phantasia/void.sample
+ at sample(,games,0664) /var/games/larn/lscore12.0.sample
@sample(,games,0664) /var/games/phantasia/characs.sample
@sample(,games,0664) /var/games/phantasia/gold.sample
@sample(,games,0664) /var/games/phantasia/lastdead.sample
@sample(,games,0664) /var/games/phantasia/mess.sample
+ at sample(,games,0664) /var/games/phantasia/monsters.sample
@sample(,games,0664) /var/games/phantasia/motd.sample
@sample(,games,0664) /var/games/phantasia/scoreboard.sample
+ at sample(,games,0664) /var/games/phantasia/void.sample
@sample(,games,0664) /var/games/robots_roll.sample
@sample(,games,0664) /var/games/rogue.scores.sample
@sample(,games,0664) /var/games/saillog.sample
- at sample(,games,0664) /var/games/snakerawscores.sample
@sample(,games,0664) /var/games/snake.log.sample
- at dir(,games,0775) /var/games/phantasia
- at dir(,games,0775) /var/games/larn
- at dir(,games,0770) /var/games/hackdir/save
- at dir(,games,0775) /var/games/hackdir
- at dir(,games,0775) /var/games/battlestar
- at dir(,games,0775) /var/games/atc
+ at sample(,games,0664) /var/games/snakerawscores.sample
+ at dir(,games,0775) /var/games/atc
+ at dir(,games,0775) /var/games/battlestar
+ at dir(,games,0775) /var/games/hackdir/save
+ at dir(,games,0775) /var/games/hackdir
+ at dir(,games,0775) /var/games/larn
+ at dir(,games,0775) /var/games/phantasia
More information about the svn-ports-all
mailing list