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)

3 files changed, 40 insertions, 19 deletions

diff --git a/games/columns/Makefile b/games/columns/Makefile
index 4a3857b651cc..5db3816f6d18 100644
--- a/games/columns/Makefile
+++ b/games/columns/Makefile
@@ -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>
diff --git a/games/columns/files/patch-columns.cc b/games/columns/files/patch-columns.cc
index 340e665bf71d..e60915f36f99 100644
--- a/games/columns/files/patch-columns.cc
+++ b/games/columns/files/patch-columns.cc
@@ -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 @@
      }
  }
  
diff --git a/games/columns/pkg-plist b/games/columns/pkg-plist
index d168a9b99b77..8f148c1362f5 100644
--- a/games/columns/pkg-plist
+++ b/games/columns/pkg-plist
@@ -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