share/gnome -> share

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@8916 df743ca5-7f9a-e211-a948-0013205c9059

18 files changed, 539 insertions, 0 deletions

diff --git a/x11-toolkits/guile-gnome/Makefile b/x11-toolkits/guile-gnome/Makefile
new file mode 100644
index 000000000..2a2ec9570
--- /dev/null
+++ b/x11-toolkits/guile-gnome/Makefile
@@ -0,0 +1,33 @@
+# New ports collection makefile for:	guile-gnome
+# Date created:        			9th June 2000
+# Whom:                			Ade Lovett <ade@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom$
+
+PORTNAME=	guile-gnome
+PORTVERSION=	0.20
+PORTREVISION=	10
+CATEGORIES=	x11-toolkits gnome scheme
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/gnome-guile/0.20
+DISTNAME=	gnome-guile-${PORTVERSION}
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Guile binding library for GNOME
+
+LIB_DEPENDS=	guilegtk-1.2.0:${PORTSDIR}/x11-toolkits/guile-gtk
+
+USE_X_PREFIX=	yes
+GNU_CONFIGURE=	yes
+USE_GNOME=	gnomeprefix bonobo gtkhtml libglade
+USE_LDCONFIG=	yes
+CONFIGURE_ARGS=	--with-bonobo --with-gtkhtml --without-gal \
+		--with-libglade --with-gdkpixbuf --with-ghttp
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+pre-build:
+	@${TOUCH} -f ${WRKSRC}/guile-gnome/gtkhtml/*.c
+
+.include <bsd.port.mk>
diff --git a/x11-toolkits/guile-gnome/distinfo b/x11-toolkits/guile-gnome/distinfo
new file mode 100644
index 000000000..0fbc94dc3
--- /dev/null
+++ b/x11-toolkits/guile-gnome/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome-guile-0.20.tar.gz) = 2be739e8bbc9fffe70e7ef19950bc984
+SHA256 (gnome-guile-0.20.tar.gz) = eb595645a1fb5ad52fd467e8fe5217d839f59767936406c679ea7a35a0ce2ae2
+SIZE (gnome-guile-0.20.tar.gz) = 493941
diff --git a/x11-toolkits/guile-gnome/files/patch-aa b/x11-toolkits/guile-gnome/files/patch-aa
new file mode 100644
index 000000000..169b6af73
--- /dev/null
+++ b/x11-toolkits/guile-gnome/files/patch-aa
@@ -0,0 +1,7 @@
+--- Makefile.in.orig	Sun Feb  4 20:53:35 2001
++++ Makefile.in	Wed Feb 28 11:07:30 2001
+@@ -100,3 +100,3 @@
+ 
+-SUBDIRS = guile-gtk guile-gnome 
++SUBDIRS = guile-gnome 
+ 
diff --git a/x11-toolkits/guile-gnome/files/patch-ab b/x11-toolkits/guile-gnome/files/patch-ab
new file mode 100644
index 000000000..5993edaa7
--- /dev/null
+++ b/x11-toolkits/guile-gnome/files/patch-ab
@@ -0,0 +1,80 @@
+--- configure.orig	Fri Mar  9 11:06:26 2001
++++ configure	Thu Apr  5 11:39:56 2001
+@@ -3261,3 +3261,3 @@
+ 
+-subdirs="guile-gtk"
++subdirs=""
+ 
+@@ -3739,72 +3739,2 @@
+ 
+-  for ac_config_dir in guile-gtk; do
+-
+-    # Do not complain, so a configure script can configure whichever
+-    # parts of a large source tree are present.
+-    if test ! -d $srcdir/$ac_config_dir; then
+-      continue
+-    fi
+-
+-    echo configuring in $ac_config_dir
+-
+-    case "$srcdir" in
+-    .) ;;
+-    *)
+-      if test -d ./$ac_config_dir || mkdir ./$ac_config_dir; then :;
+-      else
+-        { echo "configure: error: can not create `pwd`/$ac_config_dir" 1>&2; exit 1; }
+-      fi
+-      ;;
+-    esac
+-
+-    ac_popdir=`pwd`
+-    cd $ac_config_dir
+-
+-      # A "../" for each directory in /$ac_config_dir.
+-      ac_dots=`echo $ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
+-
+-    case "$srcdir" in
+-    .) # No --srcdir option.  We are building in place.
+-      ac_sub_srcdir=$srcdir ;;
+-    /*) # Absolute path.
+-      ac_sub_srcdir=$srcdir/$ac_config_dir ;;
+-    *) # Relative path.
+-      ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;;
+-    esac
+-
+-    # Check for guested configure; otherwise get Cygnus style configure.
+-    if test -f $ac_sub_srcdir/configure; then
+-      ac_sub_configure=$ac_sub_srcdir/configure
+-    elif test -f $ac_sub_srcdir/configure.in; then
+-      ac_sub_configure=$ac_configure
+-    else
+-      echo "configure: warning: no configuration information is in $ac_config_dir" 1>&2
+-      ac_sub_configure=
+-    fi
+-
+-    # The recursion is here.
+-    if test -n "$ac_sub_configure"; then
+-
+-      # Make the cache file name correct relative to the subdirectory.
+-      case "$cache_file" in
+-      /*) ac_sub_cache_file=$cache_file ;;
+-      *) # Relative path.
+-        ac_sub_cache_file="$ac_dots$cache_file" ;;
+-      esac
+-  case "$ac_given_INSTALL" in
+-        [/$]*) INSTALL="$ac_given_INSTALL" ;;
+-        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+-        esac
+-
+-      echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
+-      # The eval makes quoting arguments work.
+-      if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir
+-      then :
+-      else
+-        { echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; }
+-      fi
+-    fi
+-
+-    cd $ac_popdir
+-  done
+ fi
diff --git a/x11-toolkits/guile-gnome/files/patch-ac b/x11-toolkits/guile-gnome/files/patch-ac
new file mode 100644
index 000000000..65e4af1f4
--- /dev/null
+++ b/x11-toolkits/guile-gnome/files/patch-ac
@@ -0,0 +1,22 @@
+--- guile-gnome/Makefile.in.orig	Sun Feb  4 20:53:40 2001
++++ guile-gnome/Makefile.in	Wed Feb 28 12:08:03 2001
+@@ -129,3 +129,3 @@
+ gnomeg_SOURCES = main.c gnomeg.c client.c gnome-glue.c gnome-ui-infos.h gnome-canvas-support.c gnome-canvas-support.h
+-gnomeg_LDADD =  	$(top_builddir)/guile-gtk/libguilegtk.la     	@GUILE_LIBS@ 				     	$(GNOME_LIBDIR)                              	$(GNOMEUI_LIBS)
++gnomeg_LDADD =  	@GUILE_LIBS@ 				     	$(GNOME_LIBDIR)                              	$(GNOMEUI_LIBS) -lguilegtk-1.2
+ 
+@@ -165,4 +165,4 @@
+ gnome-canvas-support.o
+-gnomeg_DEPENDENCIES =  $(top_builddir)/guile-gtk/libguilegtk.la
+-gnomeg_LDFLAGS = 
++gnomeg_DEPENDENCIES =
++gnomeg_LDFLAGS = -pthread
+ CFLAGS = @CFLAGS@
+@@ -190,7 +190,2 @@
+ 	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps guile-gnome/Makefile
+-
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) \
+-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+-
+ 
diff --git a/x11-toolkits/guile-gnome/files/patch-ad b/x11-toolkits/guile-gnome/files/patch-ad
new file mode 100644
index 000000000..5b9bc809f
--- /dev/null
+++ b/x11-toolkits/guile-gnome/files/patch-ad
@@ -0,0 +1,7 @@
+--- guile-gnome/libglade/Makefile.in.orig	Sun Feb  4 20:53:44 2001
++++ guile-gnome/libglade/Makefile.in	Wed Feb 28 11:11:15 2001
+@@ -103,3 +103,3 @@
+ 
+-GLADE_LIBS = -lglade -lglade-gnome 
++GLADE_LIBS = `libglade-config --libs gnome`
+  
diff --git a/x11-toolkits/guile-gnome/files/patch-guile-gnome::bonobo::Makefile.in b/x11-toolkits/guile-gnome/files/patch-guile-gnome::bonobo::Makefile.in
new file mode 100644
index 000000000..2921ca1bf
--- /dev/null
+++ b/x11-toolkits/guile-gnome/files/patch-guile-gnome::bonobo::Makefile.in
@@ -0,0 +1,15 @@
+--- guile-gnome/bonobo/Makefile.in.orig	Fri Mar  9 19:07:48 2001
++++ guile-gnome/bonobo/Makefile.in	Mon Nov 12 14:05:21 2001
+@@ -98,10 +98,10 @@
+ VERSION = @VERSION@
+ ZVT_LIBS = @ZVT_LIBS@
+ 
+-INCLUDES = -I.. -I$(srcdir)/.. -I../../guile-gtk -I$(srcdir)/../../guile-gtk 	-I$(includedir) $(GUILE_INCS) $(GNOME_INCLUDEDIR)
++INCLUDES = -I.. -I$(srcdir)/.. -I../../guile-gtk -I$(srcdir)/../../guile-gtk 	-I$(includedir) $(GUILE_INCS) $(GNOME_INCLUDEDIR) `$(GNOME_CONFIG) --cflags bonobo`
+ 
+ 
+-BONOBO_LIBS = -lbonobo 
++BONOBO_LIBS = `$(GNOME_CONFIG) --libs bonobo`
+ 
+ lib_LTLIBRARIES = libguilebonobo.la
+ libguilebonobo_la_SOURCES = bonobo-glue.c 
diff --git a/x11-toolkits/guile-gnome/files/patch-guile-gnome::gdk-pixbuf::Makefile.in b/x11-toolkits/guile-gnome/files/patch-guile-gnome::gdk-pixbuf::Makefile.in
new file mode 100644
index 000000000..70486d753
--- /dev/null
+++ b/x11-toolkits/guile-gnome/files/patch-guile-gnome::gdk-pixbuf::Makefile.in
@@ -0,0 +1,11 @@
+--- guile-gnome/gdk-pixbuf/Makefile.in	2001/11/12 12:09:05	1.1
++++ guile-gnome/gdk-pixbuf/Makefile.in	2001/11/12 12:09:54
+@@ -98,7 +98,7 @@
+ VERSION = @VERSION@
+ ZVT_LIBS = @ZVT_LIBS@
+ 
+-INCLUDES = -I.. -I$(srcdir)/.. -I../../guile-gtk -I$(srcdir)/../../guile-gtk 	-I$(includedir) $(GUILE_INCS) $(GNOME_INCLUDEDIR)
++INCLUDES = -I.. -I$(srcdir)/.. -I../../guile-gtk -I$(srcdir)/../../guile-gtk 	-I$(includedir) $(GUILE_INCS) $(GNOME_INCLUDEDIR) `$(GNOME_CONFIG) --cflags gdk_pixbuf`
+ 
+ 
+ GDKPIXBUF_LIBS = -lgdk_pixbuf
diff --git a/x11-toolkits/guile-gnome/files/patch-guile-gnome::ghttp::ghttp-glue.c b/x11-toolkits/guile-gnome/files/patch-guile-gnome::ghttp::ghttp-glue.c
new file mode 100644
index 000000000..7735c4919
--- /dev/null
+++ b/x11-toolkits/guile-gnome/files/patch-guile-gnome::ghttp::ghttp-glue.c
@@ -0,0 +1,11 @@
+--- guile-gnome/ghttp/ghttp-glue.c.orig	Sat Aug 31 14:07:19 2002
++++ guile-gnome/ghttp/ghttp-glue.c	Sat Aug 31 14:08:23 2002
+@@ -53,7 +53,7 @@
+ };
+ 
+ GtkTypeInfo sgtk_ghttp_request_info_gtk = {
+-  "ghttprequest", "sizeof (ghttp_request)", 0,
++  "ghttprequest", 0, 0,
+   (GtkClassInitFunc) NULL,
+   (GtkObjectInitFunc) NULL,
+   (GtkArgSetFunc) NULL,
diff --git a/x11-toolkits/guile-gnome/files/patch-guile-gnome::gnorba-glue.c b/x11-toolkits/guile-gnome/files/patch-guile-gnome::gnorba-glue.c
new file mode 100644
index 000000000..4df9ecd27
--- /dev/null
+++ b/x11-toolkits/guile-gnome/files/patch-guile-gnome::gnorba-glue.c
@@ -0,0 +1,47 @@
+--- guile-gnome/gnorba-glue.c.orig	Sat Aug 31 14:05:01 2002
++++ guile-gnome/gnorba-glue.c	Sat Aug 31 14:05:06 2002
+@@ -41,7 +41,7 @@
+ };
+ 
+ GtkTypeInfo sgtk_corba_orb_info_gtk = {
+-  "CORBAORB", "sizeof (CORBA_ORB)", 0,
++  "CORBAORB", sizeof (CORBA_ORB), 0,
+   (GtkClassInitFunc) NULL,
+   (GtkObjectInitFunc) NULL,
+   (GtkArgSetFunc) NULL,
+@@ -57,7 +57,7 @@
+ };
+ 
+ GtkTypeInfo sgtk_corba_environment_info_gtk = {
+-  "CORBAEnvironment", "sizeof (CORBA_Environment)", 0,
++  "CORBAEnvironment", sizeof (CORBA_Environment), 0,
+   (GtkClassInitFunc) NULL,
+   (GtkObjectInitFunc) NULL,
+   (GtkArgSetFunc) NULL,
+@@ -73,7 +73,7 @@
+ };
+ 
+ GtkTypeInfo sgtk_portable_server_poa_info_gtk = {
+-  "PortableServerPOA", "sizeof (PortableServer_POA)", 0,
++  "PortableServerPOA", sizeof (PortableServer_POA), 0,
+   (GtkClassInitFunc) NULL,
+   (GtkObjectInitFunc) NULL,
+   (GtkArgSetFunc) NULL,
+@@ -89,7 +89,7 @@
+ };
+ 
+ GtkTypeInfo sgtk_portable_server_poamanager_info_gtk = {
+-  "PortableServerPOAManager", "sizeof (PortableServer_POAManager)", 0,
++  "PortableServerPOAManager", sizeof (PortableServer_POAManager), 0,
+   (GtkClassInitFunc) NULL,
+   (GtkObjectInitFunc) NULL,
+   (GtkArgSetFunc) NULL,
+@@ -105,7 +105,7 @@
+ };
+ 
+ GtkTypeInfo sgtk_corba_object_info_gtk = {
+-  "CORBAObject", "sizeof (CORBA_Object)", 0,
++  "CORBAObject", sizeof (CORBA_Object), 0,
+   (GtkClassInitFunc) NULL,
+   (GtkObjectInitFunc) NULL,
+   (GtkArgSetFunc) NULL,
diff --git a/x11-toolkits/guile-gnome/files/patch-guile-gnome::gtkhtml::Makefile.in b/x11-toolkits/guile-gnome/files/patch-guile-gnome::gtkhtml::Makefile.in
new file mode 100644
index 000000000..203204432
--- /dev/null
+++ b/x11-toolkits/guile-gnome/files/patch-guile-gnome::gtkhtml::Makefile.in
@@ -0,0 +1,15 @@
+--- guile-gnome/gtkhtml/Makefile.in.orig	Fri Mar  9 12:07:49 2001
++++ guile-gnome/gtkhtml/Makefile.in	Mon Nov 11 22:52:47 2002
+@@ -98,10 +98,10 @@
+ VERSION = @VERSION@
+ ZVT_LIBS = @ZVT_LIBS@
+ 
+-INCLUDES = -I.. -I$(srcdir)/.. -I../../guile-gtk -I$(srcdir)/../../guile-gtk 	-I$(includedir) $(GUILE_INCS) $(GNOME_INCLUDEDIR)
++INCLUDES = -I.. -I$(srcdir)/.. -I../../guile-gtk -I$(srcdir)/../../guile-gtk 	-I$(includedir) $(GUILE_INCS) $(GNOME_INCLUDEDIR) `$(GNOME_CONFIG) --cflags gtkhtml`
+ 
+ 
+-GTKHTML_LIBS = -lgtkhtml -lgdk_pixbuf
++GTKHTML_LIBS = -lgtkhtml-1.1 -lgdk_pixbuf
+ 
+ lib_LTLIBRARIES = libguilegtkhtml.la
+ libguilegtkhtml_la_SOURCES = gtkhtml-glue.c gtkhtml-support.c
diff --git a/x11-toolkits/guile-gnome/files/patch-guile-gnome::gtkhtml::gtkhtml-glue.c b/x11-toolkits/guile-gnome/files/patch-guile-gnome::gtkhtml::gtkhtml-glue.c
new file mode 100644
index 000000000..4144c78d5
--- /dev/null
+++ b/x11-toolkits/guile-gnome/files/patch-guile-gnome::gtkhtml::gtkhtml-glue.c
@@ -0,0 +1,71 @@
+--- guile-gnome/gtkhtml/gtkhtml-glue.c.orig	Mon Feb  5 22:46:22 2001
++++ guile-gnome/gtkhtml/gtkhtml-glue.c	Mon Nov 11 22:52:04 2002
+@@ -110,7 +110,7 @@
+ extern sgtk_boxed_info sgtk_gtimer_info;
+ 
+ GtkTypeInfo sgtk_gtk_htmlstream_info_gtk = {
+-  "GtkHTMLStream", "sizeof (GtkHTMLStream)", 0,
++  "GtkHTMLStream", 0, 0,
+   (GtkClassInitFunc) NULL,
+   (GtkObjectInitFunc) NULL,
+   (GtkArgSetFunc) NULL,
+@@ -310,17 +310,20 @@
+ static char s_gtk_html_set_iframe_parent[] = "gtk-html-set-iframe-parent";
+ 
+ SCM
+-sgtk_gtk_html_set_iframe_parent (SCM p_html, SCM p_parent)
++sgtk_gtk_html_set_iframe_parent (SCM p_html, SCM p_parent, SCM p_frame)
+ {
+   GtkHTML* c_html;
+   GtkWidget* c_parent;
++  HTMLObject* c_frame;
+   SCM_ASSERT (sgtk_is_a_gtkobj (gtk_html_get_type (), p_html), p_html, SCM_ARG1, s_gtk_html_set_iframe_parent);
+   SCM_ASSERT (sgtk_is_a_gtkobj (gtk_widget_get_type (), p_parent), p_parent, SCM_ARG2, s_gtk_html_set_iframe_parent);
++  SCM_ASSERT (sgtk_is_a_gtkobj (html_object_get_type (), p_frame), p_frame, SCM_ARG3, s_gtk_html_set_iframe_parent);
+ 
+   SCM_DEFER_INTS;
+   c_html = (GtkHTML*)sgtk_get_gtkobj (p_html);
+   c_parent = (GtkWidget*)sgtk_get_gtkobj (p_parent);
+-  gtk_html_set_iframe_parent (c_html, c_parent);
++  c_frame = (HTMLObject*)sgtk_get_gtkobj (p_frame);
++  gtk_html_set_iframe_parent (c_html, c_parent, c_frame);
+   SCM_ALLOW_INTS;
+ 
+   return SCM_UNSPECIFIED;
+@@ -399,21 +402,23 @@
+ static char s_gtk_html_request_paste[] = "gtk-html-request-paste";
+ 
+ SCM
+-sgtk_gtk_html_request_paste (SCM p_html, SCM p_type, SCM p_time)
++sgtk_gtk_html_request_paste (SCM p_html, SCM p_selection, SCM p_type, SCM p_time)
+ {
+   gint cr_ret;
+   GtkHTML* c_html;
++  GdkAtom c_selection;
+   gint c_type;
+   gint c_time;
+   SCM_ASSERT (sgtk_is_a_gtkobj (gtk_html_get_type (), p_html), p_html, SCM_ARG1, s_gtk_html_request_paste);
+-  c_type = scm_num2long (p_type, (char *)SCM_ARG2, s_gtk_html_request_paste);
+-  c_time = scm_num2long (p_time, (char *)SCM_ARG3, s_gtk_html_request_paste);
++  c_selection = scm_num2long (p_selection, (char *)SCM_ARG2, s_gtk_html_request_paste);
++  c_type = scm_num2long (p_type, (char *)SCM_ARG3, s_gtk_html_request_paste);
++  c_time = scm_num2long (p_time, (char *)SCM_ARG4, s_gtk_html_request_paste);
+ 
+   SCM_DEFER_INTS;
+   c_html = (GtkHTML*)sgtk_get_gtkobj (p_html);
+   ;
+   ;
+-  cr_ret = gtk_html_request_paste (c_html, c_type, c_time);
++  cr_ret = gtk_html_request_paste (c_html, c_selection, c_type, c_time, 0);
+   SCM_ALLOW_INTS;
+ 
+   return scm_long2num (cr_ret);
+@@ -693,7 +698,7 @@
+ 
+   SCM_DEFER_INTS;
+   c_html = (GtkHTML*)sgtk_get_gtkobj (p_html);
+-  gtk_html_paste (c_html);
++  gtk_html_paste (c_html, 0);
+   SCM_ALLOW_INTS;
+ 
+   return SCM_UNSPECIFIED;
diff --git a/x11-toolkits/guile-gnome/files/patch-guile-gnome::gtkhtml::gtkhtml.defs b/x11-toolkits/guile-gnome/files/patch-guile-gnome::gtkhtml::gtkhtml.defs
new file mode 100644
index 000000000..50a187329
--- /dev/null
+++ b/x11-toolkits/guile-gnome/files/patch-guile-gnome::gtkhtml::gtkhtml.defs
@@ -0,0 +1,12 @@
+--- guile-gnome/gtkhtml/gtkhtml.defs	2001/07/24 09:08:47	1.1
++++ guile-gnome/gtkhtml/gtkhtml.defs	2001/07/24 09:20:23
+@@ -78,7 +78,8 @@
+ (define-func gtk_html_set_iframe_parent 
+   none
+   ((GtkHTML html)
+-   (GtkWidget parent)))
++   (GtkWidget parent)
++   (HTMLObject frame)))
+ 
+ (define-func gtk_html_enable_debug
+   none
diff --git a/x11-toolkits/guile-gnome/files/patch-guile-gnome::libglade::Makefile.in b/x11-toolkits/guile-gnome/files/patch-guile-gnome::libglade::Makefile.in
new file mode 100644
index 000000000..4194971a0
--- /dev/null
+++ b/x11-toolkits/guile-gnome/files/patch-guile-gnome::libglade::Makefile.in
@@ -0,0 +1,19 @@
+--- guile-gnome/libglade/Makefile.in.orig	Sat Feb 16 23:57:11 2002
++++ guile-gnome/libglade/Makefile.in	Sat Feb 16 23:58:57 2002
+@@ -63,6 +63,7 @@
+ BUILD_GUILE = @BUILD_GUILE@
+ CC = @CC@
+ DLLTOOL = @DLLTOOL@
++GLADE_INCLUDES = `libglade-config --cflags gnome`
+ GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@
+ GNOMEUI_LIBS = @GNOMEUI_LIBS@
+ GNOME_ACLOCAL_DIR = @GNOME_ACLOCAL_DIR@
+@@ -98,7 +99,7 @@
+ VERSION = @VERSION@
+ ZVT_LIBS = @ZVT_LIBS@
+ 
+-INCLUDES = -I.. -I$(srcdir)/.. -I../../guile-gtk -I$(srcdir)/../../guile-gtk 	-I$(includedir) $(GUILE_INCS) $(GNOME_INCLUDEDIR)
++INCLUDES = -I.. -I$(srcdir)/.. -I../../guile-gtk -I$(srcdir)/../../guile-gtk 	-I$(includedir) $(GUILE_INCS) $(GNOME_INCLUDEDIR) $(GLADE_INCLUDES)
+ 
+ 
+ GLADE_LIBS = `libglade-config --libs gnome`
diff --git a/x11-toolkits/guile-gnome/files/patch-guile-gnome_Makefile.in b/x11-toolkits/guile-gnome/files/patch-guile-gnome_Makefile.in
new file mode 100644
index 000000000..2db87e442
--- /dev/null
+++ b/x11-toolkits/guile-gnome/files/patch-guile-gnome_Makefile.in
@@ -0,0 +1,11 @@
+--- guile-gnome/Makefile.in.orig	Wed Jun 19 16:09:26 2002
++++ guile-gnome/Makefile.in	Wed Jun 19 16:09:56 2002
+@@ -517,7 +517,7 @@
+ 	$(INSTALL_DATA) $(srcdir)/gnome.scm $(scmgnomedir)/gnome.scm
+ 	$(INSTALL_DATA) $(srcdir)/gnorba.scm $(scmgnomedir)/gnorba.scm
+ .c.x:
+-	guile-snarf $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< >tmp \
++	guile-snarf -o tmp $< $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) \
+ 	&& mv tmp $@
+ 
+ client.x: client.c
diff --git a/x11-toolkits/guile-gnome/files/patch-guile-gnome_gnomeg.c b/x11-toolkits/guile-gnome/files/patch-guile-gnome_gnomeg.c
new file mode 100644
index 000000000..f2627174f
--- /dev/null
+++ b/x11-toolkits/guile-gnome/files/patch-guile-gnome_gnomeg.c
@@ -0,0 +1,120 @@
+--- guile-gnome/gnomeg.c.orig	Thu May  1 02:35:47 2003
++++ guile-gnome/gnomeg.c	Thu May  1 02:40:20 2003
+@@ -433,7 +433,7 @@
+ 	SCM arg;
+ 	EXTRACT_SCM(info->args, arg);
+ 	SCM_ASSERT (SCM_NIMP(arg) && SCM_REALP(arg), arg, "inexact expected", s_gtk_dialog_cauldron);
+-	*x = SCM_REALPART(arg);
++	*x = SCM_REAL_VALUE (arg);
+ 	break;
+     }
+     case GTK_CAULDRON_TYPE_DOUBLE_P: {
+@@ -445,7 +445,7 @@
+ 	info->num_data++;
+ 	info->data_array = g_renew(CauldronVarItem, info->data_array, info->num_data);
+ 	info->data_array[info->num_data - 1].type = type;
+-	**x = SCM_REALPART(arg);
++	**x = SCM_REAL_VALUE(arg);
+ 	break;
+     }
+     case GTK_CAULDRON_TYPE_CALLBACK: {
+@@ -494,7 +494,9 @@
+ 	    tmp = SCM_MAKINUM(info->data_array[i].var.i);
+ 	    break;
+ 	case GTK_CAULDRON_TYPE_DOUBLE_P:
++	    /*
+ 	    tmp = scm_makdbl(info->data_array[i].var.d, 0.0);
++	    */
+ 	    break;
+ 	}
+ 	ret = scm_cons(tmp, ret);
+@@ -615,7 +617,7 @@
+   v = (char **)scm_must_malloc ((c+1) * sizeof(char**), "make-argv");
+   for (i = 0; i < c; i++, list = SCM_CDR (list))
+     {
+-      if (SCM_IMP (SCM_CAR (list)) || SCM_NSTRINGP (SCM_CAR (list)))
++      if (SCM_IMP (SCM_CAR (list)) || !SCM_STRINGP (SCM_CAR (list)))
+ 	{
+ 	  scm_must_free ((char *)v);
+ 	  return;
+@@ -1150,9 +1152,9 @@
+ 	    }
+ 	  else if (!strcmp (keystr, "accel-key"))
+ 	    {
+-	      if (!SCM_ICHRP(val))
++	      if (!SCM_CHARP(val))
+ 		uiinfo_error ("not a character", val);
+-	      info->accelerator_key = SCM_ICHR(val);
++	      info->accelerator_key = SCM_CHAR(val);
+ 	    }
+ 	  else if (!strcmp (keystr, "accel-mods"))
+ 	    {
+@@ -1271,14 +1273,14 @@
+ 	/* utilities */
+ 
+ #if 0
+-	scm_make_gsubr("gnome-libdir-file", 1, 0, 0, guile_gnome_libdir_file);
+-	scm_make_gsubr("gnome-datadir-file", 1, 0, 0, guile_gnome_datadir_file);
+-	scm_make_gsubr("gnome-pixmap-file", 1, 0, 0, guile_gnome_pixmap_file);
+-	scm_make_gsubr("gnome-unconditional-libdir-file", 1, 0, 0, guile_gnome_unconditional_libdir_file);
+-	scm_make_gsubr("gnome-unconditional-datadir-file", 1, 0, 0, guile_gnome_unconditional_datadir_file);
+-	scm_make_gsubr("gnome-unconditional-pixmap-file", 1, 0, 0, guile_gnome_unconditional_pixmap_file);
++	scm_c_define_gsubr("gnome-libdir-file", 1, 0, 0, guile_gnome_libdir_file);
++	scm_c_define_gsubr("gnome-datadir-file", 1, 0, 0, guile_gnome_datadir_file);
++	scm_c_define_gsubr("gnome-pixmap-file", 1, 0, 0, guile_gnome_pixmap_file);
++	scm_c_define_gsubr("gnome-unconditional-libdir-file", 1, 0, 0, guile_gnome_unconditional_libdir_file);
++	scm_c_define_gsubr("gnome-unconditional-datadir-file", 1, 0, 0, guile_gnome_unconditional_datadir_file);
++	scm_c_define_gsubr("gnome-unconditional-pixmap-file", 1, 0, 0, guile_gnome_unconditional_pixmap_file);
+ 
+-	scm_make_gsubr("gnome-config-get-string", 1, 0, 0, guile_gnome_config_get_string);
++	scm_c_define_gsubr("gnome-config-get-string", 1, 0, 0, guile_gnome_config_get_string);
+ #endif
+ 
+ 	/* FIXME: this should really be done via `gnome.defs'.  But
+@@ -1287,31 +1289,31 @@
+ 	   arguments here.  I named the function "gnome-about" and not
+ 	   "gnome-about-new" so that the latter can be used by the
+ 	   .defs file without changing anything.  */
+-	scm_make_gsubr("gnome-about", 5, 0, 1, guile_gnome_about);
++	scm_c_define_gsubr("gnome-about", 5, 0, 1, guile_gnome_about);
+ 
+-	scm_make_gsubr(sgnome_init_hack, 3, 0, 0, guile_gnome_init_hack);
+-	scm_make_gsubr (s_gnome_canvas_item_set, 1, 0, 1, sgtk_gnome_canvas_item_set);
+-	scm_make_gsubr (s_gnome_canvas_item_new, 2, 0, 1, sgtk_gnome_canvas_item_new);
++	scm_c_define_gsubr(sgnome_init_hack, 3, 0, 0, guile_gnome_init_hack);
++	scm_c_define_gsubr (s_gnome_canvas_item_set, 1, 0, 1, sgtk_gnome_canvas_item_set);
++	scm_c_define_gsubr (s_gnome_canvas_item_new, 2, 0, 1, sgtk_gnome_canvas_item_new);
+ 
+ 	/* I don't think this should use gnome.defs - it's one of a
+            kind interface, and iterators are not Schemish */
+ 
+-	scm_make_gsubr (s_gnome_config_foreach, 1, 0, 0, sgtk_gnome_config_foreach);
+-	scm_make_gsubr (s_gnome_config_map, 1, 0, 0, sgtk_gnome_config_map);
+-	scm_make_gsubr (s_gnome_config_private_foreach, 1, 0, 0, sgtk_gnome_config_private_foreach);
+-	scm_make_gsubr (s_gnome_config_private_map, 1, 0, 0, sgtk_gnome_config_private_map);
+-	scm_make_gsubr (s_gnome_config_sections_foreach, 1, 0, 0, sgtk_gnome_config_sections_foreach);
+-	scm_make_gsubr (s_gnome_config_sections_map, 1, 0, 0, sgtk_gnome_config_sections_map);
+-	scm_make_gsubr (s_gnome_config_private_sections_foreach, 1, 0, 0, sgtk_gnome_config_private_sections_foreach);
+-	scm_make_gsubr (s_gnome_config_private_sections_map, 1, 0, 0, sgtk_gnome_config_private_sections_map);
++	scm_c_define_gsubr (s_gnome_config_foreach, 1, 0, 0, sgtk_gnome_config_foreach);
++	scm_c_define_gsubr (s_gnome_config_map, 1, 0, 0, sgtk_gnome_config_map);
++	scm_c_define_gsubr (s_gnome_config_private_foreach, 1, 0, 0, sgtk_gnome_config_private_foreach);
++	scm_c_define_gsubr (s_gnome_config_private_map, 1, 0, 0, sgtk_gnome_config_private_map);
++	scm_c_define_gsubr (s_gnome_config_sections_foreach, 1, 0, 0, sgtk_gnome_config_sections_foreach);
++	scm_c_define_gsubr (s_gnome_config_sections_map, 1, 0, 0, sgtk_gnome_config_sections_map);
++	scm_c_define_gsubr (s_gnome_config_private_sections_foreach, 1, 0, 0, sgtk_gnome_config_private_sections_foreach);
++	scm_c_define_gsubr (s_gnome_config_private_sections_map, 1, 0, 0, sgtk_gnome_config_private_sections_map);
+ #ifdef CAULDRON_TAKES_PARENT
+-	scm_make_gsubr (s_gtk_dialog_cauldron, 4, 0, 1, sgtk_gtk_dialog_cauldron);
++	scm_c_define_gsubr (s_gtk_dialog_cauldron, 4, 0, 1, sgtk_gtk_dialog_cauldron);
+ #else
+-	scm_make_gsubr (s_gtk_dialog_cauldron, 3, 0, 1, sgtk_gtk_dialog_cauldron);
++	scm_c_define_gsubr (s_gtk_dialog_cauldron, 3, 0, 1, sgtk_gtk_dialog_cauldron);
+ #endif
+ 	uiinfo_macro_translator =
+ 	  scm_permanent_object (scm_cons (SCM_BOOL_F, SCM_EOL));
+-	scm_make_gsubr (s_gnome_uiinfo_set_translator, 1, 0, 0,
++	scm_c_define_gsubr (s_gnome_uiinfo_set_translator, 1, 0, 0,
+ 			sgtk_gnome_uiinfo_set_translator);
+ 
+ }
diff --git a/x11-toolkits/guile-gnome/pkg-descr b/x11-toolkits/guile-gnome/pkg-descr
new file mode 100644
index 000000000..54f9958ee
--- /dev/null
+++ b/x11-toolkits/guile-gnome/pkg-descr
@@ -0,0 +1 @@
+Guile binding library for GNOME
diff --git a/x11-toolkits/guile-gnome/pkg-plist b/x11-toolkits/guile-gnome/pkg-plist
new file mode 100644
index 000000000..12a345e5d
--- /dev/null
+++ b/x11-toolkits/guile-gnome/pkg-plist
@@ -0,0 +1,54 @@
+bin/gnomeg
+lib/libguilebonobo.a
+lib/libguilebonobo.la
+lib/libguilebonobo.so
+lib/libguilebonobo.so.0
+lib/libguilegdkpixbuf.a
+lib/libguilegdkpixbuf.la
+lib/libguilegdkpixbuf.so
+lib/libguilegdkpixbuf.so.0
+lib/libguileghttp.a
+lib/libguileghttp.la
+lib/libguileghttp.so
+lib/libguileghttp.so.0
+lib/libguileglade.a
+lib/libguileglade.la
+lib/libguileglade.so
+lib/libguileglade.so.0
+lib/libguilegnome.a
+lib/libguilegnome.la
+lib/libguilegnome.so
+lib/libguilegnome.so.0
+lib/libguilegnorba.a
+lib/libguilegnorba.la
+lib/libguilegnorba.so
+lib/libguilegnorba.so.0
+lib/libguilegtkhtml.a
+lib/libguilegtkhtml.la
+lib/libguilegtkhtml.so
+lib/libguilegtkhtml.so.0
+lib/libguilezvt.a
+lib/libguilezvt.la
+lib/libguilezvt.so
+lib/libguilezvt.so.0
+share/guile-gnome/bonobo.defs
+share/guile-gnome/ghttp.defs
+share/guile-gnome/gnome.defs
+share/guile-gnome/gnorba.defs
+share/guile-gnome/gtkhtml.defs
+share/guile-gnome/zvt.defs
+share/guile-gtk/gdkpixbuf.defs
+share/guile-gtk/libglade.defs
+share/guile/gnome/bonobo.scm
+share/guile/gnome/ghttp.scm
+share/guile/gnome/gnome.scm
+share/guile/gnome/gnorba.scm
+share/guile/gnome/zvt.scm
+share/guile/gtk/gdkpixbuf.scm
+share/guile/gtk/gtkhtml.scm
+share/guile/gtk/libglade.scm
+@dirrm share/guile/gtk
+@dirrm share/guile/gnome
+@dirrm share/guile
+@dirrm share/guile-gtk
+@dirrm share/guile-gnome