* Honor VARBASE for score file directory.

* Handle score file as a part of package.
* Add user-destdir installation support.

Bump PKGREVISION.

4 files changed, 23 insertions, 21 deletions

diff --git a/games/xjewel/Makefile b/games/xjewel/Makefile
index 6b78c22b3f3..8c2c7fcd8c7 100644
--- a/games/xjewel/Makefile
+++ b/games/xjewel/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2006/12/27 13:37:37 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2011/05/24 09:54:05 obache Exp $
 
 DISTNAME=	xjewel-1.6
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	games x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB:S/contrib/R5contrib/}
 EXTRACT_SUFX=	.tar.z
@@ -9,9 +9,22 @@ EXTRACT_SUFX=	.tar.z
 MAINTAINER=	jdc@NetBSD.org
 COMMENT=	X windows-based dropping jewels game
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_IMAKE=	yes
 USE_TOOLS+=	gzcat bdftopcf mkfontdir
 
+BUILD_DEFS+=	VARBASE
+
+SPECIAL_PERMS+=		bin/xjewel ${SETGID_GAMES_PERMS}
+REQD_DIRS+=		${VARBASE}/games
+REQD_FILES_PERMS+=	/dev/null ${VARBASE}/games/xjewel.scores ${GAMEDATA_PERMS}
+
+SUBST_CLASSES+=		varbase
+SUBST_STAGE.varbase=	pre-configure
+SUBST_FILES.varbase=	Imakefile
+SUBST_VARS.varbase=	VARBASE
+
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xjewel/PLIST b/games/xjewel/PLIST
index 8814d71cb5b..e6a24ab9c73 100644
--- a/games/xjewel/PLIST
+++ b/games/xjewel/PLIST
@@ -1,4 +1,3 @@
-@comment $NetBSD: PLIST,v 1.5 2006/01/13 00:16:13 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2011/05/24 09:54:05 obache Exp $
 bin/xjewel
 ${IMAKE_GAMEMAN_DIR}/xjewel.${IMAKE_GAMEMAN_SUFFIX}
-@exec touch /var/games/xjewel.scores && ${CHOWN} games:games /var/games/xjewel.scores && ${CHMOD} 664 /var/games/xjewel.scores
diff --git a/games/xjewel/distinfo b/games/xjewel/distinfo
index e5fedcfded4..33b3e6e3332 100644
--- a/games/xjewel/distinfo
+++ b/games/xjewel/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2006/01/13 00:16:13 joerg Exp $
+$NetBSD: distinfo,v 1.5 2011/05/24 09:54:05 obache Exp $
 
 SHA1 (xjewel-1.6.tar.z) = b202d4fdb70bf3a61707aed7a00607a907c80275
 RMD160 (xjewel-1.6.tar.z) = c34bb8ab01c6a7055b67c600b8511e7e3d62118c
 Size (xjewel-1.6.tar.z) = 45439 bytes
-SHA1 (patch-aa) = bc68bf5316e246c5d2ba4d89a950b83a7c2fc4ac
+SHA1 (patch-aa) = 6c592db6b0eb0ae31b55dc12a78bb3f848263f93
diff --git a/games/xjewel/patches/patch-aa b/games/xjewel/patches/patch-aa
index 020316c56d5..ee18899d039 100644
--- a/games/xjewel/patches/patch-aa
+++ b/games/xjewel/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2006/01/13 00:16:13 joerg Exp $
+$NetBSD: patch-aa,v 1.3 2011/05/24 09:54:05 obache Exp $
 
 --- Imakefile.orig	1994-02-16 10:35:06.000000000 +0000
 +++ Imakefile
@@ -8,7 +8,7 @@ $NetBSD: patch-aa,v 1.2 2006/01/13 00:16:13 joerg Exp $
  # CHANGE HSCORE_FILE TO SUIT
 -#HSCORE_FILE=/usr/local/lib/xjewel.scores
 -HSCORE_FILE=xjewel.scores
-+HSCORE_FILE=/var/games/xjewel.scores
++HSCORE_FILE=@VARBASE@/games/xjewel.scores
  
  # ADD YOUR ARCHITECTURE IF YOU USE SELECT INSTEAD OF POLL
  #if defined(HPArchitecture) || defined(ApolloArchitecture) || \
@@ -31,14 +31,7 @@ $NetBSD: patch-aa,v 1.2 2006/01/13 00:16:13 joerg Exp $
  
  ##############################################################################
  # X-STUFF...
-@@ -42,15 +42,19 @@ CFONT   = bitmaps/seven_seg.$(FFILE)
- 
- 
- # LETS GET TO IT...
-+INSTPGMFLAGS = -s -m 2555 -o root -g games
- ComplexProgramTarget(xjewel)
- 
- # IF YOUR SERVER DOES NOT LIKE THE DEFAULT FONT COMPILER, EDIT HERE...
+@@ -48,9 +48,7 @@ ComplexProgramTarget(xjewel)
  FontTarget($(FONT))
  	$(MKFONTDIR) bitmaps/
  
@@ -46,10 +39,7 @@ $NetBSD: patch-aa,v 1.2 2006/01/13 00:16:13 joerg Exp $
 +
  # FORCE FONT TO BE BUILT
  all:: $(CFONT)
- 
- install::
+-
+-install::
 -	touch  $(HSCORE_FILE)
 -	chmod a+w $(HSCORE_FILE)
-+	touch $(HSCORE_FILE)
-+	chown games:games $(HSCORE_FILE)
-+	chmod 664 $(HSCORE_FILE)