Index: MOVED
===================================================================
--- MOVED
+++ MOVED
@@ -5853,7 +5853,6 @@
 www/cgic||2014-04-11|Has expired: Unmaintained since 2000
 devel/orbitcpp||2014-04-11|Unused anymore, not libc++ friendly
 graphics/sodipodi|graphics/inkscape|2014-04-11|Sodipodi did not survive the Inkscape fork
-devel/g-wrap||2014-04-11|Unused, not stage friendly
 net/pvm++||2014-04-13|Has expired: Unmaintained since 2001
 devel/ixlib||2014-04-13|Has expired: Unmaintained since 2001
 mail/althea||2014-04-13|Has expired: Unmaintained since 2001
Index: devel/g-wrap/Makefile
===================================================================
--- /dev/null
+++ devel/g-wrap/Makefile
@@ -0,0 +1,29 @@
+# $FreeBSD$
+
+PORTNAME=	g-wrap
+DISTVERSION=	1.9.15
+CATEGORIES=	devel
+MASTER_SITES=	SAVANNAH
+
+MAINTAINER=	andrew@tao11.riddles.org.uk
+COMMENT=	Tool for generating function wrappers for Guile
+
+LICENSE=	LGPL21+
+
+LIB_DEPENDS=	libffi.so:devel/libffi					\
+		libguile-2.2.so:lang/guile2				\
+		libgc-threaded.so:devel/boehm-gc-threaded
+BUILD_DEPENDS=	guile2>=2.2:lang/guile2
+
+USES=		gmake gnome libtool pkgconfig
+USE_GNOME=	glib20
+USE_LDCONFIG=	yes
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--disable-Werror
+
+INFO=		g-wrap
+
+MAKE_JOBS_UNSAFE=yes
+
+.include <bsd.port.mk>
Index: devel/g-wrap/distinfo
===================================================================
--- /dev/null
+++ devel/g-wrap/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1572328655
+SHA256 (g-wrap-1.9.15.tar.gz) = 0ff6e2700e74b457323726f7c2551a466d8ba44339705f6792d7b533145c602a
+SIZE (g-wrap-1.9.15.tar.gz) = 701601
Index: devel/g-wrap/pkg-descr
===================================================================
--- /dev/null
+++ devel/g-wrap/pkg-descr
@@ -0,0 +1,6 @@
+G-Wrap is a tool (and guile library) for generating function wrappers
+for inter-language calls. It currently only supports generating Guile
+wrappers for C functions. Other languages may be supported in the
+future, possibly on both sides.
+
+WWW: http://www.nongnu.org/g-wrap/
Index: devel/g-wrap/pkg-plist
===================================================================
--- /dev/null
+++ devel/g-wrap/pkg-plist
@@ -0,0 +1,45 @@
+bin/g-wrap-config
+include/g-wrap-wct.h
+include/g-wrap/core-runtime.h
+include/g-wrap/ffi-support.h
+include/g-wrap/guile-compatibility.h
+include/g-wrap/guile-runtime.h
+include/g-wrap/guile-wct.h
+lib/g-wrap/modules/libgw-guile-gw-glib.a
+lib/g-wrap/modules/libgw-guile-gw-glib.so
+lib/g-wrap/modules/libgw-guile-gw-glib.so.0
+lib/g-wrap/modules/libgw-guile-gw-glib.so.0.0.0
+lib/g-wrap/modules/libgw-guile-standard.a
+lib/g-wrap/modules/libgw-guile-standard.so
+lib/g-wrap/modules/libgw-guile-standard.so.0
+lib/g-wrap/modules/libgw-guile-standard.so.0.0.0
+lib/libgwrap-core-runtime.a
+lib/libgwrap-core-runtime.so
+lib/libgwrap-core-runtime.so.2
+lib/libgwrap-core-runtime.so.2.0.0
+lib/libgwrap-guile-runtime.a
+lib/libgwrap-guile-runtime.so
+lib/libgwrap-guile-runtime.so.2
+lib/libgwrap-guile-runtime.so.2.0.0
+libdata/pkgconfig/g-wrap-2.0-guile.pc
+man/man1/g-wrap-config.1.gz
+share/aclocal/g-wrap.m4
+share/guile/site/g-wrap.scm
+share/guile/site/g-wrap/c-codegen.scm
+share/guile/site/g-wrap/c-types.scm
+share/guile/site/g-wrap/compat.scm
+share/guile/site/g-wrap/config.scm
+share/guile/site/g-wrap/enumeration.scm
+share/guile/site/g-wrap/guile.scm
+share/guile/site/g-wrap/guile/ws/standard.scm
+share/guile/site/g-wrap/gw-glib-spec.scm
+share/guile/site/g-wrap/gw-glib.scm
+share/guile/site/g-wrap/gw-standard-spec.scm
+share/guile/site/g-wrap/gw-wct-spec.scm
+share/guile/site/g-wrap/gw-wct.scm
+share/guile/site/g-wrap/gw/standard.scm
+share/guile/site/g-wrap/rti.scm
+share/guile/site/g-wrap/scm-codegen.scm
+share/guile/site/g-wrap/simple-type.scm
+share/guile/site/g-wrap/util.scm
+share/guile/site/g-wrap/ws/standard.scm
Index: graphics/guile-cairo/Makefile
===================================================================
--- /dev/null
+++ graphics/guile-cairo/Makefile
@@ -0,0 +1,27 @@
+# $FreeBSD$
+
+PORTNAME=	guile-cairo
+DISTVERSION=	1.10.0
+CATEGORIES=	graphics
+MASTER_SITES=	SAVANNAH
+
+MAINTAINER=	andrew@tao11.riddles.org.uk
+COMMENT=	Wrapper for using the Cairo graphics library from Guile
+
+LICENSE=	LGPL3+
+
+LIB_DEPENDS=	libguile-2.2.so:lang/guile2				\
+		libgc-threaded.so:devel/boehm-gc-threaded
+BUILD_DEPENDS=	guile2>=2.2:lang/guile2
+
+USES=		gmake gnome libtool pkgconfig
+USE_GNOME=	cairo
+USE_LDCONFIG=	yes
+
+GNU_CONFIGURE=	yes
+
+INFO=		guile-cairo
+
+MAKE_JOBS_UNSAFE=yes
+
+.include <bsd.port.mk>
Index: graphics/guile-cairo/distinfo
===================================================================
--- /dev/null
+++ graphics/guile-cairo/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1572341723
+SHA256 (guile-cairo-1.10.0.tar.gz) = ae3d7e0f0a8ae93d0a15c692514eb30f2478d407052064976fc59a291cccdd5c
+SIZE (guile-cairo-1.10.0.tar.gz) = 633917
Index: graphics/guile-cairo/pkg-descr
===================================================================
--- /dev/null
+++ graphics/guile-cairo/pkg-descr
@@ -0,0 +1,3 @@
+Guile-Cairo wraps the Cairo graphics library for Guile Scheme.
+
+WWW: http://www.nongnu.org/guile-cairo/
Index: graphics/guile-cairo/pkg-plist
===================================================================
--- /dev/null
+++ graphics/guile-cairo/pkg-plist
@@ -0,0 +1,12 @@
+include/guile-cairo/guile-cairo-enum-types.h
+include/guile-cairo/guile-cairo-smob-types.h
+include/guile-cairo/guile-cairo-vector-types.h
+include/guile-cairo/guile-cairo.h
+lib/libguile-cairo.so
+lib/libguile-cairo.so.0
+lib/libguile-cairo.so.0.0.0
+libdata/pkgconfig/guile-cairo.pc
+share/guile/site/cairo.scm
+share/guile/site/cairo/cairo-procedures.txt
+share/guile/site/cairo/config.scm
+share/guile/site/cairo/vector-types.scm
Index: x11-toolkits/guile-gnome-platform/Makefile
===================================================================
--- /dev/null
+++ x11-toolkits/guile-gnome-platform/Makefile
@@ -0,0 +1,130 @@
+# $FreeBSD$
+
+PORTNAME=	guile-gnome-platform
+DISTVERSION=	2.16.5
+CATEGORIES=	x11-toolkits
+MASTER_SITES=	GNU/guile-gnome/${PORTNAME}
+
+MAINTAINER=	andrew@tao11.riddles.org.uk
+COMMENT=	Guile bindings for Gnome libraries
+
+LICENSE=	GPLv2+
+
+# We don't actually need gettext, but for some incomprehensible reason it
+# is the package that installs some basic gnulib autoconf functionality.
+BUILD_DEPENDS=	guile2>=2.2:lang/guile2					\
+		${LOCALBASE}/share/aclocal/lib-link.m4:devel/gettext-tools
+LIB_DEPENDS=	libguile-2.2.so:lang/guile2				\
+		libgc-threaded.so:devel/boehm-gc-threaded		\
+		libgwrap-guile-runtime.so:devel/g-wrap			\
+		libguile-cairo.so:graphics/guile-cairo			\
+		libffi.so:devel/libffi
+
+# A note on flavors: LIBGNOMEUI, LIBGNOME, GCONF pull in very long
+# dependency lists including things like spidermonkey and samba, which
+# is rather overkill if you just want to do GUI tools. So make "lite"
+# the default for now.
+FLAVORS=	lite full
+FLAVOR?=	${FLAVORS:[1]}
+lite_PKGNAMESUFFIX=-lite
+full_PKGNAMESUFFIX=-full
+lite_CONFLICTS_INSTALL=${PORTNAME}-full
+full_CONFLICTS_INSTALL=${PORTNAME}-lite
+
+USES=		autoreconf gmake gnome libtool pkgconfig
+USE_GNOME=	glib20
+USE_LDCONFIG=	yes
+
+GNU_CONFIGURE=	yes
+
+DATADIR=	${PREFIX}/share/guile-gnome-2
+
+MAKE_JOBS_UNSAFE=yes
+
+OPTIONS_DEFINE=	ATK CAIRO CANVAS GCONF GLADE GTK2 LIBGNOME LIBGNOMEUI PANGO
+OPTIONS_DEFAULT=ATK CAIRO CANVAS GCONF GLADE GTK2 LIBGNOME LIBGNOMEUI PANGO
+
+.if ${FLAVOR:Ulite} == lite
+OPTIONS_EXCLUDE=GCONF LIBGNOME LIBGNOMEUI
+.endif
+
+OPTIONS_SUB=	yes
+
+# other options have descriptions provided by ports/Mk/*
+ATK_DESC=	GNOME accessibility toolkit (ATK)
+CANVAS_DESC=	GNOMECanvas Graphics library
+LIBGNOME_DESC=	libgnome support
+LIBGNOMEUI_DESC=libgnomeui support
+
+# Option dependencies. Broadly speaking, we try and follow the same
+# dependency structure as the underlying Gnome modules, but this isn't
+# critical.
+CANVAS_IMPLIES=	GTK2 GLADE
+GLADE_IMPLIES=	GTK2
+GTK2_IMPLIES=	CAIRO
+LIBGNOMEUI_IMPLIES=GTK2 LIBGNOME
+
+ATK_CONFIGURE_WITH=atk
+ATK_USE=	gnome=atk
+
+CAIRO_CONFIGURE_WITH=cairo
+CAIRO_USE=	gnome=cairo
+
+CANVAS_CONFIGURE_WITH=canvas
+CANVAS_USE=	gnome=libgnomecanvas
+
+GCONF_CONFIGURE_WITH=gconf
+GCONF_USE=	gnome=gconf2
+
+GTK2_CONFIGURE_WITH=gtk pixbuf
+GTK2_USE=	gnome=gtk20,gdkpixbuf2
+GTK2_LIB_DEPENDS=libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2
+
+GLADE_CONFIGURE_WITH=libglade
+GLADE_USE=	gnome=libglade2
+
+LIBGNOME_CONFIGURE_WITH=libgnome
+LIBGNOME_USE=	gnome=libgnome
+LIBGNOME_LIB_DEPENDS=libpopt.so:devel/popt
+
+LIBGNOMEUI_CONFIGURE_WITH=libgnomeui
+LIBGNOMEUI_USES=xorg
+LIBGNOMEUI_USE=	gnome=libgnomeui xorg=sm,ice
+
+PANGO_CONFIGURE_WITH=pango
+PANGO_USE=	gnome=pango
+
+# Info files for each submodule. glib and gobject are always built.
+INFO=		guile-gnome-glib guile-gnome-gobject
+
+ATK_INFO=	guile-gnome-atk
+CANVAS_INFO=	guile-gnome-libgnomecanvas
+GCONF_INFO=	guile-gnome-gconf
+GLADE_INFO=	guile-gnome-libglade
+GTK2_INFO=	guile-gnome-gtk guile-gnome-gdk
+LIBGNOME_INFO=	guile-gnome-libgnome
+LIBGNOMEUI_INFO=guile-gnome-libgnomeui
+PANGO_INFO=	guile-gnome-pango
+PANGOCAIRO_INFO=guile-gnome-pangocairo
+
+# pangocairo doesn't have its own option, but is enabled if both PANGO
+# and CAIRO are set.
+HAS_PANGOCAIRO=	${"${PORT_OPTIONS:MPANGO}${PORT_OPTIONS:MCAIRO}" == "PANGOCAIRO":?1:}
+INFO+=		${"${HAS_PANGOCAIRO}":?${PANGOCAIRO_INFO}:}
+
+# Compute the list of info files that are _not_ installed.
+INFO_UNUSED=	${DESELECTED_OPTIONS:@s@${${s}_INFO}@}		\
+		${OPTIONS_EXCLUDE:@s@${${s}_INFO}@}		\
+		${"${HAS_PANGOCAIRO}":?:${PANGOCAIRO_INFO}}
+
+# pacify check-plist by removing any .info files for deselected
+# components. This doesn't affect the packaging but makes QA testing
+# of the options much easier.
+
+post-install:
+	for f in ${INFO_UNUSED}; do \
+		${RM} ${STAGEDIR}${PREFIX}/${INFO_PATH}/$${f}.info*; \
+	done; \
+
+.include <bsd.port.mk>
Index: x11-toolkits/guile-gnome-platform/distinfo
===================================================================
--- /dev/null
+++ x11-toolkits/guile-gnome-platform/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1572342472
+SHA256 (guile-gnome-platform-2.16.5.tar.gz) = 298d8c4f9b567bfe87beda18ed58d047c2e01b88c80895129de5466b921ccebe
+SIZE (guile-gnome-platform-2.16.5.tar.gz) = 2484146
Index: x11-toolkits/guile-gnome-platform/files/patch-configure.ac
===================================================================
--- /dev/null
+++ x11-toolkits/guile-gnome-platform/files/patch-configure.ac
@@ -0,0 +1,161 @@
+--- configure.ac.orig	2019-10-29 13:46:02 UTC
++++ configure.ac
+@@ -127,7 +127,13 @@ record_check()
+ 
+ # Per-package checks follow
+ # atk
+-PKG_CHECK_MODULES(ATK, atk >= 1.12, HAVE_ATK=true, HAVE_ATK=false)
++AC_ARG_WITH([atk], AC_HELP_STRING([--without-atk], [Don't build ATK wrapper (default: test)]))
++AS_IF([test "x$with_atk" != "xno"],
++      [PKG_CHECK_MODULES(ATK, atk >= 1.12, HAVE_ATK=true, HAVE_ATK=false)],
++      [HAVE_ATK=false])
++AS_IF([test "x$HAVE_ATK" = "xfalse"],
++      [AS_IF([test "x$with_atk" = "xyes"],
++             [AC_MSG_ERROR([atk requested but not found])])])
+ AC_SUBST(ATK_CFLAGS)
+ AC_SUBST(ATK_LIBS)
+ AM_CONDITIONAL(HAVE_ATK, $HAVE_ATK)
+@@ -139,7 +145,13 @@ record_check atk $HAVE_ATK
+ # type system.  It has only been around since Cairo 1.10, but without
+ # there's no sane way to pass Cairo values through callbacks, so we
+ # require it to build the Cairo integration for Guile-GNOME.
+-PKG_CHECK_MODULES(GUILE_CAIRO, guile-cairo cairo-gobject, HAVE_CAIRO=true, HAVE_CAIRO=false)
++AC_ARG_WITH([cairo], AC_HELP_STRING([--without-cairo], [Don't build Cairo wrapper (default: test)]))
++AS_IF([test "x$with_cairo" != "xno"],
++      [PKG_CHECK_MODULES(GUILE_CAIRO, guile-cairo cairo-gobject, HAVE_CAIRO=true, HAVE_CAIRO=false)],
++      [HAVE_CAIRO=false])
++AS_IF([test "x$HAVE_CAIRO" = "xfalse"],
++      [AS_IF([test "x$with_cairo" = "xyes"],
++             [AC_MSG_ERROR([Cairo requested but not found])])])
+ AC_SUBST(GUILE_CAIRO_CFLAGS)
+ AC_SUBST(GUILE_CAIRO_LIBS)
+ AM_CONDITIONAL(HAVE_CAIRO, $HAVE_CAIRO)
+@@ -162,7 +174,13 @@ record_check cairo $HAVE_CAIRO
+ # record_check corba $HAVE_CORBA
+ 
+ # gconf
+-PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.18, HAVE_GCONF=true, HAVE_GCONF=false)
++AC_ARG_WITH([gconf], AC_HELP_STRING([--without-gconf], [Don't build GConf wrapper (default: test)]))
++AS_IF([test "x$with_gconf" != "xno"],
++      [PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.18, HAVE_GCONF=true, HAVE_GCONF=false)],
++      [HAVE_GCONF=false])
++AS_IF([test "x$HAVE_GCONF" = "xfalse"],
++      [AS_IF([test "x$with_gconf" = "xyes"],
++             [AC_MSG_ERROR([GConf requested but not found])])])
+ AC_SUBST(GCONF_CFLAGS)
+ AC_SUBST(GCONF_LIBS)
+ AM_CONDITIONAL(HAVE_GCONF, $HAVE_GCONF)
+@@ -209,10 +227,19 @@ record_check glib true
+ # record_check gnome-vfs $HAVE_GNOME_VFS
+ 
+ # gtk
+-PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0 >= 2.10.0, HAVE_GDK_PIXBUF=true, HAVE_GDK_PIBXUF=false)
++AC_ARG_WITH([pixbuf], AC_HELP_STRING([--without-pixbuf], [Don't build gdk-pixbuf wrapper (default: test)]))
++AS_IF([test "x$with_pixbuf" != "xno"],
++      [PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0 >= 2.10.0, HAVE_GDK_PIXBUF=true, HAVE_GDK_PIBXUF=false)],
++      [HAVE_GDK_PIXBUF=false])
++AS_IF([test "x$HAVE_GDK_PIXBUF" = "xfalse"],
++      [AS_IF([test "x$with_pixbuf" = "xyes"],
++             [AC_MSG_ERROR([gdk-pixbuf requested but not found])])])
+ AC_SUBST(GDK_PIXBUF_CFLAGS)
+ AC_SUBST(GDK_PIXBUF_LIBS)
+ AM_CONDITIONAL(HAVE_GDK_PIXBUF, $HAVE_GDK_PIXBUF)
++AC_ARG_WITH([gtk], AC_HELP_STRING([--without-gtk], [Don't build gtk wrapper (default: test)]))
++AS_IF([test "x$with_gtk" != "xno"],
++[
+ if $HAVE_CAIRO; then
+   PKG_CHECK_MODULES(GDK, gdk-2.0 >= 2.10.0, HAVE_GDK=true, HAVE_GDK=false)
+   AC_SUBST(GDK_CFLAGS)
+@@ -233,33 +260,64 @@ else
+   HAVE_GDK=false
+   HAVE_GTK=false
+ fi
++],[
++  HAVE_GDK=false
++  HAVE_GTK=false
++])
++AS_IF([test "x$HAVE_GTK$HAVE_GDK" != "xtruetrue"],
++      [AS_IF([test "x$with_gtk" = "xyes"],
++             [AC_MSG_ERROR([gtk requested but not found])])])
+ AM_CONDITIONAL(HAVE_GDK, $HAVE_GDK)
+ AM_CONDITIONAL(HAVE_GTK, $HAVE_GTK)
+ record_check gtk $HAVE_GTK
+ 
+ # libglade
+-PKG_CHECK_MODULES(LIBGLADE, libglade-2.0 >= 2.6, HAVE_LIBGLADE=true, HAVE_LIBGLADE=false)
++AC_ARG_WITH([libglade], AC_HELP_STRING([--without-libglade], [Don't build libglade wrapper (default: test)]))
++AS_IF([test "x$with_libglade" != "xno"],
++      [PKG_CHECK_MODULES(LIBGLADE, libglade-2.0 >= 2.6, HAVE_LIBGLADE=true, HAVE_LIBGLADE=false)],
++      [HAVE_LIBGLADE=false])
++AS_IF([test "x$HAVE_LIBGLADE" = "xfalse"],
++      [AS_IF([test "x$with_libglade" = "xyes"],
++             [AC_MSG_ERROR([libglade requested but not found])])])
+ AC_SUBST(LIBGLADE_CFLAGS)
+ AC_SUBST(LIBGLADE_LIBS)
+ AM_CONDITIONAL(HAVE_LIBGLADE, $HAVE_LIBGLADE)
+ record_check libglade $HAVE_LIBGLADE
+ 
+ # libgnome
+-PKG_CHECK_MODULES(LIBGNOME, libgnome-2.0 >= 2.16, HAVE_LIBGNOME=true, HAVE_LIBGNOME=false)
++AC_ARG_WITH([libgnome], AC_HELP_STRING([--without-libgnome], [Don't build libgnome wrapper (default: test)]))
++AS_IF([test "x$with_libgnome" != "xno"],
++      [PKG_CHECK_MODULES(LIBGNOME, libgnome-2.0 >= 2.16, HAVE_LIBGNOME=true, HAVE_LIBGNOME=false)],
++      [HAVE_LIBGNOME=false])
++AS_IF([test "x$HAVE_LIBGNOME" = "xfalse"],
++      [AS_IF([test "x$with_libgnome" = "xyes"],
++             [AC_MSG_ERROR([libgnome requested but not found])])])
+ AC_SUBST(LIBGNOME_CFLAGS)
+ AC_SUBST(LIBGNOME_LIBS)
+ AM_CONDITIONAL(HAVE_LIBGNOME, $HAVE_LIBGNOME)
+ record_check libgnome $HAVE_LIBGNOME
+ 
+ # libgnomecanvas
+-PKG_CHECK_MODULES(CANVAS, libgnomecanvas-2.0 >= 2.14, HAVE_CANVAS=true, HAVE_CANVAS=false)
++AC_ARG_WITH([canvas], AC_HELP_STRING([--without-canvas], [Don't build libgnomecanvas wrapper (default: test)]))
++AS_IF([test "x$with_canvas" != "xno"],
++      [PKG_CHECK_MODULES(CANVAS, libgnomecanvas-2.0 >= 2.14, HAVE_CANVAS=true, HAVE_CANVAS=false)],
++      [HAVE_CANVAS=false])
++AS_IF([test "x$HAVE_CANVAS" = "xfalse"],
++      [AS_IF([test "x$with_canvas" = "xyes"],
++             [AC_MSG_ERROR([libgnomecanvas requested but not found])])])
+ AC_SUBST(CANVAS_CFLAGS)
+ AC_SUBST(CANVAS_LIBS)
+ AM_CONDITIONAL(HAVE_CANVAS, $HAVE_CANVAS)
+ record_check libgnomecanvas $HAVE_CANVAS
+ 
+ # libgnomeui
+-PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0 >= 2.16.0, HAVE_LIBGNOMEUI=true, HAVE_LIBGNOMEUI=false)
++AC_ARG_WITH([libgnomeui], AC_HELP_STRING([--without-libgnomeui], [Don't build libgnomeui wrapper (default: test)]))
++AS_IF([test "x$with_libgnomeui" != "xno"],
++      [PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0 >= 2.16.0, HAVE_LIBGNOMEUI=true, HAVE_LIBGNOMEUI=false)],
++      [HAVE_LIBGNOMEUI=false])
++AS_IF([test "x$HAVE_LIBGNOMEUI" = "xfalse"],
++      [AS_IF([test "x$with_libgnomeui" = "xyes"],
++             [AC_MSG_ERROR([libgnomeui requested but not found])])])
+ AC_SUBST(LIBGNOMEUI_CFLAGS)
+ AC_SUBST(LIBGNOMEUI_LIBS)
+ AM_CONDITIONAL(HAVE_LIBGNOMEUI, $HAVE_LIBGNOMEUI)
+@@ -272,11 +330,22 @@ AC_SUBST(GNOMEUI_DEPRECATION_FLAGS)
+ record_check libgnomeui $HAVE_LIBGNOMEUI
+ 
+ # pango
++AC_ARG_WITH([pango], AC_HELP_STRING([--without-pango], [Don't build pango wrapper (default: test)]))
++AS_IF([test "x$with_pango" != "xno"],
++      [
+ PKG_CHECK_MODULES(PANGO, pango >= 1.14, HAVE_PANGO=true, HAVE_PANGO=false)
++PKG_CHECK_MODULES(PANGOCAIRO, pangocairo >= 1.14, HAVE_PANGOCAIRO=true, HAVE_PANGOCAIRO=false)
++      ],
++      [
++HAVE_PANGO=false
++HAVE_PANGOCAIRO=false
++      ])
++AS_IF([test "x$HAVE_PANGO" = "xfalse"],
++      [AS_IF([test "x$with_pango" = "xyes"],
++             [AC_MSG_ERROR([pango requested but not found])])])
+ AC_SUBST(PANGO_CFLAGS)
+ AC_SUBST(PANGO_LIBS)
+ AM_CONDITIONAL(HAVE_PANGO, $HAVE_PANGO)
+-PKG_CHECK_MODULES(PANGOCAIRO, pangocairo >= 1.14, HAVE_PANGOCAIRO=true, HAVE_PANGOCAIRO=false)
+ AC_SUBST(PANGOCAIRO_CFLAGS)
+ AC_SUBST(PANGOCAIRO_LIBS)
+ AM_CONDITIONAL(HAVE_PANGOCAIRO, $HAVE_PANGOCAIRO)
Index: x11-toolkits/guile-gnome-platform/files/patch-glib_bin_Makefile.am
===================================================================
--- /dev/null
+++ x11-toolkits/guile-gnome-platform/files/patch-glib_bin_Makefile.am
@@ -0,0 +1,17 @@
+--- glib/bin/Makefile.am.orig	2019-10-30 03:48:02 UTC
++++ glib/bin/Makefile.am
+@@ -17,14 +17,6 @@ guile-gnome-@API_VERSION@: guile-gnome.i
+ 
+ install-exec-local: Makefile
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+-	sed -e "s|@API_VERSION\@|@API_VERSION@|g" \
+-	    -e "s|@running-uninstalled\@|#f|g" \
+-	    -e "s|@guilegnomedir\@|$(guilegnomedir)|g" \
+-	    -e "s|@guilegnomelibdir\@|$(guilegnomelibdir)|g" \
+-	    -e "s|@libdir\@|$(libdir)|g" \
+-	    $(srcdir)/guile-gnome.in > $(DESTDIR)$(bindir)/guile-gnome-@API_VERSION@
+-	chmod 755 $(DESTDIR)$(bindir)/guile-gnome-@API_VERSION@
+ 
+ EXTRA_DIST = guile-gnome.in
+ CLEANFILES = $(bin_SCRIPTS)
Index: x11-toolkits/guile-gnome-platform/pkg-descr
===================================================================
--- /dev/null
+++ x11-toolkits/guile-gnome-platform/pkg-descr
@@ -0,0 +1,7 @@
+Guile-Gnome is a Guile wrapper collection for most of the GNOME core
+libraries. Guile-Gnome brings the power of Scheme to your graphical
+application: from Pango to GnomeCanvas, Gtk+ to GStreamer, Glade to
+GtkSourceView, you will find in Guile-Gnome a comprehensive
+environment for developing modern applications.
+
+WWW: https://www.gnu.org/software/guile-gnome/
Index: x11-toolkits/guile-gnome-platform/pkg-plist
===================================================================
--- /dev/null
+++ x11-toolkits/guile-gnome-platform/pkg-plist
@@ -0,0 +1,186 @@
+bin/guile-gnome-2
+include/guile-gnome-2/guile-gnome-gobject.h
+include/guile-gnome-2/guile-gnome-gobject/gc.h
+include/guile-gnome-2/guile-gnome-gobject/gclosure.h
+include/guile-gnome-2/guile-gnome-gobject/gobject.h
+include/guile-gnome-2/guile-gnome-gobject/gparameter.h
+include/guile-gnome-2/guile-gnome-gobject/gsignal.h
+include/guile-gnome-2/guile-gnome-gobject/gtype.h
+include/guile-gnome-2/guile-gnome-gobject/gutil.h
+include/guile-gnome-2/guile-gnome-gobject/gvalue.h
+%%ATK%%lib/guile-gnome-2/libgw-guile-gnome-atk.so
+%%ATK%%lib/guile-gnome-2/libgw-guile-gnome-atk.so.0
+%%ATK%%lib/guile-gnome-2/libgw-guile-gnome-atk.so.0.0.0
+%%CAIRO%%lib/guile-gnome-2/libgw-guile-gnome-cairo.so
+%%CAIRO%%lib/guile-gnome-2/libgw-guile-gnome-cairo.so.0
+%%CAIRO%%lib/guile-gnome-2/libgw-guile-gnome-cairo.so.0.0.0
+%%CANVAS%%lib/guile-gnome-2/libgw-guile-gnome-canvas.so
+%%CANVAS%%lib/guile-gnome-2/libgw-guile-gnome-canvas.so.0
+%%CANVAS%%lib/guile-gnome-2/libgw-guile-gnome-canvas.so.0.0.0
+%%GCONF%%lib/guile-gnome-2/libgw-guile-gnome-gconf.so
+%%GCONF%%lib/guile-gnome-2/libgw-guile-gnome-gconf.so.0
+%%GCONF%%lib/guile-gnome-2/libgw-guile-gnome-gconf.so.0.0.0
+%%GTK2%%lib/guile-gnome-2/libgw-guile-gnome-gdk.so
+%%GTK2%%lib/guile-gnome-2/libgw-guile-gnome-gdk.so.0
+%%GTK2%%lib/guile-gnome-2/libgw-guile-gnome-gdk.so.0.0.0
+lib/guile-gnome-2/libgw-guile-gnome-glib.so
+lib/guile-gnome-2/libgw-guile-gnome-glib.so.0
+lib/guile-gnome-2/libgw-guile-gnome-glib.so.0.0.0
+lib/guile-gnome-2/libgw-guile-gnome-gobject.so
+lib/guile-gnome-2/libgw-guile-gnome-gobject.so.0
+lib/guile-gnome-2/libgw-guile-gnome-gobject.so.0.0.0
+%%GTK2%%lib/guile-gnome-2/libgw-guile-gnome-gtk.so
+%%GTK2%%lib/guile-gnome-2/libgw-guile-gnome-gtk.so.0
+%%GTK2%%lib/guile-gnome-2/libgw-guile-gnome-gtk.so.0.0.0
+%%GLADE%%lib/guile-gnome-2/libgw-guile-gnome-libglade.so
+%%GLADE%%lib/guile-gnome-2/libgw-guile-gnome-libglade.so.0
+%%GLADE%%lib/guile-gnome-2/libgw-guile-gnome-libglade.so.0.0.0
+%%LIBGNOME%%lib/guile-gnome-2/libgw-guile-gnome-libgnome.so
+%%LIBGNOME%%lib/guile-gnome-2/libgw-guile-gnome-libgnome.so.0
+%%LIBGNOME%%lib/guile-gnome-2/libgw-guile-gnome-libgnome.so.0.0.0
+%%LIBGNOMEUI%%lib/guile-gnome-2/libgw-guile-gnome-libgnomeui.so
+%%LIBGNOMEUI%%lib/guile-gnome-2/libgw-guile-gnome-libgnomeui.so.0
+%%LIBGNOMEUI%%lib/guile-gnome-2/libgw-guile-gnome-libgnomeui.so.0.0.0
+%%PANGO%%lib/guile-gnome-2/libgw-guile-gnome-pango.so
+%%PANGO%%lib/guile-gnome-2/libgw-guile-gnome-pango.so.0
+%%PANGO%%lib/guile-gnome-2/libgw-guile-gnome-pango.so.0.0.0
+%%PANGO%%%%CAIRO%%lib/guile-gnome-2/libgw-guile-gnome-pangocairo.so
+%%PANGO%%%%CAIRO%%lib/guile-gnome-2/libgw-guile-gnome-pangocairo.so.0
+%%PANGO%%%%CAIRO%%lib/guile-gnome-2/libgw-guile-gnome-pangocairo.so.0.0.0
+lib/libguile-gnome-gobject-2.so
+lib/libguile-gnome-gobject-2.so.0
+lib/libguile-gnome-gobject-2.so.0.0.0
+libdata/pkgconfig/guile-gnome-defs-2.pc
+libdata/pkgconfig/guile-gnome-glib-2.pc
+%%GTK2%%libdata/pkgconfig/guile-gnome-gtk-2.pc
+%%LIBGNOMEUI%%libdata/pkgconfig/guile-gnome-libgnomeui-2.pc
+%%ATK%%%%DATADIR%%/gnome/atk.scm
+%%CANVAS%%%%DATADIR%%/gnome/canvas.scm
+%%DATADIR%%/gnome/contrib/delay-tree-model.scm
+%%DATADIR%%/gnome/contrib/filtered-list.scm
+%%DATADIR%%/gnome/contrib/help-browser.scm
+%%DATADIR%%/gnome/contrib/texinfo-buffer.scm
+%%DATADIR%%/gnome/defs/applet.defs
+%%DATADIR%%/gnome/defs/art.defs
+%%DATADIR%%/gnome/defs/atk-types.defs
+%%DATADIR%%/gnome/defs/atk.defs
+%%DATADIR%%/gnome/defs/bonobo-types.defs
+%%DATADIR%%/gnome/defs/bonobo.defs
+%%DATADIR%%/gnome/defs/bonoboui-types.defs
+%%DATADIR%%/gnome/defs/bonoboui.defs
+%%DATADIR%%/gnome/defs/common-ignores.defs
+%%DATADIR%%/gnome/defs/gconf-types.defs
+%%DATADIR%%/gnome/defs/gconf.defs
+%%DATADIR%%/gnome/defs/gdk-pixbuf-types.defs
+%%DATADIR%%/gnome/defs/gdk-pixbuf.defs
+%%DATADIR%%/gnome/defs/gdk-types.defs
+%%DATADIR%%/gnome/defs/gdk.defs
+%%DATADIR%%/gnome/defs/glib-types.defs
+%%DATADIR%%/gnome/defs/glib.defs
+%%DATADIR%%/gnome/defs/gnome-vfs-types.defs
+%%DATADIR%%/gnome/defs/gnome-vfs.defs
+%%DATADIR%%/gnome/defs/gtk-types.defs
+%%DATADIR%%/gnome/defs/gtk.defs
+%%DATADIR%%/gnome/defs/gtkhtml2.defs
+%%DATADIR%%/gnome/defs/gtksourceview-overrides.defs
+%%DATADIR%%/gnome/defs/gtksourceview.defs
+%%DATADIR%%/gnome/defs/libgda-overrides.defs
+%%DATADIR%%/gnome/defs/libgda-types.defs
+%%DATADIR%%/gnome/defs/libgda.defs
+%%DATADIR%%/gnome/defs/libglade-types.defs
+%%DATADIR%%/gnome/defs/libglade.defs
+%%DATADIR%%/gnome/defs/libgnome-types.defs
+%%DATADIR%%/gnome/defs/libgnome.defs
+%%DATADIR%%/gnome/defs/libgnomecanvas-types.defs
+%%DATADIR%%/gnome/defs/libgnomecanvas.defs
+%%DATADIR%%/gnome/defs/libgnomeui-types.defs
+%%DATADIR%%/gnome/defs/libgnomeui.defs
+%%DATADIR%%/gnome/defs/nautilus.defs
+%%DATADIR%%/gnome/defs/pango-types.defs
+%%DATADIR%%/gnome/defs/pango.defs
+%%DATADIR%%/gnome/defs/pangocairo-types.defs
+%%DATADIR%%/gnome/defs/pangocairo.defs
+%%DATADIR%%/gnome/defs/print.defs
+%%DATADIR%%/gnome/defs/printui.defs
+%%DATADIR%%/gnome/defs/vte-overrides.defs
+%%DATADIR%%/gnome/defs/vte.defs
+%%GCONF%%%%DATADIR%%/gnome/gconf.scm
+%%GLADE%%%%DATADIR%%/gnome/glade.scm
+%%DATADIR%%/gnome/glib.scm
+%%LIBGNOMEUI%%%%DATADIR%%/gnome/gnome-ui.scm
+%%LIBGNOME%%%%DATADIR%%/gnome/gnome.scm
+%%DATADIR%%/gnome/gobject.scm
+%%DATADIR%%/gnome/gobject/config.scm
+%%DATADIR%%/gnome/gobject/defs-support.scm
+%%DATADIR%%/gnome/gobject/event-repl.scm
+%%DATADIR%%/gnome/gobject/gclosure.scm
+%%DATADIR%%/gnome/gobject/generics.scm
+%%DATADIR%%/gnome/gobject/gobject.scm
+%%DATADIR%%/gnome/gobject/gparameter.scm
+%%DATADIR%%/gnome/gobject/gsignal.scm
+%%DATADIR%%/gnome/gobject/gtype.scm
+%%DATADIR%%/gnome/gobject/gvalue.scm
+%%DATADIR%%/gnome/gobject/gw-spec-utils.scm
+%%DATADIR%%/gnome/gobject/gw-utils.scm
+%%DATADIR%%/gnome/gobject/utils.scm
+%%GTK2%%%%DATADIR%%/gnome/gtk.scm
+%%DATADIR%%/gnome/gtk/gdk-event.scm
+%%DATADIR%%/gnome/gtk/graphical-repl.scm
+%%ATK%%%%DATADIR%%/gnome/gw/atk-spec.scm
+%%ATK%%%%DATADIR%%/gnome/gw/atk.scm
+%%CAIRO%%%%DATADIR%%/gnome/gw/cairo-spec.scm
+%%CAIRO%%%%DATADIR%%/gnome/gw/cairo.scm
+%%CANVAS%%%%DATADIR%%/gnome/gw/canvas-spec.scm
+%%CANVAS%%%%DATADIR%%/gnome/gw/canvas.scm
+%%GCONF%%%%DATADIR%%/gnome/gw/gconf-spec.scm
+%%GCONF%%%%DATADIR%%/gnome/gw/gconf.scm
+%%GTK2%%%%DATADIR%%/gnome/gw/gdk-spec.scm
+%%GTK2%%%%DATADIR%%/gnome/gw/gdk.scm
+%%DATADIR%%/gnome/gw/generics.scm
+%%DATADIR%%/gnome/gw/glib-spec.scm
+%%DATADIR%%/gnome/gw/glib.scm
+%%DATADIR%%/gnome/gw/gobject-spec.scm
+%%DATADIR%%/gnome/gw/gobject.scm
+%%GTK2%%%%DATADIR%%/gnome/gw/gtk-spec.scm
+%%GTK2%%%%DATADIR%%/gnome/gw/gtk.scm
+%%GLADE%%%%DATADIR%%/gnome/gw/libglade-spec.scm
+%%GLADE%%%%DATADIR%%/gnome/gw/libglade.scm
+%%LIBGNOME%%%%DATADIR%%/gnome/gw/libgnome-spec.scm
+%%LIBGNOME%%%%DATADIR%%/gnome/gw/libgnome.scm
+%%LIBGNOMEUI%%%%DATADIR%%/gnome/gw/libgnomeui-spec.scm
+%%LIBGNOMEUI%%%%DATADIR%%/gnome/gw/libgnomeui.scm
+%%PANGO%%%%DATADIR%%/gnome/gw/pango-spec.scm
+%%PANGO%%%%DATADIR%%/gnome/gw/pango.scm
+%%PANGO%%%%CAIRO%%%%DATADIR%%/gnome/gw/pangocairo-spec.scm
+%%PANGO%%%%CAIRO%%%%DATADIR%%/gnome/gw/pangocairo.scm
+%%DATADIR%%/gnome/gw/support/defs.scm
+%%DATADIR%%/gnome/gw/support/g-wrap.scm
+%%DATADIR%%/gnome/gw/support/genwrite.scm
+%%DATADIR%%/gnome/gw/support/glob.scm
+%%DATADIR%%/gnome/gw/support/gobject.scm
+%%DATADIR%%/gnome/gw/support/gtk-doc.scm
+%%DATADIR%%/gnome/gw/support/modules.scm
+%%DATADIR%%/gnome/gw/support/printf.scm
+%%DATADIR%%/gnome/gw/support/slib.scm
+%%ATK%%%%DATADIR%%/gnome/overrides/atk.defs
+%%ATK%%%%DATADIR%%/gnome/overrides/atk.defs-type-ignores
+%%DATADIR%%/gnome/overrides/gconf.defs
+%%DATADIR%%/gnome/overrides/gconf.defs-type-ignores
+%%DATADIR%%/gnome/overrides/gdk-pixbuf.defs
+%%DATADIR%%/gnome/overrides/gdk.defs
+%%DATADIR%%/gnome/overrides/gdk.defs-type-ignores
+%%DATADIR%%/gnome/overrides/glib.defs
+%%DATADIR%%/gnome/overrides/glib.defs-type-ignores
+%%DATADIR%%/gnome/overrides/gtk-customs.defs
+%%DATADIR%%/gnome/overrides/gtk.defs
+%%DATADIR%%/gnome/overrides/gtk.defs-type-ignores
+%%DATADIR%%/gnome/overrides/libglade.defs
+%%DATADIR%%/gnome/overrides/libgnome.defs
+%%DATADIR%%/gnome/overrides/libgnomecanvas.defs
+%%DATADIR%%/gnome/overrides/libgnomeui.defs
+%%DATADIR%%/gnome/overrides/libgnomeui.defs-type-ignores
+%%PANGO%%%%DATADIR%%/gnome/overrides/pango.defs
+%%PANGO%%%%DATADIR%%/gnome/overrides/pangocairo.defs
+%%PANGO%%%%DATADIR%%/gnome/pango.scm
+%%PANGO%%%%DATADIR%%/gnome/pangocairo.scm
+share/guile/site/gnome-2.scm