>Number:         23348
>Category:       pkg
>Synopsis:       update of games/icbm3d to 0.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Nov 03 00:23:00 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     Soren Jacobsen
>Release:        NetBSD 1.6.1
>Organization:
>Environment:
pkgsrc as of 11/01/2003.
>Description:
Changes since 0.3:
* "keydefs.h" created so you can edit the controls to suit your
   needs (and your keyboard). (Could be useful with LOCALPATCHES)
* Keyboard control is better.  You can now hold down multiple keys.

One less package with USE_X11BASE. Does not use X resources.
>How-To-Repeat:
>Fix:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/games/icbm3d/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile	2003/03/29 12:41:05	1.7
+++ Makefile	2003/11/03 00:17:37
@@ -1,8 +1,8 @@
 # $NetBSD: Makefile,v 1.7 2003/03/29 12:41:05 jmmv Exp $
 #
 
-DISTNAME=	icbm3d.0.3
-PKGNAME=	icbm3d-0.3
+DISTNAME=	icbm3d.0.4
+PKGNAME=	icbm3d-0.4
 WRKSRC=		${WRKDIR}/icbm3d
 CATEGORIES=	games x11
 MASTER_SITES=	ftp://ftp.sonic.net/pub/users/nbs/unix/x/icbm3d/
@@ -12,7 +12,7 @@
 COMMENT=	3D X11 game of defense
 
 MAKEFILE=	makefile
-USE_X11BASE=	yes
+USE_X11=	YES
 
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/icbm3d
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/games/icbm3d/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo	2001/04/21 02:08:27	1.2
+++ distinfo	2003/11/03 00:17:37
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.2 2001/04/21 02:08:27 wiz Exp $
 
-SHA1 (icbm3d.0.3.tar.gz) = f8b5b414e8dbe5a17292da9b27846b5b9db081a3
-Size (icbm3d.0.3.tar.gz) = 28798 bytes
-SHA1 (patch-aa) = 8919ccd4e01fb4d9d1a47775f713ecd0f615f99e
+SHA1 (icbm3d.0.4.tar.gz) = 9eee30aa562e15cdc08f1bf354fa6d2e7bf7fd38
+Size (icbm3d.0.4.tar.gz) = 31187 bytes
+SHA1 (patch-aa) = 2387e2cb0e053e0522b3bd651f8d18eabd2b9ddf
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/games/icbm3d/patches/patch-aa,v
retrieving revision 1.3
diff -u -r1.3 patch-aa
--- patches/patch-aa	1998/08/23 07:15:14	1.3
+++ patches/patch-aa	2003/11/03 00:17:37
@@ -1,73 +1,38 @@
-$NetBSD: patch-aa,v 1.3 1998/08/23 07:15:14 garbled Exp $
+$NetBSD$
 
---- makefile.orig	Wed Mar 18 19:54:27 1998
-+++ makefile	Fri Jul 24 02:18:44 1998
-@@ -14,2 +14,3 @@
+--- makefile.orig	1998-07-30 21:41:20.000000000 -0700
++++ makefile	2003-11-02 16:12:15.000000000 -0800
+@@ -16,7 +16,7 @@
+ LANGUAGE=english
+ 
+ XLIB=-L$(PREFIX)/lib -lX11 #-lcompat
+-CFLAGS=-I$(PREFIX)/include -O2
++CFLAGS+=-I$(X11BASE)/include
+ 
+ 
+ # End of makefile user-definable variables-----------------------------------
+@@ -26,9 +26,11 @@
+ # Makefile commands:
+ 
+ all:	icbm3d
+-	chmod 644 *.c *.h makefile *.txt
+-	@echo "Moving 'icbm3d' to $(INSTALLROOT)"
+-	- cp icbm3d $(INSTALLROOT)/icbm3d
++
++install:	icbm3d
++	$(BSD_INSTALL_PROGRAM) icbm3d $(PREFIX)/bin
++	$(BSD_INSTALL_MAN_DIR) $(PREFIX)/share/doc/icbm3d
++	$(BSD_INSTALL_MAN) README.txt $(PREFIX)/share/doc/icbm3d/
+ 
+ clean:
+ 	- rm *.o icbm3d language.h
+@@ -40,8 +42,7 @@
+ # Applications:
  
-+INSTALLROOT=$(PREFIX)
- 
-@@ -25,3 +26,3 @@
- 
--XLIB=-lX11
-+#XLIB=-lX11
- 
-@@ -38,4 +39,4 @@
- 
--# XLIB=-L /usr/X11R6/lib -lX11 -lcompat
--# CFLAGS=-I/usr/X11/include
-+XLIB= -Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib -lX11 #-lcompat
-+CFLAGS=-I$(X11BASE)/include
- 
-@@ -54,5 +55,7 @@
- 
-+install:
-+	install -g bin -o bin -m 0755 icbm3d $(INSTALLROOT)/bin
- 
--OBJECTS=icbm3d.o window.o connect.o hints.o visual.o gc.o color.o randnum.o \
--	text.o
-+SRCS= icbm3d.c window.c connect.c hints.c visual.c gc.o color.c randnum.c text.c
-+OBJS= ${SRCS:.c=.o}
+ icbm3d:	$(OBJECTS)
+-	$(CC) $(OBJECTS) $(XLIB) $(MATHLIB) $(CFLAGS) -o icbm3d
+-	chmod 755 icbm3d
++	$(CC) $(OBJECTS) $(XLIB) $(MATHLIB) $(CFLAGS) $(LDFLAGS) -o icbm3d
  
-@@ -60,4 +63,4 @@
  
--icbm3d:	$(OBJECTS)
--	$(CC) $(OBJECTS) $(XLIB) $(MATHLIB) $(CFLAGS) -o icbm3d
-+icbm3d:	$(OBJS)
-+	$(CC) $(OBJECTS) $(XLIB) $(MATHLIB) $(CFLAGS) -o $@ $(OBJS)
- 	chmod 755 icbm3d
-@@ -66,3 +69,3 @@
- 
--# Application objects:
-+#dependencies
- 
-@@ -70,28 +73,9 @@
- 		randnum.h text.h
--
--
--# Library objects:
--
- window.o:	window.c window.h
--	$(CC)	window.c -c
--
- connect.o:	connect.c connect.h
--	$(CC)	connect.c -c
--
- hints.o:	hints.c hints.h
--	$(CC)	hints.c -c
--
- visual.o:	visual.c visual.h
--	$(CC)	visual.c -c
--
--gc.o:	gc.c gc.h
--	$(CC)	gc.c -c
--
-+gc.o:		gc.c gc.h
- color.o:	color.c color.h
--	$(CC)	color.c -c
--
- randnum.o:	randnum.c randnum.h
--	$(CC)	randnum.c -c
--
--text.o:	text.c text.h
--	$(CC)	text.c -c
-+text.o:		text.c text.h
+ #dependencies
>Release-Note:
>Audit-Trail:
>Unformatted: