Import guile-1.6.8 as guile16-1.6.8 as part of getting ready to update

lang/guile to 1.8.1.  This package will be available for those which will
not work with guile-1.8.x.

14 files changed, 504 insertions, 0 deletions

diff --git a/lang/guile16/DESCR b/lang/guile16/DESCR
new file mode 100644
index 00000000000..e79cdc43f85
--- /dev/null
+++ b/lang/guile16/DESCR
@@ -0,0 +1,5 @@
+GUILE, GNU's Ubiquitous Intelligent Language for Extension, is a library
+that implements the Scheme language plus various convenient facilities.
+It's designed so that you can link it into an application or utility to
+make it extensible. Our plan is to link this library into all GNU programs
+that call for extensibility.
diff --git a/lang/guile16/Makefile b/lang/guile16/Makefile
new file mode 100644
index 00000000000..3fc2b522f4b
--- /dev/null
+++ b/lang/guile16/Makefile
@@ -0,0 +1,38 @@
+# $NetBSD: Makefile,v 1.1.1.1 2007/06/04 23:38:40 dmcmahill Exp $
+
+DISTNAME=		guile-1.6.8
+PKGNAME=		guile16-1.6.8
+CATEGORIES=		lang
+MASTER_SITES=		${MASTER_SITE_GNU:=guile/}
+
+MAINTAINER=		pkgsrc-users@NetBSD.org
+HOMEPAGE=		http://www.gnu.org/software/guile/guile.html
+COMMENT=		GNU's Ubiquitous Intelligent Language for Extension (1.6.x series)
+
+GNU_CONFIGURE=		YES
+GNU_CONFIGURE_PREFIX=	${PREFIX}/guile/1.6
+USE_TOOLS+=		gmake makeinfo
+USE_LIBTOOL=		YES
+USE_GNU_READLINE=	YES
+PTHREAD_AUTO_VARS=	YES
+INFO_FILES=		# PLIST
+
+TEST_DIRS=		${WRKSRC}
+TEST_TARGET=		check
+OWN_DIRS=		${PREFIX}/share/guile/site
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Darwin"
+CPPFLAGS+=		-Dmacosx
+
+post-patch:
+	@${MV} ${WRKSRC}/guile-config/guile-config.in.orig \
+	    ${WRKSRC}/guile-config/guile-config.in
+.endif
+
+.include "../../devel/libltdl/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/guile16/PLIST b/lang/guile16/PLIST
new file mode 100644
index 00000000000..e3887d31c99
--- /dev/null
+++ b/lang/guile16/PLIST
@@ -0,0 +1,218 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2007/06/04 23:38:40 dmcmahill Exp $
+guile/1.6/bin/guile
+guile/1.6/bin/guile-config
+guile/1.6/bin/guile-snarf
+guile/1.6/bin/guile-tools
+guile/1.6/include/guile-readline/readline.h
+guile/1.6/include/guile/gh.h
+guile/1.6/include/guile/srfi/srfi-13.h
+guile/1.6/include/guile/srfi/srfi-14.h
+guile/1.6/include/guile/srfi/srfi-4.h
+guile/1.6/include/libguile.h
+guile/1.6/include/libguile/__scm.h
+guile/1.6/include/libguile/alist.h
+guile/1.6/include/libguile/arbiters.h
+guile/1.6/include/libguile/async.h
+guile/1.6/include/libguile/backtrace.h
+guile/1.6/include/libguile/boolean.h
+guile/1.6/include/libguile/chars.h
+guile/1.6/include/libguile/continuations.h
+guile/1.6/include/libguile/coop-defs.h
+guile/1.6/include/libguile/debug-malloc.h
+guile/1.6/include/libguile/debug.h
+guile/1.6/include/libguile/deprecation.h
+guile/1.6/include/libguile/dynl.h
+guile/1.6/include/libguile/dynwind.h
+guile/1.6/include/libguile/environments.h
+guile/1.6/include/libguile/eq.h
+guile/1.6/include/libguile/error.h
+guile/1.6/include/libguile/eval.h
+guile/1.6/include/libguile/evalext.h
+guile/1.6/include/libguile/extensions.h
+guile/1.6/include/libguile/feature.h
+guile/1.6/include/libguile/filesys.h
+guile/1.6/include/libguile/fluids.h
+guile/1.6/include/libguile/fports.h
+guile/1.6/include/libguile/gc.h
+guile/1.6/include/libguile/gdb_interface.h
+guile/1.6/include/libguile/gdbint.h
+guile/1.6/include/libguile/goops.h
+guile/1.6/include/libguile/gsubr.h
+guile/1.6/include/libguile/guardians.h
+guile/1.6/include/libguile/hash.h
+guile/1.6/include/libguile/hashtab.h
+guile/1.6/include/libguile/hooks.h
+guile/1.6/include/libguile/init.h
+guile/1.6/include/libguile/ioext.h
+guile/1.6/include/libguile/iselect.h
+guile/1.6/include/libguile/keywords.h
+guile/1.6/include/libguile/lang.h
+guile/1.6/include/libguile/list.h
+guile/1.6/include/libguile/load.h
+guile/1.6/include/libguile/macros.h
+guile/1.6/include/libguile/mallocs.h
+guile/1.6/include/libguile/modules.h
+guile/1.6/include/libguile/net_db.h
+guile/1.6/include/libguile/numbers.h
+guile/1.6/include/libguile/objects.h
+guile/1.6/include/libguile/objprop.h
+guile/1.6/include/libguile/options.h
+guile/1.6/include/libguile/pairs.h
+guile/1.6/include/libguile/ports.h
+guile/1.6/include/libguile/posix.h
+guile/1.6/include/libguile/print.h
+guile/1.6/include/libguile/procprop.h
+guile/1.6/include/libguile/procs.h
+guile/1.6/include/libguile/properties.h
+guile/1.6/include/libguile/ramap.h
+guile/1.6/include/libguile/random.h
+guile/1.6/include/libguile/rdelim.h
+guile/1.6/include/libguile/read.h
+guile/1.6/include/libguile/regex-posix.h
+guile/1.6/include/libguile/root.h
+guile/1.6/include/libguile/rw.h
+guile/1.6/include/libguile/scmconfig.h
+guile/1.6/include/libguile/scmsigs.h
+guile/1.6/include/libguile/script.h
+guile/1.6/include/libguile/simpos.h
+guile/1.6/include/libguile/smob.h
+guile/1.6/include/libguile/snarf.h
+guile/1.6/include/libguile/socket.h
+guile/1.6/include/libguile/sort.h
+guile/1.6/include/libguile/srcprop.h
+guile/1.6/include/libguile/stackchk.h
+guile/1.6/include/libguile/stacks.h
+guile/1.6/include/libguile/stime.h
+guile/1.6/include/libguile/strings.h
+guile/1.6/include/libguile/strop.h
+guile/1.6/include/libguile/strorder.h
+guile/1.6/include/libguile/strports.h
+guile/1.6/include/libguile/struct.h
+guile/1.6/include/libguile/symbols.h
+guile/1.6/include/libguile/tags.h
+guile/1.6/include/libguile/threads.h
+guile/1.6/include/libguile/throw.h
+guile/1.6/include/libguile/unif.h
+guile/1.6/include/libguile/validate.h
+guile/1.6/include/libguile/values.h
+guile/1.6/include/libguile/variable.h
+guile/1.6/include/libguile/vectors.h
+guile/1.6/include/libguile/version.h
+guile/1.6/include/libguile/vports.h
+guile/1.6/include/libguile/weaks.h
+guile/1.6/info/goops.info
+guile/1.6/info/guile-tut.info
+guile/1.6/info/guile.info
+guile/1.6/info/r5rs.info
+guile/1.6/lib/libguile-ltdl.la
+guile/1.6/lib/libguile-srfi-srfi-13-14-v-1.la
+guile/1.6/lib/libguile-srfi-srfi-4-v-1.la
+guile/1.6/lib/libguile.la
+guile/1.6/lib/libguilereadline-v-12.la
+guile/1.6/share/aclocal/guile.m4
+guile/1.6/share/guile/1.6/guile-procedures.txt
+guile/1.6/share/guile/1.6/ice-9/and-let*.scm
+guile/1.6/share/guile/1.6/ice-9/and-let-star.scm
+guile/1.6/share/guile/1.6/ice-9/arrays.scm
+guile/1.6/share/guile/1.6/ice-9/boot-9.scm
+guile/1.6/share/guile/1.6/ice-9/buffered-input.scm
+guile/1.6/share/guile/1.6/ice-9/calling.scm
+guile/1.6/share/guile/1.6/ice-9/channel.scm
+guile/1.6/share/guile/1.6/ice-9/common-list.scm
+guile/1.6/share/guile/1.6/ice-9/debug.scm
+guile/1.6/share/guile/1.6/ice-9/debugger.scm
+guile/1.6/share/guile/1.6/ice-9/documentation.scm
+guile/1.6/share/guile/1.6/ice-9/emacs.scm
+guile/1.6/share/guile/1.6/ice-9/expect.scm
+guile/1.6/share/guile/1.6/ice-9/format.scm
+guile/1.6/share/guile/1.6/ice-9/ftw.scm
+guile/1.6/share/guile/1.6/ice-9/getopt-long.scm
+guile/1.6/share/guile/1.6/ice-9/hcons.scm
+guile/1.6/share/guile/1.6/ice-9/history.scm
+guile/1.6/share/guile/1.6/ice-9/lineio.scm
+guile/1.6/share/guile/1.6/ice-9/ls.scm
+guile/1.6/share/guile/1.6/ice-9/mapping.scm
+guile/1.6/share/guile/1.6/ice-9/match.scm
+guile/1.6/share/guile/1.6/ice-9/networking.scm
+guile/1.6/share/guile/1.6/ice-9/null.scm
+guile/1.6/share/guile/1.6/ice-9/optargs.scm
+guile/1.6/share/guile/1.6/ice-9/poe.scm
+guile/1.6/share/guile/1.6/ice-9/popen.scm
+guile/1.6/share/guile/1.6/ice-9/posix.scm
+guile/1.6/share/guile/1.6/ice-9/pretty-print.scm
+guile/1.6/share/guile/1.6/ice-9/psyntax.pp
+guile/1.6/share/guile/1.6/ice-9/psyntax.ss
+guile/1.6/share/guile/1.6/ice-9/q.scm
+guile/1.6/share/guile/1.6/ice-9/r4rs.scm
+guile/1.6/share/guile/1.6/ice-9/r5rs.scm
+guile/1.6/share/guile/1.6/ice-9/rdelim.scm
+guile/1.6/share/guile/1.6/ice-9/readline.scm
+guile/1.6/share/guile/1.6/ice-9/receive.scm
+guile/1.6/share/guile/1.6/ice-9/regex.scm
+guile/1.6/share/guile/1.6/ice-9/runq.scm
+guile/1.6/share/guile/1.6/ice-9/rw.scm
+guile/1.6/share/guile/1.6/ice-9/safe-r5rs.scm
+guile/1.6/share/guile/1.6/ice-9/safe.scm
+guile/1.6/share/guile/1.6/ice-9/session.scm
+guile/1.6/share/guile/1.6/ice-9/slib-old.scm
+guile/1.6/share/guile/1.6/ice-9/slib.scm
+guile/1.6/share/guile/1.6/ice-9/stack-catch.scm
+guile/1.6/share/guile/1.6/ice-9/streams.scm
+guile/1.6/share/guile/1.6/ice-9/string-fun.scm
+guile/1.6/share/guile/1.6/ice-9/syncase.scm
+guile/1.6/share/guile/1.6/ice-9/threads.scm
+guile/1.6/share/guile/1.6/ice-9/time.scm
+guile/1.6/share/guile/1.6/oop/goops.scm
+guile/1.6/share/guile/1.6/oop/goops/active-slot.scm
+guile/1.6/share/guile/1.6/oop/goops/compile.scm
+guile/1.6/share/guile/1.6/oop/goops/composite-slot.scm
+guile/1.6/share/guile/1.6/oop/goops/describe.scm
+guile/1.6/share/guile/1.6/oop/goops/dispatch.scm
+guile/1.6/share/guile/1.6/oop/goops/internal.scm
+guile/1.6/share/guile/1.6/oop/goops/old-define-method.scm
+guile/1.6/share/guile/1.6/oop/goops/save.scm
+guile/1.6/share/guile/1.6/oop/goops/stklos.scm
+guile/1.6/share/guile/1.6/oop/goops/util.scm
+guile/1.6/share/guile/1.6/scripts/PROGRAM
+guile/1.6/share/guile/1.6/scripts/autofrisk
+guile/1.6/share/guile/1.6/scripts/display-commentary
+guile/1.6/share/guile/1.6/scripts/doc-snarf
+guile/1.6/share/guile/1.6/scripts/frisk
+guile/1.6/share/guile/1.6/scripts/generate-autoload
+guile/1.6/share/guile/1.6/scripts/lint
+guile/1.6/share/guile/1.6/scripts/punify
+guile/1.6/share/guile/1.6/scripts/read-scheme-source
+guile/1.6/share/guile/1.6/scripts/snarf-check-and-output-texi
+guile/1.6/share/guile/1.6/scripts/snarf-guile-m4-docs
+guile/1.6/share/guile/1.6/scripts/use2dot
+guile/1.6/share/guile/1.6/srfi/srfi-1.scm
+guile/1.6/share/guile/1.6/srfi/srfi-10.scm
+guile/1.6/share/guile/1.6/srfi/srfi-11.scm
+guile/1.6/share/guile/1.6/srfi/srfi-13.scm
+guile/1.6/share/guile/1.6/srfi/srfi-14.scm
+guile/1.6/share/guile/1.6/srfi/srfi-16.scm
+guile/1.6/share/guile/1.6/srfi/srfi-17.scm
+guile/1.6/share/guile/1.6/srfi/srfi-19.scm
+guile/1.6/share/guile/1.6/srfi/srfi-2.scm
+guile/1.6/share/guile/1.6/srfi/srfi-31.scm
+guile/1.6/share/guile/1.6/srfi/srfi-39.scm
+guile/1.6/share/guile/1.6/srfi/srfi-4.scm
+guile/1.6/share/guile/1.6/srfi/srfi-6.scm
+guile/1.6/share/guile/1.6/srfi/srfi-8.scm
+guile/1.6/share/guile/1.6/srfi/srfi-9.scm
+@dirrm guile/1.6/share/guile/1.6/srfi
+@dirrm guile/1.6/share/guile/1.6/scripts
+@dirrm guile/1.6/share/guile/1.6/oop/goops
+@dirrm guile/1.6/share/guile/1.6/oop
+@dirrm guile/1.6/share/guile/1.6/ice-9
+@dirrm guile/1.6/share/guile/1.6
+@dirrm guile/1.6/share/guile
+@dirrm guile/1.6/share
+@dirrm guile/1.6/include/libguile
+@dirrm guile/1.6/include/guile/srfi
+@dirrm guile/1.6/include/guile-readline
+@dirrm guile/1.6/include/guile
+@dirrm guile/1.6/include
+@dirrm guile/1.6/bin
+@dirrm guile/1.6
+@dirrm guile
diff --git a/lang/guile16/buildlink3.mk b/lang/guile16/buildlink3.mk
new file mode 100644
index 00000000000..6b7f7fa3a06
--- /dev/null
+++ b/lang/guile16/buildlink3.mk
@@ -0,0 +1,31 @@
+# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/06/04 23:38:39 dmcmahill Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+GUILE16_BUILDLINK3_MK:=	${GUILE16_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	guile16
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nguile16}
+BUILDLINK_PACKAGES+=	guile16
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}guile16
+
+.if !empty(GUILE16_BUILDLINK3_MK:M+)
+BUILDLINK_API_DEPENDS.guile16+=	guile16>=1.6.8
+BUILDLINK_ABI_DEPENDS.guile16+=	guile16>=1.6.8
+BUILDLINK_PKGSRCDIR.guile16?=	../../lang/guile16
+
+BUILDLINK_PASSTHRU_DIRS=	${LOCALBASE}/guile/1.6
+BUILDLINK_FILES.guile16+=	guile/1.6/bin/*
+BUILDLINK_FNAME_TRANSFORM.guile16+=	-e s,/guile/1.6/bin/,/bin/,
+
+GUILE16_SUBDIR=                 guile/1.6
+.endif	# GUILE16_BUILDLINK3_MK
+
+.include "../../devel/libltdl/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/guile16/distinfo b/lang/guile16/distinfo
new file mode 100644
index 00000000000..65832f4d19e
--- /dev/null
+++ b/lang/guile16/distinfo
@@ -0,0 +1,14 @@
+$NetBSD: distinfo,v 1.1.1.1 2007/06/04 23:38:40 dmcmahill Exp $
+
+SHA1 (guile-1.6.8.tar.gz) = 5c244f730d7aaee32db4b0cc77b688f74a5caa71
+RMD160 (guile-1.6.8.tar.gz) = 9c2c6a6afe2adce458e30e97da782ae18ce75b5c
+Size (guile-1.6.8.tar.gz) = 3114052 bytes
+SHA1 (patch-aa) = 7c85a08bcba460cf75aa02cfe8008fe7d92ed0f5
+SHA1 (patch-ad) = 047e8826f086f3d92e605abb44807e4e9c38d69f
+SHA1 (patch-ae) = 4aaadd1df36540117bef4128f607b6a1bbcaaf28
+SHA1 (patch-af) = 96b50d3cff86a7ba7a76551723192ad99a07b971
+SHA1 (patch-ag) = a4b5f490e9c9520120bcb2824004cb8bfa1027e1
+SHA1 (patch-ah) = e66596a5ecc5c2d4fd09833507499b4d02c7af8a
+SHA1 (patch-ai) = 73e4a95dc9e9ede4d423e3a73fc2b0ac4f4802e0
+SHA1 (patch-aj) = 2d55986fd8161bdc32c6e2ef7fe3d89310ab20cd
+SHA1 (patch-ak) = 8cb47bf5d2c3818f860c459180507d4b2eae0b60
diff --git a/lang/guile16/patches/patch-aa b/lang/guile16/patches/patch-aa
new file mode 100644
index 00000000000..fe5ec868520
--- /dev/null
+++ b/lang/guile16/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1.1.1 2007/06/04 23:38:40 dmcmahill Exp $
+
+--- libguile/guile.c.orig	2002-12-07 14:41:32.000000000 -0800
++++ libguile/guile.c
+@@ -88,7 +88,7 @@ main (int argc, char **argv)
+ {
+ #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);
diff --git a/lang/guile16/patches/patch-ad b/lang/guile16/patches/patch-ad
new file mode 100644
index 00000000000..d90a28fb1a9
--- /dev/null
+++ b/lang/guile16/patches/patch-ad
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.1.1.1 2007/06/04 23:38:40 dmcmahill Exp $
+
+--- guile-readline/Makefile.in.orig	2006-05-28 03:14:33.000000000 +0000
++++ guile-readline/Makefile.in
+@@ -59,7 +59,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
+@@ -213,7 +213,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
+ pkginclude_HEADERS = readline.h
diff --git a/lang/guile16/patches/patch-ae b/lang/guile16/patches/patch-ae
new file mode 100644
index 00000000000..8b332739a0a
--- /dev/null
+++ b/lang/guile16/patches/patch-ae
@@ -0,0 +1,84 @@
+$NetBSD: patch-ae,v 1.1.1.1 2007/06/04 23:38:40 dmcmahill Exp $
+
+--- libguile/gc_os_dep.c.orig	2004-12-14 06:21:39.000000000 +0100
++++ libguile/gc_os_dep.c
+@@ -107,6 +107,11 @@ typedef int GC_bool;
+ #    define OPENBSD
+ #    define mach_type_known
+ # endif
++# if defined(__NetBSD__) && defined(__alpha__)
++#    define ALPHA
++#    define NETBSD
++#    define mach_type_known
++# endif
+ # if defined(__NetBSD__) && defined(__powerpc__)
+ #    define POWERPC
+ #    define NETBSD
+@@ -124,7 +129,7 @@ typedef int GC_bool;
+ #    define NETBSD
+ #    define mach_type_known
+ # endif
+-# if defined(__NetBSD__) && defined(__sparc__)
++# if defined(__NetBSD__) && (defined(__sparc__) || defined(__sparc_v9__))
+ #    define SPARC
+ #    define NETBSD
+ #    define mach_type_known
+@@ -243,7 +248,7 @@ typedef int GC_bool;
+ # endif
+ # if defined(__alpha) || defined(__alpha__)
+ #   define ALPHA
+-#   if !defined(LINUX)
++#   if !defined(LINUX) && !defined(NETBSD)
+ #     define OSF1	/* a.k.a Digital Unix */
+ #   endif
+ #   define mach_type_known
+@@ -296,6 +301,11 @@ typedef int GC_bool;
+ #   define NETBSD
+ #   define mach_type_known
+ # endif
++# if defined(__NetBSD__) && defined(__x86_64__)
++#   define X86_64
++#   define NETBSD
++#   define mach_type_known
++# endif
+ # if defined(bsdi) && defined(i386)
+ #    define I386
+ #    define BSDI
+@@ -435,12 +445,12 @@ scm_get_stack_base ()
+ /*
+  * For each architecture and OS, the following need to be defined:
+  *
+- * CPP_WORD_SZ is a simple integer constant representing the word size.
++ * CPP_WORDSZ is a simple integer constant representing the word size.
+  * in bits.  We assume byte addressibility, where a byte has 8 bits.
+- * We also assume CPP_WORD_SZ is either 32 or 64.
++ * We also assume CPP_WORDSZ is either 32 or 64.
+  * (We care about the length of pointers, not hardware
+  * bus widths.  Thus a 64 bit processor with a C compiler that uses
+- * 32 bit pointers should use CPP_WORD_SZ of 32, not 64. Default is 32.)
++ * 32 bit pointers should use CPP_WORDSZ of 32, not 64. Default is 32.)
+  *
+  * MACH_TYPE is a string representation of the machine type.
+  * OS_TYPE is analogous for the OS.
+@@ -985,6 +995,21 @@ scm_get_stack_base ()
+ #    endif
+ # endif
+ 
++# ifdef X86_64
++#   define MACH_TYPE "X86_64"
++#   define ALIGNMENT 8
++#   define ALIGN_DOUBLE
++#   define CPP_WORDSZ 64
++#   ifdef NETBSD
++#	define OS_TYPE "NETBSD"
++#   endif
++#   if defined(NETBSD)
++#	define HEURISTIC2
++	extern char etext;
++#	define DATASTART ((ptr_t)(&etext))
++#   endif
++#   endif
++
+ # ifdef NS32K
+ #   define MACH_TYPE "NS32K"
+ #   define ALIGNMENT 4
diff --git a/lang/guile16/patches/patch-af b/lang/guile16/patches/patch-af
new file mode 100644
index 00000000000..e8d36939bcc
--- /dev/null
+++ b/lang/guile16/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1.1.1 2007/06/04 23:38:40 dmcmahill Exp $
+
+--- doc/ref/Makefile.in.orig	2004-10-05 05:34:07.000000000 +0200
++++ doc/ref/Makefile.in
+@@ -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/guile16/patches/patch-ag b/lang/guile16/patches/patch-ag
new file mode 100644
index 00000000000..443be7dd821
--- /dev/null
+++ b/lang/guile16/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1.1.1 2007/06/04 23:38:40 dmcmahill Exp $
+
+--- doc/goops/Makefile.in.orig	2004-10-05 05:34:07.000000000 +0200
++++ doc/goops/Makefile.in
+@@ -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/guile16/patches/patch-ah b/lang/guile16/patches/patch-ah
new file mode 100644
index 00000000000..3145b417451
--- /dev/null
+++ b/lang/guile16/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1.1.1 2007/06/04 23:38:40 dmcmahill Exp $
+
+--- guile-config/guile-config.in.orig	Sun Dec  8 07:41:30 2002
++++ guile-config/guile-config.in
+@@ -177,7 +177,7 @@
+             (string=? libdir "/usr/lib/"))
+         (display-separated (cons "-lguile -lguile-ltdl" other-flags))
+         (display-separated (cons
+-                            (string-append "-L" (get-build-info 'libdir))
++                            (string-append "-Wl,-R" (get-build-info 'libdir) " -L" (get-build-info 'libdir))
+                             (cons "-lguile -lguile-ltdl" other-flags))))
+     (newline)))
+ 
diff --git a/lang/guile16/patches/patch-ai b/lang/guile16/patches/patch-ai
new file mode 100644
index 00000000000..dd6d179ea61
--- /dev/null
+++ b/lang/guile16/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1.1.1 2007/06/04 23:38:40 dmcmahill Exp $
+
+--- libguile/Makefile.in.orig	2006-05-28 02:31:25.000000000 +0000
++++ libguile/Makefile.in
+@@ -343,7 +343,7 @@ noinst_HEADERS = coop-threads.c coop-thr
+ 
+ libguile_la_DEPENDENCIES = @LIBLOBJS@
+ libguile_la_LIBADD = @LIBLOBJS@ @abs_top_builddir@/libguile-ltdl/libguile-ltdl.la $(THREAD_LIBS_LOCAL)
+-libguile_la_LDFLAGS = -version-info @LIBGUILE_INTERFACE_CURRENT@:@LIBGUILE_INTERFACE_REVISION@:@LIBGUILE_INTERFACE_AGE@ -export-dynamic -no-undefined
++libguile_la_LDFLAGS = -version-info @LIBGUILE_INTERFACE_CURRENT@:@LIBGUILE_INTERFACE_REVISION@:@LIBGUILE_INTERFACE_AGE@ -export-dynamic
+ 
+ # These are headers visible as <guile/mumble.h>
+ pkginclude_HEADERS = gh.h
diff --git a/lang/guile16/patches/patch-aj b/lang/guile16/patches/patch-aj
new file mode 100644
index 00000000000..2ef9e23a499
--- /dev/null
+++ b/lang/guile16/patches/patch-aj
@@ -0,0 +1,15 @@
+$NetBSD: patch-aj,v 1.1.1.1 2007/06/04 23:38:40 dmcmahill Exp $
+
+--- libguile/_scm.h.orig	2005-09-05 16:15:00.000000000 +0200
++++ libguile/_scm.h
+@@ -111,7 +111,9 @@
+ # define SCM_SYSCALL(line) line;
+ #endif /* ndef SCM_SYSCALL */
+ 
+-#if !defined (MSDOS) && !defined (__MINGW32__)
++#include <errno.h>
++
++#if !defined (MSDOS) && !defined (__MINGW32__) && !defined(errno)
+ # ifdef ARM_ULIB
+     extern volatile int errno;
+ # else
diff --git a/lang/guile16/patches/patch-ak b/lang/guile16/patches/patch-ak
new file mode 100644
index 00000000000..c05d44064c0
--- /dev/null
+++ b/lang/guile16/patches/patch-ak
@@ -0,0 +1,12 @@
+$NetBSD: patch-ak,v 1.1.1.1 2007/06/04 23:38:40 dmcmahill Exp $
+
+--- configure.orig	2006-07-18 17:48:48.000000000 +0000
++++ configure
+@@ -30498,6 +30498,7 @@ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
++#include <sys/types.h>
+ #include <sys/socket.h>
+ 
+ int