From owner-svn-ports-all@FreeBSD.ORG Tue Jul 22 13:39:59 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 19B174E3; Tue, 22 Jul 2014 13:39:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0644026CC; Tue, 22 Jul 2014 13:39:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6MDdwKv093492; Tue, 22 Jul 2014 13:39:58 GMT (envelope-from adamw@svn.freebsd.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6MDdwZT093490; Tue, 22 Jul 2014 13:39:58 GMT (envelope-from adamw@svn.freebsd.org) Message-Id: <201407221339.s6MDdwZT093490@svn.freebsd.org> From: Adam Weinberger Date: Tue, 22 Jul 2014 13:39:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362541 - in head/games/bsdgames: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jul 2014 13:39:59 -0000 Author: adamw Date: Tue Jul 22 13:39:58 2014 New Revision: 362541 URL: http://svnweb.freebsd.org/changeset/ports/362541 QAT: https://qat.redports.org/buildarchive/r362541/ Log: Stage, simplify, and put everything in /var/games as a @sample so that saved data is precious. Also, take maintainership, thank you uqs! Deleted: head/games/bsdgames/files/share.mtree head/games/bsdgames/files/var.mtree Modified: head/games/bsdgames/Makefile head/games/bsdgames/pkg-plist Modified: head/games/bsdgames/Makefile ============================================================================== --- head/games/bsdgames/Makefile Tue Jul 22 13:31:21 2014 (r362540) +++ head/games/bsdgames/Makefile Tue Jul 22 13:39:58 2014 (r362541) @@ -3,7 +3,7 @@ PORTNAME= bsdgames PORTVERSION= 2.4 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= games # Fetched from http://gitweb.dragonflybsd.org/dragonfly.git/tree/v2.4.0:/games @@ -11,47 +11,14 @@ CATEGORIES= games MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= uqs -MAINTAINER= uqs@FreeBSD.org +MAINTAINER= adamw@FreeBSD.org COMMENT= Traditional BSD games taken from DragonFly BSD CONFLICTS= hangman-* +USES= tar:bzip2 WRKSRC= ${WRKDIR}/dragonfly -USE_BZIP2= yes MAKE_ENV+= NO_WERROR=1 -MAN6= adventure.6 \ - arithmetic.6 \ - atc.6 \ - backgammon.6 \ - battlestar.6 \ - bs.6 \ - canfield.6 \ - cfscores.6 \ - cribbage.6 \ - fish.6 \ - hack.6 \ - hangman.6 \ - hunt.6 \ - huntd.6 \ - larn.6 \ - mille.6 \ - phantasia.6 \ - piano.6 \ - pig.6 \ - quiz.6 \ - rain.6 \ - robots.6 \ - rogue.6 \ - sail.6 \ - snake.6 \ - snscore.6 \ - trek.6 \ - wargames.6 \ - worm.6 \ - worms.6 \ - wump.6 - -MANCOMPRESSED= maybe # contain /usr/share/games SHAREPATH_FILES=atc/atc.6 \ @@ -79,7 +46,6 @@ GAMESPATH_FILES=backgammon/backgammon/ba SGID_BINARIES= atc battlestar canfield/canfield cribbage hack phantasia \ robots sail snake/snake -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e "s/NOMAN/NO_MAN/" \ ${WRKSRC}/backgammon/teachgammon/Makefile \ @@ -100,12 +66,16 @@ post-patch: ${WRKSRC}/$${f}/Makefile; \ done -# Only useful for DESTDIR -VARDIR?= /var - -pre-su-install: - ${MKDIR} ${VARDIR} - mtree -deU -f ${FILESDIR}/var.mtree -p ${VARDIR} - mtree -deU -f ${FILESDIR}/share.mtree -p ${PREFIX}/share +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 +.endfor + +post-install: + @${TOUCH} ${STAGEDIR}/var/games/atc_score + @${FIND} ${STAGEDIR}/var/games -type f -exec ${MV} {} {}.sample \; .include Modified: head/games/bsdgames/pkg-plist ============================================================================== --- head/games/bsdgames/pkg-plist Tue Jul 22 13:31:21 2014 (r362540) +++ head/games/bsdgames/pkg-plist Tue Jul 22 13:39:58 2014 (r362541) @@ -2,7 +2,6 @@ bin/adventure bin/arithmetic bin/atc bin/backgammon -bin/teachgammon bin/battlestar bin/bs bin/canfield @@ -25,22 +24,52 @@ bin/rogue bin/sail bin/snake bin/snscore +bin/teachgammon bin/trek bin/wargames bin/worm bin/worms bin/wump +man/man6/adventure.6.gz +man/man6/arithmetic.6.gz +man/man6/atc.6.gz +man/man6/backgammon.6.gz +man/man6/battlestar.6.gz +man/man6/bs.6.gz +man/man6/canfield.6.gz +man/man6/cfscores.6.gz +man/man6/cribbage.6.gz +man/man6/fish.6.gz +man/man6/hack.6.gz +man/man6/hangman.6.gz +man/man6/hunt.6.gz +man/man6/huntd.6.gz +man/man6/larn.6.gz +man/man6/mille.6.gz +man/man6/phantasia.6.gz +man/man6/piano.6.gz +man/man6/pig.6.gz +man/man6/quiz.6.gz +man/man6/rain.6.gz +man/man6/robots.6.gz +man/man6/rogue.6.gz +man/man6/sail.6.gz +man/man6/snake.6.gz +man/man6/snscore.6.gz +man/man6/trek.6.gz +man/man6/wargames.6.gz +man/man6/worm.6.gz +man/man6/worms.6.gz +man/man6/wump.6.gz share/games/atc/Game_List share/games/atc/Killer share/games/atc/crossover share/games/atc/default share/games/atc/easy share/games/atc/game_2 -@dirrm share/games/atc share/games/larn/larnmaze share/games/larn/larnopts share/games/larn/larn.help -@dirrm share/games/larn share/games/quiz.db/africa share/games/quiz.db/america share/games/quiz.db/areas @@ -74,51 +103,47 @@ share/games/quiz.db/spell share/games/quiz.db/state share/games/quiz.db/trek share/games/quiz.db/ucc -@dirrm share/games/quiz.db 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 -@cwd /var/games -@exec chgrp games /var/games -@dirrmtry atc -@exec mkdir %D/atc -@exec chmod 0775 %D/atc -@dirrmtry battlestar -@exec mkdir %D/battlestar -@exec chmod 0775 %D/battlestar -hackdir/perm -hackdir/rumors -hackdir/help -hackdir/hh -hackdir/data -phantasia/monsters -phantasia/void -@comment FIXME below are highscores, we should keep them if non-empty -@comment Also, we must make sure to not clobber them upon install XXX -hackdir/record -@dirrmtry hackdir/save -@dirrmtry hackdir -@exec mkdir -p %D/hackdir/save -@exec chmod 0770 %D/hackdir %D/hackdir/save -larn/lscore12.0 -larn/llog12.0 -@dirrmtry larn -@exec chmod 0775 %D/larn -phantasia/characs -phantasia/gold -phantasia/lastdead -phantasia/mess -phantasia/motd -phantasia/scoreboard -@dirrmtry phantasia -@exec chmod 0775 %D/phantasia -@comment atc_score -battlestar.log -cfscores -criblog -robots_roll -rogue.scores -saillog -snakerawscores -snake.log +@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 +@mode 0775 +@dirrmtry /var/games/phantasia +@dirrmtry /var/games/larn +@mode 0770 +@dirrmtry /var/games/hackdir/save +@mode 0775 +@dirrmtry /var/games/hackdir +@dirrmtry /var/games/battlestar +@dirrmtry /var/games/atc +@dirrmtry /var/games