Remove guile16.

Guile has had multiple versions in pkgsrc because of compatibility
problems, starting with 1.4.  Currently, 1.8 is the stable version and
2.0 the new version in pkgsrc, even though in the regular world 1.8 is
old and 2.0 is stable.  As far as I know, no one uses guile 1.6 any
more, and it has no depending packages in pkgsrc (tex2page was the
last one).

17 files changed, 0 insertions, 565 deletions

diff --git a/lang/guile16/DESCR b/lang/guile16/DESCR
deleted file mode 100644
index 3ad75e2426e..00000000000
--- a/lang/guile16/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-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.
-
-This is an old version of guile.
diff --git a/lang/guile16/Makefile b/lang/guile16/Makefile
deleted file mode 100644
index d64f9e24fd8..00000000000
--- a/lang/guile16/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2013/10/18 16:05:06 roy Exp $
-
-DISTNAME=		guile-1.6.8
-PKGREVISION=		6
-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)
-
-# Purposely not defining PREV_PKGPATH
-SUPERSEDES=		guile-1.6.*
-
-MAKE_JOBS_SAFE=		no
-
-GNU_CONFIGURE=		YES
-GNU_CONFIGURE_PREFIX=	${PREFIX}/guile/1.6
-USE_TOOLS+=		gmake makeinfo
-USE_LIBTOOL=		YES
-PTHREAD_AUTO_VARS=	YES
-INFO_FILES=		yes
-
-TEST_DIRS=		${WRKSRC}
-TEST_TARGET=		check
-OWN_DIRS=		${PREFIX}/share/guile/site
-
-BUILDLINK_PASSTHRU_DIRS+=	${GNU_CONFIGURE_PREFIX}
-
-# Without doing this, guile is unable to load its shared modules on
-# at least SunOS-5.9/sparc and maybe others.
-# Loading of modules can be verified by running
-# ${GNU_CONFIGURE_PREFIX}/bin/guile
-# and at the guile> prompt:
-# (load-extension "libguile-srfi-srfi-13-14-v-1" "scm_init_srfi_13")
-LDFLAGS+=			${COMPILER_RPATH_FLAG}${GNU_CONFIGURE_PREFIX}/lib
-
-.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/readline/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/lang/guile16/PLIST b/lang/guile16/PLIST
deleted file mode 100644
index 7b21e160524..00000000000
--- a/lang/guile16/PLIST
+++ /dev/null
@@ -1,202 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:03:33 joerg 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
diff --git a/lang/guile16/buildlink3.mk b/lang/guile16/buildlink3.mk
deleted file mode 100644
index 1d9033d5085..00000000000
--- a/lang/guile16/buildlink3.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.4 2013/10/18 16:05:06 roy Exp $
-
-BUILDLINK_TREE+=	guile16
-
-.if !defined(GUILE16_BUILDLINK3_MK)
-GUILE16_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.guile16+=	guile16>=1.6.8
-BUILDLINK_ABI_DEPENDS.guile16+=	guile16>=1.6.8nb3
-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
-
-.include "../../devel/libltdl/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.endif # GUILE16_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-guile16
diff --git a/lang/guile16/distinfo b/lang/guile16/distinfo
deleted file mode 100644
index c8002a8cd94..00000000000
--- a/lang/guile16/distinfo
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: distinfo,v 1.5 2013/10/04 18:35:22 joerg 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) = 4822af12b6b605236eb2d8bb202c48b8947e0434
-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
-SHA1 (patch-libguile_guile-snarf-docs.in) = 6c8b01350e7585c4f7bb650e3f7f991e231629b1
-SHA1 (patch-libguile_guile-snarf.in) = f1e0ace27799bcf4fd3f8c81607e4da5aeda7e23
-SHA1 (patch-scripts-snarf-check-and-output-texi) = 49ea1065f77925ff9417eb49bd8790d2c4f16202
diff --git a/lang/guile16/patches/patch-aa b/lang/guile16/patches/patch-aa
deleted file mode 100644
index c1d2a7501e6..00000000000
--- a/lang/guile16/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2013/04/21 15:35:24 joerg Exp $
-
---- libguile/guile.c.orig	2005-09-28 17:18:28.000000000 +0000
-+++ libguile/guile.c
-@@ -60,6 +60,8 @@
- #include <winsock2.h>
- #endif
- 
-+#include <ltdl.h>
-+
- /* Debugger interface (don't change the order of the following lines) */
- #define GDB_TYPE SCM
- #include <libguile/gdb_interface.h>
-@@ -88,7 +90,6 @@ main (int argc, char **argv)
- {
- #ifdef DYNAMIC_LINKING
-   /* libtool automagically inserts this variable into your executable... */
--  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
deleted file mode 100644
index d90a28fb1a9..00000000000
--- a/lang/guile16/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$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
deleted file mode 100644
index 8b332739a0a..00000000000
--- a/lang/guile16/patches/patch-ae
+++ /dev/null
@@ -1,84 +0,0 @@
-$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
deleted file mode 100644
index e8d36939bcc..00000000000
--- a/lang/guile16/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index 443be7dd821..00000000000
--- a/lang/guile16/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index 3145b417451..00000000000
--- a/lang/guile16/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index dd6d179ea61..00000000000
--- a/lang/guile16/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index 2ef9e23a499..00000000000
--- a/lang/guile16/patches/patch-aj
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
deleted file mode 100644
index c05d44064c0..00000000000
--- a/lang/guile16/patches/patch-ak
+++ /dev/null
@@ -1,12 +0,0 @@
-$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
diff --git a/lang/guile16/patches/patch-libguile_guile-snarf-docs.in b/lang/guile16/patches/patch-libguile_guile-snarf-docs.in
deleted file mode 100644
index 57e45aff564..00000000000
--- a/lang/guile16/patches/patch-libguile_guile-snarf-docs.in
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-libguile_guile-snarf-docs.in,v 1.1 2013/10/04 18:35:22 joerg Exp $
-
---- libguile/guile-snarf-docs.in.orig	2013-09-29 06:44:33.000000000 +0000
-+++ libguile/guile-snarf-docs.in
-@@ -23,4 +23,5 @@ bindir=`dirname $0`
- ## Let the user override the preprocessor autoconf found.
- test -n "${CPP+set}" || CPP="@CPP@"
- 
--${CPP} -DSCM_MAGIC_SNARF_DOCS "$@"
-+${CPP} -DSCM_MAGIC_SNARF_DOCS "$@" | grep -v '^#' | sed 's,\^ *\^ {,\
-+&,g'
diff --git a/lang/guile16/patches/patch-libguile_guile-snarf.in b/lang/guile16/patches/patch-libguile_guile-snarf.in
deleted file mode 100644
index a6cb28ea440..00000000000
--- a/lang/guile16/patches/patch-libguile_guile-snarf.in
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-libguile_guile-snarf.in,v 1.1 2013/10/04 18:35:22 joerg Exp $
-
---- libguile/guile-snarf.in.orig	2005-06-09 22:42:54.000000000 +0000
-+++ libguile/guile-snarf.in
-@@ -51,7 +51,8 @@ modern_snarf ()                         
-     ## empty file.
-     echo "/* cpp arguments: $@ */" ;
-     ${cpp} -DSCM_MAGIC_SNARF_INITS -DSCM_MAGIC_SNARFER "$@" > ${temp} && cpp_ok_p=true
--    grep "^ *\^ *\^" ${temp} | sed -e "s/^ *\^ *\^//"
-+    sed 's,\^ *\^,\
-+&,g' ${temp} | grep "^ *\^ *\^" | sed -e "s/^ *\^ *\^//" -e "s/\^\ *:\ *\^.*/;/"
- }
- 
- ## main
diff --git a/lang/guile16/patches/patch-scripts-snarf-check-and-output-texi b/lang/guile16/patches/patch-scripts-snarf-check-and-output-texi
deleted file mode 100644
index 61775901e08..00000000000
--- a/lang/guile16/patches/patch-scripts-snarf-check-and-output-texi
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-scripts-snarf-check-and-output-texi,v 1.1 2011/12/02 13:59:35 joerg Exp $
-
-Extended backport of 445f31fc06d338f0cafda188d0287f935c2edc3c to fix
-build with GCC 4.4 and higher.
-
---- scripts/snarf-check-and-output-texi.orig	2011-11-28 12:39:23.000000000 +0000
-+++ scripts/snarf-check-and-output-texi
-@@ -266,6 +266,25 @@ exec ${GUILE-guile} -l $0 -c "(apply $ma
-       (set! *file* file)
-       (set! *line* line))
- 
-+     ;; newer gccs like to throw around more location markers into the
-+     ;; preprocessed source; these (hash . hash) bits are what they translate to
-+     ;; in snarfy terms.
-+     (('location ('string . file) ('int . line) ('hash . 'hash))
-+      (set! *file* file)
-+      (set! *line* line))
-+
-+     (('location ('string . file) ('int . line) ('hash . 'hash) ('int . line2) ('string . file2))
-+      (set! *file* file)
-+      (set! *line* line))
-+
-+     (('location ('hash . 'hash) ('string . file) ('int . line) ('hash . 'hash))
-+      (set! *file* file)
-+      (set! *line* line))
-+
-+     (('location ('hash . 'hash) ('int . line) ('string . file) ('string . file2) ('int . line2) ('hash . 'hash) ('int . line3) ('string . file3))
-+      (set! *file* file)
-+      (set! *line* line))
-+
-      (('arglist rest ...)
-       (set! *args* (do-arglist rest)))
-