diff --git a/games/defendguin/Makefile b/games/defendguin/Makefile index 0717372f228a..b254084ba205 100644 --- a/games/defendguin/Makefile +++ b/games/defendguin/Makefile @@ -6,7 +6,7 @@ # PORTNAME= defendguin -PORTVERSION= 0.0.6 +PORTVERSION= 0.0.9 CATEGORIES= games MASTER_SITES= ftp://ftp.sonic.net/pub/users/nbs/unix/x/defendguin/ diff --git a/games/defendguin/distinfo b/games/defendguin/distinfo index e2d9b1819128..7a2125305807 100644 --- a/games/defendguin/distinfo +++ b/games/defendguin/distinfo @@ -1 +1 @@ -MD5 (defendguin-0.0.6.tar.gz) = 67000b4ddbe94af9301a8efb214d3e83 +MD5 (defendguin-0.0.9.tar.gz) = 451cc45cd8751d22f6bfa800912a32a9 diff --git a/games/defendguin/files/patch-aa b/games/defendguin/files/patch-aa index fbb1dc183ff9..ddc6d4aea1dc 100644 --- a/games/defendguin/files/patch-aa +++ b/games/defendguin/files/patch-aa @@ -1,9 +1,9 @@ $FreeBSD$ ---- Makefile.orig Sun Nov 26 13:45:14 2000 -+++ Makefile Thu Feb 8 14:27:03 2001 -@@ -9,21 +9,20 @@ +--- Makefile.orig Sun Jan 6 03:09:37 2002 ++++ Makefile Tue Mar 5 15:11:49 2002 +@@ -9,9 +9,9 @@ # User-definable stuff: @@ -12,15 +12,15 @@ $FreeBSD$ #DATA_PREFIX=$(PWD)/data/ -PREFIX=/usr/local +PREFIX?=/usr/local + MAN_PREFIX=$(PREFIX) + BIN_PREFIX=$(PREFIX)/bin DATA_PREFIX=$(PREFIX)/share/defendguin/ - JOY=YES - +@@ -20,11 +20,11 @@ # Other definitions: -SDL_CFLAGS := $(shell sdl-config --cflags) --SDL_LDFLAGS := $(shell sdl-config --libs) -L/usr/X11R6/lib \ -- -lX11 -lXext # WHY DO I NEED THIS!?!?!?!? +-SDL_LDFLAGS := $(shell sdl-config --libs) -L/usr/X11R6/lib -MIXER=-lSDL_mixer +SDL_CFLAGS := $(shell $(SDL_CONFIG) --cflags) +SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs) @@ -31,21 +31,22 @@ $FreeBSD$ -DJOY_$(JOY) SDL_LIB=$(SDL_LDFLAGS) $(MIXER) -@@ -36,11 +35,12 @@ +@@ -37,13 +37,11 @@ make defendguin MIXER= NOSOUNDFLAG=NOSOUND install: defendguin - install -d $(DATA_PREFIX) - cp -R data/* $(DATA_PREFIX) - chmod -R a+rX,g-w,o-w $(DATA_PREFIX) -- cp defendguin $(PREFIX)/bin/ -- chmod a+rx,g-w,o-w $(PREFIX)/bin/defendguin +- cp defendguin $(BIN_PREFIX)/ +- chmod a+rx,g-w,o-w $(BIN_PREFIX)/defendguin +- cp defendguin.6 $(MAN_PREFIX)/man/man6/ +- chmod a+rx,g-w,o-w $(MAN_PREFIX)/man/man6/defendguin.6 + $(MKDIR) $(DATA_PREFIX) -+ $(MKDIR) $(PREFIX)/share/doc/defendguin + cd data; tar --exclude .xvpics -cf - . | \ + (cd $(DATA_PREFIX); ${TAR} --unlink -xf - ) -+ $(BSD_INSTALL_PROGRAM) defendguin $(PREFIX)/bin -+ $(BSD_INSTALL_MAN) COPYING.txt README.txt $(PREFIX)/share/doc/defendguin ++ $(BSD_INSTALL_PROGRAM) defendguin $(BIN_PREFIX)/ ++ $(BSD_INSTALL_MAN) defendguin.6 $(MAN_PREFIX)/man/man6/ uninstall: -rm -r $(DATA_PREFIX) diff --git a/games/defendguin/files/patch-defendguin.c b/games/defendguin/files/patch-defendguin.c index 23a581f03354..5036010d6dec 100644 --- a/games/defendguin/files/patch-defendguin.c +++ b/games/defendguin/files/patch-defendguin.c @@ -1,58 +1,13 @@ $FreeBSD$ ---- defendguin.c 2001/02/08 11:27:54 1.1 -+++ defendguin.c 2001/02/08 11:37:39 -@@ -4058,7 +4058,7 @@ +--- defendguin.c 2002/03/05 13:16:46 1.1 ++++ defendguin.c 2002/03/05 13:22:13 +@@ -4210,6 +4210,7 @@ "%s\n\n", SDL_GetError()); exit(1); } -- + atexit(SDL_Quit); - /* Open display: */ -@@ -4329,9 +4329,9 @@ - "%s\n" - "The Simple DirectMedia error that occured was:\n" - "%s\n\n", MUS_TITLE, SDL_GetError()); -- exit(1); - } -- Mix_PlayMusic(title_music, 0); -+ else -+ Mix_PlayMusic(title_music, 0); - - - last_music = Mix_LoadMUS(MUS_LAST); -@@ -4342,7 +4342,6 @@ - "%s\n" - "The Simple DirectMedia error that occured was:\n" - "%s\n\n", MUS_LAST, SDL_GetError()); -- exit(1); - } - - -@@ -4354,7 +4353,6 @@ - "%s\n" - "The Simple DirectMedia error that occured was:\n" - "%s\n\n", MUS_WIN, SDL_GetError()); -- exit(1); - } - - -@@ -4366,7 +4364,6 @@ - "%s\n" - "The Simple DirectMedia error that occured was:\n" - "%s\n\n", MUS_TETRIS, SDL_GetError()); -- exit(1); - } - - -@@ -4380,7 +4377,6 @@ - "%s\n" - "The Simple DirectMedia error that occured was:\n" - "%s\n\n", game_music_names[i], SDL_GetError()); -- exit(1); - } - } - } + /* Open display: */ diff --git a/games/defendguin/pkg-plist b/games/defendguin/pkg-plist index a37c532d7203..06745299b800 100644 --- a/games/defendguin/pkg-plist +++ b/games/defendguin/pkg-plist @@ -59,6 +59,7 @@ share/defendguin/images/ship/ship-win-1.bmp share/defendguin/images/ship/ship-win-2.bmp share/defendguin/images/status/catch-the-penguinoid.bmp share/defendguin/images/status/circle.bmp +share/defendguin/images/status/circle.ppm share/defendguin/images/status/game-over.bmp share/defendguin/images/status/get-ready.bmp share/defendguin/images/status/level-bonus.bmp @@ -90,7 +91,6 @@ share/defendguin/images/swarmer/swarmer.bmp share/defendguin/images/title/arrow0.bmp share/defendguin/images/title/arrow1.bmp share/defendguin/images/title/arrow2.bmp -share/defendguin/images/title/nutecase.bmp share/defendguin/images/title/one-player.bmp share/defendguin/images/title/options.bmp share/defendguin/images/title/quit.bmp @@ -130,7 +130,6 @@ share/defendguin/music/confusio.mod share/defendguin/music/easytrip.mod share/defendguin/music/no!inhi1.mod share/defendguin/music/summerpa.mod -share/defendguin/music/tetris.mid share/defendguin/music/wormhole.mod share/defendguin/sounds/baiter.wav share/defendguin/sounds/bullet.wav @@ -168,9 +167,6 @@ share/defendguin/sounds/swarmers.wav share/defendguin/sounds/title/confirm.wav share/defendguin/sounds/title/impatience.wav share/defendguin/sounds/title/select.wav -share/doc/defendguin/COPYING.txt -share/doc/defendguin/README.txt -@dirrm share/doc/defendguin @dirrm share/defendguin/sounds/title @dirrm share/defendguin/sounds/ship @dirrm share/defendguin/sounds/peng