summaryrefslogtreecommitdiff
path: root/games/bsdgames
diff options
context:
space:
mode:
authorAdam Weinberger <adamw@FreeBSD.org>2014-12-06 19:55:13 +0000
committerAdam Weinberger <adamw@FreeBSD.org>2014-12-06 19:55:13 +0000
commitf67753f362e5fb39574a4451b381cdf5f211f9d0 (patch)
tree7390d71d871c459ee47980a2bd7bc49ec9f6a8a0 /games/bsdgames
parentRemove invalid line from plist (diff)
Rename bs and fish to avoid conflicts with games/bs and shells/fish.
While here, get on board with @dir. PR: 195672 Submitted by: nemysis
Notes
Notes: svn path=/head/; revision=374144
Diffstat (limited to 'games/bsdgames')
-rw-r--r--games/bsdgames/Makefile7
-rw-r--r--games/bsdgames/pkg-plist24
2 files changed, 17 insertions, 14 deletions
diff --git a/games/bsdgames/Makefile b/games/bsdgames/Makefile
index 6358135fa2f3..29a7080c3c3e 100644
--- a/games/bsdgames/Makefile
+++ b/games/bsdgames/Makefile
@@ -3,6 +3,7 @@
PORTNAME= bsdgames
PORTVERSION= 3.8.2
+PORTREVISION= 1
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 \;
diff --git a/games/bsdgames/pkg-plist b/games/bsdgames/pkg-plist
index e8b366fc19ff..dbd397616015 100644
--- a/games/bsdgames/pkg-plist
+++ b/games/bsdgames/pkg-plist
@@ -3,11 +3,11 @@ bin/arithmetic
bin/atc
bin/backgammon
bin/battlestar
-bin/bs
+bin/bs-game
bin/canfield
bin/cfscores
bin/cribbage
-bin/fish
+bin/fish-game
bin/hack
bin/hangman
bin/hunt
@@ -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,10 +106,6 @@ 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/atc_score.sample
@@ -138,13 +134,13 @@ share/games/wump.info
@sample /var/games/snakerawscores.sample
@sample /var/games/snake.log.sample
@mode 0775
-@dirrmtry /var/games/phantasia
-@dirrmtry /var/games/larn
+@dir /var/games/phantasia
+@dir /var/games/larn
@mode 0770
-@dirrmtry /var/games/hackdir/save
+@dir /var/games/hackdir/save
@mode 0775
-@dirrmtry /var/games/hackdir
-@dirrmtry /var/games/battlestar
-@dirrmtry /var/games/atc
+@dir /var/games/hackdir
+@dir /var/games/battlestar
+@dir /var/games/atc
@group wheel
@mode