svn commit: r374144 - head/games/bsdgames

[Adam Weinberger]

Author: adamw
Date: Sat Dec  6 19:55:13 2014
New Revision: 374144
URL: https://svnweb.freebsd.org/changeset/ports/374144
QAT: https://qat.redports.org/buildarchive/r374144/

Log:
  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

Modified:
  head/games/bsdgames/Makefile
  head/games/bsdgames/pkg-plist

Modified: head/games/bsdgames/Makefile
==============================================================================
--- head/games/bsdgames/Makefile	Sat Dec  6 19:54:20 2014	(r374143)
+++ head/games/bsdgames/Makefile	Sat Dec  6 19:55:13 2014	(r374144)
@@ -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 \;
 

Modified: head/games/bsdgames/pkg-plist
==============================================================================
--- head/games/bsdgames/pkg-plist	Sat Dec  6 19:54:20 2014	(r374143)
+++ head/games/bsdgames/pkg-plist	Sat Dec  6 19:55:13 2014	(r374144)
@@ -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
- at dirrm share/games/atc
- at dirrm share/games/larn
- at dirrm share/games/quiz.db
- at 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
- at dirrmtry /var/games/phantasia
- at dirrmtry /var/games/larn
+ at dir /var/games/phantasia
+ at dir /var/games/larn
 @mode 0770
- at dirrmtry /var/games/hackdir/save
+ at dir /var/games/hackdir/save
 @mode 0775
- at dirrmtry /var/games/hackdir
- at dirrmtry /var/games/battlestar
- at dirrmtry /var/games/atc
+ at dir /var/games/hackdir
+ at dir /var/games/battlestar
+ at dir /var/games/atc
 @group wheel
 @mode