Attachment #225025 for bug #255346

Lines 627-632 Link Here

(-)b/games/Makefile (+1 lines)
627	SUBDIR += naev-data	627	SUBDIR += naev-data
628	SUBDIR += narcissu2	628	SUBDIR += narcissu2
629	SUBDIR += nazghul	629	SUBDIR += nazghul
		630	SUBDIR += nbsdgames
630	SUBDIR += nehquake	631	SUBDIR += nehquake
631	SUBDIR += neo-cowsay	632	SUBDIR += neo-cowsay
632	SUBDIR += nethack32	633	SUBDIR += nethack32




PORTNAME=	nbsdgames
DISTVERSIONPREFIX=	v
DISTVERSION=	4.1.1
CATEGORIES=	games

MAINTAINER=	fuz@fuz.su
COMMENT=	17 text-based modern games

LICENSE=	CC0-1.0
LICENSE_FILE=	${WRKSRC}/LICENSE

USES=		ncurses

USE_GITHUB=	yes
GH_ACCOUNT=	abakh

CFLAGS+=	-I${NCURSESINC} -I${NCURSESBASE}/include
MAKE_ARGS+=	GAMES_DIR=${PREFIX}/bin \
		SCORES_DIR=/var/games/nbsdgames \
		MAN_DIR=${PREFIX}/share/man/man6

post-install:
.for game in jewels sudoku mines reversi checkers battleship rabbithole sos pipes fifteen memoblocks fisher muncher miketron redsquare darrt snakeduel
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${game}
.endfor

.include <bsd.port.mk>

Added Link Here

(-)b/games/nbsdgames/distinfo (+3 lines)
1	TIMESTAMP = 1621250633
2	SHA256 (abakh-nbsdgames-v4.1.1_GH0.tar.gz) = 85d4de6530ed34a9ac24317a724247162d6839644b2106d494718f37e68e72da
3	SIZE (abakh-nbsdgames-v4.1.1_GH0.tar.gz) = 49596




--- Makefile.orig	2021-05-05 17:39:38 UTC
+++ Makefile
@@ -6,7 +6,7 @@
 GAMES_DIR?=/usr/games
 SCORES_DIR?=/var/games
 MAN_DIR?=/usr/share/man/man6
-CFLAGS+=  -Wno-unused-result -D SCORES_DIR=\"$(SCORES_DIR)\"
+CFLAGS+= ${CPPFLAGS} -Wno-unused-result -D SCORES_DIR=\"$(SCORES_DIR)\"
 LDFLAGS+= -lncurses -lm
 
 
@@ -16,11 +16,11 @@ SCORE_FILES= pipes_scores jewels_scores miketron_score
 all: $(ALL)
 
 scorefiles:
-	for sf in $(SCORE_FILES); do touch $(SCORES_DIR)/$$sf ; chmod 664 $(SCORES_DIR)/$$sf; chown :games $(SCORES_DIR)/$$sf ; done;
-	for game in $(ALL); do chown :games $(GAMES_DIR)/$$game; chmod g+s $(GAMES_DIR)/$$game ; done;
+	mkdir -p ${DESTDIR}${SCORES_DIR}
+	for sf in $(SCORE_FILES); do touch ${DESTDIR}$(SCORES_DIR)/$$sf.sample; done;
 
 manpages:
-	cp man/* $(MAN_DIR)
+	cp man/* ${DESTDIR}$(MAN_DIR)
 jewels: jewels.c config.h common.h
 	$(CC) jewels.c $(LDFLAGS) $(CFLAGS) -o ./jewels
 sudoku: sudoku.c config.h 
@@ -60,6 +60,6 @@ clean:
 	rm $(ALL)
 uninstall:
 	for game in $(ALL); do rm $(GAMES_DIR)/$$game; rm $(MAN_DIR)/$$game.6.gz done;
-install: $(ALL)
-	cp $(ALL) $(GAMES_DIR)
+install: $(ALL) manpages scorefiles
+	cp $(ALL) ${DESTDIR}$(GAMES_DIR)
 

Added Link Here

(-)b/games/nbsdgames/pkg-descr (+11 lines)
1	A collection of terminal games including, Jewels, Sudoku, Mines,
2	Reversi, Checkers, Battleship, SOS, Rabbithole, Pipes, Fifteen,
3	Memoblocks, Fisher, Muncher, Miketron, Redsquare, Darrt, and Snakeduel.
4
5	The difficulty and/or dimensions are adjustable through simple command
6	line options, you can play a minesweeper game that take hours to
7	complete, or exprience hexadecimal sudoku and 8x8 fifteen-like puzzles!
8
9	Play on xterm for best experience.
10
11	WWW: https://github.com/abakh/nbsdgames




bin/battleship
bin/checkers
@(,games,2555) bin/darrt
bin/fifteen
@(,games,2555) bin/fisher
@(,games,2555) bin/jewels
bin/memoblocks
@(,games,2555) bin/miketron
bin/mines
@(,games,2555) bin/muncher
@(,games,2555) bin/pipes
bin/rabbithole
bin/redsquare
bin/reversi
bin/snakeduel
bin/sos
bin/sudoku
@dir(,games) /var/games/nbsdgames
@sample(,games,0664) /var/games/nbsdgames/darrt_scores.sample
@sample(,games,0664) /var/games/nbsdgames/fisher_scores.sample
@sample(,games,0664) /var/games/nbsdgames/jewels_scores.sample
@sample(,games,0664) /var/games/nbsdgames/muncher_scores.sample
@sample(,games,0664) /var/games/nbsdgames/miketron_scores.sample
@sample(,games,0664) /var/games/nbsdgames/pipes_scores.sample
share/man/man6/battleship.6.gz
share/man/man6/checkers.6.gz
share/man/man6/darrt.6.gz
share/man/man6/fifteen.6.gz
share/man/man6/fisher.6.gz
share/man/man6/jewels.6.gz
share/man/man6/memoblocks.6.gz
share/man/man6/miketron.6.gz
share/man/man6/mines.6.gz
share/man/man6/muncher.6.gz
share/man/man6/pipes.6.gz
share/man/man6/rabbithole.6.gz
share/man/man6/redsquare.6.gz
share/man/man6/reversi.6.gz
share/man/man6/snakeduel.6.gz
share/man/man6/sos.6.gz
share/man/man6/sudoku.6.gz

Return to bug 255346

Added Link Here

(-)b/games/nbsdgames/Makefile (+27 lines)
1	PORTNAME= nbsdgames
2	DISTVERSIONPREFIX= v
3	DISTVERSION= 4.1.1
4	CATEGORIES= games
5
6	MAINTAINER= fuz@fuz.su
7	COMMENT= 17 text-based modern games
8
9	LICENSE= CC0-1.0
10	LICENSE_FILE= ${WRKSRC}/LICENSE
11
12	USES= ncurses
13
14	USE_GITHUB= yes
15	GH_ACCOUNT= abakh
16
17	CFLAGS+= -I${NCURSESINC} -I${NCURSESBASE}/include
18	MAKE_ARGS+= GAMES_DIR=${PREFIX}/bin \
19	SCORES_DIR=/var/games/nbsdgames \
20	MAN_DIR=${PREFIX}/share/man/man6
21
22	post-install:
23	.for game in jewels sudoku mines reversi checkers battleship rabbithole sos pipes fifteen memoblocks fisher muncher miketron redsquare darrt snakeduel
24	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${game}
25	.endfor
26
27	.include <bsd.port.mk>

Added Link Here

(-)b/games/nbsdgames/files/patch-Makefile (+35 lines)
1	--- Makefile.orig 2021-05-05 17:39:38 UTC
2	+++ Makefile
3	@@ -6,7 +6,7 @@
4	GAMES_DIR?=/usr/games
5	SCORES_DIR?=/var/games
6	MAN_DIR?=/usr/share/man/man6
7	-CFLAGS+= -Wno-unused-result -D SCORES_DIR=\"$(SCORES_DIR)\"
8	+CFLAGS+= ${CPPFLAGS} -Wno-unused-result -D SCORES_DIR=\"$(SCORES_DIR)\"
9	LDFLAGS+= -lncurses -lm
10
11
12	@@ -16,11 +16,11 @@ SCORE_FILES= pipes_scores jewels_scores miketron_score
13	all: $(ALL)
14
15	scorefiles:
16	- for sf in $(SCORE_FILES); do touch $(SCORES_DIR)/$$sf ; chmod 664 $(SCORES_DIR)/$$sf; chown :games $(SCORES_DIR)/$$sf ; done;
17	- for game in $(ALL); do chown :games $(GAMES_DIR)/$$game; chmod g+s $(GAMES_DIR)/$$game ; done;
18	+ mkdir -p ${DESTDIR}${SCORES_DIR}
19	+ for sf in $(SCORE_FILES); do touch ${DESTDIR}$(SCORES_DIR)/$$sf.sample; done;
20
21	manpages:
22	- cp man/* $(MAN_DIR)
23	+ cp man/* ${DESTDIR}$(MAN_DIR)
24	jewels: jewels.c config.h common.h
25	$(CC) jewels.c $(LDFLAGS) $(CFLAGS) -o ./jewels
26	sudoku: sudoku.c config.h
27	@@ -60,6 +60,6 @@ clean:
28	rm $(ALL)
29	uninstall:
30	for game in $(ALL); do rm $(GAMES_DIR)/$$game; rm $(MAN_DIR)/$$game.6.gz done;
31	-install: $(ALL)
32	- cp $(ALL) $(GAMES_DIR)
33	+install: $(ALL) manpages scorefiles
34	+ cp $(ALL) ${DESTDIR}$(GAMES_DIR)
35

Added Link Here

(-)b/games/nbsdgames/pkg-plist (-1 / +41 lines)
0	-	1	bin/battleship
		2	bin/checkers
		3	@(,games,2555) bin/darrt
		4	bin/fifteen
		5	@(,games,2555) bin/fisher
		6	@(,games,2555) bin/jewels
		7	bin/memoblocks
		8	@(,games,2555) bin/miketron
		9	bin/mines
		10	@(,games,2555) bin/muncher
		11	@(,games,2555) bin/pipes
		12	bin/rabbithole
		13	bin/redsquare
		14	bin/reversi
		15	bin/snakeduel
		16	bin/sos
		17	bin/sudoku
		18	@dir(,games) /var/games/nbsdgames
		19	@sample(,games,0664) /var/games/nbsdgames/darrt_scores.sample
		20	@sample(,games,0664) /var/games/nbsdgames/fisher_scores.sample
		21	@sample(,games,0664) /var/games/nbsdgames/jewels_scores.sample
		22	@sample(,games,0664) /var/games/nbsdgames/muncher_scores.sample
		23	@sample(,games,0664) /var/games/nbsdgames/miketron_scores.sample
		24	@sample(,games,0664) /var/games/nbsdgames/pipes_scores.sample
		25	share/man/man6/battleship.6.gz
		26	share/man/man6/checkers.6.gz
		27	share/man/man6/darrt.6.gz
		28	share/man/man6/fifteen.6.gz
		29	share/man/man6/fisher.6.gz
		30	share/man/man6/jewels.6.gz
		31	share/man/man6/memoblocks.6.gz
		32	share/man/man6/miketron.6.gz
		33	share/man/man6/mines.6.gz
		34	share/man/man6/muncher.6.gz
		35	share/man/man6/pipes.6.gz
		36	share/man/man6/rabbithole.6.gz
		37	share/man/man6/redsquare.6.gz
		38	share/man/man6/reversi.6.gz
		39	share/man/man6/snakeduel.6.gz
		40	share/man/man6/sos.6.gz
		41	share/man/man6/sudoku.6.gz