- Update to 0.93

PR:		ports/68063
Submitted by:	Jean-Yves Lefort <jylefort@brutele.be>
Reviewed by:	marcus

24 files changed, 672 insertions, 168 deletions

diff --git a/x11-toolkits/gtk-sharp-devel/Makefile b/x11-toolkits/gtk-sharp-devel/Makefile
index 8709f9cddab6..d20d5db87334 100644
--- a/x11-toolkits/gtk-sharp-devel/Makefile
+++ b/x11-toolkits/gtk-sharp-devel/Makefile
@@ -6,29 +6,28 @@
 #
 
 PORTNAME=	gtk-sharp
-PORTVERSION=	0.17
-PORTREVISION=	5
+PORTVERSION=	0.93
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtk-sharp
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Gtk+ and GNOME interfaces for the .NET runtime
+COMMENT=	GTK+ and GNOME interfaces for the .NET runtime
 
-BUILD_DEPENDS+=	mono:${PORTSDIR}/lang/mono \
-		gst-launch:${PORTSDIR}/multimedia/gstreamer
-RUN_DEPENDS+=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	mono:${PORTSDIR}/lang/mono
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
-USE_LIBTOOL_VER=13
+GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
+USE_PERL5_RUN=	yes
 USE_GNOME=	gnomehack libgnomedb gtkhtml3 vte librsvg2
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|lib/pkgconfig|libdata/pkgconfig|g' \
-		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|lib/pkgconfig|libdata/pkgconfig|g' \
-		${WRKSRC}/parser/Makefile.in
+	@${REINPLACE_CMD} -e 's|^#!/usr/bin/perl|#!${PERL}|' \
+		${WRKSRC}/parser/gapi.pl \
+		${WRKSRC}/parser/gapi2xml.pl \
+		${WRKSRC}/parser/gapi_pp.pl
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtk-sharp-devel/distinfo b/x11-toolkits/gtk-sharp-devel/distinfo
index f7b90df76ef0..224642d4201b 100644
--- a/x11-toolkits/gtk-sharp-devel/distinfo
+++ b/x11-toolkits/gtk-sharp-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (gtk-sharp-0.17.tar.gz) = eef5e8acc6bafad869be2c1403c39d62
-SIZE (gtk-sharp-0.17.tar.gz) = 1448435
+MD5 (gtk-sharp-0.93.tar.gz) = b8a1a3a0fc75142fd3867976cd9254c1
+SIZE (gtk-sharp-0.93.tar.gz) = 1356305
diff --git a/x11-toolkits/gtk-sharp-devel/files/patch-configure b/x11-toolkits/gtk-sharp-devel/files/patch-configure
index 110ef9d6a040..6161b1176547 100644
--- a/x11-toolkits/gtk-sharp-devel/files/patch-configure
+++ b/x11-toolkits/gtk-sharp-devel/files/patch-configure
@@ -1,10 +1,10 @@
---- configure.orig	Wed Jan  1 18:58:20 2003
-+++ configure	Wed Jan  1 18:58:45 2003
-@@ -5647,6 +5647,7 @@
+--- configure.orig	Thu Jun 17 23:16:50 2004
++++ configure	Thu Jun 17 23:17:31 2004
+@@ -8440,7 +8440,6 @@
  
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
  
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ 
+-CFLAGS='-g -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes  -Wmissing-prototypes -Wnested-externs  -Wshadow -Wpointer-arith -Wno-cast-qual -Wcast-align -Wwrite-strings'
+ 
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
diff --git a/x11-toolkits/gtk-sharp-devel/files/patch-ltmain.sh b/x11-toolkits/gtk-sharp-devel/files/patch-ltmain.sh
new file mode 100644
index 000000000000..642e3d0bdb06
--- /dev/null
+++ b/x11-toolkits/gtk-sharp-devel/files/patch-ltmain.sh
@@ -0,0 +1,41 @@
+--- ltmain.sh.orig	Thu May 22 16:42:22 2003
++++ ltmain.sh	Tue May 27 12:12:52 2003
+@@ -1072,7 +1072,7 @@
+ 	  esac
+ 	 elif test "X$arg" = "X-lc_r"; then
+ 	  case $host in
+-	 *-*-openbsd* | *-*-freebsd*)
++	 *-*-openbsd* | *-*-freebsd4*)
+ 	    # Do not include libc_r directly, use -pthread flag.
+ 	    continue
+ 	    ;;
+@@ -1082,8 +1082,16 @@
+ 	continue
+ 	;;
+ 
++      -pthread)
++      compile_command="$compile_command -pthread"
++      finalize_command="$finalize_command -pthread"
++      compiler_flags="$compiler_flags -pthread"
++      continue
++      ;;
++
+       -module)
+ 	module=yes
++	build_old_libs=no
+ 	continue
+ 	;;
+ 
+@@ -4325,10 +4336,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/x11-toolkits/gtk-sharp-devel/pkg-descr b/x11-toolkits/gtk-sharp-devel/pkg-descr
index 0f050b1bc9dc..d728f9fd410c 100644
--- a/x11-toolkits/gtk-sharp-devel/pkg-descr
+++ b/x11-toolkits/gtk-sharp-devel/pkg-descr
@@ -1,5 +1,5 @@
-Gtk# is a port of Gtk+ 2 to the .NET runtime, written in C#.  It provides
-access to both basic parts of Gtk+ and other parts of the GNOME development
+GTK# is a port of Gtk+ 2 to the .NET runtime, written in C#.  It provides
+access to both basic parts of GTK+ and other parts of the GNOME development
 environment.
 
-WWW: http://gtk-sharp.sf.net/
+WWW: http://gtk-sharp.sourceforge.net/
diff --git a/x11-toolkits/gtk-sharp-devel/pkg-plist b/x11-toolkits/gtk-sharp-devel/pkg-plist
index 76c9a84f8fdc..140fcc366b07 100644
--- a/x11-toolkits/gtk-sharp-devel/pkg-plist
+++ b/x11-toolkits/gtk-sharp-devel/pkg-plist
@@ -9,27 +9,84 @@ bin/gapi_format_xml
 bin/gapi_pp.pl
 bin/gconfsharp-schemagen
 bin/gconfsharp-schemagen.exe
-lib/art-sharp.dll
-lib/atk-sharp.dll
-lib/gconf-sharp-peditors.dll
-lib/gconf-sharp.dll
-lib/gda-sharp.dll
-lib/gdk-sharp.dll
-lib/glade-sharp.dll
-lib/glib-sharp.dll
-lib/gnome-sharp.dll
-lib/gnomedb-sharp.dll
-lib/gtk-sharp.dll
-lib/gtkhtml-sharp.dll
+lib/libgdksharpglue.so
+lib/libgladesharpglue.so
+lib/libglibsharpglue.so
+lib/libgnomesharpglue.so
 lib/libgtksharpglue.so
-lib/pango-sharp.dll
-lib/rsvg-sharp.dll
-lib/vte-sharp.dll
+lib/mono/gac/art-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/art-sharp/1.0.0.0__35e10195dab3c99f/art-sharp.dll
+lib/mono/gac/art-sharp/1.0.0.0__35e10195dab3c99f/art-sharp.dll.config
+lib/mono/gac/atk-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/atk-sharp/1.0.0.0__35e10195dab3c99f/atk-sharp.dll
+lib/mono/gac/atk-sharp/1.0.0.0__35e10195dab3c99f/atk-sharp.dll.config
+lib/mono/gac/gconf-sharp-peditors/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/gconf-sharp-peditors/1.0.0.0__35e10195dab3c99f/gconf-sharp-peditors.dll
+lib/mono/gac/gconf-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/gconf-sharp/1.0.0.0__35e10195dab3c99f/gconf-sharp.dll
+lib/mono/gac/gconf-sharp/1.0.0.0__35e10195dab3c99f/gconf-sharp.dll.config
+lib/mono/gac/gda-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/gda-sharp/1.0.0.0__35e10195dab3c99f/gda-sharp.dll
+lib/mono/gac/gda-sharp/1.0.0.0__35e10195dab3c99f/gda-sharp.dll.config
+lib/mono/gac/gdk-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/gdk-sharp/1.0.0.0__35e10195dab3c99f/gdk-sharp.dll
+lib/mono/gac/gdk-sharp/1.0.0.0__35e10195dab3c99f/gdk-sharp.dll.config
+lib/mono/gac/glade-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/glade-sharp/1.0.0.0__35e10195dab3c99f/glade-sharp.dll
+lib/mono/gac/glade-sharp/1.0.0.0__35e10195dab3c99f/glade-sharp.dll.config
+lib/mono/gac/glib-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/glib-sharp/1.0.0.0__35e10195dab3c99f/glib-sharp.dll
+lib/mono/gac/glib-sharp/1.0.0.0__35e10195dab3c99f/glib-sharp.dll.config
+lib/mono/gac/gnome-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/gnome-sharp/1.0.0.0__35e10195dab3c99f/gnome-sharp.dll
+lib/mono/gac/gnome-sharp/1.0.0.0__35e10195dab3c99f/gnome-sharp.dll.config
+lib/mono/gac/gnomedb-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/gnomedb-sharp/1.0.0.0__35e10195dab3c99f/gnomedb-sharp.dll
+lib/mono/gac/gnomedb-sharp/1.0.0.0__35e10195dab3c99f/gnomedb-sharp.dll.config
+lib/mono/gac/gtk-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/gtk-sharp/1.0.0.0__35e10195dab3c99f/gtk-sharp.dll
+lib/mono/gac/gtk-sharp/1.0.0.0__35e10195dab3c99f/gtk-sharp.dll.config
+lib/mono/gac/gtkhtml-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/gtkhtml-sharp/1.0.0.0__35e10195dab3c99f/gtkhtml-sharp.dll
+lib/mono/gac/gtkhtml-sharp/1.0.0.0__35e10195dab3c99f/gtkhtml-sharp.dll.config
+lib/mono/gac/pango-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/pango-sharp/1.0.0.0__35e10195dab3c99f/pango-sharp.dll
+lib/mono/gac/pango-sharp/1.0.0.0__35e10195dab3c99f/pango-sharp.dll.config
+lib/mono/gac/rsvg-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/rsvg-sharp/1.0.0.0__35e10195dab3c99f/rsvg-sharp.dll
+lib/mono/gac/rsvg-sharp/1.0.0.0__35e10195dab3c99f/rsvg-sharp.dll.config
+lib/mono/gac/vte-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/vte-sharp/1.0.0.0__35e10195dab3c99f/vte-sharp.dll
+lib/mono/gac/vte-sharp/1.0.0.0__35e10195dab3c99f/vte-sharp.dll.config
+lib/mono/gtk-sharp/art-sharp.dll
+lib/mono/gtk-sharp/atk-sharp.dll
+lib/mono/gtk-sharp/gconf-sharp-peditors.dll
+lib/mono/gtk-sharp/gconf-sharp.dll
+lib/mono/gtk-sharp/gda-sharp.dll
+lib/mono/gtk-sharp/gdk-sharp.dll
+lib/mono/gtk-sharp/glade-sharp.dll
+lib/mono/gtk-sharp/glib-sharp.dll
+lib/mono/gtk-sharp/gnome-sharp.dll
+lib/mono/gtk-sharp/gnomedb-sharp.dll
+lib/mono/gtk-sharp/gtk-sharp.dll
+lib/mono/gtk-sharp/gtkhtml-sharp.dll
+lib/mono/gtk-sharp/pango-sharp.dll
+lib/mono/gtk-sharp/rsvg-sharp.dll
+lib/mono/gtk-sharp/vte-sharp.dll
+libdata/pkgconfig/art-sharp.pc
 libdata/pkgconfig/gapi.pc
+libdata/pkgconfig/gconf-sharp.pc
+libdata/pkgconfig/gda-sharp.pc
+libdata/pkgconfig/glade-sharp.pc
+libdata/pkgconfig/gnome-sharp.pc
+libdata/pkgconfig/gnomedb-sharp.pc
 libdata/pkgconfig/gtk-sharp.pc
+libdata/pkgconfig/gtkhtml-sharp.pc
+libdata/pkgconfig/rsvg-sharp.pc
+libdata/pkgconfig/vte-sharp.pc
 share/gapi/art-api.xml
-share/gapi/atk-api.xml
 share/gapi/art-symbols.xml
+share/gapi/atk-api.xml
 share/gapi/gda-api.xml
 share/gapi/gdk-api.xml
 share/gapi/gdk-symbols.xml
@@ -42,6 +99,35 @@ share/gapi/gtkhtml-api.xml
 share/gapi/pango-api.xml
 share/gapi/rsvg-api.xml
 share/gapi/vte-api.xml
-share/perl5/GAPI/Metadata.pm
-@dirrm share/perl5/GAPI
+@dirrm lib/mono/gac/art-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/art-sharp
+@dirrm lib/mono/gac/atk-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/atk-sharp
+@dirrm lib/mono/gac/gconf-sharp-peditors/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gconf-sharp-peditors
+@dirrm lib/mono/gac/gconf-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gconf-sharp
+@dirrm lib/mono/gac/gda-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gda-sharp
+@dirrm lib/mono/gac/gdk-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gdk-sharp
+@dirrm lib/mono/gac/glade-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/glade-sharp
+@dirrm lib/mono/gac/glib-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/glib-sharp
+@dirrm lib/mono/gac/gnome-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gnome-sharp
+@dirrm lib/mono/gac/gnomedb-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gnomedb-sharp
+@dirrm lib/mono/gac/gtk-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gtk-sharp
+@dirrm lib/mono/gac/gtkhtml-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gtkhtml-sharp
+@dirrm lib/mono/gac/pango-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/pango-sharp
+@dirrm lib/mono/gac/rsvg-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/rsvg-sharp
+@dirrm lib/mono/gac/vte-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/vte-sharp
+@dirrm lib/mono/gtk-sharp
 @dirrm share/gapi
diff --git a/x11-toolkits/gtk-sharp/Makefile b/x11-toolkits/gtk-sharp/Makefile
index 8709f9cddab6..d20d5db87334 100644
--- a/x11-toolkits/gtk-sharp/Makefile
+++ b/x11-toolkits/gtk-sharp/Makefile
@@ -6,29 +6,28 @@
 #
 
 PORTNAME=	gtk-sharp
-PORTVERSION=	0.17
-PORTREVISION=	5
+PORTVERSION=	0.93
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtk-sharp
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Gtk+ and GNOME interfaces for the .NET runtime
+COMMENT=	GTK+ and GNOME interfaces for the .NET runtime
 
-BUILD_DEPENDS+=	mono:${PORTSDIR}/lang/mono \
-		gst-launch:${PORTSDIR}/multimedia/gstreamer
-RUN_DEPENDS+=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	mono:${PORTSDIR}/lang/mono
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
-USE_LIBTOOL_VER=13
+GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
+USE_PERL5_RUN=	yes
 USE_GNOME=	gnomehack libgnomedb gtkhtml3 vte librsvg2
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|lib/pkgconfig|libdata/pkgconfig|g' \
-		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|lib/pkgconfig|libdata/pkgconfig|g' \
-		${WRKSRC}/parser/Makefile.in
+	@${REINPLACE_CMD} -e 's|^#!/usr/bin/perl|#!${PERL}|' \
+		${WRKSRC}/parser/gapi.pl \
+		${WRKSRC}/parser/gapi2xml.pl \
+		${WRKSRC}/parser/gapi_pp.pl
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtk-sharp/distinfo b/x11-toolkits/gtk-sharp/distinfo
index f7b90df76ef0..224642d4201b 100644
--- a/x11-toolkits/gtk-sharp/distinfo
+++ b/x11-toolkits/gtk-sharp/distinfo
@@ -1,2 +1,2 @@
-MD5 (gtk-sharp-0.17.tar.gz) = eef5e8acc6bafad869be2c1403c39d62
-SIZE (gtk-sharp-0.17.tar.gz) = 1448435
+MD5 (gtk-sharp-0.93.tar.gz) = b8a1a3a0fc75142fd3867976cd9254c1
+SIZE (gtk-sharp-0.93.tar.gz) = 1356305
diff --git a/x11-toolkits/gtk-sharp/files/patch-configure b/x11-toolkits/gtk-sharp/files/patch-configure
index 110ef9d6a040..6161b1176547 100644
--- a/x11-toolkits/gtk-sharp/files/patch-configure
+++ b/x11-toolkits/gtk-sharp/files/patch-configure
@@ -1,10 +1,10 @@
---- configure.orig	Wed Jan  1 18:58:20 2003
-+++ configure	Wed Jan  1 18:58:45 2003
-@@ -5647,6 +5647,7 @@
+--- configure.orig	Thu Jun 17 23:16:50 2004
++++ configure	Thu Jun 17 23:17:31 2004
+@@ -8440,7 +8440,6 @@
  
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
  
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ 
+-CFLAGS='-g -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes  -Wmissing-prototypes -Wnested-externs  -Wshadow -Wpointer-arith -Wno-cast-qual -Wcast-align -Wwrite-strings'
+ 
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
diff --git a/x11-toolkits/gtk-sharp/files/patch-ltmain.sh b/x11-toolkits/gtk-sharp/files/patch-ltmain.sh
new file mode 100644
index 000000000000..642e3d0bdb06
--- /dev/null
+++ b/x11-toolkits/gtk-sharp/files/patch-ltmain.sh
@@ -0,0 +1,41 @@
+--- ltmain.sh.orig	Thu May 22 16:42:22 2003
++++ ltmain.sh	Tue May 27 12:12:52 2003
+@@ -1072,7 +1072,7 @@
+ 	  esac
+ 	 elif test "X$arg" = "X-lc_r"; then
+ 	  case $host in
+-	 *-*-openbsd* | *-*-freebsd*)
++	 *-*-openbsd* | *-*-freebsd4*)
+ 	    # Do not include libc_r directly, use -pthread flag.
+ 	    continue
+ 	    ;;
+@@ -1082,8 +1082,16 @@
+ 	continue
+ 	;;
+ 
++      -pthread)
++      compile_command="$compile_command -pthread"
++      finalize_command="$finalize_command -pthread"
++      compiler_flags="$compiler_flags -pthread"
++      continue
++      ;;
++
+       -module)
+ 	module=yes
++	build_old_libs=no
+ 	continue
+ 	;;
+ 
+@@ -4325,10 +4336,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/x11-toolkits/gtk-sharp/pkg-descr b/x11-toolkits/gtk-sharp/pkg-descr
index 0f050b1bc9dc..d728f9fd410c 100644
--- a/x11-toolkits/gtk-sharp/pkg-descr
+++ b/x11-toolkits/gtk-sharp/pkg-descr
@@ -1,5 +1,5 @@
-Gtk# is a port of Gtk+ 2 to the .NET runtime, written in C#.  It provides
-access to both basic parts of Gtk+ and other parts of the GNOME development
+GTK# is a port of Gtk+ 2 to the .NET runtime, written in C#.  It provides
+access to both basic parts of GTK+ and other parts of the GNOME development
 environment.
 
-WWW: http://gtk-sharp.sf.net/
+WWW: http://gtk-sharp.sourceforge.net/
diff --git a/x11-toolkits/gtk-sharp/pkg-plist b/x11-toolkits/gtk-sharp/pkg-plist
index 76c9a84f8fdc..140fcc366b07 100644
--- a/x11-toolkits/gtk-sharp/pkg-plist
+++ b/x11-toolkits/gtk-sharp/pkg-plist
@@ -9,27 +9,84 @@ bin/gapi_format_xml
 bin/gapi_pp.pl
 bin/gconfsharp-schemagen
 bin/gconfsharp-schemagen.exe
-lib/art-sharp.dll
-lib/atk-sharp.dll
-lib/gconf-sharp-peditors.dll
-lib/gconf-sharp.dll
-lib/gda-sharp.dll
-lib/gdk-sharp.dll
-lib/glade-sharp.dll
-lib/glib-sharp.dll
-lib/gnome-sharp.dll
-lib/gnomedb-sharp.dll
-lib/gtk-sharp.dll
-lib/gtkhtml-sharp.dll
+lib/libgdksharpglue.so
+lib/libgladesharpglue.so
+lib/libglibsharpglue.so
+lib/libgnomesharpglue.so
 lib/libgtksharpglue.so
-lib/pango-sharp.dll
-lib/rsvg-sharp.dll
-lib/vte-sharp.dll
+lib/mono/gac/art-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/art-sharp/1.0.0.0__35e10195dab3c99f/art-sharp.dll
+lib/mono/gac/art-sharp/1.0.0.0__35e10195dab3c99f/art-sharp.dll.config
+lib/mono/gac/atk-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/atk-sharp/1.0.0.0__35e10195dab3c99f/atk-sharp.dll
+lib/mono/gac/atk-sharp/1.0.0.0__35e10195dab3c99f/atk-sharp.dll.config
+lib/mono/gac/gconf-sharp-peditors/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/gconf-sharp-peditors/1.0.0.0__35e10195dab3c99f/gconf-sharp-peditors.dll
+lib/mono/gac/gconf-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/gconf-sharp/1.0.0.0__35e10195dab3c99f/gconf-sharp.dll
+lib/mono/gac/gconf-sharp/1.0.0.0__35e10195dab3c99f/gconf-sharp.dll.config
+lib/mono/gac/gda-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/gda-sharp/1.0.0.0__35e10195dab3c99f/gda-sharp.dll
+lib/mono/gac/gda-sharp/1.0.0.0__35e10195dab3c99f/gda-sharp.dll.config
+lib/mono/gac/gdk-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/gdk-sharp/1.0.0.0__35e10195dab3c99f/gdk-sharp.dll
+lib/mono/gac/gdk-sharp/1.0.0.0__35e10195dab3c99f/gdk-sharp.dll.config
+lib/mono/gac/glade-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/glade-sharp/1.0.0.0__35e10195dab3c99f/glade-sharp.dll
+lib/mono/gac/glade-sharp/1.0.0.0__35e10195dab3c99f/glade-sharp.dll.config
+lib/mono/gac/glib-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/glib-sharp/1.0.0.0__35e10195dab3c99f/glib-sharp.dll
+lib/mono/gac/glib-sharp/1.0.0.0__35e10195dab3c99f/glib-sharp.dll.config
+lib/mono/gac/gnome-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/gnome-sharp/1.0.0.0__35e10195dab3c99f/gnome-sharp.dll
+lib/mono/gac/gnome-sharp/1.0.0.0__35e10195dab3c99f/gnome-sharp.dll.config
+lib/mono/gac/gnomedb-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/gnomedb-sharp/1.0.0.0__35e10195dab3c99f/gnomedb-sharp.dll
+lib/mono/gac/gnomedb-sharp/1.0.0.0__35e10195dab3c99f/gnomedb-sharp.dll.config
+lib/mono/gac/gtk-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/gtk-sharp/1.0.0.0__35e10195dab3c99f/gtk-sharp.dll
+lib/mono/gac/gtk-sharp/1.0.0.0__35e10195dab3c99f/gtk-sharp.dll.config
+lib/mono/gac/gtkhtml-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/gtkhtml-sharp/1.0.0.0__35e10195dab3c99f/gtkhtml-sharp.dll
+lib/mono/gac/gtkhtml-sharp/1.0.0.0__35e10195dab3c99f/gtkhtml-sharp.dll.config
+lib/mono/gac/pango-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/pango-sharp/1.0.0.0__35e10195dab3c99f/pango-sharp.dll
+lib/mono/gac/pango-sharp/1.0.0.0__35e10195dab3c99f/pango-sharp.dll.config
+lib/mono/gac/rsvg-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/rsvg-sharp/1.0.0.0__35e10195dab3c99f/rsvg-sharp.dll
+lib/mono/gac/rsvg-sharp/1.0.0.0__35e10195dab3c99f/rsvg-sharp.dll.config
+lib/mono/gac/vte-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/vte-sharp/1.0.0.0__35e10195dab3c99f/vte-sharp.dll
+lib/mono/gac/vte-sharp/1.0.0.0__35e10195dab3c99f/vte-sharp.dll.config
+lib/mono/gtk-sharp/art-sharp.dll
+lib/mono/gtk-sharp/atk-sharp.dll
+lib/mono/gtk-sharp/gconf-sharp-peditors.dll
+lib/mono/gtk-sharp/gconf-sharp.dll
+lib/mono/gtk-sharp/gda-sharp.dll
+lib/mono/gtk-sharp/gdk-sharp.dll
+lib/mono/gtk-sharp/glade-sharp.dll
+lib/mono/gtk-sharp/glib-sharp.dll
+lib/mono/gtk-sharp/gnome-sharp.dll
+lib/mono/gtk-sharp/gnomedb-sharp.dll
+lib/mono/gtk-sharp/gtk-sharp.dll
+lib/mono/gtk-sharp/gtkhtml-sharp.dll
+lib/mono/gtk-sharp/pango-sharp.dll
+lib/mono/gtk-sharp/rsvg-sharp.dll
+lib/mono/gtk-sharp/vte-sharp.dll
+libdata/pkgconfig/art-sharp.pc
 libdata/pkgconfig/gapi.pc
+libdata/pkgconfig/gconf-sharp.pc
+libdata/pkgconfig/gda-sharp.pc
+libdata/pkgconfig/glade-sharp.pc
+libdata/pkgconfig/gnome-sharp.pc
+libdata/pkgconfig/gnomedb-sharp.pc
 libdata/pkgconfig/gtk-sharp.pc
+libdata/pkgconfig/gtkhtml-sharp.pc
+libdata/pkgconfig/rsvg-sharp.pc
+libdata/pkgconfig/vte-sharp.pc
 share/gapi/art-api.xml
-share/gapi/atk-api.xml
 share/gapi/art-symbols.xml
+share/gapi/atk-api.xml
 share/gapi/gda-api.xml
 share/gapi/gdk-api.xml
 share/gapi/gdk-symbols.xml
@@ -42,6 +99,35 @@ share/gapi/gtkhtml-api.xml
 share/gapi/pango-api.xml
 share/gapi/rsvg-api.xml
 share/gapi/vte-api.xml
-share/perl5/GAPI/Metadata.pm
-@dirrm share/perl5/GAPI
+@dirrm lib/mono/gac/art-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/art-sharp
+@dirrm lib/mono/gac/atk-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/atk-sharp
+@dirrm lib/mono/gac/gconf-sharp-peditors/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gconf-sharp-peditors
+@dirrm lib/mono/gac/gconf-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gconf-sharp
+@dirrm lib/mono/gac/gda-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gda-sharp
+@dirrm lib/mono/gac/gdk-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gdk-sharp
+@dirrm lib/mono/gac/glade-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/glade-sharp
+@dirrm lib/mono/gac/glib-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/glib-sharp
+@dirrm lib/mono/gac/gnome-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gnome-sharp
+@dirrm lib/mono/gac/gnomedb-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gnomedb-sharp
+@dirrm lib/mono/gac/gtk-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gtk-sharp
+@dirrm lib/mono/gac/gtkhtml-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gtkhtml-sharp
+@dirrm lib/mono/gac/pango-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/pango-sharp
+@dirrm lib/mono/gac/rsvg-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/rsvg-sharp
+@dirrm lib/mono/gac/vte-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/vte-sharp
+@dirrm lib/mono/gtk-sharp
 @dirrm share/gapi
diff --git a/x11-toolkits/gtk-sharp10/Makefile b/x11-toolkits/gtk-sharp10/Makefile
index 8709f9cddab6..d20d5db87334 100644
--- a/x11-toolkits/gtk-sharp10/Makefile
+++ b/x11-toolkits/gtk-sharp10/Makefile
@@ -6,29 +6,28 @@
 #
 
 PORTNAME=	gtk-sharp
-PORTVERSION=	0.17
-PORTREVISION=	5
+PORTVERSION=	0.93
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtk-sharp
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Gtk+ and GNOME interfaces for the .NET runtime
+COMMENT=	GTK+ and GNOME interfaces for the .NET runtime
 
-BUILD_DEPENDS+=	mono:${PORTSDIR}/lang/mono \
-		gst-launch:${PORTSDIR}/multimedia/gstreamer
-RUN_DEPENDS+=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	mono:${PORTSDIR}/lang/mono
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
-USE_LIBTOOL_VER=13
+GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
+USE_PERL5_RUN=	yes
 USE_GNOME=	gnomehack libgnomedb gtkhtml3 vte librsvg2
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|lib/pkgconfig|libdata/pkgconfig|g' \
-		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|lib/pkgconfig|libdata/pkgconfig|g' \
-		${WRKSRC}/parser/Makefile.in
+	@${REINPLACE_CMD} -e 's|^#!/usr/bin/perl|#!${PERL}|' \
+		${WRKSRC}/parser/gapi.pl \
+		${WRKSRC}/parser/gapi2xml.pl \
+		${WRKSRC}/parser/gapi_pp.pl
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtk-sharp10/distinfo b/x11-toolkits/gtk-sharp10/distinfo
index f7b90df76ef0..224642d4201b 100644
--- a/x11-toolkits/gtk-sharp10/distinfo
+++ b/x11-toolkits/gtk-sharp10/distinfo
@@ -1,2 +1,2 @@
-MD5 (gtk-sharp-0.17.tar.gz) = eef5e8acc6bafad869be2c1403c39d62
-SIZE (gtk-sharp-0.17.tar.gz) = 1448435
+MD5 (gtk-sharp-0.93.tar.gz) = b8a1a3a0fc75142fd3867976cd9254c1
+SIZE (gtk-sharp-0.93.tar.gz) = 1356305
diff --git a/x11-toolkits/gtk-sharp10/files/patch-configure b/x11-toolkits/gtk-sharp10/files/patch-configure
index 110ef9d6a040..6161b1176547 100644
--- a/x11-toolkits/gtk-sharp10/files/patch-configure
+++ b/x11-toolkits/gtk-sharp10/files/patch-configure
@@ -1,10 +1,10 @@
---- configure.orig	Wed Jan  1 18:58:20 2003
-+++ configure	Wed Jan  1 18:58:45 2003
-@@ -5647,6 +5647,7 @@
+--- configure.orig	Thu Jun 17 23:16:50 2004
++++ configure	Thu Jun 17 23:17:31 2004
+@@ -8440,7 +8440,6 @@
  
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
  
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ 
+-CFLAGS='-g -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes  -Wmissing-prototypes -Wnested-externs  -Wshadow -Wpointer-arith -Wno-cast-qual -Wcast-align -Wwrite-strings'
+ 
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
diff --git a/x11-toolkits/gtk-sharp10/files/patch-ltmain.sh b/x11-toolkits/gtk-sharp10/files/patch-ltmain.sh
new file mode 100644
index 000000000000..642e3d0bdb06
--- /dev/null
+++ b/x11-toolkits/gtk-sharp10/files/patch-ltmain.sh
@@ -0,0 +1,41 @@
+--- ltmain.sh.orig	Thu May 22 16:42:22 2003
++++ ltmain.sh	Tue May 27 12:12:52 2003
+@@ -1072,7 +1072,7 @@
+ 	  esac
+ 	 elif test "X$arg" = "X-lc_r"; then
+ 	  case $host in
+-	 *-*-openbsd* | *-*-freebsd*)
++	 *-*-openbsd* | *-*-freebsd4*)
+ 	    # Do not include libc_r directly, use -pthread flag.
+ 	    continue
+ 	    ;;
+@@ -1082,8 +1082,16 @@
+ 	continue
+ 	;;
+ 
++      -pthread)
++      compile_command="$compile_command -pthread"
++      finalize_command="$finalize_command -pthread"
++      compiler_flags="$compiler_flags -pthread"
++      continue
++      ;;
++
+       -module)
+ 	module=yes
++	build_old_libs=no
+ 	continue
+ 	;;
+ 
+@@ -4325,10 +4336,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/x11-toolkits/gtk-sharp10/pkg-descr b/x11-toolkits/gtk-sharp10/pkg-descr
index 0f050b1bc9dc..d728f9fd410c 100644
--- a/x11-toolkits/gtk-sharp10/pkg-descr
+++ b/x11-toolkits/gtk-sharp10/pkg-descr
@@ -1,5 +1,5 @@
-Gtk# is a port of Gtk+ 2 to the .NET runtime, written in C#.  It provides
-access to both basic parts of Gtk+ and other parts of the GNOME development
+GTK# is a port of Gtk+ 2 to the .NET runtime, written in C#.  It provides
+access to both basic parts of GTK+ and other parts of the GNOME development
 environment.
 
-WWW: http://gtk-sharp.sf.net/
+WWW: http://gtk-sharp.sourceforge.net/
diff --git a/x11-toolkits/gtk-sharp10/pkg-plist b/x11-toolkits/gtk-sharp10/pkg-plist
index 76c9a84f8fdc..140fcc366b07 100644
--- a/x11-toolkits/gtk-sharp10/pkg-plist
+++ b/x11-toolkits/gtk-sharp10/pkg-plist
@@ -9,27 +9,84 @@ bin/gapi_format_xml
 bin/gapi_pp.pl
 bin/gconfsharp-schemagen
 bin/gconfsharp-schemagen.exe
-lib/art-sharp.dll
-lib/atk-sharp.dll
-lib/gconf-sharp-peditors.dll
-lib/gconf-sharp.dll
-lib/gda-sharp.dll
-lib/gdk-sharp.dll
-lib/glade-sharp.dll
-lib/glib-sharp.dll
-lib/gnome-sharp.dll
-lib/gnomedb-sharp.dll
-lib/gtk-sharp.dll
-lib/gtkhtml-sharp.dll
+lib/libgdksharpglue.so
+lib/libgladesharpglue.so
+lib/libglibsharpglue.so
+lib/libgnomesharpglue.so
 lib/libgtksharpglue.so
-lib/pango-sharp.dll
-lib/rsvg-sharp.dll
-lib/vte-sharp.dll
+lib/mono/gac/art-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/art-sharp/1.0.0.0__35e10195dab3c99f/art-sharp.dll
+lib/mono/gac/art-sharp/1.0.0.0__35e10195dab3c99f/art-sharp.dll.config
+lib/mono/gac/atk-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/atk-sharp/1.0.0.0__35e10195dab3c99f/atk-sharp.dll
+lib/mono/gac/atk-sharp/1.0.0.0__35e10195dab3c99f/atk-sharp.dll.config
+lib/mono/gac/gconf-sharp-peditors/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/gconf-sharp-peditors/1.0.0.0__35e10195dab3c99f/gconf-sharp-peditors.dll
+lib/mono/gac/gconf-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/gconf-sharp/1.0.0.0__35e10195dab3c99f/gconf-sharp.dll
+lib/mono/gac/gconf-sharp/1.0.0.0__35e10195dab3c99f/gconf-sharp.dll.config
+lib/mono/gac/gda-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/gda-sharp/1.0.0.0__35e10195dab3c99f/gda-sharp.dll
+lib/mono/gac/gda-sharp/1.0.0.0__35e10195dab3c99f/gda-sharp.dll.config
+lib/mono/gac/gdk-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/gdk-sharp/1.0.0.0__35e10195dab3c99f/gdk-sharp.dll
+lib/mono/gac/gdk-sharp/1.0.0.0__35e10195dab3c99f/gdk-sharp.dll.config
+lib/mono/gac/glade-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/glade-sharp/1.0.0.0__35e10195dab3c99f/glade-sharp.dll
+lib/mono/gac/glade-sharp/1.0.0.0__35e10195dab3c99f/glade-sharp.dll.config
+lib/mono/gac/glib-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/glib-sharp/1.0.0.0__35e10195dab3c99f/glib-sharp.dll
+lib/mono/gac/glib-sharp/1.0.0.0__35e10195dab3c99f/glib-sharp.dll.config
+lib/mono/gac/gnome-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/gnome-sharp/1.0.0.0__35e10195dab3c99f/gnome-sharp.dll
+lib/mono/gac/gnome-sharp/1.0.0.0__35e10195dab3c99f/gnome-sharp.dll.config
+lib/mono/gac/gnomedb-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/gnomedb-sharp/1.0.0.0__35e10195dab3c99f/gnomedb-sharp.dll
+lib/mono/gac/gnomedb-sharp/1.0.0.0__35e10195dab3c99f/gnomedb-sharp.dll.config
+lib/mono/gac/gtk-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/gtk-sharp/1.0.0.0__35e10195dab3c99f/gtk-sharp.dll
+lib/mono/gac/gtk-sharp/1.0.0.0__35e10195dab3c99f/gtk-sharp.dll.config
+lib/mono/gac/gtkhtml-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/gtkhtml-sharp/1.0.0.0__35e10195dab3c99f/gtkhtml-sharp.dll
+lib/mono/gac/gtkhtml-sharp/1.0.0.0__35e10195dab3c99f/gtkhtml-sharp.dll.config
+lib/mono/gac/pango-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/pango-sharp/1.0.0.0__35e10195dab3c99f/pango-sharp.dll
+lib/mono/gac/pango-sharp/1.0.0.0__35e10195dab3c99f/pango-sharp.dll.config
+lib/mono/gac/rsvg-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/rsvg-sharp/1.0.0.0__35e10195dab3c99f/rsvg-sharp.dll
+lib/mono/gac/rsvg-sharp/1.0.0.0__35e10195dab3c99f/rsvg-sharp.dll.config
+lib/mono/gac/vte-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/vte-sharp/1.0.0.0__35e10195dab3c99f/vte-sharp.dll
+lib/mono/gac/vte-sharp/1.0.0.0__35e10195dab3c99f/vte-sharp.dll.config
+lib/mono/gtk-sharp/art-sharp.dll
+lib/mono/gtk-sharp/atk-sharp.dll
+lib/mono/gtk-sharp/gconf-sharp-peditors.dll
+lib/mono/gtk-sharp/gconf-sharp.dll
+lib/mono/gtk-sharp/gda-sharp.dll
+lib/mono/gtk-sharp/gdk-sharp.dll
+lib/mono/gtk-sharp/glade-sharp.dll
+lib/mono/gtk-sharp/glib-sharp.dll
+lib/mono/gtk-sharp/gnome-sharp.dll
+lib/mono/gtk-sharp/gnomedb-sharp.dll
+lib/mono/gtk-sharp/gtk-sharp.dll
+lib/mono/gtk-sharp/gtkhtml-sharp.dll
+lib/mono/gtk-sharp/pango-sharp.dll
+lib/mono/gtk-sharp/rsvg-sharp.dll
+lib/mono/gtk-sharp/vte-sharp.dll
+libdata/pkgconfig/art-sharp.pc
 libdata/pkgconfig/gapi.pc
+libdata/pkgconfig/gconf-sharp.pc
+libdata/pkgconfig/gda-sharp.pc
+libdata/pkgconfig/glade-sharp.pc
+libdata/pkgconfig/gnome-sharp.pc
+libdata/pkgconfig/gnomedb-sharp.pc
 libdata/pkgconfig/gtk-sharp.pc
+libdata/pkgconfig/gtkhtml-sharp.pc
+libdata/pkgconfig/rsvg-sharp.pc
+libdata/pkgconfig/vte-sharp.pc
 share/gapi/art-api.xml
-share/gapi/atk-api.xml
 share/gapi/art-symbols.xml
+share/gapi/atk-api.xml
 share/gapi/gda-api.xml
 share/gapi/gdk-api.xml
 share/gapi/gdk-symbols.xml
@@ -42,6 +99,35 @@ share/gapi/gtkhtml-api.xml
 share/gapi/pango-api.xml
 share/gapi/rsvg-api.xml
 share/gapi/vte-api.xml
-share/perl5/GAPI/Metadata.pm
-@dirrm share/perl5/GAPI
+@dirrm lib/mono/gac/art-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/art-sharp
+@dirrm lib/mono/gac/atk-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/atk-sharp
+@dirrm lib/mono/gac/gconf-sharp-peditors/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gconf-sharp-peditors
+@dirrm lib/mono/gac/gconf-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gconf-sharp
+@dirrm lib/mono/gac/gda-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gda-sharp
+@dirrm lib/mono/gac/gdk-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gdk-sharp
+@dirrm lib/mono/gac/glade-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/glade-sharp
+@dirrm lib/mono/gac/glib-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/glib-sharp
+@dirrm lib/mono/gac/gnome-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gnome-sharp
+@dirrm lib/mono/gac/gnomedb-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gnomedb-sharp
+@dirrm lib/mono/gac/gtk-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gtk-sharp
+@dirrm lib/mono/gac/gtkhtml-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gtkhtml-sharp
+@dirrm lib/mono/gac/pango-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/pango-sharp
+@dirrm lib/mono/gac/rsvg-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/rsvg-sharp
+@dirrm lib/mono/gac/vte-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/vte-sharp
+@dirrm lib/mono/gtk-sharp
 @dirrm share/gapi
diff --git a/x11-toolkits/gtk-sharp20/Makefile b/x11-toolkits/gtk-sharp20/Makefile
index 8709f9cddab6..d20d5db87334 100644
--- a/x11-toolkits/gtk-sharp20/Makefile
+++ b/x11-toolkits/gtk-sharp20/Makefile
@@ -6,29 +6,28 @@
 #
 
 PORTNAME=	gtk-sharp
-PORTVERSION=	0.17
-PORTREVISION=	5
+PORTVERSION=	0.93
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtk-sharp
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Gtk+ and GNOME interfaces for the .NET runtime
+COMMENT=	GTK+ and GNOME interfaces for the .NET runtime
 
-BUILD_DEPENDS+=	mono:${PORTSDIR}/lang/mono \
-		gst-launch:${PORTSDIR}/multimedia/gstreamer
-RUN_DEPENDS+=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	mono:${PORTSDIR}/lang/mono
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
-USE_LIBTOOL_VER=13
+GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
+USE_PERL5_RUN=	yes
 USE_GNOME=	gnomehack libgnomedb gtkhtml3 vte librsvg2
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|lib/pkgconfig|libdata/pkgconfig|g' \
-		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|lib/pkgconfig|libdata/pkgconfig|g' \
-		${WRKSRC}/parser/Makefile.in
+	@${REINPLACE_CMD} -e 's|^#!/usr/bin/perl|#!${PERL}|' \
+		${WRKSRC}/parser/gapi.pl \
+		${WRKSRC}/parser/gapi2xml.pl \
+		${WRKSRC}/parser/gapi_pp.pl
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtk-sharp20/distinfo b/x11-toolkits/gtk-sharp20/distinfo
index f7b90df76ef0..224642d4201b 100644
--- a/x11-toolkits/gtk-sharp20/distinfo
+++ b/x11-toolkits/gtk-sharp20/distinfo
@@ -1,2 +1,2 @@
-MD5 (gtk-sharp-0.17.tar.gz) = eef5e8acc6bafad869be2c1403c39d62
-SIZE (gtk-sharp-0.17.tar.gz) = 1448435
+MD5 (gtk-sharp-0.93.tar.gz) = b8a1a3a0fc75142fd3867976cd9254c1
+SIZE (gtk-sharp-0.93.tar.gz) = 1356305
diff --git a/x11-toolkits/gtk-sharp20/files/patch-configure b/x11-toolkits/gtk-sharp20/files/patch-configure
index 110ef9d6a040..6161b1176547 100644
--- a/x11-toolkits/gtk-sharp20/files/patch-configure
+++ b/x11-toolkits/gtk-sharp20/files/patch-configure
@@ -1,10 +1,10 @@
---- configure.orig	Wed Jan  1 18:58:20 2003
-+++ configure	Wed Jan  1 18:58:45 2003
-@@ -5647,6 +5647,7 @@
+--- configure.orig	Thu Jun 17 23:16:50 2004
++++ configure	Thu Jun 17 23:17:31 2004
+@@ -8440,7 +8440,6 @@
  
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
  
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ 
+-CFLAGS='-g -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes  -Wmissing-prototypes -Wnested-externs  -Wshadow -Wpointer-arith -Wno-cast-qual -Wcast-align -Wwrite-strings'
+ 
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
diff --git a/x11-toolkits/gtk-sharp20/files/patch-ltmain.sh b/x11-toolkits/gtk-sharp20/files/patch-ltmain.sh
new file mode 100644
index 000000000000..642e3d0bdb06
--- /dev/null
+++ b/x11-toolkits/gtk-sharp20/files/patch-ltmain.sh
@@ -0,0 +1,41 @@
+--- ltmain.sh.orig	Thu May 22 16:42:22 2003
++++ ltmain.sh	Tue May 27 12:12:52 2003
+@@ -1072,7 +1072,7 @@
+ 	  esac
+ 	 elif test "X$arg" = "X-lc_r"; then
+ 	  case $host in
+-	 *-*-openbsd* | *-*-freebsd*)
++	 *-*-openbsd* | *-*-freebsd4*)
+ 	    # Do not include libc_r directly, use -pthread flag.
+ 	    continue
+ 	    ;;
+@@ -1082,8 +1082,16 @@
+ 	continue
+ 	;;
+ 
++      -pthread)
++      compile_command="$compile_command -pthread"
++      finalize_command="$finalize_command -pthread"
++      compiler_flags="$compiler_flags -pthread"
++      continue
++      ;;
++
+       -module)
+ 	module=yes
++	build_old_libs=no
+ 	continue
+ 	;;
+ 
+@@ -4325,10 +4336,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/x11-toolkits/gtk-sharp20/pkg-descr b/x11-toolkits/gtk-sharp20/pkg-descr
index 0f050b1bc9dc..d728f9fd410c 100644
--- a/x11-toolkits/gtk-sharp20/pkg-descr
+++ b/x11-toolkits/gtk-sharp20/pkg-descr
@@ -1,5 +1,5 @@
-Gtk# is a port of Gtk+ 2 to the .NET runtime, written in C#.  It provides
-access to both basic parts of Gtk+ and other parts of the GNOME development
+GTK# is a port of Gtk+ 2 to the .NET runtime, written in C#.  It provides
+access to both basic parts of GTK+ and other parts of the GNOME development
 environment.
 
-WWW: http://gtk-sharp.sf.net/
+WWW: http://gtk-sharp.sourceforge.net/
diff --git a/x11-toolkits/gtk-sharp20/pkg-plist b/x11-toolkits/gtk-sharp20/pkg-plist
index 76c9a84f8fdc..140fcc366b07 100644
--- a/x11-toolkits/gtk-sharp20/pkg-plist
+++ b/x11-toolkits/gtk-sharp20/pkg-plist
@@ -9,27 +9,84 @@ bin/gapi_format_xml
 bin/gapi_pp.pl
 bin/gconfsharp-schemagen
 bin/gconfsharp-schemagen.exe
-lib/art-sharp.dll
-lib/atk-sharp.dll
-lib/gconf-sharp-peditors.dll
-lib/gconf-sharp.dll
-lib/gda-sharp.dll
-lib/gdk-sharp.dll
-lib/glade-sharp.dll
-lib/glib-sharp.dll
-lib/gnome-sharp.dll
-lib/gnomedb-sharp.dll
-lib/gtk-sharp.dll
-lib/gtkhtml-sharp.dll
+lib/libgdksharpglue.so
+lib/libgladesharpglue.so
+lib/libglibsharpglue.so
+lib/libgnomesharpglue.so
 lib/libgtksharpglue.so
-lib/pango-sharp.dll
-lib/rsvg-sharp.dll
-lib/vte-sharp.dll
+lib/mono/gac/art-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/art-sharp/1.0.0.0__35e10195dab3c99f/art-sharp.dll
+lib/mono/gac/art-sharp/1.0.0.0__35e10195dab3c99f/art-sharp.dll.config
+lib/mono/gac/atk-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/atk-sharp/1.0.0.0__35e10195dab3c99f/atk-sharp.dll
+lib/mono/gac/atk-sharp/1.0.0.0__35e10195dab3c99f/atk-sharp.dll.config
+lib/mono/gac/gconf-sharp-peditors/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/gconf-sharp-peditors/1.0.0.0__35e10195dab3c99f/gconf-sharp-peditors.dll
+lib/mono/gac/gconf-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/gconf-sharp/1.0.0.0__35e10195dab3c99f/gconf-sharp.dll
+lib/mono/gac/gconf-sharp/1.0.0.0__35e10195dab3c99f/gconf-sharp.dll.config
+lib/mono/gac/gda-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/gda-sharp/1.0.0.0__35e10195dab3c99f/gda-sharp.dll
+lib/mono/gac/gda-sharp/1.0.0.0__35e10195dab3c99f/gda-sharp.dll.config
+lib/mono/gac/gdk-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/gdk-sharp/1.0.0.0__35e10195dab3c99f/gdk-sharp.dll
+lib/mono/gac/gdk-sharp/1.0.0.0__35e10195dab3c99f/gdk-sharp.dll.config
+lib/mono/gac/glade-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/glade-sharp/1.0.0.0__35e10195dab3c99f/glade-sharp.dll
+lib/mono/gac/glade-sharp/1.0.0.0__35e10195dab3c99f/glade-sharp.dll.config
+lib/mono/gac/glib-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/glib-sharp/1.0.0.0__35e10195dab3c99f/glib-sharp.dll
+lib/mono/gac/glib-sharp/1.0.0.0__35e10195dab3c99f/glib-sharp.dll.config
+lib/mono/gac/gnome-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/gnome-sharp/1.0.0.0__35e10195dab3c99f/gnome-sharp.dll
+lib/mono/gac/gnome-sharp/1.0.0.0__35e10195dab3c99f/gnome-sharp.dll.config
+lib/mono/gac/gnomedb-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/gnomedb-sharp/1.0.0.0__35e10195dab3c99f/gnomedb-sharp.dll
+lib/mono/gac/gnomedb-sharp/1.0.0.0__35e10195dab3c99f/gnomedb-sharp.dll.config
+lib/mono/gac/gtk-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/gtk-sharp/1.0.0.0__35e10195dab3c99f/gtk-sharp.dll
+lib/mono/gac/gtk-sharp/1.0.0.0__35e10195dab3c99f/gtk-sharp.dll.config
+lib/mono/gac/gtkhtml-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/gtkhtml-sharp/1.0.0.0__35e10195dab3c99f/gtkhtml-sharp.dll
+lib/mono/gac/gtkhtml-sharp/1.0.0.0__35e10195dab3c99f/gtkhtml-sharp.dll.config
+lib/mono/gac/pango-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/pango-sharp/1.0.0.0__35e10195dab3c99f/pango-sharp.dll
+lib/mono/gac/pango-sharp/1.0.0.0__35e10195dab3c99f/pango-sharp.dll.config
+lib/mono/gac/rsvg-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/rsvg-sharp/1.0.0.0__35e10195dab3c99f/rsvg-sharp.dll
+lib/mono/gac/rsvg-sharp/1.0.0.0__35e10195dab3c99f/rsvg-sharp.dll.config
+lib/mono/gac/vte-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/mono/gac/vte-sharp/1.0.0.0__35e10195dab3c99f/vte-sharp.dll
+lib/mono/gac/vte-sharp/1.0.0.0__35e10195dab3c99f/vte-sharp.dll.config
+lib/mono/gtk-sharp/art-sharp.dll
+lib/mono/gtk-sharp/atk-sharp.dll
+lib/mono/gtk-sharp/gconf-sharp-peditors.dll
+lib/mono/gtk-sharp/gconf-sharp.dll
+lib/mono/gtk-sharp/gda-sharp.dll
+lib/mono/gtk-sharp/gdk-sharp.dll
+lib/mono/gtk-sharp/glade-sharp.dll
+lib/mono/gtk-sharp/glib-sharp.dll
+lib/mono/gtk-sharp/gnome-sharp.dll
+lib/mono/gtk-sharp/gnomedb-sharp.dll
+lib/mono/gtk-sharp/gtk-sharp.dll
+lib/mono/gtk-sharp/gtkhtml-sharp.dll
+lib/mono/gtk-sharp/pango-sharp.dll
+lib/mono/gtk-sharp/rsvg-sharp.dll
+lib/mono/gtk-sharp/vte-sharp.dll
+libdata/pkgconfig/art-sharp.pc
 libdata/pkgconfig/gapi.pc
+libdata/pkgconfig/gconf-sharp.pc
+libdata/pkgconfig/gda-sharp.pc
+libdata/pkgconfig/glade-sharp.pc
+libdata/pkgconfig/gnome-sharp.pc
+libdata/pkgconfig/gnomedb-sharp.pc
 libdata/pkgconfig/gtk-sharp.pc
+libdata/pkgconfig/gtkhtml-sharp.pc
+libdata/pkgconfig/rsvg-sharp.pc
+libdata/pkgconfig/vte-sharp.pc
 share/gapi/art-api.xml
-share/gapi/atk-api.xml
 share/gapi/art-symbols.xml
+share/gapi/atk-api.xml
 share/gapi/gda-api.xml
 share/gapi/gdk-api.xml
 share/gapi/gdk-symbols.xml
@@ -42,6 +99,35 @@ share/gapi/gtkhtml-api.xml
 share/gapi/pango-api.xml
 share/gapi/rsvg-api.xml
 share/gapi/vte-api.xml
-share/perl5/GAPI/Metadata.pm
-@dirrm share/perl5/GAPI
+@dirrm lib/mono/gac/art-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/art-sharp
+@dirrm lib/mono/gac/atk-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/atk-sharp
+@dirrm lib/mono/gac/gconf-sharp-peditors/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gconf-sharp-peditors
+@dirrm lib/mono/gac/gconf-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gconf-sharp
+@dirrm lib/mono/gac/gda-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gda-sharp
+@dirrm lib/mono/gac/gdk-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gdk-sharp
+@dirrm lib/mono/gac/glade-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/glade-sharp
+@dirrm lib/mono/gac/glib-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/glib-sharp
+@dirrm lib/mono/gac/gnome-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gnome-sharp
+@dirrm lib/mono/gac/gnomedb-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gnomedb-sharp
+@dirrm lib/mono/gac/gtk-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gtk-sharp
+@dirrm lib/mono/gac/gtkhtml-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gtkhtml-sharp
+@dirrm lib/mono/gac/pango-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/pango-sharp
+@dirrm lib/mono/gac/rsvg-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/rsvg-sharp
+@dirrm lib/mono/gac/vte-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/vte-sharp
+@dirrm lib/mono/gtk-sharp
 @dirrm share/gapi