From a00bbe328893705c7343b12cd6b255bf5d2ac935 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Wed, 21 Sep 2016 15:20:42 +0000 Subject: [PATCH] - Unbreak fetch, switch to github, simplify port PR: 212849 Submitted by: lightside@gmx.com --- games/osgg/Makefile | 14 ++++----- games/osgg/distinfo | 6 ++-- games/osgg/files/patch-Makefile | 37 ---------------------- games/osgg/files/patch-main.cpp | 54 --------------------------------- 4 files changed, 9 insertions(+), 102 deletions(-) delete mode 100644 games/osgg/files/patch-Makefile delete mode 100644 games/osgg/files/patch-main.cpp diff --git a/games/osgg/Makefile b/games/osgg/Makefile index c199c1c610a3..f905971a983a 100644 --- a/games/osgg/Makefile +++ b/games/osgg/Makefile @@ -4,22 +4,23 @@ PORTNAME= osgg PORTVERSION= 1.0 CATEGORIES= games -MASTER_SITES= SF MAINTAINER= amdmi3@FreeBSD.org COMMENT= OldSkool Gravity Game LICENSE= GPLv3+ -BROKEN= unfetchable (checksum mismatch) +USE_GITHUB= yes +GH_ACCOUNT= DusteDdk +GH_PROJECT= Osgg +GH_TAGNAME= 32d9e02 # 1.0 + extra FreeBSD-related fixes -USES= tar:bzip2 USE_SDL= sdl image ttf mixer USE_GL= gl MAKE_ENV= DATADIR="${DATADIR}/" PLIST_FILES= bin/${PORTNAME} -PORTDATA= * +PORTDATA= *.txt *.ogg Bandal.ttf icon.png levels DESKTOP_ENTRIES="Osgg" \ "" \ @@ -28,11 +29,8 @@ DESKTOP_ENTRIES="Osgg" \ "Game;ArcadeGame;" \ "" -post-extract: - @${RM} -f ${WRKSRC}/osgg ${WRKSRC}/launcher/launcher - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ - cd ${WRKSRC} && ${COPYTREE_SHARE} "*.txt *.ogg Bandal.ttf icon.png levels" ${STAGEDIR}${DATADIR}/ + @cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR}/ .include diff --git a/games/osgg/distinfo b/games/osgg/distinfo index 126826764fb7..2f7e50b6b4fc 100644 --- a/games/osgg/distinfo +++ b/games/osgg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1471280939 -SHA256 (osgg-1.0.tar.bz2) = 59654b2a845883078071eca847a1fd07f0084302c1555a4d9d239155f29d758c -SIZE (osgg-1.0.tar.bz2) = 300614 +TIMESTAMP = 1474370793 +SHA256 (DusteDdk-Osgg-1.0-32d9e02_GH0.tar.gz) = 5d21f7f2608e2b2f43b814e4e1b9fa46b05b18314ba8af0ab15c89302d61e46d +SIZE (DusteDdk-Osgg-1.0-32d9e02_GH0.tar.gz) = 237328 diff --git a/games/osgg/files/patch-Makefile b/games/osgg/files/patch-Makefile deleted file mode 100644 index 89127c35f1b6..000000000000 --- a/games/osgg/files/patch-Makefile +++ /dev/null @@ -1,37 +0,0 @@ ---- 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) diff --git a/games/osgg/files/patch-main.cpp b/games/osgg/files/patch-main.cpp deleted file mode 100644 index cf6d2f00287e..000000000000 --- a/games/osgg/files/patch-main.cpp +++ /dev/null @@ -1,54 +0,0 @@ ---- main.cpp.orig 2016-08-13 02:07:57 UTC -+++ main.cpp -@@ -27,15 +27,18 @@ - #include - #include - #include -+#include // for usleep() - - #include - --#ifndef WIN32 -- #include --#else -+#if defined(WIN32) - typedef unsigned int uint; - #include - #include -+#elif defined(__FreeBSD__) -+ #include -+#else -+ #include - #endif - - -@@ -348,6 +351,7 @@ bool classBullets::col(vector targ - } - } - } -+ return false; - } - - 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: