[pkgsrc/trunk]: pkgsrc/games/xbill Fixed typo (CONFLICT => CONFLICTS). Added ...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bc355eba0e6c
branches:  trunk
changeset: 501566:bc355eba0e6c
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Oct 23 22:57:55 2005 +0000

description:
Fixed typo (CONFLICT => CONFLICTS). Added ${GAMEOWN} to PKG_USERS, which
is needed to build xbill on NetBSD-1.6.2/i386 as unpriviledged user.
Bumped PKGREVISION.

diffstat:

 games/xbill/Makefile         |  15 +++++++++------
 games/xbill/distinfo         |   4 ++--
 games/xbill/patches/patch-aa |   4 ++--
 3 files changed, 13 insertions(+), 10 deletions(-)

diffs (72 lines):

diff -r e607b394c4ee -r bc355eba0e6c games/xbill/Makefile
--- a/games/xbill/Makefile      Sun Oct 23 22:33:19 2005 +0000
+++ b/games/xbill/Makefile      Sun Oct 23 22:57:55 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2005/08/19 18:12:37 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/10/23 22:57:55 rillig Exp $
 #
 
 DISTNAME=              xbill-2.0
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            games x11
 MASTER_SITES=          ${MASTER_SITE_XCONTRIB:=games/}
 EXTRACT_SUFX=          .tgz
@@ -11,17 +11,20 @@
 HOMEPAGE=              http://www.xbill.org/
 COMMENT=               Stop the dreaded Windows virus from infecting computers
 
-CONFLICT=              gnome-games-[0-9]*
+CONFLICTS+=            gnome-games-[0-9]*
 
 USE_IMAKE=             YES
 USE_PKGINSTALL=                YES
 NO_INSTALL_MANPAGES=   YES
 
 CPPFLAGS+=             -DVARBASE=\"${VARBASE}\"
+PKG_USERS=             ${GAMEOWN}:${GAMEGRP}
 PKG_GROUPS=            ${GAMEGRP}
-MAKE_DIRS_PERMS+=      ${VARBASE}/games ${BINOWN} ${GAMEGRP} 0775
-MAKE_ENV+=             GAMEGRP=${GAMEGRP} GAMEMODE=${GAMEMODE}
-CONF_FILES_PERMS+=     ${PREFIX}/share/examples/xbill.scores ${VARBASE}/games/xbill.scores ${BINOWN} ${GAMEGRP} ${GAMEDATAMODE}
+MAKE_DIRS_PERMS+=      ${VARBASE}/games ${GAMEOWN} ${GAMEGRP} 0775
+MAKE_ENV+=             GAMEOWN=${GAMEOWN:Q}
+MAKE_ENV+=             GAMEGRP=${GAMEGRP:Q}
+MAKE_ENV+=             GAMEMODE=${GAMEMODE:Q}
+CONF_FILES_PERMS+=     ${PREFIX}/share/examples/xbill.scores ${VARBASE}/games/xbill.scores ${GAMEOWN} ${GAMEGRP} ${GAMEDATAMODE}
 
 post-install:
        ${INSTALL_MAN} ${WRKSRC}/xbill.man ${PREFIX}/man/man6/xbill.6
diff -r e607b394c4ee -r bc355eba0e6c games/xbill/distinfo
--- a/games/xbill/distinfo      Sun Oct 23 22:33:19 2005 +0000
+++ b/games/xbill/distinfo      Sun Oct 23 22:57:55 2005 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.11 2005/06/14 17:23:24 minskim Exp $
+$NetBSD: distinfo,v 1.12 2005/10/23 22:57:55 rillig Exp $
 
 SHA1 (xbill-2.0.tgz) = 4ce4e37687801343af5f57c28498bd0b969c0537
 RMD160 (xbill-2.0.tgz) = 8f1551fb5f2bf7b620243ba4787c88c91d00d460
 Size (xbill-2.0.tgz) = 46909 bytes
-SHA1 (patch-aa) = 2da005452b1bd9c0258bc132535dd5c1fc9eb4b9
+SHA1 (patch-aa) = 6dbb52be7523877ae52a5b6f8f913acc2e7d8a5d
 SHA1 (patch-ab) = 13a90b12c94352e228406541db06bacab8cd4a0d
 SHA1 (patch-ac) = c3dd487d0002f528f6726d268673bc11be0b24b6
 SHA1 (patch-ad) = 841d5ff9bbd984b62076a96e82b04e082d09a40c
diff -r e607b394c4ee -r bc355eba0e6c games/xbill/patches/patch-aa
--- a/games/xbill/patches/patch-aa      Sun Oct 23 22:33:19 2005 +0000
+++ b/games/xbill/patches/patch-aa      Sun Oct 23 22:57:55 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.8 2005/06/14 17:14:08 minskim Exp $
+$NetBSD: patch-aa,v 1.9 2005/10/23 22:57:55 rillig Exp $
 
 --- Imakefile.orig     1997-01-23 10:38:35.000000000 -0600
 +++ Imakefile
@@ -47,7 +47,7 @@
 -InstallProgramWithFlags(scores, $(XBILL_DIR), -m 777)
 +install::
 +      mkdir -p $(XBILL_DIR)
-+      ${INSTALL} -c -s -m ${GAMEMODE} -g ${GAMEGRP} xbill $(PREFIX)/bin
++      ${INSTALL} -c -s -m ${GAMEMODE} -o ${GAMEOWN} -g ${GAMEGRP} xbill $(PREFIX)/bin
 +
  InstallMultiple ($(XPMS), $(XBILL_DIR)pixmaps)
  InstallMultiple ($(XBMS), $(XBILL_DIR)bitmaps)