Upgrade to version 0.9.7 (with GTK2 support).

Submitted by:	maintainer

4 files changed, 28 insertions, 108 deletions

diff --git a/x11-toolkits/erlgtk/files/patch-c__src_gtk__drv.c b/x11-toolkits/erlgtk/files/patch-c__src_gtk__drv.c
index be3212b..0149f10 100644
--- a/x11-toolkits/erlgtk/files/patch-c__src_gtk__drv.c
+++ b/x11-toolkits/erlgtk/files/patch-c__src_gtk__drv.c
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- c_src/gtk_drv.c.orig	Sat Aug 30 20:51:29 2003
-+++ c_src/gtk_drv.c	Sat Aug 30 20:51:59 2003
-@@ -80,6 +80,8 @@
+--- c_src/gtk_drv.c.orig	Tue Nov  4 13:41:13 2003
++++ c_src/gtk_drv.c	Tue Nov  4 13:42:12 2003
+@@ -2203,7 +2203,7 @@
+ 	return gdrv_encode_ulong(mpp, 0);
+     }
  
- #define MAX_ARG_STACK  0x8000  /* max # of long words (128K) */
- 
-+#define ERL_MAX_COUNT 0xffffff
-+
- #define ETERM_REF(e) do { \
-   if (ERL_COUNT(e) < ERL_MAX_COUNT) \
-       ERL_COUNT(e)++; \
+-    if (type == GDK_TYPE_EVENT) {
++    if (gtk_type_is_a(type, GDK_TYPE_EVENT)) {
+ 	return encode_gdk_event(mpp, (GdkEvent*) ptr);
+     }
+     else if ((type == GDK_TYPE_WINDOW)||(type == GDK_TYPE_PIXMAP) ||
diff --git a/x11-toolkits/erlgtk/files/patch-config_configure.in b/x11-toolkits/erlgtk/files/patch-config_configure.in
index c18cedcf..e052991 100644
--- a/x11-toolkits/erlgtk/files/patch-config_configure.in
+++ b/x11-toolkits/erlgtk/files/patch-config_configure.in
@@ -1,26 +1,23 @@
 
 $FreeBSD$
 
---- config/configure.in.orig	Thu May  2 01:42:15 2002
-+++ config/configure.in	Mon Sep  1 11:11:00 2003
-@@ -69,9 +69,10 @@
+--- config/configure.in.orig	Tue Sep  2 14:17:18 2003
++++ config/configure.in	Tue Nov  4 13:08:00 2003
+@@ -64,7 +64,7 @@
+    EXISTS_FLAG=""
+ fi
  
- GTK_VERSION=`$GTK_CONFIG --version | awk -F. '{ print $1*65536+$2*256+$3 }'`
- GTK_CFLAGS=`$GTK_CONFIG --cflags`
-+GDK_PIXBUF_CFLAGS=`$GDK_PIXBUF_CONFIG --cflags`
- GTK_LIBS=`$GTK_CONFIG --libs`
+-AC_MSG_RESULT(PGK_CONFIG = $PKG_CONFIG)
++AC_MSG_RESULT(PKG_CONFIG = $PKG_CONFIG)
+ AC_MSG_RESULT(GTK_CONFIG = $GTK_CONFIG)
+ AC_MSG_RESULT(GNOME_CONFIG = $GNOME_CONFIG)
+ AC_MSG_RESULT(GDK_PIXBUF_CONFIG = $GDK_PIXBUF_CONFIG)
+@@ -107,7 +107,7 @@
+ fi
  
--GTK_CFLAGS="-DGTK_VERSION=$GTK_VERSION $GTK_CFLAGS $GTK_XCFLAGS"
-+GTK_CFLAGS="-DGTK_VERSION=$GTK_VERSION $GTK_CFLAGS $GDK_PIXBUF_CFLAGS $GTK_XCFLAGS"
- 
- 
- if test "x$GNOME" != "xno"; then
-@@ -122,7 +123,7 @@
- ERLC_FLAGS=
- EI_DIR=`$ERLC eiconf.erl; $ERL -noshell -s eiconf`
- EI_CFLAGS="-I$EI_DIR/include"
--EI_LIBS="-L$EI_DIR/lib -lerl_interface -lei"
-+EI_LIBS="-L$EI_DIR/lib -lerl_interface_st -lei_st"
- dnl
- dnl Check if the erl_interface is capable of represent/store functions
- dnl
+ AC_MSG_RESULT(GTK_DO = $GTK_DO)
+-if test "x$GTK" == "x-2.0"; then
++if test "x$GTK" = "x-2.0"; then
+ 	GTK_REL="2";
+ else
+ 	GTK_REL=""
diff --git a/x11-toolkits/erlgtk/files/patch-glade_Makefile.in b/x11-toolkits/erlgtk/files/patch-glade_Makefile.in
index 6e99e8e..85d8c58 100644
--- a/x11-toolkits/erlgtk/files/patch-glade_Makefile.in
+++ b/x11-toolkits/erlgtk/files/patch-glade_Makefile.in
@@ -12,12 +12,3 @@ $FreeBSD$
  
  RDIR	      = ../releases/erlgtk-$(VSN)
  RFILES	      = \
-@@ -61,7 +61,7 @@
- 	@INSTALL_DIR@ $(IDIR)/ebin
- 	@INSTALL_DIR@ $(IDIR)/priv/bin
- 	@INSTALL_DATA@ $(OBJS) $(IDIR)/ebin
--	@INSTALL_PROGRAM@ ../priv/bin/glade2erl $(IDIR)/priv/bin
-+	@INSTALL_SCRIPT@ ../priv/bin/glade2erl $(IDIR)/priv/bin
- 
- release: all
- 	@INSTALL_DIR@ $(RDIR)/glade
diff --git a/x11-toolkits/erlgtk/files/patch-glade_glade2erl.erl b/x11-toolkits/erlgtk/files/patch-glade_glade2erl.erl
deleted file mode 100644
index 9093611..0000000
--- a/x11-toolkits/erlgtk/files/patch-glade_glade2erl.erl
+++ /dev/null
@@ -1,68 +0,0 @@
-
-$FreeBSD$
-
---- glade/glade2erl.erl.orig	Thu May  2 08:42:20 2002
-+++ glade/glade2erl.erl	Sat Jul 19 12:19:25 2003
-@@ -1335,7 +1335,7 @@
- 			     fmt_args(Ps++[{raw,fmt_flags(OffBits,FSpec)}])])
- 	    end,
- 	    emit_spec(C,Ps,Name,T,As);
--	{cond,Type,Then,Else} ->
-+	{conditional,Type,Then,Else} ->
- 	    case eval_cond(Type,As) of
- 		true -> 
- 		    emit_spec(C,Ps,Name,Then, As),
-@@ -1437,12 +1437,12 @@
- %%
- %% ChildrenSpec = none | box | container | notebook ...
- %% 
--%% {create,{Mod,Fun},Args}    unconditional call returning a new widget
--%% {call,{Mod,Fun},Args}      unconditional call
--%% {def,{Mod,Fun},Args}       optional call (ignore if default value on args)
-+%% {create,{Mod,Fun},Args}      unconditional call returning a new widget
-+%% {call,{Mod,Fun},Args}        unconditional call
-+%% {def,{Mod,Fun},Args}         optional call (ignore if default value on args)
- %% {flags,SetF,UnsetF,Default,Flags}  
--%%                            special call for setting flag arguments
--%% {cond,Cond,Then,Else}      conditional 
-+%%                              special call for setting flag arguments
-+%% {conditional,Cond,Then,Else} conditional 
- %%
- widget_spec(DefaultFlags) ->
-     [
-@@ -1474,7 +1474,7 @@
-       [{"selection_mode",genum,'GTK_SELECTION_SINGLE'}]},
-      {def,{gtk,clist_set_shadow_type},
-       [{"shadow_type",genum,'GTK_SHADOW_IN'}]},
--     {cond, {value,"show_titles",false},
-+     {conditional, {value,"show_titles",false},
-       [{call,{gtk,clist_column_titles_show},[]}],
-       [{call,{gtk,clist_column_titles_hide},[]}]}
-      | container_spec(?GTK_CAN_FOCUS bor Flags)].
-@@ -1827,7 +1827,7 @@
- 
- 	"GtkButton" ->
- 	    S = [
--		 {cond,  {member,"stock_button"},
-+		 {conditional,  {member,"stock_button"},
- 		  [{create,{gnome_stock,button},
- 		    [{"stock_button", {gmacro,Type}, "Button"}]}],
- 		  [{create,{gtk,button_new_with_label},
-@@ -1976,7 +1976,7 @@
- 	    S = [
- 		 {create,{gtk,menu_item_new_with_label},
- 		  [{"label", gstring, Name}]},
--		 {cond, {value,"right_justify",false},
-+		 {conditional, {value,"right_justify",false},
- 		  [{call,{gtk,menu_item_right_justify},[]}],
- 		  []} | container_spec(0)],
- 	    {S, menuitem};
-@@ -2086,7 +2086,7 @@
- 		    ex(UnSetF, Ps++[OffBits])
- 	    end,
- 	    exec_spec(Ps,T,As);
--	{cond,Type,Then,Else} ->
-+	{conditional,Type,Then,Else} ->
- 	    case eval_cond(Type,As) of
- 		true -> 
- 		    exec_spec(Ps, Then++T, As);