diff options
author | xtraeme <xtraeme> | 2003-11-08 08:29:19 +0000 |
---|---|---|
committer | xtraeme <xtraeme> | 2003-11-08 08:29:19 +0000 |
commit | eaf99e21981d5723ed8ae3824874c90bade6cb1a (patch) | |
tree | 71d26e2ff811b90232defbd5ca41bc8f2902f8d0 /games | |
parent | 124806e6fc4efff1a4993741f2e15f57ccd1e7c6 (diff) | |
download | pkgsrc-eaf99e21981d5723ed8ae3824874c90bade6cb1a.tar.gz |
Upgrade to 0.4, by Soren Jacobsen in PR pkg/23348.
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.
While here s/USE_X11BASE/USE_X11/.
Diffstat (limited to 'games')
-rw-r--r-- | games/icbm3d/Makefile | 12 | ||||
-rw-r--r-- | games/icbm3d/distinfo | 8 | ||||
-rw-r--r-- | games/icbm3d/patches/patch-aa | 97 |
3 files changed, 51 insertions, 66 deletions
diff --git a/games/icbm3d/Makefile b/games/icbm3d/Makefile index b308209e7e4..a41e1962e4d 100644 --- a/games/icbm3d/Makefile +++ b/games/icbm3d/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2003/03/29 12:41:05 jmmv Exp $ +# $NetBSD: Makefile,v 1.8 2003/11/08 08:29:19 xtraeme Exp $ # -DISTNAME= icbm3d.0.3 -PKGNAME= icbm3d-0.3 +DISTNAME= icbm3d.0.4 +PKGNAME= ${DISTNAME:S/./-/} WRKSRC= ${WRKDIR}/icbm3d CATEGORIES= games x11 MASTER_SITES= ftp://ftp.sonic.net/pub/users/nbs/unix/x/icbm3d/ @@ -12,10 +12,6 @@ HOMEPAGE= http://www.sonic.net/~nbs/unix/x/icbm3d/ COMMENT= 3D X11 game of defense MAKEFILE= makefile -USE_X11BASE= yes - -pre-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/icbm3d - ${INSTALL_DATA} ${WRKSRC}/README.txt ${PREFIX}/share/doc/icbm3d +USE_X11= yes .include "../../mk/bsd.pkg.mk" diff --git a/games/icbm3d/distinfo b/games/icbm3d/distinfo index 9467c0bf6ef..1be9fcfd1fc 100644 --- a/games/icbm3d/distinfo +++ b/games/icbm3d/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 02:08:27 wiz Exp $ +$NetBSD: distinfo,v 1.3 2003/11/08 08:29:19 xtraeme 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) = d63dae44e367e456b761eaf1305aaaea94758fa7 diff --git a/games/icbm3d/patches/patch-aa b/games/icbm3d/patches/patch-aa index c1eec510fb4..1e20a7f1b90 100644 --- a/games/icbm3d/patches/patch-aa +++ b/games/icbm3d/patches/patch-aa @@ -1,73 +1,62 @@ -$NetBSD: patch-aa,v 1.3 1998/08/23 07:15:14 garbled Exp $ +$NetBSD: patch-aa,v 1.4 2003/11/08 08:29:19 xtraeme Exp $ ---- makefile.orig Wed Mar 18 19:54:27 1998 -+++ makefile Fri Jul 24 02:18:44 1998 -@@ -14,2 +14,3 @@ +--- makefile.orig 2003-11-08 09:23:55.000000000 +0100 ++++ makefile 2003-11-08 09:25:23.000000000 +0100 +@@ -9,14 +9,14 @@ -+INSTALLROOT=$(PREFIX) + # Makefile user-definable variables------------------------------------------ -@@ -25,3 +26,3 @@ +-CC=gcc ++#CC=gcc + MATHLIB=-lm --XLIB=-lX11 -+#XLIB=-lX11 + INSTALLROOT=$(PREFIX) + LANGUAGE=english -@@ -38,4 +39,4 @@ +-XLIB=-L$(PREFIX)/lib -lX11 #-lcompat +-CFLAGS=-I$(PREFIX)/include -O2 ++XLIB=${LDFLAGS} -lX11 #-lcompat ++CFLAGS=-I$(X11BASE)/include -O2 --# 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 @@ + # End of makefile user-definable variables----------------------------------- +@@ -26,22 +26,22 @@ + # Makefile commands: -+install: -+ install -g bin -o bin -m 0755 icbm3d $(INSTALLROOT)/bin + 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 + +- -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} -@@ -60,4 +63,4 @@ + # Applications: -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 @@ +- chmod 755 icbm3d ++icbm3d: $(OBJS) ++ $(CC) $(OBJS) $(XLIB) $(MATHLIB) $(CFLAGS) $(LDFLAGS) -o icbm3d --# 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 +@@ -71,7 +71,6 @@ + + language.h: lang_$(LANGUAGE).h + @echo "Using $(LANGUAGE) for messages..." +- - rm language.h + @echo "/* *** DO NOT EDIT THIS FILE! *** */" > language.h + @echo "/* Instead, edit: lang_$(LANGUAGE).h and rebuild with: */" \ + >> language.h |