- Change PORTNAME from blue to bluemoon

- Bump PORTREVISION
- Change license BSD to BSD4CLAUSE
- USES gmake instead of USE_GMAKE
- Change PLIST_FILES
- Add DOCS and Option
- Use supplied icon
- Support STAGEDIR
- Add files/bluemoon.desktop
- Add patch

Approved by:	pawel (mentor)

7 files changed, 63 insertions, 35 deletions

diff --git a/games/Makefile b/games/Makefile
index c6ce24b297ac..3b100b719319 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -88,7 +88,7 @@
     SUBDIR += blockrage
     SUBDIR += blokish
     SUBDIR += bloodfrontier
-    SUBDIR += blue
+    SUBDIR += bluemoon
     SUBDIR += bogged
     SUBDIR += bomber
     SUBDIR += bomberclone
diff --git a/games/blue/Makefile b/games/blue/Makefile
deleted file mode 100644
index 949d21f55d69..000000000000
--- a/games/blue/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# Created by: Andrey Zakhvatov
-# $FreeBSD$
-
-PORTNAME=	blue
-PORTVERSION=	2.11
-CATEGORIES=	games
-MASTER_SITES=	http://www.catb.org/~esr/bluemoon/
-DISTNAME=	bluemoon-${PORTVERSION}
-
-MAINTAINER=	nemysis@FreeBSD.org
-COMMENT=	Blue Moon card solitaire
-
-LICENSE=	BSD
-
-USE_GMAKE=	yes
-ALL_TARGET=	bluemoon
-
-PLIST_FILES=	bin/blue \
-		bin/bluemoon
-
-MAN6=		bluemoon.6
-MLINKS=		bluemoon.6 blue.6
-
-NO_STAGE=	yes
-post-patch:
-	@${REINPLACE_CMD} -e 's|^CFLAGS=|CFLAGS?=|g ; \
-		 s|cc |$${CC} |g' ${WRKSRC}/Makefile
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bluemoon ${PREFIX}/bin
-	@${LN} -sf bluemoon ${PREFIX}/bin/blue
-	${INSTALL_MAN} ${MAN6:S|^|${WRKSRC}/|} ${MAN6PREFIX}/man/man6
-
-.include <bsd.port.mk>
diff --git a/games/bluemoon/Makefile b/games/bluemoon/Makefile
new file mode 100644
index 000000000000..409d4aa5dab3
--- /dev/null
+++ b/games/bluemoon/Makefile
@@ -0,0 +1,41 @@
+# Created by: Andrey Zakhvatov
+# $FreeBSD$
+
+PORTNAME=	bluemoon
+PORTVERSION=	2.11
+PORTREVISION=	1
+CATEGORIES=	games
+MASTER_SITES=	http://www.catb.org/~esr/bluemoon/
+
+MAINTAINER=	nemysis@FreeBSD.org
+COMMENT=	Blue Moon card solitaire
+
+LICENSE=	BSD4CLAUSE
+
+USES=		gmake
+ALL_TARGET=	${PORTNAME}
+
+PLIST_FILES=	bin/${PORTNAME} \
+		man/man6/${PORTNAME}.6.gz \
+		share/applications/${PORTNAME}.desktop \
+		share/pixmaps/${PORTNAME}.png
+
+PORTDOCS=	NEWS README
+
+OPTIONS_DEFINE=	DOCS
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|^CFLAGS=|CFLAGS?=|g ; \
+		 s|cc |$${CC} |g' ${WRKSRC}/Makefile
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps 
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.6 ${STAGEDIR}${MAN6PREFIX}/man/man6/
+
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.mk>
diff --git a/games/blue/distinfo b/games/bluemoon/distinfo
index 0f09d1690093..0f09d1690093 100644
--- a/games/blue/distinfo
+++ b/games/bluemoon/distinfo
diff --git a/games/bluemoon/files/bluemoon.desktop b/games/bluemoon/files/bluemoon.desktop
new file mode 100644
index 000000000000..3255a767ec6b
--- /dev/null
+++ b/games/bluemoon/files/bluemoon.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=Blue Moon
+GenericName=Blue Moon game
+Comment=Blue Moon card solitaire
+Icon=bluemoon
+Exec=bluemoon
+Categories=Game;CardGame;
+Terminal=true
diff --git a/games/bluemoon/files/patch-bluemoon.c b/games/bluemoon/files/patch-bluemoon.c
new file mode 100644
index 000000000000..c83bd9a58e2f
--- /dev/null
+++ b/games/bluemoon/files/patch-bluemoon.c
@@ -0,0 +1,11 @@
+--- ./bluemoon.c.orig	2010-10-19 07:59:18.000000000 +0200
++++ ./bluemoon.c	2013-12-21 14:10:23.000000000 +0100
+@@ -376,7 +376,7 @@
+     refresh();
+ }
+ 
+-main(int argc, char *argv[])
++int main(int argc, char *argv[])
+ {
+     (void) signal(SIGINT, die);
+     initscr();
diff --git a/games/blue/pkg-descr b/games/bluemoon/pkg-descr
index 3f6efdb3fe2f..3f6efdb3fe2f 100644
--- a/games/blue/pkg-descr
+++ b/games/bluemoon/pkg-descr