Update to 0.0.12.

CHANGES SINCE 0.0.11
* Sound playing function could segfault.  Fixed.
 (Example: hitting [Down] in main menu!)

CHANGES SINCE 0.0.10
* Converted all BMPs to indexed (256 colors or less), reducing image files
  by 1MB and removing white artifacts seen on 24bpp and 32bpp displays.
* Made some unloadable BMPs loadable again.
* Added configuration for joystick buttons and axes to Options screen.
  (Values stored in config file (e.g., ~/.defendguinrc))
* Now keeps track of your highest score.
* Displays labels ("Player 1" and "Player 2") above score/levels on
  main menu.
* Displays highest score on main menu.
* Does not display Player 2 stats on main menu after a 1-player game.
* Last scores and levels and high score are saved-to and
  loaded-from ~/.defendguinrc
* Points awarded for shooting boss.  Large bonus awarded for beating game.

4 files changed, 29 insertions, 19 deletions

diff --git a/games/defendguin/Makefile b/games/defendguin/Makefile
index 92b39ea1b2a..5687c0f44f0 100644
--- a/games/defendguin/Makefile
+++ b/games/defendguin/Makefile
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.18 2012/10/06 11:54:35 asau Exp $
+# $NetBSD: Makefile,v 1.19 2015/02/09 09:51:26 snj Exp $
 
-DISTNAME=	defendguin-0.0.10
-PKGREVISION=	7
+DISTNAME=	defendguin-0.0.12
 CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.billsgames.com/unix/x/defendguin/src/
+MASTER_SITES=	ftp://ftp.tuxpaint.org/unix/x/defendguin/src/
 
 MAINTAINER=	reed@reedmedia.net
 HOMEPAGE=	http://www.newbreedsoftware.com/defendguin/
 COMMENT=	Clone of the arcade game Defender
 
+LICENSE=	gnu-gpl-v2
+
 USE_TOOLS+=	gmake
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6
diff --git a/games/defendguin/PLIST b/games/defendguin/PLIST
index 92f53e8febf..eb2ec670d97 100644
--- a/games/defendguin/PLIST
+++ b/games/defendguin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:56:42 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/02/09 09:51:26 snj Exp $
 bin/defendguin
 man/man6/defendguin.6
 share/defendguin/images/baiter/baiter0.bmp
@@ -29,6 +29,7 @@ share/defendguin/images/l2r.sh
 share/defendguin/images/land/center.bmp
 share/defendguin/images/land/left.bmp
 share/defendguin/images/land/right.bmp
+share/defendguin/images/loader/loading-orig.bmp.gz
 share/defendguin/images/loader/loading-text.bmp
 share/defendguin/images/loader/loading.bmp
 share/defendguin/images/loader/press-a-key.bmp
@@ -61,7 +62,6 @@ 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
diff --git a/games/defendguin/distinfo b/games/defendguin/distinfo
index a245761292d..a3675566ba2 100644
--- a/games/defendguin/distinfo
+++ b/games/defendguin/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2005/12/27 21:13:34 reed Exp $
+$NetBSD: distinfo,v 1.4 2015/02/09 09:51:26 snj Exp $
 
-SHA1 (defendguin-0.0.10.tar.gz) = 3d43e9335dcc9c00c81151761cea01f914b34f1b
-RMD160 (defendguin-0.0.10.tar.gz) = 752886000a2ea0d472d5c7e1108a6d10ebcfc8e3
-Size (defendguin-0.0.10.tar.gz) = 2299261 bytes
-SHA1 (patch-aa) = 02778ce30ff18cc907837bc325ac252b6c09ab8b
+SHA1 (defendguin-0.0.12.tar.gz) = bdbcd49729f879d34d932bec2e3ee7991697a266
+RMD160 (defendguin-0.0.12.tar.gz) = 468056a93347ec4b476d6b2daff337626a1e3921
+Size (defendguin-0.0.12.tar.gz) = 2235694 bytes
+SHA1 (patch-aa) = 96ff15abee015bee72bec2745abf3818fe372cc5
diff --git a/games/defendguin/patches/patch-aa b/games/defendguin/patches/patch-aa
index b99d8f2d67c..d57596b0a28 100644
--- a/games/defendguin/patches/patch-aa
+++ b/games/defendguin/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2005/12/27 21:13:34 reed Exp $
+$NetBSD: patch-aa,v 1.3 2015/02/09 09:51:26 snj Exp $
 
---- Makefile.orig	2002-01-05 17:09:37.000000000 -0800
-+++ Makefile
+--- Makefile.orig	2009-11-05 13:21:34.000000000 -0800
++++ Makefile	2015-02-09 01:46:52.000000000 -0800
 @@ -11,7 +11,9 @@
  
  CFLAGS=-Wall -O2
@@ -12,14 +12,23 @@ $NetBSD: patch-aa,v 1.2 2005/12/27 21:13:34 reed Exp $
  MAN_PREFIX=$(PREFIX)
  BIN_PREFIX=$(PREFIX)/bin
  DATA_PREFIX=$(PREFIX)/share/defendguin/
-@@ -42,8 +44,8 @@ install:	defendguin
- 	chmod -R a+rX,g-w,o-w $(DATA_PREFIX)
+@@ -21,7 +23,7 @@ JOY=YES
+ # Other definitions:
+ 
+ SDL_CFLAGS := $(shell sdl-config --cflags)
+-SDL_LDFLAGS := $(shell sdl-config --libs) -L/usr/X11R6/lib
++SDL_LDFLAGS := $(shell sdl-config --libs) -Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib
+ MIXER=-lSDL_mixer
+ NOSOUNDFLAG=__SOUND
+ CFLAGS=-Wall $(SDL_CFLAGS) -DDATA_PREFIX=\"$(DATA_PREFIX)\" -D$(NOSOUNDFLAG) \
+@@ -43,8 +45,8 @@ install:	defendguin
  	cp defendguin $(BIN_PREFIX)/
  	chmod a+rx,g-w,o-w $(BIN_PREFIX)/defendguin
--	cp defendguin.6 $(MAN_PREFIX)/man/man6/
+ 	-mkdir -p $(MAN_PREFIX)/man/man6/
+-	cp src/defendguin.6 $(MAN_PREFIX)/man/man6/
 -	chmod a+rx,g-w,o-w $(MAN_PREFIX)/man/man6/defendguin.6
-+	cp defendguin.6 $(MAN_PREFIX)/$(PKGMANDIR)/man6/
-+	chmod a+rx,g-w,o-w $(MAN_PREFIX)/$(PKGMANDIR)/man6/defendguin.6
++	cp src/defendguin.6 $(MAN_PREFIX)/$(PKGMANDIR)/man6/
++	chmod 444 $(MAN_PREFIX)/$(PKGMANDIR)/man6/defendguin.6
  
  uninstall:
  	-rm -r $(DATA_PREFIX)