[33011] trunk/dports/lang/guile

[mww at macports.org]

Revision: 33011
          http://trac.macosforge.org/projects/macports/changeset/33011
Author:   mww at macports.org
Date:     2008-01-16 09:51:28 -0800 (Wed, 16 Jan 2008)

Log Message:
-----------
fix build on 10.5 -- thanks to mdickens at nd.edu (#13552)

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

Added Paths:
-----------
    trunk/dports/lang/guile/files/patch-libguile-_scm.h
    trunk/dports/lang/guile/files/patch-libguile-fports.c

Modified: trunk/dports/lang/guile/Portfile
===================================================================
--- trunk/dports/lang/guile/Portfile	2008-01-16 17:39:48 UTC (rev 33010)
+++ trunk/dports/lang/guile/Portfile	2008-01-16 17:51:28 UTC (rev 33011)
@@ -34,10 +34,13 @@
 homepage	http://www.gnu.org/software/guile/guile.html
 master_sites	ftp://ftp.gnu.org/pub/gnu/guile/
 
-checksums	md5 7fd016924e1bc3e273f4009a080942de
+checksums	md5 7fd016924e1bc3e273f4009a080942de \
+		sha1 26cf7b70d4caff8fe2a5fbcc363f2457bc591c2b
 
 patchfiles	fix-64bit-problems.diff	\
-		patch-slib.scm
+		patch-slib.scm \
+		patch-libguile-_scm.h \
+		patch-libguile-fports.c  
 
 depends_lib	port:readline port:gmp
 
@@ -51,10 +54,6 @@
 		depends_lib-append	port:dlcompat
 	}
 
-platform darwin 8 {
-		configure.compiler	gcc-4.0
-	}
-
 #post-destroot	{
 #		  file delete ${destroot}${prefix}/share/${name}/1.6/ice-9/and-let\*.scm
 #		}

Added: trunk/dports/lang/guile/files/patch-libguile-_scm.h
===================================================================
--- trunk/dports/lang/guile/files/patch-libguile-_scm.h	                        (rev 0)
+++ trunk/dports/lang/guile/files/patch-libguile-_scm.h	2008-01-16 17:51:28 UTC (rev 33011)
@@ -0,0 +1,28 @@
+--- libguile/_scm.h~	2007-05-09 16:22:03.000000000 -0400
++++ libguile/_scm.h	2007-12-17 20:06:31.000000000 -0500
+@@ -145,17 +145,17 @@
+ #endif
+ 
+ /* These names are a bit long, but they make it clear what they represent. */
+-#define dirent_or_dirent64              CHOOSE_LARGEFILE(dirent,dirent64)
++#define dirent_or_dirent64              CHOOSE_LARGEFILE(dirent,dirent)
+ #define fstat_or_fstat64                CHOOSE_LARGEFILE(fstat,fstat64)
+-#define ftruncate_or_ftruncate64        CHOOSE_LARGEFILE(ftruncate,ftruncate64)
+-#define lseek_or_lseek64                CHOOSE_LARGEFILE(lseek,lseek64)
++#define ftruncate_or_ftruncate64        CHOOSE_LARGEFILE(ftruncate,ftruncate)
++#define lseek_or_lseek64                CHOOSE_LARGEFILE(lseek,lseek)
+ #define lstat_or_lstat64                CHOOSE_LARGEFILE(lstat,lstat64)
+-#define off_t_or_off64_t                CHOOSE_LARGEFILE(off_t,off64_t)
+-#define open_or_open64                  CHOOSE_LARGEFILE(open,open64)
+-#define readdir_or_readdir64            CHOOSE_LARGEFILE(readdir,readdir64)
+-#define readdir_r_or_readdir64_r        CHOOSE_LARGEFILE(readdir_r,readdir64_r)
++#define off_t_or_off64_t                CHOOSE_LARGEFILE(off_t,off_t)
++#define open_or_open64                  CHOOSE_LARGEFILE(open,open)
++#define readdir_or_readdir64            CHOOSE_LARGEFILE(readdir,readdir)
++#define readdir_r_or_readdir64_r        CHOOSE_LARGEFILE(readdir_r,readdir_r)
+ #define stat_or_stat64                  CHOOSE_LARGEFILE(stat,stat64)
+-#define truncate_or_truncate64          CHOOSE_LARGEFILE(truncate,truncate64)
++#define truncate_or_truncate64          CHOOSE_LARGEFILE(truncate,truncate)
+ #define scm_from_off_t_or_off64_t       CHOOSE_LARGEFILE(scm_from_off_t,scm_from_int64)
+ #define scm_from_ino_t_or_ino64_t       CHOOSE_LARGEFILE(scm_from_ulong,scm_from_uint64)
+ #define scm_from_blkcnt_t_or_blkcnt64_t CHOOSE_LARGEFILE(scm_from_ulong,scm_from_uint64)

Added: trunk/dports/lang/guile/files/patch-libguile-fports.c
===================================================================
--- trunk/dports/lang/guile/files/patch-libguile-fports.c	                        (rev 0)
+++ trunk/dports/lang/guile/files/patch-libguile-fports.c	2008-01-16 17:51:28 UTC (rev 33011)
@@ -0,0 +1,11 @@
+--- libguile/fports.c~	2007-05-09 16:22:03.000000000 -0400
++++ libguile/fports.c	2007-12-17 20:09:21.000000000 -0500
+@@ -674,7 +674,7 @@
+ static off_t
+ fport_seek (SCM port, off_t offset, int whence)
+ {
+-  off64_t rv = fport_seek_or_seek64 (port, (off64_t) offset, whence);
++  off_t_or_off64_t rv = fport_seek_or_seek64 (port, (off_t_or_off64_t) offset, whence);
+   if (rv > OFF_T_MAX || rv < OFF_T_MIN)
+     {
+       errno = EOVERFLOW;

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080116/9c96c746/attachment.html