- Add additional MASTER_SITES entry

- Add LICENSE
- Other improvements
- Give maintainership to submitter

PR:		ports/171288
Submitted by:	nemysis <nemysis@gmx.ch>

3 files changed, 42 insertions, 23 deletions

diff --git a/games/defendguin/Makefile b/games/defendguin/Makefile
index 44fe348dd483..dda881304294 100644
--- a/games/defendguin/Makefile
+++ b/games/defendguin/Makefile
@@ -7,20 +7,33 @@
 
 PORTNAME=	defendguin
 PORTVERSION=	0.0.12
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.billsgames.com/unix/x/defendguin/src/
+MASTER_SITES=	ftp://ftp.tuxpaint.org/unix/x/defendguin/src/ \
+		ftp://ftp.billsgames.com/unix/x/defendguin/src/ \
+		http://www.newbreedsoftware.com/images/prodicons/:icons
+DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
+		${PORTNAME}.gif:icons
+EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Another shoot-the-Bill game
+MAINTAINER=	nemysis@gmx.ch
+COMMENT=	Your mission is to defend little penguinoids
+
+LICENSE=	GPLv2
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 USE_SDL=	mixer sdl
 
-PLIST_FILES=	bin/defendguin
+PLIST_FILES=	bin/${PORTNAME} \
+		share/pixmaps/${PORTNAME}.gif
+
+PORTDATA=	*
+PORTDOCS=	AUTHORS.txt CHANGES.txt README.txt TODO.txt
 
-MAN6=		defendguin.6
+MAN6=		${PORTNAME}.6
+
+.include <bsd.port.options.mk>
 
 do-build:
 	cd ${WRKSRC} && ${CC} ${CFLAGS} -DDATA_PREFIX=\"${DATADIR}/\" \
@@ -28,17 +41,24 @@ do-build:
 		`${SDL_CONFIG} --libs` -lSDL_mixer
 
 do-install:
+# Executable
 	${INSTALL_PROGRAM} ${WRKSRC}/defendguin ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/defendguin.6 ${MAN6PREFIX}/man/man6
-	@${MKDIR} ${DATADIR}
-	${TAR} -C ${WRKSRC}/../data -cf - . | \
-		${TAR} -C ${DATADIR} --unlink -xf -
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}
-
-post-install:
-	@${FIND} ${DATADIR} ! -type d | ${SED} \
-		-e "s,${PREFIX}/,," >> ${TMPPLIST}
-	@${FIND} ${DATADIR} -type d | ${SORT} -r | ${SED} \
-		-e "s,${PREFIX}/,@dirrm ," >> ${TMPPLIST}
+
+# Manuall
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.6 ${MAN6PREFIX}/man/man6
+
+# Data
+	@(cd ${WRKSRC}/../data && ${COPYTREE_SHARE} "images music sounds" ${DATADIR})
+
+# Pixmaps
+	${INSTALL_DATA} ${DISTDIR}/${PORTNAME}.gif ${PREFIX}/share/pixmaps/
+
+# Documentation
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${DOCSDIR}
+.  for f in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/../docs/${f} ${DOCSDIR}
+.  endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/games/defendguin/distinfo b/games/defendguin/distinfo
index 71da692a8b78..007d15fb2c97 100644
--- a/games/defendguin/distinfo
+++ b/games/defendguin/distinfo
@@ -1,2 +1,4 @@
 SHA256 (defendguin-0.0.12.tar.gz) = 3c248bed480b291901b7509525dc952be6d28dfa47fd6f8e3fb9873f46017330
 SIZE (defendguin-0.0.12.tar.gz) = 2235694
+SHA256 (defendguin.gif) = 1ed6391928f1d20ca241b6988b9d56d7ec75dc2ebd48a15c507a08c8c3acac8d
+SIZE (defendguin.gif) = 2804
diff --git a/games/defendguin/files/patch-defendguin.c b/games/defendguin/files/patch-defendguin.c
index 5036010d6dec..f2c78347e3a0 100644
--- a/games/defendguin/files/patch-defendguin.c
+++ b/games/defendguin/files/patch-defendguin.c
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- defendguin.c	2002/03/05 13:16:46	1.1
-+++ defendguin.c	2002/03/05 13:22:13
-@@ -4210,6 +4210,7 @@
+--- defendguin.c.orig	2009-11-05 22:20:59.000000000 +0100
++++ defendguin.c	2012-09-10 22:01:37.000000000 +0200
+@@ -4322,6 +4322,7 @@
                "%s\n\n", SDL_GetError());
        exit(1);
      }