6 files changed, 97 insertions, 76 deletions

diff --git a/x11-toolkits/gtk-sharp20/Makefile b/x11-toolkits/gtk-sharp20/Makefile
index 5854fb90bb2e..5fae4d3e8908 100644
--- a/x11-toolkits/gtk-sharp20/Makefile
+++ b/x11-toolkits/gtk-sharp20/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	gtk-sharp
-PORTVERSION=	0.93
+PORTVERSION=	1.0
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	gtk-sharp
+MASTER_SITES=	http://mono2.ximian.com/archive/${PORTVERSION}/
 
 MAINTAINER=	coop9211@uidaho.edu
 COMMENT=	GTK+ and GNOME interfaces for the .NET runtime
@@ -25,13 +24,7 @@ USE_PERL5_RUN=	yes
 USE_GNOME=	gnomehack libgnomedb gtkhtml3 vte librsvg2
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|^#!/usr/bin/perl|#!${PERL}|' \
-		${WRKSRC}/parser/gapi.pl \
-		${WRKSRC}/parser/gapi2xml.pl \
-		${WRKSRC}/parser/gapi_pp.pl
-
-pre-configure:
-	@${FIND} ${WRKSRC} -name '*.config.in' | ${XARGS} ${REINPLACE_CMD} -e \
-		's|@LIB_PREFIX@.*@LIB_SUFFIX@|.so|g'
+	@${FIND} ${WRKSRC} -name '*.pl' | ${XARGS} ${REINPLACE_CMD} -e \
+		's|^#!/usr/bin/perl|#!${PERL}|'
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtk-sharp20/distinfo b/x11-toolkits/gtk-sharp20/distinfo
index 224642d4201b..feee8052543e 100644
--- a/x11-toolkits/gtk-sharp20/distinfo
+++ b/x11-toolkits/gtk-sharp20/distinfo
@@ -1,2 +1,2 @@
-MD5 (gtk-sharp-0.93.tar.gz) = b8a1a3a0fc75142fd3867976cd9254c1
-SIZE (gtk-sharp-0.93.tar.gz) = 1356305
+MD5 (gtk-sharp-1.0.tar.gz) = 6eab56e11c1e1245ec6af12312969399
+SIZE (gtk-sharp-1.0.tar.gz) = 1424982
diff --git a/x11-toolkits/gtk-sharp20/files/patch-configure b/x11-toolkits/gtk-sharp20/files/patch-configure
index 6161b1176547..751dc04f6afd 100644
--- a/x11-toolkits/gtk-sharp20/files/patch-configure
+++ b/x11-toolkits/gtk-sharp20/files/patch-configure
@@ -1,10 +1,11 @@
---- configure.orig	Thu Jun 17 23:16:50 2004
-+++ configure	Thu Jun 17 23:17:31 2004
-@@ -8440,7 +8440,6 @@
+--- configure.bak	Tue Jun 29 09:02:24 2004
++++ configure	Thu Jul  8 02:13:18 2004
+@@ -8441,7 +8441,7 @@
  
  
  
 -CFLAGS='-g -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes  -Wmissing-prototypes -Wnested-externs  -Wshadow -Wpointer-arith -Wno-cast-qual -Wcast-align -Wwrite-strings'
++CFLAGS='-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-sample_rsvg_Makefile.in b/x11-toolkits/gtk-sharp20/files/patch-sample_rsvg_Makefile.in
new file mode 100644
index 000000000000..6765daaf1126
--- /dev/null
+++ b/x11-toolkits/gtk-sharp20/files/patch-sample_rsvg_Makefile.in
@@ -0,0 +1,11 @@
+--- sample/rsvg/Makefile.in.bak	Tue Jun 29 09:03:12 2004
++++ sample/rsvg/Makefile.in	Thu Jul  8 16:27:33 2004
+@@ -119,7 +119,7 @@
+ am__include = @am__include@
+ am__quote = @am__quote@
+ install_sh = @install_sh@
+-assemblies = ../../glib/glib-sharp.dll ../../pango/pango-sharp.dll ../../atk/atk-sharp.dll ../../gdk/gdk-sharp.dll ../../gtk/gtk-sharp.dll ../../rsvg/rsvg-sharp.dll
++assemblies = ../../glib/glib-sharp.dll ../../pango/pango-sharp.dll ../../atk/atk-sharp.dll ../../gdk/gdk-sharp.dll ../../gtk/gtk-sharp.dll ../../art/art-sharp.dll ../../rsvg/rsvg-sharp.dll
+ references = $(addprefix /r:, $(assemblies))
+ 
+ @ENABLE_RSVG_TRUE@TARGETS = svghelloworld.exe
diff --git a/x11-toolkits/gtk-sharp20/pkg-descr b/x11-toolkits/gtk-sharp20/pkg-descr
index d728f9fd410c..fd6c71b1ea4b 100644
--- a/x11-toolkits/gtk-sharp20/pkg-descr
+++ b/x11-toolkits/gtk-sharp20/pkg-descr
@@ -2,4 +2,4 @@ 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.sourceforge.net/
+WWW: http://www.mono-project.com/using/relnotes/gtk-sharp-1.0.html
diff --git a/x11-toolkits/gtk-sharp20/pkg-plist b/x11-toolkits/gtk-sharp20/pkg-plist
index 140fcc366b07..6cd2a13ff49e 100644
--- a/x11-toolkits/gtk-sharp20/pkg-plist
+++ b/x11-toolkits/gtk-sharp20/pkg-plist
@@ -1,3 +1,48 @@
+@unexec gacutil /u glib-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true
+lib/mono/gtk-sharp/glib-sharp.dll
+@exec gacutil /i glib-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null
+@unexec gacutil /u pango-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true
+lib/mono/gtk-sharp/pango-sharp.dll
+@exec gacutil /i pango-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null
+@unexec gacutil /u atk-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true
+lib/mono/gtk-sharp/atk-sharp.dll
+@exec gacutil /i atk-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null
+@unexec gacutil /u gdk-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true
+lib/mono/gtk-sharp/gdk-sharp.dll
+@exec gacutil /i gdk-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null
+@unexec gacutil /u gtk-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true
+lib/mono/gtk-sharp/gtk-sharp.dll
+@exec gacutil /i gtk-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null
+@unexec gacutil /u glade-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true
+lib/mono/gtk-sharp/glade-sharp.dll
+@exec gacutil /i glade-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null
+@unexec gacutil /u art-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true
+lib/mono/gtk-sharp/art-sharp.dll
+@exec gacutil /i art-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null
+@unexec gacutil /u gnome-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true
+lib/mono/gtk-sharp/gnome-sharp.dll
+@exec gacutil /i gnome-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null
+@unexec gacutil /u gda-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true
+lib/mono/gtk-sharp/gda-sharp.dll
+@exec gacutil /i gda-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null
+@unexec gacutil /u gnomedb-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true
+lib/mono/gtk-sharp/gnomedb-sharp.dll
+@exec gacutil /i gnomedb-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null
+@unexec gacutil /u gtkhtml-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true
+lib/mono/gtk-sharp/gtkhtml-sharp.dll
+@exec gacutil /i gtkhtml-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null
+@unexec gacutil /u gconf-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true
+lib/mono/gtk-sharp/gconf-sharp.dll
+@exec gacutil /i gconf-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null
+@unexec gacutil /u gconf-sharp-peditors.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true
+lib/mono/gtk-sharp/gconf-sharp-peditors.dll
+@exec gacutil /i gconf-sharp-peditors.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null
+@unexec gacutil /u rsvg-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true
+lib/mono/gtk-sharp/rsvg-sharp.dll
+@exec gacutil /i rsvg-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null
+@unexec gacutil /u vte-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true
+lib/mono/gtk-sharp/vte-sharp.dll
+@exec gacutil /i vte-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null
 bin/gapi-codegen
 bin/gapi-fixup
 bin/gapi-fixup.exe
@@ -14,65 +59,36 @@ lib/libgladesharpglue.so
 lib/libglibsharpglue.so
 lib/libgnomesharpglue.so
 lib/libgtksharpglue.so
-lib/mono/gac/art-sharp/1.0.0.0__35e10195dab3c99f/__AssemblyInfo__
+lib/libpangosharpglue.so
 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
@@ -99,35 +115,35 @@ share/gapi/gtkhtml-api.xml
 share/gapi/pango-api.xml
 share/gapi/rsvg-api.xml
 share/gapi/vte-api.xml
-@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 share/gapi
+@dirrm lib/mono/gtk-sharp
+@dirrm lib/mono/gac/vte-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/vte-sharp
+@dirrm lib/mono/gac/rsvg-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/rsvg-sharp
+@dirrm lib/mono/gac/pango-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/pango-sharp
+@dirrm lib/mono/gac/gtkhtml-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gtkhtml-sharp
+@dirrm lib/mono/gac/gtk-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gtk-sharp
+@dirrm lib/mono/gac/gnomedb-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gnomedb-sharp
+@dirrm lib/mono/gac/gnome-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gnome-sharp
+@dirrm lib/mono/gac/glib-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/glib-sharp
+@dirrm lib/mono/gac/glade-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/glade-sharp
+@dirrm lib/mono/gac/gdk-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gdk-sharp
+@dirrm lib/mono/gac/gda-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gda-sharp
+@dirrm lib/mono/gac/gconf-sharp/1.0.0.0__35e10195dab3c99f
 @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
+@dirrm lib/mono/gac/atk-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/atk-sharp
+@dirrm lib/mono/gac/art-sharp/1.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/art-sharp