- Update to 1.9.5.

- Remove the ${BUILD_DEPENDS} in RUN_DEPENDS, because it causes gmake, libtool
  and few others become as runtime dependency, which they are just need to be
  in the build dependency.
- Fix the plist for gtk-sharp and gtk-sharp-devel share the some same main
  directories.

BSD# - Project by:	http://www.mono-project.com/Mono:FreeBSD

10 files changed, 74 insertions, 56 deletions

diff --git a/x11-toolkits/gtk-sharp-devel/Makefile b/x11-toolkits/gtk-sharp-devel/Makefile
index d46a7d47ae82..a515b978823b 100644
--- a/x11-toolkits/gtk-sharp-devel/Makefile
+++ b/x11-toolkits/gtk-sharp-devel/Makefile
@@ -2,14 +2,15 @@
 # Date created:         2003-01-01
 # Whom:                 Juli Mallett
 #
-# $Id: Makefile,v 1.8 2005/04/15 04:51:40 tmclau02 Exp $
+# $Id: Makefile,v 1.12 2005/06/07 01:21:44 mezz7 Exp $
 # $FreeBSD$
 #
 
 PORTNAME=	gtk-sharp
-PORTVERSION=	1.9.3
+PORTVERSION=	1.9.5
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	http://go-mono.com/sources/gtk-sharp-2.0/
 MASTER_SITE_SUBDIR=	gtk-sharp
 PKGNAMESUFFIX=	-devel
 
@@ -17,7 +18,7 @@ MAINTAINER=	bsd-sharp-list@forge.novell.com
 COMMENT=	GTK+ and GNOME interfaces for the .NET runtime
 
 BUILD_DEPENDS=	mono:${PORTSDIR}/lang/mono
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	mono:${PORTSDIR}/lang/mono
 
 USE_X_PREFIX=	yes
 USE_LIBTOOL_VER=15
diff --git a/x11-toolkits/gtk-sharp-devel/distinfo b/x11-toolkits/gtk-sharp-devel/distinfo
index 2ff54946fdd0..cd562680bad3 100644
--- a/x11-toolkits/gtk-sharp-devel/distinfo
+++ b/x11-toolkits/gtk-sharp-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (gtk-sharp-1.9.3.tar.gz) = c7654c4947a554d7fd588f035c7ef92a
-SIZE (gtk-sharp-1.9.3.tar.gz) = 2186372
+MD5 (gtk-sharp-1.9.5.tar.gz) = e61f77fd5dad3deb25f53f39e8a45378
+SIZE (gtk-sharp-1.9.5.tar.gz) = 2167548
diff --git a/x11-toolkits/gtk-sharp-devel/files/patch-configure b/x11-toolkits/gtk-sharp-devel/files/patch-configure
index e5b6fd93a476..f3617f7cb418 100644
--- a/x11-toolkits/gtk-sharp-devel/files/patch-configure
+++ b/x11-toolkits/gtk-sharp-devel/files/patch-configure
@@ -13,7 +13,7 @@
  
  
  if test "x$has_mono" = "xtrue"; then
--GACUTIL_FLAGS='/package $(PACKAGE_VERSION) /gacdir $(DESTDIR)$(libdir)'
+-GACUTIL_FLAGS='/package $(PACKAGE_VERSION) /gacdir $(DESTDIR)$(prefix)/lib'
 +GACUTIL_FLAGS='/package $(PACKAGE_VERSION) /root $(DESTDIR)$(libdir) /gacdir $(DESTDIR)$(libdir)'
  GENERATED_SOURCES=generated/*.cs
  # Extract the first word of "mono", so it can be a program name with args.
diff --git a/x11-toolkits/gtk-sharp-devel/files/patch-gtkdotnet_gtk-dotnet.dll.config.in b/x11-toolkits/gtk-sharp-devel/files/patch-gtkdotnet_gtk-dotnet.dll.config.in
new file mode 100644
index 000000000000..bde46596363f
--- /dev/null
+++ b/x11-toolkits/gtk-sharp-devel/files/patch-gtkdotnet_gtk-dotnet.dll.config.in
@@ -0,0 +1,7 @@
+--- gtkdotnet/gtk-dotnet.dll.config.in.orig	Thu Jun  2 04:01:46 2005
++++ gtkdotnet/gtk-dotnet.dll.config.in	Thu Jun  2 04:04:41 2005
+@@ -1,3 +1,3 @@
+ <configuration>
+-  <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
++  <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
+ </configuration>
diff --git a/x11-toolkits/gtk-sharp-devel/pkg-plist b/x11-toolkits/gtk-sharp-devel/pkg-plist
index c9bd502030e0..f24eccf52a22 100644
--- a/x11-toolkits/gtk-sharp-devel/pkg-plist
+++ b/x11-toolkits/gtk-sharp-devel/pkg-plist
@@ -3,10 +3,9 @@ bin/gapi2-fixup
 bin/gapi2-parser
 bin/gconfsharp2-schemagen
 lib/gtk-sharp-2.0/gapi-fixup.exe
+lib/gtk-sharp-2.0/gapi-parser.exe
 lib/gtk-sharp-2.0/gapi2xml.pl
 lib/gtk-sharp-2.0/gapi_codegen.exe
-lib/gtk-sharp-2.0/gapi_format_xml
-lib/gtk-sharp-2.0/gapi_parser.pl
 lib/gtk-sharp-2.0/gapi_pp.pl
 lib/gtk-sharp-2.0/gconfsharp-schemagen.exe
 lib/libgdksharpglue-2.so
@@ -15,6 +14,7 @@ lib/libglibsharpglue-2.so
 lib/libgnomesharpglue-2.so
 lib/libgtksharpglue-2.so
 lib/libpangosharpglue-2.so
+lib/libvtesharpglue-2.so
 lib/mono/gac/art-sharp/2.0.0.0__35e10195dab3c99f/art-sharp.dll
 lib/mono/gac/art-sharp/2.0.0.0__35e10195dab3c99f/art-sharp.dll.config
 lib/mono/gac/atk-sharp/2.0.0.0__35e10195dab3c99f/atk-sharp.dll
@@ -91,40 +91,41 @@ share/gapi-2.0/gtkhtml-api.xml
 share/gapi-2.0/pango-api.xml
 share/gapi-2.0/rsvg-api.xml
 share/gapi-2.0/vte-api.xml
-@dirrm share/gapi-2.0
+@dirrm lib/gtk-sharp-2.0/
+@unexec rmdir %D/share/gapi-2.0 2> /dev/null || true
 @dirrm lib/mono/gtk-sharp-2.0
 @dirrm lib/mono/gac/vte-sharp/2.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/vte-sharp
+@unexec rmdir %D/lib/mono/gac/vte-sharp 2> /dev/null || true
 @dirrm lib/mono/gac/rsvg-sharp/2.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/rsvg-sharp
+@unexec rmdir %D/lib/mono/gac/rsvg-sharp 2> /dev/null || true
 @dirrm lib/mono/gac/pango-sharp/2.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/pango-sharp
+@unexec rmdir %D/lib/mono/gac/pango-sharp 2> /dev/null || true
 @dirrm lib/mono/gac/gtkhtml-sharp/2.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/gtkhtml-sharp
+@unexec rmdir %D/lib/mono/gac/gtkhtml-sharp 2> /dev/null || true
 @dirrm lib/mono/gac/gtk-sharp/2.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/gtk-sharp
+@unexec rmdir %D/lib/mono/gac/gtk-sharp 2> /dev/null || true
 @dirrm lib/mono/gac/gtk-dotnet/2.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/gtk-dotnet
+@unexec rmdir %D/lib/mono/gac/gtk-dotnet 2> /dev/null || true
 @dirrm lib/mono/gac/gnomedb-sharp/2.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/gnomedb-sharp
+@unexec rmdir %D/lib/mono/gac/gnomedb-sharp 2> /dev/null || true
 @dirrm lib/mono/gac/gnome-vfs-sharp/2.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/gnome-vfs-sharp
+@unexec rmdir %D/lib/mono/gac/gnome-vfs-sharp 2> /dev/null || true
 @dirrm lib/mono/gac/gnome-sharp/2.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/gnome-sharp
+@unexec rmdir %D/lib/mono/gac/gnome-sharp 2> /dev/null || true
 @dirrm lib/mono/gac/glib-sharp/2.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/glib-sharp
+@unexec rmdir %D/lib/mono/gac/glib-sharp 2> /dev/null || true
 @dirrm lib/mono/gac/glade-sharp/2.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/glade-sharp
+@unexec rmdir %D/lib/mono/gac/glade-sharp 2> /dev/null || true
 @dirrm lib/mono/gac/gdk-sharp/2.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/gdk-sharp
+@unexec rmdir %D/lib/mono/gac/gdk-sharp 2> /dev/null || true
 @dirrm lib/mono/gac/gda-sharp/2.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/gda-sharp
+@unexec rmdir %D/lib/mono/gac/gda-sharp 2> /dev/null || true
 @dirrm lib/mono/gac/gconf-sharp/2.0.0.0__35e10195dab3c99f
 @dirrm lib/mono/gac/gconf-sharp-peditors/2.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/gconf-sharp-peditors
-@dirrm lib/mono/gac/gconf-sharp
+@unexec rmdir %D/lib/mono/gac/gconf-sharp-peditors 2> /dev/null || true
+@unexec rmdir %D/lib/mono/gac/gconf-sharp 2> /dev/null || true
 @dirrm lib/mono/gac/atk-sharp/2.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/atk-sharp
+@unexec rmdir %D/lib/mono/gac/atk-sharp 2> /dev/null || true
 @dirrm lib/mono/gac/art-sharp/2.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/art-sharp
-@dirrm lib/gtk-sharp-2.0
+@unexec rmdir %D/lib/mono/gac/art-sharp 2> /dev/null || true
+@unexec rmdir %D/lib/gtk-sharp-2.0 2> /dev/null || true
diff --git a/x11-toolkits/gtk-sharp20/Makefile b/x11-toolkits/gtk-sharp20/Makefile
index d46a7d47ae82..a515b978823b 100644
--- a/x11-toolkits/gtk-sharp20/Makefile
+++ b/x11-toolkits/gtk-sharp20/Makefile
@@ -2,14 +2,15 @@
 # Date created:         2003-01-01
 # Whom:                 Juli Mallett
 #
-# $Id: Makefile,v 1.8 2005/04/15 04:51:40 tmclau02 Exp $
+# $Id: Makefile,v 1.12 2005/06/07 01:21:44 mezz7 Exp $
 # $FreeBSD$
 #
 
 PORTNAME=	gtk-sharp
-PORTVERSION=	1.9.3
+PORTVERSION=	1.9.5
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	http://go-mono.com/sources/gtk-sharp-2.0/
 MASTER_SITE_SUBDIR=	gtk-sharp
 PKGNAMESUFFIX=	-devel
 
@@ -17,7 +18,7 @@ MAINTAINER=	bsd-sharp-list@forge.novell.com
 COMMENT=	GTK+ and GNOME interfaces for the .NET runtime
 
 BUILD_DEPENDS=	mono:${PORTSDIR}/lang/mono
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	mono:${PORTSDIR}/lang/mono
 
 USE_X_PREFIX=	yes
 USE_LIBTOOL_VER=15
diff --git a/x11-toolkits/gtk-sharp20/distinfo b/x11-toolkits/gtk-sharp20/distinfo
index 2ff54946fdd0..cd562680bad3 100644
--- a/x11-toolkits/gtk-sharp20/distinfo
+++ b/x11-toolkits/gtk-sharp20/distinfo
@@ -1,2 +1,2 @@
-MD5 (gtk-sharp-1.9.3.tar.gz) = c7654c4947a554d7fd588f035c7ef92a
-SIZE (gtk-sharp-1.9.3.tar.gz) = 2186372
+MD5 (gtk-sharp-1.9.5.tar.gz) = e61f77fd5dad3deb25f53f39e8a45378
+SIZE (gtk-sharp-1.9.5.tar.gz) = 2167548
diff --git a/x11-toolkits/gtk-sharp20/files/patch-configure b/x11-toolkits/gtk-sharp20/files/patch-configure
index e5b6fd93a476..f3617f7cb418 100644
--- a/x11-toolkits/gtk-sharp20/files/patch-configure
+++ b/x11-toolkits/gtk-sharp20/files/patch-configure
@@ -13,7 +13,7 @@
  
  
  if test "x$has_mono" = "xtrue"; then
--GACUTIL_FLAGS='/package $(PACKAGE_VERSION) /gacdir $(DESTDIR)$(libdir)'
+-GACUTIL_FLAGS='/package $(PACKAGE_VERSION) /gacdir $(DESTDIR)$(prefix)/lib'
 +GACUTIL_FLAGS='/package $(PACKAGE_VERSION) /root $(DESTDIR)$(libdir) /gacdir $(DESTDIR)$(libdir)'
  GENERATED_SOURCES=generated/*.cs
  # Extract the first word of "mono", so it can be a program name with args.
diff --git a/x11-toolkits/gtk-sharp20/files/patch-gtkdotnet_gtk-dotnet.dll.config.in b/x11-toolkits/gtk-sharp20/files/patch-gtkdotnet_gtk-dotnet.dll.config.in
new file mode 100644
index 000000000000..bde46596363f
--- /dev/null
+++ b/x11-toolkits/gtk-sharp20/files/patch-gtkdotnet_gtk-dotnet.dll.config.in
@@ -0,0 +1,7 @@
+--- gtkdotnet/gtk-dotnet.dll.config.in.orig	Thu Jun  2 04:01:46 2005
++++ gtkdotnet/gtk-dotnet.dll.config.in	Thu Jun  2 04:04:41 2005
+@@ -1,3 +1,3 @@
+ <configuration>
+-  <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
++  <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
+ </configuration>
diff --git a/x11-toolkits/gtk-sharp20/pkg-plist b/x11-toolkits/gtk-sharp20/pkg-plist
index c9bd502030e0..f24eccf52a22 100644
--- a/x11-toolkits/gtk-sharp20/pkg-plist
+++ b/x11-toolkits/gtk-sharp20/pkg-plist
@@ -3,10 +3,9 @@ bin/gapi2-fixup
 bin/gapi2-parser
 bin/gconfsharp2-schemagen
 lib/gtk-sharp-2.0/gapi-fixup.exe
+lib/gtk-sharp-2.0/gapi-parser.exe
 lib/gtk-sharp-2.0/gapi2xml.pl
 lib/gtk-sharp-2.0/gapi_codegen.exe
-lib/gtk-sharp-2.0/gapi_format_xml
-lib/gtk-sharp-2.0/gapi_parser.pl
 lib/gtk-sharp-2.0/gapi_pp.pl
 lib/gtk-sharp-2.0/gconfsharp-schemagen.exe
 lib/libgdksharpglue-2.so
@@ -15,6 +14,7 @@ lib/libglibsharpglue-2.so
 lib/libgnomesharpglue-2.so
 lib/libgtksharpglue-2.so
 lib/libpangosharpglue-2.so
+lib/libvtesharpglue-2.so
 lib/mono/gac/art-sharp/2.0.0.0__35e10195dab3c99f/art-sharp.dll
 lib/mono/gac/art-sharp/2.0.0.0__35e10195dab3c99f/art-sharp.dll.config
 lib/mono/gac/atk-sharp/2.0.0.0__35e10195dab3c99f/atk-sharp.dll
@@ -91,40 +91,41 @@ share/gapi-2.0/gtkhtml-api.xml
 share/gapi-2.0/pango-api.xml
 share/gapi-2.0/rsvg-api.xml
 share/gapi-2.0/vte-api.xml
-@dirrm share/gapi-2.0
+@dirrm lib/gtk-sharp-2.0/
+@unexec rmdir %D/share/gapi-2.0 2> /dev/null || true
 @dirrm lib/mono/gtk-sharp-2.0
 @dirrm lib/mono/gac/vte-sharp/2.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/vte-sharp
+@unexec rmdir %D/lib/mono/gac/vte-sharp 2> /dev/null || true
 @dirrm lib/mono/gac/rsvg-sharp/2.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/rsvg-sharp
+@unexec rmdir %D/lib/mono/gac/rsvg-sharp 2> /dev/null || true
 @dirrm lib/mono/gac/pango-sharp/2.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/pango-sharp
+@unexec rmdir %D/lib/mono/gac/pango-sharp 2> /dev/null || true
 @dirrm lib/mono/gac/gtkhtml-sharp/2.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/gtkhtml-sharp
+@unexec rmdir %D/lib/mono/gac/gtkhtml-sharp 2> /dev/null || true
 @dirrm lib/mono/gac/gtk-sharp/2.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/gtk-sharp
+@unexec rmdir %D/lib/mono/gac/gtk-sharp 2> /dev/null || true
 @dirrm lib/mono/gac/gtk-dotnet/2.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/gtk-dotnet
+@unexec rmdir %D/lib/mono/gac/gtk-dotnet 2> /dev/null || true
 @dirrm lib/mono/gac/gnomedb-sharp/2.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/gnomedb-sharp
+@unexec rmdir %D/lib/mono/gac/gnomedb-sharp 2> /dev/null || true
 @dirrm lib/mono/gac/gnome-vfs-sharp/2.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/gnome-vfs-sharp
+@unexec rmdir %D/lib/mono/gac/gnome-vfs-sharp 2> /dev/null || true
 @dirrm lib/mono/gac/gnome-sharp/2.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/gnome-sharp
+@unexec rmdir %D/lib/mono/gac/gnome-sharp 2> /dev/null || true
 @dirrm lib/mono/gac/glib-sharp/2.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/glib-sharp
+@unexec rmdir %D/lib/mono/gac/glib-sharp 2> /dev/null || true
 @dirrm lib/mono/gac/glade-sharp/2.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/glade-sharp
+@unexec rmdir %D/lib/mono/gac/glade-sharp 2> /dev/null || true
 @dirrm lib/mono/gac/gdk-sharp/2.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/gdk-sharp
+@unexec rmdir %D/lib/mono/gac/gdk-sharp 2> /dev/null || true
 @dirrm lib/mono/gac/gda-sharp/2.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/gda-sharp
+@unexec rmdir %D/lib/mono/gac/gda-sharp 2> /dev/null || true
 @dirrm lib/mono/gac/gconf-sharp/2.0.0.0__35e10195dab3c99f
 @dirrm lib/mono/gac/gconf-sharp-peditors/2.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/gconf-sharp-peditors
-@dirrm lib/mono/gac/gconf-sharp
+@unexec rmdir %D/lib/mono/gac/gconf-sharp-peditors 2> /dev/null || true
+@unexec rmdir %D/lib/mono/gac/gconf-sharp 2> /dev/null || true
 @dirrm lib/mono/gac/atk-sharp/2.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/atk-sharp
+@unexec rmdir %D/lib/mono/gac/atk-sharp 2> /dev/null || true
 @dirrm lib/mono/gac/art-sharp/2.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/art-sharp
-@dirrm lib/gtk-sharp-2.0
+@unexec rmdir %D/lib/mono/gac/art-sharp 2> /dev/null || true
+@unexec rmdir %D/lib/gtk-sharp-2.0 2> /dev/null || true