[96098] trunk/dports/games/frotz

[ryandesign at macports.org]

Revision: 96098
          https://trac.macports.org/changeset/96098
Author:   ryandesign at macports.org
Date:     2012-07-31 12:26:19 -0700 (Tue, 31 Jul 2012)
Log Message:
-----------
frotz: fix build on Lion and up by renaming getline function (#35316; maintainer timeout)

Modified Paths:
--------------
    trunk/dports/games/frotz/Portfile

Added Paths:
-----------
    trunk/dports/games/frotz/files/patch-getline.diff

Modified: trunk/dports/games/frotz/Portfile
===================================================================
--- trunk/dports/games/frotz/Portfile	2012-07-31 19:21:54 UTC (rev 96097)
+++ trunk/dports/games/frotz/Portfile	2012-07-31 19:26:19 UTC (rev 96098)
@@ -16,7 +16,8 @@
 checksums	  md5 efe51879e012b92bb8d5f4a82e982677
 depends_lib       port:ncurses
 patchfiles	  patch-Makefile patch-src-common-main.c \
-	   	  patch-src-common-process.c
+                    patch-src-common-process.c \
+                    patch-getline.diff
 configure	 {
 	reinplace "s|@PREFIX@|${prefix}|" \
 		"${worksrcpath}/Makefile"

Added: trunk/dports/games/frotz/files/patch-getline.diff
===================================================================
--- trunk/dports/games/frotz/files/patch-getline.diff	                        (rev 0)
+++ trunk/dports/games/frotz/files/patch-getline.diff	2012-07-31 19:26:19 UTC (rev 96098)
@@ -0,0 +1,29 @@
+--- src/dumb/dumb_input.c.orig	2002-10-26 20:44:10.000000000 -0500
++++ src/dumb/dumb_input.c	2012-07-26 07:27:34.000000000 -0500
+@@ -79,7 +79,7 @@
+ /* Read one line, including the newline, into s.  Safely avoids buffer
+  * overruns (but that's kind of pointless because there are several
+  * other places where I'm not so careful).  */
+-static void getline(char *s)
++static void frotz_getline(char *s)
+ {
+   int c;
+   char *p = s;
+@@ -203,7 +203,7 @@
+       fputs(prompt, stdout);
+     else
+       dumb_show_prompt(show_cursor, (timeout ? "tTD" : ")>}")[type]);
+-    getline(s);
++    frotz_getline(s);
+     if ((s[0] != '\\') || ((s[1] != '\0') && !islower(s[1]))) {
+       /* Is not a command line.  */
+       translate_special_chars(s);
+@@ -265,7 +265,7 @@
+ 	  if (!*current_page)
+ 	    break;
+ 	  printf("HELP: Type <return> for more, or q <return> to stop: ");
+-	  getline(s);
++	  frotz_getline(s);
+ 	  if (!strcmp(s, "q\n"))
+ 	    break;
+ 	}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120731/a7a3e225/attachment.html>