Re-import devel/guile-gtk to devel/guile14-gtk to make way for newer

version without breaking packages depending on the old version for now.
Following a plan from Greg Troxel.

6 files changed, 117 insertions, 0 deletions

diff --git a/devel/guile14-gtk/DESCR b/devel/guile14-gtk/DESCR
new file mode 100644
index 00000000000..00941e08929
--- /dev/null
+++ b/devel/guile14-gtk/DESCR
@@ -0,0 +1,10 @@
+  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.
diff --git a/devel/guile14-gtk/Makefile b/devel/guile14-gtk/Makefile
new file mode 100644
index 00000000000..15ec864f604
--- /dev/null
+++ b/devel/guile14-gtk/Makefile
@@ -0,0 +1,27 @@
+# $NetBSD: Makefile,v 1.1.1.1 2004/12/03 14:25:38 wiz Exp $
+#
+
+DISTNAME=		guile-gtk-0.19
+PKGREVISION=		6
+CATEGORIES=		devel x11
+MASTER_SITES=		http://www.ping.de/sites/zagadka/guile-gtk/download/ \
+			http://erin.netpedia.net/download/ \
+			http://erin.linuxbox.com/guile-gtk/download/ \
+			http://linux.cem.itesm.mx/~jarios/guile-gtk/download/
+
+MAINTAINER=		rh@NetBSD.org
+HOMEPAGE=		http://www.ping.de/sites/zagadka/guile-gtk/
+COMMENT=		Library to make GTK accessible from guile
+
+USE_BUILDLINK3=		yes
+USE_X11=		# defined
+USE_LIBTOOL=		# defined
+
+GNU_CONFIGURE=		# defined
+CONFIGURE_ARGS+=	--datadir=${PREFIX}/${GUILE14_SUBDIR}/share
+PLIST_SUBST+=		GUILE14_SUBDIR=${GUILE14_SUBDIR:Q}
+MAKE_ENV+=		MACHINE_ARCH=${MACHINE_ARCH}
+
+.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
new file mode 100644
index 00000000000..25af8b6b9b6
--- /dev/null
+++ b/devel/guile14-gtk/PLIST
@@ -0,0 +1,19 @@
+@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
new file mode 100644
index 00000000000..2df0cd971c2
--- /dev/null
+++ b/devel/guile14-gtk/buildlink3.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/12/03 14:25:39 wiz 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
+
+.if !empty(GUILE_GTK_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.guile-gtk+=	guile-gtk>=0.19nb4
+BUILDLINK_RECOMMENDED.guile-gtk+=	guile-gtk>=0.19nb5
+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
new file mode 100644
index 00000000000..c7f98fcc397
--- /dev/null
+++ b/devel/guile14-gtk/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1.1.1 2004/12/03 14:25:38 wiz Exp $
+
+SHA1 (guile-gtk-0.19.tar.gz) = 22e445fb0574cee76c0d18dbdc28090b63b88302
+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
new file mode 100644
index 00000000000..21b5544d7b9
--- /dev/null
+++ b/devel/guile14-gtk/patches/patch-aa
@@ -0,0 +1,34 @@
+$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
++