Remove quotes are sizeof() calls. This was breaking builds on 64-bit

architectures, and probably causing some interesting things on i386.
Bump PORTREVISION for i386 machines.

PR:		42258

4 files changed, 70 insertions, 6 deletions

diff --git a/x11-toolkits/guile-gnome/Makefile b/x11-toolkits/guile-gnome/Makefile
index 53119c221507..90f82073ce7b 100644
--- a/x11-toolkits/guile-gnome/Makefile
+++ b/x11-toolkits/guile-gnome/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	guile-gnome
 PORTVERSION=	0.20
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/gnome-guile
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 000000000000..7735c4919434
--- /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 000000000000..4df9ecd27856
--- /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::gtkhtml-glue.c b/x11-toolkits/guile-gnome/files/patch-guile-gnome::gtkhtml::gtkhtml-glue.c
index 5999870c1b73..a8c661a9d6f6 100644
--- 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
@@ -1,8 +1,14 @@
-
-$FreeBSD$
-
---- guile-gnome/gtkhtml/gtkhtml-glue.c.orig	Tue Feb  6 05:46:22 2001
-+++ guile-gnome/gtkhtml/gtkhtml-glue.c	Fri Aug 17 17:47:25 2001
+--- guile-gnome/gtkhtml/gtkhtml-glue.c.orig	Mon Feb  5 22:46:22 2001
++++ guile-gnome/gtkhtml/gtkhtml-glue.c	Sat Aug 31 14:03:17 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";