[pkgsrc/pkgsrc-2004Q4]: pkgsrc/games/battalion Pullup ticket 285 - requested ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bcf7de5492a7
branches:  pkgsrc-2004Q4
changeset: 485894:bcf7de5492a7
user:      salo <salo%pkgsrc.org@localhost>
date:      Mon Feb 14 16:21:47 2005 +0000

description:
Pullup ticket 285 - requested by Min Sik Kim
portability fix for battalion

Revisions pulled up:
- pkgsrc/games/battalion/Makefile         1.27
- pkgsrc/games/battalion/distinfo         1.5
- pkgsrc/games/battalion/patches/patch-aa 1.10

   Module Name:         pkgsrc
   Committed By:        minskim
   Date:                Sun Feb 13 21:03:41 UTC 2005

   Modified Files:
        pkgsrc/games/battalion: Makefile distinfo
        pkgsrc/games/battalion/patches: patch-aa

   Log Message:
   Make this package build on Linux.  This fixes PR pkg/29357.
     - Use -lcompat on NetBSD only.
     - Define LINUXVERSION on Linux.

diffstat:

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

diffs (56 lines):

diff -r a3193034a090 -r bcf7de5492a7 games/battalion/Makefile
--- a/games/battalion/Makefile  Sun Feb 13 15:52:41 2005 +0000
+++ b/games/battalion/Makefile  Mon Feb 14 16:21:47 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2004/10/03 00:14:42 tv Exp $
+# $NetBSD: Makefile,v 1.26.2.1 2005/02/14 16:21:47 salo Exp $
 
 DISTNAME=              battalion
 PKGNAME=               battalion-1.4
@@ -18,6 +18,14 @@
 USE_BUILDLINK3=                yes
 USE_X11=               yes
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD"
+MAKE_ENV+=     LIBFLAGS=-lcompat
+.elif ${OPSYS} == "Linux"
+MAKE_ENV+=     OS="-DLINUXVERSION"
+.endif
+
 do-install:
        ${INSTALL} -c -s -o ${ROOT_USER} -g games -m 2755 ${WRKSRC}/battalion ${PREFIX}/bin
        cd ${WRKDIR} && \
diff -r a3193034a090 -r bcf7de5492a7 games/battalion/distinfo
--- a/games/battalion/distinfo  Sun Feb 13 15:52:41 2005 +0000
+++ b/games/battalion/distinfo  Mon Feb 14 16:21:47 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2003/07/22 22:38:36 jmmv Exp $
+$NetBSD: distinfo,v 1.4.10.1 2005/02/14 16:21:47 salo Exp $
 
 SHA1 (battalionSource1.4.tar.Z) = 50891668a9b6745fcb4e070805c085487a5176d8
 Size (battalionSource1.4.tar.Z) = 186221 bytes
 SHA1 (battalionSUN4.tar.gz) = 5cc314e192320a7505dddf730bbcccaef212ff4a
 Size (battalionSUN4.tar.gz) = 1593265 bytes
-SHA1 (patch-aa) = 89ea9136bf959b5f3b92a04550441a5d1a5898f4
+SHA1 (patch-aa) = 1e9f44cfa4af24d422a4c9283c12c03770a508e3
 SHA1 (patch-ab) = a47c5be93d82555b4fed23f5d5e71169859ebb49
diff -r a3193034a090 -r bcf7de5492a7 games/battalion/patches/patch-aa
--- a/games/battalion/patches/patch-aa  Sun Feb 13 15:52:41 2005 +0000
+++ b/games/battalion/patches/patch-aa  Mon Feb 14 16:21:47 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.9 2003/07/22 22:38:36 jmmv Exp $
+$NetBSD: patch-aa,v 1.9.10.1 2005/02/14 16:21:48 salo Exp $
 --- Makefile.orig      Thu Jan 16 17:31:58 1997
 +++ Makefile   Wed Apr 12 21:03:39 2000
 @@ -23,7 +23,7 @@
@@ -45,7 +45,7 @@
  #         (USEFUL TO POINT TO WHERE THE MESA LIBRARIES RESIDE)
  # ------------------------------------------------------------
 -LIBFLAGS     = 
-+LIBFLAGS     = ${LDFLAGS} -L$(X11BASE)/lib -lcompat
++LIBFLAGS     += ${LDFLAGS} -L$(X11BASE)/lib
  
  # you should now be able to type 'make' and everything should be fine ...