Revision: 31676 http://trac.macosforge.org/projects/macports/changeset/31676 Author: ryandesign@macports.org Date: 2007-12-02 15:13:00 -0800 (Sun, 02 Dec 2007) Log Message: ----------- guile16: fix names of patchfiles to conform to recommendations Modified Paths: -------------- trunk/dports/lang/guile16/Portfile Added Paths: ----------- trunk/dports/lang/guile16/files/patch-guile.c.diff trunk/dports/lang/guile16/files/patch-posix.c.diff trunk/dports/lang/guile16/files/patch-scmsigs.c.diff Removed Paths: ------------- trunk/dports/lang/guile16/files/patch-guile.c trunk/dports/lang/guile16/files/patch-posix.c trunk/dports/lang/guile16/files/patch-scmsigs.c Modified: trunk/dports/lang/guile16/Portfile =================================================================== --- trunk/dports/lang/guile16/Portfile 2007-12-02 23:06:10 UTC (rev 31675) +++ trunk/dports/lang/guile16/Portfile 2007-12-02 23:13:00 UTC (rev 31676) @@ -42,9 +42,9 @@ checksums md5 2756b01f428b910d33267aeaa0e2d59a -patchfiles patch-scmsigs.c \ - patch-posix.c \ - patch-guile.c +patchfiles patch-scmsigs.c.diff \ + patch-posix.c.diff \ + patch-guile.c.diff depends_lib port:readline Deleted: trunk/dports/lang/guile16/files/patch-guile.c =================================================================== --- trunk/dports/lang/guile16/files/patch-guile.c 2007-12-02 23:06:10 UTC (rev 31675) +++ trunk/dports/lang/guile16/files/patch-guile.c 2007-12-02 23:13:00 UTC (rev 31676) @@ -1,11 +0,0 @@ ---- libguile/guile.c.org 2005-06-23 08:43:29.000000000 +0200 -+++ libguile/guile.c 2005-06-23 08:44:09.000000000 +0200 -@@ -88,7 +88,7 @@ - { - #ifdef DYNAMIC_LINKING - /* libtool automagically inserts this variable into your executable... */ -- extern const scm_lt_dlsymlist lt_preloaded_symbols[]; -+ extern const scm_lt_dlsymlist *lt_preloaded_symbols; - scm_lt_dlpreload_default (lt_preloaded_symbols); - #endif - scm_boot_guile (argc, argv, inner_main, 0); Copied: trunk/dports/lang/guile16/files/patch-guile.c.diff (from rev 31661, trunk/dports/lang/guile16/files/patch-guile.c) =================================================================== --- trunk/dports/lang/guile16/files/patch-guile.c.diff (rev 0) +++ trunk/dports/lang/guile16/files/patch-guile.c.diff 2007-12-02 23:13:00 UTC (rev 31676) @@ -0,0 +1,11 @@ +--- libguile/guile.c.org 2005-06-23 08:43:29.000000000 +0200 ++++ libguile/guile.c 2005-06-23 08:44:09.000000000 +0200 +@@ -88,7 +88,7 @@ + { + #ifdef DYNAMIC_LINKING + /* libtool automagically inserts this variable into your executable... */ +- extern const scm_lt_dlsymlist lt_preloaded_symbols[]; ++ extern const scm_lt_dlsymlist *lt_preloaded_symbols; + scm_lt_dlpreload_default (lt_preloaded_symbols); + #endif + scm_boot_guile (argc, argv, inner_main, 0); Deleted: trunk/dports/lang/guile16/files/patch-posix.c =================================================================== --- trunk/dports/lang/guile16/files/patch-posix.c 2007-12-02 23:06:10 UTC (rev 31675) +++ trunk/dports/lang/guile16/files/patch-posix.c 2007-12-02 23:13:00 UTC (rev 31676) @@ -1,16 +0,0 @@ ---- libguile/posix.c.sav Tue Jan 25 19:01:44 2005 -+++ libguile/posix.c Tue Jan 25 19:01:55 2005 -@@ -1257,6 +1257,13 @@ - SCM_MEMORY_ERROR; - strncpy (ptr, SCM_STRING_CHARS (str), SCM_STRING_LENGTH (str)); - ptr[SCM_STRING_LENGTH (str)] = 0; -+#if defined(macosx) -+ if (!strchr(ptr, '=')) { -+ unsetenv(ptr); -+ rv = 0; -+ } -+ else -+#endif - rv = putenv (ptr); - if (rv < 0) - SCM_SYSERROR; Copied: trunk/dports/lang/guile16/files/patch-posix.c.diff (from rev 31661, trunk/dports/lang/guile16/files/patch-posix.c) =================================================================== --- trunk/dports/lang/guile16/files/patch-posix.c.diff (rev 0) +++ trunk/dports/lang/guile16/files/patch-posix.c.diff 2007-12-02 23:13:00 UTC (rev 31676) @@ -0,0 +1,16 @@ +--- libguile/posix.c.sav Tue Jan 25 19:01:44 2005 ++++ libguile/posix.c Tue Jan 25 19:01:55 2005 +@@ -1257,6 +1257,13 @@ + SCM_MEMORY_ERROR; + strncpy (ptr, SCM_STRING_CHARS (str), SCM_STRING_LENGTH (str)); + ptr[SCM_STRING_LENGTH (str)] = 0; ++#if defined(macosx) ++ if (!strchr(ptr, '=')) { ++ unsetenv(ptr); ++ rv = 0; ++ } ++ else ++#endif + rv = putenv (ptr); + if (rv < 0) + SCM_SYSERROR; Deleted: trunk/dports/lang/guile16/files/patch-scmsigs.c =================================================================== --- trunk/dports/lang/guile16/files/patch-scmsigs.c 2007-12-02 23:06:10 UTC (rev 31675) +++ trunk/dports/lang/guile16/files/patch-scmsigs.c 2007-12-02 23:13:00 UTC (rev 31676) @@ -1,11 +0,0 @@ ---- libguile/scmsigs.c.sav Tue Feb 11 22:07:54 2003 -+++ libguile/scmsigs.c Tue Feb 11 22:08:18 2003 -@@ -66,7 +66,7 @@ - /* The thread system has its own sleep and usleep functions. */ - #ifndef USE_THREADS - --#if defined(MISSING_SLEEP_DECL) -+#if defined(MISSING_SLEEP_DECL) && ! defined(macosx) - int sleep (); - #endif - Copied: trunk/dports/lang/guile16/files/patch-scmsigs.c.diff (from rev 31661, trunk/dports/lang/guile16/files/patch-scmsigs.c) =================================================================== --- trunk/dports/lang/guile16/files/patch-scmsigs.c.diff (rev 0) +++ trunk/dports/lang/guile16/files/patch-scmsigs.c.diff 2007-12-02 23:13:00 UTC (rev 31676) @@ -0,0 +1,11 @@ +--- libguile/scmsigs.c.sav Tue Feb 11 22:07:54 2003 ++++ libguile/scmsigs.c Tue Feb 11 22:08:18 2003 +@@ -66,7 +66,7 @@ + /* The thread system has its own sleep and usleep functions. */ + #ifndef USE_THREADS + +-#if defined(MISSING_SLEEP_DECL) ++#if defined(MISSING_SLEEP_DECL) && ! defined(macosx) + int sleep (); + #endif +