USES=mono: simplify EXTRACT_ONLY, fix nuget-extract [1]

 - Instead of excluding the specific packages added to DISTFILES (but only for
   FreeBSD 9+), exclude all files with a '.nupkg' extension.
 - Move the nuget-extract command to be before post-extract, to allow the port's
   post-extract command to move packages around

audio/libgpod-sharp: add port for mono bindings for libgpod
 - audio/libgpod: [2]
   - USE_GNOME: add missing dependency
   - Remove mono files from pkg-plist (now in audio/libgpod-sharp)
   - Allow relevant variables to be overridden
   - Fix MONO options
   - Patch source to allow building with modern mono
   - Avoid post-install target for slave ports.

devel/monodevelop: update to 4.6.2.7
 - Update nuget package Fantomas to 2.4.0 (latest at time of monodevelop's
   release).
 - Downgrade nuget package FSharp.Compiler.CodeDom (per paket's specification)
 - LICENSE: Add license of LGPL21
 - LICENSE_FILE: Add license file from source
 - PORTSCOUT: Avoid checking alpha releases (aka x.y.0.z releases)

games/openra: simplify post-extract [3]
 - USES=mono:nuget allow overridding of NUGET_PACKAGEDIR
 - Set NUGET_PACKAGEDIR to correct location, fix patching accordingly

lang/fsharp: update to 4.6.2.7
 ChangeLog:
  - Fix #639: Problems with F# scripts on Mono
  - Fix FSharp.Compiler.Tools targets for .NET Core usage
  - Fix FSharp.Compiler.Tools package dependencies

lang/mono: update to 4.6.2.7
 Mono 4.6.2 is the 1st service release to the 4.6 series.
 Changes:
  - LICENSE: Add license of MIT
  - LICENSE_FILE: Add license file from source
  - PORTSCOUT: Avoid checking alpha releases (aka x.y.0.z releases)
 Bug fixes:
  - #44708 - "TrustFailure (The authentication or decryption has failed.) ...
            Invalid certificate received from server." with "Error code: 0x5"
            or "Error code: 0xffffffff800b010f" when attempting to access
            HTTPS servers on ports other than 443
  - #39832 - SIGSEGV when running roslyn

multimedia/banshee: bump port revision.
 - Update missing port dependencies
 - Convert to use option helpers
 - OPTIONS: Add APPLEDEV (missing dependency added)
 - LICENSE: Add MIT license
 - LICENSE_FILE: Add license file from source
 - PORTSCOUT: Skip alpha release (2.9.1)

x11-toolkits/gnome-sharp20: fix port dependencies
 - Add missing dependencies
 - Convert post-patch to shebangfix
 - LICENSE: add LGPL21 license
 - LICENSE_FILE: use license file from source
 - MKAE_JOBS_UNSAFE: remove, does appear to work

x11-toolkits/gtk-sharp20: update to 2.12.42.

PR:		214680 [2]
PR:		214681
Suggested by:	jbeich [1]
Submitted by:	jbeich [3]
Approved by:	avilla (maintainer; timeout) [2]

20 files changed, 232 insertions, 211 deletions

diff --git a/Mk/Uses/mono.mk b/Mk/Uses/mono.mk
index 9d15cc3..d8c335e 100644
--- a/Mk/Uses/mono.mk
+++ b/Mk/Uses/mono.mk
@@ -16,6 +16,9 @@
 #		packages in the format:
 #			${name}=${version}(:${PKGORIGIN})
 #
+#		EXTRACT_ONLY is conditionally overridden to exclude all
+#		files with a '.nupkg' extension.
+#
 # Targets:
 #
 # makenuget	This target will output the NUGET_DEPENDS based on the
@@ -51,31 +54,25 @@ GACUTIL_INSTALL=${GACUTIL} /i
 GACUTIL_INSTALL_PACKAGE=${GACUTIL} /i /package 1.0 /package 2.0
 
 .if ${mono_ARGS:Mnuget}
-NUGET_PACKAGEDIR=	${WRKSRC}/packages
+NUGET_PACKAGEDIR?=	${WRKSRC}/packages
 
 .  for depend in ${NUGET_DEPENDS}
 id=		${depend:C/=.*$//}
 version=	${depend:C/^.*=//}
 group=		nuget_${id:S/.//g:S/-//g}
 nupkg=		${id:tl}.${version}.nupkg
-NUPKG_${group}:=	${nupkg}
 DISTFILES_${group}:=	${nupkg}:${group}
 MASTER_SITES_${group}:=	https://www.nuget.org/api/v2/package/${id}/${version}?dummy=/:${group}
 NUGET_NUPKGS_${group}:=	${nupkg}:${depend}
 
-NUGET_DISTFILES+=${NUPKG_nuget_${depend:C/=.*$//:S/.//g:S/-//g}}
 DISTFILES+=	${DISTFILES_nuget_${depend:C/=.*$//:S/.//g:S/-//g}}
 MASTER_SITES+=	${MASTER_SITES_nuget_${depend:C/=.*$//:S/.//g:S/-//g}}
 NUGET_NUPKGS+=	${NUGET_NUPKGS_nuget_${depend:C/=.*$//:S/.//g:S/-//g}}
 .  endfor
 
-# Prevent the nuget packages from being extracted (and poluting ${WRKDIR}, however
-# only bmake supports this.
-.  if !defined(EXTRACT_ONLY) && defined(.PARSEDIR)
-EXTRACT_ONLY=	${_DISTFILES:[0]:C/${NUGET_DISTFILES}//g}
-.  endif
+EXTRACT_ONLY?=	${_DISTFILES:N*.nupkg}
 
-_USES_extract+=	900:nuget-extract
+_USES_extract+=	600:nuget-extract
 nuget-extract:
 .  for nupkg in ${NUGET_NUPKGS}
 	@${MKDIR} ${NUGET_PACKAGEDIR}/${nupkg:C/^.*://:S/=/./}
diff --git a/audio/Makefile b/audio/Makefile
index c89895e..730e9bb 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -378,6 +378,7 @@
     SUBDIR += libgig
     SUBDIR += libgme
     SUBDIR += libgpod
+    SUBDIR += libgpod-sharp
     SUBDIR += libgroove
     SUBDIR += libid3tag
     SUBDIR += libkcddb
diff --git a/audio/libgpod-sharp/Makefile b/audio/libgpod-sharp/Makefile
new file mode 100644
index 0000000..45828fc
--- /dev/null
+++ b/audio/libgpod-sharp/Makefile
@@ -0,0 +1,22 @@
+# Created by: David Naylor <dbn@FreeBSD.org>
+# $FreeBSD$
+
+PKGNAMESUFFIX=	-sharp
+
+MAINTAINER=	mono@FreeBSD.org
+COMMENT=	.Net bindings for the libgpod library
+
+RUN_DEPENDS=	${LOCALBASE}/lib/libgpod.so:audio/libgpod
+
+OPTIONS_EXCLUDE=DOCS IMOBILE PYTHON
+OPTIONS_SLAVE=	MONO
+
+BUILD_WRKSRC=	${WRKSRC}/bindings/mono
+INSTALL_WRKSRC=	${WRKSRC}/bindings/mono
+
+SLAVE_PORT=	yes
+MASTERDIR=	${.CURDIR}/../libgpod
+
+PLIST=		${.CURDIR}/pkg-plist
+
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/libgpod-sharp/pkg-plist b/audio/libgpod-sharp/pkg-plist
new file mode 100644
index 0000000..9afc3db
--- /dev/null
+++ b/audio/libgpod-sharp/pkg-plist
@@ -0,0 +1,6 @@
+lib/libgpod/libgpod-sharp-test.exe
+lib/libgpod/libgpod-sharp-test.exe.mdb
+lib/libgpod/libgpod-sharp.dll
+lib/libgpod/libgpod-sharp.dll.config
+lib/libgpod/libgpod-sharp.dll.mdb
+libdata/pkgconfig/libgpod-sharp.pc
diff --git a/audio/libgpod/Makefile b/audio/libgpod/Makefile
index 7581078..d6d4417 100644
--- a/audio/libgpod/Makefile
+++ b/audio/libgpod/Makefile
@@ -7,8 +7,8 @@ PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	SF/gtkpod/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
 
-MAINTAINER=	avilla@FreeBSD.org
-COMMENT=	Library for direct access to iPod contents
+MAINTAINER?=	avilla@FreeBSD.org
+COMMENT?=	Library for direct access to iPod contents
 
 LICENSE=	LGPL20
 
@@ -21,12 +21,13 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-udev --without-hal \
 		--with-html-dir="${DOCSDIR:H}"
 USE_CSTD=	gnu89
-USE_GNOME=	gdkpixbuf2 gtk20 intltool
+USE_GNOME=	gdkpixbuf2 gtk20 intltool libxml2
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	DOCS IMOBILE PYTHON # MONO
+OPTIONS_DEFINE=	DOCS IMOBILE PYTHON MONO
 OPTIONS_DEFAULT=IMOBILE
+OPTIONS_EXCLUDE?=	MONO
 OPTIONS_SUB=	yes
 
 IMOBILE_DESC=	Apple iPhone/iPod Touch support
@@ -35,11 +36,8 @@ IMOBILE_LIB_DEPENDS=	libimobiledevice.so:comms/libimobiledevice
 IMOBILE_CONFIGURE_ENV=	LIBUSB_CFLAGS=" " LIBUSB_LIBS="-lusb"
 IMOBILE_CONFIGURE_WITH=	libimobiledevice
 
-# Mono 4+ doesn't seem to be supported.
 MONO_USE=		GNOME=gtksharp20
 MONO_CONFIGURE_WITH=	mono
-CONFIGURE_ARGS+=	--without-mono
-PLIST_SUB+=		MONO="@comment "
 
 PYTHON_BUILD_DEPENDS=	swig2.0:devel/swig20 \
 			${PYTHON_SITELIBDIR}/mutagen/__init__.py:audio/py-mutagen
@@ -57,9 +55,14 @@ PORTDOCS=	ChangeLog NEWS README*
 COMMENT:=	${COMMENT:S,iPod,&/iPhone,}
 .endif
 
+post-patch-MONO-on:
+	${REINPLACE_CMD} 's/gmcs/mcs/g' ${WRKSRC}/configure ${WRKSRC}/m4/mono.m4
+
+.if ${SLAVE_PORT} == no
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tools/ipod-time-sync \
 		${STAGEDIR}${PREFIX}/bin
+.endif
 
 post-install-MONO-off:
 	@${RM} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/libgpod-sharp.pc
diff --git a/audio/libgpod/pkg-plist b/audio/libgpod/pkg-plist
index bbc2065..a233fca 100644
--- a/audio/libgpod/pkg-plist
+++ b/audio/libgpod/pkg-plist
@@ -5,11 +5,6 @@ lib/libgpod.a
 lib/libgpod.so
 lib/libgpod.so.4
 lib/libgpod.so.4.3.2
-%%MONO%%lib/libgpod/libgpod-sharp-test.exe
-%%MONO%%lib/libgpod/libgpod-sharp-test.exe.mdb
-%%MONO%%lib/libgpod/libgpod-sharp.dll
-%%MONO%%lib/libgpod/libgpod-sharp.dll.config
-%%MONO%%lib/libgpod/libgpod-sharp.dll.mdb
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gpod/__init__.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gpod/__init__.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gpod/__init__.pyo
@@ -24,7 +19,6 @@ lib/libgpod.so.4.3.2
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gpod/ipod.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gpod/ipod.pyo
 libdata/pkgconfig/libgpod-1.0.pc
-%%MONO%%libdata/pkgconfig/libgpod-sharp.pc
 %%PORTDOCS%%%%DOCSDIR%%/ch01.html
 %%PORTDOCS%%%%DOCSDIR%%/home.png
 %%PORTDOCS%%%%DOCSDIR%%/index.html
diff --git a/devel/monodevelop/Makefile b/devel/monodevelop/Makefile
index de586de..aaf2b4a 100644
--- a/devel/monodevelop/Makefile
+++ b/devel/monodevelop/Makefile
@@ -2,12 +2,15 @@
 # $FreeBSD$
 
 PORTNAME=	monodevelop
-PORTVERSION=	6.1.1.15
+PORTVERSION=	6.1.2.44
 CATEGORIES=	devel
 
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	IDE for the .NET platform
 
+LICENSE=	LGPL21
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 BUILD_DEPENDS=	mautil:devel/mono-addins \
 		fsharpc:lang/fsharp \
 		cmake:devel/cmake \
@@ -22,10 +25,10 @@ RUN_DEPENDS=	${LOCALBASE}/lib/libgdiplus.a:x11-toolkits/libgdiplus \
 		fsharpc:lang/fsharp
 
 NUGET_DEPENDS=  ExtCore=0.8.45 \
-		FSharp.Compiler.CodeDom=1.0.0.1 \
+		FSharp.Compiler.CodeDom=0.9.2 \
 		FSharp.Compiler.Service=3.0.0 \
 		FSharp.Core=4.0.0.1 \
-		Fantomas=2.3.0 \
+		Fantomas=2.4.0 \
 		Microsoft.AspNet.Mvc=5.2.3 \
 		Microsoft.AspNet.Razor=3.2.3 \
 		Microsoft.AspNet.WebPages=3.2.3 \
@@ -61,6 +64,7 @@ INSTALLS_ICONS=	yes
 INSTALL_TARGET=	install-strip
 MAKE_JOBS_UNSAFE=	Build parallelization not implemented
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTNAME}-${PORTVERSION}/main
+PORTSCOUT=	^\d+\.\d+.[1-9]\d*
 
 post-extract:
 .for tuple in ${GH_TUPLE}
diff --git a/devel/monodevelop/distinfo b/devel/monodevelop/distinfo
index 7b43f0a..c8bc231 100644
--- a/devel/monodevelop/distinfo
+++ b/devel/monodevelop/distinfo
@@ -1,20 +1,14 @@
-TIMESTAMP = 1477376869
-SHA256 (difflib.1.0.0.55.nupkg) = ab37eec5da9d7c9433c8c9df71e7ed7af555991e6d8e8c125864032659677640
-SIZE (difflib.1.0.0.55.nupkg) = 21252
+TIMESTAMP = 1479565189
 SHA256 (extcore.0.8.45.nupkg) = aadcbc638765cfe4a4d1c569b721cb9a01403872cbc5071a811e04af95cea7d0
 SIZE (extcore.0.8.45.nupkg) = 2579195
-SHA256 (fake.4.40.0.nupkg) = d70586b45742d3d37c0cba623bba961219a12617f8fe1e7338fa2e84e9c15e37
-SIZE (fake.4.40.0.nupkg) = 13483083
-SHA256 (fsharp.compiler.codedom.1.0.0.1.nupkg) = 3504512fae64d4e5691dbc790323e1c4c7ca695c8619824b7b8108866c97a11c
-SIZE (fsharp.compiler.codedom.1.0.0.1.nupkg) = 390934
+SHA256 (fsharp.compiler.codedom.0.9.2.nupkg) = 92b9a538956775efd989517a608a366b2b926beae6be752a394f7457f77ac933
+SIZE (fsharp.compiler.codedom.0.9.2.nupkg) = 385599
 SHA256 (fsharp.compiler.service.3.0.0.nupkg) = 995cf0b50a44ea84815d6a8a8f71f6c9c62bbba2c7cc447def892a475228c704
 SIZE (fsharp.compiler.service.3.0.0.nupkg) = 13541030
 SHA256 (fsharp.core.4.0.0.1.nupkg) = f67929917b5d91f03019718ea5eec5aefcd38b7f15feb677c981a2df3a93d006
 SIZE (fsharp.core.4.0.0.1.nupkg) = 5323731
-SHA256 (fantomas.2.3.0.nupkg) = bfd85001b87732e050930188f60c8ab4c90a13ea63dda912b12083e17b2a4fc2
-SIZE (fantomas.2.3.0.nupkg) = 407404
-SHA256 (icsharpcode.nrefactory.5.5.1.nupkg) = e4fe11e131b4ad13c538e2c79f8b39f0cdf6ba6a7f7b2068b12483c36114a499
-SIZE (icsharpcode.nrefactory.5.5.1.nupkg) = 1158614
+SHA256 (fantomas.2.4.0.nupkg) = 4c713eff787bdd43664d2807509362ab95f47b2dbc4ff0a76b3c0620475fe643
+SIZE (fantomas.2.4.0.nupkg) = 408685
 SHA256 (microsoft.aspnet.mvc.5.2.3.nupkg) = 035070b77bfc23970889d0a2cd56a722148b5c5cd04b4b72a920f0b76dfb1c14
 SIZE (microsoft.aspnet.mvc.5.2.3.nupkg) = 298971
 SHA256 (microsoft.aspnet.razor.3.2.3.nupkg) = a2810025de2b4c810711d856cbb7b0510e8ec07122c65372fe9d5e5a60d6c74d
@@ -23,8 +17,6 @@ SHA256 (microsoft.aspnet.webpages.3.2.3.nupkg) = 74e8f23684704f7ce314f11fb3c48b5
 SIZE (microsoft.aspnet.webpages.3.2.3.nupkg) = 228931
 SHA256 (microsoft.web.infrastructure.1.0.0.0.nupkg) = d6a9d4e32222036aa0633f07aeccfa9d38ec22bef311442568499c12734bb4d7
 SIZE (microsoft.web.infrastructure.1.0.0.0.nupkg) = 24921
-SHA256 (mono.cecil.0.9.5.4.nupkg) = f99474ff7ce8690c0e6a7f38a9fed500b15b2fd44e2f54664c652d7f6859cfc1
-SIZE (mono.cecil.0.9.5.4.nupkg) = 671650
 SHA256 (nunit.2.6.4.nupkg) = be8cde6e9754474d5d4f553addb6331cf442c2182a0eb4dc87618d744fd59ca9
 SIZE (nunit.2.6.4.nupkg) = 99004
 SHA256 (nunit.engine.3.0.1.nupkg) = 8145ca61380ef4ab233c4eff64ab33ba0e703954065082a772391f035a288aa6
@@ -33,16 +25,8 @@ SHA256 (nunit.runners.2.6.4.nupkg) = 44877aeb399ffb14b30ecca1c073813aab71dcf9a92
 SIZE (nunit.runners.2.6.4.nupkg) = 573341
 SHA256 (newtonsoft.json.6.0.8.nupkg) = 88b57d994035a83080c7f049e93f7aba2554fe14b686b678c2eb1a8be23e6851
 SIZE (newtonsoft.json.6.0.8.nupkg) = 1562062
-SHA256 (nuget.commandline.2.8.2.nupkg) = 85ad1f17805e6dbbeb8e1bef50f70a267d9949b63cfbcaec1d861bd9ca5b04fc
-SIZE (nuget.commandline.2.8.2.nupkg) = 477665
-SHA256 (sharpsvn.1.8-x86.1.8013.3694.107.nupkg) = 7422c6202536aa7d1a46ff39c918be872227087c88709ffca6bfdf1067b50b6e
-SIZE (sharpsvn.1.8-x86.1.8013.3694.107.nupkg) = 5917871
-SHA256 (wptoolkit.4.2013.08.16.nupkg) = b1a42a1feb81b38d34277a4b461752008a2db9dd1a9f0d7f5e07fbb5fc379c02
-SIZE (wptoolkit.4.2013.08.16.nupkg) = 1003997
-SHA256 (xamarin.forms.2.2.0.31.nupkg) = 03bd9652a7f463d70af246cd29b743b7ef043b33ca6b5bcce28407ab2168a03c
-SIZE (xamarin.forms.2.2.0.31.nupkg) = 7651953
-SHA256 (mono-monodevelop-6.1.1.15-monodevelop-6.1.1.15_GH0.tar.gz) = 46005e93bddacacf8e458be1d5166be766653460c9163f9c1570cbad92596e16
-SIZE (mono-monodevelop-6.1.1.15-monodevelop-6.1.1.15_GH0.tar.gz) = 16475066
+SHA256 (mono-monodevelop-6.1.2.44-monodevelop-6.1.2.44_GH0.tar.gz) = 06b7b21aea806be39e876635b88a2c9ced8962ead464852724134ca67214d5a5
+SIZE (mono-monodevelop-6.1.2.44-monodevelop-6.1.2.44_GH0.tar.gz) = 16476228
 SHA256 (icsharpcode-RefactoringEssentials-cbd2d9e_GH0.tar.gz) = a51ac4e62200a51329279347e31f3233ebc8e3afa8d8bb92af33cc870b1b2074
 SIZE (icsharpcode-RefactoringEssentials-cbd2d9e_GH0.tar.gz) = 3154094
 SHA256 (mono-cecil-cd2ff63_GH0.tar.gz) = 417709d1547b1995c8a3fb787b288b78f9bf5c3605baef2f829f35ee869a9642
@@ -59,23 +43,13 @@ SHA256 (mono-libgit2-e8b8948_GH0.tar.gz) = fb69b896a3cfb0f438633d8d6f994a762a4df
 SIZE (mono-libgit2-e8b8948_GH0.tar.gz) = 3730903
 SHA256 (mono-libgit2sharp-06bbc96_GH0.tar.gz) = bcb7f660cb03b289cd4a4834e8284aa40b317161ca05c763698e4617d7795e40
 SIZE (mono-libgit2sharp-06bbc96_GH0.tar.gz) = 1859887
-SHA256 (xamarin-macdoc-eacb7e0_GH0.tar.gz) = 2f9ccc10a0aff58579b15d877c7e8be3a3bd08ac3e714d9acd0e2bb15e946090
-SIZE (xamarin-macdoc-eacb7e0_GH0.tar.gz) = 1503050
-SHA256 (mono-mdtestharness-424f53e_GH0.tar.gz) = f01a2b50b9ee8d41afb5a1982aa43e1e1c4e7ec0cf3f59b44bba465913fcd7e1
-SIZE (mono-mdtestharness-424f53e_GH0.tar.gz) = 1296068
 SHA256 (mono-mono-addins-76cab2d_GH0.tar.gz) = e93fe82f070d8cb41482de582a7932f452afb86810adae95f7fe730200fe12d6
 SIZE (mono-mono-addins-76cab2d_GH0.tar.gz) = 672208
-SHA256 (mono-mono-tools-d858f5f_GH0.tar.gz) = feddc199b6f9d34c0df2dc1a8164a267fce959146405e96ca8e86c3b9a5c58d2
-SIZE (mono-mono-tools-d858f5f_GH0.tar.gz) = 3475537
-SHA256 (mono-monomac-1d87842_GH0.tar.gz) = 2fae559d278ae85275b8f16feddf6107c98b1d0eaad62e35c1880cd36c0ad411
-SIZE (mono-monomac-1d87842_GH0.tar.gz) = 8369789
 SHA256 (icsharpcode-NRefactory-a2b55de_GH0.tar.gz) = c26a987add8e1ac8ceb890ed17c9358ba98d77edb61a77a7aacb92a88d84c8c1
 SIZE (icsharpcode-NRefactory-a2b55de_GH0.tar.gz) = 2010815
 SHA256 (mono-nuget-binary-0811ba8_GH0.tar.gz) = 62490596bbac9d63aa15886723803e462a899de1f6d9ede88c8a5e67a2859ba1
 SIZE (mono-nuget-binary-0811ba8_GH0.tar.gz) = 2354198
 SHA256 (mono-roslyn-16e117c_GH0.tar.gz) = a3805b2b246042be912831a62902cfa7d6fe43f953b14be2d8c8c334e467cc97
 SIZE (mono-roslyn-16e117c_GH0.tar.gz) = 17539222
-SHA256 (mono-sharpsvn-binary-6e60e61_GH0.tar.gz) = ed1a69a44e6a5d6b6041a1acdc79364a335a15033f6198fcd4d797a08d088020
-SIZE (mono-sharpsvn-binary-6e60e61_GH0.tar.gz) = 1053755
 SHA256 (mono-xwt-9ee2853_GH0.tar.gz) = c145ec98830c695c5580121ecf1a5091d4fa78cdbce59bef6bac0e95fe2fb3c5
 SIZE (mono-xwt-9ee2853_GH0.tar.gz) = 1032719
diff --git a/games/openra/Makefile b/games/openra/Makefile
index 229afe9..d8fce07 100644
--- a/games/openra/Makefile
+++ b/games/openra/Makefile
@@ -44,10 +44,11 @@ NO_ARCH=	yes
 USES=		desktop-file-utils gmake lua:51,run mono:nuget openal:soft \
 		shared-mime-info shebangfix
 USE_SDL=	sdl2
-TARGET_ORDER_OVERRIDE=	520:nuget-extract
+NUGET_PACKAGEDIR=${WRKSRC}/thirdparty/download
 SHEBANG_FILES=	launch-dedicated.sh
 MAKE_ENV=	prefix="${PREFIX}" mandir="${PREFIX}/man"
 MAKE_ARGS=	VERSION="${GH_TAGNAME}"
+ALL_TARGET=	all
 INSTALL_TARGET=	install-all install-man-page \
 		install-linux-mime install-linux-shortcuts
 DATADIR=	${PREFIX}/lib/${PORTNAME}
@@ -68,25 +69,18 @@ ZENITY_RUN_DEPENDS=xdg-open:devel/xdg-utils \
 ZENITY_DESC=	Use native crash dialog
 
 post-extract:
-	@${MKDIR} ${WRKSRC}/thirdparty/download
-	@${CP} -v ${DISTFILES:C/:.*//:N*.nupkg:N*.tar*:N*.zip:S,^,${_DISTDIR}/,} \
-		${WRKSRC}/thirdparty/download
-	@for f in $$(${SED} -n 's/\.$$//; s,cp \./,,p' \
-			${WRKSRC}/thirdparty/fetch-thirdparty-deps.sh); do \
-		${MV} -v ${NUGET_PACKAGEDIR}/$$f ${WRKSRC}/thirdparty/download; \
-	done
+	${CP} ${DISTFILES:C/:.*//:N*.nupkg:N*.tar*:S,^,${_DISTDIR}/,} \
+		${NUGET_PACKAGEDIR}
 
 post-patch:
 	${REINPLACE_CMD} \
-		-e '\,thirdparty/.*\.sh,d' \
 		-e '/echo/!s/	@/	/' \
 		-e '/^mods:/s/$$/ version/' \
-		-e '/^docs:/s/$$/ all/' \
-		-e '/^test:/s/$$/ all/' \
 		${WRKSRC}/Makefile
-	${REINPLACE_CMD} -e '/linux/{ p; s//${OPSYS:tl}/; }' \
-		${WRKSRC}/thirdparty/download/*.config \
-		${WRKSRC}/thirdparty/*.config*
+	${REINPLACE_CMD} -e '/[[:<:]]get[[:blank:]]/d' \
+			${WRKSRC}/thirdparty/fetch-thirdparty-deps.sh
+	${FIND} ${WRKSRC}/thirdparty -name '*.config*' -exec ${REINPLACE_CMD} \
+		-i '.bak.os' -e '/linux/{ p; s//${OPSYS:tl}/; }' {} +
 	${SED} 's/@LIBLUA51@/liblua-${LUA_VER}.so/' \
 		${WRKSRC}/thirdparty/Eluant.dll.config.in \
 		>${WRKSRC}/Eluant.dll.config
diff --git a/lang/fsharp/Makefile b/lang/fsharp/Makefile
index df5ec82..59586e4 100644
--- a/lang/fsharp/Makefile
+++ b/lang/fsharp/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	fsharp
-PORTVERSION=	4.0.1.15
+PORTVERSION=	4.0.1.20
 CATEGORIES=	lang
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
diff --git a/lang/fsharp/distinfo b/lang/fsharp/distinfo
index f1e79cc..c4b37e8 100644
--- a/lang/fsharp/distinfo
+++ b/lang/fsharp/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1477322407
+TIMESTAMP = 1479572291
 SHA256 (fsharp.compiler.tools.4.0.1.3.nupkg) = 98a8792f59f4c9aa7ea02ab96644b71cf5dfe06d51fde0db1b0fe8373bee1ee4
 SIZE (fsharp.compiler.tools.4.0.1.3.nupkg) = 6323760
 SHA256 (fsharp.data.2.2.5.nupkg) = 449cba49c2567b0b1f27d39c0aaaab73607893072809a81563598b06e63234b1
@@ -15,5 +15,5 @@ SHA256 (system.collections.immutable.1.2.0.nupkg) = 7c9eec8208414eebce34f3af5c94
 SIZE (system.collections.immutable.1.2.0.nupkg) = 300738
 SHA256 (system.reflection.metadata.1.4.1-beta-24227-04.nupkg) = 0f077b4184d04f7db02e41169b9471e7c630c7dc873398f12eaf70b7a00a7993
 SIZE (system.reflection.metadata.1.4.1-beta-24227-04.nupkg) = 435719
-SHA256 (fsharp-fsharp-4.0.1.15_GH0.tar.gz) = 59dd17ca62d1a91f124b3cce8522bd01855ee15abf5ad38ad5d7b6b607a01f45
-SIZE (fsharp-fsharp-4.0.1.15_GH0.tar.gz) = 37324140
+SHA256 (fsharp-fsharp-4.0.1.20_GH0.tar.gz) = 380fe581d1ad99e32c8dc5974c764d90681f31dcbb1c67eb43870f524a9d0209
+SIZE (fsharp-fsharp-4.0.1.20_GH0.tar.gz) = 37326450
diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index d75ab61..0aac950 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -2,14 +2,16 @@
 # $FreeBSD$
 
 PORTNAME=	mono
-PORTVERSION=	4.6.1.5
-PORTREVISION=	2
+PORTVERSION=	4.6.2.7
 CATEGORIES=	lang
 MASTER_SITES=	http://download.mono-project.com/sources/${PORTNAME}/
 
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	Open source implementation of .NET Development Framework
 
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser \
 		bash:shells/bash
 LIB_DEPENDS=	libinotify.so:devel/libinotify
@@ -22,7 +24,6 @@ USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/mono-${PORTVERSION:R}
 
 CONFIGURE_ARGS=	--disable-dtrace
-
 CONFIGURE_ENV=	ac_cv_header_sys_inotify_h=no
 
 # Set location for .wapi creation.
@@ -36,6 +37,7 @@ MAKE_ENV=	MONO_SHARED_DIR="${MONO_SHARED_DIR}" \
 		LC_ALL=C TZ=UTC
 
 ONLY_FOR_ARCHS=	i386 amd64 powerpc
+PORTSCOUT=	^\d+\.\d+.[1-9]\d*
 
 .include <bsd.port.pre.mk>
 
diff --git a/lang/mono/distinfo b/lang/mono/distinfo
index d4620e2..3af1be0 100644
--- a/lang/mono/distinfo
+++ b/lang/mono/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476285918
-SHA256 (mono-4.6.1.5.tar.bz2) = 3871ee72bdfc2ea5d636ffff22cf49ae6bac7c4a4f3d687214dd8ac236bbf7c3
-SIZE (mono-4.6.1.5.tar.bz2) = 83174665
+TIMESTAMP = 1479537297
+SHA256 (mono-4.6.2.7.tar.bz2) = b69ead7db7590277630685f3fcad84a5ac2f83e40563f0dc8cf139b10cbe6b31
+SIZE (mono-4.6.2.7.tar.bz2) = 83271441
diff --git a/multimedia/banshee/Makefile b/multimedia/banshee/Makefile
index f302edc..a638cba 100644
--- a/multimedia/banshee/Makefile
+++ b/multimedia/banshee/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	banshee
 PORTVERSION=	2.6.2
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	GNOME
@@ -10,9 +10,19 @@ MASTER_SITES=	GNOME
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	Music management and playback for gnome
 
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 # Could do without bash, but it's brought in by gnome anyway.
 BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser \
 		bash:shells/bash
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libgstbase-0.10.so:multimedia/gstreamer \
+		libgstfft-0.10.so:multimedia/gstreamer-plugins \
+		libwebkitgtk-1.0.so:www/webkit-gtk2 \
+		libsoup-gnome-2.4.so:devel/libsoup-gnome \
+		libsoup-2.4.so:devel/libsoup
 RUN_DEPENDS=	bash:shells/bash
 
 LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-sharp-glib-1.0.pc:devel/dbus-sharp-glib \
@@ -21,8 +31,9 @@ LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-sharp-glib-1.0.pc:devel/dbus
 		${LOCALBASE}/libdata/pkgconfig/mono-addins.pc:devel/mono-addins \
 		${LOCALBASE}/libdata/pkgconfig/notify-sharp.pc:devel/notify-sharp
 
-# For now, remove APPLEDEV since it is broken
-OPTIONS_DEFINE=	DOCS BPMDETECT GIO MTP WEBKIT YOUTUBE
+OPTIONS_DEFINE=	APPLEDEV DOCS BPMDETECT GIO MTP WEBKIT YOUTUBE
+OPTIONS_DEFAULT=APPLEDEV BPMDETECT GIO MTP WEBKIT YOUTUBE
+OPTIONS_SUB=	yes
 
 APPLEDEV_DESC=	Apple device
 BPMDETECT_DESC=	Force dependency on soundtouch (required for BPM detection)
@@ -30,16 +41,14 @@ GIO_DESC=	Use GIO for disk access
 WEBKIT_DESC=	Build and/or install extensions using Webkit
 YOUTUBE_DESC=	Build and/or install the Youtube extension
 
-OPTIONS_DEFAULT=BPMDETECT GIO MTP WEBKIT YOUTUBE
-
-USES=		desktop-file-utils gmake libtool mono pathfix perl5 \
+USES=		desktop-file-utils gmake gettext-runtime libtool mono pathfix perl5 \
 		pkgconfig shared-mime-info sqlite tar:xz
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnomedocutils gnomesharp20 gtksharp20 intltool
+USE_GNOME=	cairo gnomedocutils gnomesharp20 gtksharp20 intltool
 USE_GSTREAMER=	cdparanoia
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME:C/-.*//}
-USE_XORG=	xrandr xxf86vm
+USE_XORG=	x11 xrandr xxf86vm
 INSTALLS_ICONS=	yes
 INSTALL_TARGET=	install-strip
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
@@ -47,77 +56,27 @@ CONFIGURE_ARGS=	--with-vendor-build-id=FreeBSD\ BSD\#\ Project --disable-gio-har
 CONFIGURE_ENV=	ac_cv_path_MCS=${LOCALBASE}/bin/mcs
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+PORTSCOUT=	skipv=2.9.1
 
 # Need absolute path for build/icon-install-theme.
 INSTALL=	/usr/bin/install
 
-.if ${PORT_OPTIONS:MGIO}
-CONFIGURE_ARGS+=--enable-gio
-LIB_PC_DEPENDS+=${LOCALBASE}/libdata/pkgconfig/gtk-sharp-beans-2.0.pc:x11-toolkits/gtk-sharp-beans
-PLIST_SUB+=	OPT_GIO=""
-.else
-CONFIGURE_ARGS+=--disable-gio
-PLIST_SUB+=	OPT_GIO="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MDOCS}
-CONFIGURE_ARGS+=--enable-docs
-PLIST_SUB+=	OPT_DOCS=""
-.else
-CONFIGURE_ARGS+=--disable-docs
-PLIST_SUB+=	OPT_DOCS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MBPMDETECT}
-USE_GSTREAMER+=	soundtouch
-.endif
-
-.if ${PORT_OPTIONS:MAPPLEDEV}
-CONFIGURE_ARGS+=--enable-appledevice
-LIB_PC_DEPENDS+=${LOCALBASE}/libdata/pkgconfig/libgpodsharp.pc:audio/libgpod
-BROKEN=		Missing dependency
-PLIST_SUB+=	APPLEDEV=""
-.else
-CONFIGURE_ARGS+=--disable-appledevice
-PLIST_SUB+=	APPLEDEV="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MMTP}
-CONFIGURE_ARGS+=--enable-mtp
-LIB_PC_DEPENDS+=${LOCALBASE}/libdata/pkgconfig/libmtp.pc:multimedia/libmtp
-PLIST_SUB+=	OPT_MTP=""
-.else
-CONFIGURE_ARGS+=--disable-mtp
-PLIST_SUB+=	OPT_MTP="@comment "
-.endif
+APPLEDEV_CONFIGURE_ENABLE=	appledevice
+APPLEDEV_VARS=		LIB_PC_DEPENDS+=${LOCALBASE}/libdata/pkgconfig/libgpod-sharp.pc:audio/libgpod-sharp
+BPMDETECT_USE=		gstreamer=soundtouch
+DOCS_CONFIGURE_ENABLE=	docs
+GIO_CONFIGURE_ENABLE=	gio
+GIO_VARS=		LIB_PC_DEPENDS+=${LOCALBASE}/libdata/pkgconfig/gtk-sharp-beans-2.0.pc:x11-toolkits/gtk-sharp-beans
+MTP_CONFIGURE_ENABLE=	mtp
+MTP_VARS=		LIB_PC_DEPENDS+=${LOCALBASE}/libdata/pkgconfig/libmtp.pc:multimedia/libmtp
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext
+WEBKIT_CONFIGURE_ENABLE=webkit
+WEBKIT_VARS=		LIB_PC_DEPENDS+=${LOCALBASE}/libdata/pkgconfig/webkit-sharp-1.0.pc:www/webkit-sharp
+YOUTUBE_CONFIGURE_ENABLE=	youtube
+YOUTUBE_VARS=		LIB_PC_DEPENDS+=${LOCALBASE}/libdata/pkgconfig/gdata-sharp-youtube.pc:devel/google-gdata
 
-.if ${PORT_OPTIONS:MWEBKIT}
-CONFIGURE_ARGS+=--enable-webkit
-LIB_PC_DEPENDS+=${LOCALBASE}/libdata/pkgconfig/webkit-sharp-1.0.pc:www/webkit-sharp
-PLIST_SUB+=	OPT_WEBKIT=""
-.else
-CONFIGURE_ARGS+=--disable-webkit
-PLIST_SUB+=	OPT_WEBKIT="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MYOUTUBE}
-CONFIGURE_ARGS+=--enable-youtube
-LIB_PC_DEPENDS+=${LOCALBASE}/libdata/pkgconfig/gdata-sharp-youtube.pc:devel/google-gdata
-PLIST_SUB+=	OPT_YOUTUBE=""
-.else
-CONFIGURE_ARGS+=--disable-youtube
-PLIST_SUB+=	OPT_YOUTUBE="@comment "
-.endif
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MWEBKIT} || ${PORT_OPTIONS:MYOUTUBE}
 PLIST_SUB+=	OPT_WEBKITORYOUTUBE=""
diff --git a/multimedia/banshee/distinfo b/multimedia/banshee/distinfo
index 4ffe709..b6a86b8 100644
--- a/multimedia/banshee/distinfo
+++ b/multimedia/banshee/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1479575483
 SHA256 (banshee-2.6.2.tar.xz) = f77c089b05e3dc956236d13ff02945fe560f56e402df57621a9196de39ba60f8
 SIZE (banshee-2.6.2.tar.xz) = 3372372
diff --git a/multimedia/banshee/pkg-plist b/multimedia/banshee/pkg-plist
index bd7de7a..e33f68f 100644
--- a/multimedia/banshee/pkg-plist
+++ b/multimedia/banshee/pkg-plist
@@ -4,8 +4,8 @@ bin/muinshee
 lib/banshee/Backends/Banshee.GStreamer.dll
 lib/banshee/Backends/Banshee.GStreamer.dll.config
 lib/banshee/Backends/Banshee.GStreamer.dll.mdb
-%%OPT_GIO%%lib/banshee/Backends/Banshee.Gio.dll
-%%OPT_GIO%%lib/banshee/Backends/Banshee.Gio.dll.mdb
+%%GIO%%lib/banshee/Backends/Banshee.Gio.dll
+%%GIO%%lib/banshee/Backends/Banshee.Gio.dll.mdb
 lib/banshee/Backends/Banshee.Gnome.dll
 lib/banshee/Backends/Banshee.Gnome.dll.mdb
 lib/banshee/Backends/Banshee.NowPlaying.X11.dll
@@ -13,12 +13,12 @@ lib/banshee/Backends/Banshee.NowPlaying.X11.dll.mdb
 lib/banshee/Backends/Banshee.Unix.dll
 lib/banshee/Backends/Banshee.Unix.dll.config
 lib/banshee/Backends/Banshee.Unix.dll.mdb
-%%OPT_GIO%%lib/banshee/Backends/gio-sharp.dll
-%%OPT_GIO%%lib/banshee/Backends/gio-sharp.dll.config
-%%OPT_GIO%%lib/banshee/Backends/gio-sharp.dll.mdb
-%%OPT_GIO%%lib/banshee/Backends/gtk-sharp-beans.dll
-%%OPT_GIO%%lib/banshee/Backends/gtk-sharp-beans.dll.config
-%%OPT_GIO%%lib/banshee/Backends/gtk-sharp-beans.dll.mdb
+%%GIO%%lib/banshee/Backends/gio-sharp.dll
+%%GIO%%lib/banshee/Backends/gio-sharp.dll.config
+%%GIO%%lib/banshee/Backends/gio-sharp.dll.mdb
+%%GIO%%lib/banshee/Backends/gtk-sharp-beans.dll
+%%GIO%%lib/banshee/Backends/gtk-sharp-beans.dll.config
+%%GIO%%lib/banshee/Backends/gtk-sharp-beans.dll.mdb
 lib/banshee/Backends/libbnpx11.a
 lib/banshee/Backends/libbnpx11.so
 lib/banshee/Banshee.CollectionIndexer.dll
@@ -33,8 +33,8 @@ lib/banshee/Banshee.Services.dll.mdb
 lib/banshee/Banshee.ThickClient.dll
 lib/banshee/Banshee.ThickClient.dll.config
 lib/banshee/Banshee.ThickClient.dll.mdb
-%%OPT_WEBKIT%%lib/banshee/Banshee.WebBrowser.dll
-%%OPT_WEBKIT%%lib/banshee/Banshee.WebBrowser.dll.mdb
+%%WEBKIT%%lib/banshee/Banshee.WebBrowser.dll
+%%WEBKIT%%lib/banshee/Banshee.WebBrowser.dll.mdb
 lib/banshee/Banshee.Widgets.dll
 lib/banshee/Banshee.Widgets.dll.config
 lib/banshee/Banshee.Widgets.dll.mdb
@@ -43,8 +43,8 @@ lib/banshee/Banshee.exe.config
 lib/banshee/Banshee.exe.mdb
 lib/banshee/Beroe.exe
 lib/banshee/Beroe.exe.mdb
-%%OPT_WEBKIT%%lib/banshee/Extensions/Banshee.AmazonMp3.Store.dll
-%%OPT_WEBKIT%%lib/banshee/Extensions/Banshee.AmazonMp3.Store.dll.mdb
+%%WEBKIT%%lib/banshee/Extensions/Banshee.AmazonMp3.Store.dll
+%%WEBKIT%%lib/banshee/Extensions/Banshee.AmazonMp3.Store.dll.mdb
 lib/banshee/Extensions/Banshee.AmazonMp3.exe
 lib/banshee/Extensions/Banshee.AmazonMp3.exe.mdb
 lib/banshee/Extensions/Banshee.Audiobook.dll
@@ -55,14 +55,16 @@ lib/banshee/Extensions/Banshee.CoverArt.dll
 lib/banshee/Extensions/Banshee.CoverArt.dll.mdb
 lib/banshee/Extensions/Banshee.Daap.dll
 lib/banshee/Extensions/Banshee.Daap.dll.mdb
+%%APPLEDEV%%lib/banshee/Extensions/Banshee.Dap.AppleDevice.dll
+%%APPLEDEV%%lib/banshee/Extensions/Banshee.Dap.AppleDevice.dll.mdb
 lib/banshee/Extensions/Banshee.Dap.MassStorage.dll
 lib/banshee/Extensions/Banshee.Dap.MassStorage.dll.mdb
-%%OPT_MTP%%lib/banshee/Extensions/Banshee.Dap.Mtp.dll
-%%OPT_MTP%%lib/banshee/Extensions/Banshee.Dap.Mtp.dll.mdb
+%%MTP%%lib/banshee/Extensions/Banshee.Dap.Mtp.dll
+%%MTP%%lib/banshee/Extensions/Banshee.Dap.Mtp.dll.mdb
 lib/banshee/Extensions/Banshee.Dap.dll
 lib/banshee/Extensions/Banshee.Dap.dll.mdb
-%%OPT_WEBKIT%%lib/banshee/Extensions/Banshee.Emusic.Store.dll
-%%OPT_WEBKIT%%lib/banshee/Extensions/Banshee.Emusic.Store.dll.mdb
+%%WEBKIT%%lib/banshee/Extensions/Banshee.Emusic.Store.dll
+%%WEBKIT%%lib/banshee/Extensions/Banshee.Emusic.Store.dll.mdb
 lib/banshee/Extensions/Banshee.Emusic.dll
 lib/banshee/Extensions/Banshee.Emusic.dll.mdb
 lib/banshee/Extensions/Banshee.FileSystemQueue.dll
@@ -81,8 +83,8 @@ lib/banshee/Extensions/Banshee.LibraryWatcher.dll
 lib/banshee/Extensions/Banshee.LibraryWatcher.dll.mdb
 lib/banshee/Extensions/Banshee.MiniMode.dll
 lib/banshee/Extensions/Banshee.MiniMode.dll.mdb
-%%OPT_WEBKIT%%lib/banshee/Extensions/Banshee.MiroGuide.dll
-%%OPT_WEBKIT%%lib/banshee/Extensions/Banshee.MiroGuide.dll.mdb
+%%WEBKIT%%lib/banshee/Extensions/Banshee.MiroGuide.dll
+%%WEBKIT%%lib/banshee/Extensions/Banshee.MiroGuide.dll.mdb
 lib/banshee/Extensions/Banshee.Mpris.dll
 lib/banshee/Extensions/Banshee.Mpris.dll.mdb
 lib/banshee/Extensions/Banshee.MultimediaKeys.dll
@@ -100,10 +102,13 @@ lib/banshee/Extensions/Banshee.PlayerMigration.dll
 lib/banshee/Extensions/Banshee.PlayerMigration.dll.mdb
 lib/banshee/Extensions/Banshee.Podcasting.dll
 lib/banshee/Extensions/Banshee.Podcasting.dll.mdb
-%%OPT_WEBKIT%%lib/banshee/Extensions/Banshee.Wikipedia.dll
-%%OPT_WEBKIT%%lib/banshee/Extensions/Banshee.Wikipedia.dll.mdb
-%%OPT_YOUTUBE%%lib/banshee/Extensions/Banshee.YouTube.dll
-%%OPT_YOUTUBE%%lib/banshee/Extensions/Banshee.YouTube.dll.mdb
+%%WEBKIT%%lib/banshee/Extensions/Banshee.Wikipedia.dll
+%%WEBKIT%%lib/banshee/Extensions/Banshee.Wikipedia.dll.mdb
+%%YOUTUBE%%lib/banshee/Extensions/Banshee.YouTube.dll
+%%YOUTUBE%%lib/banshee/Extensions/Banshee.YouTube.dll.mdb
+%%APPLEDEV%%lib/banshee/Extensions/libgpod-sharp.dll
+%%APPLEDEV%%lib/banshee/Extensions/libgpod-sharp.dll.config
+%%APPLEDEV%%lib/banshee/Extensions/libgpod-sharp.dll.mdb
 lib/banshee/Halie.exe
 lib/banshee/Halie.exe.mdb
 lib/banshee/Hyena.Data.Sqlite.dll
@@ -122,9 +127,9 @@ lib/banshee/Migo.dll
 lib/banshee/Migo.dll.mdb
 lib/banshee/Mono.Media.dll
 lib/banshee/Mono.Media.dll.mdb
-%%OPT_MTP%%lib/banshee/Mtp.dll
-%%OPT_MTP%%lib/banshee/Mtp.dll.config
-%%OPT_MTP%%lib/banshee/Mtp.dll.mdb
+%%MTP%%lib/banshee/Mtp.dll
+%%MTP%%lib/banshee/Mtp.dll.config
+%%MTP%%lib/banshee/Mtp.dll.mdb
 lib/banshee/Muinshee.exe
 lib/banshee/Muinshee.exe.mdb
 lib/banshee/MusicBrainz.dll
@@ -134,8 +139,8 @@ lib/banshee/Nereid.exe.mdb
 lib/banshee/gconf-schema-extractor.exe
 lib/banshee/libbanshee.a
 lib/banshee/libbanshee.so
-%%OPT_WEBKIT%%lib/banshee/libossifer.a
-%%OPT_WEBKIT%%lib/banshee/libossifer.so
+%%WEBKIT%%lib/banshee/libossifer.a
+%%WEBKIT%%lib/banshee/libossifer.so
 %%PORTDOCS%%lib/monodoc/sources/banshee-docs.source
 %%PORTDOCS%%lib/monodoc/sources/banshee-docs.tree
 %%PORTDOCS%%lib/monodoc/sources/banshee-docs.zip
@@ -180,7 +185,7 @@ share/applications/banshee.desktop
 %%DATADIR%%/icons/hicolor/16x16/actions/media-repeat-single.png
 %%DATADIR%%/icons/hicolor/16x16/actions/media-write-cd.png
 %%DATADIR%%/icons/hicolor/16x16/categories/amazon-mp3-source.png
-%%OPT_WEBKIT%%%%DATADIR%%/icons/hicolor/16x16/categories/amazon-mp3-store-source.png
+%%WEBKIT%%%%DATADIR%%/icons/hicolor/16x16/categories/amazon-mp3-store-source.png
 %%DATADIR%%/icons/hicolor/16x16/categories/audiobook.png
 %%DATADIR%%/icons/hicolor/16x16/categories/internet-archive.png
 %%DATADIR%%/icons/hicolor/16x16/categories/lastfm-audioscrobbler.png
@@ -188,13 +193,27 @@ share/applications/banshee.desktop
 %%DATADIR%%/icons/hicolor/16x16/categories/lastfm-personal.png
 %%DATADIR%%/icons/hicolor/16x16/categories/lastfm-recommended.png
 %%DATADIR%%/icons/hicolor/16x16/categories/lastfm-tag.png
-%%OPT_WEBKIT%%%%DATADIR%%/icons/hicolor/16x16/categories/miro-guide-source.png
+%%WEBKIT%%%%DATADIR%%/icons/hicolor/16x16/categories/miro-guide-source.png
 %%DATADIR%%/icons/hicolor/16x16/categories/podcast.png
 %%DATADIR%%/icons/hicolor/16x16/categories/radio.png
 %%DATADIR%%/icons/hicolor/16x16/categories/source-playlist.png
 %%DATADIR%%/icons/hicolor/16x16/categories/source-smart-playlist.png
-%%OPT_WEBKIT%%%%DATADIR%%/icons/hicolor/16x16/categories/wikipedia.png
-%%OPT_YOUTUBE%%%%DATADIR%%/icons/hicolor/16x16/categories/youtube.png
+%%WEBKIT%%%%DATADIR%%/icons/hicolor/16x16/categories/wikipedia.png
+%%YOUTUBE%%%%DATADIR%%/icons/hicolor/16x16/categories/youtube.png
+%%APPLEDEV%%%%DATADIR%%/icons/hicolor/16x16/devices/multimedia-player-ipod-U2-color.png
+%%APPLEDEV%%%%DATADIR%%/icons/hicolor/16x16/devices/multimedia-player-ipod-U2-monochrome.png
+%%APPLEDEV%%%%DATADIR%%/icons/hicolor/16x16/devices/multimedia-player-ipod-mini-blue.png
+%%APPLEDEV%%%%DATADIR%%/icons/hicolor/16x16/devices/multimedia-player-ipod-mini-gold.png
+%%APPLEDEV%%%%DATADIR%%/icons/hicolor/16x16/devices/multimedia-player-ipod-mini-green.png
+%%APPLEDEV%%%%DATADIR%%/icons/hicolor/16x16/devices/multimedia-player-ipod-mini-pink.png
+%%APPLEDEV%%%%DATADIR%%/icons/hicolor/16x16/devices/multimedia-player-ipod-mini-silver.png
+%%APPLEDEV%%%%DATADIR%%/icons/hicolor/16x16/devices/multimedia-player-ipod-nano-black.png
+%%APPLEDEV%%%%DATADIR%%/icons/hicolor/16x16/devices/multimedia-player-ipod-nano-white.png
+%%APPLEDEV%%%%DATADIR%%/icons/hicolor/16x16/devices/multimedia-player-ipod-shuffle.png
+%%APPLEDEV%%%%DATADIR%%/icons/hicolor/16x16/devices/multimedia-player-ipod-standard-color.png
+%%APPLEDEV%%%%DATADIR%%/icons/hicolor/16x16/devices/multimedia-player-ipod-standard-monochrome.png
+%%APPLEDEV%%%%DATADIR%%/icons/hicolor/16x16/devices/multimedia-player-ipod-video-black.png
+%%APPLEDEV%%%%DATADIR%%/icons/hicolor/16x16/devices/multimedia-player-ipod-video-white.png
 %%DATADIR%%/icons/hicolor/16x16/devices/phone-google-nexus-one.png
 %%DATADIR%%/icons/hicolor/16x16/devices/phone-htc-g1-white.png
 %%DATADIR%%/icons/hicolor/16x16/devices/phone-nokia-n900.png
@@ -211,7 +230,7 @@ share/applications/banshee.desktop
 %%DATADIR%%/icons/hicolor/22x22/actions/media-import-audio-cd.png
 %%DATADIR%%/icons/hicolor/22x22/actions/media-write-cd.png
 %%DATADIR%%/icons/hicolor/22x22/categories/amazon-mp3-source.png
-%%OPT_WEBKIT%%%%DATADIR%%/icons/hicolor/22x22/categories/amazon-mp3-store-source.png
+%%WEBKIT%%%%DATADIR%%/icons/hicolor/22x22/categories/amazon-mp3-store-source.png
 %%DATADIR%%/icons/hicolor/22x22/categories/audiobook.png
 %%DATADIR%%/icons/hicolor/22x22/categories/internet-archive.png
 %%DATADIR%%/icons/hicolor/22x22/categories/lastfm-audioscrobbler.png
@@ -219,21 +238,35 @@ share/applications/banshee.desktop
 %%DATADIR%%/icons/hicolor/22x22/categories/lastfm-personal.png
 %%DATADIR%%/icons/hicolor/22x22/categories/lastfm-recommended.png
 %%DATADIR%%/icons/hicolor/22x22/categories/lastfm-tag.png
-%%OPT_WEBKIT%%%%DATADIR%%/icons/hicolor/22x22/categories/miro-guide-source.png
+%%WEBKIT%%%%DATADIR%%/icons/hicolor/22x22/categories/miro-guide-source.png
 %%DATADIR%%/icons/hicolor/22x22/categories/podcast.png
 %%DATADIR%%/icons/hicolor/22x22/categories/radio.png
 %%DATADIR%%/icons/hicolor/22x22/categories/source-playlist.png
 %%DATADIR%%/icons/hicolor/22x22/categories/source-smart-playlist.png
-%%OPT_WEBKIT%%%%DATADIR%%/icons/hicolor/22x22/categories/wikipedia.png
-%%OPT_YOUTUBE%%%%DATADIR%%/icons/hicolor/22x22/categories/youtube.png
+%%WEBKIT%%%%DATADIR%%/icons/hicolor/22x22/categories/wikipedia.png
+%%YOUTUBE%%%%DATADIR%%/icons/hicolor/22x22/categories/youtube.png
+%%APPLEDEV%%%%DATADIR%%/icons/hicolor/22x22/devices/multimedia-player-ipod-U2-color.png
+%%APPLEDEV%%%%DATADIR%%/icons/hicolor/22x22/devices/multimedia-player-ipod-U2-monochrome.png
+%%APPLEDEV%%%%DATADIR%%/icons/hicolor/22x22/devices/multimedia-player-ipod-mini-blue.png
+%%APPLEDEV%%%%DATADIR%%/icons/hicolor/22x22/devices/multimedia-player-ipod-mini-gold.png
+%%APPLEDEV%%%%DATADIR%%/icons/hicolor/22x22/devices/multimedia-player-ipod-mini-green.png
+%%APPLEDEV%%%%DATADIR%%/icons/hicolor/22x22/devices/multimedia-player-ipod-mini-pink.png
+%%APPLEDEV%%%%DATADIR%%/icons/hicolor/22x22/devices/multimedia-player-ipod-mini-silver.png
+%%APPLEDEV%%%%DATADIR%%/icons/hicolor/22x22/devices/multimedia-player-ipod-nano-black.png
+%%APPLEDEV%%%%DATADIR%%/icons/hicolor/22x22/devices/multimedia-player-ipod-nano-white.png
+%%APPLEDEV%%%%DATADIR%%/icons/hicolor/22x22/devices/multimedia-player-ipod-shuffle.png
+%%APPLEDEV%%%%DATADIR%%/icons/hicolor/22x22/devices/multimedia-player-ipod-standard-color.png
+%%APPLEDEV%%%%DATADIR%%/icons/hicolor/22x22/devices/multimedia-player-ipod-standard-monochrome.png
+%%APPLEDEV%%%%DATADIR%%/icons/hicolor/22x22/devices/multimedia-player-ipod-video-black.png
+%%APPLEDEV%%%%DATADIR%%/icons/hicolor/22x22/devices/multimedia-player-ipod-video-white.png
 %%DATADIR%%/icons/hicolor/22x22/devices/phone-google-nexus-one.png
 %%DATADIR%%/icons/hicolor/22x22/devices/phone-htc-g1-white.png
 %%DATADIR%%/icons/hicolor/22x22/devices/phone-nokia-n900.png
 %%DATADIR%%/icons/hicolor/22x22/devices/phone-nook.png
 %%DATADIR%%/icons/hicolor/22x22/devices/phone-palm-pre.png
 %%DATADIR%%/icons/hicolor/22x22/devices/phone-xperia-arc.png
-%%OPT_WEBKIT%%%%DATADIR%%/icons/hicolor/24x24/categories/miro-guide-source.png
-%%OPT_YOUTUBE%%%%DATADIR%%/icons/hicolor/24x24/categories/youtube.png
+%%WEBKIT%%%%DATADIR%%/icons/hicolor/24x24/categories/miro-guide-source.png
+%%YOUTUBE%%%%DATADIR%%/icons/hicolor/24x24/categories/youtube.png
 %%DATADIR%%/icons/hicolor/24x24/devices/phone-google-nexus-one.png
 %%DATADIR%%/icons/hicolor/24x24/devices/phone-htc-g1-white.png
 %%DATADIR%%/icons/hicolor/24x24/devices/phone-nokia-n900.png
@@ -246,8 +279,8 @@ share/applications/banshee.desktop
 %%DATADIR%%/icons/hicolor/256x256/devices/phone-palm-pre.png
 %%DATADIR%%/icons/hicolor/256x256/devices/phone-xperia-arc.png
 %%DATADIR%%/icons/hicolor/32x32/actions/media-write-cd.png
-%%OPT_WEBKIT%%%%DATADIR%%/icons/hicolor/32x32/categories/miro-guide-source.png
-%%OPT_WEBKIT%%%%DATADIR%%/icons/hicolor/32x32/categories/wikipedia.png
+%%WEBKIT%%%%DATADIR%%/icons/hicolor/32x32/categories/miro-guide-source.png
+%%WEBKIT%%%%DATADIR%%/icons/hicolor/32x32/categories/wikipedia.png
 %%DATADIR%%/icons/hicolor/32x32/devices/phone-google-nexus-one.png
 %%DATADIR%%/icons/hicolor/32x32/devices/phone-htc-g1-white.png
 %%DATADIR%%/icons/hicolor/32x32/devices/phone-nokia-n900.png
@@ -256,19 +289,33 @@ share/applications/banshee.desktop
 %%DATADIR%%/icons/hicolor/32x32/devices/phone-xperia-arc.png
 %%DATADIR%%/icons/hicolor/48x48/actions/media-write-cd.png
 %%DATADIR%%/icons/hicolor/48x48/categories/audiobook.png
-%%OPT_WEBKIT%%%%DATADIR%%/icons/hicolor/48x48/categories/miro-guide-source.png
+%%WEBKIT%%%%DATADIR%%/icons/hicolor/48x48/categories/miro-guide-source.png
 %%DATADIR%%/icons/hicolor/48x48/categories/podcast.png
 %%DATADIR%%/icons/hicolor/48x48/categories/radio.png
-%%OPT_WEBKIT%%%%DATADIR%%/icons/hicolor/48x48/categories/wikipedia.png
+%%WEBKIT%%%%DATADIR%%/icons/hicolor/48x48/categories/wikipedia.png
 %%DATADIR%%/icons/hicolor/48x48/devices/phone-google-nexus-one.png
 %%DATADIR%%/icons/hicolor/48x48/devices/phone-htc-g1-white.png
 %%DATADIR%%/icons/hicolor/48x48/devices/phone-nokia-n900.png
 %%DATADIR%%/icons/hicolor/48x48/devices/phone-nook.png
 %%DATADIR%%/icons/hicolor/48x48/devices/phone-palm-pre.png
 %%DATADIR%%/icons/hicolor/48x48/devices/phone-xperia-arc.png
-%%OPT_WEBKIT%%%%DATADIR%%/icons/hicolor/scalable/categories/miro-guide-source.svg
+%%WEBKIT%%%%DATADIR%%/icons/hicolor/scalable/categories/miro-guide-source.svg
 %%DATADIR%%/icons/hicolor/scalable/categories/radio.svg
-%%OPT_WEBKIT%%%%DATADIR%%/icons/hicolor/scalable/categories/wikipedia.svg
+%%APPLEDEV%%%%DATADIR%%/icons/hicolor/scalable/devices/multimedia-player-ipod-U2-color.svg
+%%APPLEDEV%%%%DATADIR%%/icons/hicolor/scalable/devices/multimedia-player-ipod-U2-monochrome.svg
+%%APPLEDEV%%%%DATADIR%%/icons/hicolor/scalable/devices/multimedia-player-ipod-mini-blue.svg
+%%APPLEDEV%%%%DATADIR%%/icons/hicolor/scalable/devices/multimedia-player-ipod-mini-gold.svg
+%%APPLEDEV%%%%DATADIR%%/icons/hicolor/scalable/devices/multimedia-player-ipod-mini-green.svg
+%%APPLEDEV%%%%DATADIR%%/icons/hicolor/scalable/devices/multimedia-player-ipod-mini-pink.svg
+%%APPLEDEV%%%%DATADIR%%/icons/hicolor/scalable/devices/multimedia-player-ipod-mini-silver.svg
+%%APPLEDEV%%%%DATADIR%%/icons/hicolor/scalable/devices/multimedia-player-ipod-nano-black.svg
+%%APPLEDEV%%%%DATADIR%%/icons/hicolor/scalable/devices/multimedia-player-ipod-nano-white.svg
+%%APPLEDEV%%%%DATADIR%%/icons/hicolor/scalable/devices/multimedia-player-ipod-shuffle.svg
+%%APPLEDEV%%%%DATADIR%%/icons/hicolor/scalable/devices/multimedia-player-ipod-standard-color.svg
+%%APPLEDEV%%%%DATADIR%%/icons/hicolor/scalable/devices/multimedia-player-ipod-standard-monochrome.svg
+%%APPLEDEV%%%%DATADIR%%/icons/hicolor/scalable/devices/multimedia-player-ipod-video-black.svg
+%%APPLEDEV%%%%DATADIR%%/icons/hicolor/scalable/devices/multimedia-player-ipod-video-white.svg
+%%WEBKIT%%%%DATADIR%%/icons/hicolor/scalable/categories/wikipedia.svg
 %%DATADIR%%/icons/hicolor/scalable/devices/phone-nokia-n900.svg
 share/dbus-1/services/org.bansheeproject.Banshee.service
 share/dbus-1/services/org.bansheeproject.CollectionIndexer.service
diff --git a/x11-toolkits/gnome-sharp20/Makefile b/x11-toolkits/gnome-sharp20/Makefile
index 237d2a2..e6bfc1a 100644
--- a/x11-toolkits/gnome-sharp20/Makefile
+++ b/x11-toolkits/gnome-sharp20/Makefile
@@ -3,23 +3,27 @@
 
 PORTNAME=	gnome-sharp
 PORTVERSION=	2.24.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME
 
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	GNOME interfaces for the .NET runtime
 
+LICENSE=	LGPL21
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+LIB_DEPENDS=	libpopt.so:devel/popt \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2
+
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USES=		gmake libtool mono pathfix perl5 pkgconfig tar:bzip2
+USES=		gettext-runtime gmake libtool mono pathfix perl5 pkgconfig shebangfix tar:bzip2
+USE_GNOME=	cairo gnomevfs2 gtksharp20 librsvg2 vte libgnomeprintui libgnomeui
 USE_PERL5=	run
-USE_GNOME=	gnomevfs2 gtksharp20 librsvg2 vte libgnomeprintui libgnomeui
-MAKE_JOBS_UNSAFE=	yes
+USE_XORG=	ice sm
 INSTALL_TARGET=	install-strip
-
-post-patch:
-	@${FIND} ${WRKSRC} -name '*.pl' | ${XARGS} ${REINPLACE_CMD} -e \
-		's|^#!/usr/bin/perl|#!${PERL}|'
+SHEBANG_GLOB=	*.pl
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gnome-sharp20/files/patch-gnome_CanvasPathDef.custom b/x11-toolkits/gnome-sharp20/files/patch-gnome_CanvasPathDef.custom
new file mode 100644
index 0000000..7b6e28aa
--- /dev/null
+++ b/x11-toolkits/gnome-sharp20/files/patch-gnome_CanvasPathDef.custom
@@ -0,0 +1,13 @@
+--- 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/gtk-sharp20/Makefile b/x11-toolkits/gtk-sharp20/Makefile
index 5339060..f6a6162 100644
--- a/x11-toolkits/gtk-sharp20/Makefile
+++ b/x11-toolkits/gtk-sharp20/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gtk-sharp
-PORTVERSION=	2.12.40
+PORTVERSION=	2.12.42
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://download.mono-project.com/sources/gtk-sharp212/
 PKGNAMESUFFIX=	20
diff --git a/x11-toolkits/gtk-sharp20/distinfo b/x11-toolkits/gtk-sharp20/distinfo
index aa3809e..fecc71f 100644
--- a/x11-toolkits/gtk-sharp20/distinfo
+++ b/x11-toolkits/gtk-sharp20/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476770152
-SHA256 (gtk-sharp-2.12.40.tar.gz) = 1897dfa2a252473cfefe711f23ecfd99d2239f88e0d9365b61fb31ba5f0d3e57
-SIZE (gtk-sharp-2.12.40.tar.gz) = 2640898
+TIMESTAMP = 1479572648
+SHA256 (gtk-sharp-2.12.42.tar.gz) = f3b009bb73e3251378063b6f09786609cd4c061f3f8bf552f0ea663245c045c9
+SIZE (gtk-sharp-2.12.42.tar.gz) = 2645821