From owner-svn-ports-head@FreeBSD.ORG  Thu Jun 13 13:43:37 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 1934B130;
 Thu, 13 Jun 2013 13:43:37 +0000 (UTC)
 (envelope-from bsam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 0B8E11DDD;
 Thu, 13 Jun 2013 13:43:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5DDhaBC070376;
 Thu, 13 Jun 2013 13:43:36 GMT (envelope-from bsam@svn.freebsd.org)
Received: (from bsam@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5DDhaqg070371;
 Thu, 13 Jun 2013 13:43:36 GMT (envelope-from bsam@svn.freebsd.org)
Message-Id: <201306131343.r5DDhaqg070371@svn.freebsd.org>
From: Boris Samorodov <bsam@FreeBSD.org>
Date: Thu, 13 Jun 2013 13:43:36 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r320800 - in head/games/columns: . 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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Jun 2013 13:43:37 -0000

Author: bsam
Date: Thu Jun 13 13:43:36 2013
New Revision: 320800
URL: http://svnweb.freebsd.org/changeset/ports/320800

Log:
  . fix build with clang (error: C++ requires a type specifier for all declarations);
  . NOPORTDOCS -> PORT_OPTIONS:MDOCS.

Modified:
  head/games/columns/Makefile
  head/games/columns/files/patch-ab

Modified: head/games/columns/Makefile
==============================================================================
--- head/games/columns/Makefile	Thu Jun 13 13:08:41 2013	(r320799)
+++ head/games/columns/Makefile	Thu Jun 13 13:43:36 2013	(r320800)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	columns
-# Date created:				26 August 1999
-# Whom:					Andrey Zakhvatov
-#
+# Created by: Andrey Zakhvatov
 # $FreeBSD$
-#
 
 PORTNAME=	columns
 PORTVERSION=	1.2b
@@ -23,8 +19,12 @@ GNU_CONFIGURE=	yes
 DATADIR=	${PREFIX}/share/Columns
 PORTDOCS=	README
 
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif

Modified: head/games/columns/files/patch-ab
==============================================================================
--- head/games/columns/files/patch-ab	Thu Jun 13 13:08:41 2013	(r320799)
+++ head/games/columns/files/patch-ab	Thu Jun 13 13:43:36 2013	(r320800)
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- columns.cc.orig	Fri Mar 17 02:52:55 2000
-+++ columns.cc	Wed Apr 17 15:48:10 2002
+--- 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 @@
  #include <stdarg.h>
  #include <stdio.h>
@@ -17,3 +17,11 @@ $FreeBSD$
  
  #define HIGHSCORE_X 10
  #define HIGHSCORE_Y 30
+@@ -1365,6 +1367,7 @@ void eval_args(int argc, char **argv)
+     }
+ }
+ 
++int
+ main (int argc, char **argv)
+ {
+     eval_args(argc, argv);