Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/languages
In directory sc8-pr-cvs17:/tmp/cvs-serv8709
Modified Files:
guile.info guile16.info guile16.patch
Added Files:
guile18.info guile18.patch
Log Message:
move to stable, with maintainer's permission
Index: guile16.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/guile16.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- guile16.patch 24 Jan 2006 16:33:05 -0000 1.1
+++ guile16.patch 12 Sep 2007 17:37:30 -0000 1.2
@@ -83,32 +83,50 @@
+export PATH
+eval "$@"
diff -urN guile-1.6.7.orig/libguile/posix.c guile-1.6.7/libguile/posix.c
---- guile-1.6.7.orig/libguile/posix.c 2004-12-14 14:21:39.000000000 +0900
-+++ guile-1.6.7/libguile/posix.c 2005-02-28 23:08:00.000000000 +0900
-@@ -117,7 +117,12 @@
+--- guile-1.6.7.orig/libguile/posix.c 2004-12-14 00:21:39.000000000 -0500
++++ guile-1.6.7/libguile/posix.c 2006-08-22 20:11:16.000000000 -0400
+@@ -117,7 +117,17 @@
#include <signal.h>
-+#if defined(__APPLE__) && defined(__DYNAMIC__)
-+#include <crt_externs.h>
-+char ** environ = NULL;
++#if HAVE_CRT_EXTERNS_H
++#include <crt_externs.h> /* for Darwin _NSGetEnviron */
++#endif
++/* On Apple Darwin in a shared library there's no "environ" to access
++ directly, instead the address of that variable must be obtained with
++ _NSGetEnviron(). */
++#if HAVE__NSGETENVIRON
++#define environ (*_NSGetEnviron())
+#else
extern char ** environ;
+#endif
#ifdef HAVE_GRP_H
#include <grp.h>
-@@ -1068,6 +1073,9 @@
- "then the return value is unspecified.")
- #define FUNC_NAME s_scm_environ
- {
-+#if defined(__APPLE__) && defined(__DYNAMIC__)
-+ environ = *_NSGetEnviron();
-+#endif
- if (SCM_UNBNDP (env))
- return scm_makfromstrs (-1, environ);
- else
-@@ -1257,6 +1265,13 @@
+@@ -159,9 +169,6 @@
+ # include <sys/file.h>
+ #endif
+
+-#if HAVE_CRT_EXTERNS_H
+-#include <crt_externs.h> /* for Darwin _NSGetEnviron */
+-#endif
+
+ /* Some Unix systems don't define these. CPP hair is dangerous, but
+ this seems safe enough... */
+@@ -200,12 +207,6 @@
+ above means that _POSIX_SOURCE may be #defined, which will
+ encourage header files to do strange things. */
+
+-/* On Apple Darwin in a shared library there's no "environ" to access
+- directly, instead the address of that variable must be obtained with
+- _NSGetEnviron(). */
+-#if HAVE__NSGETENVIRON && defined (PIC)
+-#define environ (*_NSGetEnviron())
+-#endif
+
+
+ SCM_SYMBOL (sym_read_pipe, "read pipe");
+@@ -1257,6 +1258,13 @@
SCM_MEMORY_ERROR;
strncpy (ptr, SCM_STRING_CHARS (str), SCM_STRING_LENGTH (str));
ptr[SCM_STRING_LENGTH (str)] = 0;
Index: guile16.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/guile16.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- guile16.info 13 Jan 2007 19:27:15 -0000 1.4
+++ guile16.info 12 Sep 2007 17:37:30 -0000 1.5
@@ -1,7 +1,7 @@
Package: guile16
Version: 1.6.7
-Revision: 1010
-BuildDepends: readline (>= 4.3-1028), libncurses5 (>= 5.4-20041023-1006)
+Revision: 1013
+BuildDepends: readline5 (>= 5.0-1004), libncurses5 (>= 5.4-20041023-1006)
Depends: %N-shlibs (= %v-%r), %N-libs (= %v-%r)
GCC: 4.0
Source: mirror:gnu:guile/guile-%v.tar.gz
@@ -55,15 +55,15 @@
share/guile/1.6
<<
DocFiles: COPYING
- Depends: readline-shlibs (>= 4.3-1028), %N-shlibs (= %v-%r)
+ Depends: readline5-shlibs (>= 5.0-1004), %N-shlibs (= %v-%r)
Description: Scheme libraries and modules for guile16
<<
SplitOff3: <<
Package: %N-dev
BuildDependsOnly: True
Depends: %N-shlibs (= %v-%r)
- Replaces: guile-dev
- Conflicts: guile-dev
+ Replaces: guile-dev, guile18-dev
+ Conflicts: guile-dev, guile18-dev
Files: <<
include
share/aclocal
@@ -77,8 +77,16 @@
DocFiles: COPYING
Description: Development package for guile16
<<
+SplitOff4: <<
+ Package: %N-doc
+ Conflicts: guile18-doc, guile16 (<= 1.6.7-1011)
+ Replaces: guile18-doc, guile16 (<= 1.6.7-1011)
+ DocFiles: COPYING
+ Files: share/info
+ InfoDocs: guile.info guile-tut.info goops.info r5rs.info
+ Description: Texinfo documentation files for guile16
+<<
DocFiles: README COPYING AUTHORS HACKING NEWS THANKS
-InfoDocs: guile.info guile-tut.info goops.info r5rs.info
#
Description: Embedable Scheme interpreter
DescPort: <<
@@ -89,6 +97,8 @@
ensure it links against the just built libs.
Patched makefiles to replace -export-dynamic with -module.
Made the main packages not conflict with guile-1.4
+
+Make sure to declare the darwinish _environ symbol before using it.
<<
License: GPL
Homepage: http://www.gnu.org/software/guile/guile.html
--- NEW FILE: guile18.info ---
Package: guile18
Version: 1.8.2
Revision: 2
BuildDepends: readline5 (>= 5.0-1004), libncurses5 (>= 5.4-20041023-1006),
libtool14, gmp, libiconv-dev
Depends: %N-shlibs (= %v-%r), %N-libs (= %v-%r), libtool14-shlibs, gmp-shlibs,
libiconv
GCC: 4.0
Source: mirror:gnu:guile/guile-%v.tar.gz
Source-MD5: a4b64a992deae0532f8015bcc6c40784
PatchScript: <<
sed 's|@FINKPREFIX@|%p|g' <%a/%n.patch | patch -p1
perl -i -pe 's|GUILE-guile|GUILE-guile-1.8|' scripts/*
perl -i -pe 's|(lt_dlinit\s*\(\s*\))|\1; lt_dladdsearchdir("\%p/lib")|'
libguile/dynl.c
<<
ConfigureParams: --infodir=%p/share/info
--program-transform-name="s|guile|guile\-1\.8|g" --disable-dependency-tracking
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
SetCPPFLAGS: -Dmacosx
CompileScript: <<
#! /bin/sh -ex
export LIBRARY_PATH=%p/lib
export CPATH=%p/include
./configure %c
echo "#undef LTDL_DLOPEN_DEPLIBS" >> config.h
echo "#define LTDL_SHLIB_EXT \".so\"" >> config.h
echo "#undef HAVE_STAT64" >> config.h
make
<<
InstallScript: <<
make -j1 install DESTDIR=%d
install -m 755 guile18-build %i/bin/guile18-build
mkdir -p %i/share/guile/1.8/scripts/binoverride
ln -s %p/bin/guile-1.8 %i/share/guile/1.8/scripts/binoverride/guile
ln -s %p/bin/guile-1.8-config
%i/share/guile/1.8/scripts/binoverride/guile-config
ln -s %p/bin/guile-1.8-tools %i/share/guile/1.8/scripts/binoverride/guile-tools
ln -s %p/bin/guile-1.8-snarf %i/share/guile/1.8/scripts/binoverride/guile-snarf
<<
SplitOff: <<
Package: %N-shlibs
Depends: libncurses5-shlibs (>= 5.4-20041023-1006)
Files: <<
lib/libguile.*.dylib
<<
DocFiles: COPYING
Shlibs: <<
%p/lib/libguile.17.dylib 18.0.0 %n (>= 1.8.1-1)
<<
Description: Shared libraries for guile18
<<
SplitOff2: <<
Package: %N-libs
Files: <<
lib/libguile-srfi-srfi-13-14-v-3.*
lib/libguile-srfi-srfi-4-v-3.*
lib/libguile-srfi-srfi-1-v-3.*
lib/libguile-srfi-srfi-60-v-2.*
lib/libguilereadline-v-17.*
share/guile/1.8
<<
DocFiles: COPYING
Depends: readline5-shlibs (>= 5.0-1004), %N-shlibs (= %v-%r)
Description: Scheme libraries and modules for guile18
<<
SplitOff3: <<
Package: %N-dev
BuildDependsOnly: True
Depends: %N-shlibs (= %v-%r)
Replaces: guile-dev, guile16-dev
Conflicts: guile-dev, guile16-dev
Files: <<
include
share/aclocal
lib/libguile.a
lib/libguile.la
lib/libguile.dylib
<<
DocFiles: COPYING
Description: Development package for guile18
<<
SplitOff4: <<
Package: %N-doc
Conflicts: guile16-doc, guile16 (<= 1.6.7-1011)
Replaces: guile16-doc, guile16 (<= 1.6.7-1011)
DocFiles: COPYING
Files: share/info
InfoDocs: guile.info guile-tut.info goops.info r5rs.info
Description: Texinfo files for guile18
<<
DocFiles: README COPYING AUTHORS HACKING NEWS THANKS
#
Description: Embedable Scheme interpreter
DescPort: <<
Thread support currently disabled (configure's default).
"borrowed" a patch from darwinports to posix.c makes it
pass make check.
Patched libtool to make it build two level namespace and
ensure it links against the just built libs.
Patched makefiles to replace -export-dynamic with -module.
Made the main packages not conflict with guile-1.4
Make sure to declare the darwinish _environ symbol before using it.
<<
License: GPL
Homepage: http://www.gnu.org/software/guile/guile.html
Maintainer: Matthias Neeracher <[EMAIL PROTECTED]>
Index: guile.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/guile.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- guile.info 13 Jan 2007 19:27:14 -0000 1.5
+++ guile.info 12 Sep 2007 17:37:30 -0000 1.6
@@ -1,8 +1,8 @@
Package: guile
Version: 1.4
-Revision: 1028
+Revision: 1029
Depends: %N-shlibs (= %v-%r)
-BuildDepends: readline (>= 4.3-1028), ncurses-dev (>= 5.3-20031018-1501)
+BuildDepends: readline (>= 4.3-1028), libncurses5 (>= 5.4-20041023-1006)
Source: gnu
UpdateLibtool: true
NoSetCPPFlags: true
@@ -20,7 +20,7 @@
<<
SplitOff: <<
Package: %N-shlibs
- Depends: readline-shlibs (>= 4.3-1028), ncurses (>= 5.4-20041023-1006),
ncurses-shlibs (>= 5.3-20031018-1501)
+ Depends: readline-shlibs (>= 4.3-1028), ncurses (>= 5.4-20041023-1006),
libncurses5-shlibs (>= 5.4-20041023-1006)
Replaces: %N (<= 1.4-3)
Files: lib/libguile.*.dylib lib/libguilereadline.*.dylib
Shlibs: <<
@@ -33,8 +33,8 @@
Package: %N-dev
BuildDependsOnly: True
Depends: %N-shlibs (= %v-%r)
- Replaces: guile16-dev
- Conflicts: guile16-dev
+ Replaces: guile16-dev, guile18-dev
+ Conflicts: guile16-dev, guile18-dev
Files: include lib/*.a lib/*.la lib/libguile.dylib
lib/libguilereadline.dylib share/aclocal
DocFiles: README COPYING AUTHORS NEWS THANKS
<<
--- NEW FILE: guile18.patch ---
diff -ruN guile-1.8.1-orig/guile-config/guile-config.in
guile-1.8.1/guile-config/guile-config.in
--- guile-1.8.1-orig/guile-config/guile-config.in 2007-01-18
21:52:24.000000000 -0800
+++ guile-1.8.1/guile-config/guile-config.in 2007-01-18 21:53:35.000000000
-0800
@@ -1,4 +1,4 @@
[EMAIL PROTECTED]@/guile \
[EMAIL PROTECTED]@/guile-1.8 \
-e main -s
!#
;;;; guile-config --- utility for linking programs with Guile
diff -ruN guile-1.8.1-orig/guile-config/guile.m4
guile-1.8.1/guile-config/guile.m4
--- guile-1.8.1-orig/guile-config/guile.m4 2007-01-18 21:52:24.000000000
-0800
+++ guile-1.8.1/guile-config/guile.m4 2007-01-18 21:54:36.000000000 -0800
@@ -47,17 +47,17 @@
# The variables are marked for substitution, as by @code{AC_SUBST}.
#
AC_DEFUN([GUILE_PROGS],
- [AC_PATH_PROG(GUILE,guile)
+ [AC_PATH_PROG(GUILE,guile-1.8)
if test "$GUILE" = "" ; then
AC_MSG_ERROR([guile required but not found])
fi
AC_SUBST(GUILE)
- AC_PATH_PROG(GUILE_CONFIG,guile-config)
+ AC_PATH_PROG(GUILE_CONFIG,guile-1.8-config)
if test "$GUILE_CONFIG" = "" ; then
AC_MSG_ERROR([guile-config required but not found])
fi
AC_SUBST(GUILE_CONFIG)
- AC_PATH_PROG(GUILE_TOOLS,guile-tools)
+ AC_PATH_PROG(GUILE_TOOLS,guile-1.8-tools)
AC_SUBST(GUILE_TOOLS)
])
diff -ruN guile-1.8.1-orig/guile-readline/Makefile.in
guile-1.8.1/guile-readline/Makefile.in
--- guile-1.8.1-orig/guile-readline/Makefile.in 2007-01-18 21:52:24.000000000
-0800
+++ guile-1.8.1/guile-readline/Makefile.in 2007-01-19 01:55:33.000000000
-0800
@@ -220,7 +220,7 @@
lib_LTLIBRARIES = [EMAIL PROTECTED]@.la
[EMAIL PROTECTED]@_la_SOURCES = readline.c
[EMAIL PROTECTED]@_la_LIBADD = ../libguile/libguile.la
[EMAIL PROTECTED]@_la_LDFLAGS = -version-info @LIBGUILEREADLINE_INTERFACE@
-export-dynamic -no-undefined
[EMAIL PROTECTED]@_la_LDFLAGS = -version-info @LIBGUILEREADLINE_INTERFACE@
-module -no-undefined
BUILT_SOURCES = readline.x
pkginclude_HEADERS = readline.h
snarfcppopts = $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
diff -ruN guile-1.8.1-orig/guile18-build guile-1.8.1/guile18-build
--- guile-1.8.1-orig/guile18-build 1969-12-31 16:00:00.000000000 -0800
+++ guile-1.8.1/guile18-build 2007-01-18 21:56:19.000000000 -0800
@@ -0,0 +1,10 @@
+#! /bin/sh
+GUILE=guile-1.8
+GUILE_CONFIG=guile-1.8-config
+GUILE_TOOLS=guile-1.8-tools
+PATH="@FINKPREFIX@/share/guile/1.8/scripts/binoverride:$PATH"
+export GUILE
+export GUILE_CONFIG
+export GUILE_TOOLS
+export PATH
+eval "$@"
diff -ruN guile-1.8.1-orig/srfi/Makefile.in guile-1.8.1/srfi/Makefile.in
--- guile-1.8.1-orig/srfi/Makefile.in 2007-01-18 21:52:24.000000000 -0800
+++ guile-1.8.1/srfi/Makefile.in 2007-01-19 01:57:14.000000000 -0800
@@ -320,16 +320,16 @@
BUILT_SOURCES = srfi-1.x srfi-4.x srfi-13.x srfi-14.x srfi-60.x
[EMAIL PROTECTED]@_la_SOURCES = srfi-1.x srfi-1.c
[EMAIL PROTECTED]@_la_LIBADD = ../libguile/libguile.la
[EMAIL PROTECTED]@_la_LDFLAGS = -no-undefined -export-dynamic -version-info
@LIBGUILE_SRFI_SRFI_1_INTERFACE@
[EMAIL PROTECTED]@_la_LDFLAGS = -no-undefined -module -version-info
@LIBGUILE_SRFI_SRFI_1_INTERFACE@
[EMAIL PROTECTED]@_la_SOURCES = srfi-4.x srfi-4.c
[EMAIL PROTECTED]@_la_LIBADD = ../libguile/libguile.la
[EMAIL PROTECTED]@_la_LDFLAGS = -no-undefined -export-dynamic -version-info
@LIBGUILE_SRFI_SRFI_4_INTERFACE@
[EMAIL PROTECTED]@_la_LDFLAGS = -no-undefined -module -version-info
@LIBGUILE_SRFI_SRFI_4_INTERFACE@
[EMAIL PROTECTED]@_la_SOURCES = srfi-13.x srfi-13.c srfi-14.x srfi-14.c
[EMAIL PROTECTED]@_la_LIBADD = ../libguile/libguile.la
[EMAIL PROTECTED]@_la_LDFLAGS = -no-undefined -export-dynamic -version-info
@LIBGUILE_SRFI_SRFI_13_14_INTERFACE@
[EMAIL PROTECTED]@_la_LDFLAGS = -no-undefined -module -version-info
@LIBGUILE_SRFI_SRFI_13_14_INTERFACE@
[EMAIL PROTECTED]@_la_SOURCES = srfi-60.x srfi-60.c
[EMAIL PROTECTED]@_la_LIBADD = ../libguile/libguile.la
[EMAIL PROTECTED]@_la_LDFLAGS = -no-undefined -export-dynamic -version-info
@LIBGUILE_SRFI_SRFI_60_INTERFACE@
[EMAIL PROTECTED]@_la_LDFLAGS = -no-undefined -module -version-info
@LIBGUILE_SRFI_SRFI_60_INTERFACE@
srfidir = $(datadir)/guile/$(GUILE_EFFECTIVE_VERSION)/srfi
srfi_DATA = srfi-1.scm \
srfi-2.scm \
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
