svn commit: r374683 - in branches/2014Q4/games/bsdgames: . files

Adam Weinberger adamw at FreeBSD.org
Sat Dec 13 20:12:09 UTC 2014 

Author: adamw
Date: Sat Dec 13 20:12:07 2014
New Revision: 374683
URL: https://svnweb.freebsd.org/changeset/ports/374683
QAT: https://qat.redports.org/buildarchive/r374683/

Log:
  MFH r374144, r374594, r374674, and r374681.
  
  r374144:
  	Rename bs and fish to avoid conflicts with games/bs and shells/fish.
  	While here, get on board with @dir.
  r374594:
  	Fix a bounds-checking typo in trek. The number of sectors was being used
  	to check input for the quadrant, and NSECTS > NQUADS.
  r374674:
  	Since r367027, the setgid games have been installed as setgid root
  	instead of setgid root. The port redefines BINGRP when necessary,
  	but since BINGRP was being passed in MAKE_ARGS, it overrode those
  	redefinitions. Passing BINGRP in MAKE_ENV instead should allow
  	uidfix to still work, while making sure that the games are installed
  	with the correct group.
  r374681:
  	Revert the contents of r374674, as it broke packaging as a regular
  	user. Instead, set the group and mode manually in the plist.
  
  Approved by:	portmgr (antoine)

Added:
  branches/2014Q4/games/bsdgames/files/patch-trek_computer.c
     - copied unchanged from r374594, head/games/bsdgames/files/patch-trek_computer.c
Modified:
  branches/2014Q4/games/bsdgames/Makefile
  branches/2014Q4/games/bsdgames/pkg-plist
Directory Properties:
  branches/2014Q4/   (props changed)

Modified: branches/2014Q4/games/bsdgames/Makefile
==============================================================================
--- branches/2014Q4/games/bsdgames/Makefile	Sat Dec 13 20:00:56 2014	(r374682)
+++ branches/2014Q4/games/bsdgames/Makefile	Sat Dec 13 20:12:07 2014	(r374683)
@@ -3,6 +3,7 @@
 
 PORTNAME=	bsdgames
 PORTVERSION=	3.8.2
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	games
 # Fetched from git://git.dragonflybsd.org/dragonfly.git, v${PORTVERSION}, /games
@@ -75,6 +76,12 @@ pre-install:
 .endfor
 
 post-install:
+# avoid conflict with games/bs and shells/fish
+.for prog in bs fish
+	${MV} ${STAGEDIR}${PREFIX}/bin/${prog} ${STAGEDIR}${PREFIX}/bin/${prog}-game
+	${MV} ${STAGEDIR}${MAN6PREFIX}/man/man6/${prog}.6.gz ${STAGEDIR}${MAN6PREFIX}/man/man6/${prog}-game.6.gz
+.endfor
+
 	@${TOUCH} ${STAGEDIR}/var/games/atc_score
 	@${FIND} ${STAGEDIR}/var/games -type f -exec ${MV} {} {}.sample \;
 

Copied: branches/2014Q4/games/bsdgames/files/patch-trek_computer.c (from r374594, head/games/bsdgames/files/patch-trek_computer.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q4/games/bsdgames/files/patch-trek_computer.c	Sat Dec 13 20:12:07 2014	(r374683, copy of r374594, head/games/bsdgames/files/patch-trek_computer.c)
@@ -0,0 +1,15 @@
+--- trek/computer.c.orig	2014-12-12 15:10:37 UTC
++++ trek/computer.c
+@@ -175,10 +175,10 @@ computer(int v __unused)
+ 				tqy = Ship.quady;
+ 			} else {
+ 				ix = getintpar("Quadrant");
+-				if (ix < 0 || ix >= NSECTS)
++				if (ix < 0 || ix >= NQUADS)
+ 					break;
+ 				iy = getintpar("q-y");
+-				if (iy < 0 || iy >= NSECTS)
++				if (iy < 0 || iy >= NQUADS)
+ 					break;
+ 				tqx = ix;
+ 				tqy = iy;

Modified: branches/2014Q4/games/bsdgames/pkg-plist
==============================================================================
--- branches/2014Q4/games/bsdgames/pkg-plist	Sat Dec 13 20:00:56 2014	(r374682)
+++ branches/2014Q4/games/bsdgames/pkg-plist	Sat Dec 13 20:12:07 2014	(r374683)
@@ -1,28 +1,28 @@
 bin/adventure
 bin/arithmetic
-bin/atc
+@(,games,2555) bin/atc
 bin/backgammon
-bin/battlestar
-bin/bs
-bin/canfield
+@(,games,2555) bin/battlestar
+bin/bs-game
+@(,games,2555) bin/canfield
 bin/cfscores
-bin/cribbage
-bin/fish
-bin/hack
+@(,games,2555) bin/cribbage
+bin/fish-game
+@(,games,2555) bin/hack
 bin/hangman
 bin/hunt
 bin/huntd
 bin/larn
 bin/mille
-bin/phantasia
+@(,games,2555) bin/phantasia
 bin/piano
 bin/pig
 bin/quiz
 bin/rain
-bin/robots
+@(,games,2555) bin/robots
 bin/rogue
-bin/sail
-bin/snake
+@(,games,2555) bin/sail
+@(,games,2555) bin/snake
 bin/snscore
 bin/teachgammon
 bin/trek
@@ -35,11 +35,11 @@ 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/bs-game.6.gz
 man/man6/canfield.6.gz
 man/man6/cfscores.6.gz
 man/man6/cribbage.6.gz
-man/man6/fish.6.gz
+man/man6/fish-game.6.gz
 man/man6/hack.6.gz
 man/man6/hangman.6.gz
 man/man6/hunt.6.gz
@@ -106,45 +106,34 @@ share/games/quiz.db/ucc
 share/games/cribbage.instr
 share/games/fish.instr
 share/games/wump.info
- at dirrm share/games/atc
- at dirrm share/games/larn
- at dirrm share/games/quiz.db
- at dirrm share/games
- at group games
- at mode 664
- at sample /var/games/atc_score.sample
- at sample /var/games/battlestar.log.sample
- at sample /var/games/cfscores.sample
- at sample /var/games/criblog.sample
- at sample /var/games/hackdir/help.sample
- at sample /var/games/hackdir/hh.sample
- at sample /var/games/hackdir/data.sample
- at sample /var/games/hackdir/perm.sample
- at sample /var/games/hackdir/record.sample
- at sample /var/games/hackdir/rumors.sample
- at sample /var/games/larn/lscore12.0.sample
- at sample /var/games/larn/llog12.0.sample
- at sample /var/games/phantasia/monsters.sample
- at sample /var/games/phantasia/void.sample
- at sample /var/games/phantasia/characs.sample
- at sample /var/games/phantasia/gold.sample
- at sample /var/games/phantasia/lastdead.sample
- at sample /var/games/phantasia/mess.sample
- at sample /var/games/phantasia/motd.sample
- at sample /var/games/phantasia/scoreboard.sample
- at sample /var/games/robots_roll.sample
- at sample /var/games/rogue.scores.sample
- at sample /var/games/saillog.sample
- at sample /var/games/snakerawscores.sample
- at sample /var/games/snake.log.sample
- at mode 0775
- at dirrmtry /var/games/phantasia
- at dirrmtry /var/games/larn
- at mode 0770
- at dirrmtry /var/games/hackdir/save
- at mode 0775
- at dirrmtry /var/games/hackdir
- at dirrmtry /var/games/battlestar
- at dirrmtry /var/games/atc
- at group wheel
- at mode
+ at sample(,games,0664) /var/games/atc_score.sample
+ at sample(,games,0664) /var/games/battlestar.log.sample
+ at sample(,games,0664) /var/games/cfscores.sample
+ at sample(,games,0664) /var/games/criblog.sample
+ at sample(,games,0664) /var/games/hackdir/help.sample
+ at sample(,games,0664) /var/games/hackdir/hh.sample
+ at sample(,games,0664) /var/games/hackdir/data.sample
+ at sample(,games,0664) /var/games/hackdir/perm.sample
+ at sample(,games,0664) /var/games/hackdir/record.sample
+ at sample(,games,0664) /var/games/hackdir/rumors.sample
+ at sample(,games,0664) /var/games/larn/lscore12.0.sample
+ at 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/phantasia/characs.sample
+ at sample(,games,0664) /var/games/phantasia/gold.sample
+ at sample(,games,0664) /var/games/phantasia/lastdead.sample
+ at sample(,games,0664) /var/games/phantasia/mess.sample
+ at sample(,games,0664) /var/games/phantasia/motd.sample
+ at sample(,games,0664) /var/games/phantasia/scoreboard.sample
+ at sample(,games,0664) /var/games/robots_roll.sample
+ at sample(,games,0664) /var/games/rogue.scores.sample
+ at sample(,games,0664) /var/games/saillog.sample
+ at sample(,games,0664) /var/games/snakerawscores.sample
+ at 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

More information about the svn-ports-branches mailing list