[pkgsrc/trunk]: pkgsrc/games/falcons-eye Fixed pkglint warnings. Due to the d...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a90c351b1ef6
branches:  trunk
changeset: 514742:a90c351b1ef6
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Jun 17 19:00:08 2006 +0000

description:
Fixed pkglint warnings. Due to the definition of INSTALL_SRC, the
CONF_FILES_PERMS settings currently don't have any effect. Bumped
PKGREVISION, since the ownership of one file might change.

diffstat:

 games/falcons-eye/Makefile         |  32 +++++++++++++++++---------------
 games/falcons-eye/distinfo         |   4 ++--
 games/falcons-eye/patches/patch-ab |   8 ++++----
 3 files changed, 23 insertions(+), 21 deletions(-)

diffs (119 lines):

diff -r 77797091dfc4 -r a90c351b1ef6 games/falcons-eye/Makefile
--- a/games/falcons-eye/Makefile        Sat Jun 17 18:17:29 2006 +0000
+++ b/games/falcons-eye/Makefile        Sat Jun 17 19:00:08 2006 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.34 2006/06/12 16:28:08 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2006/06/17 19:00:08 rillig Exp $
 #
 
 DISTNAME=              nethack_source_331_jtp_193
 PKGNAME=               falcons-eye-1.9.3
-PKGREVISION=           9
+PKGREVISION=           10
 CATEGORIES=            games
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=falconseye/}
 EXTRACT_SUFX=          .zip
@@ -20,6 +20,8 @@
 WRKSRC=                        ${WRKDIR}
 USE_TOOLS+=            bison lex
 MAKE_ENV+=             YACC=${TOOLS_CMDLINE_YACC:Q}
+MAKE_FLAGS+=           GAMEUID=${GAMEOWN}
+MAKE_FLAGS+=           GAMEGRP=${GAMEGRP}
 DEINSTALL_SRC=         ${PKGDIR}/DEINSTALL
 INSTALL_SRC=           # empty
 
@@ -29,8 +31,8 @@
 SUBST_MESSAGE.paths=   Configuring program paths.
 SUBST_STAGE.paths=     post-patch
 SUBST_FILES.paths=     include/config.h src/fe-config.in
-SUBST_SED.paths=       -e "s,XXXPREFIXXXX,${PREFIX},g" \
-                       -e "s,@GZIP_PROGRAM@,${GZIP_CMD:M*gzip},g"
+SUBST_SED.paths=       -e "s,XXXPREFIXXXX,${PREFIX},g"
+SUBST_SED.paths+=      -e "s,@GZIP_PROGRAM@,${GZIP_CMD:M*gzip},g"
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -39,9 +41,9 @@
 SUBST_MESSAGE.unixconf=        Configuring to use NetBSD presets.
 SUBST_STAGE.unixconf=  post-patch
 SUBST_FILES.unixconf=  include/unixconf.h
-SUBST_SED.unixconf=    -e 's,^\/\* \#define BSD 1 \*\/,\#define BSD 1,' \
-                       -e 's,^\#define SYSV,\/\* \#define SYSV \*\/,' \
-                       -e 's,^\#define LINUX,\/\* \#define LINUX \*\/,'
+SUBST_SED.unixconf=    -e 's,^\/\* \#define BSD 1 \*\/,\#define BSD 1,'
+SUBST_SED.unixconf+=   -e 's,^\#define SYSV,\/\* \#define SYSV \*\/,'
+SUBST_SED.unixconf+=   -e 's,^\#define LINUX,\/\* \#define LINUX \*\/,'
 .endif
 
 EGDIR=                 ${PREFIX}/share/examples/falcons-eye
@@ -49,23 +51,23 @@
 
 CONF_FILES_PERMS+=     /dev/null ${SHAREDIR}/logfile ${ROOT_USER} games 664
 CONF_FILES_PERMS+=     /dev/null ${SHAREDIR}/record ${ROOT_USER} games 664
-CONF_FILES_PERM+=      ${EGDIR}/jtp_intr.txt ${SHAREDIR}/config/jtp_intr.txt \
+CONF_FILES_PERMS+=     ${EGDIR}/jtp_intr.txt ${SHAREDIR}/config/jtp_intr.txt \
        ${ROOT_USER} games 664
-CONF_FILES_PERM+=      ${EGDIR}/jtp_keys.txt ${SHAREDIR}/config/jtp_keys.txt \
+CONF_FILES_PERMS+=     ${EGDIR}/jtp_keys.txt ${SHAREDIR}/config/jtp_keys.txt \
        ${ROOT_USER} games 664
-CONF_FILES_PERM+=      ${EGDIR}/jtp_lit1.dat ${SHAREDIR}/config/jtp_lit1.dat \
+CONF_FILES_PERMS+=     ${EGDIR}/jtp_lit1.dat ${SHAREDIR}/config/jtp_lit1.dat \
        ${ROOT_USER} games 664
-CONF_FILES_PERM+=      ${EGDIR}/jtp_opts.txt ${SHAREDIR}/config/jtp_opts.txt \
+CONF_FILES_PERMS+=     ${EGDIR}/jtp_opts.txt ${SHAREDIR}/config/jtp_opts.txt \
        ${ROOT_USER} games 664
-CONF_FILES_PERM+=      ${EGDIR}/jtp_snds.txt ${SHAREDIR}/config/jtp_snds.txt \
+CONF_FILES_PERMS+=     ${EGDIR}/jtp_snds.txt ${SHAREDIR}/config/jtp_snds.txt \
        ${ROOT_USER} games 664
 
 pre-configure:
        ${CP} ${WRKSRC}/src/fe-config.in ${WRKSRC}/src/fe-config
-       @${CHMOD} 755 ${WRKSRC}/sys/unix/setup.sh
+       ${CHMOD} 755 ${WRKSRC}/sys/unix/setup.sh
 
-pre-install:
-       @${CP} ${WRKSRC}/src/nethack ${WRKSRC}/src/falcons-eye
+post-build:
+       ${CP} ${WRKSRC}/src/nethack ${WRKSRC}/src/falcons-eye
 
 post-install:
        ${INSTALL_SCRIPT} ${WRKSRC}/src/fe-config ${PREFIX}/bin
diff -r 77797091dfc4 -r a90c351b1ef6 games/falcons-eye/distinfo
--- a/games/falcons-eye/distinfo        Sat Jun 17 18:17:29 2006 +0000
+++ b/games/falcons-eye/distinfo        Sat Jun 17 19:00:08 2006 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.12 2006/05/18 16:22:26 joerg Exp $
+$NetBSD: distinfo,v 1.13 2006/06/17 19:00:08 rillig Exp $
 
 SHA1 (falcons-eye-1.9.3-20050216-2/nethack_source_331_jtp_193.zip) = f25a3b77925d247762d18b6f022500aac7c42b29
 RMD160 (falcons-eye-1.9.3-20050216-2/nethack_source_331_jtp_193.zip) = a94c3bbdec7a0c034acbe431071342b872c7acc5
 Size (falcons-eye-1.9.3-20050216-2/nethack_source_331_jtp_193.zip) = 8349587 bytes
 SHA1 (patch-aa) = e068ec41aa17aeb8746475ff33fdef3540a664de
-SHA1 (patch-ab) = 20fb9e0c806ed4e20c49ea2dc3b4a7e302ecd527
+SHA1 (patch-ab) = 87319cac318442976f98a31a35294d1a85e69970
 SHA1 (patch-ac) = 3a88954c950854350938fbec1fef195baaacb2cf
 SHA1 (patch-ad) = dc8de40956abdea203814868c4344b7676dee82d
 SHA1 (patch-ae) = b6d0cca1e3d781a2a1f1d4b244e944eaedfec716
diff -r 77797091dfc4 -r a90c351b1ef6 games/falcons-eye/patches/patch-ab
--- a/games/falcons-eye/patches/patch-ab        Sat Jun 17 18:17:29 2006 +0000
+++ b/games/falcons-eye/patches/patch-ab        Sat Jun 17 19:00:08 2006 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.2 2006/05/18 16:22:26 joerg Exp $
+$NetBSD: patch-ab,v 1.3 2006/06/17 19:00:08 rillig Exp $
 
---- sys/unix/Makefile.top.orig 2001-06-24 18:57:24.000000000 +0000
-+++ sys/unix/Makefile.top
+--- sys/unix/Makefile.top.orig 2001-06-24 18:57:24.000000000 +0200
++++ sys/unix/Makefile.top      2006-06-17 20:32:55.000000000 +0200
 @@ -14,19 +14,17 @@
  # MAKE = make
  
@@ -145,7 +145,7 @@
 +      chown $(GAMEUID):$(GAMEGRP) $(PREFIX)/share/doc/$(GAME)/Guidebook.txt
 +      chmod $(FILEPERM) $(PREFIX)/share/doc/$(GAME)/Guidebook.txt
 +      cp util/recover $(PREFIX)/bin/recover-$(GAME)
-+      chown 0:0 $(PREFIX)/bin/recover-$(GAME)
++      : chown 0:0 $(PREFIX)/bin/recover-$(GAME)
 +      chmod 755 $(PREFIX)/bin/recover-$(GAME)
 +
  # and a reminder