[99872] trunk/dports/editors/elvis

[cal at macports.org]

Revision: 99872
          https://trac.macports.org/changeset/99872
Author:   cal at macports.org
Date:     2012-11-20 05:05:54 -0800 (Tue, 20 Nov 2012)
Log Message:
-----------
elvis: fix build on ML, closes #37056, add new maintainer

Modified Paths:
--------------
    trunk/dports/editors/elvis/Portfile

Added Paths:
-----------
    trunk/dports/editors/elvis/files/
    trunk/dports/editors/elvis/files/patch-src-ref.c.diff

Modified: trunk/dports/editors/elvis/Portfile
===================================================================
--- trunk/dports/editors/elvis/Portfile	2012-11-20 12:17:58 UTC (rev 99871)
+++ trunk/dports/editors/elvis/Portfile	2012-11-20 13:05:54 UTC (rev 99872)
@@ -9,7 +9,7 @@
 homepage        http://elvis.the-little-red-haired-girl.org/
 description     A vi/ex clone
 categories      editors
-maintainers     nomaintainer
+maintainers     gmail.com:crosma
 platforms       darwin
 master_sites    ftp://ftp.cs.pdx.edu/pub/elvis/ \
                   ftp://ftp.false.com/pub/elvis/ \
@@ -21,6 +21,8 @@
 universal_variant no
 configure.args  --without-x
 
+patchfiles      patch-src-ref.c.diff
+
 # The x11 variant is seriously borked and needs patching to compile
 #variant         x11 {  depends_lib port:xorg-libX11 port:xorg-libOTHERS???
 #                       configure.args-delete --without-x

Added: trunk/dports/editors/elvis/files/patch-src-ref.c.diff
===================================================================
--- trunk/dports/editors/elvis/files/patch-src-ref.c.diff	                        (rev 0)
+++ trunk/dports/editors/elvis/files/patch-src-ref.c.diff	2012-11-20 13:05:54 UTC (rev 99872)
@@ -0,0 +1,47 @@
+--- ref.c.orig	2012-11-20 19:41:32.000000000 +1100
++++ ref.c	2012-11-20 19:42:20.000000000 +1100
+@@ -42,7 +42,7 @@
+ 
+ #if USE_PROTOTYPES
+ static void usage(char *argv0);
+-static char *getline(FILE *fp);
++static char *static_getline(FILE *fp);
+ static void store(char *line, char **list);
+ static LINECLS classify(char *line, LINECLS prev);
+ static void lookup(TAG *tag);
+@@ -171,7 +171,7 @@
+ /* This function reads a single line, and replaces the terminating newline with
+  * a '\0' byte.  The string will be in a static buffer.  Returns NULL at EOF.
+  */
+-static char *getline(fp)
++static char *static_getline(fp)
+ 	FILE	*fp;
+ {
+ 	int	ch;
+@@ -348,7 +348,7 @@
+ 	}
+ 
+ 	/* for each line... */
+-	for (lnum = 1, lc = LC_COMPLETE; (line = getline(fp)) != NULL; lnum++)
++	for (lnum = 1, lc = LC_COMPLETE; (line = static_getline(fp)) != NULL; lnum++)
+ 	{
+ 		/* is this the tag definition? */
+ 		if (taglnum > 0 ? taglnum == lnum : !strncmp(tagline, line, len))
+@@ -377,7 +377,7 @@
+ 			{
+ 				if (strchr(line, '(') != NULL)
+ 				{
+-					while ((line = getline(fp)) != NULL
++					while ((line = static_getline(fp)) != NULL
+ 					    && *line
+ 					    && ((*line != '#' && *line != '{')
+ 						|| line[strlen(line) - 1] == '\\'))
+@@ -387,7 +387,7 @@
+ 				}
+ 				else if ((lc = classify(line, lc)) == LC_PARTIAL)
+ 				{
+-					while ((line = getline(fp)) != NULL
++					while ((line = static_getline(fp)) != NULL
+ 					    && (lc = classify(line, lc)) == LC_PARTIAL)
+ 					{
+ 						puts(line);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121120/e9526589/attachment.html>