Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages
In directory
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv868/main/finkinfo/languages
Modified Files:
Tag: pangocairo-branch
guile.info guile16.info
Added Files:
Tag: pangocairo-branch
guile18.info guile18.patch
Log Message:
merges from HEAD, forgot to commit these before
Index: guile16.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/guile16.info,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -d -r1.4.2.1 -r1.4.2.2
--- guile16.info 16 Jan 2007 16:02:47 -0000 1.4.2.1
+++ guile16.info 28 Jan 2007 18:22:20 -0000 1.4.2.2
@@ -1,6 +1,6 @@
Package: guile16
Version: 1.6.7
-Revision: 1011
+Revision: 1012
BuildDepends: readline5 (>= 5.0-1004), libncurses5 (>= 5.4-20041023-1006)
Depends: %N-shlibs (= %v-%r), %N-libs (= %v-%r)
GCC: 4.0
@@ -62,8 +62,8 @@
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)
+ DocFile: 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: <<
--- NEW FILE: guile18.info ---
Package: guile18
Version: 1.8.1
Revision: 1
BuildDepends: readline5 (>= 5.0-1004), libncurses5 (>= 5.4-20041023-1006),
libtool14
Depends: %N-shlibs (= %v-%r), %N-libs (= %v-%r), libtool14-shlibs
GCC: 4.0
Source: mirror:gnu:guile/guile-%v.tar.gz
Source-MD5: be792074780d597208a8cdfed976f559
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)
DocFile: 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/unstable/main/finkinfo/languages/guile.info,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -d -r1.4.2.1 -r1.4.2.2
--- guile.info 16 Jan 2007 16:02:45 -0000 1.4.2.1
+++ guile.info 28 Jan 2007 18:22:20 -0000 1.4.2.2
@@ -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/libguile/numbers.c guile-1.8.1/libguile/numbers.c
--- guile-1.8.1-orig/libguile/numbers.c 2007-01-18 21:52:24.000000000 -0800
+++ guile-1.8.1/libguile/numbers.c 2007-01-19 01:28:07.000000000 -0800
@@ -452,28 +452,21 @@
/* No, it's a proper fraction.
*/
- return scm_double_cell (scm_tc16_fraction,
- SCM_UNPACK (numerator),
- SCM_UNPACK (denominator), 0);
+ {
+ SCM divisor = scm_gcd (numerator, denominator);
+ if (!(scm_is_eq (divisor, SCM_I_MAKINUM(1))))
+ {
+ numerator = scm_divide (numerator, divisor);
+ denominator = scm_divide (denominator, divisor);
+ }
+
+ return scm_double_cell (scm_tc16_fraction,
+ SCM_UNPACK (numerator),
+ SCM_UNPACK (denominator), 0);
+ }
}
#undef FUNC_NAME
-static void scm_i_fraction_reduce (SCM z)
-{
- if (!(SCM_FRACTION_REDUCED (z)))
- {
- SCM divisor;
- divisor = scm_gcd (SCM_FRACTION_NUMERATOR (z), SCM_FRACTION_DENOMINATOR
(z));
- if (!(scm_is_eq (divisor, SCM_I_MAKINUM(1))))
- {
- /* is this safe? */
- SCM_FRACTION_SET_NUMERATOR (z, scm_divide (SCM_FRACTION_NUMERATOR
(z), divisor));
- SCM_FRACTION_SET_DENOMINATOR (z, scm_divide (SCM_FRACTION_DENOMINATOR
(z), divisor));
- }
- SCM_FRACTION_REDUCED_SET (z);
- }
-}
-
double
scm_i_fraction2double (SCM z)
{
@@ -2387,7 +2380,6 @@
}
else if (SCM_FRACTIONP (n))
{
- scm_i_fraction_reduce (n);
return scm_string_append (scm_list_3 (scm_number_to_string
(SCM_FRACTION_NUMERATOR (n), radix),
scm_from_locale_string ("/"),
scm_number_to_string
(SCM_FRACTION_DENOMINATOR (n), radix)));
@@ -2441,7 +2433,6 @@
scm_i_print_fraction (SCM sexp, SCM port, scm_print_state *pstate SCM_UNUSED)
{
SCM str;
- scm_i_fraction_reduce (sexp);
str = scm_number_to_string (sexp, SCM_UNDEFINED);
scm_lfwrite (scm_i_string_chars (str), scm_i_string_length (str), port);
scm_remember_upto_here_1 (str);
@@ -3109,8 +3100,6 @@
SCM
scm_i_fraction_equalp (SCM x, SCM y)
{
- scm_i_fraction_reduce (x);
- scm_i_fraction_reduce (y);
if (scm_is_false (scm_equal_p (SCM_FRACTION_NUMERATOR (x),
SCM_FRACTION_NUMERATOR (y)))
|| scm_is_false (scm_equal_p (SCM_FRACTION_DENOMINATOR (x),
@@ -5424,10 +5413,7 @@
else if (SCM_BIGP (z))
return z;
else if (SCM_FRACTIONP (z))
- {
- scm_i_fraction_reduce (z);
- return SCM_FRACTION_NUMERATOR (z);
- }
+ return SCM_FRACTION_NUMERATOR (z);
else if (SCM_REALP (z))
return scm_exact_to_inexact (scm_numerator (scm_inexact_to_exact (z)));
else
@@ -5446,10 +5432,7 @@
else if (SCM_BIGP (z))
return SCM_I_MAKINUM (1);
else if (SCM_FRACTIONP (z))
- {
- scm_i_fraction_reduce (z);
- return SCM_FRACTION_DENOMINATOR (z);
- }
+ return SCM_FRACTION_DENOMINATOR (z);
else if (SCM_REALP (z))
return scm_exact_to_inexact (scm_denominator (scm_inexact_to_exact (z)));
else
diff -ruN guile-1.8.1-orig/libguile/numbers.h guile-1.8.1/libguile/numbers.h
--- guile-1.8.1-orig/libguile/numbers.h 2007-01-18 21:52:24.000000000 -0800
+++ guile-1.8.1/libguile/numbers.h 2007-01-19 01:28:07.000000000 -0800
@@ -157,14 +157,6 @@
#define SCM_FRACTIONP(x) (!SCM_IMP (x) && SCM_TYP16 (x) == scm_tc16_fraction)
#define SCM_FRACTION_NUMERATOR(x) (SCM_CELL_OBJECT_1 (x))
#define SCM_FRACTION_DENOMINATOR(x) (SCM_CELL_OBJECT_2 (x))
-#define SCM_FRACTION_SET_NUMERATOR(x, v) (SCM_SET_CELL_OBJECT_1 ((x), (v)))
-#define SCM_FRACTION_SET_DENOMINATOR(x, v) (SCM_SET_CELL_OBJECT_2 ((x), (v)))
-
- /* I think the left half word is free in the type, so I'll use bit 17 */
-#define SCM_FRACTION_REDUCED_BIT 0x10000
-#define SCM_FRACTION_REDUCED_SET(x) (SCM_SET_CELL_TYPE((x), (SCM_CELL_TYPE (x)
| SCM_FRACTION_REDUCED_BIT)))
-#define SCM_FRACTION_REDUCED_CLEAR(x) (SCM_SET_CELL_TYPE((x), (SCM_CELL_TYPE
(x) & ~SCM_FRACTION_REDUCED_BIT)))
-#define SCM_FRACTION_REDUCED(x) (0x10000 & SCM_CELL_TYPE (x))
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 \
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
