diff options
| author | agc <agc@pkgsrc.org> | 2003-11-05 12:47:01 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2003-11-05 12:47:01 +0000 |
| commit | c41f199e73fe2d04ee9d7cc2ae26597fbc5611c1 (patch) | |
| tree | 7f1c6fd3481ff31cee15a3d02800b4b38b259675 /games | |
| parent | 494f62f029a4390d83345e6ea51cd48c78b2c857 (diff) | |
| download | pkgsrc-c41f199e73fe2d04ee9d7cc2ae26597fbc5611c1.tar.gz | |
Make this package happy in the presence of xpkgwedge.
Make this package install; deinstall; install properly.
Don't force the use of gcc to build this package.
Diffstat (limited to 'games')
| -rw-r--r-- | games/xbomber/distinfo | 4 | ||||
| -rw-r--r-- | games/xbomber/patches/patch-aa | 34 |
2 files changed, 19 insertions, 19 deletions
diff --git a/games/xbomber/distinfo b/games/xbomber/distinfo index 0d5904798ab..2067dcc9408 100644 --- a/games/xbomber/distinfo +++ b/games/xbomber/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 02:08:38 wiz Exp $ +$NetBSD: distinfo,v 1.3 2003/11/05 12:47:01 agc Exp $ SHA1 (xbomber.0.8.tar.gz) = 1146d1cc9d10f1115f650ad20bf4fd9e77cf2b8b Size (xbomber.0.8.tar.gz) = 241168 bytes -SHA1 (patch-aa) = 17ee5cb37c736009c533c961aba7f658f2ddece7 +SHA1 (patch-aa) = 5e4afae5d42df18bb319ae09b5a26563fa644849 SHA1 (patch-ab) = 934cd3bba0f7f257c7e5dd9490c4114413f4a094 diff --git a/games/xbomber/patches/patch-aa b/games/xbomber/patches/patch-aa index b9f0273b99e..4a693880004 100644 --- a/games/xbomber/patches/patch-aa +++ b/games/xbomber/patches/patch-aa @@ -1,11 +1,12 @@ -$NetBSD: patch-aa,v 1.4 2000/09/26 00:43:21 hubertf Exp $ +$NetBSD: patch-aa,v 1.5 2003/11/05 12:47:01 agc Exp $ ---- makefile.orig Fri Jun 19 05:28:34 1998 -+++ makefile +--- makefile.orig 1998-06-19 04:28:34.000000000 +0100 ++++ makefile 2003-11-05 12:36:20.000000000 +0000 @@ -11,15 +11,22 @@ # Makefile user-definable variables------------------------------------------ +-CC=gcc +INSTALLROOT= $(PREFIX) +INSTALLBIN= $(INSTALLROOT)/bin +SOUNDS= $(INSTALLROOT)/share/xbomber/sounds @@ -13,38 +14,37 @@ $NetBSD: patch-aa,v 1.4 2000/09/26 00:43:21 hubertf Exp $ +LEVELS= $(INSTALLROOT)/share/xbomber/level +BITMAPS= $(INSTALLROOT)/share/xbomber/bitmaps + - CC=gcc ++#CC=gcc MATHLIB=-lm -CFLAGS=-I/usr/X11/include -+CFLAGS=-I$(PREFIX)/include -DSOUNDS=\"$(SOUNDS)\" -DPIXMAPS=\"$(PIXMAPS)\" -DLEVELS=\"$(LEVELS)\" -DBITMAPS=\"$(BITMAPS)\" ++CFLAGS=-I$(PREFIX)/include -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 # adjust according to target -XLIB=-L/usr/X11/lib -lX11 -+XLIB=-Wl,-R${PREFIX}/lib -L$(PREFIX)/lib -lX11 ++XLIB=-Wl,${RPATH_FLAG}${PREFIX}/lib -L$(PREFIX)/lib -Wl,${RPATH_FLAG}${X11BASE}/lib -L${X11BASE}/lib -lX11 # uncomment for sunos/solaris #XLIB=-L/usr/openwin/lib -lX11 -@@ -43,6 +50,20 @@ - chmod 644 *.c *.h makefile sounds/*.au *.txt \ +@@ -44,6 +51,19 @@ bitmaps/*.xbm pixmaps/*.ppm \ sounds/numbers/*.au levels/*.dat -+ + +install: xbomber + install -s -c -o bin -g bin xbomber $(INSTALLBIN)/xbomber + mkdir -p $(LEVELS) + mkdir -p $(SOUNDS)/numbers + mkdir -p $(PIXMAPS)/jungle + mkdir -p $(BITMAPS) -+ install -o bin -g bin -m 0644 pixmaps/* $(PIXMAPS) -+ install -o bin -g bin -m 0644 bitmaps/* $(BITMAPS) -+ install -o bin -g bin -m 0644 jungle/* $(PIXMAPS)/jungle -+ install -o bin -g bin -m 0644 sounds/numbers/* $(SOUNDS)/numbers -+ @rm -rf sounds/numbers -+ install -o bin -g bin -m 0644 sounds/* $(SOUNDS) -+ install -o bin -g bin -m 0644 levels/* $(LEVELS) - ++ install -c -o bin -g bin -m 0644 pixmaps/* $(PIXMAPS) ++ install -c -o bin -g bin -m 0644 bitmaps/* $(BITMAPS) ++ install -c -o bin -g bin -m 0644 jungle/* $(PIXMAPS)/jungle ++ install -c -o bin -g bin -m 0644 sounds/numbers/* $(SOUNDS)/numbers ++ install -c -o bin -g bin -m 0644 sounds/*.au $(SOUNDS) ++ install -c -o bin -g bin -m 0644 levels/* $(LEVELS) ++ clean: rm *.o + |