Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 20 Oct 2018 11:27:15 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r482490 - in head: . games games/astromenace games/openastromenace
Message-ID:  <201810201127.w9KBRFn6009568@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Sat Oct 20 11:27:14 2018
New Revision: 482490
URL: https://svnweb.freebsd.org/changeset/ports/482490

Log:
  - Update to 1.4.0
  - Rename port according to upstream

Added:
  head/games/astromenace/
     - copied from r424623, head/games/openastromenace/
  head/games/astromenace/pkg-plist   (contents, props changed)
Deleted:
  head/games/openastromenace/
Modified:
  head/MOVED
  head/games/Makefile
  head/games/astromenace/Makefile
  head/games/astromenace/distinfo

Modified: head/MOVED
==============================================================================
--- head/MOVED	Sat Oct 20 11:11:45 2018	(r482489)
+++ head/MOVED	Sat Oct 20 11:27:14 2018	(r482490)
@@ -10582,3 +10582,4 @@ cad/gmsh-occ||2018-10-17|To match upstream, cad/gmsh n
 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

Modified: head/games/Makefile
==============================================================================
--- head/games/Makefile	Sat Oct 20 11:11:45 2018	(r482489)
+++ head/games/Makefile	Sat Oct 20 11:27:14 2018	(r482490)
@@ -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

Modified: head/games/astromenace/Makefile
==============================================================================
--- head/games/openastromenace/Makefile	Tue Oct 25 13:20:28 2016	(r424623)
+++ head/games/astromenace/Makefile	Sat Oct 20 11:27:14 2018	(r482490)
@@ -1,54 +1,58 @@
 # Created by: Oleg Alexeenkov
 # $FreeBSD$
 
-PORTNAME=	openastromenace
-PORTVERSION=	1.3.2
-PORTREVISION=	3
+PORTNAME=	astromenace
+PORTVERSION=	1.4.0
+DISTVERSIONPREFIX=	v
 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
+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 \
-		libfontconfig.so:x11-fonts/fontconfig
+		libfreetype.so:print/freetype2
 
-USES=		cmake openal:al,alut tar:bzip2
-USE_XORG=	x11 xinerama
+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=	sdl
-WRKSRC=		${WRKDIR}/AstroMenace
+USE_SDL=	sdl2
 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/
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${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
+.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.txt ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/CHANGELOG.md ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>

Modified: head/games/astromenace/distinfo
==============================================================================
--- head/games/openastromenace/distinfo	Tue Oct 25 13:20:28 2016	(r424623)
+++ head/games/astromenace/distinfo	Sat Oct 20 11:27:14 2018	(r482490)
@@ -1,2 +1,3 @@
-SHA256 (astromenace-src-1.3.2.tar.bz2) = 9b775df2b157565b97aca008dd879b867cd3377c07b829cee6b5342639357fe6
-SIZE (astromenace-src-1.3.2.tar.bz2) = 55390211
+TIMESTAMP = 1540033373
+SHA256 (viewizard-astromenace-v1.4.0_GH0.tar.gz) = 6ebbb14d7b2e066a4f35b104185562560614e125498a63631402fbc77d899f35
+SIZE (viewizard-astromenace-v1.4.0_GH0.tar.gz) = 68046630

Added: head/games/astromenace/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/astromenace/pkg-plist	Sat Oct 20 11:27:14 2018	(r482490)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810201127.w9KBRFn6009568>