diff options
author | obache <obache> | 2011-05-26 12:51:22 +0000 |
---|---|---|
committer | obache <obache> | 2011-05-26 12:51:22 +0000 |
commit | 613ab734ed1c749e0a5819a634270bda0b8f3208 (patch) | |
tree | 2f9e545fa646cb045738b13e7f3d8ff927e76d04 /games/falcons-eye | |
parent | 81af0bdefb350dcd7da98949ccdd4eb72335a5a6 (diff) | |
download | pkgsrc-613ab734ed1c749e0a5819a634270bda0b8f3208.tar.gz |
* add destdir installation support
* honor PKGMANDIR
* create some missing directories with permissions
* runtime dependency on gzip command
Bump PKGREVISION.
Diffstat (limited to 'games/falcons-eye')
-rw-r--r-- | games/falcons-eye/Makefile | 36 | ||||
-rw-r--r-- | games/falcons-eye/distinfo | 6 | ||||
-rw-r--r-- | games/falcons-eye/patches/patch-ab | 20 | ||||
-rw-r--r-- | games/falcons-eye/patches/patch-ae | 10 |
4 files changed, 37 insertions, 35 deletions
diff --git a/games/falcons-eye/Makefile b/games/falcons-eye/Makefile index ed7cb57155d..e4d01589af8 100644 --- a/games/falcons-eye/Makefile +++ b/games/falcons-eye/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.41 2009/08/25 11:57:45 wiz Exp $ +# $NetBSD: Makefile,v 1.42 2011/05/26 12:51:22 obache Exp $ # DISTNAME= nethack_source_331_jtp_193 PKGNAME= falcons-eye-1.9.3 -PKGREVISION= 13 +PKGREVISION= 14 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=falconseye/} EXTRACT_SUFX= .zip @@ -12,6 +12,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://falconseye.sourceforge.net/ COMMENT= Falcon's Eye NetHack +PKG_DESTDIR_SUPPORT= destdir + MAKE_JOBS_SAFE= no HAS_CONFIGURE= yes @@ -19,10 +21,11 @@ CONFIGURE_SCRIPT= ./sys/unix/setup.sh DIST_SUBDIR= ${PKGNAME_NOREV}-20050216-2 WRKSRC= ${WRKDIR} -USE_TOOLS+= bison lex ksh:run +USE_TOOLS+= bison lex ksh:run gzip:run +USE_GAMESGROUP= yes MAKE_ENV+= YACC=${TOOLS_CMDLINE_YACC:Q} -MAKE_FLAGS+= GAMEUID=${GAMEOWN} -MAKE_FLAGS+= GAMEGRP=${GAMEGRP} +MAKE_FLAGS+= GAMEUID=${GAMES_USER} +MAKE_FLAGS+= GAMEGRP=${GAMES_GROUP} REPLACE_KSH+= src/fe-config @@ -32,6 +35,7 @@ SUBST_CLASSES+= paths SUBST_MESSAGE.paths= Configuring program paths. SUBST_STAGE.paths= post-patch SUBST_FILES.paths= include/config.h src/fe-config.in +SUBST_FILES.paths+= sys/unix/nethack.sh SUBST_SED.paths= -e "s,XXXPREFIXXXX,${PREFIX},g" SUBST_SED.paths+= -e "s,@GZIP_PROGRAM@,${GZIP_CMD:M*gzip},g" @@ -50,18 +54,22 @@ SUBST_SED.unixconf+= -e 's,^\#define LINUX,\/\* \#define LINUX \*\/,' EGDIR= ${PREFIX}/share/examples/falcons-eye SHAREDIR= ${PREFIX}/share/falcons-eye-dir -CONF_FILES_PERMS+= /dev/null ${SHAREDIR}/logfile ${ROOT_USER} games 664 -CONF_FILES_PERMS+= /dev/null ${SHAREDIR}/record ${ROOT_USER} games 664 +CONF_FILES_PERMS+= /dev/null ${SHAREDIR}/logfile ${ROOT_USER} ${GAMES_GROUP} ${GAMEDATAMODE} +CONF_FILES_PERMS+= /dev/null ${SHAREDIR}/record ${ROOT_USER} ${GAMES_GROUP} ${GAMEDATAMODE} +REQD_DIRS+= ${SHAREDIR}/config +REQD_DIRS_PERMS+= ${SHAREDIR} ${ROOT_USER} ${GAMES_GROUP} ${GAMEDIRMODE} +REQD_DIRS_PERMS+= ${SHAREDIR}/save ${ROOT_USER} ${GAMES_GROUP} 770 CONF_FILES_PERMS+= ${EGDIR}/jtp_intr.txt ${SHAREDIR}/config/jtp_intr.txt \ - ${ROOT_USER} games 664 + ${ROOT_USER} ${GAMES_GROUP} ${GAMEDATAMODE} CONF_FILES_PERMS+= ${EGDIR}/jtp_keys.txt ${SHAREDIR}/config/jtp_keys.txt \ - ${ROOT_USER} games 664 + ${ROOT_USER} ${GAMES_GROUP} ${GAMEDATAMODE} CONF_FILES_PERMS+= ${EGDIR}/jtp_lit1.dat ${SHAREDIR}/config/jtp_lit1.dat \ - ${ROOT_USER} games 664 + ${ROOT_USER} ${GAMES_GROUP} ${GAMEDATAMODE} CONF_FILES_PERMS+= ${EGDIR}/jtp_opts.txt ${SHAREDIR}/config/jtp_opts.txt \ - ${ROOT_USER} games 664 + ${ROOT_USER} ${GAMES_GROUP} ${GAMEDATAMODE} CONF_FILES_PERMS+= ${EGDIR}/jtp_snds.txt ${SHAREDIR}/config/jtp_snds.txt \ - ${ROOT_USER} games 664 + ${ROOT_USER} ${GAMES_GROUP} ${GAMEDATAMODE} +SPECIAL_PERMS+= ${SHAREDIR}/falcons-eye ${SETGID_GAMES_PERMS} pre-configure: ${CP} ${WRKSRC}/src/fe-config.in ${WRKSRC}/src/fe-config @@ -70,8 +78,10 @@ pre-configure: post-build: ${CP} ${WRKSRC}/src/nethack ${WRKSRC}/src/falcons-eye +INSTALL_MAKE_FLAGS+= PREFIX=${DESTDIR}${PREFIX} + post-install: - ${INSTALL_SCRIPT} ${WRKSRC}/src/fe-config ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/src/fe-config ${DESTDIR}${PREFIX}/bin .include "../../devel/SDL/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/falcons-eye/distinfo b/games/falcons-eye/distinfo index 71c5798136a..5d39eb1600a 100644 --- a/games/falcons-eye/distinfo +++ b/games/falcons-eye/distinfo @@ -1,13 +1,13 @@ -$NetBSD: distinfo,v 1.14 2007/06/17 19:19:12 minskim Exp $ +$NetBSD: distinfo,v 1.15 2011/05/26 12:51:22 obache 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) = 87319cac318442976f98a31a35294d1a85e69970 +SHA1 (patch-ab) = b3c6a73755f6f6210d3b2540ce38e1ec8da17a00 SHA1 (patch-ac) = 3a88954c950854350938fbec1fef195baaacb2cf SHA1 (patch-ad) = dc8de40956abdea203814868c4344b7676dee82d -SHA1 (patch-ae) = b6d0cca1e3d781a2a1f1d4b244e944eaedfec716 +SHA1 (patch-ae) = ed76945b95fe4f871cc05b95381dd379e009ff70 SHA1 (patch-af) = f7ad4c58a5b37346f86976473ec9136188a4e628 SHA1 (patch-ag) = 6aeae6bde079b9c9081f6e32523687010c9bc674 SHA1 (patch-ah) = f7cd2d43bfa991e1b1d759db519bdaf1a48357bf diff --git a/games/falcons-eye/patches/patch-ab b/games/falcons-eye/patches/patch-ab index 83823cdbf02..17e94b571ae 100644 --- a/games/falcons-eye/patches/patch-ab +++ b/games/falcons-eye/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.3 2006/06/17 19:00:08 rillig Exp $ +$NetBSD: patch-ab,v 1.4 2011/05/26 12:51:23 obache Exp $ ---- 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 +--- sys/unix/Makefile.top.orig 2001-06-24 09:57:24.000000000 +0000 ++++ sys/unix/Makefile.top @@ -14,19 +14,17 @@ # MAKE = make @@ -89,15 +89,7 @@ $NetBSD: patch-ab,v 1.3 2006/06/17 19:00:08 rillig Exp $ dofiles: target=`sed -n \ -@@ -203,6 +210,7 @@ dofiles: - -rm -f $(SHELLDIR)/$(GAME) - sed -e 's;/usr/games/lib/nethackdir;$(GAMEDIR);' \ - -e 's;HACKDIR/nethack;HACKDIR/$(GAME);' \ -+ -e 's;XXXPREFIXXXX;$(PREFIX);' \ - < sys/unix/nethack.sh \ - > $(SHELLDIR)/$(GAME) - # set up their permissions -@@ -239,7 +247,8 @@ dofiles-jtp: +@@ -239,7 +246,8 @@ dofiles-jtp: chmod $(DIRPERM) $(JTPMAINDIR) $(JTPDATADIR) $(JTPGRAPHICSDIR) $(JTPSOUNDDIR) $(JTPMANUALDIR) # copy over the Falcon's Eye files ( cd win/jtp/gamedata; cp $(JTPMAINFILES) $(JTPMAINDIR) ; \ @@ -107,7 +99,7 @@ $NetBSD: patch-ab,v 1.3 2006/06/17 19:00:08 rillig Exp $ cd ../graphics; cp $(JTPGRAPHICSFILES) $(JTPGRAPHICSDIR) ; \ cd ../sound; cp $(JTPSOUNDFILES) $(JTPSOUNDDIR) ; \ cd ../manual; cp $(JTPMANUALFILES) $(JTPMANUALDIR) ) -@@ -247,9 +256,6 @@ dofiles-jtp: +@@ -247,9 +255,6 @@ dofiles-jtp: -( cd $(JTPMAINDIR) ; $(CHOWN) $(GAMEUID) $(JTPMAINFILES) ; \ $(CHGRP) $(GAMEGRP) $(JTPMAINFILES) ; \ chmod $(FILEPERM) $(JTPMAINFILES) ; \ @@ -117,7 +109,7 @@ $NetBSD: patch-ab,v 1.3 2006/06/17 19:00:08 rillig Exp $ cd $(JTPGRAPHICSDIR) ; $(CHOWN) $(GAMEUID) $(JTPGRAPHICSFILES) ; \ $(CHGRP) $(GAMEGRP) $(JTPGRAPHICSFILES) ; \ chmod $(FILEPERM) $(JTPGRAPHICSFILES) ; \ -@@ -280,19 +286,27 @@ install: $(GAME) $(VARDAT) dungeon spec_ +@@ -280,19 +285,27 @@ install: $(GAME) $(VARDAT) dungeon spec_ # set up the directories # not all mkdirs have -p; those that don't will create a -p directory -mkdir -p $(SHELLDIR) diff --git a/games/falcons-eye/patches/patch-ae b/games/falcons-eye/patches/patch-ae index 8ddeee23f4f..4bb70ed94bc 100644 --- a/games/falcons-eye/patches/patch-ae +++ b/games/falcons-eye/patches/patch-ae @@ -1,13 +1,13 @@ -$NetBSD: patch-ae,v 1.1.1.1 2002/01/21 11:56:17 pooka Exp $ +$NetBSD: patch-ae,v 1.2 2011/05/26 12:51:23 obache Exp $ ---- sys/unix/Makefile.doc.orig Fri Jan 14 22:49:48 2000 -+++ sys/unix/Makefile.doc Thu Aug 10 18:17:40 2000 -@@ -34,7 +34,7 @@ +--- sys/unix/Makefile.doc.orig 2001-06-24 09:57:24.000000000 +0000 ++++ sys/unix/Makefile.doc +@@ -34,7 +34,7 @@ Guidebook.dvi: Guidebook.tex GAME = nethack -MANDIR = /usr/man/man6 -+MANDIR = $(PREFIX)/man/man6 ++MANDIR = $(PREFIX)/${PKGMANDIR}/man6 MANEXT = 6 # manual installation for most BSD-style systems |