Index: head/Mk/bsd.default-versions.mk
===================================================================
--- head/Mk/bsd.default-versions.mk
+++ head/Mk/bsd.default-versions.mk
@@ -87,7 +87,7 @@
 # Possible values: 2.3, 2.4, 2.5
 RUBY_DEFAULT?=		2.4
 # Possible values: 4.6, 4.7, 4.8
-SAMBA_DEFAULT?=		4.6
+SAMBA_DEFAULT?=		4.7
 # Possible values: base, openssl, openssl-devel, libressl, libressl-devel
 .if !defined(SSL_DEFAULT)
 #	If no preference was set, check for an installed base version
Index: head/UPDATING
===================================================================
--- head/UPDATING
+++ head/UPDATING
@@ -5,6 +5,34 @@
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20180901:
+  AFFECTS: users of samba46
+  AUTHOR: antoine@FreeBSD.org
+
+  The default version of samba has been switched from 4.6 to 4.7.
+  Upgrade instructions:
+
+  For package users having samba46 installed indirectly (as a dependency):
+    # pkg upgrade
+
+  For package users having samba46 installed directly (leaf port):
+    # pkg upgrade
+    # pkg install samba47
+
+  For ports users:
+    If you want to keep samba46, add DEFAULT_VERSIONS+= samba=4.6 to make.conf
+
+    If you want to upgrade to samba47, remove samba46:
+    # pkg delete -f samba46
+
+    Portmaster users:
+    # portmaster net/samba47
+    # portmaster -a
+
+    Portupgrade users:
+    # portinstall net/samba47
+    # portupgrade -a
+
 20180813:
   AFFECTS: net/geoipupdate
   AUTHOR: adamw@FreeBSD.org
Index: head/audio/musicpd/Makefile
===================================================================
--- head/audio/musicpd/Makefile
+++ head/audio/musicpd/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	musicpd
 PORTVERSION=	0.20.21
+PORTREVISION=	1
 CATEGORIES=	audio ipv6
 MASTER_SITES=	http://www.musicpd.org/download/mpd/${PORTVERSION:R}/
 DISTNAME=	mpd-${PORTVERSION}
Index: head/audio/xmms2/Makefile
===================================================================
--- head/audio/xmms2/Makefile
+++ head/audio/xmms2/Makefile
@@ -4,7 +4,7 @@
 PORTNAME?=	xmms2
 PORTVERSION=	0.8
 DISTVERSIONSUFFIX=	DrO_o
-PORTREVISION?=	26
+PORTREVISION?=	27
 CATEGORIES?=	audio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20${DISTVERSIONSUFFIX}
 
Index: head/devel/gnome-vfs/Makefile
===================================================================
--- head/devel/gnome-vfs/Makefile
+++ head/devel/gnome-vfs/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnome-vfs
 PORTVERSION=	2.24.4
-PORTREVISION?=	8
+PORTREVISION?=	9
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
Index: head/devel/gvfs/Makefile
===================================================================
--- head/devel/gvfs/Makefile
+++ head/devel/gvfs/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gvfs
 PORTVERSION=	1.26.3
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
Index: head/devel/kio-extras/Makefile
===================================================================
--- head/devel/kio-extras/Makefile
+++ head/devel/kio-extras/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	kio-extras
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-applications # kde kde-applications-plasma
 
 MAINTAINER=	kde@FreeBSD.org
Index: head/emulators/qemu-devel/Makefile
===================================================================
--- head/emulators/qemu-devel/Makefile
+++ head/emulators/qemu-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	qemu
 DISTVERSION=	2.6.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	emulators
 MASTER_SITES=	http://wiki.qemu.org/download/
 PKGNAMESUFFIX=	-devel
Index: head/emulators/qemu-sbruno/Makefile
===================================================================
--- head/emulators/qemu-sbruno/Makefile
+++ head/emulators/qemu-sbruno/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	qemu
 PORTVERSION=	2.11.50.g20180622
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	GH
 PKGNAMESUFFIX?=	-sbruno
Index: head/emulators/qemu/Makefile
===================================================================
--- head/emulators/qemu/Makefile
+++ head/emulators/qemu/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	qemu
 PORTVERSION=	2.12.0
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://wiki.qemu.org/download/
 DIST_SUBDIR=	qemu/${PORTVERSION}
Index: head/misc/amanda-server/Makefile
===================================================================
--- head/misc/amanda-server/Makefile
+++ head/misc/amanda-server/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	amanda
 PORTVERSION=	3.3.9
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	misc
 MASTER_SITES=	SF/amanda/amanda%20-%20stable/${PORTVERSION}
Index: head/misc/linm/Makefile
===================================================================
--- head/misc/linm/Makefile
+++ head/misc/linm/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	linm
 DISTVERSION=	0.8.1-1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	misc shells
 MASTER_SITES=	http://kldp.net/frs/download.php/4508/
 DISTNAME=	${PORTNAME}_${DISTVERSION}
Index: head/multimedia/ffmpeg/Makefile
===================================================================
--- head/multimedia/ffmpeg/Makefile
+++ head/multimedia/ffmpeg/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ffmpeg
 PORTVERSION=	4.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	https://ffmpeg.org/releases/
Index: head/multimedia/gmerlin-avdecoder/Makefile
===================================================================
--- head/multimedia/gmerlin-avdecoder/Makefile
+++ head/multimedia/gmerlin-avdecoder/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gmerlin-avdecoder
 PORTVERSION=	1.2.0
-PORTREVISION=	21
+PORTREVISION=	22
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/gmerlin/${PORTNAME}/${PORTVERSION}
 
Index: head/multimedia/kodi-devel/Makefile
===================================================================
--- head/multimedia/kodi-devel/Makefile
+++ head/multimedia/kodi-devel/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	kodi
 CATEGORIES=	multimedia
 DISTVERSION=	18.0.g201808261011
+PORTREVISION=	1
 PKGNAMESUFFIX?=	-devel
 
 MAINTAINER=	tobik@FreeBSD.org
Index: head/multimedia/kodi/Makefile
===================================================================
--- head/multimedia/kodi/Makefile
+++ head/multimedia/kodi/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kodi
 DISTVERSION=	17.6
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	multimedia java
 
 MAINTAINER=	mickael.maillot@gmail.com
Index: head/multimedia/libxine/Makefile
===================================================================
--- head/multimedia/libxine/Makefile
+++ head/multimedia/libxine/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xine
 PORTVERSION=	1.2.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia ipv6
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-lib/${PORTVERSION}
 PKGNAMEPREFIX=	lib
Index: head/multimedia/mplayer/Makefile
===================================================================
--- head/multimedia/mplayer/Makefile
+++ head/multimedia/mplayer/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	riggs@FreeBSD.org
Index: head/multimedia/mpv/Makefile
===================================================================
--- head/multimedia/mpv/Makefile
+++ head/multimedia/mpv/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	mpv
 PORTVERSION=	0.29.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	https://waf.io/:waf
Index: head/multimedia/vlc/Makefile
===================================================================
--- head/multimedia/vlc/Makefile
+++ head/multimedia/vlc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	vlc
 DISTVERSION=	2.2.8
-PORTREVISION=	9
+PORTREVISION=	10
 PORTEPOCH=	4
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \
Index: head/net/freeradius3/Makefile
===================================================================
--- head/net/freeradius3/Makefile
+++ head/net/freeradius3/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	freeradius
 DISTVERSION=	3.0.17
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/freeradius/%SUBDIR%/ \
 		ftp://ftp.ntua.gr/pub/net/radius/freeradius/%SUBDIR%/ \
Index: head/net/jags/Makefile
===================================================================
--- head/net/jags/Makefile
+++ head/net/jags/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	jags
 PORTVERSION=	0.22.1
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}/Jags/${PORTNAME}-${PORTVERSION}
 
Index: head/net/opennx/Makefile
===================================================================
--- head/net/opennx/Makefile
+++ head/net/opennx/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	opennx
 PORTVERSION=	0.16.0.729
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/CI-source
 
Index: head/net/pecl-smbclient/Makefile
===================================================================
--- head/net/pecl-smbclient/Makefile
+++ head/net/pecl-smbclient/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	smbclient
 PORTVERSION=	0.9.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net pear
 
 MAINTAINER=	sunpoet@FreeBSD.org
Index: head/net/prosearch/Makefile
===================================================================
--- head/net/prosearch/Makefile
+++ head/net/prosearch/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	prosearch
 PORTVERSION=	0.19.4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net www
 MASTER_SITES=	http://pro.setun.net/search/download/ SF/pro-search/pro-search/${PORTVERSION}
 
Index: head/net/smb4k-kde4/Makefile
===================================================================
--- head/net/smb4k-kde4/Makefile
+++ head/net/smb4k-kde4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	smb4k-kde4
 PORTVERSION=	0.10.9
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	net kde
 MASTER_SITES=	SF/smb4k
 DISTNAME=	smb4k-${PORTVERSION}
Index: head/print/apsfilter/Makefile
===================================================================
--- head/print/apsfilter/Makefile
+++ head/print/apsfilter/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	apsfilter
 PORTVERSION=	7.2.8
-PORTREVISION=	21
+PORTREVISION=	22
 CATEGORIES=	print
 MASTER_SITES=	http://www.apsfilter.org/download/
 DIST_SUBDIR=	apsfilter
Index: head/print/cups-smb-backend/Makefile
===================================================================
--- head/print/cups-smb-backend/Makefile
+++ head/print/cups-smb-backend/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cups-smb-backend
 PORTVERSION=	1.0
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	print
 MASTER_SITES=	# empty
 DISTFILES=	# empty
Index: head/print/gnome-cups-manager/Makefile
===================================================================
--- head/print/gnome-cups-manager/Makefile
+++ head/print/gnome-cups-manager/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	gnome-cups-manager
 PORTVERSION=	0.31
-PORTREVISION=	20
+PORTREVISION=	21
 PORTEPOCH=	1
 CATEGORIES=	print gnome
 MASTER_SITES=	GNOME
Index: head/security/sssd/Makefile
===================================================================
--- head/security/sssd/Makefile
+++ head/security/sssd/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	sssd
 PORTVERSION=	1.11.7
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	security
 MASTER_SITES=	https://releases.pagure.org/SSSD/${PORTNAME}/
 
Index: head/sysutils/backuppc-devel/Makefile
===================================================================
--- head/sysutils/backuppc-devel/Makefile
+++ head/sysutils/backuppc-devel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	backuppc
 DISTVERSION=	4.1.6.20180212
+PORTREVISION=	1
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	-devel
 
Index: head/sysutils/backuppc/Makefile
===================================================================
--- head/sysutils/backuppc/Makefile
+++ head/sysutils/backuppc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	backuppc
 PORTVERSION=	3.3.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	https://github.com/backuppc/backuppc/releases/download/${PORTVERSION}/ \
 		SF
Index: head/sysutils/backuppc4/Makefile
===================================================================
--- head/sysutils/backuppc4/Makefile
+++ head/sysutils/backuppc4/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	backuppc
 PORTVERSION=	4.2.1
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	https://github.com/backuppc/backuppc/releases/download/${PORTVERSION}/ \
 		SF
Index: head/sysutils/fusefs-smbnetfs/Makefile
===================================================================
--- head/sysutils/fusefs-smbnetfs/Makefile
+++ head/sysutils/fusefs-smbnetfs/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	smbnetfs
 PORTVERSION=	0.6.1
+PORTREVISION=	1
 CATEGORIES=	sysutils net
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/SMBNetFS-${PORTVERSION}
 PKGNAMEPREFIX=	fusefs-
Index: head/sysutils/gnome-control-center/Makefile
===================================================================
--- head/sysutils/gnome-control-center/Makefile
+++ head/sysutils/gnome-control-center/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnome-control-center
 PORTVERSION=	3.18.2
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
Index: head/www/elinks/Makefile
===================================================================
--- head/www/elinks/Makefile
+++ head/www/elinks/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	elinks
 DISTVERSION=	0.11.7
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	www
 MASTER_SITES=	http://elinks.or.cz/download/
 
Index: head/www/smb_auth/Makefile
===================================================================
--- head/www/smb_auth/Makefile
+++ head/www/smb_auth/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	smb_auth
 PORTVERSION=	0.05
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	www
 MASTER_SITES=	LOCAL/dinoex
 
Index: head/www/squid-devel/Makefile
===================================================================
--- head/www/squid-devel/Makefile
+++ head/www/squid-devel/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	4.0.25
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.squid-cache.org/Versions/v4/ \
 		http://www2.us.squid-cache.org/Versions/v4/ \
Index: head/www/squid/Makefile
===================================================================
--- head/www/squid/Makefile
+++ head/www/squid/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.squid-cache.org/Versions/v4/ \
 		http://www2.us.squid-cache.org/Versions/v4/ \
Index: head/www/squid3/Makefile
===================================================================
--- head/www/squid3/Makefile
+++ head/www/squid3/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	3.5.27
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
 		http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
Index: head/x11-fm/doublecmd/Makefile
===================================================================
--- head/x11-fm/doublecmd/Makefile
+++ head/x11-fm/doublecmd/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	doublecmd
 PORTVERSION=	0.8.3
+PORTREVISION=	1
 CATEGORIES=	x11-fm
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 MASTER_SITES=	SF/${PORTNAME}/Double%20Commander%20Source
Index: head/x11-fm/wcmcommander/Makefile
===================================================================
--- head/x11-fm/wcmcommander/Makefile
+++ head/x11-fm/wcmcommander/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	wcmcommander
 PORTVERSION=	0.20.0
 DISTVERSIONPREFIX=	release-
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11-fm
 
 MAINTAINER=	amdmi3@FreeBSD.org
Index: head/x11/kde-runtime-kde4/Makefile
===================================================================
--- head/x11/kde-runtime-kde4/Makefile
+++ head/x11/kde-runtime-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kde-runtime
 PORTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	x11 kde kde-applications
 PKGNAMESUFFIX=	-kde4