summaryrefslogtreecommitdiff
path: root/lang/guile/patches
diff options
context:
space:
mode:
Diffstat (limited to 'lang/guile/patches')
-rw-r--r--lang/guile/patches/patch-ad26
-rw-r--r--lang/guile/patches/patch-ae20
-rw-r--r--lang/guile/patches/patch-af22
-rw-r--r--lang/guile/patches/patch-ag22
-rw-r--r--lang/guile/patches/patch-ai6
5 files changed, 48 insertions, 48 deletions
diff --git a/lang/guile/patches/patch-ad b/lang/guile/patches/patch-ad
index fee029a8825..a293605b738 100644
--- a/lang/guile/patches/patch-ad
+++ b/lang/guile/patches/patch-ad
@@ -1,22 +1,22 @@
-$NetBSD: patch-ad,v 1.6 2003/12/14 17:14:40 wiz Exp $
+$NetBSD: patch-ad,v 1.7 2004/11/18 12:30:49 wiz Exp $
---- guile-readline/Makefile.in.orig 2003-04-21 20:23:33.000000000 +0200
+--- guile-readline/Makefile.in.orig 2004-10-05 05:58:19.000000000 +0200
+++ guile-readline/Makefile.in
-@@ -135,7 +135,7 @@ lib_LTLIBRARIES = libguilereadline-v-@LI
+@@ -61,7 +61,7 @@ am__vpath_adj = case $$p in \
+ esac;
+ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgincludedir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
++libLTLIBRARIES_INSTALL = $(INSTALL_DATA)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_DEPENDENCIES = \
+ ../libguile/libguile.la
+@@ -215,7 +215,7 @@ lib_LTLIBRARIES = libguilereadline-v-@LI
libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_SOURCES = readline.c
libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_LIBADD = ../libguile/libguile.la
libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_LDFLAGS = -version-info @LIBGUILEREADLINE_INTERFACE@ \
- -export-dynamic -no-undefined
+ -export-dynamic
-
BUILT_SOURCES = readline.x
-@@ -208,7 +208,7 @@ $(srcdir)/configure: $(srcdir)/configur
-
- $(ACLOCAL_M4): configure.in
- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
--libLTLIBRARIES_INSTALL = $(INSTALL)
-+libLTLIBRARIES_INSTALL = $(INSTALL_DATA)
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(libdir)
+ pkginclude_HEADERS = readline.h
diff --git a/lang/guile/patches/patch-ae b/lang/guile/patches/patch-ae
index 7186b5f627a..95d9c07ad9f 100644
--- a/lang/guile/patches/patch-ae
+++ b/lang/guile/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.9 2004/03/16 00:46:39 dmcmahill Exp $
+$NetBSD: patch-ae,v 1.10 2004/11/18 12:30:49 wiz Exp $
---- libguile/gc_os_dep.c.orig Wed Apr 16 20:16:21 2003
+--- libguile/gc_os_dep.c.orig 2004-06-16 00:55:31.000000000 +0200
+++ libguile/gc_os_dep.c
-@@ -98,12 +98,27 @@ typedef int GC_bool;
+@@ -112,12 +112,27 @@ typedef int GC_bool;
# define NETBSD
# define mach_type_known
# endif
@@ -32,7 +32,7 @@ $NetBSD: patch-ae,v 1.9 2004/03/16 00:46:39 dmcmahill Exp $
# define ARM32
# define NETBSD
# define mach_type_known
-@@ -227,7 +242,7 @@ typedef int GC_bool;
+@@ -241,7 +256,7 @@ typedef int GC_bool;
# endif
# if defined(__alpha) || defined(__alpha__)
# define ALPHA
@@ -41,7 +41,7 @@ $NetBSD: patch-ae,v 1.9 2004/03/16 00:46:39 dmcmahill Exp $
# define OSF1 /* a.k.a Digital Unix */
# endif
# define mach_type_known
-@@ -279,6 +294,11 @@ typedef int GC_bool;
+@@ -294,6 +309,11 @@ typedef int GC_bool;
# define NETBSD
# define mach_type_known
# endif
@@ -53,7 +53,7 @@ $NetBSD: patch-ae,v 1.9 2004/03/16 00:46:39 dmcmahill Exp $
# if defined(bsdi) && defined(i386)
# define I386
# define BSDI
-@@ -412,12 +432,12 @@ typedef int GC_bool;
+@@ -433,12 +453,12 @@ scm_get_stack_base ()
/*
* For each architecture and OS, the following need to be defined:
*
@@ -69,11 +69,10 @@ $NetBSD: patch-ae,v 1.9 2004/03/16 00:46:39 dmcmahill Exp $
*
* MACH_TYPE is a string representation of the machine type.
* OS_TYPE is analogous for the OS.
-@@ -961,6 +981,21 @@ typedef int GC_bool;
- # define OS_TYPE "GNU"
+@@ -983,6 +1003,21 @@ scm_get_stack_base ()
# endif
# endif
-+
+
+# ifdef X86_64
+# define MACH_TYPE "X86_64"
+# define ALIGNMENT 8
@@ -88,6 +87,7 @@ $NetBSD: patch-ae,v 1.9 2004/03/16 00:46:39 dmcmahill Exp $
+# define DATASTART ((ptr_t)(&etext))
+# endif
+# endif
-
++
# ifdef NS32K
# define MACH_TYPE "NS32K"
+ # define ALIGNMENT 4
diff --git a/lang/guile/patches/patch-af b/lang/guile/patches/patch-af
index b7dbaf36735..2089c640d17 100644
--- a/lang/guile/patches/patch-af
+++ b/lang/guile/patches/patch-af
@@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.2 2003/12/14 17:14:40 wiz Exp $
+$NetBSD: patch-af,v 1.3 2004/11/18 12:30:49 wiz Exp $
---- doc/ref/Makefile.in.orig 2003-04-21 19:02:49.000000000 +0200
+--- doc/ref/Makefile.in.orig 2004-10-05 05:34:07.000000000 +0200
+++ doc/ref/Makefile.in
-@@ -218,7 +218,7 @@ PSS = guile.ps
- TEXINFOS = guile.texi
- DATA = $(html_DATA)
-
--DIST_COMMON = $(guile_TEXINFOS) $(top_srcdir)/am/pre-inst-guile \
-+DIST_COMMON = $(info_TEXINFOS) $(top_srcdir)/am/pre-inst-guile \
- ChangeLog Makefile.am Makefile.in mdate-sh stamp-vti \
- texinfo.tex version.texi
- all: all-am
+@@ -35,7 +35,7 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-DIST_COMMON = $(guile_TEXINFOS) $(srcdir)/Makefile.am \
++DIST_COMMON = $(info_TEXINFOS) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(srcdir)/stamp-vti \
+ $(srcdir)/version.texi $(top_srcdir)/am/pre-inst-guile \
+ ChangeLog mdate-sh texinfo.tex
diff --git a/lang/guile/patches/patch-ag b/lang/guile/patches/patch-ag
index 73b8a461bf6..0910f44c89a 100644
--- a/lang/guile/patches/patch-ag
+++ b/lang/guile/patches/patch-ag
@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.2 2003/12/14 17:14:40 wiz Exp $
+$NetBSD: patch-ag,v 1.3 2004/11/18 12:30:49 wiz Exp $
---- doc/goops/Makefile.in.orig 2003-04-21 19:02:48.000000000 +0200
+--- doc/goops/Makefile.in.orig 2004-10-05 05:34:07.000000000 +0200
+++ doc/goops/Makefile.in
-@@ -201,7 +201,7 @@ PSS = goops.ps
- TEXINFOS = goops.texi
- DATA = $(html_DATA)
-
--DIST_COMMON = $(goops_TEXINFOS) ChangeLog Makefile.am Makefile.in
-+DIST_COMMON = $(info_TEXINFOS) ChangeLog Makefile.am Makefile.in
- all: all-am
-
- .SUFFIXES:
+@@ -36,7 +36,7 @@ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+ subdir = doc/goops
+-DIST_COMMON = $(goops_TEXINFOS) $(srcdir)/Makefile.am \
++DIST_COMMON = $(info_TEXINFOS) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in ChangeLog
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/guile-config/qthreads.m4 \
diff --git a/lang/guile/patches/patch-ai b/lang/guile/patches/patch-ai
index 8b49f4816e9..f8fd94882b4 100644
--- a/lang/guile/patches/patch-ai
+++ b/lang/guile/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.1 2004/05/16 17:52:11 danw Exp $
+$NetBSD: patch-ai,v 1.2 2004/11/18 12:30:49 wiz Exp $
---- libguile/Makefile.in.orig Sat Mar 13 17:21:34 2004
+--- libguile/Makefile.in.orig 2004-10-05 05:34:09.000000000 +0200
+++ libguile/Makefile.in
-@@ -258,7 +258,7 @@ noinst_HEADERS = coop-threads.c coop-thr
+@@ -343,7 +343,7 @@ noinst_HEADERS = coop-threads.c coop-thr
libguile_la_DEPENDENCIES = @LIBLOBJS@
libguile_la_LIBADD = @LIBLOBJS@ ../libguile-ltdl/libguile-ltdl.la $(THREAD_LIBS_LOCAL)