Date: Wed, 10 Dec 2014 23:43:03 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> 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 Message-ID: <201412102343.sBANh3Nb097809@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.port.mk> 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 <stdarg.h> #include <stdio.h> #include <string.h> -+#ifndef __STDC__ - #include <malloc.h> -+#endif +-#include <malloc.h> #include <stdlib.h> #include <time.h> -#include <SDL/SDL.h> @@ -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<HIGHSCORE_ENTRIES; i++) +@@ -369,7 +369,7 @@ + void highscore_load() + { + char line[30]; +- char *fname = find_datafile("columns.hsc"); ++ char *fname = "/var/games/columns.hsc"; + FILE *fp = fopen(fname,"rb"); + if (fp != NULL) { + for (int i=0; i<HIGHSCORE_ENTRIES; i++) { +@@ -1365,6 +1365,7 @@ } } Modified: branches/2014Q4/games/columns/pkg-plist ============================================================================== --- branches/2014Q4/games/columns/pkg-plist Wed Dec 10 23:41:28 2014 (r374497) +++ branches/2014Q4/games/columns/pkg-plist Wed Dec 10 23:43:02 2014 (r374498) @@ -1,11 +1,8 @@ -bin/columns +@(,games,2555) bin/columns %%DATADIR%%/applause.wav %%DATADIR%%/bg.bmp %%DATADIR%%/big.fnt %%DATADIR%%/bye.wav -@mode 0666 -%%DATADIR%%/columns.hsc -@mode %%DATADIR%%/drop.wav %%DATADIR%%/hello.wav %%DATADIR%%/laugh.wav @@ -17,4 +14,4 @@ bin/columns %%DATADIR%%/rotate.wav %%DATADIR%%/small.fnt %%DATADIR%%/tiles.bmp -@dirrm %%DATADIR%% +@sample(,games,664) /var/games/columns.hsc.sample
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412102343.sBANh3Nb097809>