Honor GAMEGRP, GAMEMODE, and GAMEDATAMODE.

3 files changed, 14 insertions, 14 deletions

diff --git a/games/xbill/Makefile b/games/xbill/Makefile
index 362338c7f04..16d7d65ef33 100644
--- a/games/xbill/Makefile
+++ b/games/xbill/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:45:58 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/06/14 17:14:08 minskim Exp $
 #
 
 DISTNAME=		xbill-2.0
@@ -17,9 +17,9 @@ USE_IMAKE=		YES
 USE_PKGINSTALL=		YES
 NO_INSTALL_MANPAGES=	YES
 
-PKG_GROUPS=		games
-MAKE_DIRS_PERMS+=	/var/games ${BINOWN} games 0775
-SUPPORT_FILES_PERMS+=	${PREFIX}/share/examples/xbill.scores /var/games/xbill.scores ${BINOWN} games 0664
+PKG_GROUPS=		${GAMEGRP}
+MAKE_DIRS_PERMS+=	/var/games ${BINOWN} ${GAMEGRP} 0775
+SUPPORT_FILES_PERMS+=	${PREFIX}/share/examples/xbill.scores /var/games/xbill.scores ${BINOWN} ${GAMEGRP} ${GAMEDATAMODE}
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/xbill.man ${PREFIX}/man/man6/xbill.6
diff --git a/games/xbill/distinfo b/games/xbill/distinfo
index 5d9c4307fcc..e0c1fb6cf7d 100644
--- a/games/xbill/distinfo
+++ b/games/xbill/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.9 2005/06/14 17:03:37 jmmv Exp $
+$NetBSD: distinfo,v 1.10 2005/06/14 17:14:08 minskim Exp $
 
 SHA1 (xbill-2.0.tgz) = 4ce4e37687801343af5f57c28498bd0b969c0537
 RMD160 (xbill-2.0.tgz) = 8f1551fb5f2bf7b620243ba4787c88c91d00d460
 Size (xbill-2.0.tgz) = 46909 bytes
-SHA1 (patch-aa) = e4fad0653c5dae7d7cef3d85bd934a35c9f3d498
+SHA1 (patch-aa) = 2da005452b1bd9c0258bc132535dd5c1fc9eb4b9
 SHA1 (patch-ab) = 245573e1ea2223ed1bde91c16db81a658bfcc8f6
 SHA1 (patch-ac) = c3dd487d0002f528f6726d268673bc11be0b24b6
 SHA1 (patch-ad) = 841d5ff9bbd984b62076a96e82b04e082d09a40c
diff --git a/games/xbill/patches/patch-aa b/games/xbill/patches/patch-aa
index d91c350c4ff..43bce413dea 100644
--- a/games/xbill/patches/patch-aa
+++ b/games/xbill/patches/patch-aa
@@ -1,14 +1,14 @@
-$NetBSD: patch-aa,v 1.7 2004/05/24 10:16:52 kristerw Exp $
+$NetBSD: patch-aa,v 1.8 2005/06/14 17:14:08 minskim Exp $
 
---- Imakefile.orig	1997-01-23 17:38:35.000000000 +0100
-+++ Imakefile	2004-05-24 12:13:39.000000000 +0200
+--- Imakefile.orig	1997-01-23 10:38:35.000000000 -0600
++++ Imakefile
 @@ -1,4 +1,4 @@
 -XBILL_DIR = /var/lib/games/xbill/
 +XBILL_DIR = $(PREFIX)/share/xbill/
  XCOMM XBILL_DIR = $(HOME)/.xbill/
  
  XCOMM Which widget set?  Motif looks slightly better; Athena is free.
-@@ -10,7 +10,7 @@
+@@ -10,7 +10,7 @@ XCOMM If you do not have libXpm installe
  XCOMM the statement below and insert the correct path.
  XCOMM Make sure xpm.h can be referenced as <X11/xpm.h>
  
@@ -17,7 +17,7 @@ $NetBSD: patch-aa,v 1.7 2004/05/24 10:16:52 kristerw Exp $
  XPMLIB = -lXpm
  
  XCOMM You shouldn't have to change anything below this line.
-@@ -18,12 +18,10 @@
+@@ -18,12 +18,10 @@ XCOMM You shouldn't have to change anyth
  XBILL_DEF = -DXBILL_HOME=\"$(XBILL_DIR)\"
  
  INCLUDES = -I. $(XPMINC)
@@ -31,7 +31,7 @@ $NetBSD: patch-aa,v 1.7 2004/05/24 10:16:52 kristerw Exp $
  
  #ifdef Use_Motif
    WIDGET = motif
-@@ -35,7 +33,7 @@
+@@ -35,7 +33,7 @@ CC = $(CXX)
  #endif
  
  LOCAL_LIBRARIES = $(WIDGETLIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
@@ -40,14 +40,14 @@ $NetBSD: patch-aa,v 1.7 2004/05/24 10:16:52 kristerw Exp $
  
  TARGET = xbill
  
-@@ -136,6 +134,9 @@
+@@ -136,6 +134,9 @@ XBMS =	bitmaps/apple.xbm \
  
  ComplexProgramTarget($(TARGET))
  
 -InstallProgramWithFlags(scores, $(XBILL_DIR), -m 777)
 +install::
 +	mkdir -p $(XBILL_DIR)
-+	${INSTALL} -c -s -m 2755 -g games xbill $(PREFIX)/bin
++	${INSTALL} -c -s -m ${GAMEMODE} -g ${GAMEGRP} xbill $(PREFIX)/bin
 +
  InstallMultiple ($(XPMS), $(XBILL_DIR)pixmaps)
  InstallMultiple ($(XBMS), $(XBILL_DIR)bitmaps)