From owner-svn-ports-all@freebsd.org Tue Feb 16 12:59:28 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D3B6B537612; Tue, 16 Feb 2021 12:59:28 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Dg1Jc3r5lz3q9N; Tue, 16 Feb 2021 12:59:28 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 69CE0113B8; Tue, 16 Feb 2021 12:59:28 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 11GCxSAm015933; Tue, 16 Feb 2021 12:59:28 GMT (envelope-from fernape@FreeBSD.org) Received: (from fernape@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11GCxReJ015931; Tue, 16 Feb 2021 12:59:27 GMT (envelope-from fernape@FreeBSD.org) Message-Id: <202102161259.11GCxReJ015931@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fernape set sender to fernape@FreeBSD.org using -f From: =?UTF-8?Q?Fernando_Apestegu=c3=ada?= Date: Tue, 16 Feb 2021 12:59:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r565398 - branches/2021Q1/games/bsdgames X-SVN-Group: ports-branches X-SVN-Commit-Author: fernape X-SVN-Commit-Paths: branches/2021Q1/games/bsdgames X-SVN-Commit-Revision: 565398 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Feb 2021 12:59:29 -0000 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 +.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 +.include 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