svn commit: r362720 - in head: . games/bsdgames

[Adam Weinberger]

Author: adamw
Date: Wed Jul 23 19:29:58 2014
New Revision: 362720
URL: http://svnweb.freebsd.org/changeset/ports/362720
QAT: https://qat.redports.org/buildarchive/r362720/

Log:
  The decision to move the savedata into ${PREFIX} did not go over
  well. Revert it, and add a "@cwd /" that makes @sample do the
  right thing.

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

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Wed Jul 23 19:27:16 2014	(r362719)
+++ head/UPDATING	Wed Jul 23 19:29:58 2014	(r362720)
@@ -42,10 +42,9 @@ you update your ports collection, before
   AFFECTS: users of games/bsdgames
   AUTHOR: adamw at FreeBSD.org
 
-  bsdgames now expects savegame data in /usr/local/var/games instead of
-  /var/games. To continue using your saved games,
-
-  cp -rp /var/games/* /usr/local/var/games
+  Please disregard any prior instructions about moving your game data to
+  /usr/local/var/games. If you have done this, please move it back to
+  /var/games.
 
 20140714:
   AFFECTS: users of databases/db6

Modified: head/games/bsdgames/Makefile
==============================================================================
--- head/games/bsdgames/Makefile	Wed Jul 23 19:27:16 2014	(r362719)
+++ head/games/bsdgames/Makefile	Wed Jul 23 19:29:58 2014	(r362720)
@@ -3,20 +3,19 @@
 
 PORTNAME=	bsdgames
 PORTVERSION=	3.8.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	games
 # Fetched from http://gitweb.dragonflybsd.org/dragonfly.git/tree/v${PORTVERSION}:/games
-# Content is stable, but file timestamps differ. Bad gitweb, no cookie!
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	adamw
 
 MAINTAINER=	adamw at FreeBSD.org
 COMMENT=	Traditional BSD games taken from DragonFly BSD
 
-CONFLICTS=	hangman-*
+CONFLICTS=	hangman-[0-9]*
 
 USES=		tar:xz
-#WRKSRC=		${WRKDIR}/dragonfly
 MAKE_ENV+=	NO_WERROR=1
 
 # contain /usr/share/games
@@ -64,19 +63,17 @@ post-patch:
 		${REINPLACE_CMD} -e 's/HIDEGAME/SGIDGAME/' \
 			${WRKSRC}/$${f}/Makefile; \
 	done
-	@${FIND} ${WRKSRC} -type f | ${XARGS} \
-		${REINPLACE_CMD} -e 's|/var/games/|${PREFIX}&|g'
 
 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}${PREFIX}/var/games/$d
+	@${MKDIR} ${STAGEDIR}/var/games/$d
 .endfor
 
 post-install:
-	@${TOUCH} ${STAGEDIR}${PREFIX}/var/games/atc_score
-	@${FIND} ${STAGEDIR}${PREFIX}/var/games -type f -exec ${MV} {} {}.sample \;
+	@${TOUCH} ${STAGEDIR}/var/games/atc_score
+	@${FIND} ${STAGEDIR}/var/games -type f -exec ${MV} {} {}.sample \;
 
 .include <bsd.port.mk>

Modified: head/games/bsdgames/pkg-plist
==============================================================================
--- head/games/bsdgames/pkg-plist	Wed Jul 23 19:27:16 2014	(r362719)
+++ head/games/bsdgames/pkg-plist	Wed Jul 23 19:29:58 2014	(r362720)
@@ -106,8 +106,13 @@ 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
+ at cwd /
 @sample var/games/atc_score.sample
 @sample var/games/battlestar.log.sample
 @sample var/games/cfscores.sample
@@ -143,10 +148,3 @@ share/games/wump.info
 @dirrmtry var/games/battlestar
 @dirrmtry var/games/atc
 @dirrmtry var/games
- at mode
- at group
- at dirrmtry var
- at dirrm share/games/atc
- at dirrm share/games/larn
- at dirrm share/games/quiz.db
- at dirrm share/games