4 files changed, 15 insertions, 13 deletions

diff --git a/net/samba4/Makefile b/net/samba4/Makefile
index ce3afe9d4f41..c4ca4938a430 100644
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME?=		${SAMBA4_BASENAME}4
 PORTVERSION?=		${SAMBA4_VERSION}
-PORTREVISION?=		2
+PORTREVISION?=		0
 CATEGORIES?=		net
 MASTER_SITES=		${MASTER_SITE_SAMBA}
 MASTER_SITE_SUBDIR=	samba/stable samba/rc
@@ -18,7 +18,7 @@ CONFLICTS?=		*samba3[2-6]-3.* samba41-4.1.*
 
 SAMBA4_BASENAME=	samba
 SAMBA4_PORTNAME=	${SAMBA4_BASENAME}4
-SAMBA4_VERSION=		4.0.19
+SAMBA4_VERSION=		4.0.21
 SAMBA4_DISTNAME=	${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
 
 WRKSRC?=		${WRKDIR}/${DISTNAME}
@@ -131,6 +131,7 @@ UTMP_DESC=		UTMP accounting support
 OPTIONS_DEFINE+=	DEVELOPER MANPAGES EXP_MODULES
 
 DEVELOPER_DESC=		With development support
+MANPAGES_DESC=		Build manpages from DOCBOOK templates
 
 OPTIONS_SINGLE=		DNS
 OPTIONS_SINGLE_DNS=	NSUPDATE BIND98 BIND99
@@ -180,7 +181,7 @@ CONFIGURE_ARGS+=	--enable-debug
 
 # https://bugzilla.samba.org/show_bug.cgi?id=8969
 .if ${PORT_OPTIONS:MDEVELOPER}
-GDB_CMD?=		gdb761
+GDB_CMD?=		gdb771
 BUILD_DEPENDS+=		${GDB_CMD}:${PORTSDIR}/devel/gdb
 RUN_DEPENDS+=		${GDB_CMD}:${PORTSDIR}/devel/gdb
 SAMBA4_MODULES+=	auth_skel perfcount_test pdb_test vfs_shadow_copy_test vfs_skel_opaque vfs_skel_transparent vfs_fake_acls
@@ -523,12 +524,12 @@ do-install:
 			@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_TOOL} ${MAKE_ARGS} ${INSTALL_TARGET})
 
 post-install:
+			@${LN} -sf smb.conf.5.gz ${STAGEDIR}${PREFIX}/man/man5/smb4.conf.5.gz
 .if ${PORT_OPTIONS:MDOCS}
 			@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .	for doc in ${PORTDOCS}
 			@${INSTALL_DATA} ${WRKDIR}/${doc} ${STAGEDIR}${DOCSDIR}
 .	endfor
-			@${LN} -sf smb.conf.5.gz ${STAGEDIR}${PREFIX}/man/man5/smb4.conf.5.gz
 .endif
 # Run post-install script
 .for dir in ${SAMBA4_LOGDIR} ${SAMBA4_RUNDIR} ${SAMBA4_LOCKDIR} ${SAMBA4_MODULEDIR} ${SAMBA4_PRIVATEDIR}
diff --git a/net/samba4/distinfo b/net/samba4/distinfo
index e9fa1a90f7bf..336906d867a6 100644
--- a/net/samba4/distinfo
+++ b/net/samba4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (samba-4.0.19.tar.gz) = 966ba09c99ba5ff679e444e56b1282c974630bade4a289a71f3327865bbedf85
-SIZE (samba-4.0.19.tar.gz) = 22131987
+SHA256 (samba-4.0.21.tar.gz) = b28ddbccc4c17951aa86c0a65d8068083d519b81609ec55f919b4b9c2dfdf91f
+SIZE (samba-4.0.21.tar.gz) = 22132674
diff --git a/net/samba41/Makefile b/net/samba41/Makefile
index 0370677e560e..82f3751ec99d 100644
--- a/net/samba41/Makefile
+++ b/net/samba41/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME?=		${SAMBA4_BASENAME}41
 PORTVERSION?=		${SAMBA4_VERSION}
-PORTREVISION?=		2
+PORTREVISION?=		0
 CATEGORIES?=		net
 MASTER_SITES=		${MASTER_SITE_SAMBA}
 MASTER_SITE_SUBDIR=	samba/stable samba/rc
@@ -18,7 +18,7 @@ CONFLICTS?=		*samba3[2-6]-3.* samba4-4.0.*
 
 SAMBA4_BASENAME=	samba
 SAMBA4_PORTNAME=	${SAMBA4_BASENAME}4
-SAMBA4_VERSION=		4.1.9
+SAMBA4_VERSION=		4.1.11
 SAMBA4_DISTNAME=	${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
 
 WRKSRC?=		${WRKDIR}/${DISTNAME}
@@ -106,8 +106,8 @@ BUILD_DEPENDS+=		ntdb>=1.0:${PORTSDIR}/databases/ntdb
 RUN_DEPENDS+=		ntdb>=1.0:${PORTSDIR}/databases/ntdb
 SAMBA4_BUNDLED_LIBS+=	!ntdb
 # ldb
-BUILD_DEPENDS+=		ldb>=1.1.15:${PORTSDIR}/databases/ldb
-RUN_DEPENDS+=		ldb>=1.1.15:${PORTSDIR}/databases/ldb
+BUILD_DEPENDS+=		ldb>=1.1.17:${PORTSDIR}/databases/ldb
+RUN_DEPENDS+=		ldb>=1.1.17:${PORTSDIR}/databases/ldb
 SAMBA4_BUNDLED_LIBS+=	!ldb
 # Don't use external libcom_err
 SAMBA4_BUNDLED_LIBS+=	com_err
@@ -134,6 +134,7 @@ UTMP_DESC=		UTMP accounting support
 OPTIONS_DEFINE+=	DEVELOPER MANPAGES EXP_MODULES
 
 DEVELOPER_DESC=		With development support
+MANPAGES_DESC=		Build manpages from DOCBOOK templates
 
 OPTIONS_SINGLE=		DNS
 OPTIONS_SINGLE_DNS=	NSUPDATE BIND98 BIND99
@@ -183,7 +184,7 @@ CONFIGURE_ARGS+=	--enable-debug
 
 # https://bugzilla.samba.org/show_bug.cgi?id=8969
 .if ${PORT_OPTIONS:MDEVELOPER}
-GDB_CMD?=		gdb761
+GDB_CMD?=		gdb771
 BUILD_DEPENDS+=		${GDB_CMD}:${PORTSDIR}/devel/gdb
 RUN_DEPENDS+=		${GDB_CMD}:${PORTSDIR}/devel/gdb
 SAMBA4_MODULES+=	auth_skel perfcount_test pdb_test vfs_shadow_copy_test vfs_skel_opaque vfs_skel_transparent vfs_fake_acls
diff --git a/net/samba41/distinfo b/net/samba41/distinfo
index fabec6f8e501..940cc4b5a1d9 100644
--- a/net/samba41/distinfo
+++ b/net/samba41/distinfo
@@ -1,2 +1,2 @@
-SHA256 (samba-4.1.9.tar.gz) = 1484542db4b462bc562541412a061ad03a0e8af7199a916d74b063dd1881c6bd
-SIZE (samba-4.1.9.tar.gz) = 23192788
+SHA256 (samba-4.1.11.tar.gz) = 565e663a28eb785e00b0df3086319bb0b328ed2b1b8765c3d962757d3897ecfe
+SIZE (samba-4.1.11.tar.gz) = 19510128