Index: head/games/columns/Makefile
===================================================================
--- head/games/columns/Makefile	(revision 416707)
+++ head/games/columns/Makefile	(revision 416708)
@@ -1,36 +1,38 @@
 # Created by: Andrey Zakhvatov
 # $FreeBSD$
 
 PORTNAME=	columns
 PORTVERSION=	1.2b
 PORTREVISION=	9
 CATEGORIES=	games
 # mastersite disappeared in December 2000
 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_FILE=	${WRKSRC}/COPYING
 
 USE_SDL=	sdl
 GNU_CONFIGURE=	yes
 
 DATADIR=	${PREFIX}/share/Columns
 PORTDOCS=	README
 
 OPTIONS_DEFINE=	DOCS
 
 post-configure:
 	@${REINPLACE_CMD} -e '/chmod 0666/d' ${WRKSRC}/Makefile
 
 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
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/games/columns/files/patch-columns.cc
===================================================================
--- head/games/columns/files/patch-columns.cc	(revision 416707)
+++ head/games/columns/files/patch-columns.cc	(revision 416708)
@@ -1,48 +1,48 @@
---- columns.cc.orig	2000-03-17 03:52:55.000000000 +0300
-+++ columns.cc	2014-12-02 05:13:18.850698698 +0300
+--- columns.cc.orig	2000-03-17 00:52:55 UTC
++++ columns.cc
 @@ -22,10 +22,9 @@
  #include <stdarg.h>
  #include <stdio.h>
  #include <string.h>
 -#include <malloc.h>
  #include <stdlib.h>
  #include <time.h>
 -#include <SDL/SDL.h>
 +#include <SDL.h>
  
  #define HIGHSCORE_X 10
  #define HIGHSCORE_Y 30
-@@ -269,6 +268,7 @@
+@@ -269,6 +268,7 @@ Font *load_font(const char *fname)
      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 @@
+@@ -357,7 +357,7 @@ highscore_entry highscore[HIGHSCORE_ENTR
  
  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 @@
+@@ -369,7 +369,7 @@ void highscore_save()
  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 @@
+@@ -1365,6 +1365,7 @@ void eval_args(int argc, char **argv)
      }
  }
  
 +int
  main (int argc, char **argv)
  {
      eval_args(argc, argv);
Index: head/games/columns/files/patch-configure
===================================================================
--- head/games/columns/files/patch-configure	(revision 416707)
+++ head/games/columns/files/patch-configure	(revision 416708)
@@ -1,10 +1,10 @@
---- configure.orig	Fri Mar 17 08:33:59 2000
-+++ configure	Sat Oct 28 03:23:44 2000
-@@ -1292,6 +1292,7 @@
+--- configure.orig	2000-03-16 23:33:59 UTC
++++ configure
+@@ -1292,6 +1292,7 @@ rm -f conftest*
    rm -f conf.sdltest
  
  CFLAGS="$CFLAGS $SDL_CFLAGS"
 +CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
  LIBS="$LIBS $SDL_LIBS"
  
  # Finally create all the generated files