Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 8 Dec 2021 08:21:12 GMT
From:      Juraj Lutter <otis@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: f98f36ad53e5 - main - games/freesweep: update to 1.0.2
Message-ID:  <202112080821.1B88LCpG080524@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by otis:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f98f36ad53e5fc2ae72f609f192c957e76dd8071

commit f98f36ad53e5fc2ae72f609f192c957e76dd8071
Author:     Robert Clausecker <fuz@fuz.su>
AuthorDate: 2021-12-08 08:19:15 +0000
Commit:     Juraj Lutter <otis@FreeBSD.org>
CommitDate: 2021-12-08 08:19:15 +0000

    games/freesweep: update to 1.0.2
    
    Update to 1.0.2 and while we are here:
    - make portlint happy
    - move scores file to hier(7) directory
    - fix plist issues and move plist to a plist file
    - remove --disable-debug-log which had the opposite effect
    - pass maintainership to fuz@fuz.su as requested by previous maintainer
    
    Upstream fixes:
    - always use "%s"-style format for printf()-style functions
    - fix build with gcc 10
    
    PR:             260233
---
 games/freesweep/Makefile                | 21 ++++++++-------------
 games/freesweep/distinfo                |  5 +++--
 games/freesweep/files/patch-config.h.in |  4 ++--
 games/freesweep/pkg-plist               |  4 ++++
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/games/freesweep/Makefile b/games/freesweep/Makefile
index d54da11fafb1..3e5c10fc395a 100644
--- a/games/freesweep/Makefile
+++ b/games/freesweep/Makefile
@@ -1,40 +1,35 @@
 # Created by: Andrey Zakhvatov
 
 PORTNAME=	freesweep
-PORTVERSION=	1.0.1
+PORTVERSION=	1.0.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	games
 
-MAINTAINER=	rwestlun@gmail.com
+MAINTAINER=	fuz@fuz.su
 COMMENT=	Minesweeper-style game for text-mode terminals
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_FreeBSD_13=	ld: error: duplicate symbol: CharSet
-BROKEN_FreeBSD_14=	ld: error: duplicate symbol: CharSet
-
+USES=		gmake ncurses
 USE_GITHUB=	yes
 GH_ACCOUNT=	rwestlund
 
-USES=		gmake ncurses
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-prefsdir=${DATADIR} \
-		--with-scoresdir=${DATADIR} \
-		--disable-debug-log
+		--with-scoresdir=/var/games
+
 ALL_TARGET=	${PORTNAME}
+MAKE_ARGS=	VERSION='"${PORTVERSION}"'
 
 PORTDOCS=	README.md
-PLIST_FILES=	"@(,games,2555) bin/${PORTNAME}" man/man6/${PORTNAME}.6.gz \
-		%%DATADIR%%/sweeprc "@(,games,0664) %%DATADIR%%/sweeptimes"
-PLIST_DIRS=	%%DATADIR%%
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/freesweep ${STAGEDIR}${PREFIX}/bin
-	@${MKDIR} ${STAGEDIR}${DATADIR}
-	${TOUCH} ${STAGEDIR}${DATADIR}/sweeptimes
+	${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}/var/games
+	${TOUCH} ${STAGEDIR}/var/games/sweeptimes.sample
 	${INSTALL_DATA} ${WRKSRC}/sweeprc ${STAGEDIR}${DATADIR}
 	${INSTALL_MAN} ${WRKSRC}/freesweep.6 ${STAGEDIR}${PREFIX}/man/man6
 
diff --git a/games/freesweep/distinfo b/games/freesweep/distinfo
index 4d731bbc647f..561b80b6814b 100644
--- a/games/freesweep/distinfo
+++ b/games/freesweep/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rwestlund-freesweep-v1.0.1_GH0.tar.gz) = f2b21fef3f547a5b8d663bf3bf9a0c74ad643d9b4043d170c29aa25248705350
-SIZE (rwestlund-freesweep-v1.0.1_GH0.tar.gz) = 93966
+TIMESTAMP = 1638919526
+SHA256 (rwestlund-freesweep-v1.0.2_GH0.tar.gz) = ec9318eec04f8a7ce20c230620f830a17bcf02d8e161866750dfb0c89ff8fe72
+SIZE (rwestlund-freesweep-v1.0.2_GH0.tar.gz) = 93986
diff --git a/games/freesweep/files/patch-config.h.in b/games/freesweep/files/patch-config.h.in
index d58b997c8884..01211ff0ef6c 100644
--- a/games/freesweep/files/patch-config.h.in
+++ b/games/freesweep/files/patch-config.h.in
@@ -1,5 +1,5 @@
---- config.h.in.orig	Wed Nov 12 04:24:48 2003
-+++ config.h.in	Wed Nov 12 04:25:07 2003
+--- config.h.in.orig	2016-02-14 22:00:30 UTC
++++ config.h.in
 @@ -25,7 +25,7 @@
  #undef SCORESDIR
  
diff --git a/games/freesweep/pkg-plist b/games/freesweep/pkg-plist
new file mode 100644
index 000000000000..b64441aebfae
--- /dev/null
+++ b/games/freesweep/pkg-plist
@@ -0,0 +1,4 @@
+@(,games,2555) bin/freesweep
+man/man6/freesweep.6.gz
+%%DATADIR%%/sweeprc
+@sample(,games,0664) /var/games/sweeptimes.sample



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112080821.1B88LCpG080524>