>Number:         23454
>Category:       pkg
>Synopsis:       games/xbomber does not need USE_X11BASE
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Nov 16 06:30:00 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     Soren Jacobsen
>Release:        NetBSD 1.6.1
>Organization:
>Environment:
pkgsrc as of 11/15/2003.
>Description:
There is no reason to put xbomber in ${X11PREFIX}.
Also make it obey ${CFLAGS}, and bump PKGREVISION for prefix change.
>How-To-Repeat:
>Fix:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/games/xbomber/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile	2003/03/29 12:41:10	1.9
+++ Makefile	2003/11/16 06:23:51
@@ -3,6 +3,7 @@
 
 DISTNAME=	xbomber.0.8
 PKGNAME=	xbomber-0.8
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/xbomber
 CATEGORIES=	games x11
 MASTER_SITES=	ftp://ftp.sonic.net/pub/users/nbs/unix/x/xbomber/
@@ -12,7 +13,7 @@
 COMMENT=	Colorful game where you blow other people/robots up
 
 MAKEFILE=	makefile
-USE_X11BASE=	yes
+USE_X11=	yes
 
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xbomber
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/games/xbomber/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo	2003/11/05 13:38:27	1.4
+++ distinfo	2003/11/16 06:23:51
@@ -2,5 +2,5 @@
 
 SHA1 (xbomber.0.8.tar.gz) = 1146d1cc9d10f1115f650ad20bf4fd9e77cf2b8b
 Size (xbomber.0.8.tar.gz) = 241168 bytes
-SHA1 (patch-aa) = da4ba6ba91dc5d5c946626ad5a5793e2f5fc06f6
+SHA1 (patch-aa) = ecc66c58bb4dcf73564e8f5a0d7325f881d793a4
 SHA1 (patch-ab) = 934cd3bba0f7f257c7e5dd9490c4114413f4a094
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/games/xbomber/patches/patch-aa,v
retrieving revision 1.6
diff -u -r1.6 patch-aa
--- patches/patch-aa	2003/11/05 13:38:27	1.6
+++ patches/patch-aa	2003/11/16 06:23:51
@@ -17,7 +17,7 @@
 +#CC=gcc
  MATHLIB=-lm
 -CFLAGS=-I/usr/X11/include
-+CFLAGS=-I$(PREFIX)/include -I${X11BASE}/include -DSOUNDS=\"$(SOUNDS)\" -DPIXMAPS=\"$(PIXMAPS)\" -DLEVELS=\"$(LEVELS)\" -DBITMAPS=\"$(BITMAPS)\"
++CFLAGS+=-I${X11BASE}/include -DSOUNDS=\"$(SOUNDS)\" -DPIXMAPS=\"$(PIXMAPS)\" -DLEVELS=\"$(LEVELS)\" -DBITMAPS=\"$(BITMAPS)\"
  
  # Change this to "touch" if your system doesn't have the "strip" command:
  POSTPROCESS=strip
>Release-Note:
>Audit-Trail:
>Unformatted: