>Number:         21685
>Category:       pkg
>Synopsis:       games/battalion doesn't need USE_X11BASE
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon May 26 05:34:00 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     Soren Jacobsen
>Release:        NetBSD 1.6.1
>Organization:
>Environment:
pkgsrc as of 05/25/2003.
>Description:
USE_X11BASE used without reason. Also fix patch-aa to use ${CC} instead of
cc.
>How-To-Repeat:
>Fix:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/games/battalion/Makefile,v
retrieving revision 1.21
diff -b -u -r1.21 Makefile
--- Makefile	2003/03/09 19:46:51	1.21
+++ Makefile	2003/05/26 05:30:16
@@ -3,7 +3,7 @@
 
 DISTNAME=		battalion
 PKGNAME=		battalion-1.4
-PKGREVISION=		1
+PKGREVISION=		2
 WRKSRC=			${WRKDIR}/battalionSource
 CATEGORIES=		games x11
 MASTER_SITES=		http://www.evl.uic.edu/aej/
@@ -17,7 +17,7 @@
 
 EXTRACT_ONLY=		battalionSource1.4.tar.Z
 USE_BUILDLINK2=		yes
-USE_X11BASE=		yes
+USE_X11=		yes
 
 do-install:
 	${INSTALL} -c -s -o ${ROOT_USER} -g games -m 2755 ${WRKSRC}/battalion ${PREFIX}/bin
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/games/battalion/distinfo,v
retrieving revision 1.3
diff -b -u -r1.3 distinfo
--- distinfo	2003/03/09 19:46:51	1.3
+++ distinfo	2003/05/26 05:30:16
@@ -4,5 +4,5 @@
 Size (battalionSource1.4.tar.Z) = 186221 bytes
 SHA1 (battalionSUN4.tar.gz) = 5cc314e192320a7505dddf730bbcccaef212ff4a
 Size (battalionSUN4.tar.gz) = 1593265 bytes
-SHA1 (patch-aa) = 351f783154a992de348d29c039b670d7ef324507
+SHA1 (patch-aa) = 50a18c122a0621c48f39d9b9c6ed16bd4ba28f3d
 SHA1 (patch-ab) = a47c5be93d82555b4fed23f5d5e71169859ebb49
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/games/battalion/patches/patch-aa,v
retrieving revision 1.8
diff -b -u -r1.8 patch-aa
--- patches/patch-aa	2003/03/09 19:46:52	1.8
+++ patches/patch-aa	2003/05/26 05:30:16
@@ -6,7 +6,7 @@
  #  see a warning message please let me know about it)
  # ------------------------------------------------------------
 -CC = CC
-+CC = cc
++#CC = cc
  
  
  # STEP 2: IF YOU WANT TO COMPILE WITH THE MESA LIBRARIES THEN
>Release-Note:
>Audit-Trail:
>Unformatted: