- Update to 1.4.0

- Rename port according to upstream

8 files changed, 68 insertions, 58 deletions

diff --git a/MOVED b/MOVED
index 29934a688ef2..95a3322fe95a 100644
--- a/MOVED
+++ b/MOVED
@@ -10582,3 +10582,4 @@ cad/gmsh-occ||2018-10-17|To match upstream, cad/gmsh now builds with OCC
 audio/msbcg729||2018-10-18|Obsolete: net/mediastreamer has built-in G.729 codec
 audio/msilbc|multimedia/mswebrtc|2018-10-18|Deprecated upstream
 multimedia/msx264|multimedia/msopenh264|2018-10-18|Deprecated upstream
+games/openastromenace|games/astromenace|2018-10-20|Name correctly after upstream
diff --git a/games/Makefile b/games/Makefile
index c21c00f96593..5557500f141d 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -60,6 +60,7 @@
     SUBDIR += assaultcube
     SUBDIR += asteroid
     SUBDIR += asteroids3d
+    SUBDIR += astromenace
     SUBDIR += asylum
     SUBDIR += atanks
     SUBDIR += atomix
@@ -733,7 +734,6 @@
     SUBDIR += openarena-data
     SUBDIR += openarena-oax
     SUBDIR += openarena-server
-    SUBDIR += openastromenace
     SUBDIR += openbor
     SUBDIR += openbor3482
     SUBDIR += openbor3711
diff --git a/games/astromenace/Makefile b/games/astromenace/Makefile
new file mode 100644
index 000000000000..886d8ccce6ca
--- /dev/null
+++ b/games/astromenace/Makefile
@@ -0,0 +1,58 @@
+# Created by: Oleg Alexeenkov
+# $FreeBSD$
+
+PORTNAME=	astromenace
+PORTVERSION=	1.4.0
+DISTVERSIONPREFIX=	v
+CATEGORIES=	games
+
+MAINTAINER=	amdmi3@FreeBSD.org
+COMMENT=	Hardcore 3D space shooter with spaceship upgrade possibilities
+
+LICENSE=	GPLv3+ CC-BY-SA-4.0 OFL11
+LICENSE_COMB=	multi
+LICENSE_FILE_GPLv3+ =	${WRKSRC}/licenses/GPL-3.0.txt
+LICENSE_FILE_CC-BY-SA-4.0=${WRKSRC}/licenses/CC-BY-SA-4.0.txt
+LICENSE_FILE_OFL11=	${WRKSRC}/licenses/OFL-1.1.txt
+
+LIB_DEPENDS=	libogg.so:audio/libogg \
+		libvorbis.so:audio/libvorbis \
+		libvorbisfile.so:audio/libvorbis \
+		libfreetype.so:print/freetype2
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	viewizard
+
+USES=		cmake compiler:c++11-lib dos2unix gl openal:al,alut
+DOS2UNIX_FILES=	CMakeLists.txt src/config/config.cpp
+USE_GL=		gl glu
+USE_SDL=	sdl2
+CMAKE_ARGS=	-DDATADIR="${DATADIR}"
+LLD_UNSAFE=	yes
+
+PORTDATA=	*
+PORTDOCS=	*
+
+OPTIONS_DEFINE=	DOCS
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/gamedata.vfs ${STAGEDIR}${DATADIR}/
+.for s in 64 128
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/
+	${INSTALL_DATA} ${WRKSRC}/share/${PORTNAME}_${s}.png \
+		${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/${PORTNAME}.png
+.endfor
+	${INSTALL_DATA} ${WRKSRC}/share/${PORTNAME}.desktop \
+		${STAGEDIR}${PREFIX}/share/applications/
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/appdata/
+	${INSTALL_DATA} ${WRKSRC}/share/${PORTNAME}.appdata.xml \
+		${STAGEDIR}${PREFIX}/share/appdata/
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/CHANGELOG.md ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}/
+
+.include <bsd.port.mk>
diff --git a/games/astromenace/distinfo b/games/astromenace/distinfo
new file mode 100644
index 000000000000..4f352d629163
--- /dev/null
+++ b/games/astromenace/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1540033373
+SHA256 (viewizard-astromenace-v1.4.0_GH0.tar.gz) = 6ebbb14d7b2e066a4f35b104185562560614e125498a63631402fbc77d899f35
+SIZE (viewizard-astromenace-v1.4.0_GH0.tar.gz) = 68046630
diff --git a/games/openastromenace/pkg-descr b/games/astromenace/pkg-descr
index c99684757a50..c99684757a50 100644
--- a/games/openastromenace/pkg-descr
+++ b/games/astromenace/pkg-descr
diff --git a/games/astromenace/pkg-plist b/games/astromenace/pkg-plist
new file mode 100644
index 000000000000..8f46c4e2f673
--- /dev/null
+++ b/games/astromenace/pkg-plist
@@ -0,0 +1,5 @@
+bin/astromenace
+share/appdata/astromenace.appdata.xml
+share/applications/astromenace.desktop
+share/icons/hicolor/128x128/astromenace.png
+share/icons/hicolor/64x64/astromenace.png
diff --git a/games/openastromenace/Makefile b/games/openastromenace/Makefile
deleted file mode 100644
index 75abcb269c59..000000000000
--- a/games/openastromenace/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-# Created by: Oleg Alexeenkov
-# $FreeBSD$
-
-PORTNAME=	openastromenace
-PORTVERSION=	1.3.2
-PORTREVISION=	4
-CATEGORIES=	games
-MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}/
-DISTNAME=	astromenace-src-${PORTVERSION}
-
-MAINTAINER=	amdmi3@FreeBSD.org
-COMMENT=	Hardcore 3D space shooter with spaceship upgrade possibilities
-
-LICENSE=	GPLv3
-
-LIB_DEPENDS=	libogg.so:audio/libogg \
-		libvorbis.so:audio/libvorbis \
-		libvorbisfile.so:audio/libvorbis \
-		libfreetype.so:print/freetype2 \
-		libfontconfig.so:x11-fonts/fontconfig
-
-USES=		cmake openal:al,alut tar:bzip2
-USE_XORG=	x11 xinerama
-USE_GL=		gl glu
-USE_SDL=	sdl
-WRKSRC=		${WRKDIR}/AstroMenace
-CMAKE_ARGS=	-DDATADIR="${DATADIR}"
-LLD_UNSAFE=	yes
-
-PLIST_FILES=	bin/AstroMenace \
-		share/pixmaps/${PORTNAME}.png
-PORTDATA=	*
-PORTDOCS=	*
-
-DESKTOP_ENTRIES="AstroMenace" "" \
-		"${PORTNAME}" "AstroMenace" \
-		"Game;ArcadeGame;" false
-
-OPTIONS_DEFINE=	DOCS
-
-post-build:
-	cd ${WRKSRC} && ./AstroMenace dos2unix --pack --rawdata=./RAW_VFS_DATA --dir="${WRKSRC}"
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/AstroMenace ${STAGEDIR}${PREFIX}/bin/
-	@${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/gamedata.vfs ${STAGEDIR}${DATADIR}/
-	${INSTALL_DATA} ${WRKSRC}/astromenace_128.png \
-		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
-
-do-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/ChangeLog.txt ${STAGEDIR}${DOCSDIR}/
-
-.include <bsd.port.mk>
diff --git a/games/openastromenace/distinfo b/games/openastromenace/distinfo
deleted file mode 100644
index d2cd121195e5..000000000000
--- a/games/openastromenace/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (astromenace-src-1.3.2.tar.bz2) = 9b775df2b157565b97aca008dd879b867cd3377c07b829cee6b5342639357fe6
-SIZE (astromenace-src-1.3.2.tar.bz2) = 55390211