[33041] trunk/dports/lang/guile
ryandesign at macports.org
ryandesign at macports.org
Wed Jan 16 20:57:03 PST 2008
Revision: 33041
http://trac.macosforge.org/projects/macports/changeset/33041
Author: ryandesign at macports.org
Date: 2008-01-16 20:57:01 -0800 (Wed, 16 Jan 2008)
Log Message:
-----------
guile: fix names of patchfiles to match recommendations
Modified Paths:
--------------
trunk/dports/lang/guile/Portfile
Added Paths:
-----------
trunk/dports/lang/guile/files/patch-libguile-_scm.h.diff
trunk/dports/lang/guile/files/patch-libguile-fports.c.diff
trunk/dports/lang/guile/files/patch-slib.scm.diff
trunk/dports/lang/guile/files/patch-srfi-60.c.diff
Removed Paths:
-------------
trunk/dports/lang/guile/files/fix-64bit-problems.diff
trunk/dports/lang/guile/files/patch-libguile-_scm.h
trunk/dports/lang/guile/files/patch-libguile-fports.c
trunk/dports/lang/guile/files/patch-slib.scm
Modified: trunk/dports/lang/guile/Portfile
===================================================================
--- trunk/dports/lang/guile/Portfile 2008-01-17 04:39:56 UTC (rev 33040)
+++ trunk/dports/lang/guile/Portfile 2008-01-17 04:57:01 UTC (rev 33041)
@@ -37,10 +37,10 @@
checksums md5 7fd016924e1bc3e273f4009a080942de \
sha1 26cf7b70d4caff8fe2a5fbcc363f2457bc591c2b
-patchfiles fix-64bit-problems.diff \
- patch-slib.scm \
- patch-libguile-_scm.h \
- patch-libguile-fports.c
+patchfiles patch-srfi-60.c.diff \
+ patch-slib.scm.diff \
+ patch-libguile-_scm.h.diff \
+ patch-libguile-fports.c.diff
depends_lib port:readline port:gmp
Deleted: trunk/dports/lang/guile/files/fix-64bit-problems.diff
===================================================================
--- trunk/dports/lang/guile/files/fix-64bit-problems.diff 2008-01-17 04:39:56 UTC (rev 33040)
+++ trunk/dports/lang/guile/files/fix-64bit-problems.diff 2008-01-17 04:57:01 UTC (rev 33041)
@@ -1,22 +0,0 @@
-Index: sid/srfi/srfi-60.c
-===================================================================
---- sid.orig/srfi/srfi-60.c 2006-11-30 23:40:16.000000000 -0800
-+++ ./srfi/srfi-60.c 2006-11-30 23:40:18.000000000 -0800
-@@ -59,7 +59,7 @@
-
-
- SCM_DEFINE (scm_srfi60_copy_bit, "copy-bit", 3, 0, 0,
-- (SCM index, SCM n, SCM bit),
-+ (SCM index, SCM n, SCM newbit),
- "Return @var{n} with the bit at @var{index} set according to\n"
- "@var{newbit}. @var{newbit} should be @code{#t} to set the bit\n"
- "to 1, or @code{#f} to set it to 0. Bits other than at\n"
-@@ -75,7 +75,7 @@
- int bb;
-
- ii = scm_to_ulong (index);
-- bb = scm_to_bool (bit);
-+ bb = scm_to_bool (newbit);
-
- if (SCM_I_INUMP (n))
- {
Deleted: trunk/dports/lang/guile/files/patch-libguile-_scm.h
===================================================================
--- trunk/dports/lang/guile/files/patch-libguile-_scm.h 2008-01-17 04:39:56 UTC (rev 33040)
+++ trunk/dports/lang/guile/files/patch-libguile-_scm.h 2008-01-17 04:57:01 UTC (rev 33041)
@@ -1,28 +0,0 @@
---- 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)
Copied: trunk/dports/lang/guile/files/patch-libguile-_scm.h.diff (from rev 33040, trunk/dports/lang/guile/files/patch-libguile-_scm.h)
===================================================================
--- trunk/dports/lang/guile/files/patch-libguile-_scm.h.diff (rev 0)
+++ trunk/dports/lang/guile/files/patch-libguile-_scm.h.diff 2008-01-17 04:57:01 UTC (rev 33041)
@@ -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)
Deleted: trunk/dports/lang/guile/files/patch-libguile-fports.c
===================================================================
--- trunk/dports/lang/guile/files/patch-libguile-fports.c 2008-01-17 04:39:56 UTC (rev 33040)
+++ trunk/dports/lang/guile/files/patch-libguile-fports.c 2008-01-17 04:57:01 UTC (rev 33041)
@@ -1,11 +0,0 @@
---- 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;
Copied: trunk/dports/lang/guile/files/patch-libguile-fports.c.diff (from rev 33040, trunk/dports/lang/guile/files/patch-libguile-fports.c)
===================================================================
--- trunk/dports/lang/guile/files/patch-libguile-fports.c.diff (rev 0)
+++ trunk/dports/lang/guile/files/patch-libguile-fports.c.diff 2008-01-17 04:57:01 UTC (rev 33041)
@@ -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;
Deleted: trunk/dports/lang/guile/files/patch-slib.scm
===================================================================
--- trunk/dports/lang/guile/files/patch-slib.scm 2008-01-17 04:39:56 UTC (rev 33040)
+++ trunk/dports/lang/guile/files/patch-slib.scm 2008-01-17 04:57:01 UTC (rev 33041)
@@ -1,16 +0,0 @@
---- ice-9/slib.scm 2006-02-18 07:08:44.000000000 +0100
-+++ ice-9/slib.scm 2007-03-28 01:11:35.000000000 +0200
-@@ -16,6 +16,13 @@
- ;;;; License along with this library; if not, write to the Free Software
- ;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- ;;;;
-+
-+;; forward patch GDT's 1.6.7 pkgsrc patch
-+;; ref. http://lists.gnu.org/archive/html/guile-user/2005-10/msg00083.html
-+;; Load slib's init routine.
-+(load (string-append (assoc-ref %guile-build-info 'pkgdatadir)
-+ "/slib/guile.init"))
-+
- (define-module (ice-9 slib)
- :export (slib:load slib:load-source defmacro:load
- implementation-vicinity library-vicinity home-vicinity
Copied: trunk/dports/lang/guile/files/patch-slib.scm.diff (from rev 33040, trunk/dports/lang/guile/files/patch-slib.scm)
===================================================================
--- trunk/dports/lang/guile/files/patch-slib.scm.diff (rev 0)
+++ trunk/dports/lang/guile/files/patch-slib.scm.diff 2008-01-17 04:57:01 UTC (rev 33041)
@@ -0,0 +1,16 @@
+--- ice-9/slib.scm 2006-02-18 07:08:44.000000000 +0100
++++ ice-9/slib.scm 2007-03-28 01:11:35.000000000 +0200
+@@ -16,6 +16,13 @@
+ ;;;; License along with this library; if not, write to the Free Software
+ ;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ;;;;
++
++;; forward patch GDT's 1.6.7 pkgsrc patch
++;; ref. http://lists.gnu.org/archive/html/guile-user/2005-10/msg00083.html
++;; Load slib's init routine.
++(load (string-append (assoc-ref %guile-build-info 'pkgdatadir)
++ "/slib/guile.init"))
++
+ (define-module (ice-9 slib)
+ :export (slib:load slib:load-source defmacro:load
+ implementation-vicinity library-vicinity home-vicinity
Copied: trunk/dports/lang/guile/files/patch-srfi-60.c.diff (from rev 33040, trunk/dports/lang/guile/files/fix-64bit-problems.diff)
===================================================================
--- trunk/dports/lang/guile/files/patch-srfi-60.c.diff (rev 0)
+++ trunk/dports/lang/guile/files/patch-srfi-60.c.diff 2008-01-17 04:57:01 UTC (rev 33041)
@@ -0,0 +1,22 @@
+Index: sid/srfi/srfi-60.c
+===================================================================
+--- sid.orig/srfi/srfi-60.c 2006-11-30 23:40:16.000000000 -0800
++++ ./srfi/srfi-60.c 2006-11-30 23:40:18.000000000 -0800
+@@ -59,7 +59,7 @@
+
+
+ SCM_DEFINE (scm_srfi60_copy_bit, "copy-bit", 3, 0, 0,
+- (SCM index, SCM n, SCM bit),
++ (SCM index, SCM n, SCM newbit),
+ "Return @var{n} with the bit at @var{index} set according to\n"
+ "@var{newbit}. @var{newbit} should be @code{#t} to set the bit\n"
+ "to 1, or @code{#f} to set it to 0. Bits other than at\n"
+@@ -75,7 +75,7 @@
+ int bb;
+
+ ii = scm_to_ulong (index);
+- bb = scm_to_bool (bit);
++ bb = scm_to_bool (newbit);
+
+ if (SCM_I_INUMP (n))
+ {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080116/d24bda89/attachment.html
More information about the macports-changes
mailing list