svn commit: r372029 - in head/games/xtrojka: . files

[Antoine Brodin]

Author: antoine
Date: Sat Nov  1 19:04:18 2014
New Revision: 372029
URL: https://svnweb.freebsd.org/changeset/ports/372029
QAT: https://qat.redports.org/buildarchive/r372029/

Log:
  - Allow staging as a regular user
  - Bump portrevision as some files were not packaged with intended group

Deleted:
  head/games/xtrojka/files/old-patch-Makefile
Modified:
  head/games/xtrojka/Makefile
  head/games/xtrojka/files/patch-Makefile
  head/games/xtrojka/pkg-plist

Modified: head/games/xtrojka/Makefile
==============================================================================
--- head/games/xtrojka/Makefile	Sat Nov  1 18:56:19 2014	(r372028)
+++ head/games/xtrojka/Makefile	Sat Nov  1 19:04:18 2014	(r372029)
@@ -2,9 +2,9 @@
 
 PORTNAME=	xtrojka
 PORTVERSION=	1.2.3
+PORTREVISION=	1
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	games/arcade/tetris
+MASTER_SITES=	SUNSITE/games/arcade/tetris
 DISTNAME=	${PORTNAME}${PORTVERSION:C/\.//g}
 
 MAINTAINER=	ports at edwinm.ik.nu
@@ -13,12 +13,9 @@ COMMENT=	Game of skill similar to T*tris
 USE_XORG=	x11 xt xproto xaw xmu xext
 MAKE_JOBS_UNSAFE=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}
-MAKE_ARGS=	PREFIX=${STAGEDIR}${PREFIX}
+INSTALL_TARGET=	install PREFIX=${STAGEDIR}${PREFIX}
 
 pre-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/xtrojka
 
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/xtrojka
-
 .include <bsd.port.mk>

Modified: head/games/xtrojka/files/patch-Makefile
==============================================================================
--- head/games/xtrojka/files/patch-Makefile	Sat Nov  1 18:56:19 2014	(r372028)
+++ head/games/xtrojka/files/patch-Makefile	Sat Nov  1 19:04:18 2014	(r372029)
@@ -1,6 +1,6 @@
---- Makefile.orig	1996-07-27 20:05:03.000000000 +0200
-+++ Makefile	2013-09-12 11:55:14.000000000 +0200
-@@ -10,15 +10,15 @@
+--- Makefile.orig	1996-07-27 18:05:03 UTC
++++ Makefile
+@@ -10,15 +10,15 @@ PROGS= xtrojka
  #					xtrojka version (do not change!)
  VERSION=123
  #					where to put the binary
@@ -20,7 +20,7 @@
  #					used X libraries
  XLIBS= -lXaw -lXmu -lXt -lX11 -lXext
  #					some more X libraries
-@@ -48,7 +48,7 @@
+@@ -48,7 +48,7 @@ HSF=-DSCOREFILE='"$(HSFILE)"'
  #	comment out your favorite system (the one you use, that is...)
  #
  #					search the libaries here
@@ -29,7 +29,7 @@
  #					doesn't work too well on all systems
  #LCK=-DLOCKING
  #					add debug info
-@@ -75,7 +75,13 @@
+@@ -75,7 +75,13 @@ XPMLIB=-lXpm
  #
  # Linux
  #
@@ -44,7 +44,7 @@
  
  #
  #
-@@ -105,11 +111,17 @@
+@@ -105,11 +111,14 @@ tar:
  	rm -rf xtrojka$(VERSION);
  
  install:
@@ -57,17 +57,14 @@
 +	echo $(HSFILE)|sed -e 's/\//\\\//g'>hsn
 +	sed -e "s/__SCOREDIR__/`cat hsn`/g" xtrojka.man > xtrojka.6
 +	gzip -c xtrojka.6 >$(MANDIR)/xtrojka.6.gz
-+	cp xtrojka $(TARGET_DIR)
-+	chmod 2755 $(TARGET_DIR)/xtrojka
-+	chgrp games $(TARGET_DIR)/xtrojka
++	$(BSD_INSTALL_PROGRAM) xtrojka $(TARGET_DIR)
 +	touch $(HSFILE)
 +	chmod 664 $(HSFILE)
-+	chgrp games $(HSFILE)
 +	@rm -f hsn
  	
  clean:
  	rm -rf tags *.o core xtrojka xtrojka.6 
-@@ -119,7 +131,7 @@
+@@ -119,7 +128,7 @@ clean:
  #	DEPENDENCIES
  #
  

Modified: head/games/xtrojka/pkg-plist
==============================================================================
--- head/games/xtrojka/pkg-plist	Sat Nov  1 18:56:19 2014	(r372028)
+++ head/games/xtrojka/pkg-plist	Sat Nov  1 19:04:18 2014	(r372029)
@@ -1,4 +1,3 @@
-bin/xtrojka
-share/xtrojka/xtrojka.scores
+@(,games,2755) bin/xtrojka
+@(,games,) share/xtrojka/xtrojka.scores
 man/man6/xtrojka.6.gz
- at dirrm share/xtrojka