Attachment #142668 for bug #189735

View | Details | Raw Unified | Return to bug 189735
Collapse All | Expand All




# $FreeBSD: head/games/fgrun/Makefile 347809 2014-03-10 20:55:20Z gerald $

PORTNAME=	fgrun
PORTVERSION=	3.0.0
PORTREVISION=	1
CATEGORIES=	games
MASTER_SITES=	https://gitorious.org/${GO_ACCOUNT}/${GO_PROJECT}/archive/${GO_TAGNAME}.tar.gz?dummy=



CMAKE_ARGS+=	-DLIB_DIR=${PREFIX}/lib

USE_GCC=	yes
USES=		cmake
USE_GL=		gl

GO_ACCOUNT=	fg
GO_PROJECT=	fgrun
GO_TAGNAME=	e13e42811239008fded7685d8f2311bb571f6a58
FETCH_ARGS?=	-o ${DISTDIR}/${DISTFILES}

OPTIONS_DEFINE=	NLS

Lines 1-2 Link Here

(-)fgrun/distinfo (-2 / +2 lines)
1	SHA256 (fgrun-1.7.0.tar.gz) = 768d2c5353e6260d1b5625781f66cd46f8fff9f8f1607ba1bd370c778193900c	1	SHA256 (fgrun-3.0.0.tar.gz) = df8299cae9334fb6563be2cf0f78cfe397b569a3d64fbd3a39a26034132ab5d8
2	SIZE (fgrun-1.7.0.tar.gz) = 187221	2	SIZE (fgrun-3.0.0.tar.gz) = 194601




--- CMakeLists.txt.orig	2014-05-12 04:37:55.000000000 +0800
+++ CMakeLists.txt	2014-05-12 04:38:05.000000000 +0800
@@ -137,7 +137,6 @@
 
 if (ENABLE_NLS AND GETTEXT_FOUND)
 
-    if (MSVC)
         FIND_LIBRARY(INTL_LIBRARY
           NAMES intl
           HINTS
@@ -153,7 +152,6 @@
         if (NOT INTL_LIBRARY)
             set( ENABLE_NLS 0 )
         endif (NOT INTL_LIBRARY)
-    endif (MSVC)
 
 	if (ENABLE_NLS)
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_NLS")




--- CMakeLists.txt.orig	2013-11-18 06:56:58.000000000 +0800
+++ CMakeLists.txt	2013-11-18 06:57:32.000000000 +0800
@@ -138,7 +138,6 @@
 
 if (ENABLE_NLS AND GETTEXT_FOUND)
 
-    if (MSVC)
         FIND_LIBRARY(INTL_LIBRARY
           NAMES intl
           HINTS
@@ -154,7 +153,6 @@
         if (NOT INTL_LIBRARY)
             set( ENABLE_NLS 0 )
         endif (NOT INTL_LIBRARY)
-    endif (MSVC)
 
 	if (ENABLE_NLS)
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_NLS")

Lines 1-12 Link Here

(-)fgrun/files/patch-src-fgrun_pty.cxx (-7 / +9 lines)
1	--- src/fgrun_pty.cxx.orig 2008-10-18 17:32:33.000000000 +0800	1	--- src/fgrun_pty.cxx.orig 2014-05-12 04:35:04.000000000 +0800
2	+++ src/fgrun_pty.cxx 2008-10-18 17:33:12.000000000 +0800	2	+++ src/fgrun_pty.cxx 2014-05-12 04:35:29.000000000 +0800
3	@@ -28,6 +28,9 @@	3	@@ -40,6 +40,11 @@
4	# include <pty.h>	4	#include <fcntl.h> // O_RDWR
5	#endif	5	#endif
6		6
7	+#include <sys/types.h>	7	+#include <sys/types.h>
		8	+#include <sys/ioctl.h>
		9	+#include <termios.h>
8	+#include <libutil.h>	10	+#include <libutil.h>
9	+	11	+
10	#if defined(HAVE_UTMP_H)	12	#include <stdlib.h> //needed on some linux systems for grantpt()
11	# include <utmp.h>	13	#include <string.h> //strcpy is not necessarily already included
12	#endif	14	/**




--- src/run_posix.cxx.orig	2014-05-12 04:32:03.000000000 +0800
+++ src/run_posix.cxx	2014-05-12 04:32:24.000000000 +0800
@@ -60,7 +60,7 @@
 #if defined(HAVE_TERMIOS_H)
     struct termios term;
     tcgetattr( STDOUT_FILENO, &term );

 
     pid = pty_fork( &master, 0, &term, 0 );
 #else
@@ -171,7 +171,7 @@
 #if defined(HAVE_TERMIOS_H)
     struct termios term;
     tcgetattr( STDOUT_FILENO, &term );
-    term.c_oflag &= ~( OLCUC | ONLCR );
+    term.c_oflag &= ~ONLCR;
 
     tsPid = pty_fork( &master, 0, &term, 0 );
 #else

Return to bug 189735

Lines 2-9 Link Here

(-)fgrun/Makefile (-4 / +2 lines)
2	# $FreeBSD: head/games/fgrun/Makefile 347809 2014-03-10 20:55:20Z gerald $	2	# $FreeBSD: head/games/fgrun/Makefile 347809 2014-03-10 20:55:20Z gerald $
3		3
4	PORTNAME= fgrun	4	PORTNAME= fgrun
5	PORTVERSION= 1.7.0	5	PORTVERSION= 3.0.0
6	PORTREVISION= 1
7	CATEGORIES= games	6	CATEGORIES= games
8	MASTER_SITES= https://gitorious.org/${GO_ACCOUNT}/${GO_PROJECT}/archive/${GO_TAGNAME}.tar.gz?dummy=	7	MASTER_SITES= https://gitorious.org/${GO_ACCOUNT}/${GO_PROJECT}/archive/${GO_TAGNAME}.tar.gz?dummy=
9		8
Lines 23-35 Link Here
23		22
24	CMAKE_ARGS+= -DLIB_DIR=${PREFIX}/lib	23	CMAKE_ARGS+= -DLIB_DIR=${PREFIX}/lib
25		24
26	USE_GCC= yes
27	USES= cmake	25	USES= cmake
28	USE_GL= gl	26	USE_GL= gl
29		27
30	GO_ACCOUNT= fg	28	GO_ACCOUNT= fg
31	GO_PROJECT= fgrun	29	GO_PROJECT= fgrun
32	GO_TAGNAME= 90e936c01e28feac4a9c3e28d5227980fb8f1e1d	30	GO_TAGNAME= e13e42811239008fded7685d8f2311bb571f6a58
33	FETCH_ARGS?= -o ${DISTDIR}/${DISTFILES}	31	FETCH_ARGS?= -o ${DISTDIR}/${DISTFILES}
34		32
35	OPTIONS_DEFINE= NLS	33	OPTIONS_DEFINE= NLS

Line 0 Link Here

(-)fgrun/files/patch-CMakeLists.txt (+18 lines)
	1	--- CMakeLists.txt.orig 2014-05-12 04:37:55.000000000 +0800
	2	+++ CMakeLists.txt 2014-05-12 04:38:05.000000000 +0800
	3	@@ -137,7 +137,6 @@
	4
	5	if (ENABLE_NLS AND GETTEXT_FOUND)
	6
	7	- if (MSVC)
	8	FIND_LIBRARY(INTL_LIBRARY
	9	NAMES intl
	10	HINTS
	11	@@ -153,7 +152,6 @@
	12	if (NOT INTL_LIBRARY)
	13	set( ENABLE_NLS 0 )
	14	endif (NOT INTL_LIBRARY)
	15	- endif (MSVC)
	16
	17	if (ENABLE_NLS)
	18	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_NLS")

Lines 1-18 Link Here

(-)fgrun/files/patch-src-CMakeLists.txt (-18 lines)
1	--- CMakeLists.txt.orig 2013-11-18 06:56:58.000000000 +0800
2	+++ CMakeLists.txt 2013-11-18 06:57:32.000000000 +0800
3	@@ -138,7 +138,6 @@
4
5	if (ENABLE_NLS AND GETTEXT_FOUND)
6
7	- if (MSVC)
8	FIND_LIBRARY(INTL_LIBRARY
9	NAMES intl
10	HINTS
11	@@ -154,7 +153,6 @@
12	if (NOT INTL_LIBRARY)
13	set( ENABLE_NLS 0 )
14	endif (NOT INTL_LIBRARY)
15	- endif (MSVC)
16
17	if (ENABLE_NLS)
18	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_NLS")

Lines 1-6 Link Here

(-)fgrun/files/patch-src-run_posix.cxx (-12 / +3 lines)
1	--- src/run_posix.cxx.orig 2009-01-25 17:01:58.000000000 +0000	1	--- src/run_posix.cxx.orig 2014-05-12 04:32:03.000000000 +0800
2	+++ src/run_posix.cxx 2009-03-09 01:08:38.080801315 +0000	2	+++ src/run_posix.cxx 2014-05-12 04:32:24.000000000 +0800
3	@@ -59,7 +59,7 @@	3	@@ -60,7 +60,7 @@
4	#if defined(HAVE_TERMIOS_H)	4	#if defined(HAVE_TERMIOS_H)
5	struct termios term;	5	struct termios term;
6	tcgetattr( STDOUT_FILENO, &term );	6	tcgetattr( STDOUT_FILENO, &term );
Lines 9-20 Link Here
9		9
10	pid = pty_fork( &master, 0, &term, 0 );	10	pid = pty_fork( &master, 0, &term, 0 );
11	#else	11	#else
12	@@ -171,7 +171,7 @@
13	#if defined(HAVE_TERMIOS_H)
14	struct termios term;
15	tcgetattr( STDOUT_FILENO, &term );
16	- term.c_oflag &= ~( OLCUC \| ONLCR );
17	+ term.c_oflag &= ~ONLCR;
18
19	tsPid = pty_fork( &master, 0, &term, 0 );
20	#else