Date: Sat, 9 Nov 2024 13:11:02 GMT From: Max Brazhnikov <makc@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 048072727661 - 2024Q4 - games/glaxium: clean up Message-ID: <202411091311.4A9DB2iu044745@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2024Q4 has been updated by makc: URL: https://cgit.FreeBSD.org/ports/commit/?id=048072727661eedd9a460e307079ff6cf208c3a9 commit 048072727661eedd9a460e307079ff6cf208c3a9 Author: Max Brazhnikov <makc@FreeBSD.org> AuthorDate: 2024-11-09 13:10:27 +0000 Commit: Max Brazhnikov <makc@FreeBSD.org> CommitDate: 2024-11-09 13:10:27 +0000 games/glaxium: clean up - Add LICENSE - Make dependence on GL and X11 libraries explicit - Regenerate patches - Sort plist (cherry picked from commit 7d1f7ff4a61bc270832f38b66607d23627bd10a8) --- games/glaxium/Makefile | 12 +++++++----- games/glaxium/files/patch-Makefile.in | 14 +++++++++----- games/glaxium/files/patch-scene.cpp | 6 +++--- games/glaxium/files/patch-variables.cpp | 6 +++--- games/glaxium/pkg-plist | 2 +- 5 files changed, 23 insertions(+), 17 deletions(-) diff --git a/games/glaxium/Makefile b/games/glaxium/Makefile index 5c998a94baa6..1d3c8a06cfa6 100644 --- a/games/glaxium/Makefile +++ b/games/glaxium/Makefile @@ -1,6 +1,6 @@ PORTNAME= glaxium PORTVERSION= 0.5 -PORTREVISION= 19 +PORTREVISION= 20 CATEGORIES= games MASTER_SITES= http://xhosxe.free.fr/glaxium/ DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -9,11 +9,15 @@ MAINTAINER= ports@FreeBSD.org COMMENT= OpenGL based space-ship "shoot-em-up" game WWW= http://xhosxe.free.fr/glaxium/ +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/LICENSE + LIB_DEPENDS= libpng.so:graphics/png -USES= dos2unix gl gmake sdl +USES= dos2unix gl gmake sdl xorg USE_SDL= sdl mixer -USE_GL= glut +USE_GL= gl glu glut +USE_XORG= x11 xi xmu GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX=${PREFIX}/share ALL_TARGET= ${PORTNAME} @@ -30,8 +34,6 @@ DESKTOP_ENTRIES= "Glaxium" \ post-patch: @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g; \ s|/games/glaxium|/glaxium|g' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|gcc -g -o|$$(CC) -o|g ; \ - s|/games/glaxium|/glaxium|g' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|Scratcher:: Scratcher|Scratcher|g' \ ${WRKSRC}/scratcher.hpp @${REINPLACE_CMD} -e 's|TankFire::TankFire|TankFire|g' \ diff --git a/games/glaxium/files/patch-Makefile.in b/games/glaxium/files/patch-Makefile.in index 37ff8100794c..a47d9bd97be7 100644 --- a/games/glaxium/files/patch-Makefile.in +++ b/games/glaxium/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- ./Makefile.in.orig 2002-10-20 18:30:12.000000000 +0000 -+++ ./Makefile.in 2013-10-22 22:38:44.900225905 +0000 -@@ -13,10 +13,10 @@ +--- Makefile.in.orig 2002-10-20 18:30:12 UTC ++++ Makefile.in +@@ -13,13 +13,13 @@ mandir=@mandir@ bindir=@bindir@ mandir=@mandir@ @@ -9,8 +9,12 @@ DATA_DIRS=samples textures -GLAXIUM_HOME=$(datadir)/games/glaxium -MAN_DIR=$(mandir) -+GLAXIUM_HOME=$(DESTDIR)$(datadir)/games/glaxium ++GLAXIUM_HOME=$(DESTDIR)$(datadir)/glaxium +MAN_DIR=$(DESTDIR)$(mandir) glaxium : $(OBJ) - gcc -g -o glaxium $(OBJ) $(LIB) +- gcc -g -o glaxium $(OBJ) $(LIB) ++ $(CC) -o glaxium $(OBJ) $(LIB) + + + diff --git a/games/glaxium/files/patch-scene.cpp b/games/glaxium/files/patch-scene.cpp index 3b55656d3d70..b989bece62df 100644 --- a/games/glaxium/files/patch-scene.cpp +++ b/games/glaxium/files/patch-scene.cpp @@ -1,6 +1,6 @@ ---- ./scene.cpp.orig Thu Oct 10 16:57:58 2002 -+++ ./scene.cpp Sat Jul 21 17:54:40 2007 -@@ -2361,7 +2361,7 @@ +--- scene.cpp.orig 2024-11-06 19:04:58 UTC ++++ scene.cpp +@@ -2361,7 +2361,7 @@ void Scene::menuIdle() oldTimer = newTimer; globalList->move() ; #ifndef PI diff --git a/games/glaxium/files/patch-variables.cpp b/games/glaxium/files/patch-variables.cpp index 7f38c9925099..689ca4a4ff36 100644 --- a/games/glaxium/files/patch-variables.cpp +++ b/games/glaxium/files/patch-variables.cpp @@ -1,6 +1,6 @@ ---- ./variables.cpp.orig Fri Oct 18 01:53:00 2002 -+++ ./variables.cpp Sat Jul 21 17:51:10 2007 -@@ -453,6 +453,7 @@ +--- variables.cpp.orig 2024-11-06 19:04:58 UTC ++++ variables.cpp +@@ -453,6 +453,7 @@ char* GlaxiumVariables::getFullOptionsPath() { static char strReturn[1024]; strcpy(strReturn, getenv("HOME")); strcat(strReturn, "/.glaxiumrc"); diff --git a/games/glaxium/pkg-plist b/games/glaxium/pkg-plist index e28bd62ffc4f..f32bcaa07c52 100644 --- a/games/glaxium/pkg-plist +++ b/games/glaxium/pkg-plist @@ -1,5 +1,4 @@ bin/glaxium -share/man/man6/glaxium.6.gz %%DATADIR%%/samples/detection.wav %%DATADIR%%/samples/explode1.wav %%DATADIR%%/samples/explode2.wav @@ -57,3 +56,4 @@ share/man/man6/glaxium.6.gz %%DATADIR%%/textures/sphere.png %%DATADIR%%/textures/tache.png %%DATADIR%%/textures/thunder.png +share/man/man6/glaxium.6.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202411091311.4A9DB2iu044745>