Date: Sat, 13 Jul 2013 12:53:09 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322915 - head/irc/scrollz/files Message-ID: <201307131253.r6DCr9wS026122@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Sat Jul 13 12:53:08 2013 New Revision: 322915 URL: http://svnweb.freebsd.org/changeset/ports/322915 Log: - Fix build with clang due to missing return value Submitted by: M. de Vries <mdv@unsavoury.net> (maintainer via email) Obtained from: https://github.com/ScrollZ/ScrollZ/commit/125c00412258054e3e4501f2e7a4e32e3e372227 Modified: head/irc/scrollz/files/patch-source-screen.c Modified: head/irc/scrollz/files/patch-source-screen.c ============================================================================== --- head/irc/scrollz/files/patch-source-screen.c Sat Jul 13 12:51:19 2013 (r322914) +++ head/irc/scrollz/files/patch-source-screen.c Sat Jul 13 12:53:08 2013 (r322915) @@ -1,6 +1,18 @@ ---- source/screen.c.orig 2011-04-29 17:21:18.000000000 +0900 -+++ source/screen.c 2013-03-12 00:08:32.423090823 +0900 -@@ -2416,6 +2416,10 @@ +--- ./source/screen.c.orig 2011-04-29 03:21:18.000000000 -0500 ++++ ./source/screen.c 2013-07-13 07:45:53.092133202 -0500 +@@ -2000,7 +2000,10 @@ + { + puts(incoming); + fflush(stdout); +- return; ++/**************************** PATCHED by Flier ******************************/ ++ /*return;*/ ++ return NULL; ++/****************************************************************************/ + } + /* Handles output redirection first */ + if (!in_redirect && current_screen->redirect_name && +@@ -2416,6 +2419,10 @@ { screen_type = ST_SCREEN; } @@ -11,7 +23,7 @@ else if ((char *) 0 != (displayvar = getenv("DISPLAY"))) { if ((char *) 0 == (termvar = getenv("TERM"))) -@@ -2454,6 +2458,7 @@ +@@ -2454,6 +2461,7 @@ say("Opening new %s...", screen_type == ST_XTERM ? "window" : screen_type == ST_SCREEN ? "screen" : @@ -19,7 +31,7 @@ "wound" ); snprintf(sock.sun_path, sizeof sock.sun_path, "/tmp/irc_%08d_%x", (int) pid, mycycle); sock.sun_family = AF_UNIX; -@@ -2569,6 +2574,22 @@ +@@ -2569,6 +2577,22 @@ args[i] = NULL; execvp(xterm, args); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307131253.r6DCr9wS026122>