[pkgsrc/trunk]: pkgsrc/games/nighthawk Honor VARBASE.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/939220571b21
branches:  trunk
changeset: 495350:939220571b21
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Tue Jun 07 05:41:38 2005 +0000

description:
Honor VARBASE.

diffstat:

 games/nighthawk/Makefile         |   7 ++++---
 games/nighthawk/distinfo         |   6 +++---
 games/nighthawk/patches/patch-ab |  15 +++++++--------
 games/nighthawk/patches/patch-ad |  10 +++++-----
 4 files changed, 19 insertions(+), 19 deletions(-)

diffs (102 lines):

diff -r 1eb19f372525 -r 939220571b21 games/nighthawk/Makefile
--- a/games/nighthawk/Makefile  Tue Jun 07 05:34:39 2005 +0000
+++ b/games/nighthawk/Makefile  Tue Jun 07 05:41:38 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/06/07 05:33:20 minskim Exp $
+# $NetBSD: Makefile,v 1.25 2005/06/07 05:41:38 minskim Exp $
 #
 
 DISTNAME=              nighthawk-2.1
@@ -21,7 +21,8 @@
 
 MAKE_ENV+=             OSTYPE=${OPSYS}
 CPPFLAGS+=             -DPREFIX="\"${PREFIX}\"" \
-                       -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
+                       -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\"" \
+                       -DVARBASE="\"${VARBASE}\""
 
 .include "../../graphics/xpm/buildlink3.mk"
 .include "../../mk/ossaudio.buildlink3.mk"
@@ -43,6 +44,6 @@
        ${CHGRP} games ${PREFIX}/bin/nighthawk
        ${CHMOD} g+s ${PREFIX}/bin/nighthawk
        ${INSTALL_MAN} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/nighthawk/README
-       ${INSTALL} -o ${ROOT_USER} -g games -m 664 /dev/null /var/games/nighthawk.scores
+       ${INSTALL} -o ${ROOT_USER} -g games -m 664 /dev/null ${VARBASE}/games/nighthawk.scores
 
 .include "../../mk/bsd.pkg.mk"
diff -r 1eb19f372525 -r 939220571b21 games/nighthawk/distinfo
--- a/games/nighthawk/distinfo  Tue Jun 07 05:34:39 2005 +0000
+++ b/games/nighthawk/distinfo  Tue Jun 07 05:41:38 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2005/06/07 05:33:20 minskim Exp $
+$NetBSD: distinfo,v 1.8 2005/06/07 05:41:38 minskim Exp $
 
 SHA1 (nighthawk-2.1.tgz) = 117cd7d2c496a0d9e44b1b6d02523ad1cb0de1bf
 RMD160 (nighthawk-2.1.tgz) = 3973ff63c4525de65ae4dd3803d355c102968997
@@ -7,9 +7,9 @@
 RMD160 (nighthawk-2.1a.patch) = 4b4bf8f7c4092ecc5ea231fab83de99977e77306
 Size (nighthawk-2.1a.patch) = 8543 bytes
 SHA1 (patch-aa) = 34a11d0be9d7f83e341a85af986042013ad804ba
-SHA1 (patch-ab) = c1085e131ae6f4563e966c5bed8083b1c0e24f92
+SHA1 (patch-ab) = 1e0b921ad6920f74341b78e7d9804313e0269663
 SHA1 (patch-ac) = e51ee631a604a38570328b2472f958a64e39f169
-SHA1 (patch-ad) = e59c729c4700d36ca61809e40721f88d2d22c09d
+SHA1 (patch-ad) = 2cb1ad86cd8fbfcfbc0ece05ce3d65508a57fe68
 SHA1 (patch-ae) = 1699979e5013e86dc158722faef525b46ce30076
 SHA1 (patch-ba) = 3bf82814d23305a686317ea36ff03698d65157ee
 SHA1 (patch-bb) = beb63b9e3400c774534dd8b9832cfb314bc684ff
diff -r 1eb19f372525 -r 939220571b21 games/nighthawk/patches/patch-ab
--- a/games/nighthawk/patches/patch-ab  Tue Jun 07 05:34:39 2005 +0000
+++ b/games/nighthawk/patches/patch-ab  Tue Jun 07 05:41:38 2005 +0000
@@ -1,19 +1,18 @@
-$NetBSD: patch-ab,v 1.4 1999/08/04 12:18:12 hubertf Exp $
+$NetBSD: patch-ab,v 1.5 2005/06/07 05:41:38 minskim Exp $
 
---- src/Makefile.orig  Sun Feb  7 01:25:16 1999
-+++ src/Makefile       Sun Feb  7 01:26:48 1999
-@@ -3,13 +3,14 @@
+--- src/Makefile.orig  2005-06-07 00:36:34.514643392 -0500
++++ src/Makefile
+@@ -3,13 +3,13 @@
  #
  ############################################################################
  VERSION         = 2.1
 -CC            = gcc
 -CP            = g++
+-OPTIONS       = -Wall -g -pipe -fomit-frame-pointer \
 +CC            = gcc ${EVERYTHING}
 +CP            = g++ ${EVERYTHING}
- OPTIONS       = -Wall -g -pipe -fomit-frame-pointer \
--                      -DVERSION='"$(VERSION)"'
-+                      -DVERSION='"$(VERSION)"' \
-+                      -DPREFIX=\"${PREFIX}\"
++OPTIONS       = ${CPPFLAGS} ${CFLAGS} -Wall -pipe -fomit-frame-pointer \
+                       -DVERSION='"$(VERSION)"'
  
 -INCLUDE               =
 -LIBS          = -L/usr/X11R6/lib -lXpm -lX11
diff -r 1eb19f372525 -r 939220571b21 games/nighthawk/patches/patch-ad
--- a/games/nighthawk/patches/patch-ad  Tue Jun 07 05:34:39 2005 +0000
+++ b/games/nighthawk/patches/patch-ad  Tue Jun 07 05:41:38 2005 +0000
@@ -1,15 +1,15 @@
-$NetBSD: patch-ad,v 1.2 1999/02/10 15:09:56 frueauf Exp $
+$NetBSD: patch-ad,v 1.3 2005/06/07 05:41:38 minskim Exp $
 
---- options.h.BAK      Sun Feb  7 01:25:16 1999
-+++ options.h  Sun Feb  7 01:31:44 1999
-@@ -8,8 +8,8 @@
+--- options.h.orig     2005-06-07 00:33:59.974137120 -0500
++++ options.h
+@@ -8,8 +8,8 @@ If you are only building the basic game 
  configure theses directives.
  --------------------------------------------------------------------------
  --------------------------------------------------------------------------*/
 -#define INSTALL_DIR "/tmp"
 -#define SCORES_FILE "/tmp/nighthawk.scores"
 +#define INSTALL_DIR PREFIX "/share/nighthawk"
-+#define SCORES_FILE "/var/games/nighthawk.scores"
++#define SCORES_FILE VARBASE"/games/nighthawk.scores"
  
  /*
  uncomment this if you have a slow machine. this will reduce high intensive