Update ancillary mono ports

x11-toolkits/gnome-sharp20:
 - update to version 2.24.4
 - use github for sources
 - use autoreconf and provided bootstrap script (pre-configure)
 - remove gettext-runtime, not used by port
 - order USES section, move non-USES related variables to own section

x11-toolkits/gtk-sharp20:
 - update to version 2.12.45
 - remove gettext-runtime, not used by port
 - order USES section, move non-USES related variables to own section

Differential Revision:	https://reviews.freebsd.org/D13751

8 files changed, 44 insertions, 48 deletions

diff --git a/x11-toolkits/gnome-sharp20/Makefile b/x11-toolkits/gnome-sharp20/Makefile
index e6bfc1a02257..28e85b508257 100644
--- a/x11-toolkits/gnome-sharp20/Makefile
+++ b/x11-toolkits/gnome-sharp20/Makefile
@@ -2,10 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	gnome-sharp
-PORTVERSION=	2.24.2
-PORTREVISION=	5
+PORTVERSION=	2.24.4
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	GNOME
 
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	GNOME interfaces for the .NET runtime
@@ -17,13 +15,20 @@ LIB_DEPENDS=	libpopt.so:devel/popt \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
-GNU_CONFIGURE=	yes
+USES=		autoreconf gmake libtool mono pathfix perl5 pkgconfig shebangfix tar:bzip2
 USE_LDCONFIG=	yes
-USES=		gettext-runtime gmake libtool mono pathfix perl5 pkgconfig shebangfix tar:bzip2
+USE_GITHUB=	yes
 USE_GNOME=	cairo gnomevfs2 gtksharp20 librsvg2 vte libgnomeprintui libgnomeui
 USE_PERL5=	run
 USE_XORG=	ice sm
-INSTALL_TARGET=	install-strip
 SHEBANG_GLOB=	*.pl
 
+GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
+
+GH_ACCOUNT=	mono
+
+pre-configure:
+	(cd ${WRKSRC}; ./bootstrap-2.24)
+
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gnome-sharp20/distinfo b/x11-toolkits/gnome-sharp20/distinfo
index 92658eb607d2..2006b62fb227 100644
--- a/x11-toolkits/gnome-sharp20/distinfo
+++ b/x11-toolkits/gnome-sharp20/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome-sharp-2.24.2.tar.bz2) = 122b1e03966d63ec3389decf5440fb94285907d1b6be48352dcf6aca292cf7b0
-SIZE (gnome-sharp-2.24.2.tar.bz2) = 421281
+TIMESTAMP = 1503214858
+SHA256 (mono-gnome-sharp-2.24.4_GH0.tar.gz) = 4e72b9b452af9cf54250564b0b633e5a5925f50ddb3b39e97efd0abe69bc077e
+SIZE (mono-gnome-sharp-2.24.4_GH0.tar.gz) = 321244
diff --git a/x11-toolkits/gnome-sharp20/files/patch-configure b/x11-toolkits/gnome-sharp20/files/patch-configure
deleted file mode 100644
index 56122d10f831..000000000000
--- a/x11-toolkits/gnome-sharp20/files/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig	2008-09-08 11:29:02.000000000 -0400
-+++ configure	2008-11-01 12:21:49.000000000 -0300
-@@ -21789,7 +21789,7 @@
-    { (exit 1); exit 1; }; }
- fi
- 
--GTK_REQUIRED_VERSION=2.13.0
-+GTK_REQUIRED_VERSION=2.12.0
- GTK_SHARP_REQUIRED_VERSION=2.12.2
- 
- 
-@@ -22247,7 +22247,7 @@
- 
- 
- ## Versions of dependencies
--GNOME_REQUIRED_VERSION=2.23.0
-+GNOME_REQUIRED_VERSION=2.22.0
- GNOMEVFS_REQUIRED_VERSION=2.22.0
- ART_REQUIRED_VERSION=2.3.20
- 
diff --git a/x11-toolkits/gnome-sharp20/files/patch-configure.in.in b/x11-toolkits/gnome-sharp20/files/patch-configure.in.in
new file mode 100644
index 000000000000..6e3fb71c76d5
--- /dev/null
+++ b/x11-toolkits/gnome-sharp20/files/patch-configure.in.in
@@ -0,0 +1,11 @@
+--- configure.in.in.orig	2017-05-10 14:25:41 UTC
++++ configure.in.in
+@@ -27,7 +27,7 @@ esac
+ 
+ AM_CONDITIONAL(PLATFORM_WIN32, test x$platform_win32 = xyes)
+ 
+-AC_CHECK_TOOL(CC, gcc, gcc)
++AC_CHECK_TOOL(CC, cc)
+ AC_PROG_CC
+ AM_PROG_CC_STDC
+ AC_PROG_INSTALL
diff --git a/x11-toolkits/gnome-sharp20/files/patch-gnome_CanvasPathDef.custom b/x11-toolkits/gnome-sharp20/files/patch-gnome_CanvasPathDef.custom
deleted file mode 100644
index 7b6e28aa6ff0..000000000000
--- a/x11-toolkits/gnome-sharp20/files/patch-gnome_CanvasPathDef.custom
+++ /dev/null
@@ -1,13 +0,0 @@
---- gnome/CanvasPathDef.custom.orig	2016-11-22 06:40:36 UTC
-+++ gnome/CanvasPathDef.custom
-@@ -21,9 +21,7 @@
- 
- 		public static CanvasPathDef NewFromBpath (Art.Bpath bpath)
- 		{
--                        IntPtr native_bpath = GLib.Marshaller.StructureToPtrAlloc (bpath);
--                        CanvasPathDef result = new CanvasPathDef (gnome_canvas_path_def_new_from_bpath (native_bpath));
--			GLib.Marshaller.Free (native_bpath);
-+                        CanvasPathDef result = new CanvasPathDef (gnome_canvas_path_def_new_from_bpath (ref bpath));
- 			return result;
- 		}
- 
diff --git a/x11-toolkits/gnome-sharp20/files/patch-sample_gconf_Makefile.am b/x11-toolkits/gnome-sharp20/files/patch-sample_gconf_Makefile.am
new file mode 100644
index 000000000000..bebec9f58a82
--- /dev/null
+++ b/x11-toolkits/gnome-sharp20/files/patch-sample_gconf_Makefile.am
@@ -0,0 +1,11 @@
+--- sample/gconf/Makefile.am.orig	2017-08-20 08:02:28 UTC
++++ sample/gconf/Makefile.am
+@@ -22,7 +22,7 @@ sample.exe: $(SCHEMA) $(srcdir)/sample.g
+ 	$(CSC) /out:sample.exe $(FILES) $(REFERENCES) $(RESOURCES)
+ 
+ Settings.cs: $(SCHEMA)
+-	MONO_PATH=$(top_builddir)/gconf/GConf/gconf-sharp.dll:${MONO_PATH} $(RUNTIME) $(GCONFDIR)/tools/gconfsharp-schemagen.exe Sample $(SCHEMA) > Settings.cs
++	MONO_PATH=$(top_builddir)/gconf/GConf/:${MONO_PATH} $(RUNTIME) $(GCONFDIR)/tools/gconfsharp-schemagen.exe Sample $(SCHEMA) > Settings.cs
+ 
+ CLEANFILES = sample.exe Settings.cs
+ 
diff --git a/x11-toolkits/gtk-sharp20/Makefile b/x11-toolkits/gtk-sharp20/Makefile
index dd99c7e784bc..5a195127d0bd 100644
--- a/x11-toolkits/gtk-sharp20/Makefile
+++ b/x11-toolkits/gtk-sharp20/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gtk-sharp
-PORTVERSION=	2.12.43
+PORTVERSION=	2.12.45
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://download.mono-project.com/sources/gtk-sharp212/
 PKGNAMESUFFIX=	20
@@ -17,12 +17,13 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 RUN_DEPENDS=	p5-XML-LibXML>=0:textproc/p5-XML-LibXML
 
-GNU_CONFIGURE=	yes
+USES=		gmake libtool mono pathfix perl5 pkgconfig shebangfix
 USE_LDCONFIG=	yes
 USE_GNOME=	cairo gdkpixbuf2 gtk20 libglade2
-USES=		gettext-runtime gmake libtool mono pathfix perl5 pkgconfig shebangfix
-SHEBANG_FILES=	parser/*.pl
 USE_PERL5=	run
+SHEBANG_FILES=	parser/*.pl
+
+GNU_CONFIGURE=	yes
 MAKE_ENV=	INSTALL_STRIP_FLAG=${STRIP}
 
 post-patch:
diff --git a/x11-toolkits/gtk-sharp20/distinfo b/x11-toolkits/gtk-sharp20/distinfo
index ccf3232c33d5..d924e4825ab3 100644
--- a/x11-toolkits/gtk-sharp20/distinfo
+++ b/x11-toolkits/gtk-sharp20/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1492496937
-SHA256 (gtk-sharp-2.12.43.tar.gz) = 161e6b483d6a77ae70a17658f23ade24bcea8b35ca17766c18c7482caa94de86
-SIZE (gtk-sharp-2.12.43.tar.gz) = 2627310
+TIMESTAMP = 1502131059
+SHA256 (gtk-sharp-2.12.45.tar.gz) = 02680578e4535441064aac21d33315daa009d742cab8098ac8b2749d86fffb6a
+SIZE (gtk-sharp-2.12.45.tar.gz) = 2644209