svn commit: r320800 - in head/games/columns: . files

[Boris Samorodov]

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);