Attachment 142668 Details for Bug 189735 – file.diff

[patch] file.diff

file.diff (text/plain), 4.47 KB, created by buganini on 2014-05-12 21:00:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: buganini

Created: 2014-05-12 21:00:00 UTC

Size: 4.47 KB

patch

obsolete

>diff -ruN fgrun.orig/Makefile fgrun/Makefile
>--- fgrun.orig/Makefile	2014-05-12 04:23:27.000000000 +0800
>+++ fgrun/Makefile	2014-05-12 04:30:39.000000000 +0800
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/games/fgrun/Makefile 347809 2014-03-10 20:55:20Z gerald $
> 
> PORTNAME=	fgrun
>-PORTVERSION=	1.7.0
>-PORTREVISION=	1
>+PORTVERSION=	3.0.0
> CATEGORIES=	games
> MASTER_SITES=	https://gitorious.org/${GO_ACCOUNT}/${GO_PROJECT}/archive/${GO_TAGNAME}.tar.gz?dummy=
> 
>@@ -23,13 +22,12 @@
> 
> CMAKE_ARGS+=	-DLIB_DIR=${PREFIX}/lib
> 
>-USE_GCC=	yes
> USES=		cmake
> USE_GL=		gl
> 
> GO_ACCOUNT=	fg
> GO_PROJECT=	fgrun
>-GO_TAGNAME=	90e936c01e28feac4a9c3e28d5227980fb8f1e1d
>+GO_TAGNAME=	e13e42811239008fded7685d8f2311bb571f6a58
> FETCH_ARGS?=	-o ${DISTDIR}/${DISTFILES}
> 
> OPTIONS_DEFINE=	NLS
>diff -ruN fgrun.orig/distinfo fgrun/distinfo
>--- fgrun.orig/distinfo	2014-05-12 04:23:27.000000000 +0800
>+++ fgrun/distinfo	2014-05-12 04:26:03.000000000 +0800
>@@ -1,2 +1,2 @@
>-SHA256 (fgrun-1.7.0.tar.gz) = 768d2c5353e6260d1b5625781f66cd46f8fff9f8f1607ba1bd370c778193900c
>-SIZE (fgrun-1.7.0.tar.gz) = 187221
>+SHA256 (fgrun-3.0.0.tar.gz) = df8299cae9334fb6563be2cf0f78cfe397b569a3d64fbd3a39a26034132ab5d8
>+SIZE (fgrun-3.0.0.tar.gz) = 194601
>diff -ruN fgrun.orig/files/patch-CMakeLists.txt fgrun/files/patch-CMakeLists.txt
>--- fgrun.orig/files/patch-CMakeLists.txt	1970-01-01 08:00:00.000000000 +0800
>+++ fgrun/files/patch-CMakeLists.txt	2014-05-12 04:38:23.000000000 +0800
>@@ -0,0 +1,18 @@
>+--- 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")
>diff -ruN fgrun.orig/files/patch-src-CMakeLists.txt fgrun/files/patch-src-CMakeLists.txt
>--- fgrun.orig/files/patch-src-CMakeLists.txt	2014-05-12 04:23:27.000000000 +0800
>+++ fgrun/files/patch-src-CMakeLists.txt	1970-01-01 08:00:00.000000000 +0800
>@@ -1,18 +0,0 @@
>---- 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")
>diff -ruN fgrun.orig/files/patch-src-fgrun_pty.cxx fgrun/files/patch-src-fgrun_pty.cxx
>--- fgrun.orig/files/patch-src-fgrun_pty.cxx	2014-05-12 04:23:27.000000000 +0800
>+++ fgrun/files/patch-src-fgrun_pty.cxx	2014-05-12 04:36:03.000000000 +0800
>@@ -1,12 +1,14 @@
>---- src/fgrun_pty.cxx.orig	2008-10-18 17:32:33.000000000 +0800
>-+++ src/fgrun_pty.cxx	2008-10-18 17:33:12.000000000 +0800
>-@@ -28,6 +28,9 @@
>- #  include <pty.h>
>+--- src/fgrun_pty.cxx.orig	2014-05-12 04:35:04.000000000 +0800
>++++ src/fgrun_pty.cxx	2014-05-12 04:35:29.000000000 +0800
>+@@ -40,6 +40,11 @@
>+ #include <fcntl.h>	// O_RDWR
>  #endif
>  
> +#include <sys/types.h>
>++#include <sys/ioctl.h>
>++#include <termios.h>
> +#include <libutil.h>
> +
>- #if defined(HAVE_UTMP_H)
>- #  include <utmp.h>
>- #endif
>+ #include <stdlib.h> //needed on some linux systems for grantpt()
>+ #include <string.h> //strcpy is not necessarily already included
>+ /**
>diff -ruN fgrun.orig/files/patch-src-run_posix.cxx fgrun/files/patch-src-run_posix.cxx
>--- fgrun.orig/files/patch-src-run_posix.cxx	2014-05-12 04:23:27.000000000 +0800
>+++ fgrun/files/patch-src-run_posix.cxx	2014-05-12 04:32:46.000000000 +0800
>@@ -1,6 +1,6 @@
>---- src/run_posix.cxx.orig	2009-01-25 17:01:58.000000000 +0000
>-+++ src/run_posix.cxx	2009-03-09 01:08:38.080801315 +0000
>-@@ -59,7 +59,7 @@
>+--- 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 );
>@@ -9,12 +9,3 @@
>  
>      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

Actions: View | Diff

Attachments on bug 189735: 142668