Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 15 Apr 2014 16:25:41 +0000 (UTC)
From:      Rusmir Dusko <nemysis@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r351348 - in head/games/highmoon: . files
Message-ID:  <201404151625.s3FGPfoJ018206@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: nemysis
Date: Tue Apr 15 16:25:41 2014
New Revision: 351348
URL: http://svnweb.freebsd.org/changeset/ports/351348
QAT: https://qat.redports.org/buildarchive/r351348/

Log:
  - Bump PORTREVISION for MAINTAINER, LICENSE, pkg-plist change
  - Transfer maintainership to games@ team
  - Add license (GPLv2)
  - Add AUTHORS and NEWS to DOCS
  - Add pkg-message, information about usage
  - Add Desktop entry file
  - Change REINPLACE, cosmetical changes, fix bad C++ code
  - Use supplied icon
  - Add patch, fix deprecated code for Clang
  - Change pkg-descr, cosmetical changes
  - Recreate pkg-plist with make makeplist, remove DOCS, add icon

Added:
  head/games/highmoon/files/
  head/games/highmoon/files/patch-src__sound.cpp   (contents, props changed)
  head/games/highmoon/files/pkg-message.in   (contents, props changed)
Modified:
  head/games/highmoon/Makefile
  head/games/highmoon/pkg-descr
  head/games/highmoon/pkg-plist

Modified: head/games/highmoon/Makefile
==============================================================================
--- head/games/highmoon/Makefile	Tue Apr 15 16:00:50 2014	(r351347)
+++ head/games/highmoon/Makefile	Tue Apr 15 16:25:41 2014	(r351348)
@@ -3,39 +3,56 @@
 
 PORTNAME=	highmoon
 PORTVERSION=	1.2.4
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	games
 MASTER_SITES=	http://highmoon.gerdsmeier.net/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	games@FreeBSD.org
 COMMENT=	Duel in the universe
 
+LICENSE=	GPLv2
+
 WRKSRC=		${WRKDIR}/HighMoon
 
-USE_SDL=	image sdl
 USES=		gmake
+USE_SDL=	image sdl
 MAKE_ARGS=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" LIBS="${LDFLAGS}"
 
 CXXFLAGS+=	`${SDL_CONFIG} --cflags`
 LDFLAGS+=	`${SDL_CONFIG} --libs` -lSDL_image
 
+PORTDOCS=	AUTHORS NEWS README
 OPTIONS_DEFINE=	DOCS
 
+SUB_FILES=	pkg-message
+
+DESKTOP_ENTRIES="HighMoon" "" "${PORTNAME}" \
+		"${PORTNAME}" "Game;ArcadeGame;" ""
+
 post-patch:
 	@${FIND} ${WRKSRC}/src -type f | ${XARGS} ${REINPLACE_CMD} -e \
-		's|SDL/SDL|SDL|g ; \
-		 s|^#define __ENV|//#define __ENV|g ; \
-		 s|"gfx/|"${DATADIR}/gfx/|g ; \
-		 s|"snd/|"${DATADIR}/snd/|g ; \
-		 s|-round(|-rint(|g'
+		's|SDL/SDL|SDL|; \
+		 s|^#define __ENV|//#define __ENV|; \
+		 s|"gfx/|(char\*)"${DATADIR}/gfx/|; \
+		 s|"snd/|(char\*)"${DATADIR}/snd/|; \
+		 s|-round(|-rint(|'
+	${REINPLACE_CMD} -e \
+		's|planet_filename = ""|planet_filename = (char\*)""|; \
+		 s|u_filename = ""|u_filename = (char\*)""|; \
+		 s|c_filename = ""|c_filename = (char\*)""|' \
+		${WRKSRC}/src/galaxy.cpp
+	${REINPLACE_CMD} -e 's|"HighMoon -|(char\*)"HighMoon -|; \
+		s|"Highmoon -|(char\*)"HighMoon -|' \
+		${WRKSRC}/src/language.cpp
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ufo ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-	@${MKDIR} ${STAGEDIR}${DATADIR}/gfx
-	${INSTALL_DATA} ${WRKSRC}/gfx/* ${STAGEDIR}${DATADIR}/gfx
-	@${MKDIR} ${STAGEDIR}${DATADIR}/snd
-	${INSTALL_DATA} ${WRKSRC}/snd/* ${STAGEDIR}${DATADIR}/snd
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} "gfx snd" ${STAGEDIR}${DATADIR})
+	${INSTALL_DATA} ${WRKSRC}/icon.png ${STAGEDIR}${DATADIR}
+	${LN} -sf ${DATADIR}/icon.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
+
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Added: head/games/highmoon/files/patch-src__sound.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/highmoon/files/patch-src__sound.cpp	Tue Apr 15 16:25:41 2014	(r351348)
@@ -0,0 +1,13 @@
+--- ./src/sound.cpp.orig	2006-03-25 22:10:32.000000000 +0100
++++ ./src/sound.cpp	2014-04-15 17:58:18.532919123 +0200
+@@ -27,6 +27,10 @@
+ 
+ #include "sound.hpp"
+ 
++#ifdef __clang__
++#pragma clang diagnostic ignored "-Wtautological-constant-out-of-range-compare"
++#endif
++
+ Soundset::Sample Soundset::sounds[ NUMBEROFCHANNELS ];
+ bool Soundset::soundOn = true;
+ 

Added: head/games/highmoon/files/pkg-message.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/highmoon/files/pkg-message.in	Tue Apr 15 16:25:41 2014	(r351348)
@@ -0,0 +1,20 @@
+===============================================================================
+
+HighMoon has been installed.
+
+All options are given in the command line or GUI shortcuts
+
+
+You can use executable to start and see shortcuts
+
+    highmoon --help
+
+
+Or can use desktop file with shortcuts
+
+    %%LOCALBASE%%/share/applications/highmoon.desktop
+
+
+Have fun!
+
+===============================================================================

Modified: head/games/highmoon/pkg-descr
==============================================================================
--- head/games/highmoon/pkg-descr	Tue Apr 15 16:00:50 2014	(r351347)
+++ head/games/highmoon/pkg-descr	Tue Apr 15 16:25:41 2014	(r351348)
@@ -1,7 +1,7 @@
 HighMoon is a game similar to "Artillery" or "Worms" -- but it takes place
-in the universe.  There is a planet system between two flying saucers.  The
-gravitational fields of the planets and moons change inevitably each
-ballistic curve.  It is not easy to eliminate an enemy.  If you miss it,
+in the universe. There is a planet system between two flying saucers.
+The gravitational fields of the planets and moons change inevitably each
+ballistic curve. It is not easy to eliminate an enemy. If you miss it,
 the shoots can change their direction and become dangerous to the attacker.
 
 HighMoon can be played against a computer or a human opponent in many

Modified: head/games/highmoon/pkg-plist
==============================================================================
--- head/games/highmoon/pkg-plist	Tue Apr 15 16:00:50 2014	(r351347)
+++ head/games/highmoon/pkg-plist	Tue Apr 15 16:25:41 2014	(r351348)
@@ -1,5 +1,4 @@
 bin/highmoon
-%%PORTDOCS%%%%DOCSDIR%%/README
 %%DATADIR%%/gfx/c_shooting.gif
 %%DATADIR%%/gfx/c_thinking.gif
 %%DATADIR%%/gfx/cpktblue.gif
@@ -30,6 +29,7 @@ bin/highmoon
 %%DATADIR%%/gfx/ufoblue.gif
 %%DATADIR%%/gfx/ufored.gif
 %%DATADIR%%/gfx/venus.gif
+%%DATADIR%%/icon.png
 %%DATADIR%%/snd/applause.wav
 %%DATADIR%%/snd/click.wav
 %%DATADIR%%/snd/curve.wav
@@ -38,7 +38,7 @@ bin/highmoon
 %%DATADIR%%/snd/laser.wav
 %%DATADIR%%/snd/pluck.wav
 %%DATADIR%%/snd/strom.wav
+share/pixmaps/highmoon.png
 @dirrm %%DATADIR%%/snd
 @dirrm %%DATADIR%%/gfx
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%



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