Remove guile14 and its remaining two dependencies

(guile-oops is included in newer guile, guile-gtk replaces guile14-gtk).

12 files changed, 1 insertions, 206 deletions

diff --git a/devel/Makefile b/devel/Makefile
index 26d63632876..72c0c95c2ee 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.862 2007/06/02 17:49:30 jmmv Exp $
+# $NetBSD: Makefile,v 1.863 2007/06/05 05:50:16 wiz Exp $
 #
 
 COMMENT=	Development utilities
@@ -203,10 +203,8 @@ SUBDIR+=	guile-fcgi
 SUBDIR+=	guile-gnome
 SUBDIR+=	guile-gtk
 SUBDIR+=	guile-lib
-SUBDIR+=	guile-oops
 SUBDIR+=	guile-slib
 SUBDIR+=	guile-www
-SUBDIR+=	guile14-gtk
 SUBDIR+=	haskell-mode
 SUBDIR+=	hdf
 SUBDIR+=	hdf5
diff --git a/devel/guile-oops/DESCR b/devel/guile-oops/DESCR
deleted file mode 100644
index ea1c12ad0d2..00000000000
--- a/devel/guile-oops/DESCR
+++ /dev/null
@@ -1,16 +0,0 @@
-GOOPS is built in to guile 1.6 and higher; this package provides goops
-for guile 1.4.
-
-GOOPS is the object oriented extension to Guile. Its implementation is
-derived from STk-3.99.3 by Erick Gallesio and version 1.3 of Gregor
-Kiczales `Tiny-Clos'.  It is very close in spirit to CLOS, the Common
-Lisp Object System (`CLtL2') but is adapted for the Scheme language.
-While GOOPS is not compatible with any of these systems, GOOPS
-contains a compatibility module which allows for execution of STKlos
-programs.
-
-Briefly stated, the GOOPS extension gives the user a full object
-oriented system with multiple inheritance and generic functions with
-multi-method dispatch.  Furthermore, the implementation relies on a
-true meta object protocol, in the spirit of the one defined for CLOS
-(Gregor Kiczales: A Metaobject Protocol).
diff --git a/devel/guile-oops/Makefile b/devel/guile-oops/Makefile
deleted file mode 100644
index c5ff7d72aeb..00000000000
--- a/devel/guile-oops/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2006/03/31 05:37:08 jlam Exp $
-#
-
-DISTNAME=	guile-oops-0.9.0
-PKGREVISION=	7
-CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNU:=guile/}
-
-MAINTAINER=	gdt@NetBSD.org
-HOMEPAGE=	http://www.gnu.org/software/guile/
-COMMENT=	CLOS-like object system for Guile 1.4
-
-CONFLICTS=	guile>1.4
-
-GNU_CONFIGURE=		YES
-USE_LIBTOOL=		YES
-INFO_FILES=		# PLIST
-
-.include "../../lang/guile14/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/devel/guile-oops/PLIST b/devel/guile-oops/PLIST
deleted file mode 100644
index fba602c00ac..00000000000
--- a/devel/guile-oops/PLIST
+++ /dev/null
@@ -1,20 +0,0 @@
-@comment $NetBSD: PLIST,v 1.7 2006/03/31 05:37:08 jlam Exp $
-bin/guile-oops
-include/goops-snarf.h
-include/goops.h
-include/goops/versiondat.h
-info/goops.info
-lib/libgoopscore.la
-share/guile/oop/goops.scm
-share/guile/oop/goops/active-slot.scm
-share/guile/oop/goops/compile.scm
-share/guile/oop/goops/composite-slot.scm
-share/guile/oop/goops/describe.scm
-share/guile/oop/goops/dispatch.scm
-share/guile/oop/goops/internal.scm
-share/guile/oop/goops/save.scm
-share/guile/oop/goops/stklos.scm
-share/guile/oop/goops/util.scm
-@dirrm share/guile/oop/goops
-@dirrm share/guile/oop
-@dirrm include/goops
diff --git a/devel/guile-oops/distinfo b/devel/guile-oops/distinfo
deleted file mode 100644
index 542947dd976..00000000000
--- a/devel/guile-oops/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 22:24:16 agc Exp $
-
-SHA1 (guile-oops-0.9.0.tar.gz) = c5d1473f2e555002c710751db6b5149b3877f339
-RMD160 (guile-oops-0.9.0.tar.gz) = 2482688d16ca61780143b05bd303fb1555ba8292
-Size (guile-oops-0.9.0.tar.gz) = 448313 bytes
-SHA1 (patch-aa) = e85028272aa888d71198afd7f13bd72758dada86
diff --git a/devel/guile-oops/patches/patch-aa b/devel/guile-oops/patches/patch-aa
deleted file mode 100644
index 13c89f843b2..00000000000
--- a/devel/guile-oops/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2004/10/14 15:31:40 tv Exp $
-
---- Makefile.in.orig	2000-06-30 16:43:32.000000000 -0400
-+++ Makefile.in
-@@ -655,18 +655,11 @@ maintainer-clean-generic clean mostlycle
- 
- install-exec-hook:
- 	$(mkinstalldirs) $(goopsdatadir)
--	(. ./libgoopscore.la; \
--	 test -z "$$dlname" \
--	 || test ! -r $(libdir)/$$dlname \
--	 || (cd $(goopsdatadir) \
--	     && rm -f libgoopscore.la $$dlname \
--	     && $(LN_S) $(libdir)/libgoopscore.la \
--	     && $(LN_S) $(libdir)/$$dlname))
- 
- dist-hook: goops.ps
- 	cp -p $(top_builddir)/goops.ps $(distdir)
- .c.x:
--	$(SNARF) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< > $@ \
-+	$(SNARF) $< $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) > $@ \
- 	|| { rm $@; false; }
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/devel/guile14-gtk/DESCR b/devel/guile14-gtk/DESCR
deleted file mode 100644
index 0837ad21700..00000000000
--- a/devel/guile14-gtk/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-  Guile-gtk is a library written to make GTK accessible from guile.
-It provides a convenient interface for Scheme programmers to develop
-visual applications.  It can also integrate with GNOME via the
-Gnome-guile module.
-
-  Guile-gtk was started by Marius Vollmer <mvo@zagadka.ping.de> and
-is currently maintained by Ariel Rios <jarios@usa.net> and other
-intrepid Guile hackers around the world.
-
-Guile-gtk is free software licensed under the GPL.
-
-This package uses guile-1.4.
diff --git a/devel/guile14-gtk/Makefile b/devel/guile14-gtk/Makefile
deleted file mode 100644
index 76f4203fc2c..00000000000
--- a/devel/guile14-gtk/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2006/10/10 02:43:15 dmcmahill Exp $
-#
-
-DISTNAME=		guile-gtk-0.19
-PKGREVISION=		8
-CATEGORIES=		devel x11
-MASTER_SITES=		http://gnuwin.epfl.ch/sources/geda/
-
-MAINTAINER=		rh@NetBSD.org
-HOMEPAGE=		http://www.gnu.org/software/guile-gtk/
-COMMENT=		Library to make GTK accessible from guile 1.4
-
-USE_LIBTOOL=		yes
-
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--datadir=${PREFIX}/${GUILE14_SUBDIR}/share
-PLIST_SUBST+=		GUILE14_SUBDIR=${GUILE14_SUBDIR:Q}
-MAKE_ENV+=		MACHINE_ARCH=${MACHINE_ARCH:Q}
-LDFLAGS+=		-lltdl
-
-.include "../../lang/guile14/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/devel/guile14-gtk/PLIST b/devel/guile14-gtk/PLIST
deleted file mode 100644
index 25af8b6b9b6..00000000000
--- a/devel/guile14-gtk/PLIST
+++ /dev/null
@@ -1,19 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/12/03 14:25:38 wiz Exp $
-bin/build-guile-gtk
-bin/guile-gtk
-bin/guile-gtk-1.2
-include/guile-gtk.h
-lib/libguilegtk-1.2.la
-${GUILE14_SUBDIR}/share/guile-gtk/gdk-1.2.defs
-${GUILE14_SUBDIR}/share/guile-gtk/gtk-1.2.defs
-${GUILE14_SUBDIR}/share/guile/gtk-1.2/gdk.scm
-${GUILE14_SUBDIR}/share/guile/gtk-1.2/gtk.scm
-${GUILE14_SUBDIR}/share/guile/gtk/config.scm
-${GUILE14_SUBDIR}/share/guile/gtk/dynlink-old.scm
-${GUILE14_SUBDIR}/share/guile/gtk/dynlink.scm
-${GUILE14_SUBDIR}/share/guile/gtk/event-repl.scm
-${GUILE14_SUBDIR}/share/guile/gtk/gdk.scm
-${GUILE14_SUBDIR}/share/guile/gtk/gtk.scm
-@dirrm ${GUILE14_SUBDIR}/share/guile/gtk
-@dirrm ${GUILE14_SUBDIR}/share/guile/gtk-1.2
-@dirrm ${GUILE14_SUBDIR}/share/guile-gtk
diff --git a/devel/guile14-gtk/buildlink3.mk b/devel/guile14-gtk/buildlink3.mk
deleted file mode 100644
index 033d0a96901..00000000000
--- a/devel/guile14-gtk/buildlink3.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:43 jlam Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GUILE_GTK_BUILDLINK3_MK:=	${GUILE_GTK_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	guile-gtk
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nguile-gtk}
-BUILDLINK_PACKAGES+=	guile-gtk
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}guile-gtk
-
-.if !empty(GUILE_GTK_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.guile-gtk+=	guile-gtk>=0.19nb4
-BUILDLINK_ABI_DEPENDS.guile-gtk+=	guile-gtk>=0.19nb7
-BUILDLINK_PKGSRCDIR.guile-gtk?=	../../devel/guile14-gtk
-.endif	# GUILE_GTK_BUILDLINK3_MK
-
-.include "../../lang/guile14/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/guile14-gtk/distinfo b/devel/guile14-gtk/distinfo
deleted file mode 100644
index 4e81613d07e..00000000000
--- a/devel/guile14-gtk/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 22:24:16 agc Exp $
-
-SHA1 (guile-gtk-0.19.tar.gz) = 22e445fb0574cee76c0d18dbdc28090b63b88302
-RMD160 (guile-gtk-0.19.tar.gz) = b80497a5ce57286a2756eef5df0b0ebf13d3565d
-Size (guile-gtk-0.19.tar.gz) = 278896 bytes
-SHA1 (patch-aa) = 54753539855280704593b9ee7da330ec6934bfdf
diff --git a/devel/guile14-gtk/patches/patch-aa b/devel/guile14-gtk/patches/patch-aa
deleted file mode 100644
index 21b5544d7b9..00000000000
--- a/devel/guile14-gtk/patches/patch-aa
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/12/03 14:25:39 wiz Exp $
-
---- Makefile.in.orig	Wed Jul 26 19:24:58 2000
-+++ Makefile.in
-@@ -617,7 +617,7 @@ install-data-local:
- 	$(INSTALL_DATA) ./gtk/config.scm  $(gtkmoduledir)/config.scm
- 	$(INSTALL_DATA) $(srcdir)/gtk/event-repl.scm $(gtkmoduledir)/event-repl.scm
- .c.x:
--	guile-snarf $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< >$<.tmp && mv $<.tmp $@
-+	guile-snarf $< $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) >$<.tmp && mv $<.tmp $@
- 
- gtk-glue.c: $(gtkdefs) $(gdkdefs) build-guile-gtk
- 	$(BUILD) -I $(srcdir) glue $(gtkdefs) >tmpt && mv tmpt $@
-@@ -641,3 +641,20 @@ dist-hook:
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-+
-+# problems with optimization. triggers internal compiler errors
-+
-+COMPILE_NOOPT=${COMPILE:C/-O[0-9]*//g}
-+LTCOMPILE_NOOPT=${LTCOMPILE:C/-O[0-9]*//g}
-+
-+.if (${MACHINE_ARCH} == "alpha")
-+
-+gdk-glue.o: gdk-glue.c
-+	$(COMPILE_NOOPT) -c gdk-glue.c
-+
-+gdk-glue.lo: gdk-glue.c
-+	@echo "Compiling without optimization to work around gcc -O* compiler bug"
-+	$(LTCOMPILE_NOOPT) -c gdk-glue.c
-+
-+.endif
-+