Date: Tue, 16 Feb 2021 12:59:27 +0000 (UTC) From: =?UTF-8?Q?Fernando_Apestegu=c3=ada?= <fernape@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r565398 - branches/2021Q1/games/bsdgames Message-ID: <202102161259.11GCxReJ015931@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: fernape Date: Tue Feb 16 12:59:27 2021 New Revision: 565398 URL: https://svnweb.freebsd.org/changeset/ports/565398 Log: MFH: r564133 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) Modified: branches/2021Q1/games/bsdgames/Makefile branches/2021Q1/games/bsdgames/pkg-plist Directory Properties: branches/2021Q1/ (props changed) Modified: branches/2021Q1/games/bsdgames/Makefile ============================================================================== --- branches/2021Q1/games/bsdgames/Makefile Tue Feb 16 12:26:24 2021 (r565397) +++ branches/2021Q1/games/bsdgames/Makefile Tue Feb 16 12:59:27 2021 (r565398) @@ -17,46 +17,22 @@ 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]* -# 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 +INFO= wump +INFO_PATH= share/games -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 +.include <bsd.port.pre.mk> +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300134 +MAKE_ARGS+= NO_WERROR=yes +.endif + pre-install: .for d in atc larn quiz.db boggle @${MKDIR} ${STAGEDIR}${PREFIX}/share/games/$d @@ -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> Modified: branches/2021Q1/games/bsdgames/pkg-plist ============================================================================== --- branches/2021Q1/games/bsdgames/pkg-plist Tue Feb 16 12:26:24 2021 (r565397) +++ branches/2021Q1/games/bsdgames/pkg-plist Tue Feb 16 12:59:27 2021 (r565398) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202102161259.11GCxReJ015931>