diff --git a/games/nbsdgames/Makefile b/games/nbsdgames/Makefile index e4f393633d90..0b813979c796 100644 --- a/games/nbsdgames/Makefile +++ b/games/nbsdgames/Makefile @@ -1,45 +1,50 @@ PORTNAME= nbsdgames DISTVERSIONPREFIX= v -DISTVERSION= 4.1.2 +DISTVERSION= 5 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 MAKE_ARGS+= GAMES_DIR=${PREFIX}/bin \ MAN_DIR=${PREFIX}/share/man/man6 \ SCORES_DIR=/var/games/nbsdgames CFLAGS+= --std=c99 -I${NCURSESINC} -I${NCURSESBASE}/include _GAMES= battleship \ checkers \ darrt \ fifteen \ fisher \ jewels \ memoblocks \ miketron \ mines \ muncher \ + nbsdgames \ pipes \ rabbithole \ redsquare \ reversi \ snakeduel \ sos \ sudoku \ + tugow post-install: + ${INSTALL_DATA} ${WRKSRC}/nbsdgames.desktop ${STAGEDIR}${PREFIX}/share/applications/ + ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/ + ${INSTALL_DATA} ${WRKSRC}/nbsdgames.svg ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/ .for game in ${_GAMES} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${game} .endfor .include diff --git a/games/nbsdgames/distinfo b/games/nbsdgames/distinfo index ce609fb54b8d..31e47d0a287d 100644 --- a/games/nbsdgames/distinfo +++ b/games/nbsdgames/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1626652244 -SHA256 (abakh-nbsdgames-v4.1.2_GH0.tar.gz) = b4ba777791274af7db13d2827b254cf998a757468e119c6ee106ccbeafcd04c1 -SIZE (abakh-nbsdgames-v4.1.2_GH0.tar.gz) = 49789 +TIMESTAMP = 1643821944 +SHA256 (abakh-nbsdgames-v5_GH0.tar.gz) = ca81d8b854a7bf9685bbc58aabc1a24cd617cadb7e9ddac64a513d2c8ddb2e6c +SIZE (abakh-nbsdgames-v5_GH0.tar.gz) = 58893 diff --git a/games/nbsdgames/files/patch-Makefile b/games/nbsdgames/files/patch-Makefile index 9d27d42dde0c..120948dc87bf 100644 --- a/games/nbsdgames/files/patch-Makefile +++ b/games/nbsdgames/files/patch-Makefile @@ -1,35 +1,37 @@ ---- Makefile.orig 2021-05-07 00:50:08 UTC +--- Makefile.orig 2022-02-02 12:39:13 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} -D SCORES_DIR=\"$(SCORES_DIR)\" LDFLAGS+= -lncurses -lm @@ -16,11 +16,11 @@ SCORE_FILES= pipes_scores jewels_scores miketron_score - all: $(ALL) + 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; +- for game in $(ALL); do chown :games $(GAMES_DIR)/$$game; chmod g $(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) +@@ -66,8 +66,8 @@ clean: + for game in $(ALL); do rm $$game; done; uninstall: - for game in $(ALL); do rm $(GAMES_DIR)/$$game; rm $(MAN_DIR)/$$game.6.gz done; + for game in $(ALL); do rm $(GAMES_DIR)/$$game; rm $(MAN_DIR)/$$game.6.gz ;done; -install: $(ALL) -- cp $(ALL) $(GAMES_DIR) +- cp $(ALL) $(GAMES_DIR) +install: $(ALL) manpages scorefiles -+ cp $(ALL) ${DESTDIR}$(GAMES_DIR) ++ cp $(ALL) ${DESTDIR}$(GAMES_DIR) + test: + for game in $(ALL); do ./$$game ;done; diff --git a/games/nbsdgames/pkg-plist b/games/nbsdgames/pkg-plist index ac26f2075057..528cdc899286 100644 --- a/games/nbsdgames/pkg-plist +++ b/games/nbsdgames/pkg-plist @@ -1,41 +1,46 @@ 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 +bin/nbsdgames @(,games,2555) bin/pipes bin/rabbithole bin/redsquare bin/reversi bin/snakeduel bin/sos bin/sudoku +@(,games,2555) bin/tugow @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 +@sample(,games,0664) /var/games/nbsdgames/tugow_scores.sample +share/applications/nbsdgames.desktop +share/icons/hicolor/scalable/apps/nbsdgames.svg 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