[94236] trunk/dports/sysutils/sfind

[ryandesign at macports.org]

Revision: 94236
          https://trac.macports.org/changeset/94236
Author:   ryandesign at macports.org
Date:     2012-06-12 18:46:53 -0700 (Tue, 12 Jun 2012)
Log Message:
-----------
sfind: fix build failure on Lion and up due to redefinition of getline (#34842)

Modified Paths:
--------------
    trunk/dports/sysutils/sfind/Portfile

Added Paths:
-----------
    trunk/dports/sysutils/sfind/files/
    trunk/dports/sysutils/sfind/files/patch-getline.diff

Modified: trunk/dports/sysutils/sfind/Portfile
===================================================================
--- trunk/dports/sysutils/sfind/Portfile	2012-06-13 01:41:13 UTC (rev 94235)
+++ trunk/dports/sysutils/sfind/Portfile	2012-06-13 01:46:53 UTC (rev 94236)
@@ -24,6 +24,8 @@
 
 depends_build       port:smake
 
+patchfiles          patch-getline.diff
+
 use_configure       no
 
 # smake does not support the -j flag

Added: trunk/dports/sysutils/sfind/files/patch-getline.diff
===================================================================
--- trunk/dports/sysutils/sfind/files/patch-getline.diff	                        (rev 0)
+++ trunk/dports/sysutils/sfind/files/patch-getline.diff	2012-06-13 01:46:53 UTC (rev 94236)
@@ -0,0 +1,51 @@
+--- include/schily/schily.h.orig	2006-09-13 07:51:53.000000000 -0500
++++ include/schily/schily.h	2012-06-12 20:39:28.000000000 -0500
+@@ -186,7 +186,7 @@
+ extern	char	*findbytes __PR((const void *, int, char));
+ extern	int	findline __PR((const char *, char, const char *,
+ 							int, char **, int));
+-extern	int	getline __PR((char *, int));
++extern	int	schily_getline __PR((char *, int));
+ extern	int	getstr __PR((char *, int));
+ extern	int	breakline __PR((char *, char, char **, int));
+ extern	int	getallargs __PR((int *, char * const**, const char *, ...));
+--- libfind/find.c.orig	2006-09-15 09:17:50.000000000 -0500
++++ libfind/find.c	2012-06-12 20:41:44.000000000 -0500
+@@ -1608,7 +1608,7 @@
+ 		flush();
+ 		fprintf(stderr, "< %s ... %s > ? ", ((char **)t->this)[0], f);
+ 		fflush(stderr);
+-		getline(qbuf, sizeof (qbuf) - 1);
++		schily_getline(qbuf, sizeof (qbuf) - 1);
+ 
+ 		switch (qbuf[0]) {
+ 		case 'y':
+--- libschily/libschily-mapvers.orig	2006-09-14 06:55:31.000000000 -0500
++++ libschily/libschily-mapvers	2012-06-12 20:42:23.000000000 -0500
+@@ -98,7 +98,6 @@
+ 	geterrno;
+ 	getfiles;
+ 	getfp;
+-	getline;
+ 	getmainfp;
+ 	getstr;
+ 	handlecond;
+@@ -121,6 +120,7 @@
+ 	saved_ac;
+ 	saved_av;
+ 	saved_av0;
++	schily_getline;
+ 	serrmsg;
+ 	serrmsgno;
+ 	set_progname;
+--- libschily/stdio/fgetline.c.orig	2004-09-25 07:23:36.000000000 -0500
++++ libschily/stdio/fgetline.c	2012-06-12 20:42:42.000000000 -0500
+@@ -61,7 +61,7 @@
+ }
+ 
+ EXPORT int
+-getline(buf, len)
++schily_getline(buf, len)
+ 	char	*buf;
+ 	int	len;
+ {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120612/a38749aa/attachment.html>