svn commit: r355445 - in head/games/golddig: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Mon May 26 20:23:16 2014
New Revision: 355445
URL: http://svnweb.freebsd.org/changeset/ports/355445
QAT: https://qat.redports.org/buildarchive/r355445/

Log:
  - Stagify
  - Improve highscore file handling
  - Pass maintainership to games@
  - Fix insallation from user
  - Strip binary

Added:
  head/games/golddig/files/
  head/games/golddig/files/patch-Makefile   (contents, props changed)
  head/games/golddig/files/pkg-deinstall.in   (contents, props changed)
  head/games/golddig/files/pkg-install.in
     - copied, changed from r354909, head/games/golddig/pkg-install
Deleted:
  head/games/golddig/pkg-install
Modified:
  head/games/golddig/Makefile
  head/games/golddig/pkg-plist

Modified: head/games/golddig/Makefile
==============================================================================
--- head/games/golddig/Makefile	Mon May 26 20:21:53 2014	(r355444)
+++ head/games/golddig/Makefile	Mon May 26 20:23:16 2014	(r355445)
@@ -3,23 +3,27 @@
 
 PORTNAME=	golddig
 PORTVERSION=	3.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.NetBSD.org/~chuck/gz/
 DISTNAME=	${PORTNAME}C${PORTVERSION}
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	games at FreeBSD.org
 COMMENT=	Getting the Gold and Avoiding Death
 
 USE_XORG=	x11
-MAKE_ENV=	X11BASE="${LOCALBASE}"
+MAKE_ENV=	X11BASE="${LOCALBASE}" \
+		_STRIPFLAG_INSTALL="${STRIP}"
 
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-MAN6=		gdedit.6 golddig.6
+SCOREFILE=	/var/games/golddig.scores
+
+SUB_FILES=	pkg-deinstall pkg-install
+SUB_LIST=	SCOREFILE="${SCOREFILE}"
 
 DESKTOP_ENTRIES="Gold Digger" "" "" "${PORTNAME}" "" ""
 
-NO_STAGE=	yes
 post-patch:
 	@${GREP} -lR "@PREFIX@" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
 		's|@PREFIX@|${PREFIX}|'

Added: head/games/golddig/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/golddig/files/patch-Makefile	Mon May 26 20:23:16 2014	(r355445)
@@ -0,0 +1,50 @@
+--- Makefile.orig	2008-11-25 00:26:32.000000000 +0300
++++ Makefile	2014-05-26 13:44:10.000000000 +0400
+@@ -49,36 +49,29 @@
+ #
+ #
+ BSD_INSTALL_GAME_DIR?= \
+-	${INSTALL} -d -o ${GAMEOWN} -g ${GAMEGRP} -m ${GAMEDIRMODE}
++	${INSTALL} -d
+ #
+ BSD_INSTALL_GAME?=          \
+-        ${INSTALL} ${COPY} ${_STRIPFLAG_INSTALL} -o ${GAMEOWN} \
+-	-g ${GAMEGRP} -m ${GAMEMODE}
++        ${INSTALL} ${COPY} ${_STRIPFLAG_INSTALL} \
++	-m ${GAMEMODE}
+ #
+ BSD_INSTALL_GAME_DATA?=     \
+-        ${INSTALL} ${COPY} -o ${GAMEOWN} -g ${GAMEGRP} -m ${GAMEDATAMODE}
++        ${INSTALL} ${COPY} -m ${GAMEDATAMODE}
+ #
+ BSD_INSTALL_MAN?=           \
+-        ${INSTALL} ${COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE}
++        ${INSTALL} ${COPY} -m ${MANMODE}
+ #
+ 
+ 
+ all: ${GAME} ${EDITOR}
+ 
+ install: ${GAME} ${EDITOR}
+-	${BSD_INSTALL_GAME_DIR} ${LIB}
+-	${BSD_INSTALL_GAME} ${GAME} ${BIN}
+-	${BSD_INSTALL_GAME} ${EDITOR} ${BIN}
+-	${BSD_INSTALL_GAME_DIR} /var/games
+-	touch golddig.scores
+-	${BSD_INSTALL_GAME_DATA} golddig.scores /var/games/golddig.scores
+-	${BSD_INSTALL_GAME_DATA} levs/goldlev* levs/default ${LIB}
+-	${BSD_INSTALL_MAN} golddig.6 ${MAN}/golddig.${MANEXT}
+-	${BSD_INSTALL_MAN} gdedit.6 ${MAN}/gdedit.${MANEXT}
+-	chgrp ${SCORE_GROUP} ${BIN}/${GAME}
+-	chmod g+s ${BIN}/${GAME}
+-	chgrp ${SCORE_GROUP} /var/games/golddig.scores
+-	chmod 0664 /var/games/golddig.scores
++	${BSD_INSTALL_GAME_DIR} ${DESTDIR}${LIB}
++	${BSD_INSTALL_GAME} ${GAME} ${DESTDIR}${BIN}
++	${BSD_INSTALL_GAME} ${EDITOR} ${DESTDIR}${BIN}
++	${BSD_INSTALL_GAME_DATA} levs/goldlev* levs/default ${DESTDIR}${LIB}
++	${BSD_INSTALL_MAN} golddig.6 ${DESTDIR}${MAN}/golddig.${MANEXT}
++	${BSD_INSTALL_MAN} gdedit.6 ${DESTDIR}${MAN}/gdedit.${MANEXT}
+ 
+ update: ${GAME} ${EDITOR}
+ 	cp ${GAME} ${EDITOR} ${BIN}

Added: head/games/golddig/files/pkg-deinstall.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/golddig/files/pkg-deinstall.in	Mon May 26 20:23:16 2014	(r355445)
@@ -0,0 +1,16 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+[ "$2" != "POST-DEINSTALL" ] && exit 0
+
+if [ -s "%%SCOREFILE%%" ]; then
+	echo
+	echo "To completely remove the port, please remove the following"
+	echo "file manually, if it's no longer needed:"
+	echo
+	echo "    %%SCOREFILE%%"
+	echo
+else
+	rm -f "%%SCOREFILE%%"
+fi

Copied and modified: head/games/golddig/files/pkg-install.in (from r354909, head/games/golddig/pkg-install)
==============================================================================
--- head/games/golddig/pkg-install	Fri May 23 04:15:41 2014	(r354909, copy source)
+++ head/games/golddig/files/pkg-install.in	Mon May 26 20:23:16 2014	(r355445)
@@ -1,11 +1,10 @@
 #!/bin/sh
+#
+# $FreeBSD$
 
-SCOREDIR="/var/games"
-SCOREFILE="/var/games/golddig.scores"
+[ "$2" != "POST-INSTALL" ] && exit 0
+[ -e "%%SCOREFILE%%" ] && exit 0
 
-[ "$2" != "POST-INSTALL" -o -f "$SCOREFILE" ] && exit 0
-
-mkdir -p $SCOREDIR
-touch $SCOREFILE
-chown root:games $SCOREFILE
-chmod 664 $SCOREFILE
+touch "%%SCOREFILE%%"
+chgrp games "%%SCOREFILE%%"
+chmod g+w "%%SCOREFILE%%"

Modified: head/games/golddig/pkg-plist
==============================================================================
--- head/games/golddig/pkg-plist	Mon May 26 20:21:53 2014	(r355444)
+++ head/games/golddig/pkg-plist	Mon May 26 20:23:16 2014	(r355445)
@@ -1,5 +1,11 @@
 bin/gdedit
+ at group games
+ at mode 2555
 bin/golddig
+ at mode
+ at group
+man/man6/gdedit.6.gz
+man/man6/golddig.6.gz
 %%DATADIR%%/default
 %%DATADIR%%/goldlev001
 %%DATADIR%%/goldlev002
@@ -28,4 +34,3 @@ bin/golddig
 %%DATADIR%%/goldlev025
 %%DATADIR%%/goldlev026
 @dirrm %%DATADIR%%
- at unexec [ -s /var/games/golddig.scores ] || rm -f /var/games/golddig.scores