Change default version of samba from 4.4 to 4.6

Reviewed by:	mat
With hat:	portmgr
Differential Revision:	https://reviews.freebsd.org/D13529

41 files changed, 68 insertions, 35 deletions

diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index 2f7a4115206c..879c13505031 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -86,7 +86,7 @@ PYTHON3_DEFAULT?=	3.6
 # Possible values: 2.2, 2.3, 2.4
 RUBY_DEFAULT?=		2.3
 # Possible values: 4.4, 4.5, 4.6, 4.7
-SAMBA_DEFAULT?=		4.4
+SAMBA_DEFAULT?=		4.6
 # Possible values: base, openssl, openssl-devel, libressl, libressl-devel
 .if !defined(SSL_DEFAULT)
 #	If no preference was set, check for an installed base version
diff --git a/UPDATING b/UPDATING
index f4a374ebb049..2943c3e54ef5 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,34 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20171223:
+  AFFECTS: users of samba44
+  AUTHOR: antoine@FreeBSD.org
+
+  The default version of samba has been switched from 4.4 to 4.6.
+  Upgrade instructions:
+
+  For package users having samba44 installed indirectly (as a dependency):
+    # pkg upgrade
+
+  For package users having samba44 installed directly (leaf port):
+    # pkg upgrade
+    # pkg install samba46
+
+  For ports users:
+    If you want to keep samba44, add DEFAULT_VERSIONS+= samba=4.4 to make.conf
+
+    If you want to upgrade to samba46, remove samba44:
+    # pkg delete -f samba44
+
+    Portmaster users:
+    # portmaster net/samba46
+    # portmaster -a
+
+    Portupgrade users:
+    # portinstall net/samba46
+    # portupgrade -a
+
 20171218:
   AFFECTS: users of devel/gogs
   AUTHOR: dg@syrec.org
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index 8a0f91f6aba7..0990d832c9ef 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	musicpd
 PORTVERSION=	0.20.13
+PORTREVISION=	1
 CATEGORIES=	audio ipv6
 MASTER_SITES=	http://www.musicpd.org/download/mpd/${PORTVERSION:R}/
 DISTNAME=	mpd-${PORTVERSION}
diff --git a/audio/xmms2/Makefile b/audio/xmms2/Makefile
index db257df3ea5c..05c4d0515635 100644
--- a/audio/xmms2/Makefile
+++ b/audio/xmms2/Makefile
@@ -4,7 +4,7 @@
 PORTNAME?=	xmms2
 PORTVERSION=	0.8
 DISTVERSIONSUFFIX=	DrO_o
-PORTREVISION?=	22
+PORTREVISION?=	23
 CATEGORIES?=	audio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20${DISTVERSIONSUFFIX}
 
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 43372987666f..a28d2f933353 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnome-vfs
 PORTVERSION=	2.24.4
-PORTREVISION?=	6
+PORTREVISION?=	7
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile
index 94c0e5165158..70d6e4cae1ec 100644
--- a/devel/gvfs/Makefile
+++ b/devel/gvfs/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gvfs
 PORTVERSION=	1.26.3
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile
index d7b5b9406d2d..0cc6f46b0e54 100644
--- a/emulators/qemu-devel/Makefile
+++ b/emulators/qemu-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	qemu
 DISTVERSION=	2.6.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	emulators
 MASTER_SITES=	http://wiki.qemu.org/download/
 PKGNAMESUFFIX=	-devel
diff --git a/emulators/qemu-sbruno/Makefile b/emulators/qemu-sbruno/Makefile
index 59a4ed171679..1e3fcc3474a9 100644
--- a/emulators/qemu-sbruno/Makefile
+++ b/emulators/qemu-sbruno/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	qemu
 PORTVERSION=	2.11.50.g20171215
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	GH
 PKGNAMESUFFIX?=	-sbruno
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 414d982fe1b0..f25e9fcf5a67 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	qemu
 PORTVERSION=	2.9.0
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://wiki.qemu.org/download/
 DIST_SUBDIR=	qemu/${PORTVERSION}
diff --git a/mail/libmapi/Makefile b/mail/libmapi/Makefile
index 4399c9e40b73..e5f2cad56ac6 100644
--- a/mail/libmapi/Makefile
+++ b/mail/libmapi/Makefile
@@ -56,11 +56,7 @@ DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_CONFIGURE_ENV_OFF=	ac_cv_path_DOXYGEN=""
 PLIST_SUB=	SAMBA=${SAMBAPORT:T}
 
-.include <bsd.port.pre.mk>
-
-.if ${SAMBA_DEFAULT} == 4.4
 BROKEN=		fails to build
-.endif
 
 #  --enable-openchange-qt4 Compile OpenChange Qt4 wrapper.
 
@@ -83,4 +79,4 @@ post-install:
 	@${STRIP_CMD} ${STAGEDIR}/${PREFIX}/lib/shared-modules/dcerpc_server/*.so
 	@${STRIP_CMD} ${STAGEDIR}/${PREFIX}/modules/dcerpc_mapiproxy*/*.so
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile
index 7fc55ef91215..dc290b9ebd6e 100644
--- a/misc/amanda-server/Makefile
+++ b/misc/amanda-server/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	amanda
 PORTVERSION=	3.3.9
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	misc
 MASTER_SITES=	SF/amanda/amanda%20-%20stable/${PORTVERSION}
diff --git a/misc/linm/Makefile b/misc/linm/Makefile
index 6824746185c2..41dd129ace16 100644
--- a/misc/linm/Makefile
+++ b/misc/linm/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	linm
 DISTVERSION=	0.8.1-1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	misc shells
 MASTER_SITES=	http://kldp.net/frs/download.php/4508/
 DISTNAME=	${PORTNAME}_${DISTVERSION}
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index b0ccb2677c57..32914f5d0dfd 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ffmpeg
 PORTVERSION=	3.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://ffmpeg.org/releases/
diff --git a/multimedia/gmerlin-avdecoder/Makefile b/multimedia/gmerlin-avdecoder/Makefile
index 3ed43810f5e6..06ca80b3bbde 100644
--- a/multimedia/gmerlin-avdecoder/Makefile
+++ b/multimedia/gmerlin-avdecoder/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gmerlin-avdecoder
 PORTVERSION=	1.2.0
-PORTREVISION=	18
+PORTREVISION=	19
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/gmerlin/${PORTNAME}/${PORTVERSION}
 
diff --git a/multimedia/kodi-devel/Makefile b/multimedia/kodi-devel/Makefile
index 43f96d9a0cd7..fc16beac0505 100644
--- a/multimedia/kodi-devel/Makefile
+++ b/multimedia/kodi-devel/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	kodi
 DISTVERSION=	18.0.g20171213
+PORTREVISION=	1
 CATEGORIES=	multimedia
 PKGNAMESUFFIX=	-devel
 
diff --git a/multimedia/kodi/Makefile b/multimedia/kodi/Makefile
index 6582610ab767..d3b310b91b61 100644
--- a/multimedia/kodi/Makefile
+++ b/multimedia/kodi/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kodi
 DISTVERSION=	17.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia java
 
 MAINTAINER=	mickael.maillot@gmail.com
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index a34579a00da0..e3729b57ec45 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xine
 PORTVERSION=	1.2.6
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	multimedia ipv6
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-lib/${PORTVERSION}
 PKGNAMEPREFIX=	lib
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 5793e8974899..adcd2aaa09ca 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
+PORTREVISION=	1
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	riggs@FreeBSD.org
diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile
index 5d13634a4392..403c3fcff2ab 100644
--- a/multimedia/mpv/Makefile
+++ b/multimedia/mpv/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	mpv
 PORTVERSION=	0.27.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio
 
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 1b94053d6f92..a0907b594086 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	vlc
 DISTVERSION=	2.2.6
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	4
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \
diff --git a/net/jags/Makefile b/net/jags/Makefile
index 83817653d2cd..6ad3d63cf9bf 100644
--- a/net/jags/Makefile
+++ b/net/jags/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	jags
 PORTVERSION=	0.22.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}/Jags/${PORTNAME}-${PORTVERSION}
 
diff --git a/net/opennx/Makefile b/net/opennx/Makefile
index 00e37ecc8754..084c7f745096 100644
--- a/net/opennx/Makefile
+++ b/net/opennx/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	opennx
 PORTVERSION=	0.16.0.729
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/CI-source
 
diff --git a/net/pecl-smbclient/Makefile b/net/pecl-smbclient/Makefile
index 53e799d8390b..8ead14b73c5a 100644
--- a/net/pecl-smbclient/Makefile
+++ b/net/pecl-smbclient/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	smbclient
 PORTVERSION=	0.9.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net pear
 
 MAINTAINER=	kevlo@FreeBSD.org
diff --git a/net/prosearch/Makefile b/net/prosearch/Makefile
index 2b4c09143e42..2047bed786a3 100644
--- a/net/prosearch/Makefile
+++ b/net/prosearch/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	prosearch
 PORTVERSION=	0.19.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net www
 MASTER_SITES=	http://pro.setun.net/search/download/ SF/pro-search/pro-search/${PORTVERSION}
 
diff --git a/net/smb4k-kde4/Makefile b/net/smb4k-kde4/Makefile
index cea8e408a5a1..03865f76cbb0 100644
--- a/net/smb4k-kde4/Makefile
+++ b/net/smb4k-kde4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	smb4k-kde4
 PORTVERSION=	0.10.9
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	net kde
 MASTER_SITES=	SF/smb4k
 DISTNAME=	smb4k-${PORTVERSION}
diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile
index 73f41b5232f5..3c06cddd9c58 100644
--- a/print/apsfilter/Makefile
+++ b/print/apsfilter/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	apsfilter
 PORTVERSION=	7.2.8
-PORTREVISION=	20
+PORTREVISION=	21
 CATEGORIES=	print
 MASTER_SITES=	http://www.apsfilter.org/download/
 DIST_SUBDIR=	apsfilter
diff --git a/print/cups-smb-backend/Makefile b/print/cups-smb-backend/Makefile
index 0aac29df291d..7a45acbd5a3c 100644
--- a/print/cups-smb-backend/Makefile
+++ b/print/cups-smb-backend/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cups-smb-backend
 PORTVERSION=	1.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	print
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/print/gnome-cups-manager/Makefile b/print/gnome-cups-manager/Makefile
index d7c5b0aba3b4..30ccfbf0e121 100644
--- a/print/gnome-cups-manager/Makefile
+++ b/print/gnome-cups-manager/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	gnome-cups-manager
 PORTVERSION=	0.31
-PORTREVISION=	18
+PORTREVISION=	19
 PORTEPOCH=	1
 CATEGORIES=	print gnome
 MASTER_SITES=	GNOME
diff --git a/security/sssd/Makefile b/security/sssd/Makefile
index 8d7f55ab53f3..b3740cfa882b 100644
--- a/security/sssd/Makefile
+++ b/security/sssd/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	sssd
 PORTVERSION=	1.11.7
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	security
 MASTER_SITES=	https://releases.pagure.org/SSSD/${PORTNAME}/
 
diff --git a/sysutils/backuppc-devel/Makefile b/sysutils/backuppc-devel/Makefile
index 95b9f04bd53d..a69d6634afd7 100644
--- a/sysutils/backuppc-devel/Makefile
+++ b/sysutils/backuppc-devel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	backuppc
 PORTVERSION=	4.1.2.20170424
+PORTREVISION=	1
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	-devel
 
diff --git a/sysutils/backuppc/Makefile b/sysutils/backuppc/Makefile
index 641794494463..292073a351ac 100644
--- a/sysutils/backuppc/Makefile
+++ b/sysutils/backuppc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	backuppc
 PORTVERSION=	3.3.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	https://github.com/backuppc/backuppc/releases/download/${PORTVERSION}/ \
 		SF
diff --git a/sysutils/backuppc4/Makefile b/sysutils/backuppc4/Makefile
index 65e7d4ef34cc..7c8baa8fc2a7 100644
--- a/sysutils/backuppc4/Makefile
+++ b/sysutils/backuppc4/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	backuppc
 PORTVERSION=	4.1.4
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	https://github.com/backuppc/backuppc/releases/download/${PORTVERSION}/ \
 		SF
diff --git a/sysutils/fusefs-smbnetfs/Makefile b/sysutils/fusefs-smbnetfs/Makefile
index c5ad8b6a1b85..f7c5c895e30e 100644
--- a/sysutils/fusefs-smbnetfs/Makefile
+++ b/sysutils/fusefs-smbnetfs/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	smbnetfs
 PORTVERSION=	0.6.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils net
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/SMBNetFS-${PORTVERSION}
 PKGNAMEPREFIX=	fusefs-
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index da699ed39bab..44c7e1c22eb3 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnome-control-center
 PORTVERSION=	3.18.2
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
diff --git a/www/elinks/Makefile b/www/elinks/Makefile
index 54c191fa502d..d6f87762dc18 100644
--- a/www/elinks/Makefile
+++ b/www/elinks/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	elinks
 DISTVERSION=	0.11.7
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	www
 MASTER_SITES=	http://elinks.or.cz/download/
 
diff --git a/www/smb_auth/Makefile b/www/smb_auth/Makefile
index 052f0b3cc7e1..cd71068f4cbf 100644
--- a/www/smb_auth/Makefile
+++ b/www/smb_auth/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	smb_auth
 PORTVERSION=	0.05
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	www
 MASTER_SITES=	LOCAL/dinoex
 
diff --git a/www/squid-devel/Makefile b/www/squid-devel/Makefile
index 6ea76a3531b0..0e5ea2874245 100644
--- a/www/squid-devel/Makefile
+++ b/www/squid-devel/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	4.0.22
+PORTREVISION=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.squid-cache.org/Versions/v4/ \
 		http://www2.us.squid-cache.org/Versions/v4/ \
diff --git a/www/squid/Makefile b/www/squid/Makefile
index 384ecc22e062..1f621887dca7 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	3.5.27
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
 		http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
diff --git a/x11-fm/doublecmd/Makefile b/x11-fm/doublecmd/Makefile
index a9a17fab779f..7c7ca65e2148 100644
--- a/x11-fm/doublecmd/Makefile
+++ b/x11-fm/doublecmd/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	doublecmd
 PORTVERSION=	0.7.8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-fm
 MASTER_SITES=	SF/${PORTNAME}/Double%20Commander%20Source
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
diff --git a/x11-fm/wcmcommander/Makefile b/x11-fm/wcmcommander/Makefile
index 6c8a83af8f46..98de5fcb0ef1 100644
--- a/x11-fm/wcmcommander/Makefile
+++ b/x11-fm/wcmcommander/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	wcmcommander
 PORTVERSION=	0.20.0
 DISTVERSIONPREFIX=	release-
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-fm
 
 MAINTAINER=	amdmi3@FreeBSD.org
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index c869f4fb5498..6a415b764059 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kde-runtime
 PORTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11 kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org