[94239] trunk/dports/math/scalc

[ryandesign at macports.org]

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

Modified Paths:
--------------
    trunk/dports/math/scalc/Portfile

Added Paths:
-----------
    trunk/dports/math/scalc/files/patch-getline.diff

Modified: trunk/dports/math/scalc/Portfile
===================================================================
--- trunk/dports/math/scalc/Portfile	2012-06-13 01:59:17 UTC (rev 94238)
+++ trunk/dports/math/scalc/Portfile	2012-06-13 02:12:40 UTC (rev 94239)
@@ -24,7 +24,8 @@
 
 depends_build       port:smake
 
-patchfiles          patch-RULES_rules.prg.diff
+patchfiles          patch-RULES_rules.prg.diff \
+                    patch-getline.diff
 
 use_configure       no
 
@@ -35,6 +36,7 @@
 
 destroot.destdir    INS_BASE=${destroot}${prefix} \
                     MANDIR=share/man
+
 post-destroot {
     delete ${destroot}${prefix}/lib ${destroot}${prefix}/include \
         ${destroot}${prefix}/share/man/man5

Added: trunk/dports/math/scalc/files/patch-getline.diff
===================================================================
--- trunk/dports/math/scalc/files/patch-getline.diff	                        (rev 0)
+++ trunk/dports/math/scalc/files/patch-getline.diff	2012-06-13 02:12:40 UTC (rev 94239)
@@ -0,0 +1,33 @@
+--- calc/calc.c.orig	2004-07-11 16:34:54.000000000 -0500
++++ calc/calc.c	2012-06-12 21:09:24.000000000 -0500
+@@ -96,7 +96,7 @@
+ 	}
+ 
+ 	putchar('?'); flush();
+-	while (getline(eingabe, LLEN) >= 0 && !streql(eingabe, "quit")) {
++	while (schily_getline(eingabe, LLEN) >= 0 && !streql(eingabe, "quit")) {
+ 
+ 		opstr = eingabe;
+ 		while (*opstr == ' ' || *opstr == '\t')
+--- include/schily.h.orig	2004-03-04 18:30:40.000000000 -0600
++++ include/schily.h	2012-06-12 21:09:36.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 *, ...));
+--- libschily/stdio/fgetline.c.orig	2003-06-14 18:55:42.000000000 -0500
++++ libschily/stdio/fgetline.c	2012-06-12 21:09:58.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/1cd47e0a/attachment-0001.html>