2 files changed, 43 insertions, 49 deletions

diff --git a/games/bsdgames/Makefile b/games/bsdgames/Makefile
index 32ea74ff6f2f..32cff10bf870 100644
--- a/games/bsdgames/Makefile
+++ b/games/bsdgames/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	bsdgames
 PORTVERSION=	3.8.2
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	games
 # Fetched from git://git.dragonflybsd.org/dragonfly.git, v${PORTVERSION}, /games
@@ -18,7 +18,8 @@ LICENSE=	BSD3CLAUSE
 CONFLICTS=	hangman-[0-9]*
 
 USES=		uidfix tar:xz
-MAKE_ENV+=	NO_WERROR=1 BINGRP=${BINGRP}
+MAKE_ENV+=	NO_WERROR=1
+MAKE_ARGS=	BINGRP=${BINGRP}
 
 # contain /usr/share/games
 SHAREPATH_FILES=atc/atc.6 \
diff --git a/games/bsdgames/pkg-plist b/games/bsdgames/pkg-plist
index dbd397616015..62bc9a3db5a1 100644
--- a/games/bsdgames/pkg-plist
+++ b/games/bsdgames/pkg-plist
@@ -1,28 +1,28 @@
 bin/adventure
 bin/arithmetic
-bin/atc
+@(,games,2555) bin/atc
 bin/backgammon
-bin/battlestar
+@(,games,2555) bin/battlestar
 bin/bs-game
-bin/canfield
+@(,games,2555) bin/canfield
 bin/cfscores
-bin/cribbage
+@(,games,2555) bin/cribbage
 bin/fish-game
-bin/hack
+@(,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
@@ -106,41 +106,34 @@ share/games/quiz.db/ucc
 share/games/cribbage.instr
 share/games/fish.instr
 share/games/wump.info
-@group games
-@mode 664
-@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
-@dir /var/games/phantasia
-@dir /var/games/larn
-@mode 0770
-@dir /var/games/hackdir/save
-@mode 0775
-@dir /var/games/hackdir
-@dir /var/games/battlestar
-@dir /var/games/atc
-@group wheel
-@mode
+@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
+@sample(,games,0664) /var/games/hackdir/help.sample
+@sample(,games,0664) /var/games/hackdir/hh.sample
+@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
+@sample(,games,0664) /var/games/larn/lscore12.0.sample
+@sample(,games,0664) /var/games/larn/llog12.0.sample
+@sample(,games,0664) /var/games/phantasia/monsters.sample
+@sample(,games,0664) /var/games/phantasia/void.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
+@sample(,games,0664) /var/games/phantasia/motd.sample
+@sample(,games,0664) /var/games/phantasia/scoreboard.sample
+@sample(,games,0664) /var/games/robots_roll.sample
+@sample(,games,0664) /var/games/rogue.scores.sample
+@sample(,games,0664) /var/games/saillog.sample
+@sample(,games,0664) /var/games/snakerawscores.sample
+@sample(,games,0664) /var/games/snake.log.sample
+@dir(,games,0775) /var/games/phantasia
+@dir(,games,0775) /var/games/larn
+@dir(,games,0770) /var/games/hackdir/save
+@dir(,games,0775) /var/games/hackdir
+@dir(,games,0775) /var/games/battlestar
+@dir(,games,0775) /var/games/atc