2 files changed, 18 insertions, 62 deletions

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: */