- Update to 0.4.4

- Change master sites and add icons
- Take maintainership
- Remove leading article from COMMENT
- Remove USES gmake, build good without
- Add licenses (GPLv2)
- Disable all warnings with -w
- Support STAGEDIR
- Add DOCS and Option
- Add Desktop entry file
- Remove obsolete REINPLACE,
- Add REINPLACE, make CFLAGS safe [1]
- Remove obsolete patches

PR:		ports/173352 ports/185932
Submitted by:	nemysis (self), KATO Tsuguru <tkato432@yahoo.com> [1]

4 files changed, 48 insertions, 22 deletions

diff --git a/games/gtkatlantic/Makefile b/games/gtkatlantic/Makefile
index 1d1603e16c25..29822966335d 100644
--- a/games/gtkatlantic/Makefile
+++ b/games/gtkatlantic/Makefile
@@ -2,24 +2,50 @@
 # $FreeBSD$
 
 PORTNAME=	gtkatlantic
-PORTVERSION=	0.4.3
-PORTREVISION=	1
+PORTVERSION=	0.4.4
 CATEGORIES=	games
-MASTER_SITES=	http://download.tuxfamily.org/gtkatlantic/downloads/v0.4/
+MASTER_SITES=	http://download.tuxfamily.org/gtkatlantic/downloads/v0.4/ \
+		SF/nemysisfreebsdp/${CATEGORIES}/:icons
+DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
+		${PORTNAME}_icons${EXTRACT_SUFX}:icons
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A game like Monopoly(tm)
+MAINTAINER=	nemysis@FreeBSD.org
+COMMENT=	Game like Monopoly(tm)
+
+LICENSE=	GPLv2
 
-USES=		gmake pkgconfig
 USE_BZIP2=	yes
+USES=		pkgconfig
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
+
+CPPFLAGS+=	-I${LOCALBASE}/include -w
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-NO_STAGE=	yes
+PORTDOCS=	AUTHORS ChangeLog NEWS README
+
+OPTIONS_DEFINE=	DOCS
+
+INSTALLS_ICONS=	yes
+ICON_SIZES=	32x32 48x48 64x64 72x72 96x96 128x128
+
+DESKTOP_ENTRIES="GtkAtlantic" "" "${PORTNAME}" \
+		"${PORTNAME}" "Game;BoardGame;" ""
+
 post-patch:
-	@${REINPLACE_CMD} -e '/-Werror/s|^|#|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e '/CFLAGS=/s|-ggdb|$$CFLAGS|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|mkdir |$$(mkdir_p) |g' ${WRKSRC}/Makefile.in
 
+post-install:
+.for s in ${ICON_SIZES}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps
+	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_${s}.png \
+		${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png
+.endfor
+	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps/
+
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+
 .include <bsd.port.mk>
diff --git a/games/gtkatlantic/distinfo b/games/gtkatlantic/distinfo
index 583e7a8cd983..515825dfa07e 100644
--- a/games/gtkatlantic/distinfo
+++ b/games/gtkatlantic/distinfo
@@ -1,2 +1,4 @@
-SHA256 (gtkatlantic-0.4.3.tar.bz2) = 5711eab90b831816da48b1d30f0f0d2b511bfaa6b057240977296f2c133184b1
-SIZE (gtkatlantic-0.4.3.tar.bz2) = 748589
+SHA256 (gtkatlantic-0.4.4.tar.bz2) = 1f1676f74325807e3e405bd668b41764c76a67897f51290aaaf711db5e699c37
+SIZE (gtkatlantic-0.4.4.tar.bz2) = 778679
+SHA256 (gtkatlantic_icons.tar.bz2) = 73eaec5f7ef2014832ba2b4c5f610f007a7a98f109a5b1fb5c086c68bb57d440
+SIZE (gtkatlantic_icons.tar.bz2) = 41628
diff --git a/games/gtkatlantic/files/patch-readpng.c b/games/gtkatlantic/files/patch-readpng.c
deleted file mode 100644
index 112e713764ee..000000000000
--- a/games/gtkatlantic/files/patch-readpng.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/readpng.c.orig	2010-04-18 11:36:49.000000000 +0900
-+++ src/readpng.c	2010-09-14 03:27:35.000000000 +0900
-@@ -33,7 +33,7 @@
- 	png_uint_32 width, height;
- 
- 	fread(sig, 1, 8, infile);
--	if (!png_check_sig((png_bytep)sig, 8))
-+	if (png_sig_cmp((png_bytep)sig, 0, 8))
- 		return FALSE;
- 
- 	*png_struct = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
diff --git a/games/gtkatlantic/pkg-plist b/games/gtkatlantic/pkg-plist
index 19ccbe9b26bb..879ef741ecf9 100644
--- a/games/gtkatlantic/pkg-plist
+++ b/games/gtkatlantic/pkg-plist
@@ -5,7 +5,9 @@ bin/gtkatlantic
 %%DATADIR%%/default.conf
 %%DATADIR%%/help.index
 %%DATADIR%%/houses.png
+%%DATADIR%%/icon16x16.ico
 %%DATADIR%%/icon16x16.xpm
+%%DATADIR%%/icon32x32.ico
 %%DATADIR%%/icon32x32.xpm
 %%DATADIR%%/interface.xml
 %%DATADIR%%/logo.png
@@ -21,6 +23,13 @@ bin/gtkatlantic
 %%DATADIR%%/themes/generic_gradient/theme.conf
 %%DATADIR%%/themes/generic_gradient/tokens.png
 %%DATADIR%%/tokens.png
+share/icons/hicolor/128x128/apps/gtkatlantic.png
+share/icons/hicolor/32x32/apps/gtkatlantic.png
+share/icons/hicolor/48x48/apps/gtkatlantic.png
+share/icons/hicolor/64x64/apps/gtkatlantic.png
+share/icons/hicolor/72x72/apps/gtkatlantic.png
+share/icons/hicolor/96x96/apps/gtkatlantic.png
+share/pixmaps/gtkatlantic.png
 @dirrm %%DATADIR%%/themes/generic_gradient
 @dirrm %%DATADIR%%/themes
 @dirrm %%DATADIR%%