From nobody Wed Nov 06 20:14:09 2024 X-Original-To: dev-commits-ports-main@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 4XkGcx6FD6z5bmZC; Wed, 06 Nov 2024 20:14:09 +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 4XkGcx4mmvz40Zb; Wed, 6 Nov 2024 20:14:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730924049; 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=7/UOMzUDt1p/WDgcOtp+jwxxqKflGaq4cdUd5xk5D9E=; b=XfyLxsxMnYxUy9zYrizH+0kGTpLdna/MDsyeI5X9BRTRQn4p0rIAgc8BxGvYWpSNNEpyzu fckiDrjM9iZVHaNEkvXs0CmJe3hrOTL6FZ26p/NxMj7YYgWamf4dAAxMxCSB4KQhkCZR55 C/7obn3Wx4tQbUkbZB1tH29uQz2nd1+a+pzFDgP6GxYFUbR7sfps4qCVou4+0/Epg2kNOn DA5Q0NK0Pqb5YfyEpJFHfYfqCzlggrPcwLVBfS1eMHdY2x9+Dlcfy2asvGo36xYRIfHvgr +iEtTT2DC3Jk6zff/JyL55rJqemDR3ySbID/SGBZWFKSqD9uqmzpkKnXuIRiLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730924049; 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=7/UOMzUDt1p/WDgcOtp+jwxxqKflGaq4cdUd5xk5D9E=; b=pGzyI3A+jhPgMMSa4Nvfhb2O1azcqGTk3XoqVpbFdZaZqB81xa2EtPBXBDMJVONEs+r+uC K7jrPInzbK+gOPTwA0xMiguWuGxnwtrDAYb+lvT/+QTSAMHeNzcVmor060czHyFtv31PVc ikB2TCZEPg8kvgBeiZyjAz4A8DH9mHxFdj1XTAO0ai+XevtflVtkD1Zb737RGvPnBb47P0 1XEXknIpgtQMflwuC1kudIBj2pGEQx60SiMNEKijacfeVfH2nbHZdERxAi6oTWnNVmnVEB 8an/sdrhK8oWEJy7/vSngPRRpsWeyATQ4ohH2O9Oh/KliWFSK4DLDJpjp1CFwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730924049; a=rsa-sha256; cv=none; b=AOhkavRT1NV6SMBwkLxdXbDC5XTdFfgOigWswV12136HjP0lJIp0aS7SAXum4U3KotU2kM lsofQj1Nx0gUCRYpRd2dBJNSLKockIWp12G8WwGCKHFWP3hwX7DJjYJhq6X8SR54dd/wal PI3O9oqrzdZoy6bBPn24DHd7uMYh17NVMynbyFgAJowu85m7Reu/XJ2QUkcoqUJHuIUOCc AjwUU2GSSqvqvNEmIPhxkaswMThbNdbetskLntMYh04R2PgcD4Im0U2sg5vji27JUPo3uw FTYUMurHOsw85yUAhksCm+KYwmgXoo2shJ1xYadZwfvHrtt4HefYE406+m+HWg== 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 4XkGcx3sn1zG5Q; Wed, 6 Nov 2024 20:14:09 +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 4A6KE9LQ001072; Wed, 6 Nov 2024 20:14:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A6KE9Mp001069; Wed, 6 Nov 2024 20:14:09 GMT (envelope-from git) Date: Wed, 6 Nov 2024 20:14:09 GMT Message-Id: <202411062014.4A6KE9Mp001069@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Max Brazhnikov Subject: git: 7d1f7ff4a61b - main - games/glaxium: clean up List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 7d1f7ff4a61bc270832f38b66607d23627bd10a8 Auto-Submitted: auto-generated The branch main has been updated by makc: URL: https://cgit.FreeBSD.org/ports/commit/?id=7d1f7ff4a61bc270832f38b66607d23627bd10a8 commit 7d1f7ff4a61bc270832f38b66607d23627bd10a8 Author: Max Brazhnikov AuthorDate: 2024-11-06 20:13:15 +0000 Commit: Max Brazhnikov CommitDate: 2024-11-06 20:13:15 +0000 games/glaxium: clean up - Add LICENSE - Make dependence on GL and X11 libraries explicit - Regenerate patches - Sort plist --- 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