[125115] trunk/dports/lang/guile

[jeremyhu at macports.org]

Revision: 125115
          https://trac.macports.org/changeset/125115
Author:   jeremyhu at macports.org
Date:     2014-09-06 12:15:12 -0700 (Sat, 06 Sep 2014)
Log Message:
-----------
guile: Fix build on Xcode 5.1 and later, patch via fink

Modified Paths:
--------------
    trunk/dports/lang/guile/Portfile

Added Paths:
-----------
    trunk/dports/lang/guile/files/endl.patch

Modified: trunk/dports/lang/guile/Portfile
===================================================================
--- trunk/dports/lang/guile/Portfile	2014-09-06 19:12:36 UTC (rev 125114)
+++ trunk/dports/lang/guile/Portfile	2014-09-06 19:15:12 UTC (rev 125115)
@@ -6,6 +6,7 @@
 
 name		guile
 version		1.8.8
+revision	1
 categories	lang
 maintainers	nomaintainer
 platforms	darwin
@@ -44,7 +45,8 @@
 
 patchfiles	patch-srfi-60.c.diff \
 		patch-libguile-fports.c.diff \
-		patch-no-stack-checking.diff
+		patch-no-stack-checking.diff \
+		endl.patch
 
 depends_lib	port:readline \
                 port:gettext \

Added: trunk/dports/lang/guile/files/endl.patch
===================================================================
--- trunk/dports/lang/guile/files/endl.patch	                        (rev 0)
+++ trunk/dports/lang/guile/files/endl.patch	2014-09-06 19:15:12 UTC (rev 125115)
@@ -0,0 +1,54 @@
+https://www.mail-archive.com/fink-users@lists.sourceforge.net/msg39760.html
+http://fink.cvs.sourceforge.net/viewvc/fink/dists/10.7/stable/main/finkinfo/languages/guile18.patch?r1=1.2&r2=1.4
+
+--- libguile/Makefile.in~	2010-12-13 20:29:39.000000000 +0100
++++ libguile/Makefile.in	2014-04-02 10:29:34.000000000 +0200
+@@ -2158,6 +2158,8 @@
+ .c.doc:
+ 	-$(AWK) -f ./guile-func-name-check $<
+ 	(./guile-snarf-docs $(snarfcppopts) $< | \
++	   sed -e 's|ENDL|\
++|g' -e '/^#/d' | \
+ 	./guile_filter_doc_snarfage$(EXEEXT) --filter-snarfage) > $@ || { rm $@; false; }
+ 
+ $(DOT_X_FILES) $(EXTRA_DOT_X_FILES): scmconfig.h snarf.h guile-snarf.in
+--- libguile/guile-snarf.in~	2010-12-13 18:24:40.000000000 +0100
++++ libguile/guile-snarf.in	2014-04-02 09:17:20.000000000 +0200
+@@ -50,7 +50,8 @@
+     ## Apparently, AIX's preprocessor is unhappy if you try to #include an
+     ## empty file.
+     echo "/* cpp arguments: $@ */" ;
+-    ${cpp} -DSCM_MAGIC_SNARF_INITS -DSCM_MAGIC_SNARFER "$@" > ${temp} && cpp_ok_p=true
++    ${cpp} -DSCM_MAGIC_SNARF_INITS -DSCM_MAGIC_SNARFER "$@" | sed -e 's|ENDL|\
++|g' > ${temp} && cpp_ok_p=true
+     grep "^ *\^ *\^" ${temp} | sed -e "s/^ *\^ *\^//" -e "s/\^\ *:\ *\^.*/;/"
+ }
+ 
+--- libguile/snarf.h~	2010-12-13 18:24:40.000000000 +0100
++++ libguile/snarf.h	2014-04-01 14:46:36.000000000 +0200
+@@ -51,14 +51,14 @@
+ 
+ #ifdef SCM_MAGIC_SNARF_INITS
+ # define SCM_SNARF_HERE(X)
+-# define SCM_SNARF_INIT(X) ^^ X ^:^
++# define SCM_SNARF_INIT(x) ENDL^^ x ^:^
+ # define SCM_SNARF_DOCS(TYPE, CNAME, FNAME, ARGLIST, REQ, OPT, VAR, DOCSTRING)
+ #else
+ # ifdef SCM_MAGIC_SNARF_DOCS
+ #  define SCM_SNARF_HERE(X)
+ #  define SCM_SNARF_INIT(X)
+ #  define SCM_SNARF_DOCS(TYPE, CNAME, FNAME, ARGLIST, REQ, OPT, VAR, DOCSTRING) \
+-^^ { \
++ENDL^^ { \
+ cname CNAME ^^ \
+ fname FNAME ^^ \
+ type TYPE ^^ \
+@@ -272,7 +272,7 @@
+ 
+ #ifdef SCM_MAGIC_SNARF_DOCS
+ #undef SCM_ASSERT
+-#define SCM_ASSERT(_cond, _arg, _pos, _subr) ^^ argpos _arg _pos __LINE__ ^^
++#define SCM_ASSERT(_cond, _arg, _pos, _subr) ENDL^^ argpos _arg _pos __LINE__ ^^
+ #endif /* SCM_MAGIC_SNARF_DOCS */
+ 
+ #endif  /* SCM_SNARF_H */
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140906/ace68435/attachment.html>