[94240] trunk/dports/sysutils/compare

ryandesign at macports.org ryandesign at macports.org
Tue Jun 12 19:19:24 PDT 2012


Revision: 94240
          https://trac.macports.org/changeset/94240
Author:   ryandesign at macports.org
Date:     2012-06-12 19:19:23 -0700 (Tue, 12 Jun 2012)
Log Message:
-----------
compare: fix build failure on Lion and up due to redefinition of getline

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

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

Modified: trunk/dports/sysutils/compare/Portfile
===================================================================
--- trunk/dports/sysutils/compare/Portfile	2012-06-13 02:12:40 UTC (rev 94239)
+++ trunk/dports/sysutils/compare/Portfile	2012-06-13 02:19:23 UTC (rev 94240)
@@ -22,8 +22,12 @@
 checksums           md5 b4fdc2ad3c07e6df23cfe02e923bd775 \
                     rmd160  430f9fec01e5f9aefaa6d4a823b0ab1c693a0cdd \
                     sha256  1808bf1899fe1f50533b04173804a84149154830550aaa50d47d229fcd304fd0
-patchfiles          patch-RULES-rules.prg patch-compare-compare.1.diff patch-compare-compare.c.diff
 
+patchfiles          patch-RULES-rules.prg \
+                    patch-compare-compare.1.diff \
+                    patch-compare-compare.c.diff \
+                    patch-getline.diff
+
 depends_build       port:smake
 
 use_configure       no

Added: trunk/dports/sysutils/compare/files/patch-getline.diff
===================================================================
--- trunk/dports/sysutils/compare/files/patch-getline.diff	                        (rev 0)
+++ trunk/dports/sysutils/compare/files/patch-getline.diff	2012-06-13 02:19:23 UTC (rev 94240)
@@ -0,0 +1,23 @@
+--- include/schily.h.orig	2004-03-04 18:30:40.000000000 -0600
++++ include/schily.h	2012-06-12 21:14:48.000000000 -0500
+@@ -187,7 +187,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 *, ...));
+diff -ru compare-1.16-orig/libschily/stdio/fgetline.c compare-1.16/libschily/stdio/fgetline.c
+--- libschily/stdio/fgetline.c.orig	2003-06-14 18:55:42.000000000 -0500
++++ libschily/stdio/fgetline.c	2012-06-12 21:15:02.000000000 -0500
+@@ -64,7 +64,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/8f51860c/attachment.html>


More information about the macports-changes mailing list