From owner-svn-ports-all@freebsd.org Mon Oct 31 17:10:54 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1A6BBC2867B; Mon, 31 Oct 2016 17:10:54 +0000 (UTC) (envelope-from adamw@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 mx1.freebsd.org (Postfix) with ESMTPS id D16DA1AD0; Mon, 31 Oct 2016 17:10:53 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9VHArsw088945; Mon, 31 Oct 2016 17:10:53 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9VHAqa4088939; Mon, 31 Oct 2016 17:10:52 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201610311710.u9VHAqa4088939@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Mon, 31 Oct 2016 17:10:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r425015 - in head/games/bsdgames: . files X-SVN-Group: ports-head 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.23 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: Mon, 31 Oct 2016 17:10:54 -0000 Author: adamw Date: Mon Oct 31 17:10:52 2016 New Revision: 425015 URL: https://svnweb.freebsd.org/changeset/ports/425015 Log: Update to the sources from DragonflyBSD 4.6.1. We lost piano(6), but gained two vitally important tools: colorbars(6), which displays a couple colors in the terminal, and hals_end(6), which displays a script of HAL's final words. Added: head/games/bsdgames/files/patch-colorbars_colorbars.c (contents, props changed) Modified: head/games/bsdgames/Makefile head/games/bsdgames/distinfo head/games/bsdgames/files/patch-Makefile head/games/bsdgames/pkg-plist Modified: head/games/bsdgames/Makefile ============================================================================== --- head/games/bsdgames/Makefile Mon Oct 31 17:07:19 2016 (r425014) +++ head/games/bsdgames/Makefile Mon Oct 31 17:10:52 2016 (r425015) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= bsdgames -PORTVERSION= 4.4.2 -PORTREVISION= 1 +PORTVERSION= 4.6.1 PORTEPOCH= 1 CATEGORIES= games MASTER_SITES= LOCAL/adamw @@ -15,7 +14,7 @@ LICENSE= BSD3CLAUSE CONFLICTS= hangman-[0-9]* -USES= uidfix tar:xz +USES= ncurses tar:xz uidfix MAKE_ENV+= NO_WERROR=1 MAKE_ARGS= BINGRP=${BINGRP} @@ -45,6 +44,8 @@ GAMESPATH_FILES=backgammon/backgammon/ba SGID_BINARIES= atc battlestar canfield/canfield cribbage hack phantasia \ robots sail snake/snake +.include + post-patch: @${REINPLACE_CMD} -e "s/NOMAN/NO_MAN/" \ ${WRKSRC}/backgammon/teachgammon/Makefile \ @@ -66,6 +67,10 @@ post-patch: done @${REINPLACE_CMD} -e "s/getline/get_line/g" ${WRKSRC}/cribbage/io.c \ ${WRKSRC}/cribbage/crib.c ${WRKSRC}/cribbage/cribbage.h +.if ${OPSYS} == "FreeBSD" + @${FIND} ${WRKSRC} -type f -name Makefile \ + | ${XARGS} ${REINPLACE_CMD} -e 's/-lprivate_ncurses/-lncurses/' +.endif pre-install: .for d in atc larn quiz.db @@ -92,4 +97,4 @@ dist: tar -cvf bsdgames-${PORTVERSION}.tar bsdgames-${PORTVERSION} xz -v bsdgames-${PORTVERSION}.tar -.include +.include Modified: head/games/bsdgames/distinfo ============================================================================== --- head/games/bsdgames/distinfo Mon Oct 31 17:07:19 2016 (r425014) +++ head/games/bsdgames/distinfo Mon Oct 31 17:10:52 2016 (r425015) @@ -1,2 +1,3 @@ -SHA256 (bsdgames-4.4.2.tar.xz) = a628a6cf2608b7c6b9f00e402fd60a349f8f7fde00e67713cc39a214f97d730b -SIZE (bsdgames-4.4.2.tar.xz) = 1750804 +TIMESTAMP = 1477932679 +SHA256 (bsdgames-4.6.1.tar.xz) = 4ecb06ac99728933a38c375035a60432eb3f861fdcbd594c9d69e53009d36f9b +SIZE (bsdgames-4.6.1.tar.xz) = 1738852 Modified: head/games/bsdgames/files/patch-Makefile ============================================================================== --- head/games/bsdgames/files/patch-Makefile Mon Oct 31 17:07:19 2016 (r425014) +++ head/games/bsdgames/files/patch-Makefile Mon Oct 31 17:10:52 2016 (r425015) @@ -1,6 +1,6 @@ ---- Makefile.orig 2009-09-24 10:46:30.000000000 +0200 -+++ Makefile 2009-11-04 18:14:08.698185298 +0100 -@@ -8,32 +8,20 @@ +--- Makefile.orig 2016-10-31 16:52:06 UTC ++++ Makefile +@@ -8,33 +8,21 @@ SUBDIR= adventure \ atc \ backgammon \ battlestar \ @@ -9,12 +9,14 @@ - caesar \ canfield \ cribbage \ + colorbars \ - dm \ - factor \ fish \ - fortune \ - grdc \ hack \ + hals_end \ hangman \ hunt \ larn \ @@ -22,7 +24,6 @@ - morse \ - number \ phantasia \ - piano \ pig \ - pom \ - ppt \ Added: head/games/bsdgames/files/patch-colorbars_colorbars.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/bsdgames/files/patch-colorbars_colorbars.c Mon Oct 31 17:10:52 2016 (r425015) @@ -0,0 +1,13 @@ +--- colorbars/colorbars.c.orig 2016-10-31 17:00:48 UTC ++++ colorbars/colorbars.c +@@ -31,6 +31,10 @@ + #include + #include + ++#ifndef __arysize ++#define __arysize(n) (sizeof(n)/sizeof((n)[0])) ++#endif ++ + int + main(void) + { Modified: head/games/bsdgames/pkg-plist ============================================================================== --- head/games/bsdgames/pkg-plist Mon Oct 31 17:07:19 2016 (r425014) +++ head/games/bsdgames/pkg-plist Mon Oct 31 17:10:52 2016 (r425015) @@ -6,16 +6,17 @@ bin/backgammon bin/bs-game @(,games,2555) bin/canfield bin/cfscores +bin/colorbars @(,games,2555) bin/cribbage bin/fish-game @(,games,2555) bin/hack +bin/hals_end bin/hangman bin/hunt bin/huntd bin/larn bin/mille @(,games,2555) bin/phantasia -bin/piano bin/pig bin/quiz bin/rain @@ -38,16 +39,17 @@ man/man6/battlestar.6.gz man/man6/bs-game.6.gz man/man6/canfield.6.gz man/man6/cfscores.6.gz +man/man6/colorbars.6.gz man/man6/cribbage.6.gz man/man6/fish-game.6.gz man/man6/hack.6.gz +man/man6/hals_end.6.gz man/man6/hangman.6.gz man/man6/hunt.6.gz man/man6/huntd.6.gz man/man6/larn.6.gz man/man6/mille.6.gz man/man6/phantasia.6.gz -man/man6/piano.6.gz man/man6/pig.6.gz man/man6/quiz.6.gz man/man6/rain.6.gz