From nobody Sat Nov 09 13:11:02 2024 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xlx5M0kNHz5c7lS; Sat, 09 Nov 2024 13:11:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xlx5L6h0Bz3xlX; Sat, 9 Nov 2024 13:11:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731157862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MFqDWVMbGy2UaZfkk8Fv5VFoLqKz4JgtbkM3tklvhJs=; b=siEF1tHnjJkXgYmLaH6AVNgkx+OQLm51mkW2VbZJM6Yd+k2+IawtTptrFhJqbgv9ZWUx2b K2Mclb2Dzp+rADJ651magJSflIDCvpkTK10Jw4da9yYmxIuUpDRXnRFbu4U/W8vqsjP7RQ Z8/iS/bkHJlncLV8oTbX73mCf1m7tfjqibeZRXSrMe3BAP7wm+HCVjWnDbnmqh+0Nz2pr0 +BsWSGXy5w6gxqhHSlW7ouvbmBLEY2elDcgQ1EC5wAreb9Dj4qT/civ1ChO4ODJQeOz8Qr lqzk9dWxAK4Kf+R0MbUKsvWji5gUNL4kjKnp5v95d20LgQMaGuWa/ZMks8fejg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731157862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MFqDWVMbGy2UaZfkk8Fv5VFoLqKz4JgtbkM3tklvhJs=; b=jODuk4MFAzoRZSlYrho3x649dvtPXs9Hnrz8se/9dkWOocfJF9bUfjh8W4pWdrOMQJnR1m M0iHY1ylvSCM8Y8I40b/jWmpGFb5MQCmA2xx/AfCatiMGgopD9d6T5yp/IUROlAW8IKte1 QWfdA9EuXcECdbdCKb9KKkXuphTP9SXiOEmLkAVAHBEU4CDMk/G2kJVNcwYYddvk2iIc7a c6HLxbZbuKm3GD5FM9V3i8VfhdnaIJRyy05oEhyH/aeDo0EstyxoS9cx71bDxQT8XmEN+e sgDpmsw2QGmGZtJavxHrKvk7K7bv0KsUtDk8kaVkcBRqrJ/zh6FC20yrCjyLYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731157862; a=rsa-sha256; cv=none; b=sPM79/d3fnyrB755PKL8nqQXu5OFw/6dhZm5Hgm/OWfsydrBaEx6GV3ybnD1Wr1iIExpeH G+DWDhMO1c+WlXXj7ykYXjKF5Vy4j/AppSRPCWHlXc2A7h50BUr7HRHryFNONglpkuktLe 4Fc6yjfxUVdjcl9wq67iACepjMoJvO9LutcUWq7xmpYtm6rFncAQE0COIOVLOtyNE7y/4I xWIk+Z1IU7h2AEfmK8KMgfONjWvjAspzSOcRpQduJTLkAAtLIqHeYHv1wgwG5SvvoUozqK Xw8mw7leoDFbeRbHQ51jHNbv4r+MS/TA5ufPPu/17TpGryRja1QqrycHVTT3fg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xlx5L62knz1F1t; Sat, 9 Nov 2024 13:11:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A9DB2Mu044748; Sat, 9 Nov 2024 13:11:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A9DB2iu044745; Sat, 9 Nov 2024 13:11:02 GMT (envelope-from git) Date: Sat, 9 Nov 2024 13:11:02 GMT Message-Id: <202411091311.4A9DB2iu044745@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Max Brazhnikov Subject: git: 048072727661 - 2024Q4 - games/glaxium: clean up List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: makc X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q4 X-Git-Reftype: branch X-Git-Commit: 048072727661eedd9a460e307079ff6cf208c3a9 Auto-Submitted: auto-generated The branch 2024Q4 has been updated by makc: URL: https://cgit.FreeBSD.org/ports/commit/?id=048072727661eedd9a460e307079ff6cf208c3a9 commit 048072727661eedd9a460e307079ff6cf208c3a9 Author: Max Brazhnikov AuthorDate: 2024-11-09 13:10:27 +0000 Commit: Max Brazhnikov 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