From owner-svn-ports-all@FreeBSD.ORG Wed Dec 10 23:43:04 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2F2674BF; Wed, 10 Dec 2014 23:43:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 1B915822; Wed, 10 Dec 2014 23:43:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBANh3g6097812; Wed, 10 Dec 2014 23:43:03 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBANh3Nb097809; Wed, 10 Dec 2014 23:43:03 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201412102343.sBANh3Nb097809@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 10 Dec 2014 23:43:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r374498 - in branches/2014Q4/games/columns: . files X-SVN-Group: ports-branches 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.18-1 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: Wed, 10 Dec 2014 23:43:04 -0000 Author: amdmi3 Date: Wed Dec 10 23:43:02 2014 New Revision: 374498 URL: https://svnweb.freebsd.org/changeset/ports/374498 QAT: https://qat.redports.org/buildarchive/r374498/ Log: MFH: r373734 - Clarify LICENSE - Add LICENSE_FILE - Simplify MASTER_SITES - Add distfile mirror - Move highscores to /var/games, use @sample to handle them - Fix font rendering - Drop @dirrm* from plist Approved by: ports-secteam (rea) Modified: branches/2014Q4/games/columns/Makefile branches/2014Q4/games/columns/files/patch-columns.cc (contents, props changed) branches/2014Q4/games/columns/pkg-plist Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/games/columns/Makefile ============================================================================== --- branches/2014Q4/games/columns/Makefile Wed Dec 10 23:41:28 2014 (r374497) +++ branches/2014Q4/games/columns/Makefile Wed Dec 10 23:43:02 2014 (r374498) @@ -3,17 +3,18 @@ PORTNAME= columns PORTVERSION= 1.2b -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= games # mastersite disappeared in December 2000 -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= thierry +MASTER_SITES= LOCAL/thierry \ + http://mirror.amdmi3.ru/distfiles/ DISTNAME= Columns-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Nice little implementation of columns game for X Window System -LICENSE= GPLv2 +LICENSE= GPLv2 # or later +LICENSE_FILE= ${WRKSRC}/COPYING USE_SDL= sdl GNU_CONFIGURE= yes @@ -29,5 +30,7 @@ post-configure: post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}/var/games + ${MV} ${STAGEDIR}${DATADIR}/columns.hsc ${STAGEDIR}/var/games/columns.hsc.sample .include Modified: branches/2014Q4/games/columns/files/patch-columns.cc ============================================================================== --- branches/2014Q4/games/columns/files/patch-columns.cc Wed Dec 10 23:41:28 2014 (r374497) +++ branches/2014Q4/games/columns/files/patch-columns.cc Wed Dec 10 23:43:02 2014 (r374498) @@ -1,15 +1,10 @@ - -$FreeBSD$ - ---- columns.cc.orig 2000-03-17 04:52:55.000000000 +0400 -+++ columns.cc 2013-06-13 15:21:46.472644056 +0400 -@@ -22,10 +22,12 @@ +--- columns.cc.orig 2000-03-17 03:52:55.000000000 +0300 ++++ columns.cc 2014-12-02 05:13:18.850698698 +0300 +@@ -22,10 +22,9 @@ #include #include #include -+#ifndef __STDC__ - #include -+#endif +-#include #include #include -#include @@ -17,7 +12,33 @@ $FreeBSD$ #define HIGHSCORE_X 10 #define HIGHSCORE_Y 30 -@@ -1365,6 +1367,7 @@ void eval_args(int argc, char **argv) +@@ -269,6 +268,7 @@ + for (int i=0; i<256; i++) { + data[i] = NULL; + fnt->w[i] = fnt->h[i]= fnt->x[i] = 0; ++ fnt->strut = 0; + } + + // read character chunks one by one +@@ -357,7 +357,7 @@ + + void highscore_save() + { +- char *fname = find_datafile("columns.hsc"); ++ char *fname = "/var/games/columns.hsc"; + FILE *fp = fopen(fname,"wb"); + if (fp != NULL) { + for (int i=0; i