Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 13 Apr 2014 17:11:21 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r351231 - in head/games/falconseye: . files
Message-ID:  <201404131711.s3DHBLXQ045139@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pawel
Date: Sun Apr 13 17:11:21 2014
New Revision: 351231
URL: http://svnweb.freebsd.org/changeset/ports/351231
QAT: https://qat.redports.org/buildarchive/r351231/

Log:
  Add staging support

Modified:
  head/games/falconseye/Makefile
  head/games/falconseye/files/patch-sys_unix_Makefile_top
  head/games/falconseye/pkg-plist

Modified: head/games/falconseye/Makefile
==============================================================================
--- head/games/falconseye/Makefile	Sun Apr 13 16:51:17 2014	(r351230)
+++ head/games/falconseye/Makefile	Sun Apr 13 17:11:21 2014	(r351231)
@@ -25,7 +25,6 @@ CFLAGS+=	-I${LOCALBASE}/include -L${LOCA
 NO_WRKSUBDIR=	yes
 MAKE_JOBS_UNSAFE=	yes
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -i '' -e "s|<malloc.h>|<stdlib.h>|" \
 	${WRKSRC}/include/jtp_gen.h ${WRKSRC}/win/jtp/jtp_dirx.c \
@@ -41,10 +40,10 @@ post-build:
 	@cd ${WRKSRC}/doc && ${PERL} -p ${FILESDIR}/substitute <recover.6 >frecover.6
 
 post-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/util/recover ${PREFIX}/bin/frecover
-	@cd ${WRKSRC}/doc && \
-		${INSTALL_MAN} recover.6 ${PREFIX}/man/man6/frecover.6
-	@cd ${WRKSRC}/doc && \
-		${INSTALL_MAN} nethack.6 ${PREFIX}/man/man6/falconseye.6
+	${INSTALL_PROGRAM} ${WRKSRC}/util/recover ${STAGEDIR}${PREFIX}/bin/frecover
+	cd ${WRKSRC}/doc && ${INSTALL_MAN} recover.6 \
+		${STAGEDIR}${PREFIX}/man/man6/frecover.6
+	cd ${WRKSRC}/doc && ${INSTALL_MAN} nethack.6 \
+		${STAGEDIR}${PREFIX}/man/man6/falconseye.6
 
 .include <bsd.port.mk>

Modified: head/games/falconseye/files/patch-sys_unix_Makefile_top
==============================================================================
--- head/games/falconseye/files/patch-sys_unix_Makefile_top	Sun Apr 13 16:51:17 2014	(r351230)
+++ head/games/falconseye/files/patch-sys_unix_Makefile_top	Sun Apr 13 17:11:21 2014	(r351231)
@@ -1,6 +1,6 @@
---- sys/unix/Makefile.top.orig	Sun Jun 24 18:57:24 2001
-+++ sys/unix/Makefile.top	Fri Aug 24 03:27:56 2001
-@@ -15,18 +15,17 @@
+--- sys/unix/Makefile.top.orig	2001-06-24 18:57:24.000000000 +0200
++++ sys/unix/Makefile.top	2014-04-13 18:56:38.000000000 +0200
+@@ -15,11 +15,10 @@
  
  # make NetHack
  #PREFIX	 = /usr
@@ -15,16 +15,6 @@
  
  # Permissions - some places use setgid instead of setuid, for instance
  # See also the option "SECURE" in include/config.h
--GAMEPERM = 04755
--FILEPERM = 0644
-+GAMEPERM = 02755
-+FILEPERM = 0664
- EXEPERM  = 0755
--DIRPERM  = 0755
-+DIRPERM  = 0775
- 
- # GAMEDIR also appears in config.h as "HACKDIR".
- # VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else GAMEDIR
 @@ -36,12 +35,13 @@
  # therefore there should not be anything in GAMEDIR that you want to keep
  # (if there is, you'll have to do the installation by hand or modify the
@@ -42,17 +32,15 @@
  # VARDATND = x11tiles pet_mark.xbm
  # VARDATND = x11tiles pet_mark.xbm rip.xpm
  # for Atari/Gem
-@@ -67,8 +67,8 @@
- # will only work if setuid (or setgid) behavior is not desired or required.
- # CHOWN = chown
- # CHGRP = chgrp
--CHOWN = true
--CHGRP = true
-+CHOWN = chown
-+CHGRP = chgrp
- 
- # ----------------------------------------------
- # Extra configuration for NetHack - Falcon's Eye
+@@ -78,7 +78,7 @@
+ # in order to e.g. access the Xlib server. In particular, we need to
+ # setgid instead of setuid. Therefore we must also allow group writing 
+ # for the files and directories.
+-GAMEPERM = 02755
++GAMEPERM = 02555
+ FILEPERM = 0664
+ EXEPERM = 0755
+ DIRPERM = 0775
 @@ -119,12 +119,15 @@
  $(GAME):
  	( cd src ; $(MAKE) )

Modified: head/games/falconseye/pkg-plist
==============================================================================
--- head/games/falconseye/pkg-plist	Sun Apr 13 16:51:17 2014	(r351230)
+++ head/games/falconseye/pkg-plist	Sun Apr 13 17:11:21 2014	(r351231)
@@ -256,11 +256,9 @@ share/falconseyedir/wizard1.lev
 share/falconseyedir/wizard2.lev
 share/falconseyedir/wizard3.lev
 share/falconseyedir/wizhelp
-man/man6/falconseye.6
-man/man6/frecover.6
-@mode 2555
+man/man6/falconseye.6.gz
+man/man6/frecover.6.gz
 share/falconseyedir/falconseye
-@exec chmod 775 %B
 @exec install -g games -m 0664 /dev/null %B/logfile
 @exec install -g games -m 0664 /dev/null %B/perm
 @exec install -g games -m 0664 /dev/null %B/record



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404131711.s3DHBLXQ045139>