svn commit: r422096 - in head/games/osgg: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Wed Sep 14 01:45:32 2016
New Revision: 422096
URL: https://svnweb.freebsd.org/changeset/ports/422096

Log:
  - Update to 1.0
  - Add LICENSE
  - Add .desktop file
  - Simplify makefile

Added:
  head/games/osgg/files/patch-Makefile   (contents, props changed)
Modified:
  head/games/osgg/Makefile
  head/games/osgg/distinfo
  head/games/osgg/files/patch-main.cpp

Modified: head/games/osgg/Makefile
==============================================================================
--- head/games/osgg/Makefile	Wed Sep 14 01:17:27 2016	(r422095)
+++ head/games/osgg/Makefile	Wed Sep 14 01:45:32 2016	(r422096)
@@ -2,36 +2,32 @@
 # $FreeBSD$
 
 PORTNAME=	osgg
-PORTVERSION=	0.99
-PORTREVISION=	9
+PORTVERSION=	1.0
 CATEGORIES=	games
 MASTER_SITES=	SF
 
 MAINTAINER=	amdmi3 at FreeBSD.org
 COMMENT=	OldSkool Gravity Game
 
+LICENSE=	GPLv3+
+
 USES=		tar:bzip2
 USE_SDL=	sdl image ttf mixer
-USE_GL=		yes
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
+USE_GL=		gl
+MAKE_ENV=	DATADIR="${DATADIR}/"
 
 PLIST_FILES=	bin/${PORTNAME}
 PORTDATA=	*
 
-post-extract:
-	@${FIND} -d ${WRKSRC} -name .svn -exec ${RM} -rf {} \;
+DESKTOP_ENTRIES="Osgg" \
+		"" \
+		"${DATADIR}/icon.png" \
+		"osgg" \
+		"Game;ArcadeGame;" \
+		""
 
-post-patch:
-	@${RM} -f ${WRKSRC}/osgg
-	@${REINPLACE_CMD} -e 's|"[a-z]*.txt"|DATADIR&|; s|endian.h|sys/&|' \
-		${WRKSRC}/main.cpp
-
-do-build:
-	cd ${WRKSRC} && ${CXX} ${CXXFLAGS} `${SDL_CONFIG} --libs --cflags` \
-		-lGL -lSDL_image -lSDL_ttf -lSDL_mixer -o ${PORTNAME} \
-		-DDATADIR="\"${DATADIR}/\"" \
-		main.cpp text.cpp sound.cpp
+post-extract:
+	@${RM} -f ${WRKSRC}/osgg ${WRKSRC}/launcher/launcher
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/

Modified: head/games/osgg/distinfo
==============================================================================
--- head/games/osgg/distinfo	Wed Sep 14 01:17:27 2016	(r422095)
+++ head/games/osgg/distinfo	Wed Sep 14 01:45:32 2016	(r422096)
@@ -1,2 +1,3 @@
-SHA256 (osgg-0.99.tar.bz2) = d186294f490437e8bfce1f5947673932f57fc5719fa10dac5153aa7be8ed3f86
-SIZE (osgg-0.99.tar.bz2) = 2664753
+TIMESTAMP = 1471280939
+SHA256 (osgg-1.0.tar.bz2) = 59654b2a845883078071eca847a1fd07f0084302c1555a4d9d239155f29d758c
+SIZE (osgg-1.0.tar.bz2) = 300614

Added: head/games/osgg/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/osgg/files/patch-Makefile	Wed Sep 14 01:45:32 2016	(r422096)
@@ -0,0 +1,37 @@
+--- Makefile.orig	2016-08-13 02:07:57 UTC
++++ Makefile
+@@ -1,26 +1,26 @@
+ DATADIR?=./
+ 
+-CC=g++ -DDATADIR="\"$(DATADIR)\""
++CXX?=g++
+ 
+-CFLAGS+=-Wall `sdl-config --cflags`
++CXXFLAGS+=-Wall `sdl-config --cflags` -DDATADIR="\"$(DATADIR)\""
+ 
+-LIBS+=-lGL `sdl-config --libs` -lSDL_ttf -lSDL_image -lSDL_mixer
++LIBS+=`sdl-config --libs` -lSDL_ttf -lSDL_image -lSDL_mixer -lGL -lm
+ 
+ SOURCES=main.cpp text.cpp sound.cpp
+-OBJECTS=$(SOURCES:.c=.o)
++OBJECTS=$(SOURCES:.cpp=.o)
+ 
+ EXECUTABLE=osgg
+ 
+ all: $(SOURCES) $(EXECUTABLE)
+ 
+ server: server.cpp
+-	 $(CC) $(LDFLAGS) server.cpp $(LIBS) -o $@
+-	
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) server.cpp $(LIBS) -o $@
++
+ $(EXECUTABLE): $(OBJECTS)
+-	$(CC) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
++	$(CXX) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
+ 
+ .cpp.o:
+-	$(CC) $(CFLAGS) $< -o $@
++	$(CXX) $(CXXFLAGS) -c $< -o $@
+ 
+ clean:
+ 	rm -f *.o $(EXECUTABLE)

Modified: head/games/osgg/files/patch-main.cpp
==============================================================================
--- head/games/osgg/files/patch-main.cpp	Wed Sep 14 01:17:27 2016	(r422095)
+++ head/games/osgg/files/patch-main.cpp	Wed Sep 14 01:45:32 2016	(r422096)
@@ -1,6 +1,6 @@
---- main.cpp.orig	2009-03-14 01:46:04.000000000 +0300
-+++ main.cpp	2013-12-21 03:29:52.401817465 +0400
-@@ -26,6 +26,7 @@
+--- main.cpp.orig	2016-08-13 02:07:57 UTC
++++ main.cpp
+@@ -27,15 +27,18 @@
  #include <fstream>
  #include <iostream>
  #include <sstream>
@@ -8,7 +8,21 @@
  
  #include <sys/time.h>
  
-@@ -340,6 +341,7 @@
+-#ifndef WIN32
+-    #include <endian.h>
+-#else
++#if defined(WIN32)
+     typedef unsigned int uint;
+     #include <windows.h>
+     #include <GL/glext.h>
++#elif defined(__FreeBSD__)
++    #include <sys/endian.h>
++#else
++    #include <endian.h>
+ #endif
+ 
+ 
+@@ -348,6 +351,7 @@ bool classBullets::col(vector<vert> targ
        }
      }
    }
@@ -16,3 +30,25 @@
  }
  
  void classBullets::shoot(entity owner, gPs velocity)
+@@ -1826,9 +1830,9 @@ int main(int argc, char **argv)
+ 
+   GLfloat scale;
+ 
+-  readEnt("ship.txt", gameInfo.shipStaticVerts);
+-  readEnt("base.txt", gameInfo.baseStaticVerts);
+-  readEnt("enemy.txt", gameInfo.enemyStaticVerts);
++  readEnt(DATADIR "ship.txt", gameInfo.shipStaticVerts);
++  readEnt(DATADIR "base.txt", gameInfo.baseStaticVerts);
++  readEnt(DATADIR "enemy.txt", gameInfo.enemyStaticVerts);
+ 
+   //Enter Main loop
+   while(gameState != GameStateQuit)
+@@ -1958,7 +1962,7 @@ int main(int argc, char **argv)
+               break;
+ 
+             case SDLK_d:
+-              saveMap(polys, ents, "verts.txt");
++              saveMap(polys, ents, DATADIR "verts.txt");
+             break;
+ 
+             case SDLK_s: