git: 3e217af8119e - main - games/freebee: update 1.7 → 2.0

The branch main has been updated by amdmi3:

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

commit 3e217af8119e6d3ecc6d38e26223b0ef1ccee886
Author:     Dmitry Marakasov <amdmi3@FreeBSD.org>
AuthorDate: 2022-03-05 15:04:38 +0000
Commit:     Dmitry Marakasov <amdmi3@FreeBSD.org>
CommitDate: 2022-03-05 15:10:41 +0000

    games/freebee: update 1.7 → 2.0
---
 games/freebee/Makefile             |  4 +++-
 games/freebee/distinfo             |  6 +++---
 games/freebee/files/patch-Makefile | 30 ++++++++++++------------------
 games/freebee/pkg-plist            |  3 ---
 4 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/games/freebee/Makefile b/games/freebee/Makefile
index b080db8e4e90..93727ae974df 100644
--- a/games/freebee/Makefile
+++ b/games/freebee/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	freebee
 DISTVERSIONPREFIX=	${PORTNAME}-
-DISTVERSION=	1.7
+DISTVERSION=	2.0
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
@@ -18,6 +18,8 @@ GH_PROJECT=	console-client
 
 PORTDOCS=	README.md
 
+PLIST_FILES=	bin/freebee share/man/man6/freebee.6.gz
+
 OPTIONS_DEFINE=	DOCS
 
 post-install-DOCS-on:
diff --git a/games/freebee/distinfo b/games/freebee/distinfo
index c942c9f53674..aa26d2f6765f 100644
--- a/games/freebee/distinfo
+++ b/games/freebee/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1620327621
-SHA256 (freebee-game-console-client-freebee-1.7_GH0.tar.gz) = a239520a4f10f5206e81a219d1cc7d3056f668b7119934d074fb8c65999244c3
-SIZE (freebee-game-console-client-freebee-1.7_GH0.tar.gz) = 453839
+TIMESTAMP = 1646491453
+SHA256 (freebee-game-console-client-freebee-2.0_GH0.tar.gz) = 25dd752d92ea5f3e57d491927a75327a4ee838002b22586540ae92473f048db0
+SIZE (freebee-game-console-client-freebee-2.0_GH0.tar.gz) = 9079
diff --git a/games/freebee/files/patch-Makefile b/games/freebee/files/patch-Makefile
index 2edc9d571b40..042848259419 100644
--- a/games/freebee/files/patch-Makefile
+++ b/games/freebee/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2020-07-28 01:02:14 UTC
+--- Makefile.orig	2022-02-20 17:47:34 UTC
 +++ Makefile
-@@ -2,18 +2,18 @@
+@@ -2,30 +2,30 @@
  
  CC ?=		cc
  CFLAGS ?=	-O2 -pipe
@@ -8,22 +8,20 @@
 +CFLAGS +=	-I${LOCALBASE}/include
  
  # Remove if your system doesn't have
- # arc4random_uniform(3) and/or strlcat(3)
- # Same with pledge(2) and/or unveil(2)
+ # arc4random_uniform(3), strlcat(3), and/or strtonum(3)
+ # Same with pledge(2)
  CFLAGS +=	-DHAVE_ARC4RANDOM_UNIFORM -DHAVE_STRLCAT
--CFLAGS +=	-DHAVE_PLEDGE -DHAVE_UNVEIL
-+#CFLAGS +=	-DHAVE_PLEDGE -DHAVE_UNVEIL
- 
- # Uncomment if you don't want to install
- # or if you plan to install the dictionary somewhere
- # other than /usr/local/share/freebee/enable1.txt
--#CFLAGS +=	-DDICTIONARY="\"enable1.txt\""
-+CFLAGS +=	-DDICTIONARY="\"${SHAREDIR}/enable1.txt\""
+-CFLAGS +=	-DHAVE_STRTONUM -DHAVE_PLEDGE
++CFLAGS +=	-DHAVE_STRTONUM
  
  PREFIX ?=	/usr/local
  BINDIR ?=	${PREFIX}/bin
-@@ -25,15 +25,15 @@ OBJS =	anagram.o arc4random_uniform.o dir.o game.o mai
- 	strlcat.o
+-MANDIR ?=	${PREFIX}/man/man6
++MANDIR ?=	${PREFIX}/share/man/man6
+ 
+ PROG =	freebee
+ OBJS =	anagram.o arc4random_uniform.o dir.o game.o main.o net.o rank.o \
+ 	strlcat.o strtonum.o
  
  all: ${OBJS}
 -	${CC} ${LDFLAGS} -o ${PROG} ${OBJS} -lncurses -L/usr/local/lib -lcurl
@@ -32,16 +30,12 @@
  install:
 -	/usr/bin/install -d -m 755 ${BINDIR}
 -	/usr/bin/install -d -m 755 ${MANDIR}
--	/usr/bin/install -d -m 755 ${SHAREDIR}
 -	/usr/bin/install -c -s -m 555 freebee ${BINDIR}
 -	/usr/bin/install -c -m 444 freebee.6 ${MANDIR}
--	/usr/bin/install -c -m 444 enable1.txt ${SHAREDIR}
 +	/usr/bin/install -d -m 755 ${DESTDIR}${BINDIR}
 +	/usr/bin/install -d -m 755 ${DESTDIR}${MANDIR}
-+	/usr/bin/install -d -m 755 ${DESTDIR}${SHAREDIR}
 +	/usr/bin/install -c -s -m 555 freebee ${DESTDIR}${BINDIR}
 +	/usr/bin/install -c -m 444 freebee.6 ${DESTDIR}${MANDIR}
-+	/usr/bin/install -c -m 444 enable1.txt ${DESTDIR}${SHAREDIR}
  
  clean:
  	rm -f ${PROG} ${OBJS} ${PROG}.core
diff --git a/games/freebee/pkg-plist b/games/freebee/pkg-plist
deleted file mode 100644
index 0e9a24516aa1..000000000000
--- a/games/freebee/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/freebee
-man/man6/freebee.6.gz
-%%DATADIR%%/enable1.txt