diff options
| author | Fernando Apesteguía <fernape@FreeBSD.org> | 2021-02-05 16:43:15 +0000 |
|---|---|---|
| committer | Fernando Apesteguía <fernape@FreeBSD.org> | 2021-02-05 16:43:15 +0000 |
| commit | 8f1ac4a01ecb7a9e848c93a0a3a3a5afc95e920d (patch) | |
| tree | 89c8479435ec2d4fd4c4ffc36ec83f591f148638 /games/bsdgames | |
| parent | 349cbb905cf4aa51d7f0344bee7fded350f18371 (diff) | |
| download | ports-8f1ac4a01ecb7a9e848c93a0a3a3a5afc95e920d.tar.gz ports-8f1ac4a01ecb7a9e848c93a0a3a3a5afc95e920d.zip | |
games/bsdgames: NO_WERROR fix for FreeBSD 13
* use WITHOUT_WERROR instead of NO_WERROR
* remove noop REINPLACE statements
* moves the wump.info out of the pkg-plist into the Makefile
PR: 252941
Submitted by: jockl@pianojockl.org (maintainer)
Notes
Notes:
svn path=/head/; revision=564133
Diffstat (limited to 'games/bsdgames')
| -rw-r--r-- | games/bsdgames/Makefile | 46 | ||||
| -rw-r--r-- | games/bsdgames/pkg-plist | 1 |
2 files changed, 11 insertions, 36 deletions
diff --git a/games/bsdgames/Makefile b/games/bsdgames/Makefile index ab37e241f37c..b5f513f34dda 100644 --- a/games/bsdgames/Makefile +++ b/games/bsdgames/Makefile @@ -17,45 +17,21 @@ USES= ncurses tar:xz uidfix USE_GITHUB= yes GH_ACCOUNT= pianojockl -CONFLICTS= hangman-[0-9]* +MAKE_ARGS= BINGRP=${BINGRP} +MAKE_ENV= WITHOUT_WERROR=yes CFLAGS+= -fcommon -MAKE_ENV= NO_WERROR=1 -MAKE_ARGS= BINGRP=${BINGRP} -# contain /usr/share/games -SHAREPATH_FILES=atc/atc.6 \ - atc/pathnames.h \ - boggle/boggle/bog.h \ - boggle/boggle/boggle.6 \ - cribbage/cribbage.6 \ - cribbage/pathnames.h \ - fish/pathnames.h \ - larn/pathnames.h \ - quiz/datfiles/index \ - quiz/pathnames.h \ - quiz/quiz.6 \ - wump/pathnames.h +CONFLICTS= hangman-[0-9]* + +INFO= wump +INFO_PATH= share/games -# contain /usr/games/* -GAMESPATH_FILES=backgammon/backgammon/backgammon.6 \ - backgammon/common_source/init.c \ - canfield/canfield/canfield.6 \ - cribbage/cribbage.6 \ - hunt/hunt/hunt.6 \ - hunt/huntd/huntd.6 \ - phantasia/pathnames.h \ - wargames/wargames.sh +.include <bsd.port.pre.mk> -post-patch: - @for f in ${SHAREPATH_FILES}; do \ - ${REINPLACE_CMD} -e 's|/usr/share/games|${PREFIX}/share/games|g' \ - ${WRKSRC}/$${f}; \ - done - @for f in ${GAMESPATH_FILES}; do \ - ${REINPLACE_CMD} -e 's|/usr/games|${PREFIX}/bin|g' \ - ${WRKSRC}/$${f}; \ - done +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300134 +MAKE_ARGS+= NO_WERROR=yes +.endif pre-install: .for d in atc larn quiz.db boggle @@ -75,4 +51,4 @@ post-install: @${TOUCH} ${STAGEDIR}/var/games/atc_score @${FIND} ${STAGEDIR}/var/games -type f -exec ${MV} {} {}.sample \; -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/games/bsdgames/pkg-plist b/games/bsdgames/pkg-plist index fece2b8dfa2d..463b4b033236 100644 --- a/games/bsdgames/pkg-plist +++ b/games/bsdgames/pkg-plist @@ -118,7 +118,6 @@ share/games/quiz.db/spell share/games/quiz.db/state share/games/quiz.db/trek share/games/quiz.db/ucc -share/games/wump.info @sample(,games,0664) /var/games/atc_score.sample @sample(,games,0664) /var/games/battlestar.log.sample @sample(,games,0664) /var/games/cfscores.sample |