Date: Tue, 22 Jul 2014 14:45:41 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362545 - in head: . games/bsdgames games/bsdgames/files Message-ID: <201407221445.s6MEjf7o025973@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Tue Jul 22 14:45:40 2014 New Revision: 362545 URL: http://svnweb.freebsd.org/changeset/ports/362545 QAT: https://qat.redports.org/buildarchive/r362545/ Log: Update to 3.8.1. Along with this, savegame data is now in /usr/local/var/games instead of /var/games. This was necessary because @sample cannot operate outside of %%PREFIX%%, and previously the port would overwrite or remove previously saved games. This is easier, better and more hier(7)ful. Added: head/games/bsdgames/files/patch-battlestar_externs.h - copied, changed from r362536, head/games/bsdgames/files/patch-battlestar head/games/bsdgames/files/patch-battlestar_fly.c - copied, changed from r362536, head/games/bsdgames/files/patch-battlestar head/games/bsdgames/files/patch-cribbage_instr.c - copied, changed from r362536, head/games/bsdgames/files/patch-dfly head/games/bsdgames/files/patch-hack_hack.unix.c - copied, changed from r362536, head/games/bsdgames/files/patch-hack head/games/bsdgames/files/patch-sail_pl_1.c - copied, changed from r362536, head/games/bsdgames/files/patch-dfly Deleted: head/games/bsdgames/files/patch-battlestar head/games/bsdgames/files/patch-dfly head/games/bsdgames/files/patch-hack Modified: head/UPDATING head/games/bsdgames/Makefile head/games/bsdgames/distinfo head/games/bsdgames/pkg-plist Modified: head/UPDATING ============================================================================== --- head/UPDATING Tue Jul 22 14:08:53 2014 (r362544) +++ head/UPDATING Tue Jul 22 14:45:40 2014 (r362545) @@ -5,6 +5,15 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20140722 + AFFECTS: users of games/bsdgames + AUTHOR: adamw@adamw.org + + bsdgames now expects savegame data in /usr/local/var/games instead of + /var/games. To continue using your saved games, + + cp -rp /var/games/* /usr/local/var/games + 20140714: AFFECTS: users of databases/db6 AUTHOR: mandree@FreeBSD.org Modified: head/games/bsdgames/Makefile ============================================================================== --- head/games/bsdgames/Makefile Tue Jul 22 14:08:53 2014 (r362544) +++ head/games/bsdgames/Makefile Tue Jul 22 14:45:40 2014 (r362545) @@ -2,22 +2,21 @@ # $FreeBSD$ PORTNAME= bsdgames -PORTVERSION= 2.4 -PORTREVISION= 3 +PORTVERSION= 3.8.1 PORTEPOCH= 1 CATEGORIES= games -# Fetched from http://gitweb.dragonflybsd.org/dragonfly.git/tree/v2.4.0:/games +# Fetched from http://gitweb.dragonflybsd.org/dragonfly.git/tree/v${PORTVERSION}:/games # Content is stable, but file timestamps differ. Bad gitweb, no cookie! MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= uqs +MASTER_SITE_SUBDIR= adamw MAINTAINER= adamw@FreeBSD.org COMMENT= Traditional BSD games taken from DragonFly BSD CONFLICTS= hangman-* -USES= tar:bzip2 -WRKSRC= ${WRKDIR}/dragonfly +USES= tar:xz +#WRKSRC= ${WRKDIR}/dragonfly MAKE_ENV+= NO_WERROR=1 # contain /usr/share/games @@ -65,17 +64,19 @@ post-patch: ${REINPLACE_CMD} -e 's/HIDEGAME/SGIDGAME/' \ ${WRKSRC}/$${f}/Makefile; \ done + @${FIND} ${WRKSRC} -type f | ${XARGS} \ + ${REINPLACE_CMD} -e 's|/var/games/|${PREFIX}&|g' pre-install: .for d in atc larn quiz.db @${MKDIR} ${STAGEDIR}${PREFIX}/share/games/$d .endfor .for d in atc battlestar hackdir/save larn phantasia - @${MKDIR} ${STAGEDIR}/var/games/$d + @${MKDIR} ${STAGEDIR}${PREFIX}/var/games/$d .endfor post-install: - @${TOUCH} ${STAGEDIR}/var/games/atc_score - @${FIND} ${STAGEDIR}/var/games -type f -exec ${MV} {} {}.sample \; + @${TOUCH} ${STAGEDIR}${PREFIX}/var/games/atc_score + @${FIND} ${STAGEDIR}${PREFIX}/var/games -type f -exec ${MV} {} {}.sample \; .include <bsd.port.mk> Modified: head/games/bsdgames/distinfo ============================================================================== --- head/games/bsdgames/distinfo Tue Jul 22 14:08:53 2014 (r362544) +++ head/games/bsdgames/distinfo Tue Jul 22 14:45:40 2014 (r362545) @@ -1,2 +1,2 @@ -SHA256 (bsdgames-2.4.tar.bz2) = c89da5b3a63b3d5b4ecb9658a549a0ade114529d10890cd6cf0979a96a28ce19 -SIZE (bsdgames-2.4.tar.bz2) = 2011321 +SHA256 (bsdgames-3.8.1.tar.xz) = 573a1ae4201f911b33e0002e7f935b58b29175512f65af55eb333be9d714c7f7 +SIZE (bsdgames-3.8.1.tar.xz) = 1750464 Copied and modified: head/games/bsdgames/files/patch-battlestar_externs.h (from r362536, head/games/bsdgames/files/patch-battlestar) ============================================================================== --- head/games/bsdgames/files/patch-battlestar Tue Jul 22 12:33:36 2014 (r362536, copy source) +++ head/games/bsdgames/files/patch-battlestar_externs.h Tue Jul 22 14:45:40 2014 (r362545) @@ -1,14 +1,3 @@ -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 -@@ -294,6 +294,7 @@ - signal(SIGALRM, SIG_DFL); - mvcur(0,COLS-1,LINES-1,0); - endwin(); -+ setlinebuf(stdout); - signal(SIGTSTP, SIG_DFL); - signal(SIGINT, oldsig); - } --- 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 @@ Copied and modified: head/games/bsdgames/files/patch-battlestar_fly.c (from r362536, head/games/bsdgames/files/patch-battlestar) ============================================================================== --- head/games/bsdgames/files/patch-battlestar Tue Jul 22 12:33:36 2014 (r362536, copy source) +++ head/games/bsdgames/files/patch-battlestar_fly.c Tue Jul 22 14:45:40 2014 (r362545) @@ -1,7 +1,7 @@ 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 -@@ -294,6 +294,7 @@ +@@ -286,6 +286,7 @@ signal(SIGALRM, SIG_DFL); mvcur(0,COLS-1,LINES-1,0); endwin(); @@ -9,26 +9,3 @@ diff -Naur battlestar.orig/fly.c battles signal(SIGTSTP, SIG_DFL); signal(SIGINT, oldsig); } ---- 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 */ Copied and modified: head/games/bsdgames/files/patch-cribbage_instr.c (from r362536, head/games/bsdgames/files/patch-dfly) ============================================================================== --- head/games/bsdgames/files/patch-dfly Tue Jul 22 12:33:36 2014 (r362536, copy source) +++ head/games/bsdgames/files/patch-cribbage_instr.c Tue Jul 22 14:45:40 2014 (r362545) @@ -24,17 +24,3 @@ exit(1); } } ---- ./sail/pl_1.c -+++ ./sail/pl_1.c -@@ -122,7 +122,11 @@ choke(void) - void - child(void) - { -+#ifdef __DragonFly__ - union wait status; -+#else -+ int status; -+#endif - int pid; - - signal(SIGCHLD, SIG_IGN); Copied and modified: head/games/bsdgames/files/patch-hack_hack.unix.c (from r362536, head/games/bsdgames/files/patch-hack) ============================================================================== --- head/games/bsdgames/files/patch-hack Tue Jul 22 12:33:36 2014 (r362536, copy source) +++ head/games/bsdgames/files/patch-hack_hack.unix.c Tue Jul 22 14:45:40 2014 (r362545) @@ -1,28 +1,28 @@ ---- hack/hack.unix.c.orig 2009-09-24 10:46:30.000000000 +0200 -+++ hack/hack.unix.c 2009-11-04 18:49:58.645035610 +0100 -@@ -19,7 +19,9 @@ +--- 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> + #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); -@@ -95,13 +97,32 @@ + 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 *np; + char *p, *np, *path; + char filename[MAXPATHLEN+1]; - name = "/usr/games/hide/hack"; -- if(stat(name, &hbuf)) +- if (stat(name, &hbuf)) - error("Cannot get status of %s.", -- (np = rindex(name, '/')) ? np+1 : name); +- (np = strrchr(name, '/')) ? np + 1 : name); + if (strchr(name, '/') != NULL || (p = getenv("PATH")) == NULL) + p = ""; + np = path = strdup(p); /* Make a copy for strsep. */ Copied and modified: head/games/bsdgames/files/patch-sail_pl_1.c (from r362536, head/games/bsdgames/files/patch-dfly) ============================================================================== --- head/games/bsdgames/files/patch-dfly Tue Jul 22 12:33:36 2014 (r362536, copy source) +++ head/games/bsdgames/files/patch-sail_pl_1.c Tue Jul 22 14:45:40 2014 (r362545) @@ -1,29 +1,3 @@ ---- ./cribbage/instr.c -+++ ./cribbage/instr.c -@@ -51,7 +51,11 @@ void - instructions(void) - { - struct stat sb; -+#ifdef __DragonFly__ - union wait pstat; -+#else -+ int pstat; -+#endif - pid_t pid; - const char *pager, *path; - -@@ -77,7 +81,11 @@ instructions(void) - do { - pid = waitpid(pid, (int *)&pstat, 0); - } while (pid == -1 && errno == EINTR); -+#ifdef __DragonFly__ - if (pid == -1 || pstat.w_status) -+#else -+ if (pid == -1 || WEXITSTATUS(pstat) || WTERMSIG(pstat)) -+#endif - exit(1); - } - } --- ./sail/pl_1.c +++ ./sail/pl_1.c @@ -122,7 +122,11 @@ choke(void) Modified: head/games/bsdgames/pkg-plist ============================================================================== --- head/games/bsdgames/pkg-plist Tue Jul 22 14:08:53 2014 (r362544) +++ head/games/bsdgames/pkg-plist Tue Jul 22 14:45:40 2014 (r362545) @@ -106,44 +106,47 @@ share/games/quiz.db/ucc share/games/cribbage.instr share/games/fish.instr share/games/wump.info -@dirrm share/games/atc -@dirrm share/games/larn -@dirrm share/games/quiz.db -@dirrm share/games @group games @mode 664 -@sample /var/games/hackdir/help.sample -@sample /var/games/hackdir/hh.sample -@sample /var/games/hackdir/data.sample -@sample /var/games/hackdir/perm.sample -@sample /var/games/hackdir/record.sample -@sample /var/games/hackdir/rumors.sample -@sample /var/games/larn/lscore12.0.sample -@sample /var/games/larn/llog12.0.sample -@sample /var/games/phantasia/monsters.sample -@sample /var/games/phantasia/void.sample -@sample /var/games/phantasia/characs.sample -@sample /var/games/phantasia/gold.sample -@sample /var/games/phantasia/lastdead.sample -@sample /var/games/phantasia/mess.sample -@sample /var/games/phantasia/motd.sample -@sample /var/games/phantasia/scoreboard.sample -@sample /var/games/atc_score.sample -@sample /var/games/battlestar.log.sample -@sample /var/games/cfscores.sample -@sample /var/games/criblog.sample -@sample /var/games/robots_roll.sample -@sample /var/games/rogue.scores.sample -@sample /var/games/saillog.sample -@sample /var/games/snakerawscores.sample -@sample /var/games/snake.log.sample +@sample var/games/atc_score.sample +@sample var/games/battlestar.log.sample +@sample var/games/cfscores.sample +@sample var/games/criblog.sample +@sample var/games/hackdir/help.sample +@sample var/games/hackdir/hh.sample +@sample var/games/hackdir/data.sample +@sample var/games/hackdir/perm.sample +@sample var/games/hackdir/record.sample +@sample var/games/hackdir/rumors.sample +@sample var/games/larn/lscore12.0.sample +@sample var/games/larn/llog12.0.sample +@sample var/games/phantasia/monsters.sample +@sample var/games/phantasia/void.sample +@sample var/games/phantasia/characs.sample +@sample var/games/phantasia/gold.sample +@sample var/games/phantasia/lastdead.sample +@sample var/games/phantasia/mess.sample +@sample var/games/phantasia/motd.sample +@sample var/games/phantasia/scoreboard.sample +@sample var/games/robots_roll.sample +@sample var/games/rogue.scores.sample +@sample var/games/saillog.sample +@sample var/games/snakerawscores.sample +@sample var/games/snake.log.sample @mode 0775 -@dirrmtry /var/games/phantasia -@dirrmtry /var/games/larn +@dirrmtry var/games/phantasia +@dirrmtry var/games/larn @mode 0770 -@dirrmtry /var/games/hackdir/save +@dirrmtry var/games/hackdir/save @mode 0775 -@dirrmtry /var/games/hackdir -@dirrmtry /var/games/battlestar -@dirrmtry /var/games/atc -@dirrmtry /var/games +@dirrmtry var/games/hackdir +@dirrmtry var/games/battlestar +@dirrmtry var/games/atc +@dirrmtry var/games +@mode +@group +@dirrmtry var +@dirrm share/games/atc +@dirrm share/games/larn +@dirrm share/games/quiz.db +@dirrm share/games
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407221445.s6MEjf7o025973>