aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbsam <bsam@FreeBSD.org>2013-06-13 21:43:36 +0800
committerbsam <bsam@FreeBSD.org>2013-06-13 21:43:36 +0800
commit237976ebd99c8cedb6b85914200a1ff6b3bbdbf7 (patch)
tree159683c006e021171a7f5a4d6e91de8ea6d9f09d
parent8f3c96cce93d0778f8ab8fca9690489233137277 (diff)
downloadfreebsd-ports-gnome-237976ebd99c8cedb6b85914200a1ff6b3bbdbf7.tar.gz
freebsd-ports-gnome-237976ebd99c8cedb6b85914200a1ff6b3bbdbf7.tar.zst
freebsd-ports-gnome-237976ebd99c8cedb6b85914200a1ff6b3bbdbf7.zip
. fix build with clang (error: C++ requires a type specifier for all declarations);
. NOPORTDOCS -> PORT_OPTIONS:MDOCS.
-rw-r--r--games/columns/Makefile12
-rw-r--r--games/columns/files/patch-ab12
2 files changed, 16 insertions, 8 deletions
diff --git a/games/columns/Makefile b/games/columns/Makefile
index 4b92fe276439..de12367519c7 100644
--- a/games/columns/Makefile
+++ b/games/columns/Makefile
@@ -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
diff --git a/games/columns/files/patch-ab b/games/columns/files/patch-ab
index d4622b14ea4e..340e665bf71d 100644
--- a/games/columns/files/patch-ab
+++ b/games/columns/files/patch-ab
@@ -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);