Remove expired ports:

2016-03-01 net/samba41: not supported by the upstream 2016-04-01 net/samba-smbclient: not supported by the upstream 2016-04-01 net/samba-libsmbclient: not supported by the upstream 2016-04-01 net/samba-nmblookup: not supported by the upstream 2016-04-01 net/samba36: not supported by the upstream
author: Rene Ladan <rene@FreeBSD.org> 2016-05-16 13:09:43 +0000
committer: Rene Ladan <rene@FreeBSD.org> 2016-05-16 13:09:43 +0000
commit: c14b1a5d9fba73fa212a8761d64da8a74391ab63 (patch)
tree: f3cdb7db11873de7f8f45bb731adb28472f04852 /net
parent: Update devel/elixir-apex to version 0.5.0. (diff)
79 files changed, 0 insertions, 7279 deletions
diff --git a/net/Makefile b/net/Makefile
index 9f0a4856dcaa..8c9abfac63a6 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1180,11 +1180,6 @@
     SUBDIR += rubygem-whois
     SUBDIR += rude
     SUBDIR += rwhoisd
-    SUBDIR += samba-libsmbclient
-    SUBDIR += samba-nmblookup
-    SUBDIR += samba-smbclient
-    SUBDIR += samba36
-    SUBDIR += samba41
     SUBDIR += samba42
     SUBDIR += samba43
     SUBDIR += samba44
diff --git a/net/samba-libsmbclient/Makefile b/net/samba-libsmbclient/Makefile
deleted file mode 100644
index d9b4de1ca750..000000000000
--- a/net/samba-libsmbclient/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# $FreeBSD$
-
-PORTREVISION=		2
-PORTEPOCH=		0
-PKGNAMESUFFIX=		-libsmbclient
-
-COMMENT=		Shared lib from the samba package
-
-CONFLICTS=
-
-SAMBA_PORT=		samba36
-SAMBA_SUBPORT=		yes
-
-MASTERDIR=		${.CURDIR}/../${SAMBA_PORT}
-PKGDIR=			${.CURDIR}
-
-USE_LDCONFIG=		${PREFIX}/lib
-
-# We WANT shared libs
-CONFIGURE_ARGS+=	--with-libsmbclient
-
-ALL_TARGET=		libsmbclient
-
-do-install:
-			-@${MKDIR} ${STAGEDIR}${MAN7PREFIX}/man/man7
-			${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/manpages/libsmbclient.7 ${STAGEDIR}${MAN7PREFIX}/man/man7
-			-@${MKDIR} ${STAGEDIR}${PREFIX}/include
-			${INSTALL_DATA} ${WRKSRC}/include/libsmbclient.h ${STAGEDIR}${PREFIX}/include
-			${INSTALL_DATA} ${WRKSRC}/pkgconfig/smbclient.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/
-			-@${MKDIR} ${STAGEDIR}${PREFIX}/lib
-			${INSTALL_SCRIPT} ${WRKSRC}/bin/libsmbclient.a ${STAGEDIR}${PREFIX}/lib
-			${INSTALL_SCRIPT} ${WRKSRC}/bin/libsmbclient.so ${STAGEDIR}${PREFIX}/lib/libsmbclient.so.0
-			${LN} -snf libsmbclient.so.0 ${STAGEDIR}${PREFIX}/lib/libsmbclient.so
-			-@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-			@${CP} -Rp ${WRKDIR}/${DISTNAME}/examples/libsmbclient/ ${STAGEDIR}${EXAMPLESDIR}
-
-.include "${MASTERDIR}/Makefile"
diff --git a/net/samba-libsmbclient/pkg-descr b/net/samba-libsmbclient/pkg-descr
deleted file mode 100644
index 5af983161c7a..000000000000
--- a/net/samba-libsmbclient/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This is the set of shared libraries from the Samba port. It lets other
-programs to utilize various aspects of the SMB protocol.
-
-WWW: http://www.samba.org/
diff --git a/net/samba-libsmbclient/pkg-plist b/net/samba-libsmbclient/pkg-plist
deleted file mode 100644
index a5ba5391714b..000000000000
--- a/net/samba-libsmbclient/pkg-plist
+++ /dev/null
@@ -1,46 +0,0 @@
-include/libsmbclient.h
-lib/libsmbclient.a
-lib/libsmbclient.so
-lib/libsmbclient.so.0
-libdata/pkgconfig/smbclient.pc
-man/man7/libsmbclient.7.gz
-%%EXAMPLESDIR%%/Makefile
-%%EXAMPLESDIR%%/Makefile.internal
-%%EXAMPLESDIR%%/Makefile.internal.in
-%%EXAMPLESDIR%%/README
-%%EXAMPLESDIR%%/get_auth_data_fn.h
-%%EXAMPLESDIR%%/smbwrapper/Makefile
-%%EXAMPLESDIR%%/smbwrapper/README
-%%EXAMPLESDIR%%/smbwrapper/bsd-strlcat.c
-%%EXAMPLESDIR%%/smbwrapper/bsd-strlcpy.c
-%%EXAMPLESDIR%%/smbwrapper/bsd-strlfunc.h
-%%EXAMPLESDIR%%/smbwrapper/opendir_smbsh.c
-%%EXAMPLESDIR%%/smbwrapper/select.c
-%%EXAMPLESDIR%%/smbwrapper/smbsh.1
-%%EXAMPLESDIR%%/smbwrapper/smbsh.1.html
-%%EXAMPLESDIR%%/smbwrapper/smbsh.1.xml
-%%EXAMPLESDIR%%/smbwrapper/smbsh.c
-%%EXAMPLESDIR%%/smbwrapper/smbw.c
-%%EXAMPLESDIR%%/smbwrapper/smbw.h
-%%EXAMPLESDIR%%/smbwrapper/smbw_dir.c
-%%EXAMPLESDIR%%/smbwrapper/smbw_stat.c
-%%EXAMPLESDIR%%/smbwrapper/wrapper.c
-%%EXAMPLESDIR%%/smbwrapper/wrapper.h
-%%EXAMPLESDIR%%/testacl.c
-%%EXAMPLESDIR%%/testacl2.c
-%%EXAMPLESDIR%%/testacl3.c
-%%EXAMPLESDIR%%/testbrowse.c
-%%EXAMPLESDIR%%/testbrowse2.c
-%%EXAMPLESDIR%%/testchmod.c
-%%EXAMPLESDIR%%/testctx.c
-%%EXAMPLESDIR%%/testfstatvfs.c
-%%EXAMPLESDIR%%/testread.c
-%%EXAMPLESDIR%%/testsmbc.c
-%%EXAMPLESDIR%%/teststat.c
-%%EXAMPLESDIR%%/teststat2.c
-%%EXAMPLESDIR%%/teststat3.c
-%%EXAMPLESDIR%%/teststatvfs.c
-%%EXAMPLESDIR%%/testtruncate.c
-%%EXAMPLESDIR%%/testutime.c
-%%EXAMPLESDIR%%/testwrite.c
-%%EXAMPLESDIR%%/tree.c
diff --git a/net/samba-nmblookup/Makefile b/net/samba-nmblookup/Makefile
deleted file mode 100644
index 904c3c63d1aa..000000000000
--- a/net/samba-nmblookup/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# Created by: Hirohisa Yamaguchi <umq@ueo.co.jp>
-# $FreeBSD$
-
-PORTREVISION=		0
-PORTEPOCH=		0
-PKGNAMESUFFIX=		-nmblookup
-
-COMMENT=		NetBIOS Name lookup tool
-
-CONFLICTS=		ja-samba-[23].* samba-[2-4].*
-
-SAMBA_PORT=		samba36
-SAMBA_SUBPORT=		yes
-
-MASTERDIR=		${.CURDIR}/../${SAMBA_PORT}
-PKGDIR=			${.CURDIR}
-
-PLIST_FILES=		bin/nmblookup \
-			man/man1/nmblookup.1.gz \
-			man/man5/smb.conf.5.gz
-
-WITHOUT_ADS=		yes
-
-ALL_TARGET=		bin/nmblookup
-
-do-install:
-	-@${MKDIR} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/nmblookup ${STAGEDIR}${PREFIX}/bin
-	-@${MKDIR} ${MAN1PREFIX}/man/man1 ${STAGEDIR}${MAN5PREFIX}/man/man5
-	${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/manpages/nmblookup.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/manpages/smb.conf.5 ${STAGEDIR}${MAN5PREFIX}/man/man5
-
-.include "${MASTERDIR}/Makefile"
diff --git a/net/samba-nmblookup/pkg-descr b/net/samba-nmblookup/pkg-descr
deleted file mode 100644
index 283ab61799c8..000000000000
--- a/net/samba-nmblookup/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a tool to query NetBIOS names and map them to IP addresses
-in a network using NetBIOS over TCP/IP queries from the Samba port.
-
-WWW: http://www.samba.org/
diff --git a/net/samba-smbclient/Makefile b/net/samba-smbclient/Makefile
deleted file mode 100644
index 8f3b91dab093..000000000000
--- a/net/samba-smbclient/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# Created by: garga
-# $FreeBSD$
-
-PORTREVISION=		0
-PORTEPOCH=		0
-PKGNAMESUFFIX=		-smbclient
-
-COMMENT=		Samba "ftp-like" client
-
-CONFLICTS=		ja-samba-[23].* samba-[2-4].*
-
-SAMBA_PORT=		samba36
-SAMBA_SUBPORT=		yes
-
-SAMBA_CONFIG=		smb-client.conf
-
-MASTERDIR=		${.CURDIR}/../${SAMBA_PORT}
-FILESDIR=		${.CURDIR}/files
-PKGDIR=			${.CURDIR}
-
-WITHOUT_ADS=		yes
-
-PLIST_SUB+=		SAMBA_CONFDIR="${SAMBA_CONFDIR:S,^${PREFIX}/,,}" \
-			SAMBA_CONFIG="${SAMBA_CONFIG}"
-
-ALL_TARGET=		bin/smbclient
-
-do-install:
-	-@${MKDIR} ${STAGEDIR}${SAMBA_CONFDIR}
-	${INSTALL_DATA} ${FILESDIR}/smb-client.conf.sample ${STAGEDIR}${SAMBA_CONFDIR}/${SAMBA_CONFIG}.sample
-	-@${MKDIR} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/smbclient ${STAGEDIR}${PREFIX}/bin
-	-@${MKDIR} ${STAGEDIR}${MAN1PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/manpages/smbclient.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
-
-.include "${MASTERDIR}/Makefile"
diff --git a/net/samba-smbclient/files/smb-client.conf.sample b/net/samba-smbclient/files/smb-client.conf.sample
deleted file mode 100644
index e493fd5c8419..000000000000
--- a/net/samba-smbclient/files/smb-client.conf.sample
+++ /dev/null
@@ -1,9 +0,0 @@
-[global]
-
-# workgroup = NT-Domain-Name or Workgroup-Name, eg: MIDEARTH
-;   workgroup = MYGROUP
-
-# Charset settings
-;   display charset = koi8-r
-;   unix charset = koi8-r
-;   dos charset = cp866
diff --git a/net/samba-smbclient/pkg-descr b/net/samba-smbclient/pkg-descr
deleted file mode 100644
index 4e691cb33725..000000000000
--- a/net/samba-smbclient/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-smbclient is samba client with an "ftp like" interface. It is a useful tool to
-test connectivity to a Windows share. It can be used to transfer files, or to
-look at share names. In addition, it has a nifty ability to 'tar' (backup) and
-restore files from a server to a client and visa versa.
-
-WWW: http://www.samba.org/
diff --git a/net/samba-smbclient/pkg-plist b/net/samba-smbclient/pkg-plist
deleted file mode 100644
index 23dd7f363bf8..000000000000
--- a/net/samba-smbclient/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/smbclient
-man/man1/smbclient.1.gz
-%%SAMBA_CONFDIR%%/%%SAMBA_CONFIG%%.sample
diff --git a/net/samba36/Makefile b/net/samba36/Makefile
deleted file mode 100644
index 6b3862e927c0..000000000000
--- a/net/samba36/Makefile
+++ /dev/null
@@ -1,561 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=		${SAMBA_BASENAME}36
-PORTVERSION=		3.6.25
-PORTREVISION?=		3
-CATEGORIES?=		net
-MASTER_SITES=		SAMBA/samba SAMBA/samba/stable SAMBA/samba/pre
-DISTNAME=		${SAMBA_BASENAME}-${PORTVERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
-PATCH_SITES=		https://www.samba.org/samba/ftp/patches/security/
-PATCHFILES=		samba-3.6.25-security-2015-12-16.patch:-p1
-
-MAINTAINER?=		timur@FreeBSD.org
-COMMENT?=		Free SMB and CIFS client and server for Unix
-
-LICENSE=		GPLv3
-LICENSE_FILE=		${WRKDIR}/${DISTNAME}/COPYING
-
-CONFLICTS?=		*samba3[2-5]-3.*
-
-DEPRECATED=		not supported by the upstream
-EXPIRATION_DATE=	2016-04-01
-
-# Additional patches from Sernet.de
-PATCH_STRIP=		-p1
-EXTRA_PATCHES=		${PATCHDIR}/sernet.patch
-
-SAMBA_BASENAME=		samba
-CPE_VENDOR=		samba
-CPE_PRODUCT=		samba
-
-EXAMPLESDIR=		${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
-PATCH_WRKSRC=		${WRKDIR}/${DISTNAME}
-WRKSRC=			${WRKDIR}/${DISTNAME}/source3
-IPATHS=			-I${WRKDIR}/${DISTNAME}/source3/m4 -I${WRKDIR}/${DISTNAME}/m4 -I${WRKDIR}/${DISTNAME}/lib/replace -I${WRKDIR}/${DISTNAME}/source4
-AUTOHEADER_ARGS=	${IPATHS}
-AUTOCONF_ARGS=		${IPATHS}
-
-GNU_CONFIGURE=		yes
-USES=			cpe execinfo gmake iconv pkgconfig shebangfix
-SHEBANG_FILES=		../examples/LDAP/convertSambaAccount \
-			../examples/LDAP/get_next_oid \
-			../examples/LDAP/ol-schema-migrate.pl \
-			../examples/ad-bench/ad-bench.sh \
-			../examples/misc/adssearch.pl \
-			../examples/misc/check_multiple_LDAP_entries.pl \
-			../examples/misc/cldap.pl \
-			../examples/printing/smbprint \
-			../examples/scripts/idmap/idmap_nis.sh \
-			../examples/scripts/printing/cups/smbaddprinter.pl \
-			../examples/scripts/printing/cups/smbdelprinter.pl \
-			../examples/scripts/shares/perl/modify_samba_config.pl \
-			../examples/scripts/users_and_groups/adduserstogroups.pl \
-			../examples/scripts/users_and_groups/createdomobj.pl
-USE_AUTOTOOLS=		autoconf autoheader
-USE_LDCONFIG=		${SAMBA_LIBDIR}
-# pkg-config is used to find talloc
-PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
-PKGCONFIGDIR_REL?=	${PKGCONFIGDIR:S|^${PREFIX}/||}
-# directories
-VARDIR?=		/var
-SAMBA_SPOOL?=		${VARDIR}/spool/${SAMBA_BASENAME}
-SAMBA_LOGDIR=		${VARDIR}/log/${SAMBA_BASENAME}
-SAMBA_RUNDIR=		${VARDIR}/run/${SAMBA_BASENAME}
-SAMBA_LOCKDIR?=		${VARDIR}/db/${SAMBA_BASENAME}
-SAMBA_CONFIG?=		smb.conf
-SAMBA_CONFDIR?=		${PREFIX}/etc
-RC_DIR=			${PREFIX}/etc/rc.d
-SAMBA_SWATDIR=		${PREFIX}/share/swat
-SAMBA_LIBDIR=		${PREFIX}/lib
-SAMBA_MODULEDIR=	${SAMBA_LIBDIR}/${SAMBA_BASENAME}
-SAMBA_INCLUDEDIR=	${PREFIX}/include/${SAMBA_BASENAME}
-SAMBA_PRIVATEDIR?=	${SAMBA_CONFDIR}/${SAMBA_BASENAME}
-
-CONFIGURE_ARGS+=	--exec-prefix="${PREFIX}" \
-			--sysconfdir="${SAMBA_CONFDIR}" \
-			--with-configdir="${SAMBA_CONFDIR}" \
-			--includedir="${SAMBA_INCLUDEDIR}" \
-			--datadir="${DATADIR}" \
-			--with-swatdir="${SAMBA_SWATDIR}" \
-			--libdir="${SAMBA_LIBDIR}" \
-			--with-pammodulesdir="${SAMBA_LIBDIR}" \
-			--with-modulesdir="${SAMBA_MODULEDIR}" \
-			--localstatedir="${VARDIR}" \
-			--with-piddir="${SAMBA_RUNDIR}" \
-			--with-ncalrpcdir="${SAMBA_RUNDIR}/ncalrpc" \
-			--with-nmbdsocketdir="${SAMBA_RUNDIR}/nmbd" \
-			--with-lockdir="${SAMBA_LOCKDIR}" \
-			--with-statedir="${SAMBA_LOCKDIR}" \
-			--with-cachedir="${SAMBA_LOCKDIR}" \
-			--with-privatedir="${SAMBA_PRIVATEDIR}" \
-			--with-logfilebase="${SAMBA_LOGDIR}"
-
-CPPFLAGS+=		-I${LOCALBASE}/include
-LDFLAGS+=		-L${LOCALBASE}/lib
-
-CONFIGURE_ENV+=		PTHREAD_LDFLAGS="-lpthread"
-# XXX: Temporary hack for RELENG6
-CONFIGURE_ENV+=		ac_cv_header_sys_mount_h=yes
-# XXX: readdir test fails on ZFS, bringing unusable replacement code
-CONFIGURE_ENV+=		libreplace_cv_READDIR_NEEDED=no
-# tdb
-BUILD_DEPENDS+=		tdb>=1.2.6:databases/tdb
-RUN_DEPENDS+=		tdb>=1.2.6:databases/tdb
-CONFIGURE_ARGS+=	--without-libtdb --enable-external-libtdb
-# talloc
-BUILD_DEPENDS+=		talloc>=2.0.1:devel/talloc
-RUN_DEPENDS+=		talloc>=2.0.1:devel/talloc
-CONFIGURE_ARGS+=	--without-libtalloc --enable-external-libtalloc
-# tevent
-BUILD_DEPENDS+=		tevent>=0.9.11:devel/tevent
-RUN_DEPENDS+=		tevent>=0.9.11:devel/tevent
-CONFIGURE_ARGS+=	--without-libtevent --enable-external-libtevent
-# These options are common for all (sub)ports
-CONFIGURE_ARGS+=	${ICONV_CONFIGURE_BASE} \
-			--disable-as-needed
-
-.if !defined(SAMBA_SUBPORT)
-OPTIONS_DEFINE=		ACL_SUPPORT ADS AIO_SUPPORT AVAHI CUPS DNSUPDATE \
-			DOCS EXAMPLES EXP_MODULES FAM IPV6 LDAP \
-			MAX_DEBUG PAM_SMBPASS POPT PTHREADPOOL QUOTAS \
-			SMBTORTURE SWAT SYSLOG UTMP WINBIND
-OPTIONS_RADIO=		GSSAPI
-OPTIONS_RADIO_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
-
-OPTIONS_DEFAULT=	ACL_SUPPORT AIO_SUPPORT CUPS LDAP POPT PTHREADPOOL \
-			WINBIND GSSAPI_NONE
-
-ACL_SUPPORT_DESC=	ACL support
-
-ADS_DESC=		Active Directory support
-ADS_CONFIGURE_ON=	--with-ads --with-krb5="${GSSAPIBASEDIR}"
-ADS_CONFIGURE_OFF=	--without-ads --without-krb5
-
-AIO_SUPPORT_DESC=	Asyncronous IO support
-DNSUPDATE_DESC=		Dynamic DNS update(require ADS)
-EXP_MODULES_DESC=	Experimental modules
-
-GSSAPI_BASE_DESC=	Use Heimdal in base
-GSSAPI_BASE_USES=	gssapi
-GSSAPI_HEIMDAL_DESC=	Use Heimdal from ports
-GSSAPI_HEIMDAL_USES=	gssapi:heimdal,flags
-GSSAPI_MIT_DESC=	Use MIT Kerberos V5
-GSSAPI_MIT_USES=	gssapi:mit,flags
-GSSAPI_NONE_DESC=	No Kerberos support
-
-MAX_DEBUG_DESC=		Maximum debugging
-PAM_SMBPASS_DESC=	PAM authentication via passdb backends
-POPT_DESC=		System-wide POPT library
-PTHREADPOOL_DESC=	Pthread pool
-QUOTAS_DESC=		Disk quota support
-SMBTORTURE_DESC=	smbtorture
-SWAT_DESC=		SWAT WebGUI
-UTMP_DESC=		UTMP accounting support
-WINBIND_DESC=		WinBIND support
-
-# !SAMBA_SUBPORT
-.endif
-
-.include <bsd.port.options.mk>
-
-# There are reports that on ARM PIE makes binaries to core dump(#149186)
-.if ${ARCH} == "arm"
-CONFIGURE_ARGS+=	--disable-pie
-.endif
-
-.if defined(SAMBA_SUBPORT)
-# Switch off all extra functionality
-CONFIGURE_ARGS+=	--disable-cups --disable-fam --without-winbind \
-			--without-syslog --without-quotas --without-utmp \
-			--without-pam --without-pam_smbpass \
-			--without-aio-support --with-included-popt
-.else
-# Samba server itself
-USE_RC_SUBR=		${SAMBA_BASENAME}
-SUB_FILES=		pkg-message smb.conf.sample
-
-PLIST=			${WRKDIR}/.PLIST
-# We don't (yet) have clustered FS for cluster support
-CONFIGURE_ARGS+=	--with-pam --with-readline=/usr \
-			--with-included-iniparser \
-			--with-sendfile-support \
-			--enable-largefile \
-			--without-cluster-support \
-			--without-libsmbclient \
-			--without-libaddns \
-			--without-libnetapi \
-			--without-libsmbsharemodes
-
-.if ! ${PORT_OPTIONS:MIPV6}
-CONFIGURE_ENV+=		libreplace_cv_HAVE_IPV6=no
-.endif
-
-.if ${PORT_OPTIONS:MLDAP}
-SAMBA_WANT_LDAP=	yes
-.endif
-
-.if ${PORT_OPTIONS:MCUPS}
-LIB_DEPENDS+=		libcups.so:print/cups
-CONFIGURE_ARGS+=	--enable-cups --enable-iprint
-SUB_LIST+=		CUPS=""
-.else
-CONFIGURE_ARGS+=	--disable-cups --disable-iprint
-SUB_LIST+=		CUPS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MMAX_DEBUG}
-CPPFLAGS+=		-g
-LDFLAGS+=		-g
-LIB_DEPENDS+=		libdmalloc.so:devel/dmalloc
-CONFIGURE_ARGS+=	--enable-debug
-#			--enable-socket-wrapper --enable-nss-wrapper \
-#			--enable-developer --enable-krb5developer \
-#			--enable-dmalloc --with-profiling-data
-
-CONFIGURE_ARGS+=	--with-smbtorture4-path=${WRKDIR}/${DISTNAME}/source4/torture
-.else
-CONFIGURE_ARGS+=	--disable-debug \
-			--disable-socket-wrapper --disable-nss-wrapper \
-			--disable-developer --disable-krb5developer \
-			--disable-dmalloc --without-profiling-data
-.endif
-
-.if ${PORT_OPTIONS:MSYSLOG}
-CONFIGURE_ARGS+=	--with-syslog
-.else
-CONFIGURE_ARGS+=	--without-syslog
-.endif
-
-.if ${PORT_OPTIONS:MQUOTAS}
-CONFIGURE_ARGS+=	--with-quotas
-.else
-CONFIGURE_ARGS+=	--without-quotas
-.endif
-
-.if ${PORT_OPTIONS:MUTMP}
-CONFIGURE_ARGS+=	--with-utmp
-.else
-CONFIGURE_ARGS+=	--without-utmp
-.endif
-
-.if ${PORT_OPTIONS:MWINBIND}
-CONFIGURE_ARGS+=	--with-winbind
-PLIST_SUB+=		WINBIND=""
-SUB_LIST+=		WINBIND=""
-.else
-CONFIGURE_ARGS+=	--without-winbind
-PLIST_SUB+=		WINBIND="@comment "
-SUB_LIST+=		WINBIND="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSWAT}
-CONFIGURE_ARGS+=	--enable-swat
-PLIST_SUB+=		SWAT=""
-.else
-CONFIGURE_ARGS+=	--disable-swat
-PLIST_SUB+=		SWAT="@comment "
-.endif
-# Add some shared modules
-.if ${PORT_OPTIONS:MEXP_MODULES}
-.	if !defined(WANT_EXP_MODULES) || empty(WANT_EXP_MODULES)
-WANT_EXP_MODULES=	idmap_tdb2 idmap_ad idmap_adex idmap_hash idmap_rid \
-			charset_weird
-.		if ! ${PORT_OPTIONS:MMAX_DEBUG}
-WANT_EXP_MODULES+=	rpc_echo
-.		endif
-WANT_EXP_MODULES+=	vfs_cacheprime vfs_catia vfs_commit vfs_dirsort \
-			vfs_readahead vfs_streams_depot vfs_syncops
-.	endif
-.endif
-
-.if ${PORT_OPTIONS:MFAM}
-USES+=			fam
-WANT_EXP_MODULES+=	vfs_notify_fam
-CONFIGURE_ARGS+=	--enable-fam
-.else
-CONFIGURE_ARGS+=	--disable-fam
-.endif
-
-.if ${PORT_OPTIONS:MACL_SUPPORT}
-CONFIGURE_ARGS+=	--with-acl-support
-WANT_EXP_MODULES+=	vfs_zfsacl
-LIB_DEPENDS+=		libsunacl.so:sysutils/libsunacl
-.else
-CONFIGURE_ARGS+=	--without-acl-support
-.endif
-
-.if ${PORT_OPTIONS:MAIO_SUPPORT}
-CONFIGURE_ARGS+=	--with-aio-support
-.else
-CONFIGURE_ARGS+=	--without-aio-support
-.endif
-
-.if ${PORT_OPTIONS:MPAM_SMBPASS}
-CONFIGURE_ARGS+=	--with-pam_smbpass
-PLIST_SUB+=		SMBPASS=""
-.else
-CONFIGURE_ARGS+=	--without-pam_smbpass
-PLIST_SUB+=		SMBPASS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MDNSUPDATE}
-.	if ! ${PORT_OPTIONS:MADS}
-IGNORE=			dynamic DNS updates require ADS support. Disable DNSUPDATE support
-.	endif
-LIB_DEPENDS+=		libuuid.so:misc/e2fsprogs-libuuid
-CONFIGURE_ARGS+=	--with-dnsupdate
-.else
-CONFIGURE_ARGS+=	--without-dnsupdate
-.endif
-
-.if ${PORT_OPTIONS:MAVAHI}
-CPPFLAGS+=		`pkg-config --cflags avahi-client`
-CONFIGURE_ENV+=		DNSSD_LIBS="`pkg-config --libs avahi-client`"
-LIB_DEPENDS+=		libavahi-client.so:net/avahi-app
-CONFIGURE_ARGS+=	--enable-avahi
-.else
-CONFIGURE_ARGS+=	--disable-avahi
-.endif
-
-.if ${PORT_OPTIONS:MPTHREADPOOL}
-CONFIGURE_ARGS+=	--enable-pthreadpool
-.else
-CONFIGURE_ARGS+=	--disable-pthreadpool
-.endif
-
-.if ${PORT_OPTIONS:MPOPT}
-LIB_DEPENDS+=		libpopt.so:devel/popt
-CONFIGURE_ARGS+=	--without-included-popt
-.else
-CONFIGURE_ARGS+=	--with-included-popt
-.endif
-
-.if ${PORT_OPTIONS:MSMBTORTURE}
-PLIST_SUB+=		SMBTORTURE=""
-.else
-PLIST_SUB+=		SMBTORTURE="@comment "
-.endif
-# !SAMBA_SUBPORT
-.endif
-
-###
-### Common part for port and it's subports
-###
-
-.if ${PORT_OPTIONS:MADS}
-.	if ${PORT_OPTIONS:MGSSAPI_NONE}
-# Kerberos5 is necessary for ADS
-IGNORE=	ADS support requires GSSAPI_BASE, GSSAPI_HEIMDAL, or GSSAPI_MIT
-.	endif
-SAMBA_WANT_LDAP=	yes
-.endif
-
-.if defined(SAMBA_WANT_LDAP)
-USE_OPENLDAP=		yes
-CONFIGURE_ARGS+=	--with-ldap
-.else
-CONFIGURE_ARGS+=	--without-ldap
-.endif
-
-.if defined(WANT_EXP_MODULES) && !empty(WANT_EXP_MODULES)
-CONFIGURE_ARGS+=	--with-shared-modules="${WANT_EXP_MODULES:Q:C/(\\\\ )+/,/g}"
-.endif
-
-.include <bsd.port.pre.mk>
-
-post-patch:
-		@${REINPLACE_CMD} -e 's|%%SAMBA_CONFIG%%|${SAMBA_CONFIG}|g' \
-		    ${WRKSRC}/Makefile.in
-		@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-		    ${WRKSRC}/configure.in ${WRKSRC}/m4/aclocal.m4
-		${REINPLACE_CMD} -e '\|^Libs:|d; s|^#Libs:|Libs:|g' \
-		    ${WRKSRC}/pkgconfig/*.pc.in
-###
-### end of common part
-###
-
-.if !defined(SAMBA_SUBPORT)
-# Samba server only
-SAMBA_MAN1=	dbwrap_tool.1 findsmb.1 \
-		log2pcap.1 nmblookup.1 ntlm_auth.1 profiles.1 rpcclient.1 \
-		sharesec.1 smbcacls.1 smbclient.1 smbcontrol.1 smbcquotas.1 \
-		smbget.1 smbstatus.1 smbtar.1 smbtree.1 testparm.1 vfstest.1
-SAMBA_MAN5=	lmhosts.5 smb.conf.5 smbgetrc.5 smbpasswd.5
-SAMBA_MAN7=	samba.7
-SAMBA_MAN8=	eventlogadm.8 net.8 nmbd.8 pdbedit.8 smbd.8 smbpasswd.8 \
-		smbspool.8 idmap_nss.8 idmap_tdb.8 idmap_tdb2.8 \
-		vfs_acl_tdb.8 vfs_acl_xattr.8 \
-		vfs_audit.8 vfs_cap.8 vfs_default_quota.8 vfs_extd_audit.8 \
-		vfs_fake_perms.8 vfs_full_audit.8 vfs_netatalk.8 \
-		vfs_preopen.8 \
-		vfs_readahead.8 vfs_readonly.8 vfs_recycle.8 vfs_shadow_copy.8 \
-		vfs_shadow_copy2.8 vfs_smb_traffic_analyzer.8 \
-		vfs_streams_xattr.8 vfs_xattr_tdb.8
-
-.if ${PORT_OPTIONS:MWINBIND}
-SAMBA_MAN1+=	wbinfo.1
-SAMBA_MAN5+=	pam_winbind.conf.5
-SAMBA_MAN7+=	winbind_krb5_locator.7
-SAMBA_MAN8+=	pam_winbind.8 winbindd.8
-.endif
-
-.if ${PORT_OPTIONS:MSWAT}
-SAMBA_MAN8+=	swat.8
-.endif
-
-.if ${PORT_OPTIONS:MFAM}
-SAMBA_MAN8+=	vfs_notify_fam.8
-.endif
-
-.if ${PORT_OPTIONS:MPTHREADPOOL}
-SAMBA_MAN8+=	vfs_aio_pthread.8
-.endif
-
-.if defined(SAMBA_WANT_LDAP)
-SAMBA_MAN8+=	idmap_ldap.8
-.endif
-
-.if !empty(WANT_EXP_MODULES:Midmap_ad)
-SAMBA_MAN8+=	idmap_ad.8
-.endif
-
-.if !empty(WANT_EXP_MODULES:Midmap_adex)
-SAMBA_MAN8+=	idmap_adex.8
-.endif
-
-.if !empty(WANT_EXP_MODULES:Midmap_hash)
-SAMBA_MAN8+=	idmap_hash.8
-.endif
-
-.if !empty(WANT_EXP_MODULES:Midmap_rid)
-SAMBA_MAN8+=	idmap_rid.8
-.endif
-
-.if !empty(WANT_EXP_MODULES:Mvfs_cacheprime)
-SAMBA_MAN8+=	vfs_cacheprime.8
-.endif
-
-.if !empty(WANT_EXP_MODULES:Mvfs_catia)
-SAMBA_MAN8+=	vfs_catia.8
-.endif
-
-.if !empty(WANT_EXP_MODULES:Mvfs_commit)
-SAMBA_MAN8+=	vfs_commit.8
-.endif
-
-.if !empty(WANT_EXP_MODULES:Mvfs_dirsort)
-SAMBA_MAN8+=	vfs_dirsort.8
-.endif
-
-.if !empty(WANT_EXP_MODULES:Mvfs_streams_depot)
-SAMBA_MAN8+=	vfs_streams_depot.8
-.endif
-
-SAMBA_SUB=	SAMBA_LOGDIR="${SAMBA_LOGDIR}" \
-		SAMBA_LOCKDIR="${SAMBA_LOCKDIR}" \
-		SAMBA_CONFDIR="${SAMBA_CONFDIR}" \
-		SAMBA_CONFIG="${SAMBA_CONFIG}" \
-		SAMBA_RUNDIR="${SAMBA_RUNDIR}" \
-		SAMBA_SWATDIR="${SAMBA_SWATDIR}" \
-		SAMBA_SPOOL="${SAMBA_SPOOL}" \
-		SAMBA_PRIVATEDIR="${SAMBA_PRIVATEDIR}" \
-		PKGCONFIGDIR="${PKGCONFIGDIR_REL}"
-
-PLIST_SUB+=	${SAMBA_SUB}
-SUB_LIST+=	${SAMBA_SUB}
-
-ALL_TARGET=	all
-.if ${PORT_OPTIONS:MSMBTORTURE}
-ALL_TARGET+=	smbtorture
-.endif
-
-# What will be installed
-INSTALL_TARGET=	installservers installbin installscripts installdat \
-		installmodules installlibs
-
-.if ${PORT_OPTIONS:MSWAT}
-INSTALL_TARGET+=installswat
-.endif
-
-pre-configure:
-	@${FIND} ${WRKDIR}/${DISTNAME} -type d | ${XARGS} ${CHMOD} u+w,a+rx
-	@${FIND} ${WRKDIR}/${DISTNAME} -type f | ${XARGS} ${CHMOD} u+w,a+r
-
-post-configure:
-# It's in another port
-	@${RM} -f ${WRKDIR}/${DISTNAME}/docs/htmldocs/manpages/libsmbclient.7.html
-	@${RM} -rf ${WRKDIR}/${DISTNAME}/examples/libsmbclient
-
-pre-install:
-	-@${FIND} "${STAGEDIR}${SAMBA_MODULEDIR}" -type f -o -type l 2>/dev/null | ${SORT} | ${SED} -E 's|^${STAGEDIR}${PREFIX}/?||;' > ${WRKDIR}/.PLIST.exclude
-	@${CAT} ${PKGDIR}/pkg-plist > ${PLIST}
-.if ${PORT_OPTIONS:MSWAT}
-	@${CAT} ${PKGDIR}/pkg-plist.swat >> ${PLIST}
-.endif
-
-post-install:
-	@${RM} -f ${STAGEDIR}/${PREFIX}/bin/findsmb
-.for sect in 1 3 5 7 8
-	@${MKDIR} ${STAGEDIR}${MAN${sect}PREFIX}/man/man${sect}
-.	for man in ${SAMBA_MAN${sect}}
-	    @${INSTALL_MAN} "${WRKDIR}/${DISTNAME}/docs/manpages/${man}" "${STAGEDIR}${MAN${sect}PREFIX}/man/man${sect}"
-	    ${ECHO_CMD} "man/man${sect}/${man}.gz" >> ${TMPPLIST}
-.	endfor
-.endfor
-# Put examples in place
-	@${MKDIR} "${STAGEDIR}${EXAMPLESDIR}"
-	@${CP} -Rp ${WRKDIR}/${DISTNAME}/examples/* "${STAGEDIR}${EXAMPLESDIR}"
-.if ${PORT_OPTIONS:MPAM_SMBPASS}
-	@${MKDIR} "${STAGEDIR}${EXAMPLESDIR}/pam_smbpass"
-	@${CP} -Rp ${WRKSRC}/pam_smbpass/samples/* "${STAGEDIR}${EXAMPLESDIR}/pam_smbpass"
-.endif
-	${INSTALL_DATA} "${WRKDIR}/smb.conf.sample" "${STAGEDIR}${EXAMPLESDIR}/${SAMBA_CONFIG}.sample"
-	${INSTALL_DATA} "${WRKDIR}/smb.conf.sample" "${STAGEDIR}${SAMBA_CONFDIR}/${SAMBA_CONFIG}.sample"
-	${INSTALL_SCRIPT} "${WRKSRC}/script/mksmbpasswd.sh" "${STAGEDIR}${PREFIX}/bin/make_smbpasswd"
-# Winbind
-.if ${PORT_OPTIONS:MWINBIND}
-	${INSTALL_PROGRAM} "${WRKDIR}/${DISTNAME}/nsswitch/nss_winbind.so" "${STAGEDIR}${SAMBA_LIBDIR}/nss_winbind.so.1"
-	${INSTALL_PROGRAM} "${WRKDIR}/${DISTNAME}/nsswitch/nss_wins.so" "${STAGEDIR}${SAMBA_LIBDIR}/nss_wins.so.1"
-	${INSTALL_PROGRAM} "${WRKSRC}/bin/pam_winbind.so" "${STAGEDIR}${SAMBA_LIBDIR}"
-.endif
-.if ${PORT_OPTIONS:MPAM_SMBPASS}
-	${INSTALL_PROGRAM} "${WRKSRC}/bin/pam_smbpass.so" "${STAGEDIR}${SAMBA_LIBDIR}"
-.endif
-# smbtorture
-.if ${PORT_OPTIONS:MSMBTORTURE}
-	${INSTALL_PROGRAM} "${WRKSRC}/bin/smbtorture" "${STAGEDIR}${PREFIX}/bin"
-.endif
-# Lib
-	@${FIND} "${STAGEDIR}${SAMBA_MODULEDIR}" -type f -o -type l | ${SED} -E 's|^${STAGEDIR}${PREFIX}/?||;' | ${EGREP} -F -v -f ${WRKDIR}/.PLIST.exclude | ${SORT} >> ${TMPPLIST}
-	@for d in `${FIND} "${STAGEDIR}${SAMBA_MODULEDIR}" -type d | ${SORT} -r | ${SED} -E 's|^${STAGEDIR}${PREFIX}/?||;'`; do \
-	    ${ECHO_CMD} "@unexec rmdir >/dev/null 2>&1 \"%D/$$d\" || true" >> ${TMPPLIST}; \
-	done
-# Documentation
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@${CP} -Rp "${WRKDIR}/${DISTNAME}/docs/registry" "${STAGEDIR}${DOCSDIR}"
-.	for f in Samba3-ByExample.pdf Samba3-HOWTO.pdf Samba3-Developers-Guide.pdf
-	    @${INSTALL_DATA} "${WRKDIR}/${DISTNAME}/docs/${f}" "${STAGEDIR}${DOCSDIR}"
-.	endfor
-.	for f in README COPYING MAINTAINERS.txt PFIF.txt Manifest Roadmap \
-		WHATSNEW.txt docs/THANKS docs/history
-	    @${INSTALL_DATA} "${WRKDIR}/${DISTNAME}/${f}" "${STAGEDIR}${DOCSDIR}"
-.	endfor
-	@${INSTALL_DATA} "${FILESDIR}/README.FreeBSD" "${STAGEDIR}${DOCSDIR}"
-.endif
-# Run post-install script
-.for dir in ${SAMBA_SPOOL} ${SAMBA_LOGDIR} ${SAMBA_RUNDIR} ${SAMBA_LOCKDIR} ${SAMBA_PRIVATEDIR}
-	@${MKDIR} "${STAGEDIR}${dir}"
-.endfor
-	@${CHMOD} 1777 ${STAGEDIR}${SAMBA_SPOOL}
-	@${CHMOD} 0700 ${STAGEDIR}${SAMBA_PRIVATEDIR}
-	@${CAT} ${PKGMESSAGE}
-
-.if ${PORT_OPTIONS:MMAX_DEBUG}
-test:
-	(cd ${WRKSRC} && ${MAKE_CMD} test_nss_modules test_pam_modules && ${MAKE_CMD} test)
-.endif
-# !SAMBA_SUBPORT
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/net/samba36/distinfo b/net/samba36/distinfo
deleted file mode 100644
index b8a1fa8e7bb3..000000000000
--- a/net/samba36/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-SHA256 (samba-3.6.25.tar.gz) = 8f2c8a7f2bd89b0dfd228ed917815852f7c625b2bc0936304ac3ed63aaf83751
-SIZE (samba-3.6.25.tar.gz) = 34121828
-SHA256 (samba-3.6.25-security-2015-12-16.patch) = abe1ba1a73afe0865f20ac34a207c799cde29d34e736de5c2d029d532c93ac01
-SIZE (samba-3.6.25-security-2015-12-16.patch) = 8023
diff --git a/net/samba36/files/README.FreeBSD b/net/samba36/files/README.FreeBSD
deleted file mode 100644
index 6070b61c81b7..000000000000
--- a/net/samba36/files/README.FreeBSD
+++ /dev/null
@@ -1,32 +0,0 @@
-If you want to run this port:
-
-1. Copy /usr/local/etc/smb.conf.default to /usr/local/etc/smb.conf and edit
-   it.
-2. Put string 'samba_enable="YES"' into your /etc/rc.conf.
-3. Run '/usr/local/etc/rc.d/samba start' or reboot.
-
-This port doesn't create 'smbpasswd' file automatically anymore. Users
-are encouraged to use 'tdbsam' backend instead:
-
-  [global]
-    passdb backend = tdbsam, smbpasswd
-
-You can use pdbedit to migrate accounts from 'smbpasswd' to 'tdbsam',
-see the Samba3-HOWTO-Collection.
-
-You still can create 'smbpasswd' file with the supplied 'make_smbpasswd'
-script:
-
-  cat /etc/passwd | grep -v "^#" | make_smbpasswd > smbpasswd
-  chmod 600 smbpasswd
-
-But the usage of it is deprecated.
-
-See document files in /usr/local/share/doc/samba and example config files in
-/usr/local/share/examples/samba for details.
-
-This port doesn't come anymore with the IDEALX Samba LDAP management tools.
-They are a separate port now, net/smbldap-tools. Please, install it, if you
-are going to use Samba LDAP back end.
-
-FreeBSD Samba3 port maintainer: Timur I. Bakeyev <timur@FreeBSD.org>
diff --git a/net/samba36/files/patch-lib__replace__system__wait.h b/net/samba36/files/patch-lib__replace__system__wait.h
deleted file mode 100644
index 3cfa995371b3..000000000000
--- a/net/samba36/files/patch-lib__replace__system__wait.h
+++ /dev/null
@@ -1,21 +0,0 @@
---- ./lib/replace/system/wait.h.orig	2010-04-01 15:26:22.000000000 +0200
-+++ ./lib/replace/system/wait.h	2010-04-23 01:08:35.000000000 +0200
-@@ -32,6 +32,18 @@
- 
- #include <signal.h>
- 
-+#ifndef SIGRTMIN
-+#	ifdef NSIG
-+#		define SIGRTMIN (NSIG+1)
-+#	else
-+#		define SIGRTMIN 33
-+#	endif
-+#endif
-+
-+#ifndef SIGRTMAX
-+#define SIGRTMAX (SIGRTMIN+64)
-+#endif
-+
- #ifndef SIGCLD
- #define SIGCLD SIGCHLD
- #endif
diff --git a/net/samba36/files/patch-lib__tevent__tevent_signal.c b/net/samba36/files/patch-lib__tevent__tevent_signal.c
deleted file mode 100644
index d62b2e6eec8d..000000000000
--- a/net/samba36/files/patch-lib__tevent__tevent_signal.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./lib/tevent/tevent_signal.c.orig	2010-04-01 15:26:22.000000000 +0200
-+++ ./lib/tevent/tevent_signal.c	2010-04-23 01:08:35.000000000 +0200
-@@ -30,7 +30,7 @@
- #include "tevent_internal.h"
- #include "tevent_util.h"
- 
--#define TEVENT_NUM_SIGNALS 64
-+#define TEVENT_NUM_SIGNALS (SIGRTMAX+1)
- 
- /* maximum number of SA_SIGINFO signals to hold in the queue.
-   NB. This *MUST* be a power of 2, in order for the ring buffer
diff --git a/net/samba36/files/patch-nsswitch__pam_winbind.c b/net/samba36/files/patch-nsswitch__pam_winbind.c
deleted file mode 100644
index 9c32da334bd8..000000000000
--- a/net/samba36/files/patch-nsswitch__pam_winbind.c
+++ /dev/null
@@ -1,52 +0,0 @@
---- ./nsswitch/pam_winbind.c.orig	2011-08-09 13:17:47.000000000 +0200
-+++ ./nsswitch/pam_winbind.c	2011-09-06 23:23:18.000000000 +0200
-@@ -163,7 +163,6 @@
- }
- #endif
- 
--
- /*
-  * Work around the pam API that has functions with void ** as parameters
-  * These lead to strict aliasing warnings with gcc.
-@@ -173,14 +172,20 @@
- 			 const void *_item)
- {
- 	const void **item = (const void **)_item;
--	return pam_get_item(pamh, item_type, item);
-+	return pam_get_item((pam_handle_t *)pamh, item_type, item);
- }
-+
- static int _pam_get_data(const pam_handle_t *pamh,
- 			 const char *module_data_name,
- 			 const void *_data)
- {
-+#if PAM_GET_DATA_ARG3_CONST_VOID_PP
- 	const void **data = (const void **)_data;
--	return pam_get_data(pamh, module_data_name, data);
-+	return pam_get_data((pam_handle_t *)pamh, module_data_name, data);
-+#else
-+	void **data = (void **)_data;
-+	return pam_get_data((pam_handle_t *)pamh, module_data_name, data);
-+#endif
- }
- 
- /* some syslogging */
-@@ -311,7 +316,7 @@
- 	if (item_type != 0) {
- 		pam_get_item(ctx->pamh, item_type, &data);
- 	} else {
--		pam_get_data(ctx->pamh, key, &data);
-+		_pam_get_data(ctx->pamh, key, &data);
- 	}
- 	if (data != NULL) {
- 		const char *type = (item_type != 0) ? "ITEM" : "DATA";
-@@ -2835,8 +2840,7 @@
- 		ret = PAM_USER_UNKNOWN;
- 		goto out;
- 	case 0:
--		pam_get_data(pamh, PAM_WINBIND_NEW_AUTHTOK_REQD,
--			     (const void **)&tmp);
-+		_pam_get_data(pamh, PAM_WINBIND_NEW_AUTHTOK_REQD, &tmp);
- 		if (tmp != NULL) {
- 			ret = atoi((const char *)tmp);
- 			switch (ret) {
diff --git a/net/samba36/files/patch-nsswitch__winbind_nss_freebsd.c b/net/samba36/files/patch-nsswitch__winbind_nss_freebsd.c
deleted file mode 100644
index 103059a96790..000000000000
--- a/net/samba36/files/patch-nsswitch__winbind_nss_freebsd.c
+++ /dev/null
@@ -1,100 +0,0 @@
---- ./nsswitch/winbind_nss_freebsd.c.orig	2012-10-02 08:24:41.000000000 +0000
-+++ ./nsswitch/winbind_nss_freebsd.c	2013-03-13 09:40:37.285778609 +0000
-@@ -5,6 +5,7 @@
-    routines against Samba winbind/Windows NT Domain
- 
-    Copyright (C) Aaron Collins 2003
-+   Copyright (C) Timur I. Bakeyev 2013
- 
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-@@ -53,6 +54,9 @@
- NSS_METHOD_PROTOTYPE(__nss_compat_getpwent_r);
- NSS_METHOD_PROTOTYPE(__nss_compat_setpwent);
- NSS_METHOD_PROTOTYPE(__nss_compat_endpwent);
-+NSS_METHOD_PROTOTYPE(__nss_compat_endpwent);
-+
-+NSS_METHOD_PROTOTYPE(__freebsd_getgroupmembership);
- 
- static ns_mtab methods[] = {
- { NSDB_GROUP, "getgrnam_r", __nss_compat_getgrnam_r, _nss_winbind_getgrnam_r },
-@@ -60,6 +64,7 @@
- { NSDB_GROUP, "getgrent_r", __nss_compat_getgrent_r, _nss_winbind_getgrent_r },
- { NSDB_GROUP, "setgrent",   __nss_compat_setgrent,   _nss_winbind_setgrent },
- { NSDB_GROUP, "endgrent",   __nss_compat_endgrent,   _nss_winbind_endgrent },
-+{ NSDB_GROUP, "getgroupmembership", __freebsd_getgroupmembership, NULL },
- 
- { NSDB_PASSWD, "getpwnam_r", __nss_compat_getpwnam_r, _nss_winbind_getpwnam_r },
- { NSDB_PASSWD, "getpwuid_r", __nss_compat_getpwuid_r, _nss_winbind_getpwuid_r },
-@@ -69,6 +74,71 @@
- 
- };
- 
-+/* Taken from libc */
-+static int
-+gr_addgid(gid_t gid, gid_t *groups, int maxgrp, int *grpcnt)
-+{
-+	int	ret, dupc;
-+
-+	/* skip duplicates */
-+	for (dupc = 0; dupc < MIN(maxgrp, *grpcnt); dupc++) {
-+		if (groups[dupc] == gid)
-+			return 1;
-+	}
-+
-+	ret = 1;
-+	if (*grpcnt < maxgrp)			/* add this gid */
-+		groups[*grpcnt] = gid;
-+	else
-+		ret = 0;
-+
-+	(*grpcnt)++;
-+
-+	return ret;
-+}
-+
-+/*
-+    rv = _nsdispatch(NULL, dtab, NSDB_GROUP, "getgroupmembership",
-+	            defaultsrc, uname, agroup, groups, maxgrp, grpcnt);
-+*/
-+
-+int
-+__freebsd_getgroupmembership(void *retval, void *mdata, va_list ap)
-+{
-+	const char 	*uname  = va_arg(ap, const char *);
-+	gid_t		 group  = va_arg(ap, gid_t);
-+	gid_t		*groups = va_arg(ap, gid_t *);
-+	int		 maxgrp = va_arg(ap, int);
-+	int		*groupc = va_arg(ap, int *);
-+
-+	NSS_STATUS ret;
-+	long int lcount, lsize;
-+	int i, errnop;
-+	gid_t *tmpgroups;
-+
-+	/* Can be realloc() inside _nss_winbind_initgroups_dyn() */
-+	if ((tmpgroups=calloc(maxgrp, sizeof(gid_t))) == NULL) {
-+		errno = ENOMEM;
-+		return NS_TRYAGAIN;
-+	}
-+
-+	lcount = 0;
-+	lsize = maxgrp;
-+	/* insert primary membership(possibly already there) */
-+	gr_addgid(group, groups, maxgrp, groupc);
-+	/* Don't limit number of groups, we want to know total size */
-+	ret = _nss_winbind_initgroups_dyn(uname, group, &lcount, &lsize,
-+		&tmpgroups, 0, &errnop);
-+	if (ret == NSS_STATUS_SUCCESS) {
-+		/* lcount potentially can be bigger than maxgrp, so would groupc */
-+		for (i = 0; i < lcount; i++)
-+			 gr_addgid(tmpgroups[i], groups, maxgrp, groupc);
-+	}
-+	free(tmpgroups);
-+	/* Let following nsswitch backend(s) add more groups(?) */
-+	return NSS_STATUS_NOTFOUND;
-+}
-+
- ns_mtab *
- nss_module_register(const char *source, unsigned int *mtabsize,
-     nss_module_unregister_fn *unreg)
diff --git a/net/samba36/files/patch-nsswitch__wins_freebsd.c b/net/samba36/files/patch-nsswitch__wins_freebsd.c
deleted file mode 100644
index e0f837760482..000000000000
--- a/net/samba36/files/patch-nsswitch__wins_freebsd.c
+++ /dev/null
@@ -1,82 +0,0 @@
---- ./nsswitch/wins_freebsd.c.orig	2010-04-23 01:08:35.000000000 +0200
-+++ ./nsswitch/wins_freebsd.c	2010-04-23 01:08:35.000000000 +0200
-@@ -0,0 +1,79 @@
-+/*
-+   Unix SMB/CIFS implementation.
-+
-+   Copyright (C) Timur I. Bakeyev 2007
-+
-+   This library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Library General Public
-+   License as published by the Free Software Foundation; either
-+   version 2 of the License, or (at your option) any later version.
-+
-+   This library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Library General Public License for more details.
-+
-+   You should have received a copy of the GNU Library General Public
-+   License along with this library; if not, write to the
-+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+   Boston, MA  02111-1307, USA.
-+*/
-+
-+#include "winbind_client.h"
-+
-+NSS_STATUS _nss_wins_gethostbyname2_r(const char *name, int af, struct hostent *he,
-+			   char *buffer, size_t buflen, int *h_errnop);
-+
-+NSS_METHOD_PROTOTYPE(__nss_wins_freebsd_gethostbyname2_r);
-+
-+static ns_mtab methods[] =
-+{
-+	{ NSDB_HOSTS, "getaddrinfo",	  NULL, NULL },
-+	{ NSDB_HOSTS, "ghbyname",	  NULL, NULL },
-+	{ NSDB_HOSTS, "ghbyaddr",	  NULL, NULL },
-+	{ NSDB_HOSTS, "gethostbyaddr_r",  NULL, NULL },
-+	{ NSDB_HOSTS, "gethostbyname2_r", __nss_wins_freebsd_gethostbyname2_r, _nss_wins_gethostbyname2_r },
-+	{ NSDB_HOSTS, "getnetbyname_r",	  NULL, NULL },
-+	{ NSDB_HOSTS, "getnetbyaddr_r",	  NULL, NULL },
-+	{ NSDB_HOSTS, "gethostbyname",	  NULL, NULL },
-+	{ NSDB_HOSTS, "gethostbyaddr",	  NULL, NULL },
-+	{ NSDB_HOSTS, "getnetbyname",	  NULL, NULL },
-+	{ NSDB_HOSTS, "getnetbyaddr",	  NULL, NULL }
-+};
-+
-+int
-+__nss_wins_freebsd_gethostbyname2_r(void *retval, void *mdata, va_list ap)
-+{
-+	int (*fn)(const char *, int, struct hostent *, char *, size_t, int *);
-+	const char	*hostname;
-+	int		af;
-+	struct hostent	*he;
-+	char		*buffer;
-+	size_t		buflen;
-+	int		*h_errnop;
-+	enum nss_status	status;
-+	
-+	fn = mdata;
-+	hostname = va_arg(ap, const char *);
-+	af = va_arg(ap, int);
-+	he = va_arg(ap, struct hostent *);
-+	buffer = va_arg(ap, char *);
-+	buflen = va_arg(ap, size_t);
-+	h_errnop = va_arg(ap, int *);
-+
-+	status = fn(hostname, af, he, buffer, buflen, h_errnop);
-+	status = __nss_compat_result(status, *h_errnop);
-+	if (status == NS_SUCCESS)
-+		*(struct hostent **)retval = he;
-+	
-+	return (status);
-+}
-+
-+ns_mtab *
-+nss_module_register(const char *source __unused, unsigned int *mtabsize,
-+    nss_module_unregister_fn *unreg)
-+{
-+	*mtabsize = sizeof(methods) / sizeof(methods[0]);
-+	*unreg = NULL;
-+	return (methods);
-+}
diff --git a/net/samba36/files/patch-source3__Makefile.in b/net/samba36/files/patch-source3__Makefile.in
deleted file mode 100644
index 084dd93c0b10..000000000000
--- a/net/samba36/files/patch-source3__Makefile.in
+++ /dev/null
@@ -1,62 +0,0 @@
---- ./source3/Makefile.in.orig	2013-06-19 07:35:24.000000000 +0000
-+++ ./source3/Makefile.in	2013-06-30 04:26:08.399888796 +0000
-@@ -151,7 +151,7 @@
- # These can be overridden by command line switches (see smbd(8))
- # or in smb.conf (see smb.conf(5))
- LOGFILEBASE = @logfilebase@
--CONFIGFILE = $(CONFIGDIR)/smb.conf
-+CONFIGFILE = $(CONFIGDIR)/%%SAMBA_CONFIG%%
- LMHOSTSFILE = $(CONFIGDIR)/lmhosts
- NCALRPCDIR = @ncalrpcdir@
- 
-@@ -1305,8 +1305,8 @@
-                  $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) \
- 		 $(LIBNDR_GEN_OBJ0)
- 
--WINBIND_WINS_NSS_OBJ = ../nsswitch/wins.o $(PARAM_OBJ) \
--	$(LIB_NONSMBD_OBJ) $(LIBSMB_ERR_OBJ) $(LIBNMB_OBJ)
-+WINBIND_WINS_NSS_OBJ = ../nsswitch/wins.o @WINBIND_WINS_NSS_EXTRA_OBJS@ \
-+		$(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(LIBSMB_ERR_OBJ) $(LIBNMB_OBJ)
- 
- PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o pam_smbpass/pam_smb_passwd.o \
- 		pam_smbpass/pam_smb_acct.o pam_smbpass/support.o ../lib/util/asn1.o
-@@ -1623,6 +1623,7 @@
- 
- .SUFFIXES:
- .SUFFIXES: .c .o .lo
-+.SUFFIXES: .h .h.gch
- 
- .PHONY: showflags SHOWFLAGS
- 
-@@ -1684,6 +1685,9 @@
- 		$(COMPILE_CC) >/dev/null 2>&1
- @BROKEN_CC@	-mv `echo $@ | sed 's%^.*/%%g'` $@
- 
-+.h.h.gch:
-+	@echo Compiling $*.h
-+
- PRECOMPILED_HEADER = $(builddir)/include/includes.h.gch
- 
- # this adds support for precompiled headers. To use it, install a snapshot
-@@ -2856,9 +2860,9 @@
- 		$(LDAP_LIBS) $(KRB5LIBS) $(LIBS) $(LIBTALLOC_LIBS) $(LIBTEVENT_LIBS) $(LIBTDB_LIBS) $(ZLIB_LIBS) \
- 		@SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@
- 
--bin/winbind_krb5_locator.@SHLIBEXT@: $(BINARY_PREREQS) $(WINBIND_KRB5_LOCATOR_OBJ) $(LIBWBCLIENT)
-+bin/winbind_krb5_locator.@SHLIBEXT@: $(BINARY_PREREQS) $(WINBIND_KRB5_LOCATOR_OBJ) $(LIBTALLOC) $(LIBWBCLIENT)
- 	@echo "Linking $@"
--	@$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_KRB5_LOCATOR_OBJ) $(LIBWBCLIENT_LIBS) $(KRB5LIBS) \
-+	@$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_KRB5_LOCATOR_OBJ) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) $(KRB5LIBS) \
- 		$(LIBREPLACE_LIBS) @SONAMEFLAG@`basename $@`
- 
- bin/pam_winbind.@SHLIBEXT@: $(BINARY_PREREQS) $(PAM_WINBIND_OBJ) $(LIBTALLOC) $(LIBTEVENT) $(LIBWBCLIENT)
-@@ -3215,7 +3219,8 @@
- 	@echo "Linking shared library $@"
- 	@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_OBJ) $(LIBCLI_LDAP_NDR_OBJ) -lpam $(DYNEXP) \
- 		$(LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
--		$(LIBTALLOC_LIBS) $(LIBTEVENT_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS)
-+		$(LIBTALLOC_LIBS) $(LIBTEVENT_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) \
-+		@SONAMEFLAG@`basename $@`
- 
- bin/tdbbackup@EXEEXT@: $(BINARY_PREREQS) $(TDBBACKUP_OBJ) $(LIBTALLOC) $(LIBTDB)
- 	@echo Linking $@
diff --git a/net/samba36/files/patch-source3__configure.in b/net/samba36/files/patch-source3__configure.in
deleted file mode 100644
index 30a50f9ade93..000000000000
--- a/net/samba36/files/patch-source3__configure.in
+++ /dev/null
@@ -1,210 +0,0 @@
---- ./source3/configure.in.orig	2013-01-18 10:41:08.000000000 +0000
-+++ ./source3/configure.in	2013-01-30 01:24:19.349878982 +0000
-@@ -864,9 +864,13 @@
- 	AC_PATH_PROG(CUPS_CONFIG, cups-config)
- 
-         if test "x$CUPS_CONFIG" != x; then
-+		ac_save_PRINT_CPPFLAGS=$CPPFLAGS
-+		ac_save_PRINT_LDFLAGS=$LDFLAGS
- 
--		ac_save_LDFLAGS=$LDFLAGS
- 		ac_save_PRINT_LIBS=$PRINT_LIBS
-+		CPPFLAGS="$CPPFLAGS `$CUPS_CONFIG --cflags`"
-+		LDFLAGS="$LDFLAGS `$CUPS_CONFIG --ldflags`"
-+
- 		AC_CHECK_HEADERS(cups/cups.h cups/language.h)
- 
- 		if test x"$ac_cv_header_cups_cups_h" = xyes -a \
-@@ -875,7 +879,7 @@
- 			# underlinked. With cups-config --libs we pull in unwanted and unneeded
- 			# dendencies including thread libraries - use cups-config only if really
- 			# required. 
--			AC_CHECK_LIB_EXT(cups, ac_save_PRINT_LIBS , httpConnect,
-+			AC_CHECK_LIB_EXT(cups, ac_save_PRINT_LIBS, httpConnect,
- 				[PRINT_LIBS="$ac_save_PRINT_LIBS -lcups"],
- 				[AC_MSG_WARN([your cups library doesn't link with -lcups alone, it might be underlinked.]) ;
- 				 PRINT_LIBS="$ac_save_PRINT_LIBS `$CUPS_CONFIG --libs`"])
-@@ -885,10 +889,10 @@
- 			AC_CHECK_LIB_EXT(cups, PRINT_LIBS, httpConnectEncrypt)
- 		else
- 			AC_MSG_WARN([cups-config around but cups-devel not installed])
--			CFLAGS=$ac_save_CFLAGS
--			LDFLAGS=$ac_save_LDFLAGS
- 			PRINT_LIBS=$ac_save_PRINT_LIBS
- 		fi
-+		CPPFLAGS=$ac_save_PRINT_CPPFLAGS
-+		LDFLAGS=$ac_save_PRINT_LDFLAGS
- 
- 	elif test x"$enable_cups" = x"yes"; then
- 		AC_MSG_ERROR(Cups support required but cups-config not located.  Make sure cups-devel related files are installed.)
-@@ -1845,7 +1849,7 @@
- fi
- 
- if test x"$BLDSHARED" = x"true" ; then
--	LDFLAGS="$LDFLAGS -L./bin"
-+	LDFLAGS="-L./bin $LDFLAGS"
- fi
- 
- AC_MSG_RESULT($BLDSHARED)
-@@ -1976,9 +1980,6 @@
- AC_MSG_CHECKING([PICFLAG])
- AC_MSG_RESULT([$PICFLAG])
- 
--AC_MSG_CHECKING([NSSSONAMEVERSIONSUFFIX])
--AC_MSG_RESULT([$NSSSONAMEVERSIONSUFFIX])
--
- AC_CACHE_CHECK([whether building shared libraries actually works],
-                [ac_cv_shlib_works],[
-    # try building a trivial shared library
-@@ -4656,15 +4657,51 @@
- 		x"$ac_cv_header_pam_pam_modules_h" = x"no" ; then
- 		if test x"${try_pam}" = x"yes";then
- 			AC_MSG_ERROR([--with-pam=yes but pam_modules.h not found])
--       fi
-+		fi
- 		create_pam_modules=no
--    fi
-+	fi
- 
- 	if test x"$use_pam" = x"yes"; then
--    AC_DEFINE(WITH_PAM,1,[Whether to include PAM support])
-+		AC_DEFINE(WITH_PAM,1,[Whether to include PAM support])
- 		AC_DEFINE(HAVE_LIBPAM,1,[Whether libpam is available])
- 		AUTH_LIBS="$AUTH_LIBS $PAM_LIBS"
--    with_pam_for_crypt=yes
-+		with_pam_for_crypt=yes
-+
-+		AC_VERIFY_C_PROTOTYPE(
-+			[int pam_get_data(const pam_handle_t *pamh, const char *module_data_name, const void **data)],
-+			[return 0;],
-+			[AC_DEFINE(PAM_GET_DATA_ARG3_CONST_VOID_PP, 1, [Whether pam_get_data 3 argument is a const pointer to pointer])],
-+			[
-+			dnl Old OpenPAM declaration
-+			AC_VERIFY_C_PROTOTYPE(
-+				[int pam_get_data(pam_handle_t *pamh, const char *module_data_name, void **data)],
-+				[return 0;],
-+				[AC_DEFINE(PAM_GET_DATA_ARG3_VOID_PP, 1, [Whether pam_get_data 3 argument is a void pointer to pointer])],
-+				[], [
-+					#include <sys/types.h>
-+					#if HAVE_SECURITY_PAM_APPL_H
-+					#include <security/pam_appl.h>
-+					#endif
-+					#if HAVE_PAM_PAM_APPL_H
-+					#include <pam/pam_appl.h>
-+					#endif
-+					#if HAVE_SECURITY_PAM_MODULES_H
-+					#include <security/pam_modules.h>
-+					#endif
-+				]
-+			)],[
-+				#include <sys/types.h>
-+				#if HAVE_SECURITY_PAM_APPL_H
-+				#include <security/pam_appl.h>
-+				#endif
-+				#if HAVE_PAM_PAM_APPL_H
-+				#include <pam/pam_appl.h>
-+				#endif
-+				#if HAVE_SECURITY_PAM_MODULES_H
-+				#include <security/pam_modules.h>
-+				#endif
-+			]
-+		)
- 
- 		if test x"$create_pam_modules" = x"yes"; then
- 			AC_DEFINE(WITH_PAM_MODULES,1,[Whether to include PAM MODULES support])
-@@ -4674,7 +4711,7 @@
- 			AC_CHECK_HEADERS(pam/pam_ext.h pam/_pam_macros.h)
- 			AC_CHECK_FUNC_EXT(pam_vsyslog,$PAM_LIBS)
- 		else
--			AC_MSG_WARN([PAM support detected but PAM MODULES support is missing])		
-+			AC_MSG_WARN([PAM support detected but PAM MODULES support is missing])
- 		fi
- 	fi
- 	AC_MSG_CHECKING(whether to use PAM support)
-@@ -5877,7 +5914,7 @@
- 
- 			AC_MSG_CHECKING(for aio_suspend)
- 			AC_LINK_IFELSE([#include <aio.h>
--int main() { struct aiocb a; struct timespec t; return aio_suspend(&a, 1, &t); }],
-+int main() { struct aiocb *a[[1]]; struct timespec t; return aio_suspend((const struct aiocb**)&a, 1, &t); }],
- [AC_DEFINE(HAVE_AIO_SUSPEND, 1, [Have aio_suspend]) AC_MSG_RESULT(yes)],
- [AC_MSG_RESULT(no)])
- 		fi
-@@ -6336,12 +6373,13 @@
- 		NSSSONAMEVERSIONSUFFIX=".2"
- 		WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_linux.o"
- 		;;
--	*freebsd[[5-9]]*)
-+	*freebsd*)
- 		# FreeBSD winbind client is implemented as a wrapper around
- 		# the Linux version.
- 		NSSSONAMEVERSIONSUFFIX=".1"
- 		WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_freebsd.o \
- 		    ../nsswitch/winbind_nss_linux.o"
-+		WINBIND_WINS_NSS_EXTRA_OBJS="../nsswitch/wins_freebsd.o"
- 		WINBIND_NSS="../nsswitch/nss_winbind.$SHLIBEXT"
- 		WINBIND_WINS_NSS="../nsswitch/nss_wins.$SHLIBEXT"
- 		;;
-@@ -6488,10 +6526,14 @@
-         AC_MSG_RESULT(no$winbind_no_reason)
- fi
- 
-+AC_MSG_CHECKING([NSSSONAMEVERSIONSUFFIX])
-+AC_MSG_RESULT([$NSSSONAMEVERSIONSUFFIX])
-+
- AC_SUBST(WINBIND_NSS)
- AC_SUBST(WINBIND_WINS_NSS)
- AC_SUBST(WINBIND_NSS_LDSHFLAGS)
- AC_SUBST(WINBIND_NSS_EXTRA_OBJS)
-+AC_SUBST(WINBIND_WINS_NSS_EXTRA_OBJS)
- AC_SUBST(NSSSONAMEVERSIONSUFFIX)
- 
- AC_SUBST(WINBIND_KRB5_LOCATOR)
-@@ -6810,13 +6852,21 @@
- # Start
- AC_CHECK_FUNC(getmntent)
- 
--AC_CHECK_HEADERS(sys/statfs.h)
-+AC_CHECK_HEADERS(sys/statfs.h sys/mount.h)
- 
- AC_MSG_CHECKING([vfs_fileid: checking for statfs() and struct statfs.f_fsid)])
- AC_CACHE_VAL(vfsfileid_cv_statfs,[
- 	     AC_TRY_RUN([
- 		#include <sys/types.h>
-+		#ifdef HAVE_SYS_PARAM_H
-+		#include <sys/param.h>
-+		#endif
-+		#ifdef HAVE_SYS_MOUNT_H
-+		#include <sys/mount.h>
-+		#endif
-+		#ifdef HAVE_SYS_STATFS_H
- 		#include <sys/statfs.h>
-+		#endif
- 		int main(void)
- 		{
- 			struct statfs fsd;
-@@ -7116,6 +7166,16 @@
- 	LIBS="$LIBS -ldmalloc"
- fi
- 
-+AC_ARG_ENABLE(dmalloc, [AS_HELP_STRING([--enable-dmalloc], [Enable heap debugging [default=no]])])
-+
-+if test "x$enable_dmalloc" = xyes
-+then
-+	AC_DEFINE(ENABLE_DMALLOC, 1, [Define to turn on dmalloc debugging])
-+	AC_DEFINE(DMALLOC_FUNC_CHECK, 1,
-+                  [Define to check invariants around some common functions])
-+	LIBS="$LIBS -ldmalloc"	
-+fi
-+
- dnl Remove -L/usr/lib/? from LDFLAGS and LIBS
- LIB_REMOVE_USR_LIB(LDFLAGS)
- LIB_REMOVE_USR_LIB(LIBS)
-@@ -7164,6 +7224,7 @@
- AC_SUBST(SMBD_LIBS)
- 
- CFLAGS="${CFLAGS} \$(FLAGS)"
-+CFLAGS="${CFLAGS} -I%%LOCALBASE%%/include"
- CFLAGS="${CFLAGS} -D_SAMBA_BUILD_=3"
- 
- # If we had to expand the includes, make tsure the output file is moved back
diff --git a/net/samba36/files/patch-source3__include__includes.h b/net/samba36/files/patch-source3__include__includes.h
deleted file mode 100644
index 2f6978cafb50..000000000000
--- a/net/samba36/files/patch-source3__include__includes.h
+++ /dev/null
@@ -1,24 +0,0 @@
---- ./source3/include/includes.h.orig	2011-08-09 13:17:47.000000000 +0200
-+++ ./source3/include/includes.h	2011-10-04 00:34:33.000000000 +0200
-@@ -161,6 +161,10 @@
- #include <sys/uio.h>
- #endif
- 
-+#ifdef HAVE_SYS_SYSCTL_H
-+#include <sys/sysctl.h>
-+#endif
-+
- #if HAVE_LANGINFO_H
- #include <langinfo.h>
- #endif
-@@ -548,10 +552,6 @@
- #define SIGCLD SIGCHLD
- #endif
- 
--#ifndef SIGRTMIN
--#define SIGRTMIN NSIG
--#endif
--
- #if defined(HAVE_PUTPRPWNAM) && defined(AUTH_CLEARTEXT_SEG_CHARS)
- #define OSF1_ENH_SEC 1
- #endif
diff --git a/net/samba36/files/patch-source3__lib__fault.c b/net/samba36/files/patch-source3__lib__fault.c
deleted file mode 100644
index c6525d30442f..000000000000
--- a/net/samba36/files/patch-source3__lib__fault.c
+++ /dev/null
@@ -1,164 +0,0 @@
---- ./source3/lib/fault.c.orig	2010-04-01 15:26:22.000000000 +0200
-+++ ./source3/lib/fault.c	2010-04-23 01:08:35.000000000 +0200
-@@ -26,6 +26,10 @@
- #endif
- 
- 
-+#ifdef HAVE_SYS_SYSCTL_H
-+#include <sys/sysctl.h>
-+#endif
-+
- #ifdef HAVE_SYS_PRCTL_H
- #include <sys/prctl.h>
- #endif
-@@ -144,52 +148,93 @@
-  * before dump_core() calls abort.
-  */
- #if (defined(FREEBSD) && defined(HAVE_SYSCTLBYNAME))
--static char *get_freebsd_corepath(void)
-+/*
-+ * Expand the name described in corefilename, using name, uid, and pid.
-+ * corefilename is a printf-like string, with three format specifiers:
-+ *	%N	name of process ("name")
-+ *	%P	process id (pid)
-+ *	%U	user id (uid)
-+ * For example, "%N.core" is the default; they can be disabled completely
-+ * by using "/dev/null", or all core files can be stored in "/cores/%U/%N-%P".
-+ */
-+static char *get_freebsd_corepath(const char *name)
- {
--	char *tmp_corepath = NULL;
--	char *end = NULL;
--	size_t len = 128;
-+	TALLOC_CTX *tmp_ctx;
-+	char format[MAXPATHLEN];
-+	char *freebsd_corepath = NULL, *buffer = NULL;
-+	char *start, *end;
-+	size_t len;
- 	int ret;
- 
--	/* Loop with increasing sizes so we don't allocate too much. */
--	do {
--		if (len > 1024)  {
--			goto err_out;
--		}
--
--		tmp_corepath = (char *)talloc_realloc(NULL, tmp_corepath,
--						      char, len);
--		if (!tmp_corepath) {
--			return NULL;
--		}
--
--		ret = sysctlbyname("kern.corefile", tmp_corepath, &len, NULL,
--				   0);
--		if (ret == -1) {
--			if (errno != ENOMEM) {
--				DEBUG(0, ("sysctlbyname failed getting "
--					  "kern.corefile %s\n",
--					  strerror(errno)));
--				goto err_out;
--			}
--
--			/* Not a large enough array, try a bigger one. */
--			len = len << 1;
--		}
--	} while (ret == -1);
--
-+	len = sizeof(format);
-+	/* Read format string */
-+	if((ret = sysctlbyname("kern.corefile", format, &len, NULL, 0)) == -1) {
-+		return NULL;
-+	}
- 	/* Strip off the common filename expansion */
--	if ((end = strrchr_m(tmp_corepath, '/'))) {
-+	if ((end=strrchr_m(format, '/')) != NULL) {
- 		*end = '\0';
- 	}
-+	/* Core file is relative to the cwd */
-+	if(!format[0] || format[0] != '/') {
-+		return NULL;
-+	}
- 
--	return tmp_corepath;
--
-- err_out:
--	if (tmp_corepath) {
--		talloc_free(tmp_corepath);
-+	if((tmp_ctx = talloc_new(NULL)) == NULL) {
-+		DEBUG(0, ("talloc_new failed\n"));
-+		return NULL;
- 	}
--	return NULL;
-+	if((buffer = talloc_strdup(tmp_ctx, "")) == NULL) {
-+		DEBUG(0, ("talloc_strdup: Out of memory!\n"));
-+		goto failed;
-+	}
-+	/* Parse format string and expand variables */
-+	start = format;
-+	while((end=strchr_m(start, '%')) != NULL) {
-+		/* Copy part of the string without format arguments */
-+		if(end != start) {
-+			buffer = talloc_strndup_append_buffer(buffer, start, end - start);
-+			if(buffer == NULL) {
-+				DEBUG(0, ("talloc_strdup: Out of memory!\n"));
-+				goto failed;
-+			}
-+		}
-+		start = end + 1;
-+		switch (*start) {
-+			case '%':
-+				buffer = talloc_strdup_append_buffer(buffer, "%%");
-+				break;
-+			case 'N':	/* process name */
-+				buffer = talloc_asprintf_append_buffer(buffer, "%s", name);
-+				break;
-+			case 'P':	/* process id */
-+				buffer = talloc_asprintf_append_buffer(buffer, "%u", getpid());
-+				break;
-+			case 'U':	/* user id */
-+				buffer = talloc_asprintf_append_buffer(buffer, "%u", getuid());
-+				break;
-+			default:
-+				DEBUG(0,(
-+				    "Unknown format character %c in "
-+				    "corename `%s'\n", *start, format));
-+		}
-+		if(buffer == NULL) {
-+			DEBUG(0, ("talloc_asprintf_append_buffer: Out of memory!\n"));
-+			goto failed;
-+		}
-+		start++;
-+	}
-+	/* Copy remaining part, if any */
-+	if((buffer = talloc_strdup_append_buffer(buffer, start)) == NULL) {
-+		DEBUG(0, ("talloc_strdup_append_buffer: Out of memory!\n"));
-+		goto failed;
-+	}
-+	/* Duplicate assembled string in the unattached contenxt */
-+	freebsd_corepath = talloc_strdup(NULL, buffer);
-+failed:
-+	TALLOC_FREE(tmp_ctx);
-+
-+	return freebsd_corepath;
- }
- #endif
- 
-@@ -248,8 +293,7 @@
- {
- #if (defined(FREEBSD) && defined(HAVE_SYSCTLBYNAME))
- 	char *tmp_corepath = NULL;
--	tmp_corepath = get_freebsd_corepath();
--
-+	tmp_corepath = get_freebsd_corepath(progname);
- 	/* If this has been set correctly, we're done. */
- 	if (tmp_corepath) {
- 		return tmp_corepath;
-@@ -327,7 +371,7 @@
- 	SAFE_FREE(logbase);
- }
- 
-- void dump_core(void)
-+void dump_core(void)
- {
- 	static bool called;
- 
diff --git a/net/samba36/files/patch-source3__lib__system.c b/net/samba36/files/patch-source3__lib__system.c
deleted file mode 100644
index c2f1b0635e80..000000000000
--- a/net/samba36/files/patch-source3__lib__system.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./source3/lib/system.c.orig	2011-08-09 13:17:47.000000000 +0200
-+++ ./source3/lib/system.c	2011-10-13 23:38:02.000000000 +0200
-@@ -2586,14 +2586,14 @@
- }
- 
- /*******************************************************************
-- An aio_fsync wrapper that will deal with 64-bit sizes.
-+ An aio_suspend wrapper that will deal with 64-bit sizes.
- ********************************************************************/
- 
- int sys_aio_suspend(const SMB_STRUCT_AIOCB * const cblist[], int n, const struct timespec *timeout)
- {
- #if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_AIOCB64) && defined(HAVE_AIO_SUSPEND64)
-         return aio_suspend64(cblist, n, timeout);
--#elif defined(HAVE_AIO_FSYNC)
-+#elif defined(HAVE_AIO_SUSPEND)
-         return aio_suspend(cblist, n, timeout);
- #else
- 	errno = ENOSYS;
diff --git a/net/samba36/files/patch-source3__m4__aclocal.m4 b/net/samba36/files/patch-source3__m4__aclocal.m4
deleted file mode 100644
index 357dcf2e8366..000000000000
--- a/net/samba36/files/patch-source3__m4__aclocal.m4
+++ /dev/null
@@ -1,163 +0,0 @@
---- ./source3/m4/aclocal.m4.orig	2012-09-14 08:12:09.000000000 +0000
-+++ ./source3/m4/aclocal.m4	2012-10-20 13:13:36.975802862 +0000
-@@ -385,7 +385,7 @@
-   ac_new_flags=""
-   for i in [$]$1; do
-     case [$]i in
--    -I/usr/include|-I/usr/include/) ;;
-+    -I/usr/include|-I/usr/include/|-I%%LOCALBASE%%/include/|-I%%LOCALBASE%%/include) f=1;;
-     *) ac_new_flags="[$]ac_new_flags [$]i" ;;
-     esac
-   done
-@@ -437,104 +437,81 @@
-   dnl those with the standalone portable libiconv installed).
-   AC_MSG_CHECKING(for iconv in $1)
-     jm_cv_func_iconv="no"
-+    jm_cv_include=""
-     jm_cv_lib_iconv=""
--    jm_cv_giconv=no
-+    jm_cv_giconv="no"
-     jm_save_LIBS="$LIBS"
- 
--  dnl Check for include in giconv.h but no lib needed
--  if test "$jm_cv_func_iconv" != yes; then
--    AC_TRY_LINK([#include <stdlib.h>
-+    dnl Check for include in funny place but no lib needed
-+    if test "$jm_cv_func_iconv" != yes; then 
-+      AC_TRY_LINK([#include <stdlib.h>
- #include <giconv.h>],
-       [iconv_t cd = iconv_open("","");
-        iconv(cd,NULL,NULL,NULL,NULL);
-        iconv_close(cd);],
--       jm_cv_func_iconv=yes
--       jm_cv_include="giconv.h"
--       jm_cv_giconv="yes"
--       jm_cv_lib_iconv="")
-+      jm_cv_func_iconv=yes
-+      jm_cv_include="giconv.h"
-+      jm_cv_lib_iconv=""
-+      jm_cv_giconv="yes")
- 
--    dnl Standard iconv.h include, lib in glibc or libc ...
--    if test "$jm_cv_func_iconv" != yes; then
--      AC_TRY_LINK([#include <stdlib.h>
-+      dnl Standard iconv.h include, lib in glibc or libc ...
-+      if test "$jm_cv_func_iconv" != yes; then
-+	AC_TRY_LINK([#include <stdlib.h>
- #include <iconv.h>],
--        [iconv_t cd = iconv_open("","");
-+	[iconv_t cd = iconv_open("","");
-          iconv(cd,NULL,NULL,NULL,NULL);
-          iconv_close(cd);],
--         jm_cv_include="iconv.h"
--         jm_cv_func_iconv=yes
--         jm_cv_lib_iconv="")
--
--      dnl Include in giconv.h, libgiconv needed to link
--      if test "$jm_cv_func_iconv" != yes; then
--        jm_save_LIBS="$LIBS"
--        LIBS="$LIBS -lgiconv"
--        AC_TRY_LINK([#include <stdlib.h>
-+	jm_cv_func_iconv=yes
-+	jm_cv_include="iconv.h"
-+	jm_cv_lib_iconv="")
-+
-+	dnl Include in giconv.h, libgiconv needed to link
-+	if test "$jm_cv_func_iconv" != yes; then
-+	  jm_save_LIBS="$LIBS"
-+	  LIBS="$LIBS -lgiconv"
-+          AC_TRY_LINK([#include <stdlib.h>
- #include <giconv.h>],
--          [iconv_t cd = iconv_open("","");
-+	  [iconv_t cd = iconv_open("","");
-            iconv(cd,NULL,NULL,NULL,NULL);
-            iconv_close(cd);],
--          jm_cv_lib_iconv=yes
-           jm_cv_func_iconv=yes
-           jm_cv_include="giconv.h"
--          jm_cv_giconv=yes
--          jm_cv_lib_iconv="giconv")
-+          jm_cv_lib_iconv="giconv"
-+          jm_cv_giconv=yes)
- 
--        LIBS="$jm_save_LIBS"
-+	  LIBS="$jm_save_LIBS"
- 
--        dnl Include in iconv.h, libiconv needed to link
--        if test "$jm_cv_func_iconv" != yes; then
--          jm_save_LIBS="$LIBS"
--          LIBS="$LIBS -liconv"
--          AC_TRY_LINK([#include <stdlib.h>
-+	dnl Include in iconv.h, libiconv needed to link
-+	  if test "$jm_cv_func_iconv" != yes; then
-+	    jm_save_LIBS="$LIBS"
-+	    LIBS="$LIBS -liconv"
-+	    AC_TRY_LINK([#include <stdlib.h>
- #include <iconv.h>],
--            [iconv_t cd = iconv_open("","");
--             iconv(cd,NULL,NULL,NULL,NULL);
--             iconv_close(cd);],
--            jm_cv_include="iconv.h"
--            jm_cv_func_iconv=yes
--            jm_cv_lib_iconv="iconv")
--          LIBS="$jm_save_LIBS"
--
--          dnl Include in biconv.h, libbiconv needed to link
--          if test "$jm_cv_func_iconv" != yes; then
--            jm_save_LIBS="$LIBS"
--            LIBS="$LIBS -lbiconv"
--            AC_TRY_LINK([#include <stdlib.h>
--#include <biconv.h>],
--              [iconv_t cd = iconv_open("","");
--               iconv(cd,NULL,NULL,NULL,NULL);
--               iconv_close(cd);],
--              jm_cv_lib_iconv=yes
--              jm_cv_func_iconv=yes
--              jm_cv_include="biconv.h"
--              jm_cv_biconv=yes
--              jm_cv_lib_iconv="biconv")
-+	    [iconv_t cd = iconv_open("","");
-+	     iconv(cd,NULL,NULL,NULL,NULL);
-+	     iconv_close(cd);],
-+	    jm_cv_func_iconv=yes
-+	    jm_cv_include="iconv.h"
-+	    jm_cv_lib_iconv="iconv")
- 
--            LIBS="$jm_save_LIBS"
--          fi
--        fi
-+	    LIBS="$jm_save_LIBS"
-+	  fi
-+	fi
-       fi
-     fi
--  fi
--  if test "$jm_cv_func_iconv" = yes; then
--    if test "$jm_cv_giconv" = yes; then
--      AC_DEFINE(HAVE_GICONV, 1, [What header to include for iconv() function: giconv.h])
--      AC_MSG_RESULT(yes)
--      ICONV_FOUND=yes
--    else
--      if test "$jm_cv_biconv" = yes; then
--        AC_DEFINE(HAVE_BICONV, 1, [What header to include for iconv() function: biconv.h])
--        AC_MSG_RESULT(yes)
--        ICONV_FOUND=yes
-+    if test "$jm_cv_func_iconv" = yes; then
-+      if test "$jm_cv_giconv" = yes; then
-+	AC_DEFINE(HAVE_GICONV, 1, [What header to include for iconv() function: giconv.h])
-+	AC_MSG_RESULT(yes)
-+	ICONV_FOUND=yes
-       else 
-         AC_DEFINE(HAVE_ICONV, 1, [What header to include for iconv() function: iconv.h])
-         AC_MSG_RESULT(yes)
-         ICONV_FOUND=yes
-       fi
-+    else
-+      AC_MSG_RESULT(no)
-     fi
--  else
--    AC_MSG_RESULT(no)
--  fi
- ])
- 
- AC_DEFUN(rjs_CHARSET,[
diff --git a/net/samba36/files/patch-source3__modules__vfs_shadow_copy2.c b/net/samba36/files/patch-source3__modules__vfs_shadow_copy2.c
deleted file mode 100644
index d4eeedb6345e..000000000000
--- a/net/samba36/files/patch-source3__modules__vfs_shadow_copy2.c
+++ /dev/null
@@ -1,127 +0,0 @@
---- ./source3/modules/vfs_shadow_copy2.c.orig	2012-10-19 03:37:47.475803452 +0000
-+++ ./source3/modules/vfs_shadow_copy2.c	2012-10-19 03:39:42.665808023 +0000
-@@ -237,7 +237,7 @@
- 	if (shadow_copy2_match_name(fname, &gmt_start)) {	\
- 		char *name2; \
- 		rtype ret; \
--		name2 = convert_shadow2_name(handle, fname, gmt_start);	\
-+		name2 = convert_shadow2_name(handle, fname, gmt_start, True);	\
- 		if (name2 == NULL) { \
- 			errno = EINVAL; \
- 			return eret; \
-@@ -258,7 +258,7 @@
- 		char *name2; \
- 		char *smb_base_name_tmp = NULL; \
- 		rtype ret; \
--		name2 = convert_shadow2_name(handle, smb_fname->base_name, gmt_start); \
-+		name2 = convert_shadow2_name(handle, smb_fname->base_name, gmt_start, True); \
- 		if (name2 == NULL) { \
- 			errno = EINVAL; \
- 			return eret; \
-@@ -285,7 +285,7 @@
-         if (shadow_copy2_match_name(fname, &gmt_start)) {	\
-                 char *name2; \
-                 NTSTATUS ret; \
--                name2 = convert_shadow2_name(handle, fname, gmt_start);	\
-+                name2 = convert_shadow2_name(handle, fname, gmt_start, True);	\
-                 if (name2 == NULL) { \
-                         errno = EINVAL; \
-                         return eret; \
-@@ -409,7 +409,8 @@
-   convert a filename from a share relative path, to a path in the
-   snapshot directory
-  */
--static char *convert_shadow2_name(vfs_handle_struct *handle, const char *fname, const char *gmt_path)
-+static char *convert_shadow2_name(vfs_handle_struct *handle, const char *fname,
-+				  const char *gmt_path, const bool incl_rel)
- {
- 	TALLOC_CTX *tmp_ctx = talloc_new(handle->data);
- 	const char *snapdir, *relpath, *baseoffset, *basedir;
-@@ -486,11 +487,13 @@
- 	if (*relpath == '/') relpath++;
- 	if (*baseoffset == '/') baseoffset++;
- 
--	ret = talloc_asprintf(handle->data, "%s/%s/%s/%s",
-+	ret = talloc_asprintf(handle->data, "%s/%s%s%s%s%s",
- 			      snapdir, 
- 			      snapshot,
-+			      *baseoffset ? "/" : "",
- 			      baseoffset, 
--			      relpath);
-+			      *relpath ? "/" : "",
-+			      incl_rel ? relpath : "");
- 	DEBUG(6,("convert_shadow2_name: '%s' -> '%s'\n", fname, ret));
- 	talloc_free(tmp_ctx);
- 	return ret;
-@@ -687,68 +690,17 @@
- static const char *shadow_copy2_connectpath(struct vfs_handle_struct *handle,
- 					    const char *fname)
- {
--	TALLOC_CTX *tmp_ctx;
--	const char *snapdir, *baseoffset, *basedir, *gmt_start;
--	size_t baselen;
-+	const char *gmt_start;
- 	char *ret;
- 
- 	DEBUG(10, ("shadow_copy2_connectpath called with %s\n", fname));
- 
- 	if (!shadow_copy2_match_name(fname, &gmt_start)) {
--		return handle->conn->connectpath;
--	}
--
--        /*
--         * We have to create a real temporary context because we have
--         * to put our result on talloc_tos(). Thus we can't use a
--         * talloc_stackframe() here.
--         */
--	tmp_ctx = talloc_new(talloc_tos());
--
--	fname = shadow_copy2_normalise_path(tmp_ctx, fname, gmt_start);
--	if (fname == NULL) {
--		TALLOC_FREE(tmp_ctx);
--		return NULL;
--	}
--
--	snapdir = shadow_copy2_find_snapdir(tmp_ctx, handle);
--	if (snapdir == NULL) {
--		DEBUG(2,("no snapdir found for share at %s\n",
--			 handle->conn->connectpath));
--		TALLOC_FREE(tmp_ctx);
--		return NULL;
-+		return SMB_VFS_NEXT_CONNECTPATH(handle, fname);
- 	}
- 
--	basedir = shadow_copy2_find_basedir(tmp_ctx, handle);
--	if (basedir == NULL) {
--		DEBUG(2,("no basedir found for share at %s\n",
--			 handle->conn->connectpath));
--		TALLOC_FREE(tmp_ctx);
--		return NULL;
--	}
--
--	baselen = strlen(basedir);
--	baseoffset = handle->conn->connectpath + baselen;
--
--	/* some sanity checks */
--	if (strncmp(basedir, handle->conn->connectpath, baselen) != 0 ||
--	    (handle->conn->connectpath[baselen] != 0
--	     && handle->conn->connectpath[baselen] != '/')) {
--		DEBUG(0,("shadow_copy2_connectpath: basedir %s is not a "
--			 "parent of %s\n", basedir,
--			 handle->conn->connectpath));
--		TALLOC_FREE(tmp_ctx);
--		return NULL;
--	}
--
--	if (*baseoffset == '/') baseoffset++;
--
--	ret = talloc_asprintf(talloc_tos(), "%s/%.*s/%s",
--			      snapdir,
--			      GMT_NAME_LEN, fname,
--			      baseoffset);
-+	ret = convert_shadow2_name(handle, fname, gmt_start, False);
- 	DEBUG(6,("shadow_copy2_connectpath: '%s' -> '%s'\n", fname, ret));
--	TALLOC_FREE(tmp_ctx);
- 	return ret;
- }
- 
diff --git a/net/samba36/files/patch-source3__smbd__quotas.c b/net/samba36/files/patch-source3__smbd__quotas.c
deleted file mode 100644
index be4d6b9a9fe9..000000000000
--- a/net/samba36/files/patch-source3__smbd__quotas.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./source3/smbd/quotas.c.orig	2010-04-01 15:26:22.000000000 +0200
-+++ ./source3/smbd/quotas.c	2010-04-23 01:08:35.000000000 +0200
-@@ -1235,6 +1235,7 @@
- 	if (!cutstr)
- 		return False;
- 
-+	memset(&D, '\0', sizeof(D));
- 	memset(cutstr, '\0', len+1);
- 	host = strncat(cutstr,mnttype, sizeof(char) * len );
- 	DEBUG(5,("nfs_quotas: looking for mount on \"%s\"\n", cutstr));
-@@ -1243,7 +1244,7 @@
- 	args.gqa_pathp = testpath+1;
- 	args.gqa_uid = uid;
- 
--	DEBUG(5,("nfs_quotas: Asking for host \"%s\" rpcprog \"%i\" rpcvers \"%i\" network \"%s\"\n", host, RQUOTAPROG, RQUOTAVERS, "udp"));
-+	DEBUG(5,("nfs_quotas: Asking for host \"%s\" rpcprog \"%lu\" rpcvers \"%lu\" network \"%s\"\n", host, RQUOTAPROG, RQUOTAVERS, "udp"));
- 
- 	if ((clnt = clnt_create(host, RQUOTAPROG, RQUOTAVERS, "udp")) == NULL) {
- 		ret = False;
diff --git a/net/samba36/files/patch-source3__smbd__statvfs.c b/net/samba36/files/patch-source3__smbd__statvfs.c
deleted file mode 100644
index aa24d18ddc32..000000000000
--- a/net/samba36/files/patch-source3__smbd__statvfs.c
+++ /dev/null
@@ -1,64 +0,0 @@
---- ./source3/smbd/statvfs.c.orig	2010-04-01 15:26:22.000000000 +0200
-+++ ./source3/smbd/statvfs.c	2010-04-23 01:08:35.000000000 +0200
-@@ -3,6 +3,7 @@
-    VFS API's statvfs abstraction
-    Copyright (C) Alexander Bokovoy			2005
-    Copyright (C) Steve French				2005
-+   Copyright (C) Timur I. Bakeyev			2005
-    Copyright (C) James Peach				2006
-    
-    This program is free software; you can redistribute it and/or modify
-@@ -49,9 +50,42 @@
- 	}
- 	return result;
- }
--#endif
-+#elif defined(FREEBSD)
-+static int bsd_statvfs(const char *path, vfs_statvfs_struct *statbuf)
-+{
-+	struct statfs statfs_buf;
-+	int result;
-+
-+	result = statfs(path, &statfs_buf);
-+	if(result != 0) {
-+		return result;
-+	}
-+	
-+	statbuf->OptimalTransferSize = statfs_buf.f_iosize;
-+	statbuf->BlockSize = statfs_buf.f_bsize;
-+	statbuf->TotalBlocks = statfs_buf.f_blocks;
-+	statbuf->BlocksAvail = statfs_buf.f_bfree;
-+	statbuf->UserBlocksAvail = statfs_buf.f_bavail;
-+	statbuf->TotalFileNodes = statfs_buf.f_files;
-+	statbuf->FreeFileNodes = statfs_buf.f_ffree;
-+	statbuf->FsIdentifier = 
-+		(((uint64_t)statfs_buf.f_fsid.val[0]<<32) & 0xffffffff00000000LL) | (uint64_t)statfs_buf.f_fsid.val[1];
-+	/* Try to extrapolate some of the fs flags into the
-+	 * capabilities
-+	 */
-+	statbuf->FsCapabilities =
-+	    FILE_CASE_SENSITIVE_SEARCH | FILE_CASE_PRESERVED_NAMES;
-+	if(statfs_buf.f_flags & MNT_ACLS)
-+		statbuf->FsCapabilities |= FILE_PERSISTENT_ACLS;
-+	if(statfs_buf.f_flags & MNT_QUOTA)
-+		statbuf->FsCapabilities |= FILE_VOLUME_QUOTAS;
-+	if(statfs_buf.f_flags & MNT_RDONLY)
-+		statbuf->FsCapabilities |= FILE_READ_ONLY_VOLUME;
- 
--#if defined(DARWINOS)
-+	return 0;
-+}
-+
-+#elif defined(DARWINOS)
- 
- #include <sys/attr.h>
- 
-@@ -137,6 +171,8 @@
- {
- #if defined(LINUX) && defined(HAVE_FSID_INT)
- 	return linux_statvfs(path, statbuf);
-+#elif defined(FREEBSD)
-+	return bsd_statvfs(path, statbuf);
- #elif defined(DARWINOS)
- 	return darwin_statvfs(path, statbuf);
- #else
diff --git a/net/samba36/files/patch-source3__utils__net.c b/net/samba36/files/patch-source3__utils__net.c
deleted file mode 100644
index aa4853a7624e..000000000000
--- a/net/samba36/files/patch-source3__utils__net.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./source3/utils/net.c.orig	2013-01-29 08:49:31.000000000 +0000
-+++ ./source3/utils/net.c	2013-01-31 15:04:24.069877314 +0000
-@@ -898,8 +898,13 @@
- 		set_global_myname(c->opt_requester_name);
- 	}
- 
--	if (!c->opt_user_name && getenv("LOGNAME")) {
--		c->opt_user_name = getenv("LOGNAME");
-+	if (!c->opt_user_name) {
-+		if(getenv("LOGNAME"))
-+			c->opt_user_name = getenv("LOGNAME");
-+		else
-+			d_fprintf(stderr,
-+				_("Environment LOGNAME is not defined."
-+			          " Trying anonymous access.\n"));
- 	}
- 
- 	if (!c->opt_workgroup) {
diff --git a/net/samba36/files/patch-source3__utils__net_time.c b/net/samba36/files/patch-source3__utils__net_time.c
deleted file mode 100644
index 6c6ce7614652..000000000000
--- a/net/samba36/files/patch-source3__utils__net_time.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./source3/utils/net_time.c.orig	2010-04-01 15:26:22.000000000 +0200
-+++ ./source3/utils/net_time.c	2010-04-23 01:08:35.000000000 +0200
-@@ -87,10 +87,15 @@
- 	if (!tm) {
- 		return "unknown";
- 	}
--
-+#if defined(FREEBSD)
-+	return talloc_asprintf(talloc_tos(), "%02d%02d%02d%02d%02d.%02d",
-+				tm->tm_year + 1900, tm->tm_mon+1, tm->tm_mday,
-+				tm->tm_hour, tm->tm_min, tm->tm_sec);
-+#else
- 	return talloc_asprintf(talloc_tos(), "%02d%02d%02d%02d%04d.%02d",
- 			       tm->tm_mon+1, tm->tm_mday, tm->tm_hour,
- 			       tm->tm_min, tm->tm_year + 1900, tm->tm_sec);
-+#endif
- }
- 
- int net_time_usage(struct net_context *c, int argc, const char **argv)
diff --git a/net/samba36/files/pkg-message.in b/net/samba36/files/pkg-message.in
deleted file mode 100644
index 98866a899ff7..000000000000
--- a/net/samba36/files/pkg-message.in
+++ /dev/null
@@ -1,7 +0,0 @@
-===============================================================================
-Samba3 *package* now doesn't include ADS support due the portability problems
-with Kerberos5 libraries on different installations. You need to compile the
-port yourself to get this functionality.
-
-For additional hints and directions, please, look into the README.FreeBSD file.
-===============================================================================
diff --git a/net/samba36/files/samba.in b/net/samba36/files/samba.in
deleted file mode 100644
index 98c2ca75a3d7..000000000000
--- a/net/samba36/files/samba.in
+++ /dev/null
@@ -1,198 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: nmbd smbd
-%%WINBIND%%# PROVIDE: winbindd
-# REQUIRE: NETWORKING SERVERS DAEMON ldconfig resolv
-%%CUPS%%# REQUIRE: cupsd
-# BEFORE: LOGIN
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
-# to enable this service:
-#
-#samba_enable="YES"
-# You can disable/enable any of the Samba daemons by specifying:
-#nmbd_enable="NO"
-#smbd_enable="NO"
-%%WINBIND%%# You need to enable winbindd separately, by adding:
-%%WINBIND%%#winbindd_enable="YES"
-#
-# Configuration file can be set with:
-#samba_config="%%SAMBA_CONFDIR%%/%%SAMBA_CONFIG%%"
-#
-
-. /etc/rc.subr
-
-name="samba"
-rcvar=samba_enable
-# Custom commands
-extra_commands="reload status"
-start_precmd="samba_start_precmd"
-start_cmd="samba_cmd"
-stop_cmd="samba_cmd"
-status_cmd="samba_cmd"
-restart_precmd="samba_checkconfig"
-reload_precmd="samba_checkconfig"
-reload_cmd="samba_reload_cmd"
-rcvar_cmd="samba_rcvar_cmd"
-# Defaults
-samba_config_default="%%SAMBA_CONFDIR%%/%%SAMBA_CONFIG%%"
-testparm_command="%%PREFIX%%/bin/testparm"
-smbcontrol_command="%%PREFIX%%/bin/smbcontrol"
-samba_parm="${testparm_command} -s -v --parameter-name"
-pid_extra=
-#
-samba_daemons="nmbd smbd"
-%%WINBIND%%samba_daemons="${samba_daemons} winbindd"
-
-samba_checkconfig() {
-    echo -n "Performing sanity check on Samba configuration: "
-    if ${testparm_command} -s ${samba_config:+"${samba_config}"} >/dev/null 2>&1; then #"
-	echo "OK"
-    else
-	echo "FAILED"
-	return 1
-    fi
-    return 0
-}
-
-samba_start_precmd() {
-    # Make sure rundir exists
-    if [ ! -d "%%SAMBA_RUNDIR%%" -a ! -e "%%SAMBA_RUNDIR%%" ]; then
-	install -m 0755 -d "%%SAMBA_RUNDIR%%"
-    fi
-    # XXX: Never delete winbindd_idmap, winbindd_cache and group_mapping
-    if [ -n "${samba_lockdir}" -a -d "${samba_lockdir}" ]; then
-	echo -n "Removing stale Samba tdb files: "
-	for file in brlock.tdb browse.dat connections.tdb gencache.tdb \
-		    locking.tdb messages.tdb namelist.debug sessionid.tdb \
-		    unexpected.tdb
-	do
-	    rm "${samba_lockdir}/${file}" </dev/null 2>/dev/null && echo -n '.'
-	done
-	echo " done"
-    fi
-}
-
-samba_rcvar_cmd() {
-    local name rcvar
-    rcvar=${name}_enable
-    # Prevent recursive calling
-    unset "${rc_arg}_cmd" "${rc_arg}_precmd" "${rc_arg}_postcmd"
-    # Check master variable
-    run_rc_command "${_rc_prefix}${rc_arg}" ${rc_extra_args}
-    # Check dependent variables
-    for name in ${samba_daemons}; do
-	# XXX
-	rcvars=''; v=''
-	rcvar=${name}_enable
-	run_rc_command "${_rc_prefix}${rc_arg}" ${rc_extra_args}
-    done
-}
-
-samba_reload_cmd() {
-    local name rcvar command pidfile force_run
-    # Prevent recursive calling
-    unset "${rc_arg}_cmd" "${rc_arg}_precmd" "${rc_arg}_postcmd"
-    # Ignore rcvar and run command
-    if [ -n "${_rc_prefix}" -a "${_rc_prefix}" = "one" ] || [ -n "${rc_force}" ] || [ -n "${rc_fast}" ]; then
-	force_run=yes
-    fi
-    # Apply to all daemons
-    for name in ${samba_daemons}; do
-	rcvar=${name}_enable
-	command="%%PREFIX%%/sbin/${name}"
-	pidfile="%%SAMBA_RUNDIR%%/${name}${pid_extra}.pid"
-	# Daemon should be enabled and running
-	if ( [ -n "${rcvar}" ] && checkyesno "${rcvar}" ) || [ -n "$force_run" ]; then
-	    if [ -n "$(check_pidfile "${pidfile}" "${command}")" ]; then
-		debug "reloading ${name} configuration"
-		echo "Reloading ${name}."
-		# XXX: Hack with pid_extra
-		${smbcontrol_command} "${name}${pid_extra}" 'reload-config' ${command_args} >/dev/null 2>&1
-	    fi
-	fi
-    done
-}
-
-samba_cmd() {
-    local name rcvar rcvars v command pidfile samba_daemons result force_run
-    # Prevent recursive calling
-    unset "${rc_arg}_cmd" "${rc_arg}_precmd" "${rc_arg}_postcmd"
-    # Stop processes in the reverse order
-    if [ "${rc_arg}" = "stop" ] ; then
-	samba_daemons=$(reverse_list ${samba_daemons})
-    fi
-    # Ignore rcvar and run command
-    if [ -n "${_rc_prefix}" -a "${_rc_prefix}" = "one" ] || [ -n "${rc_force}" ] || [ -n "${rc_fast}" ]; then
-	force_run=yes
-    fi
-    # Assume success
-    result=0
-    # Apply to all daemons
-    for name in ${samba_daemons}; do
-	# XXX
-	rcvars=''; v=''
-	rcvar=${name}_enable
-	command="%%PREFIX%%/sbin/${name}"
-	pidfile="%%SAMBA_RUNDIR%%/${name}${pid_extra}.pid"
-	# Daemon should be enabled and running
-	if ( [ -n "${rcvar}" ] && checkyesno "${rcvar}" ) || [ -n "$force_run" ]; then
-	    run_rc_command "${_rc_prefix}${rc_arg}" ${rc_extra_args}
-	    # If any of the commands failed, take it as a global result
-	    result=$((${result} || $?))
-	fi
-    done
-    return ${result}
-}
-
-samba_config_init() {
-    local name
-    # Load configuration
-    load_rc_config "${name}"
-    for name in ${samba_daemons}; do
-	load_rc_config "${name}"
-    done
-    # Location of the config
-    samba_config=${samba_config="${samba_config_default}"} #"
-    # XXX: Hack to work around name change of pid file with non-default config
-    if [ -n "${samba_config}" -a "${samba_config}" != "${samba_config_default}" ]; then
-	pid_extra="-$(basename "${samba_config}")"
-    fi
-    # Defaults
-    samba_enable=${samba_enable:=NO}
-    # Setup dependent variables
-    if [ -n "${rcvar}" ] && checkyesno "${rcvar}"; then
-	nmbd_enable=${nmbd_enable=YES}
-	smbd_enable=${smbd_enable=YES}
-    fi
-    nmbd_enable=${nmbd_enable:=NO}
-    smbd_enable=${smbd_enable:=NO}
-%%WINBIND%%    # Winbindd
-%%WINBIND%%    if [ -z "${winbind_enable}" ]; then
-%%WINBIND%%	samba_idmap=$(${samba_parm} 'idmap uid' "${samba_config}" 2>/dev/null)
-%%WINBIND%%	# Check that winbindd is actually configured
-%%WINBIND%%	if [ -n "${samba_idmap}" ]; then
-%%WINBIND%%		winbindd_enable="YES"
-%%WINBIND%%	fi
-%%WINBIND%%	winbindd_enable=${winbindd_enable:=NO}
-%%WINBIND%%    fi
-}
-
-# Load configuration variables
-samba_config_init
-# Where is the lockdir
-samba_lockdir=$(${samba_parm} 'lock directory' "${samba_config}" 2>/dev/null)
-# Common flags
-command_args=${samba_config:+-s "${samba_config}"} #"
-nmbd_flags=${nmbd_flags="-D"}
-smbd_flags=${smbd_flags="-D"}
-%%WINBIND%%winbindd_flags=${winbindd_flags=''}
-# Requirements
-required_files="${samba_config}"
-required_dirs="${samba_lockdir}"
-
-run_rc_command "$1"
diff --git a/net/samba36/files/sernet.patch b/net/samba36/files/sernet.patch
deleted file mode 100644
index 566315409a5a..000000000000
--- a/net/samba36/files/sernet.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-samba3-3.4-honor-all-loopback-ips.patch
-samba3.6-veto-speedup.patch
-
-commit b6afe7ef236a454d8a6abf104b8846f817378f73
-Author: Björn Jacke <bj@sernet.de>
-Date:   Thu Oct 15 02:02:30 2009 +0200
-
-    util: cope the all loopback addresses IPv4 knows
-    
-    The fact that we just recogniced 127.0.0.1 as loopback IP address and not the
-    rest of the 127.0.0.0/8 IP address range we used the lo interface for sending
-    packages even though we should send them to some more physical interface. This
-    way we ended up with failing WINS registration and so on like in #6348.
-    On the lo interface sendto() returned "Invalid Argument" (EINVAL).
-
-diff --git a/lib/util/util_net.c b/lib/util/util_net.c
-index 0ce495e..0511a28 100644
---- a/lib/util/util_net.c
-+++ b/lib/util/util_net.c
-@@ -353,13 +353,11 @@
- }
- 
- /**
-- * Check if an IPv7 is 127.0.0.1
-+ * Check if an IPv4 is in IN_LOOPBACKNET (127.0.0.0/8)
-  */
- bool is_loopback_ip_v4(struct in_addr ip)
- {
--	struct in_addr a;
--	a.s_addr = htonl(INADDR_LOOPBACK);
--	return(ip.s_addr == a.s_addr);
-+	return ((ntohl(ip.s_addr) & IN_CLASSA_NET) == (IN_LOOPBACKNET << IN_CLASSA_NSHIFT));
- }
- 
- /**
-From 944f10760f1bd0e839e08f1204b68e9c06617cf1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bj=C3=B6rn=20Jacke?= <bj@sernet.de>
-Date: Thu, 19 Apr 2012 13:33:50 +0200
-Subject: [PATCH] s3: speed up reply when vetoed files are being accessed
-
-one usecase of this fast-path is when non-existing files are being tried to be
-opened that are vetoed anyway. With this modification we look if the pattern is
-vetoed first and immediately tell the client that the file doesn't exist
-instead of searching for it in the first place and later on say we don't have
-it regardless.
----
- source3/smbd/filename.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
-index b2ed239..67138e7 100644
---- a/source3/smbd/filename.c
-+++ b/source3/smbd/filename.c
-@@ -1284,6 +1284,13 @@ NTSTATUS filename_convert(TALLOC_CTX *ctx,
- 
- 	*pp_smb_fname = NULL;
- 
-+	status = check_veto_path(conn, name_in);
-+	if (!NT_STATUS_IS_OK(status)) {
-+		DEBUG(10,("file %s matches veto path - fast path returning %s\n",
-+			name_in, nt_errstr(status)));
-+		return status;
-+	}
-+
- 	status = resolve_dfspath_wcard(ctx, conn,
- 				dfs_path,
- 				name_in,
diff --git a/net/samba36/files/smb.conf.sample.in b/net/samba36/files/smb.conf.sample.in
deleted file mode 100644
index 4c7e56dbdf55..000000000000
--- a/net/samba36/files/smb.conf.sample.in
+++ /dev/null
@@ -1,306 +0,0 @@
-# This is the main Samba configuration file. You should read the
-# smb.conf(5) manual page in order to understand the options listed
-# here. Samba has a huge number of configurable options (perhaps too
-# many!) most of which are not shown in this example
-#
-# For a step to step guide on installing, configuring and using samba, 
-# read the Samba-HOWTO-Collection. This may be obtained from:
-#  http://www.samba.org/samba/docs/Samba-HOWTO-Collection.pdf
-#
-# Many working examples of smb.conf files can be found in the 
-# Samba-Guide which is generated daily and can be downloaded from: 
-#  http://www.samba.org/samba/docs/Samba-Guide.pdf
-#
-# Any line which starts with a ; (semi-colon) or a # (hash) 
-# is a comment and is ignored. In this example we will use a #
-# for commentry and a ; for parts of the config file that you
-# may wish to enable
-#
-# NOTE: Whenever you modify this file you should run the command "testparm"
-# to check that you have not made any basic syntactic errors. 
-#
-#======================= Global Settings =====================================
-[global]
-
-# workgroup = NT-Domain-Name or Workgroup-Name, eg: MIDEARTH
-   workgroup = MYGROUP
-
-# server string is the equivalent of the NT Description field
-   server string = Samba Server
-
-# Security mode. Defines in which mode Samba will operate. Possible 
-# values are share, user, server, domain and ads. Most people will want 
-# user level security. See the Samba-HOWTO-Collection for details.
-   security = user
-
-# This option is important for security. It allows you to restrict
-# connections to machines which are on your local network. The
-# following example restricts access to two C class networks and
-# the "loopback" interface. For more examples of the syntax see
-# the smb.conf man page
-;   hosts allow = 192.168.1. 192.168.2. 127.
-
-# If you want to automatically load your printer list rather
-# than setting them up individually then you'll need this
-   load printers = yes
-
-# you may wish to override the location of the printcap file
-;   printcap name = /etc/printcap
-
-# on SystemV system setting printcap name to lpstat should allow
-# you to automatically obtain a printer list from the SystemV spool
-# system
-;   printcap name = lpstat
-
-# It should not be necessary to specify the print system type unless
-# it is non-standard. Currently supported print systems include:
-# bsd, cups, sysv, plp, lprng, aix, hpux, qnx
-;   printing = cups
-
-# Uncomment this if you want a guest account, you must add this to /etc/passwd
-# otherwise the user "nobody" is used
-;  guest account = pcguest
-
-# this tells Samba to use a separate log file for each machine
-# that connects
-   log file = %%SAMBA_LOGDIR%%/log.%m
-
-# Put a capping on the size of the log files (in Kb).
-   max log size = 50
-
-# Use password server option only with security = server
-# The argument list may include:
-#   password server = My_PDC_Name [My_BDC_Name] [My_Next_BDC_Name]
-# or to auto-locate the domain controller/s
-#   password server = *
-;   password server = <NT-Server-Name>
-
-# Use the realm option only with security = ads
-# Specifies the Active Directory realm the host is part of
-;   realm = MY_REALM
-
-# Backend to store user information in. New installations should 
-# use either tdbsam or ldapsam. smbpasswd is available for backwards 
-# compatibility. tdbsam requires no further configuration.
-;   passdb backend = tdbsam
-
-# Using the following line enables you to customise your configuration
-# on a per machine basis. The %m gets replaced with the netbios name
-# of the machine that is connecting.
-# Note: Consider carefully the location in the configuration file of
-#       this line.  The included file is read at that point.
-;   include = %%SAMBA_CONFDIR%%/smb.conf.%m
-
-# Most people will find that this option gives better performance.
-# See the chapter 'Samba performance issues' in the Samba HOWTO Collection
-# and the manual pages for details.
-# You may want to add the following on a Linux system:
-;   socket options = SO_RCVBUF=8192 SO_SNDBUF=8192
-
-# Configure Samba to use multiple interfaces
-# If you have multiple network interfaces then you must list them
-# here. See the man page for details.
-;   interfaces = 192.168.12.2/24 192.168.13.2/24 
-
-# Browser Control Options:
-# set local master to no if you don't want Samba to become a master
-# browser on your network. Otherwise the normal election rules apply
-;   local master = no
-
-# OS Level determines the precedence of this server in master browser
-# elections. The default value should be reasonable
-;   os level = 33
-
-# Domain Master specifies Samba to be the Domain Master Browser. This
-# allows Samba to collate browse lists between subnets. Don't use this
-# if you already have a Windows NT domain controller doing this job
-;   domain master = yes 
-
-# Preferred Master causes Samba to force a local browser election on startup
-# and gives it a slightly higher chance of winning the election
-;   preferred master = yes
-
-# Enable this if you want Samba to be a domain logon server for 
-# Windows95 workstations. 
-;   domain logons = yes
-
-# if you enable domain logons then you may want a per-machine or
-# per user logon script
-# run a specific logon batch file per workstation (machine)
-;   logon script = %m.bat
-# run a specific logon batch file per username
-;   logon script = %U.bat
-
-# Where to store roving profiles (only for Win95 and WinNT)
-#        %L substitutes for this servers netbios name, %U is username
-#        You must uncomment the [Profiles] share below
-;   logon path = \\%L\Profiles\%U
-
-# Windows Internet Name Serving Support Section:
-# WINS Support - Tells the NMBD component of Samba to enable it's WINS Server
-;   wins support = yes
-
-# WINS Server - Tells the NMBD components of Samba to be a WINS Client
-#	Note: Samba can be either a WINS Server, or a WINS Client, but NOT both
-;   wins server = w.x.y.z
-
-# WINS Proxy - Tells Samba to answer name resolution queries on
-# behalf of a non WINS capable client, for this to work there must be
-# at least one	WINS Server on the network. The default is NO.
-;   wins proxy = yes
-
-# DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names
-# via DNS nslookups. The default is NO.
-   dns proxy = no 
-
-# Charset settings
-;   display charset = koi8-r
-;   unix charset = koi8-r
-;   dos charset = cp866
-
-# Use extended attributes to store file modes
-;    store dos attributes = yes
-;    map hidden = no
-;    map system = no
-;    map archive = no
-
-# Use inherited ACLs for directories
-;    nt acl support = yes
-;    inherit acls = yes
-;    map acl inherit = yes 
-
-# These scripts are used on a domain controller or stand-alone 
-# machine to add or delete corresponding unix accounts
-;  add user script = /usr/sbin/useradd %u
-;  add group script = /usr/sbin/groupadd %g
-;  add machine script = /usr/sbin/adduser -n -g machines -c Machine -d /dev/null -s /bin/false %u
-;  delete user script = /usr/sbin/userdel %u
-;  delete user from group script = /usr/sbin/deluser %u %g
-;  delete group script = /usr/sbin/groupdel %g
-
-
-#============================ Share Definitions ==============================
-[homes]
-   comment = Home Directories
-   browseable = no
-   writable = yes
-
-# Un-comment the following and create the netlogon directory for Domain Logons
-; [netlogon]
-;   comment = Network Logon Service
-;   path = /usr/local/samba/lib/netlogon
-;   guest ok = yes
-;   writable = no
-;   share modes = no
-
-
-# Un-comment the following to provide a specific roving profile share
-# the default is to use the user's home directory
-;[Profiles]
-;    path = /usr/local/samba/profiles
-;    browseable = no
-;    guest ok = yes
-
-
-# NOTE: If you have a BSD-style print system there is no need to 
-# specifically define each individual printer
-[printers]
-   comment = All Printers
-   path = %%SAMBA_SPOOL%%
-   browseable = no
-# Set public = yes to allow user 'guest account' to print
-   guest ok = no
-   writable = no
-   printable = yes
-
-# This one is useful for people to share files
-;[tmp]
-;   comment = Temporary file space
-;   path = /tmp
-;   read only = no
-;   public = yes
-
-# A publicly accessible directory, but read only, except for people in
-# the "staff" group
-;[public]
-;   comment = Public Stuff
-;   path = /home/samba
-;   public = yes
-;   writable = yes
-;   printable = no
-;   write list = @staff
-
-# Other examples. 
-#
-# A private printer, usable only by fred. Spool data will be placed in fred's
-# home directory. Note that fred must have write access to the spool directory,
-# wherever it is.
-;[fredsprn]
-;   comment = Fred's Printer
-;   valid users = fred
-;   path = /homes/fred
-;   printer = freds_printer
-;   public = no
-;   writable = no
-;   printable = yes
-
-# A private directory, usable only by fred. Note that fred requires write
-# access to the directory.
-;[fredsdir]
-;   comment = Fred's Service
-;   path = /usr/somewhere/private
-;   valid users = fred
-;   public = no
-;   writable = yes
-;   printable = no
-
-# a service which has a different directory for each machine that connects
-# this allows you to tailor configurations to incoming machines. You could
-# also use the %U option to tailor it by user name.
-# The %m gets replaced with the machine name that is connecting.
-;[pchome]
-;  comment = PC Directories
-;  path = /usr/pc/%m
-;  public = no
-;  writable = yes
-
-# A publicly accessible directory, read/write to all users. Note that all files
-# created in the directory by users will be owned by the default user, so
-# any user with access can delete any other user's files. Obviously this
-# directory must be writable by the default user. Another user could of course
-# be specified, in which case all files would be owned by that user instead.
-;[public]
-;   path = /usr/somewhere/else/public
-;   public = yes
-;   only guest = yes
-;   writable = yes
-;   printable = no
-
-# The following two entries demonstrate how to share a directory so that two
-# users can place files there that will be owned by the specific users. In this
-# setup, the directory should be writable by both users and should have the
-# sticky bit set on it to prevent abuse. Obviously this could be extended to
-# as many users as required.
-;[myshare]
-;   comment = Mary's and Fred's stuff
-;   path = /usr/somewhere/shared
-;   valid users = mary fred
-;   public = no
-;   writable = yes
-;   printable = no
-;   create mask = 0765
-;
-
-# This is a DRAFT sample configuration for the ACLs on the ZFS partition.
-#
-;    nt acl support = yes
-;    inherit acls = no
-;    map acl inherit = yes
-;
-;[zpool]
-;    path = /tank/zpool
-;    unix extensions = no
-;    vfs objects = zfsacl
-;    nfs4:mode = special
-;    nfs4:acedup = merge
-;    nfs4:chown = yes
diff --git a/net/samba36/pkg-descr b/net/samba36/pkg-descr
deleted file mode 100644
index 28f431acf0f7..000000000000
--- a/net/samba36/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-The Samba suite is a set of programs which run under the FreeBSD
-operating system. These programs deliver most of the important
-functionality of a Microsoft Lan Manager server. That is, they support
-remote access to FreeBSD filespace and FreeBSD printers from Lan Manager
-compatible clients. In practical terms, this means that such clients can
-connect to and use FreeBSD filespace as if it was a local disk drive, or
-FreeBSD printers as if they were local printers.
-
-Some of the most popular Lan Manager compatible clients include Lan
-Manager itself, Windows for Workgroups, OS/2 and Windows NT.
-
-WWW: http://www.samba.org/
diff --git a/net/samba36/pkg-plist b/net/samba36/pkg-plist
deleted file mode 100644
index 1ac95d86b149..000000000000
--- a/net/samba36/pkg-plist
+++ /dev/null
@@ -1,215 +0,0 @@
-etc/%%SAMBA_CONFIG%%.sample
-bin/eventlogadm
-bin/make_smbpasswd
-bin/net
-bin/nmblookup
-bin/ntlm_auth
-bin/pdbedit
-bin/profiles
-bin/rpcclient
-bin/sharesec
-bin/smbcacls
-bin/smbclient
-bin/smbcontrol
-bin/smbcquotas
-bin/smbget
-bin/smbpasswd
-bin/smbspool
-bin/smbstatus
-bin/smbta-util
-bin/smbtar
-bin/smbtree
-bin/testparm
-%%SMBTORTURE%%bin/smbtorture
-%%WINBIND%%bin/wbinfo
-%%WINBIND%%include/wbclient.h
-sbin/smbd
-sbin/nmbd
-%%SWAT%%sbin/swat
-%%WINBIND%%sbin/winbindd
-%%WINBIND%%lib/libwbclient.so
-%%WINBIND%%lib/libwbclient.so.0
-%%WINBIND%%lib/nss_winbind.so.1
-%%WINBIND%%lib/nss_wins.so.1
-%%WINBIND%%lib/pam_winbind.so
-%%SMBPASS%%lib/pam_smbpass.so
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/%%SAMBA_CONFIG%%.sample
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/LDAP/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/LDAP/convertSambaAccount
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/LDAP/get_next_oid
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/LDAP/ol-schema-migrate.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/LDAP/samba-nds.schema
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/LDAP/samba-schema-FDS.ldif
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/LDAP/samba-schema-netscapeds5.x.README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/LDAP/samba-schema.IBMSecureWay
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/LDAP/samba.ldif
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/LDAP/samba.schema
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/LDAP/samba.schema.at.IBM-DS
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/LDAP/samba.schema.oc.IBM-DS
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/VFS/Makefile.in
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/VFS/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/VFS/autogen.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/VFS/config.guess
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/VFS/config.sub
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/VFS/configure
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/VFS/configure.in
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/VFS/install-sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/VFS/module_config.h.in
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/VFS/shadow_copy_test.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/VFS/skel_opaque.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/VFS/skel_transparent.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ad-bench/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ad-bench/ad-bench.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ad-bench/settings.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ad-bench/test_utils.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ad-bench/time_group.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ad-bench/time_join.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ad-bench/time_kinit.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ad-bench/time_ldap.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ad-bench/time_user.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ad-bench/utils.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/auth_skel.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/crackcheck/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/crackcheck/crackcheck.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/autofs/auto.smb
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bind9-patches/0001-leave-the-question-section-in-update-responses.patch
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bind9-patches/0002-prevent-a-valgrind-uninitialised-memory-warning.patch
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bind9-patches/0003-don-t-compress-TSIG-names.patch
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bind9-patches/0004-If-tkey-gssapi-initialisation-fails-then-heck-for-th.patch
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bind9-patches/0005-windows-doesn-t-return-valid-GSSAPI-sequence-numbers.patch
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bind9-patches/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dce-dfs/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dce-dfs/smb.conf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/logon/genlogon/genlogon.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/logon/mklogon/mklogon.conf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/logon/mklogon/mklogon.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/logon/ntlogon/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/logon/ntlogon/ntlogon.conf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/logon/ntlogon/ntlogon.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/adssearch.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/check_multiple_LDAP_entries.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/cldap.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/extra_smbstatus
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/swat.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/wall.perl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nss/nss_winbind.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nss/nss_winbind.h
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nss/wbtest.c
-%%PORTEXAMPLES%%%%SMBPASS%%%%EXAMPLESDIR%%/pam_smbpass/README
-%%PORTEXAMPLES%%%%SMBPASS%%%%EXAMPLESDIR%%/pam_smbpass/kdc-pdc
-%%PORTEXAMPLES%%%%SMBPASS%%%%EXAMPLESDIR%%/pam_smbpass/password-mature
-%%PORTEXAMPLES%%%%SMBPASS%%%%EXAMPLESDIR%%/pam_smbpass/password-migration
-%%PORTEXAMPLES%%%%SMBPASS%%%%EXAMPLESDIR%%/pam_smbpass/password-sync
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pam_winbind/pam_winbind.conf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/COPYING
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/closerequest.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/closerequest.hpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/ethernet.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/ethernet.hpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/ip.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/ip.hpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/main.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/ntcreateandxrequest.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/ntcreateandxrequest.hpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/ntcreateandxresponse.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/ntcreateandxresponse.hpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/readandxrequest.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/readandxrequest.hpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/readandxresponse.hpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/smb.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/smb.hpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/tcp.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/tcp.hpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/writeandxrequest.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap2nbench/writeandxrequest.hpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pdb/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pdb/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pdb/test.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perfcounter/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perfcounter/perf.h
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perfcounter/perf_writer.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perfcounter/perf_writer_cpu.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perfcounter/perf_writer_disk.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perfcounter/perf_writer_mem.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perfcounter/perf_writer_process.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perfcounter/perf_writer_util.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perfcounter/perfcountd.init
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/printer-accounting/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/printer-accounting/acct-all
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/printer-accounting/acct-sum
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/printer-accounting/hp5-redir
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/printer-accounting/lp-acct
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/printer-accounting/printcap
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/printing/VampireDriversFunctions
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/printing/prtpub.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/printing/readme.prtpub
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/printing/smbprint
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/printing/smbprint.sysv
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/debugging/linux/backtrace
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/debugging/solaris/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/debugging/solaris/solaris-oops.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/eventlog/parselog.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/idmap/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/idmap/idmap_nis.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/mount/mount.smbfs
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/printing/cups/smbaddprinter.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/printing/cups/smbdelprinter.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/shares/perl/modify_samba_config.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/shares/python/SambaConfig.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/shares/python/SambaParm.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/shares/python/generate_parm_table.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/shares/python/modify_samba_config.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/shares/python/smbparm.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/users_and_groups/adduserstogroups.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/users_and_groups/createdomobj.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/wins_hook/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/wins_hook/dns_update
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smb.conf.default
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tridge/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tridge/smb.conf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tridge/smb.conf.WinNT
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tridge/smb.conf.fjall
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tridge/smb.conf.lapland
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tridge/smb.conf.vittjokk
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/validchars/msdos70.out
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/validchars/nwdos70.out
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/validchars/readme
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/validchars/validchr.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/validchars/validchr.com
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/MAINTAINERS.txt
-%%PORTDOCS%%%%DOCSDIR%%/Manifest
-%%PORTDOCS%%%%DOCSDIR%%/PFIF.txt
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
-%%PORTDOCS%%%%DOCSDIR%%/Roadmap
-%%PORTDOCS%%%%DOCSDIR%%/Samba3-ByExample.pdf
-%%PORTDOCS%%%%DOCSDIR%%/Samba3-Developers-Guide.pdf
-%%PORTDOCS%%%%DOCSDIR%%/Samba3-HOWTO.pdf
-%%PORTDOCS%%%%DOCSDIR%%/THANKS
-%%PORTDOCS%%%%DOCSDIR%%/WHATSNEW.txt
-%%PORTDOCS%%%%DOCSDIR%%/history
-%%PORTDOCS%%%%DOCSDIR%%/registry/FolderRedir.adm
-%%PORTDOCS%%%%DOCSDIR%%/registry/NT4-Locking.reg
-%%PORTDOCS%%%%DOCSDIR%%/registry/NT4_PlainPassword.reg
-%%PORTDOCS%%%%DOCSDIR%%/registry/Win-2Kx-XPP-DeleteCachedProfiles.reg
-%%PORTDOCS%%%%DOCSDIR%%/registry/Win-2Kx-XPP-ForceLocalProfile.reg
-%%PORTDOCS%%%%DOCSDIR%%/registry/Win-NT-DeleteRoamingProfile.reg
-%%PORTDOCS%%%%DOCSDIR%%/registry/Win2000_PlainPassword.reg
-%%PORTDOCS%%%%DOCSDIR%%/registry/Win7_Samba3DomainMember.reg
-%%PORTDOCS%%%%DOCSDIR%%/registry/Win95_PlainPassword.reg
-%%PORTDOCS%%%%DOCSDIR%%/registry/Win98_PlainPassword.reg
-%%PORTDOCS%%%%DOCSDIR%%/registry/Win9X-CacheHandling.reg
-%%PORTDOCS%%%%DOCSDIR%%/registry/WinME_PlainPassword.reg
-%%PORTDOCS%%%%DOCSDIR%%/registry/WinXP_PlainPassword.reg
-%%PORTDOCS%%%%DOCSDIR%%/registry/WindowsTerminalServer.reg
-@dir %%SAMBA_PRIVATEDIR%%
-@dir %%SAMBA_LOCKDIR%%
-@dir %%SAMBA_LOGDIR%%
-@dir %%SAMBA_SPOOL%%
-@dir %%SAMBA_RUNDIR%%/nmbd
-@dir %%SAMBA_RUNDIR%%
diff --git a/net/samba36/pkg-plist.swat b/net/samba36/pkg-plist.swat
deleted file mode 100644
index 6ec8a653a061..000000000000
--- a/net/samba36/pkg-plist.swat
+++ /dev/null
@@ -1,345 +0,0 @@
-share/swat/help/Samba3-ByExample/Big500users.html
-share/swat/help/Samba3-ByExample/DMSMig.html
-share/swat/help/Samba3-ByExample/DomApps.html
-share/swat/help/Samba3-ByExample/ExNetworks.html
-share/swat/help/Samba3-ByExample/HA.html
-share/swat/help/Samba3-ByExample/RefSection.html
-share/swat/help/Samba3-ByExample/apa.html
-share/swat/help/Samba3-ByExample/appendix.html
-share/swat/help/Samba3-ByExample/ch14.html
-share/swat/help/Samba3-ByExample/go01.html
-share/swat/help/Samba3-ByExample/happy.html
-share/swat/help/Samba3-ByExample/images/AccountingNetwork.png
-share/swat/help/Samba3-ByExample/images/Charity-Network.png
-share/swat/help/Samba3-ByExample/images/Domain-WorkgroupAnnouncement.png
-share/swat/help/Samba3-ByExample/images/HostAnnouncment.png
-share/swat/help/Samba3-ByExample/images/LocalMasterAnnouncement.png
-share/swat/help/Samba3-ByExample/images/NullConnect.png
-share/swat/help/Samba3-ByExample/images/UNIX-Samba-and-LDAP.png
-share/swat/help/Samba3-ByExample/images/UserConnect.png
-share/swat/help/Samba3-ByExample/images/UserMgrNT4.png
-share/swat/help/Samba3-ByExample/images/WINREPRESSME-Capture.png
-share/swat/help/Samba3-ByExample/images/WINREPRESSME-Capture2.png
-share/swat/help/Samba3-ByExample/images/Windows-ME-WINEPRESSME-Startup-30min-ProtocolStats.png
-share/swat/help/Samba3-ByExample/images/Windows-ME-WINEPRESSME-Startup-30min-TraceStats.png
-share/swat/help/Samba3-ByExample/images/WindowsXP-NullConnection.png
-share/swat/help/Samba3-ByExample/images/WindowsXP-UserConnection.png
-share/swat/help/Samba3-ByExample/images/XP-screen001.png
-share/swat/help/Samba3-ByExample/images/acct2net.png
-share/swat/help/Samba3-ByExample/images/ch7-dual-additive-LDAP-Ok.png
-share/swat/help/Samba3-ByExample/images/ch7-dual-additive-LDAP.png
-share/swat/help/Samba3-ByExample/images/ch7-fail-overLDAP.png
-share/swat/help/Samba3-ByExample/images/ch7-singleLDAP.png
-share/swat/help/Samba3-ByExample/images/ch8-migration.png
-share/swat/help/Samba3-ByExample/images/chap4-net.png
-share/swat/help/Samba3-ByExample/images/chap5-net.png
-share/swat/help/Samba3-ByExample/images/chap6-net.png
-share/swat/help/Samba3-ByExample/images/chap7-idresol.png
-share/swat/help/Samba3-ByExample/images/chap7-net-A.png
-share/swat/help/Samba3-ByExample/images/chap7-net-Ar.png
-share/swat/help/Samba3-ByExample/images/chap7-net.png
-share/swat/help/Samba3-ByExample/images/chap7-net2-B.png
-share/swat/help/Samba3-ByExample/images/chap7-net2-Br.png
-share/swat/help/Samba3-ByExample/images/chap7-net2.png
-share/swat/help/Samba3-ByExample/images/chap7-net2r.png
-share/swat/help/Samba3-ByExample/images/chap7-netr.png
-share/swat/help/Samba3-ByExample/images/chap9-ADSDC.png
-share/swat/help/Samba3-ByExample/images/chap9-SambaDC.png
-share/swat/help/Samba3-ByExample/images/imc-usermanager2.png
-share/swat/help/Samba3-ByExample/images/lam-config.png
-share/swat/help/Samba3-ByExample/images/lam-group-members.png
-share/swat/help/Samba3-ByExample/images/lam-groups.png
-share/swat/help/Samba3-ByExample/images/lam-hosts.png
-share/swat/help/Samba3-ByExample/images/lam-login.png
-share/swat/help/Samba3-ByExample/images/lam-users.png
-share/swat/help/Samba3-ByExample/images/openmag.png
-share/swat/help/Samba3-ByExample/images/wxpp001.png
-share/swat/help/Samba3-ByExample/images/wxpp004.png
-share/swat/help/Samba3-ByExample/images/wxpp006.png
-share/swat/help/Samba3-ByExample/images/wxpp007.png
-share/swat/help/Samba3-ByExample/images/wxpp008.png
-share/swat/help/Samba3-ByExample/images/wxpp010.png
-share/swat/help/Samba3-ByExample/images/wxpp011.png
-share/swat/help/Samba3-ByExample/images/wxpp012.png
-share/swat/help/Samba3-ByExample/images/wxpp013.png
-share/swat/help/Samba3-ByExample/images/wxpp015.png
-share/swat/help/Samba3-ByExample/index.html
-share/swat/help/Samba3-ByExample/ix01.html
-share/swat/help/Samba3-ByExample/kerberos.html
-share/swat/help/Samba3-ByExample/net2000users.html
-share/swat/help/Samba3-ByExample/ntmigration.html
-share/swat/help/Samba3-ByExample/nw4migration.html
-share/swat/help/Samba3-ByExample/pr01.html
-share/swat/help/Samba3-ByExample/pr02.html
-share/swat/help/Samba3-ByExample/pr03.html
-share/swat/help/Samba3-ByExample/preface.html
-share/swat/help/Samba3-ByExample/primer.html
-share/swat/help/Samba3-ByExample/secure.html
-share/swat/help/Samba3-ByExample/simple.html
-share/swat/help/Samba3-ByExample/small.html
-share/swat/help/Samba3-ByExample/unixclients.html
-share/swat/help/Samba3-ByExample/upgrades.html
-share/swat/help/Samba3-Developers-Guide/CodingSuggestions.html
-share/swat/help/Samba3-Developers-Guide/Packaging.html
-share/swat/help/Samba3-Developers-Guide/architecture.html
-share/swat/help/Samba3-Developers-Guide/contributing.html
-share/swat/help/Samba3-Developers-Guide/debug.html
-share/swat/help/Samba3-Developers-Guide/devprinting.html
-share/swat/help/Samba3-Developers-Guide/index.html
-share/swat/help/Samba3-Developers-Guide/internals.html
-share/swat/help/Samba3-Developers-Guide/modules.html
-share/swat/help/Samba3-Developers-Guide/ntdomain.html
-share/swat/help/Samba3-Developers-Guide/parsing.html
-share/swat/help/Samba3-Developers-Guide/pr01.html
-share/swat/help/Samba3-Developers-Guide/pt01.html
-share/swat/help/Samba3-Developers-Guide/pt02.html
-share/swat/help/Samba3-Developers-Guide/pt03.html
-share/swat/help/Samba3-Developers-Guide/pt04.html
-share/swat/help/Samba3-Developers-Guide/pt05.html
-share/swat/help/Samba3-Developers-Guide/pwencrypt.html
-share/swat/help/Samba3-Developers-Guide/rpc-plugin.html
-share/swat/help/Samba3-Developers-Guide/tracing.html
-share/swat/help/Samba3-Developers-Guide/unix-smb.html
-share/swat/help/Samba3-Developers-Guide/vfs.html
-share/swat/help/Samba3-Developers-Guide/wins.html
-share/swat/help/Samba3-HOWTO/AccessControls.html
-share/swat/help/Samba3-HOWTO/AdvancedNetworkManagement.html
-share/swat/help/Samba3-HOWTO/Appendix.html
-share/swat/help/Samba3-HOWTO/Backup.html
-share/swat/help/Samba3-HOWTO/CUPS-printing.html
-share/swat/help/Samba3-HOWTO/ChangeNotes.html
-share/swat/help/Samba3-HOWTO/ClientConfig.html
-share/swat/help/Samba3-HOWTO/DNSDHCP.html
-share/swat/help/Samba3-HOWTO/FastStart.html
-share/swat/help/Samba3-HOWTO/InterdomainTrusts.html
-share/swat/help/Samba3-HOWTO/IntroSMB.html
-share/swat/help/Samba3-HOWTO/NT4Migration.html
-share/swat/help/Samba3-HOWTO/NetCommand.html
-share/swat/help/Samba3-HOWTO/NetworkBrowsing.html
-share/swat/help/Samba3-HOWTO/Other-Clients.html
-share/swat/help/Samba3-HOWTO/PolicyMgmt.html
-share/swat/help/Samba3-HOWTO/Portability.html
-share/swat/help/Samba3-HOWTO/ProfileMgmt.html
-share/swat/help/Samba3-HOWTO/SWAT.html
-share/swat/help/Samba3-HOWTO/SambaHA.html
-share/swat/help/Samba3-HOWTO/ServerType.html
-share/swat/help/Samba3-HOWTO/StandAloneServer.html
-share/swat/help/Samba3-HOWTO/TOSHpreface.html
-share/swat/help/Samba3-HOWTO/VFS.html
-share/swat/help/Samba3-HOWTO/apa.html
-share/swat/help/Samba3-HOWTO/bugreport.html
-share/swat/help/Samba3-HOWTO/cfgsmarts.html
-share/swat/help/Samba3-HOWTO/ch-ldap-tls.html
-share/swat/help/Samba3-HOWTO/ch47.html
-share/swat/help/Samba3-HOWTO/classicalprinting.html
-share/swat/help/Samba3-HOWTO/compiling.html
-share/swat/help/Samba3-HOWTO/diagnosis.html
-share/swat/help/Samba3-HOWTO/domain-member.html
-share/swat/help/Samba3-HOWTO/go01.html
-share/swat/help/Samba3-HOWTO/groupmapping.html
-share/swat/help/Samba3-HOWTO/idmapper.html
-share/swat/help/Samba3-HOWTO/images/10small.png
-share/swat/help/Samba3-HOWTO/images/11small.png
-share/swat/help/Samba3-HOWTO/images/12small.png
-share/swat/help/Samba3-HOWTO/images/13small.png
-share/swat/help/Samba3-HOWTO/images/14small.png
-share/swat/help/Samba3-HOWTO/images/1small.png
-share/swat/help/Samba3-HOWTO/images/2small.png
-share/swat/help/Samba3-HOWTO/images/3small.png
-share/swat/help/Samba3-HOWTO/images/4small.png
-share/swat/help/Samba3-HOWTO/images/5small.png
-share/swat/help/Samba3-HOWTO/images/6small.png
-share/swat/help/Samba3-HOWTO/images/7small.png
-share/swat/help/Samba3-HOWTO/images/8small.png
-share/swat/help/Samba3-HOWTO/images/9small.png
-share/swat/help/Samba3-HOWTO/images/WME001.png
-share/swat/help/Samba3-HOWTO/images/WME002.png
-share/swat/help/Samba3-HOWTO/images/WME003.png
-share/swat/help/Samba3-HOWTO/images/WME004.png
-share/swat/help/Samba3-HOWTO/images/WME005.png
-share/swat/help/Samba3-HOWTO/images/WME006.png
-share/swat/help/Samba3-HOWTO/images/WME007.png
-share/swat/help/Samba3-HOWTO/images/WME008.png
-share/swat/help/Samba3-HOWTO/images/WME009.png
-share/swat/help/Samba3-HOWTO/images/WME010.png
-share/swat/help/Samba3-HOWTO/images/WME011.png
-share/swat/help/Samba3-HOWTO/images/WME012.png
-share/swat/help/Samba3-HOWTO/images/WME013.png
-share/swat/help/Samba3-HOWTO/images/WME014.png
-share/swat/help/Samba3-HOWTO/images/WXPP002.png
-share/swat/help/Samba3-HOWTO/images/WXPP003.png
-share/swat/help/Samba3-HOWTO/images/WXPP005.png
-share/swat/help/Samba3-HOWTO/images/WXPP009.png
-share/swat/help/Samba3-HOWTO/images/WXPP014.png
-share/swat/help/Samba3-HOWTO/images/a_small.png
-share/swat/help/Samba3-HOWTO/images/access1.png
-share/swat/help/Samba3-HOWTO/images/browsing1.png
-share/swat/help/Samba3-HOWTO/images/cups1.png
-share/swat/help/Samba3-HOWTO/images/cups2.png
-share/swat/help/Samba3-HOWTO/images/domain.png
-share/swat/help/Samba3-HOWTO/images/ethereal1.png
-share/swat/help/Samba3-HOWTO/images/ethereal2.png
-share/swat/help/Samba3-HOWTO/images/idmap-gid2sid.png
-share/swat/help/Samba3-HOWTO/images/idmap-groups.png
-share/swat/help/Samba3-HOWTO/images/idmap-sid2gid.png
-share/swat/help/Samba3-HOWTO/images/idmap-sid2uid.png
-share/swat/help/Samba3-HOWTO/images/idmap-store-gid2sid.png
-share/swat/help/Samba3-HOWTO/images/idmap-uid2sid.png
-share/swat/help/Samba3-HOWTO/images/idmap.png
-share/swat/help/Samba3-HOWTO/images/idmap_winbind_no_loop.png
-share/swat/help/Samba3-HOWTO/images/pdftoepsonusb.png
-share/swat/help/Samba3-HOWTO/images/pdftosocket.png
-share/swat/help/Samba3-HOWTO/images/trusts1.png
-share/swat/help/Samba3-HOWTO/images/w2kp001.png
-share/swat/help/Samba3-HOWTO/images/w2kp002.png
-share/swat/help/Samba3-HOWTO/images/w2kp003.png
-share/swat/help/Samba3-HOWTO/images/w2kp004.png
-share/swat/help/Samba3-HOWTO/images/w2kp005.png
-share/swat/help/Samba3-HOWTO/images/w2kp006.png
-share/swat/help/Samba3-HOWTO/images/wxpp001.png
-share/swat/help/Samba3-HOWTO/images/wxpp004.png
-share/swat/help/Samba3-HOWTO/images/wxpp006.png
-share/swat/help/Samba3-HOWTO/images/wxpp007.png
-share/swat/help/Samba3-HOWTO/images/wxpp008.png
-share/swat/help/Samba3-HOWTO/images/wxpp010.png
-share/swat/help/Samba3-HOWTO/images/wxpp011.png
-share/swat/help/Samba3-HOWTO/images/wxpp012.png
-share/swat/help/Samba3-HOWTO/images/wxpp013.png
-share/swat/help/Samba3-HOWTO/images/wxpp015.png
-share/swat/help/Samba3-HOWTO/index.html
-share/swat/help/Samba3-HOWTO/install.html
-share/swat/help/Samba3-HOWTO/integrate-ms-networks.html
-share/swat/help/Samba3-HOWTO/introduction.html
-share/swat/help/Samba3-HOWTO/ix01.html
-share/swat/help/Samba3-HOWTO/largefile.html
-share/swat/help/Samba3-HOWTO/locking.html
-share/swat/help/Samba3-HOWTO/migration.html
-share/swat/help/Samba3-HOWTO/msdfs.html
-share/swat/help/Samba3-HOWTO/optional.html
-share/swat/help/Samba3-HOWTO/pam.html
-share/swat/help/Samba3-HOWTO/passdb.html
-share/swat/help/Samba3-HOWTO/pr01.html
-share/swat/help/Samba3-HOWTO/pr02.html
-share/swat/help/Samba3-HOWTO/pr03.html
-share/swat/help/Samba3-HOWTO/problems.html
-share/swat/help/Samba3-HOWTO/rights.html
-share/swat/help/Samba3-HOWTO/samba-bdc.html
-share/swat/help/Samba3-HOWTO/samba-pdc.html
-share/swat/help/Samba3-HOWTO/securing-samba.html
-share/swat/help/Samba3-HOWTO/speed.html
-share/swat/help/Samba3-HOWTO/tdb.html
-share/swat/help/Samba3-HOWTO/troubleshooting.html
-share/swat/help/Samba3-HOWTO/type.html
-share/swat/help/Samba3-HOWTO/unicode.html
-share/swat/help/Samba3-HOWTO/upgrading-to-3.0.html
-share/swat/help/Samba3-HOWTO/winbind.html
-share/swat/help/manpages/eventlogadm.8.html
-share/swat/help/manpages/findsmb.1.html
-share/swat/help/manpages/idmap_ad.8.html
-share/swat/help/manpages/idmap_adex.8.html
-share/swat/help/manpages/idmap_autorid.8.html
-share/swat/help/manpages/idmap_hash.8.html
-share/swat/help/manpages/idmap_ldap.8.html
-share/swat/help/manpages/idmap_nss.8.html
-share/swat/help/manpages/idmap_rid.8.html
-share/swat/help/manpages/idmap_tdb.8.html
-share/swat/help/manpages/idmap_tdb2.8.html
-share/swat/help/manpages/index.html
-share/swat/help/manpages/lmhosts.5.html
-share/swat/help/manpages/log2pcap.1.html
-share/swat/help/manpages/net.8.html
-share/swat/help/manpages/nmbd.8.html
-share/swat/help/manpages/nmblookup.1.html
-share/swat/help/manpages/ntlm_auth.1.html
-share/swat/help/manpages/pam_winbind.8.html
-share/swat/help/manpages/pam_winbind.conf.5.html
-share/swat/help/manpages/pdbedit.8.html
-share/swat/help/manpages/profiles.1.html
-share/swat/help/manpages/rpcclient.1.html
-share/swat/help/manpages/samba.7.html
-share/swat/help/manpages/sharesec.1.html
-share/swat/help/manpages/smb.conf.5.html
-share/swat/help/manpages/smbcacls.1.html
-share/swat/help/manpages/smbclient.1.html
-share/swat/help/manpages/smbcontrol.1.html
-share/swat/help/manpages/smbcquotas.1.html
-share/swat/help/manpages/smbd.8.html
-share/swat/help/manpages/smbget.1.html
-share/swat/help/manpages/smbgetrc.5.html
-share/swat/help/manpages/smbpasswd.5.html
-share/swat/help/manpages/smbpasswd.8.html
-share/swat/help/manpages/smbspool.8.html
-share/swat/help/manpages/smbstatus.1.html
-share/swat/help/manpages/smbta-util.8.html
-share/swat/help/manpages/smbtar.1.html
-share/swat/help/manpages/smbtree.1.html
-share/swat/help/manpages/swat.8.html
-share/swat/help/manpages/tdbbackup.8.html
-share/swat/help/manpages/tdbdump.8.html
-share/swat/help/manpages/tdbtool.8.html
-share/swat/help/manpages/testparm.1.html
-share/swat/help/manpages/vfs_acl_tdb.8.html
-share/swat/help/manpages/vfs_acl_xattr.8.html
-share/swat/help/manpages/vfs_aio_fork.8.html
-share/swat/help/manpages/vfs_aio_pthread.8.html
-share/swat/help/manpages/vfs_audit.8.html
-share/swat/help/manpages/vfs_cacheprime.8.html
-share/swat/help/manpages/vfs_cap.8.html
-share/swat/help/manpages/vfs_catia.8.html
-share/swat/help/manpages/vfs_commit.8.html
-share/swat/help/manpages/vfs_crossrename.8.html
-share/swat/help/manpages/vfs_default_quota.8.html
-share/swat/help/manpages/vfs_dirsort.8.html
-share/swat/help/manpages/vfs_extd_audit.8.html
-share/swat/help/manpages/vfs_fake_perms.8.html
-share/swat/help/manpages/vfs_fileid.8.html
-share/swat/help/manpages/vfs_full_audit.8.html
-share/swat/help/manpages/vfs_gpfs.8.html
-share/swat/help/manpages/vfs_netatalk.8.html
-share/swat/help/manpages/vfs_notify_fam.8.html
-share/swat/help/manpages/vfs_prealloc.8.html
-share/swat/help/manpages/vfs_preopen.8.html
-share/swat/help/manpages/vfs_readahead.8.html
-share/swat/help/manpages/vfs_readonly.8.html
-share/swat/help/manpages/vfs_recycle.8.html
-share/swat/help/manpages/vfs_scannedonly.8.html
-share/swat/help/manpages/vfs_shadow_copy.8.html
-share/swat/help/manpages/vfs_shadow_copy2.8.html
-share/swat/help/manpages/vfs_smb_traffic_analyzer.8.html
-share/swat/help/manpages/vfs_streams_depot.8.html
-share/swat/help/manpages/vfs_streams_xattr.8.html
-share/swat/help/manpages/vfs_time_audit.8.html
-share/swat/help/manpages/vfs_xattr_tdb.8.html
-share/swat/help/manpages/vfstest.1.html
-share/swat/help/manpages/wbinfo.1.html
-share/swat/help/manpages/winbind_krb5_locator.7.html
-share/swat/help/manpages/winbindd.8.html
-share/swat/help/welcome-no-samba-doc.html
-share/swat/help/welcome.html
-share/swat/images/globals.gif
-share/swat/images/home.gif
-share/swat/images/passwd.gif
-share/swat/images/printers.gif
-share/swat/images/samba.gif
-share/swat/images/shares.gif
-share/swat/images/status.gif
-share/swat/images/viewconfig.gif
-share/swat/images/wizard.gif
-share/swat/include/footer.html
-share/swat/include/header.html
-share/swat/lang/ja/help/welcome.html
-share/swat/lang/tr/help/welcome.html
-share/swat/lang/tr/images/globals.gif
-share/swat/lang/tr/images/home.gif
-share/swat/lang/tr/images/passwd.gif
-share/swat/lang/tr/images/printers.gif
-share/swat/lang/tr/images/samba.gif
-share/swat/lang/tr/images/shares.gif
-share/swat/lang/tr/images/status.gif
-share/swat/lang/tr/images/viewconfig.gif
-@dir share/swat/lang/tr/js
-@dir share/swat/lang/tr/include
-@dir share/swat/lang/ja/js
-@dir share/swat/lang/ja/include
-@dir share/swat/lang/ja/images
-@dir share/swat/js
diff --git a/net/samba41/Makefile b/net/samba41/Makefile
deleted file mode 100644
index b2a3b95fa962..000000000000
--- a/net/samba41/Makefile
+++ /dev/null
@@ -1,528 +0,0 @@
-# Created by: timur@FreeBSD.org
-# $FreeBSD$
-
-PORTNAME?=		${SAMBA4_BASENAME}41
-PORTVERSION?=		${SAMBA4_VERSION}
-PORTREVISION?=		2
-CATEGORIES?=		net
-MASTER_SITES=		SAMBA/samba/stable SAMBA/samba/rc
-DISTNAME=		${SAMBA4_DISTNAME}
-
-MAINTAINER?=		timur@FreeBSD.org
-COMMENT?=		Free SMB/CIFS and AD/DC server and client for Unix
-
-LICENSE=		GPLv3
-
-CONFLICTS?=		*samba3[2-6]-3.* samba4-4.0.*
-
-DEPRECATED=		not supported by the upstream
-EXPIRATION_DATE=	2016-03-01
-
-SAMBA4_BASENAME=	samba
-SAMBA4_PORTNAME=	${SAMBA4_BASENAME}4
-SAMBA4_VERSION=		4.1.22
-SAMBA4_DISTNAME=	${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
-
-WRKSRC?=		${WRKDIR}/${DISTNAME}
-
-.if !defined(SAMBA4_SUBPORT)
-CPE_VENDOR=		samba
-CPE_PRODUCT=		samba
-# Directories
-VARDIR=			${DESTDIR}/var
-SAMBA4_RUNDIR=		${VARDIR}/run/${SAMBA4_PORTNAME}
-SAMBA4_LOGDIR=		${VARDIR}/log/${SAMBA4_PORTNAME}
-SAMBA4_LOCKDIR=		${VARDIR}/db/${SAMBA4_PORTNAME}
-SAMBA4_PRIVATEDIR=	${SAMBA4_LOCKDIR}/private
-SAMBA4_LIBDIR=		${PREFIX}/lib
-SAMBA4_MODULEDIR=	${SAMBA4_LIBDIR}/shared-modules
-SAMBA4_INCLUDEDIR=	${PREFIX}/include/${SAMBA4_PORTNAME}
-SAMBA4_CONFDIR=		${PREFIX}/etc
-SAMBA4_CONFIG=		smb4.conf
-
-CONFIGURE_ARGS+=	--exec-prefix="${PREFIX}" \
-			--mandir="${MANPREFIX}/man" \
-			--sysconfdir="${SAMBA4_CONFDIR}" \
-			--includedir="${SAMBA4_INCLUDEDIR}" \
-			--datadir="${DATADIR}" \
-			--libdir="${SAMBA4_LIBDIR}" \
-			--with-pammodulesdir="${SAMBA4_LIBDIR}" \
-			--with-privatelibdir="${SAMBA4_LIBDIR}/samba" \
-			--with-modulesdir="${SAMBA4_MODULEDIR}" \
-			--with-pkgconfigdir="${PKGCONFIGDIR}" \
-			--localstatedir="${VARDIR}" \
-			--with-piddir="${SAMBA4_RUNDIR}" \
-			--with-sockets-dir="${SAMBA4_RUNDIR}" \
-			--with-privileged-socket-dir="${SAMBA4_RUNDIR}" \
-			--with-lockdir="${SAMBA4_LOCKDIR}" \
-			--with-statedir="${SAMBA4_LOCKDIR}" \
-			--with-cachedir="${SAMBA4_LOCKDIR}" \
-			--with-privatedir="${SAMBA4_PRIVATEDIR}" \
-			--with-logfilebase="${SAMBA4_LOGDIR}"
-# Flags
-CONFIGURE_ENV+=		PTHREAD_LDFLAGS="-lpthread"
-
-USES=			cpe compiler waf pkgconfig perl5 python:2 \
-			execinfo readline iconv shebangfix
-USE_PERL5=		build
-USE_LDCONFIG=		${SAMBA4_LIBDIR}
-WAF_CMD=		buildtools/bin/waf
-CONFIGURE_LOG=		bin/config.log
-
-PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
-PLIST_SUB+=		PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
-# XXX: Unconditional dependencies which can't be switched off (if present
-# in the system)
-# popt
-LIB_DEPENDS+=		libpopt.so:devel/popt
-# inotify
-LIB_DEPENDS+=		libinotify.so:devel/libinotify
-# SASL
-LIB_DEPENDS+=		libsasl2.so:security/cyrus-sasl2
-# GNUTLS
-LIB_DEPENDS+=		libgcrypt.so:security/libgcrypt
-LIB_DEPENDS+=		libgnutls.so:security/gnutls
-# NFS4 ACL glue
-LIB_DEPENDS+=		libsunacl.so:sysutils/libsunacl
-# External Samba dependencies
-# IDL compiler
-BUILD_DEPENDS+=		p5-Parse-Pidl>=4.0.0:devel/p5-Parse-Pidl
-#
-BUILD_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython
-RUN_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython
-PLIST_SUB+=		PY_DNSPYTHON="@comment "
-# ntdb
-BUILD_DEPENDS+=		ntdb>=1.0:databases/ntdb
-RUN_DEPENDS+=		ntdb>=1.0:databases/ntdb
-SAMBA4_BUNDLED_LIBS+=	!ntdb
-# talloc
-BUILD_DEPENDS+=		talloc>=2.1.5:devel/talloc
-RUN_DEPENDS+=		talloc>=2.1.5:devel/talloc
-SAMBA4_BUNDLED_LIBS+=	!talloc
-# tevent
-BUILD_DEPENDS+=		tevent>=0.9.25:devel/tevent
-RUN_DEPENDS+=		tevent>=0.9.25:devel/tevent
-SAMBA4_BUNDLED_LIBS+=	!tevent
-# tdb
-BUILD_DEPENDS+=		tdb>=1.3.8:databases/tdb
-RUN_DEPENDS+=		tdb>=1.3.8:databases/tdb
-SAMBA4_BUNDLED_LIBS+=	!tdb
-# ldb
-BUILD_DEPENDS+=		ldb>=1.1.24:databases/ldb
-RUN_DEPENDS+=		ldb>=1.1.24:databases/ldb
-SAMBA4_BUNDLED_LIBS+=	!ldb
-# Don't use external libcom_err
-SAMBA4_BUNDLED_LIBS+=	com_err
-##############################################################################
-# Options
-OPTIONS_DEFINE=		ACL_SUPPORT AD_DC ADS AIO_SUPPORT CUPS DEBUG \
-			DNSUPDATE DOCS FAM LDAP PAM_SMBPASS \
-			PTHREADPOOL QUOTAS SYSLOG UTMP
-
-OPTIONS_DEFAULT=	ACL_SUPPORT AD_DC ADS AIO_SUPPORT DEBUG \
-			DNSUPDATE DOCS FAM LDAP \
-			PTHREADPOOL QUOTAS SYSLOG UTMP
-
-ACL_SUPPORT_DESC=	File system ACL support
-AD_DC_DESC=		Active Directory Domain Controller support
-ADS_DESC=		Active Directory client support
-AIO_SUPPORT_DESC=	Asynchronous IO support
-DNSUPDATE_DESC=		Dynamic DNS update (requires ADS)
-EXP_MODULES_DESC=	Experimental modules
-DEBUG_DESC=		With debug information in the binaries
-LDAP_DESC=		LDAP client support
-PAM_SMBPASS_DESC=	PAM authentication via passdb backends
-PTHREADPOOL_DESC=	Pthread pool
-QUOTAS_DESC=		Disk quota support
-UTMP_DESC=		UTMP accounting support
-##############################################################################
-OPTIONS_DEFINE+=	DEVELOPER MANPAGES EXP_MODULES
-
-DEVELOPER_DESC=		With development support
-MANPAGES_DESC=		Build manpages from DOCBOOK templates
-
-OPTIONS_RADIO=		DNS ZEROCONF
-OPTIONS_RADIO_DNS=	NSUPDATE BIND99 BIND910
-OPTIONS_RADIO_ZEROCONF=	AVAHI MDNSRESPONDER
-
-BIND99_DESC=		Use bind99 as AD DC DNS server frontend
-BIND910_DESC=		Use bind910 as AD DC DNS server frontend
-NSUPDATE_DESC=		Use samba NSUPDATE utility for AD DC
-
-.include <bsd.port.options.mk>
-
-CONFIGURE_ARGS+=	\
-			--with-pam \
-			--with-iconv \
-			--with-winbind \
-			--without-gettext \
-			--with-sendfile-support \
-			--builtin-libraries=smbclient \
-			${ICONV_CONFIGURE_BASE}
-
-# for libexecinfo: (so that __builtin_frame_address() finds the top of the stack)
-.if ${ARCH} == "amd64"
-CFLAGS+=		-fno-omit-frame-pointer
-.endif
-
-.if ${PORT_OPTIONS:MBIND99}
-RUN_DEPENDS+=		bind99>=9.9.0.0:dns/bind99
-SUB_LIST+=		NSUPDATE="@comment "
-.elif ${PORT_OPTIONS:MBIND910}
-RUN_DEPENDS+=		bind910>=9.10.0.0:dns/bind910
-SUB_LIST+=		NSUPDATE="@comment "
-.elif ${PORT_OPTIONS:MNSUPDATE}
-RUN_DEPENDS+=		samba-nsupdate:dns/samba-nsupdate
-SUB_LIST+=		NSUPDATE=""
-.endif
-
-.if ${PORT_OPTIONS:MDEBUG}
-WITH_DEBUG=		yes
-CONFIGURE_ARGS+=	--verbose
-MAKE_ARGS+=		--verbose
-CONFIGURE_ARGS+=	--enable-debug
-.endif
-
-# https://bugzilla.samba.org/show_bug.cgi?id=8969
-.if ${PORT_OPTIONS:MDEVELOPER}
-#GDB_CMD?=		gdb79
-# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=194046
-# XXX: Still may break, if the link isn't installed - blame devel/gdb maintainer then.
-GDB_CMD?=		${LOCALBASE}/bin/gdb
-BUILD_DEPENDS+=		${GDB_CMD}:devel/gdb
-RUN_DEPENDS+=		${GDB_CMD}:devel/gdb
-SAMBA4_MODULES+=	auth_skel perfcount_test pdb_test vfs_shadow_copy_test vfs_skel_opaque vfs_skel_transparent vfs_fake_acls
-CONFIGURE_ARGS+=	--enable-developer --enable-socket-wrapper --enable-nss-wrapper --enable-selftest
-PLIST_SUB+=		DEVELOPER=""
-.else
-GDB_CMD=		true
-PLIST_SUB+=		DEVELOPER="@comment "
-.endif
-##############################################################################
-# XXX: That will blow up your installation
-# https://bugzilla.samba.org/show_bug.cgi?id=9302
-.if defined(CRAZY)
-WANT_EXP_MODULES=	auth_samba4 auth_script auth_skel auth_unix auth_wbc \
-			gpext_registry gpext_scripts gpext_security idmap_ad \
-			idmap_autorid idmap_hash idmap_ldap idmap_passdb \
-			idmap_rid idmap_tdb idmap_tdb2 idmap_nss nss_info_template \
-			pdb_ldap pdb_samba_dsdb pdb_smbpasswd pdb_tdbsam \
-			pdb_test pdb_wbc_sam perfcount_test vfs_acl_tdb \
-			vfs_acl_xattr vfs_aio_fork vfs_aio_posix \
-			vfs_aio_pthread vfs_audit vfs_cacheprime vfs_cap \
-			vfs_catia vfs_commit vfs_crossrename vfs_default_quota \
-			vfs_dfs_samba4 vfs_dirsort vfs_expand_msdfs vfs_extd_audit \
-			vfs_fake_acls vfs_fake_perms vfs_full_audit vfs_media_harmony \
-			vfs_netatalk vfs_posix_eadb vfs_preopen vfs_readahead \
-			vfs_readonly vfs_recycle vfs_scannedonly vfs_shadow_copy \
-			vfs_shadow_copy2 vfs_shadow_copy_test vfs_skel_opaque \
-			vfs_skel_transparent vfs_smb_traffic_analyzer vfs_streams_depot \
-			vfs_streams_xattr vfs_syncops vfs_time_audit \
-			vfs_xattr_tdb vfs_zfsacl
-.endif
-
-.if ${PORT_OPTIONS:MEXP_MODULES}
-.	if !defined(WANT_EXP_MODULES) || empty(WANT_EXP_MODULES)
-WANT_EXP_MODULES=	vfs_cacheprime gpext_scripts gpext_security gpext_registry
-.	endif
-.endif
-
-.if ${PORT_OPTIONS:MACL_SUPPORT}
-LIB_DEPENDS+=		libsunacl.so:sysutils/libsunacl
-WANT_EXP_MODULES+=	vfs_zfsacl
-SAMBA4_MODULES+=	vfs_zfsacl
-CONFIGURE_ARGS+=	--with-acl-support
-.else
-CONFIGURE_ARGS+=	--without-acl-support
-.endif
-
-.if ! ${PORT_OPTIONS:MAD_DC}
-CONFIGURE_ARGS+=	--without-ad-dc
-PLIST_SUB+=		AD_DC="@comment "
-.else
-PLIST_SUB+=		AD_DC=""
-.endif
-
-.if ${PORT_OPTIONS:MADS}
-SAMBA4_WANT_ADS=	yes
-SAMBA4_WANT_LDAP=	yes
-# List of extra modules taken from RHEL build
-# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=197320
-SAMBA4_MODULES+=	idmap_rid idmap_ad idmap_hash idmap_adex idmap_tdb2
-.endif
-
-.if ${PORT_OPTIONS:MAIO_SUPPORT}
-CONFIGURE_ARGS+=	--with-aio-support
-SAMBA4_MODULES+=	vfs_aio_posix
-.else
-CONFIGURE_ARGS+=	--without-aio-support
-.endif
-
-.if ${PORT_OPTIONS:MAVAHI}
-LIB_DEPENDS+=		libavahi-client.so:net/avahi-app
-CONFIGURE_ARGS+=	--enable-avahi
-.else
-CONFIGURE_ARGS+=	--disable-avahi
-.endif
-
-.if ${PORT_OPTIONS:MMDNSRESPONDER}
-LIB_DEPENDS+=		libdns_sd.so:net/mDNSResponder
-CONFIGURE_ARGS+=	--enable-dnssd
-.else
-CONFIGURE_ARGS+=	--disable-dnssd
-.endif
-
-.if ${PORT_OPTIONS:MCUPS}
-LIB_DEPENDS+=		libcups.so:print/cups
-CONFIGURE_ARGS+=	--enable-cups --enable-iprint
-.else
-CONFIGURE_ARGS+=	--disable-cups --disable-iprint
-.endif
-
-.if ${PORT_OPTIONS:MDNSUPDATE}
-SAMBA_WANT_ADS=		yes
-CONFIGURE_ARGS+=	--with-dnsupdate
-.else
-CONFIGURE_ARGS+=	--without-dnsupdate
-.endif
-
-# https://bugzilla.samba.org/show_bug.cgi?id=9545
-.if ${PORT_OPTIONS:MFAM}
-USES+=			fam
-CONFIGURE_ARGS+=	--with-fam
-WANT_EXP_MODULES+=	vfs_notify_fam
-SAMBA4_MODULES+=	vfs_notify_fam
-.else
-CONFIGURE_ARGS+=	--without-fam
-.endif
-
-.if ${PORT_OPTIONS:MLDAP}
-SAMBA4_WANT_LDAP=	yes
-.endif
-
-.if ${PORT_OPTIONS:MPAM_SMBPASS}
-CONFIGURE_ARGS+=	--with-pam_smbpass
-PLIST_SUB+=		SMBPASS=""
-.else
-CONFIGURE_ARGS+=	--without-pam_smbpass
-PLIST_SUB+=		SMBPASS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPTHREADPOOL}
-CONFIGURE_ARGS+=	--enable-pthreadpool
-SAMBA4_MODULES+=	vfs_aio_pthread
-.else
-CONFIGURE_ARGS+=	--disable-pthreadpool
-.endif
-
-.if ${PORT_OPTIONS:MQUOTAS}
-CONFIGURE_ARGS+=	--with-quotas
-.else
-CONFIGURE_ARGS+=	--without-quotas
-.endif
-
-.if ${PORT_OPTIONS:MSYSLOG}
-CONFIGURE_ARGS+=	--with-syslog
-.else
-CONFIGURE_ARGS+=	--without-syslog
-.endif
-
-.if ${PORT_OPTIONS:MUTMP}
-CONFIGURE_ARGS+=	--with-utmp
-.else
-CONFIGURE_ARGS+=	--without-utmp
-.endif
-
-.if defined(SAMBA4_WANT_ADS)
-CONFIGURE_ARGS+=	--with-ads
-.else
-CONFIGURE_ARGS+=	--without-ads
-.endif
-
-.if defined(SAMBA4_WANT_LDAP)
-USE_OPENLDAP=		yes
-#WANT_OPENLDAP_SASL=	yes
-CONFIGURE_ARGS+=	--with-ldap
-PLIST_SUB+=		LDAP=""
-.else
-CONFIGURE_ARGS+=	--without-ldap
-PLIST_SUB+=		LDAP="@comment "
-.endif
-
-.if ! ${PORT_OPTIONS:MMANPAGES}
-CONFIGURE_ENV+=		XSLTPROC="true"
-.else
-BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
-			xsltproc:textproc/libxslt
-.endif
-
-.if defined(SAMBA4_BUNDLED_LIBS) && !empty(SAMBA4_BUNDLED_LIBS)
-CONFIGURE_ARGS+=	--bundled-libraries="${SAMBA4_BUNDLED_LIBS:Q:C|(\\\\ )+|,|g:S|\\||g}"
-.endif
-
-.if defined(WANT_EXP_MODULES) && !empty(WANT_EXP_MODULES)
-SAMBA4_MODULES+=	${WANT_EXP_MODULES}
-.endif
-
-.if defined(SAMBA4_MODULES) && !empty(SAMBA4_MODULES)
-CONFIGURE_ARGS+=	--with-shared-modules="${SAMBA4_MODULES:Q:C|(\\\\ )+|,|g:S|\\||g}"
-.endif
-# XXX: Dirty
-.for module in	auth_samba4 auth_skel auth_unix auth_wbc gpext_registry gpext_scripts \
-		gpext_security idmap_ad idmap_ldap idmap_nss idmap_passdb idmap_tdb \
-		nss_info_template pdb_ldap pdb_samba_dsdb pdb_smbpasswd pdb_tdbsam \
-		pdb_test pdb_wbc_sam perfcount_test vfs_aio_posix vfs_aio_pthread \
-		vfs_cacheprime vfs_dfs_samba4 vfs_fake_acls vfs_notify_fam \
-		vfs_shadow_copy_test vfs_skel_opaque vfs_skel_transparent
-.	if !empty(SAMBA4_MODULES) && ${SAMBA4_MODULES:M${module}}
-PLIST_SUB+=		MODULE_${module:tu}=""
-.	else
-PLIST_SUB+=		MODULE_${module:tu}="@comment "
-.	endif
-.endfor
-##############################################################################
-# !SAMBA4_SUBPORT
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if !defined(SAMBA4_SUBPORT)
-
-SAMBA4_SUB=		SAMBA4_LOGDIR="${SAMBA4_LOGDIR}" \
-			SAMBA4_RUNDIR="${SAMBA4_RUNDIR}" \
-			SAMBA4_LOCKDIR="${SAMBA4_LOCKDIR}" \
-			SAMBA4_MODULEDIR="${SAMBA4_MODULEDIR}" \
-			SAMBA4_PRIVATEDIR="${SAMBA4_PRIVATEDIR}" \
-			SAMBA4_CONFDIR="${SAMBA4_CONFDIR}" \
-			SAMBA4_CONFIG="${SAMBA4_CONFIG}"
-
-PLIST_SUB+=		${SAMBA4_SUB}
-SUB_LIST+=		${SAMBA4_SUB}
-
-USE_RC_SUBR=		samba_server
-SUB_FILES=		pkg-message README.FreeBSD
-# Make sure that the right version of Python is used by the tools
-# https://bugzilla.samba.org/show_bug.cgi?id=7305
-SHEBANG_FILES=		${PATCH_WRKSRC}/source4/scripting/bin/*
-# No fancy color error messages
-.if ${COMPILER_TYPE} == "clang"
-CFLAGS+=		-fno-color-diagnostics
-.endif
-CONFIGURE_ENV+=		NOCOLOR=yes
-MAKE_ENV+=		NOCOLOR=yes
-
-SAMBA_MAN1+=		dbwrap_tool.1 findsmb.1 gentest.1 locktest.1 \
-			log2pcap.1 masktest.1 ndrdump.1 nmblookup.1 \
-			nmblookup4.1 ntlm_auth.1 oLschema2ldif.1 \
-			profiles.1 regdiff.1 regpatch.1 regshell.1 \
-			regtree.1 rpcclient.1 sharesec.1 smbcacls.1 \
-			smbclient.1 smbcontrol.1 smbcquotas.1 smbget.1 \
-			smbstatus.1 smbtar.1 smbtorture.1 smbtree.1 \
-			testparm.1 vfstest.1 wbinfo.1
-
-SAMBA_MAN5+=		lmhosts.5 smbgetrc.5 smbpasswd.5 pam_winbind.conf.5 \
-			smb.conf.5
-
-SAMBA_MAN7+=		samba.7 winbind_krb5_locator.7
-
-SAMBA_MAN8+=		eventlogadm.8 idmap_ad.8 idmap_autorid.8 idmap_hash.8 \
-			idmap_ldap.8 idmap_nss.8 idmap_rfc2307.8 idmap_rid.8 \
-			idmap_tdb.8 idmap_tdb2.8 net.8 nmbd.8 pam_winbind.8 pdbedit.8 \
-			samba-regedit.8 samba-tool.8 samba.8 smbd.8 smbpasswd.8 \
-			smbspool.8 smbta-util.8 vfs_acl_tdb.8 vfs_acl_xattr.8 \
-			vfs_aio_fork.8 vfs_aio_linux.8 vfs_aio_pthread.8 \
-			vfs_audit.8 vfs_cacheprime.8 vfs_cap.8 vfs_catia.8 \
-			vfs_commit.8 vfs_crossrename.8 vfs_default_quota.8 \
-			vfs_dirsort.8 vfs_extd_audit.8 vfs_fake_perms.8 vfs_fileid.8 \
-			vfs_full_audit.8 vfs_glusterfs.8 vfs_gpfs.8 vfs_media_harmony.8 \
-			vfs_netatalk.8 vfs_notify_fam.8 vfs_prealloc.8 \
-			vfs_preopen.8 vfs_readahead.8 vfs_readonly.8 \
-			vfs_recycle.8 vfs_scannedonly.8 vfs_shadow_copy.8 \
-			vfs_shadow_copy2.8 vfs_smb_traffic_analyzer.8 \
-			vfs_streams_depot.8 vfs_streams_xattr.8 vfs_syncops.8 vfs_time_audit.8 \
-			vfs_tsmsm.8 vfs_xattr_tdb.8 winbindd.8 \
-			vfs_linux_xfs_sgid.8 vfs_btrfs.8
-
-PORTDOCS=		README.FreeBSD
-
-IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
-
-post-extract:
-			@${RM} -rf ${WRKSRC}/pidl
-
-post-patch:
-			@${REINPLACE_CMD} -e 's|$${PKGCONFIGDIR}|${PKGCONFIGDIR}|g' \
-				${PATCH_WRKSRC}/buildtools/wafsamba/pkgconfig.py
-			@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-				${PATCH_WRKSRC}/buildtools/wafsamba/samba_pidl.py \
-				${PATCH_WRKSRC}/buildtools/wafsamba/wafsamba.py
-			@${REINPLACE_CMD} -e 's|%%GDB_CMD%%|${GDB_CMD}|g' \
-				${PATCH_WRKSRC}/buildtools/scripts/abi_gen.sh
-			@${REINPLACE_CMD} -e 's|%%SAMBA4_CONFIG%%|${SAMBA4_CONFIG}|g' \
-				${PATCH_WRKSRC}/dynconfig/wscript
-
-# Use threading (or multiprocessing) but not thread (renamed in python 3+).
-pre-configure:
-			@if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \
-				${ECHO_CMD}; \
-				${ECHO_MSG} "===>  ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \
-				${ECHO_CMD}; \
-				${FALSE}; \
-			fi
-
-# XXX: Gross hack to allow build newer Samba while old one is installed.
-# This implies that LINKFLAGS_PYEMBED contains flags which are already
-# used in other parts of LINKFLAGS, namely -L$(LOCALBASE)/lib and -pthread
-post-configure:
-	-${REINPLACE_CMD} -e 's|LINKFLAGS_PYEMBED.*|LINKFLAGS_PYEMBED = []|' \
-		${CONFIGURE_WRKSRC}/bin/c4che/default.cache.py
-
-pre-build:
-.if ! ${PORT_OPTIONS:MMANPAGES}
-.	for man in	libcli/nbt/man/nmblookup4.1 \
-			librpc/tools/ndrdump.1 \
-			source4/lib/registry/man/regdiff.1 \
-			source4/lib/registry/man/regpatch.1 \
-			source4/lib/registry/man/regshell.1 \
-			source4/lib/registry/man/regtree.1 \
-			source4/torture/man/gentest.1 \
-			source4/torture/man/locktest.1 \
-			source4/torture/man/masktest.1 \
-			source4/torture/man/smbtorture.1 \
-			source4/utils/man/ntlm_auth4.1 \
-			source4/utils/man/oLschema2ldif.1
-			-@${MKDIR} `dirname ${BUILD_WRKSRC}/bin/default/${man}`
-			${INSTALL_MAN} ${FILESDIR}/man/`basename ${man}` ${BUILD_WRKSRC}/bin/default/${man}
-.	endfor
-			-@${MKDIR} ${BUILD_WRKSRC}/bin/default/docs-xml/manpages
-.	for man in ${SAMBA_MAN1} ${SAMBA_MAN5} ${SAMBA_MAN7} ${SAMBA_MAN8}
-			-${INSTALL_MAN} ${BUILD_WRKSRC}/docs/manpages/${man} ${BUILD_WRKSRC}/bin/default/docs-xml/manpages
-.	endfor
-.endif
-
-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
-.endif
-# Run post-install script
-.for dir in ${SAMBA4_LOGDIR} ${SAMBA4_RUNDIR} ${SAMBA4_LOCKDIR} ${SAMBA4_MODULEDIR}
-			@${INSTALL} -d -m 0755 "${STAGEDIR}${dir}"
-.endfor
-			@${INSTALL} -d -m 0700 "${STAGEDIR}${SAMBA4_PRIVATEDIR}"
-.for dir in auth bind9 gensec gpext idmap ldb nss_info pdb perfcount process_model service vfs
-			@${MKDIR} "${STAGEDIR}${SAMBA4_MODULEDIR}/${dir}"
-.endfor
-
-.if ${PORT_OPTIONS:MDEVELOPER}
-test: build
-			@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_CMD} ${MAKE_ARGS} $@)
-.endif
-
-# !SAMBA4_SUBPORT
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/net/samba41/distinfo b/net/samba41/distinfo
deleted file mode 100644
index 38c9bf235ef1..000000000000
--- a/net/samba41/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (samba-4.1.22.tar.gz) = 5563a1c94a2dac837ccffd1f0821bb25e097affaa7389fef186f9cfb3486cfe5
-SIZE (samba-4.1.22.tar.gz) = 19557688
diff --git a/net/samba41/files/README.FreeBSD.in b/net/samba41/files/README.FreeBSD.in
deleted file mode 100644
index b40faa7ceed2..000000000000
--- a/net/samba41/files/README.FreeBSD.in
+++ /dev/null
@@ -1,99 +0,0 @@
-
-              !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-              !!! Please read before runing any tools !!!
-              !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-Documentation
-=============
-
-    o https://wiki.samba.org/index.php/Samba4/HOWTO
-
-    o https://wiki.samba.org/index.php/Samba_AD_DC_HOWTO
-
-    o https://wiki.samba.org/index.php/Samba4/samba-tool/domain/classicupgrade/HOWTO
-
-FreeBSD specific information
-============================
-
-* Your configuration is in: %%SAMBA4_CONFDIR%%/%%SAMBA4_CONFIG%%
-
-* All the logs are under: %%SAMBA4_LOGDIR%%
-
-* All the relevant databases are under: %%SAMBA4_LOCKDIR%%
-
-* Provisioning script is: %%PREFIX%%/bin/samba-tool
-
-Samba4 provisioning requires file system(s) with POSIX ACLs support. At
-the moment that is UFS2 only. You have to add 'acls' option to the mount
-flags to get things working.
-
-It is known that ZFS-only installations don't work out of the box with
-Samba4. In partucular, s3fs service requires POSIX ACLs during provi-
-sioning. It is possible to work around that requirement by specifying:
-
-    # samba-tool domain provision --interactive --use-xattrs=no --use-ntvfs
-
-And removing later in '%%SAMBA4_CONFIG%%' options like:
-
-    'server services', 'dcerpc endpoint servers', 'posix:eadb'
-
-and adding 'vfs objects = zfsacl' as well. Still this isn't supported
-and tested configuration, so use it at your own risk.
-
-You may find this tutorial useful, if you happen to run Samba4 on
-ZFS-root:
-
-    o http://glsan.com/community/samba4
-
-To run this port you need to perform the following steps:
----------------------------------------------------------
-
-0. If you had Samba3 port installed before, please, *take backups* of
-all the relevant files. That includes 'smb.conf' file and all the
-content of the '/var/db/samba/' directory.
-
-If you had Samba4-devel installation before to my knowledge the best
-option would be to start from scratch.
-
-1a. Create new '%%SAMBA4_CONFDIR%%/%%SAMBA4_CONFIG%%' file by running:
-
-    # samba-tool domain provision
-
-1b. Or upgrade from the Samba3 'smb.conf' file by running:
-
-    # samba-tool domain classicupgrade
-
-%%NSUPDATE%%1c. You will need to specify location of the 'nsupdate' command in the
-%%NSUPDATE%%'%%SAMBA4_CONFIG%%' file:
-%%NSUPDATE%%
-%%NSUPDATE%%      nsupdate command = %%PREFIX%%/bin/samba-nsupdate -g
-%%NSUPDATE%%
-2. Put string 'samba_server_enable="YES"' into your /etc/rc.conf.
-
-3. Make sure that your server doesn't run Samba3, OpenLDAP and named.
-Stop them, if necessary.
-
-4. Run '%%PREFIX%%/etc/rc.d/samba_server start' or reboot.
-
-WARNING! This port is still experimental and if you need any asistance,
-please, check archives of samba@lists.samba.org and ask there for help.
-
-    https://lists.samba.org/archive/samba/
-
-In case you found a bug which is clearly not related to the port build
-process itself, plese file a bug report at:
-
-    https://bugzilla.samba.org/
-
-And add me to CC list.
-
-You may find those tools helpful:
----------------------------------
-
-Microsoft Remote Server Administration Tools (RSAT) for:
-
-* Vista: http://www.microsoft.com/en-us/download/details.aspx?id=21090
-* Windows 7: http://www.microsoft.com/en-us/download/details.aspx?id=7887
-
-
-FreeBSD Samba4 port maintainer: Timur I. Bakeyev <timur@FreeBSD.org>
diff --git a/net/samba41/files/man/gentest.1 b/net/samba41/files/man/gentest.1
deleted file mode 100644
index ad9b0790ed49..000000000000
--- a/net/samba41/files/man/gentest.1
+++ /dev/null
@@ -1,133 +0,0 @@
-'\" t
-.\"     Title: gentest
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 10/15/2013
-.\"    Manual: Test Suite
-.\"    Source: Samba 4.0
-.\"  Language: English
-.\"
-.TH "GENTEST" "1" "10/15/2013" "Samba 4\&.0" "Test Suite"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-gentest \- Run random generic SMB operations against two SMB servers and show the differences in behavior
-.SH "SYNOPSIS"
-.HP \w'\fBgentest\fR\ 'u
-\fBgentest\fR {//server1/share1} {//server2/share2} {\-U\ user%pass} {\-U\ user%pass} [\-s\ seed] [\-o\ numops] [\-a] [\-A] [\-i\ FILE] [\-O] [\-S\ FILE] [\-L] [\-F] [\-C] [\-X]
-.SH "DESCRIPTION"
-.PP
-gentest
-is a utility for detecting differences in behaviour between SMB servers\&. It will run a random set of generic operations against
-\fI//server1/share1\fR
-and then the same random set against
-\fI//server2/share2\fR
-and display the differences in the responses it gets\&.
-.PP
-This utility is used by the Samba team to find differences in behaviour between Samba and Windows servers\&.
-.SH "OPTIONS"
-.PP
-\-U user%pass
-.RS 4
-Specify the user and password to use when logging on on the shares\&. This parameter is mandatory and has to be specified twice\&.
-.RE
-.PP
-\-s seed
-.RS 4
-Seed the random number generator with the specified value\&.
-.RE
-.PP
-\-o numops
-.RS 4
-Set the number of operations to perform\&.
-.RE
-.PP
-\-a
-.RS 4
-Print the operations that are performed\&.
-.RE
-.PP
-\-A
-.RS 4
-Backtrack to find minimal number of operations required to make the response to a certain call differ\&.
-.RE
-.PP
-\-i FILE
-.RS 4
-Specify a file containing the names of fields that have to be ignored (such as time fields)\&. See below for a description of the file format\&.
-.RE
-.PP
-\-O
-.RS 4
-Enable oplocks\&.
-.RE
-.PP
-\-S FILE
-.RS 4
-Set preset seeds file\&. The default is
-gentest_seeds\&.dat\&.
-.RE
-.PP
-\-L
-.RS 4
-Use preset seeds
-.RE
-.PP
-\-F
-.RS 4
-Fast reconnect (just close files)
-.RE
-.PP
-\-C
-.RS 4
-Continuous analysis mode
-.RE
-.PP
-\-X
-.RS 4
-Analyse even when the test succeeded\&.
-.RE
-.SH "VERSION"
-.PP
-This man page is correct for version 4\&.0 of the Samba suite\&.
-.SH "SEE ALSO"
-.PP
-Samba
-.SH "AUTHOR"
-.PP
-This utility is part of the
-\m[blue]\fBSamba\fR\m[]\&\s-2\u[1]\d\s+2
-suite, which is developed by the global
-\m[blue]\fBSamba Team\fR\m[]\&\s-2\u[2]\d\s+2\&.
-.PP
-gentest was written by Andrew Tridgell\&.
-.PP
-This manpage was written by Jelmer Vernooij\&.
-.SH "NOTES"
-.IP " 1." 4
-Samba
-.RS 4
-\%http://www.samba.org/
-.RE
-.IP " 2." 4
-Samba Team
-.RS 4
-\%http://www.samba.org/samba/team/
-.RE
diff --git a/net/samba41/files/man/locktest.1 b/net/samba41/files/man/locktest.1
deleted file mode 100644
index 254321270bf7..000000000000
--- a/net/samba41/files/man/locktest.1
+++ /dev/null
@@ -1,137 +0,0 @@
-'\" t
-.\"     Title: locktest
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 10/15/2013
-.\"    Manual: Test Suite
-.\"    Source: Samba 4.0
-.\"  Language: English
-.\"
-.TH "LOCKTEST" "1" "10/15/2013" "Samba 4\&.0" "Test Suite"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-locktest \- Find differences in locking between two SMB servers
-.SH "SYNOPSIS"
-.HP \w'\fBlocktest\fR\ 'u
-\fBlocktest\fR {//server1/share1} {//server2/share2} [\-U\ user%pass] [\-U\ user%pass] [\-s\ seed] [\-o\ numops] [\-a] [\-O] [\-E] [\-Z] [\-R\ range] [\-B\ base] [\-M\ min]
-.SH "DESCRIPTION"
-.PP
-locktest
-is a utility for detecting differences in behaviour in locking between SMB servers\&. It will run a random set of locking operations against
-\fI//server1/share1\fR
-and then the same random set against
-\fI//server2/share2\fR
-and display the differences in the responses it gets\&.
-.PP
-This utility is used by the Samba team to find differences in behaviour between Samba and Windows servers\&.
-.SH "OPTIONS"
-.PP
-\-U user%pass
-.RS 4
-Specify the user and password to use when logging on on the shares\&. This parameter can be specified twice (once for the first server, once for the second)\&.
-.RE
-.PP
-\-s seed
-.RS 4
-Seed the random number generator with the specified value\&.
-.RE
-.PP
-\-o numops
-.RS 4
-Set the number of operations to perform\&.
-.RE
-.PP
-\-a
-.RS 4
-Print the operations that are performed\&.
-.RE
-.PP
-\-A
-.RS 4
-Backtrack to find minimal number of operations required to make the response to a certain call differ\&.
-.RE
-.PP
-\-O
-.RS 4
-Enable oplocks\&.
-.RE
-.PP
-\-u
-.RS 4
-Hide unlock fails\&.
-.RE
-.PP
-\-E
-.RS 4
-enable exact error code checking
-.RE
-.PP
-\-Z
-.RS 4
-enable the zero/zero lock
-.RE
-.PP
-\-R range
-.RS 4
-set lock range
-.RE
-.PP
-\-B base
-.RS 4
-set lock base
-.RE
-.PP
-\-M min
-.RS 4
-set min lock length
-.RE
-.PP
-\-k
-.RS 4
-Use kerberos
-.RE
-.SH "VERSION"
-.PP
-This man page is correct for version 4\&.0 of the Samba suite\&.
-.SH "SEE ALSO"
-.PP
-Samba
-.SH "AUTHOR"
-.PP
-This utility is part of the
-\m[blue]\fBSamba\fR\m[]\&\s-2\u[1]\d\s+2
-suite, which is developed by the global
-\m[blue]\fBSamba Team\fR\m[]\&\s-2\u[2]\d\s+2\&.
-.PP
-locktest was written by Andrew Tridgell\&.
-.PP
-This manpage was written by Jelmer Vernooij\&.
-.SH "NOTES"
-.IP " 1." 4
-Samba
-.RS 4
-\%http://www.samba.org/
-.RE
-.IP " 2." 4
-Samba Team
-.RS 4
-\%http://www.samba.org/samba/team/
-.RE
diff --git a/net/samba41/files/man/masktest.1 b/net/samba41/files/man/masktest.1
deleted file mode 100644
index 2c90f71083a6..000000000000
--- a/net/samba41/files/man/masktest.1
+++ /dev/null
@@ -1,113 +0,0 @@
-'\" t
-.\"     Title: masktest
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 10/15/2013
-.\"    Manual: Test Suite
-.\"    Source: Samba 4.0
-.\"  Language: English
-.\"
-.TH "MASKTEST" "1" "10/15/2013" "Samba 4\&.0" "Test Suite"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-masktest \- Find differences in wildcard matching between Samba\*(Aqs implementation and that of a remote server\&.
-.SH "SYNOPSIS"
-.HP \w'\fBmasktest\fR\ 'u
-\fBmasktest\fR {//server/share} [\-U\ user%pass] [\-d\ debuglevel] [\-W\ workgroup] [\-n\ numloops] [\-s\ seed] [\-a] [\-E] [\-M\ max\ protocol] [\-f\ filechars] [\-m\ maskchars] [\-v]
-.SH "DESCRIPTION"
-.PP
-masktest
-is a utility for detecting differences in behaviour between Samba\*(Aqs own implementation and that of a remote server\&. It will run generate random filenames/masks and check if these match the same files they do on the remote file as they do on the local server\&. It will display any differences it finds\&.
-.PP
-This utility is used by the Samba team to find differences in behaviour between Samba and Windows servers\&.
-.SH "OPTIONS"
-.PP
-\-U user%pass
-.RS 4
-Specify the user and password to use when logging on on the shares\&. This parameter can be specified twice (once for the first server, once for the second)\&.
-.RE
-.PP
-\-s seed
-.RS 4
-Seed the random number generator with the specified value\&.
-.RE
-.PP
-\-n numops
-.RS 4
-Set the number of operations to perform\&.
-.RE
-.PP
-\-a
-.RS 4
-Print the operations that are performed\&.
-.RE
-.PP
-\-M max_protocol
-.RS 4
-Maximum protocol to use\&.
-.RE
-.PP
-\-f
-.RS 4
-Specify characters that can be used when generating file names\&. Default: abcdefghijklm\&.
-.RE
-.PP
-\-E
-.RS 4
-Abort when difference in behaviour is found\&.
-.RE
-.PP
-\-m maskchars
-.RS 4
-Specify characters used for wildcards\&.
-.RE
-.PP
-\-v
-.RS 4
-Be verbose
-.RE
-.SH "VERSION"
-.PP
-This man page is correct for version 4\&.0 of the Samba suite\&.
-.SH "SEE ALSO"
-.PP
-Samba
-.SH "AUTHOR"
-.PP
-This utility is part of the
-\m[blue]\fBSamba\fR\m[]\&\s-2\u[1]\d\s+2
-suite, which is developed by the global
-\m[blue]\fBSamba Team\fR\m[]\&\s-2\u[2]\d\s+2\&.
-.PP
-masktest was written by Andrew Tridgell\&.
-.PP
-This manpage was written by Jelmer Vernooij\&.
-.SH "NOTES"
-.IP " 1." 4
-Samba
-.RS 4
-\%http://www.samba.org/
-.RE
-.IP " 2." 4
-Samba Team
-.RS 4
-\%http://www.samba.org/samba/team/
-.RE
diff --git a/net/samba41/files/man/ndrdump.1 b/net/samba41/files/man/ndrdump.1
deleted file mode 100644
index ab8e7f75eaff..000000000000
--- a/net/samba41/files/man/ndrdump.1
+++ /dev/null
@@ -1,83 +0,0 @@
-'\" t
-.\"     Title: ndrdump
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 10/15/2013
-.\"    Manual: System Administration tools
-.\"    Source: Samba 4.0
-.\"  Language: English
-.\"
-.TH "NDRDUMP" "1" "10/15/2013" "Samba 4\&.0" "System Administration tools"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-ndrdump \- DCE/RPC Packet Parser and Dumper
-.SH "SYNOPSIS"
-.HP \w'\fBndrdump\fR\ 'u
-\fBndrdump\fR [\-c\ context] {pipe} {function} {in|out} {filename}
-.HP \w'\fBndrdump\fR\ 'u
-\fBndrdump\fR [pipe]
-.HP \w'\fBndrdump\fR\ 'u
-\fBndrdump\fR
-.SH "DESCRIPTION"
-.PP
-ndrdump tries to parse the specified
-\fIfilename\fR
-using Samba\*(Aqs parser for the specified pipe and function\&. The third argument should be either
-\fIin\fR
-or
-\fIout\fR, depending on whether the data should be parsed as a request or a reply\&.
-.PP
-Running ndrdump without arguments will list the pipes for which parsers are available\&.
-.PP
-Running ndrdump with one argument will list the functions that Samba can parse for the specified pipe\&.
-.PP
-The primary function of ndrdump is debugging Samba\*(Aqs internal DCE/RPC parsing functions\&. The file being parsed is usually one exported by wiresharks
-\(lqExport selected packet bytes\(rq
-function\&.
-.PP
-The context argument can be used to load context data from the request packet when parsing reply packets (such as array lengths)\&.
-.SH "VERSION"
-.PP
-This man page is correct for version 4\&.0 of the Samba suite\&.
-.SH "SEE ALSO"
-.PP
-wireshark, pidl
-.SH "AUTHOR"
-.PP
-This utility is part of the
-\m[blue]\fBSamba\fR\m[]\&\s-2\u[1]\d\s+2
-suite, which is developed by the global
-\m[blue]\fBSamba Team\fR\m[]\&\s-2\u[2]\d\s+2\&.
-.PP
-ndrdump was written by Andrew Tridgell\&.
-.PP
-This manpage was written by Jelmer Vernooij\&.
-.SH "NOTES"
-.IP " 1." 4
-Samba
-.RS 4
-\%http://www.samba.org/
-.RE
-.IP " 2." 4
-Samba Team
-.RS 4
-\%http://www.samba.org/samba/team/
-.RE
diff --git a/net/samba41/files/man/nmblookup4.1 b/net/samba41/files/man/nmblookup4.1
deleted file mode 100644
index 946423606a79..000000000000
--- a/net/samba41/files/man/nmblookup4.1
+++ /dev/null
@@ -1,157 +0,0 @@
-'\" t
-.\"     Title: nmblookup4
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 10/15/2013
-.\"    Manual: User Commands
-.\"    Source: Samba 3.2
-.\"  Language: English
-.\"
-.TH "NMBLOOKUP4" "1" "10/15/2013" "Samba 3\&.2" "User Commands"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-nmblookup4 \- NetBIOS over TCP/IP client used to lookup NetBIOS names
-.SH "SYNOPSIS"
-.HP \w'\fBnmblookup4\fR\ 'u
-\fBnmblookup4\fR [\-M] [\-R] [\-S] [\-r] [\-A] [\-h] [\-B\ <broadcast\ address>] [\-U\ <unicast\ address>] [\-d\ <debug\ level>] [\-s\ <smb\ config\ file>] [\-i\ <NetBIOS\ scope>] [\-T] [\-f] {name}
-.SH "DESCRIPTION"
-.PP
-This tool is part of the
-\fBsamba\fR(7)
-suite\&.
-.PP
-\fBnmblookup4\fR
-is used to query NetBIOS names and map them to IP addresses in a network using NetBIOS over TCP/IP queries\&. The options allow the name queries to be directed at a particular IP broadcast area or to a particular machine\&. All queries are done over UDP\&.
-.SH "OPTIONS"
-.PP
-\-M
-.RS 4
-Searches for a master browser by looking up the NetBIOS name
-\fIname\fR
-with a type of
-\fB0x1d\fR\&. If
-\fI name\fR
-is "\-" then it does a lookup on the special name
-\fB__MSBROWSE__\fR\&. Please note that in order to use the name "\-", you need to make sure "\-" isn\*(Aqt parsed as an argument, e\&.g\&. use :
-\fBnmblookup4 \-M \-\- \-\fR\&.
-.RE
-.PP
-\-R
-.RS 4
-Set the recursion desired bit in the packet to do a recursive lookup\&. This is used when sending a name query to a machine running a WINS server and the user wishes to query the names in the WINS server\&. If this bit is unset the normal (broadcast responding) NetBIOS processing code on a machine is used instead\&. See RFC1001, RFC1002 for details\&.
-.RE
-.PP
-\-S
-.RS 4
-Once the name query has returned an IP address then do a node status query as well\&. A node status query returns the NetBIOS names registered by a host\&.
-.RE
-.PP
-\-r
-.RS 4
-Try and bind to UDP port 137 to send and receive UDP datagrams\&. The reason for this option is a bug in Windows 95 where it ignores the source port of the requesting packet and only replies to UDP port 137\&. Unfortunately, on most UNIX systems root privilege is needed to bind to this port, and in addition, if the
-\fBnmbd\fR(8)
-daemon is running on this machine it also binds to this port\&.
-.RE
-.PP
-\-A
-.RS 4
-Interpret
-\fIname\fR
-as an IP Address and do a node status query on this address\&.
-.RE
-.PP
-\-B <broadcast address>
-.RS 4
-Send the query to the given broadcast address\&. Without this option the default behavior of nmblookup4 is to send the query to the broadcast address of the network interfaces as either auto\-detected or defined in the
-\m[blue]\fB\fIinterfaces\fR\fR\m[]\&\s-2\u[1]\d\s+2
-parameter of the
-\fBsmb.conf\fR(5)
-file\&.
-.RE
-.PP
-\-U <unicast address>
-.RS 4
-Do a unicast query to the specified address or host
-\fIunicast address\fR\&. This option (along with the
-\fI\-R\fR
-option) is needed to query a WINS server\&.
-.RE
-.PP
-\-T
-.RS 4
-This causes any IP addresses found in the lookup to be looked up via a reverse DNS lookup into a DNS name, and printed out before each
-.sp
-\fIIP address \&.\&.\&.\&. NetBIOS name\fR
-.sp
-pair that is the normal output\&.
-.RE
-.PP
-\-f
-.RS 4
-Show which flags apply to the name that has been looked up\&. Possible answers are zero or more of: Response, Authoritative, Truncated, Recursion_Desired, Recursion_Available, Broadcast\&.
-.RE
-.PP
-name
-.RS 4
-This is the NetBIOS name being queried\&. Depending upon the previous options this may be a NetBIOS name or IP address\&. If a NetBIOS name then the different name types may be specified by appending \*(Aq#<type>\*(Aq to the name\&. This name may also be \*(Aq*\*(Aq, which will return all registered names within a broadcast area\&.
-.RE
-.SH "EXAMPLES"
-.PP
-\fBnmblookup4\fR
-can be used to query a WINS server (in the same way
-\fBnslookup\fR
-is used to query DNS servers)\&. To query a WINS server,
-\fBnmblookup4\fR
-must be called like this:
-.PP
-\fBnmblookup4 \-U server \-R \*(Aqname\*(Aq\fR
-.PP
-For example, running :
-.PP
-\fBnmblookup4 \-U samba\&.org \-R \*(AqIRIX#1B\*(Aq\fR
-.PP
-would query the WINS server samba\&.org for the domain master browser (1B name type) for the IRIX workgroup\&.
-.SH "VERSION"
-.PP
-This man page is correct for version 3 of the Samba suite\&.
-.SH "SEE ALSO"
-.PP
-\fBnmbd\fR(8),
-\fBsamba\fR(7), and
-\fBsmb.conf\fR(5)\&.
-.SH "AUTHOR"
-.PP
-The original Samba software and related utilities were created by Andrew Tridgell\&. Samba is now developed by the Samba Team as an Open Source project similar to the way the Linux kernel is developed\&.
-.PP
-The original Samba man pages were written by Karl Auer\&. The man page sources were converted to YODL format (another excellent piece of Open Source software, available at
-\m[blue]\fBftp://ftp\&.icce\&.rug\&.nl/pub/unix/\fR\m[]\&\s-2\u[2]\d\s+2) and updated for the Samba 2\&.0 release by Jeremy Allison\&. The conversion to DocBook for Samba 2\&.2 was done by Gerald Carter\&. The conversion to DocBook XML 4\&.2 for Samba 3\&.0 was done by Alexander Bokovoy\&.
-.SH "NOTES"
-.IP " 1." 4
-\fIinterfaces\fR
-		
-.RS 4
-\%[set $man.base.url.for.relative.links]/smb.conf.5.html#INTERFACES
-.RE
-.IP " 2." 4
-ftp://ftp.icce.rug.nl/pub/unix/
-.RS 4
-\%ftp://ftp.icce.rug.nl/pub/unix/
-.RE
diff --git a/net/samba41/files/man/ntlm_auth4.1 b/net/samba41/files/man/ntlm_auth4.1
deleted file mode 100644
index 26293d3dca6b..000000000000
--- a/net/samba41/files/man/ntlm_auth4.1
+++ /dev/null
@@ -1,233 +0,0 @@
-'\" t
-.\"     Title: ntlm_auth4
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 11/05/2013
-.\"    Manual: User Commands
-.\"    Source: Samba 4.0
-.\"  Language: English
-.\"
-.TH "NTLM_AUTH4" "1" "11/05/2013" "Samba 4\&.0" "User Commands"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-ntlm_auth4 \- tool to allow external access to Winbind\*(Aqs NTLM authentication function
-.SH "SYNOPSIS"
-.HP \w'\fBntlm_auth4\fR\ 'u
-\fBntlm_auth4\fR [\-d\ debuglevel] [\-l\ logdir] [\-s\ <smb\ config\ file>]
-.SH "DESCRIPTION"
-.PP
-This tool is part of the
-\fBsamba\fR(7)
-suite\&.
-.PP
-\fBntlm_auth4\fR
-is a helper utility that authenticates users using NT/LM authentication\&. It returns 0 if the users is authenticated successfully and 1 if access was denied\&. ntlm_auth4 uses winbind to access the user and authentication data for a domain\&. This utility is only indended to be used by other programs (currently squid)\&.
-.SH "OPERATIONAL REQUIREMENTS"
-.PP
-The
-\fBwinbindd\fR(8)
-daemon must be operational for many of these commands to function\&.
-.PP
-Some of these commands also require access to the directory
-winbindd_privileged
-in
-$LOCKDIR\&. This should be done either by running this command as root or providing group access to the
-winbindd_privileged
-directory\&. For security reasons, this directory should not be world\-accessable\&.
-.SH "OPTIONS"
-.PP
-\-\-helper\-protocol=PROTO
-.RS 4
-Operate as a stdio\-based helper\&. Valid helper protocols are:
-.PP
-squid\-2\&.4\-basic
-.RS 4
-Server\-side helper for use with Squid 2\&.4\*(Aqs basic (plaintext) authentication\&.
-.RE
-.PP
-squid\-2\&.5\-basic
-.RS 4
-Server\-side helper for use with Squid 2\&.5\*(Aqs basic (plaintext) authentication\&.
-.RE
-.PP
-squid\-2\&.5\-ntlmssp
-.RS 4
-Server\-side helper for use with Squid 2\&.5\*(Aqs NTLMSSP authentication\&.
-.sp
-Requires access to the directory
-winbindd_privileged
-in
-$LOCKDIR\&. The protocol used is described here:
-\m[blue]\fBhttp://devel\&.squid\-cache\&.org/ntlm/squid_helper_protocol\&.html\fR\m[]
-.RE
-.PP
-ntlmssp\-client\-1
-.RS 4
-Cleint\-side helper for use with arbitary external programs that may wish to use Samba\*(Aqs NTLMSSP authentication knowlege\&.
-.sp
-This helper is a client, and as such may be run by any user\&. The protocol used is effectivly the reverse of the previous protocol\&.
-.RE
-.PP
-gss\-spnego
-.RS 4
-Server\-side helper that implements GSS\-SPNEGO\&. This uses a protocol that is almost the same as
-\fBsquid\-2\&.5\-ntlmssp\fR, but has some subtle differences that are undocumented outside the source at this stage\&.
-.sp
-Requires access to the directory
-winbindd_privileged
-in
-$LOCKDIR\&.
-.RE
-.PP
-gss\-spnego\-client
-.RS 4
-Client\-side helper that implements GSS\-SPNEGO\&. This also uses a protocol similar to the above helpers, but is currently undocumented\&.
-.RE
-.RE
-.PP
-\-\-username=USERNAME
-.RS 4
-Specify username of user to authenticate
-.RE
-.PP
-\-\-domain=DOMAIN
-.RS 4
-Specify domain of user to authenticate
-.RE
-.PP
-\-\-workstation=WORKSTATION
-.RS 4
-Specify the workstation the user authenticated from
-.RE
-.PP
-\-\-challenge=STRING
-.RS 4
-NTLM challenge (in HEXADECIMAL)
-.RE
-.PP
-\-\-lm\-response=RESPONSE
-.RS 4
-LM Response to the challenge (in HEXADECIMAL)
-.RE
-.PP
-\-\-nt\-response=RESPONSE
-.RS 4
-NT or NTLMv2 Response to the challenge (in HEXADECIMAL)
-.RE
-.PP
-\-\-password=PASSWORD
-.RS 4
-User\*(Aqs plaintext password
-.sp
-If not specified on the command line, this is prompted for when required\&.
-.RE
-.PP
-\-\-request\-lm\-key
-.RS 4
-Retreive LM session key
-.RE
-.PP
-\-\-request\-nt\-key
-.RS 4
-Request NT key
-.RE
-.PP
-\-\-diagnostics
-.RS 4
-Perform Diagnostics on the authentication chain\&. Uses the password from
-\fB\-\-password\fR
-or prompts for one\&.
-.RE
-.PP
-\-\-require\-membership\-of={SID|Name}
-.RS 4
-Require that a user be a member of specified group (either name or SID) for authentication to succeed\&.
-.RE
-.SH "EXAMPLE SETUP"
-.PP
-To setup ntlm_auth4 for use by squid 2\&.5, with both basic and NTLMSSP authentication, the following should be placed in the
-squid\&.conf
-file\&.
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-auth_param ntlm program ntlm_auth4 \-\-helper\-protocol=squid\-2\&.5\-ntlmssp
-auth_param basic program ntlm_auth4 \-\-helper\-protocol=squid\-2\&.5\-basic
-auth_param basic children 5
-auth_param basic realm Squid proxy\-caching web server
-auth_param basic credentialsttl 2 hours
-.fi
-.if n \{\
-.RE
-.\}
-.if n \{\
-.sp
-.\}
-.RS 4
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.ps +1
-\fBNote\fR
-.ps -1
-.br
-.PP
-This example assumes that ntlm_auth4 has been installed into your path, and that the group permissions on
-winbindd_privileged
-are as described above\&.
-.sp .5v
-.RE
-.PP
-To setup ntlm_auth4 for use by squid 2\&.5 with group limitation in addition to the above example, the following should be added to the
-squid\&.conf
-file\&.
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-auth_param ntlm program ntlm_auth4 \-\-helper\-protocol=squid\-2\&.5\-ntlmssp \-\-require\-membership\-of=\*(AqWORKGROUP\eDomain Users\*(Aq
-auth_param basic program ntlm_auth4 \-\-helper\-protocol=squid\-2\&.5\-basic \-\-require\-membership\-of=\*(AqWORKGROUP\eDomain Users\*(Aq
-.fi
-.if n \{\
-.RE
-.\}
-.SH "TROUBLESHOOTING"
-.PP
-If you\*(Aqre experiencing problems with authenticating Internet Explorer running under MS Windows 9X or Millenium Edition against ntlm_auth4\*(Aqs NTLMSSP authentication helper (\-\-helper\-protocol=squid\-2\&.5\-ntlmssp), then please read
-\m[blue]\fBthe Microsoft Knowledge Base article #239869 and follow instructions described there\fR\m[]\&\s-2\u[1]\d\s+2\&.
-.SH "VERSION"
-.PP
-This man page is correct for version 3\&.0 of the Samba suite\&.
-.SH "AUTHOR"
-.PP
-The original Samba software and related utilities were created by Andrew Tridgell\&. Samba is now developed by the Samba Team as an Open Source project similar to the way the Linux kernel is developed\&.
-.PP
-The ntlm_auth4 manpage was written by Jelmer Vernooij and Andrew Bartlett\&.
-.SH "NOTES"
-.IP " 1." 4
-the Microsoft Knowledge Base article #239869 and follow instructions described there
-.RS 4
-\%http://support.microsoft.com/support/kb/articles/Q239/8/69.ASP
-.RE
diff --git a/net/samba41/files/man/oLschema2ldif.1 b/net/samba41/files/man/oLschema2ldif.1
deleted file mode 100644
index 4f283a932518..000000000000
--- a/net/samba41/files/man/oLschema2ldif.1
+++ /dev/null
@@ -1,74 +0,0 @@
-'\" t
-.\"     Title: oLschema2ldif
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 11/05/2013
-.\"    Manual: System Administration tools
-.\"    Source: Samba 4.0
-.\"  Language: English
-.\"
-.TH "OLSCHEMA2LDIF" "1" "11/05/2013" "Samba 4\&.0" "System Administration tools"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-oLschema2ldif \- Converts LDAP schema\*(Aqs to LDB\-compatible LDIF
-.SH "SYNOPSIS"
-.HP \w'\fBoLschema2ldif\fR\ 'u
-\fBoLschema2ldif\fR [\-I\ INPUT\-FILE] [\-O\ OUTPUT\-FILE]
-.SH "DESCRIPTION"
-.PP
-oLschema2ldif is a simple tool that converts standard OpenLDAP schema files to a LDIF format that is understood by LDB\&.
-.SH "OPTIONS"
-.PP
-\-I input\-file
-.RS 4
-OpenLDAP schema to read\&. If none are specified, the schema file will be read from standard input\&.
-.RE
-.PP
-\-O output\-file
-.RS 4
-File to write ldif version of schema to\&.
-.RE
-.SH "VERSION"
-.PP
-This man page is correct for version 4\&.0 of the Samba suite\&.
-.SH "SEE ALSO"
-.PP
-ldb(7), ldbmodify, ldbdel, ldif(5)
-.SH "AUTHOR"
-.PP
-ldb was written by
-\m[blue]\fBAndrew Tridgell\fR\m[]\&\s-2\u[1]\d\s+2\&. oLschema2ldif was written by
-\m[blue]\fBSimo Sorce\fR\m[]\&\s-2\u[2]\d\s+2\&.
-.PP
-If you wish to report a problem or make a suggestion then please see the
-\m[blue]\fB\%http://ldb.samba.org/\fR\m[]
-web site for current contact and maintainer information\&.
-.SH "NOTES"
-.IP " 1." 4
-Andrew Tridgell
-.RS 4
-\%http://samba.org/~tridge/
-.RE
-.IP " 2." 4
-Simo Sorce
-.RS 4
-\%mailto:idra@samba.org
-.RE
diff --git a/net/samba41/files/man/regdiff.1 b/net/samba41/files/man/regdiff.1
deleted file mode 100644
index b09ea977a34b..000000000000
--- a/net/samba41/files/man/regdiff.1
+++ /dev/null
@@ -1,87 +0,0 @@
-'\" t
-.\"     Title: regdiff
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 10/15/2013
-.\"    Manual: System Administration tools
-.\"    Source: Samba 4.0
-.\"  Language: English
-.\"
-.TH "REGDIFF" "1" "10/15/2013" "Samba 4\&.0" "System Administration tools"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-regdiff \- Diff program for Windows registry files
-.SH "SYNOPSIS"
-.HP \w'\fBregdiff\fR\ 'u
-\fBregdiff\fR [\-\-help] [\-\-backend=BACKEND] [\-\-backend=BACKEND] [\-\-credentials=CREDENTIALS] [\-\-credentials=CREDENTIALS] [location] [location]
-.SH "DESCRIPTION"
-.PP
-regdiff compares two Windows registry files key by key and value by value and generates a text file that contains the differences between the two files\&.
-.PP
-A file generated by regdiff can later be applied to a registry file by the regpatch utility\&.
-.PP
-regdiff and regpatch use the same file format as the regedit32\&.exe utility from Windows\&.
-.SH "OPTIONS"
-.PP
-\-\-help
-.RS 4
-Show list of available options\&.
-.RE
-.PP
-\-\-backend BACKEND
-.RS 4
-Name of backend to load\&. Possible values are: creg, regf, dir and rpc\&. The default is
-\fIdir\fR\&.
-.sp
-This argument can be specified twice: once for the first registry file and once for the second\&.
-.RE
-.PP
-\-\-credentials=CREDENTIALS
-.RS 4
-Credentials to use, if any\&. Password should be separated from user name by a percent sign\&.
-.sp
-This argument can be specified twice: once for the first registry file and once for the second\&.
-.RE
-.SH "VERSION"
-.PP
-This man page is correct for version 4\&.0 of the Samba suite\&.
-.SH "SEE ALSO"
-.PP
-gregedit, regshell, regpatch, regtree, samba, patch, diff
-.SH "AUTHOR"
-.PP
-This utility is part of the
-\m[blue]\fBSamba\fR\m[]\&\s-2\u[1]\d\s+2
-suite, which is developed by the global
-\m[blue]\fBSamba Team\fR\m[]\&\s-2\u[2]\d\s+2\&.
-.PP
-This manpage and regdiff were written by Jelmer Vernooij\&.
-.SH "NOTES"
-.IP " 1." 4
-Samba
-.RS 4
-\%http://www.samba.org/
-.RE
-.IP " 2." 4
-Samba Team
-.RS 4
-\%http://www.samba.org/samba/team/
-.RE
diff --git a/net/samba41/files/man/regpatch.1 b/net/samba41/files/man/regpatch.1
deleted file mode 100644
index 64b57f3ffd5c..000000000000
--- a/net/samba41/files/man/regpatch.1
+++ /dev/null
@@ -1,81 +0,0 @@
-'\" t
-.\"     Title: regpatch
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 10/15/2013
-.\"    Manual: System Administration tools
-.\"    Source: Samba 4.0
-.\"  Language: English
-.\"
-.TH "REGPATCH" "1" "10/15/2013" "Samba 4\&.0" "System Administration tools"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-regpatch \- Applies registry patches to registry files
-.SH "SYNOPSIS"
-.HP \w'\fBregpatch\fR\ 'u
-\fBregpatch\fR [\-\-help] [\-\-backend=BACKEND] [\-\-credentials=CREDENTIALS] [location] [patch\-file]
-.SH "DESCRIPTION"
-.PP
-The regpatch utility applies registry patches to Windows registry files\&. The patch files should have the same format as is being used by the regdiff utility and regedit32\&.exe from Windows\&.
-.PP
-If no patch file is specified on the command line, regpatch attempts to read it from standard input\&.
-.SH "OPTIONS"
-.PP
-\-\-help
-.RS 4
-Show list of available options\&.
-.RE
-.PP
-\-\-backend BACKEND
-.RS 4
-Name of backend to load\&. Possible values are: creg, regf, dir and rpc\&. The default is
-\fIdir\fR\&.
-.RE
-.PP
-\-\-credentials=CREDENTIALS
-.RS 4
-Credentials to use, if any\&. Password should be separated from user name by a percent sign\&.
-.RE
-.SH "VERSION"
-.PP
-This man page is correct for version 4\&.0 of the Samba suite\&.
-.SH "SEE ALSO"
-.PP
-regdiff, regtree, regshell, gregedit, samba, diff, patch
-.SH "AUTHOR"
-.PP
-This utility is part of the
-\m[blue]\fBSamba\fR\m[]\&\s-2\u[1]\d\s+2
-suite, which is developed by the global
-\m[blue]\fBSamba Team\fR\m[]\&\s-2\u[2]\d\s+2\&.
-.PP
-This manpage and regpatch were written by Jelmer Vernooij\&.
-.SH "NOTES"
-.IP " 1." 4
-Samba
-.RS 4
-\%http://www.samba.org/
-.RE
-.IP " 2." 4
-Samba Team
-.RS 4
-\%http://www.samba.org/samba/team/
-.RE
diff --git a/net/samba41/files/man/regshell.1 b/net/samba41/files/man/regshell.1
deleted file mode 100644
index 1fdfadc622f7..000000000000
--- a/net/samba41/files/man/regshell.1
+++ /dev/null
@@ -1,177 +0,0 @@
-'\" t
-.\"     Title: regshell
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 10/15/2013
-.\"    Manual: System Administration tools
-.\"    Source: Samba 4.0
-.\"  Language: English
-.\"
-.TH "REGSHELL" "1" "10/15/2013" "Samba 4\&.0" "System Administration tools"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-regshell \- Windows registry file browser using readline
-.SH "SYNOPSIS"
-.HP \w'\fBregshell\fR\ 'u
-\fBregshell\fR [\-\-help] [\-\-backend=BACKEND] [\-\-credentials=CREDENTIALS] [location]
-.SH "DESCRIPTION"
-.PP
-regshell is a utility that lets you browse thru a Windows registry file as if you were using a regular unix shell to browse thru a file system\&.
-.SH "OPTIONS"
-.PP
-\-\-help
-.RS 4
-Show list of available options\&.
-.RE
-.PP
-\-\-backend BACKEND
-.RS 4
-Name of backend to load\&. Possible values are: creg, regf, dir and rpc\&. The default is
-\fIdir\fR\&.
-.RE
-.PP
-\-\-credentials=CREDENTIALS
-.RS 4
-Credentials to use, if any\&. Password should be separated from user name by a percent sign\&.
-.RE
-.SH "COMMANDS"
-.PP
-ck|cd <keyname>
-.RS 4
-Go to the specified subkey\&.
-.RE
-.PP
-ch|predef [predefined\-key\-name]
-.RS 4
-Go to the specified predefined key\&.
-.RE
-.PP
-list|ls
-.RS 4
-List subkeys and values of the current key\&.
-.RE
-.PP
-mkkey|mkdir <keyname>
-.RS 4
-Create a key with the specified
-\fIkeyname\fR
-as a subkey of the current key\&.
-.RE
-.PP
-rmval|rm <valname>
-.RS 4
-Delete the specified value\&.
-.RE
-.PP
-rmkey|rmdir <keyname>
-.RS 4
-Delete the specified subkey recursively\&.
-.RE
-.PP
-pwd|pwk
-.RS 4
-Print the full name of the current key\&.
-.RE
-.PP
-set|update
-.RS 4
-Update the value of a key value\&. Not implemented at the moment\&.
-.RE
-.PP
-help|?
-.RS 4
-Print a list of available commands\&.
-.RE
-.PP
-exit|quit
-.RS 4
-Leave regshell\&.
-.RE
-.SH "EXAMPLES"
-.PP
-Browsing thru a nt4 registry file
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-\fBregshell \-b nt4 NTUSER\&.DAT\fR
-$$$PROTO\&.HIV> \fBls\fR
-K AppEvents
-K Console
-K Control Panel
-K Environment
-K Identities
-K Keyboard Layout
-K Network
-K Printers
-K Software
-K UNICODE Program Groups
-K Windows 3\&.1 Migration Status
-$$$PROTO\&.HIV> \fBexit\fR
-.fi
-.if n \{\
-.RE
-.\}
-.PP
-Listing the subkeys of HKEY_CURRENT_USER\eAppEvents on a remote computer:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-\fBregshell \-\-remote=ncacn_np:aurelia \-c "jelmer%secret"\fR
-HKEY_CURRENT_MACHINE> \fBpredef HKEY_CURRENT_USER\fR
-HKEY_CURRENT_USER> \fBcd AppEvents\fR
-Current path is: HKEY_CURRENT_USER\eAppEvents
-HKEY_CURRENT_USER\eAppEvents> \fBls\fR
-K EventLabels
-K Schemes
-HKEY_CURRENT_USER\eAppEvents> \fBexit\fR
-.fi
-.if n \{\
-.RE
-.\}
-.SH "VERSION"
-.PP
-This man page is correct for version 4\&.0 of the Samba suite\&.
-.SH "SEE ALSO"
-.PP
-regtree, regdiff, regpatch, gregedit, samba
-.SH "AUTHOR"
-.PP
-This utility is part of the
-\m[blue]\fBSamba\fR\m[]\&\s-2\u[1]\d\s+2
-suite, which is developed by the global
-\m[blue]\fBSamba Team\fR\m[]\&\s-2\u[2]\d\s+2\&.
-.PP
-This manpage and regshell were written by Jelmer Vernooij\&.
-.SH "NOTES"
-.IP " 1." 4
-Samba
-.RS 4
-\%http://www.samba.org/
-.RE
-.IP " 2." 4
-Samba Team
-.RS 4
-\%http://www.samba.org/samba/team/
-.RE
diff --git a/net/samba41/files/man/regtree.1 b/net/samba41/files/man/regtree.1
deleted file mode 100644
index fc03f71e1cfd..000000000000
--- a/net/samba41/files/man/regtree.1
+++ /dev/null
@@ -1,89 +0,0 @@
-'\" t
-.\"     Title: regtree
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 10/15/2013
-.\"    Manual: System Administration tools
-.\"    Source: Samba 4.0
-.\"  Language: English
-.\"
-.TH "REGTREE" "1" "10/15/2013" "Samba 4\&.0" "System Administration tools"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-regtree \- Text\-mode registry viewer
-.SH "SYNOPSIS"
-.HP \w'\fBregtree\fR\ 'u
-\fBregtree\fR [\-\-help] [\-\-backend=BACKEND] [\-\-fullpath] [\-\-no\-values] [\-\-credentials=CREDENTIALS] [location]
-.SH "DESCRIPTION"
-.PP
-The regtree utility prints out all the contents of a Windows registry file\&. Subkeys are printed with one level more indentation than their parents\&.
-.SH "OPTIONS"
-.PP
-\-\-help
-.RS 4
-Show list of available options\&.
-.RE
-.PP
-\-\-backend BACKEND
-.RS 4
-Name of backend to load\&. Possible values are: creg, regf, dir and rpc\&. The default is
-\fIdir\fR\&.
-.RE
-.PP
-\-\-credentials=CREDENTIALS
-.RS 4
-Credentials to use, if any\&. Password should be separated from user name by a percent sign\&.
-.RE
-.PP
-\-\-fullpath
-.RS 4
-Print the full path to each key instead of only its name\&.
-.RE
-.PP
-\-\-no\-values
-.RS 4
-Don\*(Aqt print values, just keys\&.
-.RE
-.SH "VERSION"
-.PP
-This man page is correct for version 4\&.0 of the Samba suite\&.
-.SH "SEE ALSO"
-.PP
-gregedit, regshell, regdiff, regpatch, samba
-.SH "AUTHOR"
-.PP
-This utility is part of the
-\m[blue]\fBSamba\fR\m[]\&\s-2\u[1]\d\s+2
-suite, which is developed by the global
-\m[blue]\fBSamba Team\fR\m[]\&\s-2\u[2]\d\s+2\&.
-.PP
-This manpage and regtree were written by Jelmer Vernooij\&.
-.SH "NOTES"
-.IP " 1." 4
-Samba
-.RS 4
-\%http://www.samba.org/
-.RE
-.IP " 2." 4
-Samba Team
-.RS 4
-\%http://www.samba.org/samba/team/
-.RE
diff --git a/net/samba41/files/man/smbtorture.1 b/net/samba41/files/man/smbtorture.1
deleted file mode 100644
index 21b23b78da8f..000000000000
--- a/net/samba41/files/man/smbtorture.1
+++ /dev/null
@@ -1,369 +0,0 @@
-'\" t
-.\"     Title: smbtorture
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 10/15/2013
-.\"    Manual: Test Suite
-.\"    Source: Samba 4.0
-.\"  Language: English
-.\"
-.TH "SMBTORTURE" "1" "10/15/2013" "Samba 4\&.0" "Test Suite"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-smbtorture \- Run a series of tests against a SMB server
-.SH "SYNOPSIS"
-.HP \w'\fBsmbtorture\fR\ 'u
-\fBsmbtorture\fR
-.HP \w'\fBsmbtorture\fR\ 'u
-\fBsmbtorture\fR {//server/share} [\-d\ debuglevel] [\-U\ user%pass] [\-k] [\-N\ numprocs] [\-n\ netbios_name] [\-W\ workgroup] [\-o\ num_operations] [\-e\ num\ files(entries)] [\-O\ socket_options] [\-m\ maximum_protocol] [\-L] [\-c\ CLIENT\&.TXT] [\-t\ timelimit] [\-C\ filename] [\-A] [\-p\ port] [\-s\ seed] [\-f\ max_failures] [\-X] {BINDING\-STRING|UNC} {TEST1} [TEST2] [\&.\&.\&.]
-.SH "DESCRIPTION"
-.PP
-smbtorture is a testsuite that runs several tests against a SMB server\&. All tests are known to succeed against a Windows 2003 server (?)\&. Smbtorture\*(Aqs primary goal is finding differences in implementations of the SMB protocol and testing SMB servers\&.
-.PP
-Any number of tests can be specified on the command\-line\&. If no tests are specified, all tests are run\&.
-.PP
-If no arguments are specified at all, all available options and tests are listed\&.
-.SS "Binding string format"
-.PP
-The binding string format is:
-.PP
-TRANSPORT:host[flags]
-.PP
-Where TRANSPORT is either ncacn_np for SMB, ncacn_ip_tcp for RPC/TCP or ncalrpc for local connections\&.
-.PP
-\*(Aqhost\*(Aq is an IP or hostname or netbios name\&. If the binding string identifies the server side of an endpoint, \*(Aqhost\*(Aq may be an empty string\&.
-.PP
-\*(Aqflags\*(Aq can include a SMB pipe name if using the ncacn_np transport or a TCP port number if using the ncacn_ip_tcp transport, otherwise they will be auto\-determined\&.
-.PP
-other recognised flags are:
-.PP
-sign
-.RS 4
-enable ntlmssp signing
-.RE
-.PP
-seal
-.RS 4
-enable ntlmssp sealing
-.RE
-.PP
-connect
-.RS 4
-enable rpc connect level auth (auth, but no sign or seal)
-.RE
-.PP
-validate
-.RS 4
-enable the NDR validator
-.RE
-.PP
-print
-.RS 4
-enable debugging of the packets
-.RE
-.PP
-bigendian
-.RS 4
-use bigendian RPC
-.RE
-.PP
-padcheck
-.RS 4
-check reply data for non\-zero pad bytes
-.RE
-.PP
-For example, these all connect to the samr pipe:
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-ncacn_np:myserver
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-ncacn_np:myserver[samr]
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-ncacn_np:myserver[\e\epipe\e\esamr]
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-ncacn_np:myserver[/pipe/samr]
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-ncacn_np:myserver[samr,sign,print]
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-ncacn_np:myserver[\e\epipe\e\esamr,sign,seal,bigendian]
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-ncacn_np:myserver[/pipe/samr,seal,validate]
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-ncacn_np:
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-ncacn_np:[/pipe/samr]
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-ncacn_ip_tcp:myserver
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-ncacn_ip_tcp:myserver[1024]
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-ncacn_ip_tcp:myserver[1024,sign,seal]
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-ncalrpc:
-.RE
-.SS "UNC Format"
-.PP
-The UNC format is:
-.PP
-//server/share
-.SH "OPTIONS"
-.PP
-\-d debuglevel
-.RS 4
-Use the specified Samba debug level\&. A higher debug level means more output\&.
-.RE
-.PP
-\-U user%pass
-.RS 4
-Use the specified username/password combination when logging in to a remote server\&.
-.RE
-.PP
-\-k
-.RS 4
-Use kerberos when authenticating\&.
-.RE
-.PP
-\-W workgroup
-.RS 4
-Use specified name as our workgroup name\&.
-.RE
-.PP
-\-n netbios_name
-.RS 4
-Use specified name as our NetBIOS name\&.
-.RE
-.PP
-\-O socket_options
-.RS 4
-Use specified socket options, equivalent of the smb\&.conf option
-\(lqsocket options\(rq\&. See the smb\&.conf(5) manpage for details\&.
-.RE
-.PP
-\-m max_protocol
-.RS 4
-Specify the maximum SMB dialect that should be used\&. Possible values are: CORE, COREPLUS, LANMAN1, LANMAN2, NT1
-.RE
-.PP
-\-s seed
-.RS 4
-Initialize the randomizer using
-\fIseed\fR
-as seed\&.
-.RE
-.PP
-\-L
-.RS 4
-Use oplocks\&.
-.RE
-.PP
-\-X
-.RS 4
-Enable dangerous tests\&. Use with care! This might crash your server\&.\&.\&.
-.RE
-.PP
-\-t timelimit
-.RS 4
-Specify the NBENCH time limit in seconds\&. Defaults to 600\&.
-.RE
-.PP
-\-p ports
-.RS 4
-Specify ports to connect to\&.
-.RE
-.PP
-\-c file
-.RS 4
-Read NBENCH commands from
-\fIfile\fR
-instead of from CLIENT\&.TXT\&.
-.RE
-.PP
-\-A
-.RS 4
-Show not just OK or FAILED but more detailed output\&. Used only by DENY test at the moment\&.
-.RE
-.PP
-\-C filename
-.RS 4
-Load a list of UNC names from the specified filename\&. Smbtorture instances will connect to a random host from this list\&.
-.RE
-.PP
-\-N numprocs
-.RS 4
-Specify number of smbtorture processes to launch\&.
-.RE
-.PP
-\-o num_operations
-.RS 4
-Number of times some operations should be tried before assuming they\*(Aqre output is consistent (default:100)\&.
-.RE
-.PP
-\-e num_files
-.RS 4
-Number of entries to use in certain tests (such as creating X files) (default: 1000)\&.
-.RE
-.PP
-\-f max_failures
-.RS 4
-Number of failures before aborting a test (default: 1)\&.
-.RE
-.SH "VERSION"
-.PP
-This man page is correct for version 4\&.0 of the Samba suite\&.
-.SH "SEE ALSO"
-.PP
-Samba
-.SH "AUTHOR"
-.PP
-This utility is part of the
-\m[blue]\fBSamba\fR\m[]\&\s-2\u[1]\d\s+2
-suite, which is developed by the global
-\m[blue]\fBSamba Team\fR\m[]\&\s-2\u[2]\d\s+2\&.
-.PP
-smbtorture was written by Andrew Tridgell\&.
-.PP
-This manpage was written by Jelmer Vernooij\&.
-.SH "NOTES"
-.IP " 1." 4
-Samba
-.RS 4
-\%http://www.samba.org/
-.RE
-.IP " 2." 4
-Samba Team
-.RS 4
-\%http://www.samba.org/samba/team/
-.RE
diff --git a/net/samba41/files/patch-buildtools__scripts__abi_gen.sh b/net/samba41/files/patch-buildtools__scripts__abi_gen.sh
deleted file mode 100644
index b8ffd04d5822..000000000000
--- a/net/samba41/files/patch-buildtools__scripts__abi_gen.sh
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./buildtools/scripts/abi_gen.sh.orig	2013-02-10 00:47:43.199878737 +0000
-+++ ./buildtools/scripts/abi_gen.sh	2013-02-10 00:47:55.789877693 +0000
-@@ -9,6 +9,7 @@
- cat <<EOF
- set height 0
- set width 0
-+set print sevenbit-strings on
- EOF
- nm "$SHAREDLIB" | cut -d' ' -f2- | egrep '^[BDGTRVWS]' | grep -v @ | egrep -v ' (__bss_start|_edata|_init|_fini|_end)' | cut -c3- | sort | while read s; do
-     echo "echo $s: "
-@@ -17,5 +17,5 @@
- ) > $GDBSCRIPT
- 
- # forcing the terminal avoids a problem on Fedora12
--TERM=none gdb -batch -x $GDBSCRIPT "$SHAREDLIB" < /dev/null
-+TERM=none %%GDB_CMD%% -batch -x $GDBSCRIPT "$SHAREDLIB" < /dev/null
- rm -f $GDBSCRIPT
diff --git a/net/samba41/files/patch-buildtools__wafsamba__samba_install.py b/net/samba41/files/patch-buildtools__wafsamba__samba_install.py
deleted file mode 100644
index 061202fe4868..000000000000
--- a/net/samba41/files/patch-buildtools__wafsamba__samba_install.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./buildtools/wafsamba/samba_install.py.orig	2012-11-13 08:03:38.000000000 +0000
-+++ ./buildtools/wafsamba/samba_install.py	2013-01-27 01:44:15.919866417 +0000
-@@ -111,7 +111,7 @@
-             inst_name    = bld.make_libname(t.target)
-     elif self.vnum:
-         vnum_base    = self.vnum.split('.')[0]
--        install_name = bld.make_libname(target_name, version=self.vnum)
-+        install_name = bld.make_libname(target_name, version=vnum_base)
-         install_link = bld.make_libname(target_name, version=vnum_base)
-         inst_name    = bld.make_libname(t.target)
-         if not self.private_library:
diff --git a/net/samba41/files/patch-buildtools__wafsamba__samba_pidl.py b/net/samba41/files/patch-buildtools__wafsamba__samba_pidl.py
deleted file mode 100644
index 019fd57ad5b6..000000000000
--- a/net/samba41/files/patch-buildtools__wafsamba__samba_pidl.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./buildtools/wafsamba/samba_pidl.py.orig	2013-01-27 23:15:21.739874063 +0000
-+++ ./buildtools/wafsamba/samba_pidl.py	2013-01-27 23:15:50.549893124 +0000
-@@ -88,7 +88,7 @@
-     # prime the list of nodes we are dependent on with the cached pidl sources
-     t.allnodes = pidl_src_nodes
- 
--    t.env.PIDL = os.path.join(bld.srcnode.abspath(), 'pidl/pidl')
-+    t.env.PIDL = os.path.join('%%LOCALBASE%%', 'bin/pidl')
-     t.env.OPTIONS = TO_LIST(options)
-     t.env.OUTPUTDIR = bld.bldnode.name + '/' + bld.path.find_dir(output_dir).bldpath(t.env)
- 
diff --git a/net/samba41/files/patch-buildtools__wafsamba__wafsamba.py b/net/samba41/files/patch-buildtools__wafsamba__wafsamba.py
deleted file mode 100644
index 73ab8df1ab9e..000000000000
--- a/net/samba41/files/patch-buildtools__wafsamba__wafsamba.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./buildtools/wafsamba/wafsamba.py.orig	2013-02-05 12:25:25.000000000 +0000
-+++ ./buildtools/wafsamba/wafsamba.py	2013-02-06 02:15:45.969880485 +0000
-@@ -790,7 +790,7 @@
-     '''build and install manual pages'''
-     bld.env.SAMBA_EXPAND_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/expand-sambadoc.xsl'
-     bld.env.SAMBA_MAN_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/man.xsl'
--    bld.env.SAMBA_CATALOGS = 'file:///etc/xml/catalog file:///usr/local/share/xml/catalog file://' + bld.srcnode.abspath() + '/bin/default/docs-xml/build/catalog.xml'
-+    bld.env.SAMBA_CATALOGS = 'file://%%LOCALBASE%%/share/xml/catalog file://' + bld.srcnode.abspath() + '/bin/default/docs-xml/build/catalog.xml'
- 
-     for m in manpages.split():
-         source = m + '.xml'
diff --git a/net/samba41/files/patch-docs-xml__wscript_build b/net/samba41/files/patch-docs-xml__wscript_build
deleted file mode 100644
index 5f68097926d2..000000000000
--- a/net/samba41/files/patch-docs-xml__wscript_build
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./docs-xml/wscript_build.orig	2013-02-05 02:34:14.929894486 +0000
-+++ ./docs-xml/wscript_build	2013-02-05 02:34:33.030266035 +0000
-@@ -3,7 +3,6 @@
- manpages='''
-          manpages/eventlogadm.8
-          manpages/findsmb.1
--         manpages/libsmbclient.7
-          manpages/lmhosts.5
-          manpages/log2pcap.1
-          manpages/idmap_ad.8
diff --git a/net/samba41/files/patch-dynconfig__wscript b/net/samba41/files/patch-dynconfig__wscript
deleted file mode 100644
index 713065911f55..000000000000
--- a/net/samba41/files/patch-dynconfig__wscript
+++ /dev/null
@@ -1,32 +0,0 @@
---- ./dynconfig/wscript.orig	2012-11-13 08:03:38.000000000 +0000
-+++ ./dynconfig/wscript	2013-01-29 19:43:57.489880918 +0000
-@@ -127,6 +127,8 @@
-     'PKGCONFIGDIR' : {
-          'STD-PATH':  '${LIBDIR}/pkgconfig',
-          'FHS-PATH':  '${LIBDIR}/pkgconfig',
-+         'OPTION':    '--with-pkgconfigdir',
-+         'HELPTEXT':  'Where to put .pc files',
-     },
-     'SWATDIR' : {
-          'STD-PATH':  '${DATADIR}/swat',
-@@ -236,8 +238,8 @@
-          'DELAY':     True,
-     },
-     'CONFIGFILE' : {
--         'STD-PATH':  '${CONFIGDIR}/smb.conf',
--         'FHS-PATH':  '${CONFIGDIR}/smb.conf',
-+         'STD-PATH':  '${CONFIGDIR}/%%SAMBA4_CONFIG%%',
-+         'FHS-PATH':  '${CONFIGDIR}/%%SAMBA4_CONFIG%%',
-          'DELAY':     True,
-     },
-     'LMHOSTSFILE' : {
-@@ -294,9 +296,6 @@
-         flavor = 'FHS-PATH'
-     else:
-         flavor = 'STD-PATH'
--        if conf.env.PREFIX == '/usr' or conf.env.PREFIX == '/usr/local':
--           Logs.error("Don't install directly under /usr or /usr/local without using the FHS option (--enable-fhs)")
--           raise Utils.WafError("ERROR: invalid --prefix=%s value" % (conf.env.PREFIX))
- 
-     explicit_set ={}
- 
diff --git a/net/samba41/files/patch-lib__replace__wscript b/net/samba41/files/patch-lib__replace__wscript
deleted file mode 100644
index 86eebb55beab..000000000000
--- a/net/samba41/files/patch-lib__replace__wscript
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/replace/wscript.orig	2013-09-06 09:39:57.000000000 +0000
-+++ lib/replace/wscript	2013-10-15 15:11:25.307472084 +0000
-@@ -398,8 +398,6 @@
-                            'it with --with-gettext=</path/to/gettext> or ' +
-                            '--without-gettext to build without''')
- 
--    conf.CHECK_FUNCS_IN('pthread_create', 'pthread', checklibc=True, headers='pthread.h')
--
-     conf.CHECK_FUNCS_IN('crypt', 'crypt', checklibc=True)
- 
-     conf.CHECK_VARIABLE('rl_event_hook', define='HAVE_DECL_RL_EVENT_HOOK', always=True,
diff --git a/net/samba41/files/patch-lib__replace__xattr.c b/net/samba41/files/patch-lib__replace__xattr.c
deleted file mode 100644
index 6bbf74b3bb92..000000000000
--- a/net/samba41/files/patch-lib__replace__xattr.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/replace/xattr.c.orig	2013-11-19 12:05:06.297639060 +0000
-+++ lib/replace/xattr.c	2013-11-19 12:05:15.450326063 +0000
-@@ -25,6 +25,7 @@
-    License along with this library; if not, see <http://www.gnu.org/licenses/>.
- */
- 
-+#define UID_WRAPPER_NOT_REPLACE
- #include "replace.h"
- #include "system/filesys.h"
- #include "system/dir.h"
diff --git a/net/samba41/files/patch-nsswitch__wins_freebsd.c b/net/samba41/files/patch-nsswitch__wins_freebsd.c
deleted file mode 100644
index 1b47c702d3a1..000000000000
--- a/net/samba41/files/patch-nsswitch__wins_freebsd.c
+++ /dev/null
@@ -1,84 +0,0 @@
---- ./nsswitch/wins_freebsd.c.orig	2013-07-03 01:06:20.689871582 +0000
-+++ ./nsswitch/wins_freebsd.c	2013-07-03 01:33:02.779873084 +0000
-@@ -0,0 +1,81 @@
-+/* 
-+   Unix SMB/CIFS implementation.
-+
-+   Copyright (C) Timur I. Bakeyev 2007
-+   
-+   This library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Library General Public
-+   License as published by the Free Software Foundation; either
-+   version 2 of the License, or (at your option) any later version.
-+   
-+   This library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Library General Public License for more details.
-+   
-+   You should have received a copy of the GNU Library General Public
-+   License along with this library; if not, write to the
-+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+   Boston, MA  02111-1307, USA.   
-+*/
-+
-+#include "winbind_client.h"
-+
-+extern enum nss_status _nss_wins_gethostbyname2_r(const char *name, int af, struct hostent *he,
-+			   char *buffer, size_t buflen, int *h_errnop);
-+
-+ns_mtab *nss_module_register(const char *source, unsigned int *, nss_module_unregister_fn *);
-+
-+NSS_METHOD_PROTOTYPE(__nss_wins_freebsd_gethostbyname2_r);
-+
-+static ns_mtab methods[] =
-+{
-+	{ NSDB_HOSTS, "getaddrinfo",	  NULL, NULL },
-+	{ NSDB_HOSTS, "ghbyname",	  NULL, NULL },
-+	{ NSDB_HOSTS, "ghbyaddr",	  NULL, NULL },
-+	{ NSDB_HOSTS, "gethostbyaddr_r",  NULL, NULL },
-+	{ NSDB_HOSTS, "gethostbyname2_r", __nss_wins_freebsd_gethostbyname2_r, _nss_wins_gethostbyname2_r },
-+	{ NSDB_HOSTS, "getnetbyname_r",	  NULL, NULL },
-+	{ NSDB_HOSTS, "getnetbyaddr_r",	  NULL, NULL },
-+	{ NSDB_HOSTS, "gethostbyname",	  NULL, NULL },
-+	{ NSDB_HOSTS, "gethostbyaddr",	  NULL, NULL },
-+	{ NSDB_HOSTS, "getnetbyname",	  NULL, NULL },
-+	{ NSDB_HOSTS, "getnetbyaddr",	  NULL, NULL }
-+};
-+
-+int
-+__nss_wins_freebsd_gethostbyname2_r(void *retval, void *mdata, va_list ap)
-+{
-+	int (*fn)(const char *, int, struct hostent *, char *, size_t, int *);
-+	const char	*hostname;
-+	int		af;
-+	struct hostent	*he;
-+	char		*buffer;
-+	size_t		buflen;
-+	int		*h_errnop;
-+	enum nss_status	status;
-+	
-+	fn = mdata;
-+	hostname = va_arg(ap, const char *);
-+	af = va_arg(ap, int);
-+	he = va_arg(ap, struct hostent *);
-+	buffer = va_arg(ap, char *);
-+	buflen = va_arg(ap, size_t);
-+	h_errnop = va_arg(ap, int *);
-+
-+	status = fn(hostname, af, he, buffer, buflen, h_errnop);
-+	status = __nss_compat_result(status, *h_errnop);
-+	if (status == NS_SUCCESS)
-+		*(struct hostent **)retval = he;
-+	
-+	return (status);
-+}
-+
-+ns_mtab *
-+nss_module_register(const char *source __unused, unsigned int *mtabsize,
-+    nss_module_unregister_fn *unreg)
-+{
-+	*mtabsize = sizeof(methods) / sizeof(methods[0]);
-+	*unreg = NULL;
-+	return (methods);
-+}
diff --git a/net/samba41/files/patch-nsswitch__wscript_build b/net/samba41/files/patch-nsswitch__wscript_build
deleted file mode 100644
index 8efdb86d3a26..000000000000
--- a/net/samba41/files/patch-nsswitch__wscript_build
+++ /dev/null
@@ -1,15 +0,0 @@
---- nsswitch/wscript_build.orig	2015-01-15 23:07:01.654902807 +0000
-+++ nsswitch/wscript_build	2015-01-15 23:11:43.587388779 +0000
-@@ -57,6 +57,12 @@
- 			  realname='nss_winbind.so.1',
- 			  vnum='1')
- 
-+	bld.SAMBA3_LIBRARY('nss_wins',
-+			  source='wins.c wins_freebsd.c',
-+			  deps='''param libsmb LIBTSOCKET''',
-+			  realname='nss_wins.so.1',
-+			  vnum='1')
-+
- elif (host_os.rfind('netbsd') > -1):
- 	# NetBSD winbind client is implemented as a wrapper
- 	# around the Linux version. It needs getpwent_r() to
diff --git a/net/samba41/files/patch-source3__client__dnsbrowse.c b/net/samba41/files/patch-source3__client__dnsbrowse.c
deleted file mode 100644
index 83f2dd7789f6..000000000000
--- a/net/samba41/files/patch-source3__client__dnsbrowse.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- source3/client/dnsbrowse.c.orig	2013-11-12 10:20:03.145351798 +0100
-+++ source3/client/dnsbrowse.c	2013-11-12 10:20:11.762761273 +0100
-@@ -91,7 +91,7 @@
- 		}
- 	}
- 
--	TALLOC_FREE(fdset);
-+	TALLOC_FREE(ctx);
- 	DNSServiceRefDeallocate(mdns_conn_sdref);
- }
- 
diff --git a/net/samba41/files/patch-source3__lib__sysquotas_nfs.c b/net/samba41/files/patch-source3__lib__sysquotas_nfs.c
deleted file mode 100644
index e22d874fceb3..000000000000
--- a/net/samba41/files/patch-source3__lib__sysquotas_nfs.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- source3/lib/sysquotas_nfs.c.orig	2013-11-05 12:08:05.568859038 +0000
-+++ source3/lib/sysquotas_nfs.c	2013-11-05 12:08:28.560058330 +0000
-@@ -154,7 +154,7 @@
- 	gq_args.gqa_uid = id.uid;
- 
- 	DEBUG(10, ("sys_get_nfs_quotas: Asking for quota of path '%s' on "
--		   "host '%s', rpcprog '%i', rpcvers '%i', network '%s'\n",
-+		   "host '%s', rpcprog '%li', rpcvers '%li', network '%s'\n",
- 		    host, testpath+1, RQUOTAPROG, RQUOTAVERS, "udp"));
- 
- 	clnt = clnt_create(host, RQUOTAPROG, RQUOTAVERS, "udp");
diff --git a/net/samba41/files/patch-source3__smbd__quotas.c b/net/samba41/files/patch-source3__smbd__quotas.c
deleted file mode 100644
index 0708b8b2eac9..000000000000
--- a/net/samba41/files/patch-source3__smbd__quotas.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./source3/smbd/quotas.c.orig	2012-10-02 08:24:45.000000000 +0000
-+++ ./source3/smbd/quotas.c	2013-11-18 22:45:12.800444516 +0000
-@@ -144,6 +144,7 @@
- 	if (!cutstr)
- 		return False;
- 
-+	memset(&D, '\0', sizeof(D));
- 	memset(cutstr, '\0', len+1);
- 	host = strncat(cutstr,mnttype, sizeof(char) * len );
- 	DEBUG(5,("nfs_quotas: looking for mount on \"%s\"\n", cutstr));
-@@ -152,7 +153,7 @@
- 	args.gqa_pathp = testpath+1;
- 	args.gqa_uid = uid;
- 
--	DEBUG(5,("nfs_quotas: Asking for host \"%s\" rpcprog \"%i\" rpcvers \"%i\" network \"%s\"\n", host, RQUOTAPROG, RQUOTAVERS, "udp"));
-+	DEBUG(5,("nfs_quotas: Asking for host \"%s\" rpcprog \"%lu\" rpcvers \"%lu\" network \"%s\"\n", host, RQUOTAPROG, RQUOTAVERS, "udp"));
- 
- 	if ((clnt = clnt_create(host, RQUOTAPROG, RQUOTAVERS, "udp")) == NULL) {
- 		ret = False;
diff --git a/net/samba41/files/patch-source3__utils__net.c b/net/samba41/files/patch-source3__utils__net.c
deleted file mode 100644
index aa4853a7624e..000000000000
--- a/net/samba41/files/patch-source3__utils__net.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./source3/utils/net.c.orig	2013-01-29 08:49:31.000000000 +0000
-+++ ./source3/utils/net.c	2013-01-31 15:04:24.069877314 +0000
-@@ -898,8 +898,13 @@
- 		set_global_myname(c->opt_requester_name);
- 	}
- 
--	if (!c->opt_user_name && getenv("LOGNAME")) {
--		c->opt_user_name = getenv("LOGNAME");
-+	if (!c->opt_user_name) {
-+		if(getenv("LOGNAME"))
-+			c->opt_user_name = getenv("LOGNAME");
-+		else
-+			d_fprintf(stderr,
-+				_("Environment LOGNAME is not defined."
-+			          " Trying anonymous access.\n"));
- 	}
- 
- 	if (!c->opt_workgroup) {
diff --git a/net/samba41/files/patch-source3__utils__net_time.c b/net/samba41/files/patch-source3__utils__net_time.c
deleted file mode 100644
index 6c6ce7614652..000000000000
--- a/net/samba41/files/patch-source3__utils__net_time.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./source3/utils/net_time.c.orig	2010-04-01 15:26:22.000000000 +0200
-+++ ./source3/utils/net_time.c	2010-04-23 01:08:35.000000000 +0200
-@@ -87,10 +87,15 @@
- 	if (!tm) {
- 		return "unknown";
- 	}
--
-+#if defined(FREEBSD)
-+	return talloc_asprintf(talloc_tos(), "%02d%02d%02d%02d%02d.%02d",
-+				tm->tm_year + 1900, tm->tm_mon+1, tm->tm_mday,
-+				tm->tm_hour, tm->tm_min, tm->tm_sec);
-+#else
- 	return talloc_asprintf(talloc_tos(), "%02d%02d%02d%02d%04d.%02d",
- 			       tm->tm_mon+1, tm->tm_mday, tm->tm_hour,
- 			       tm->tm_min, tm->tm_year + 1900, tm->tm_sec);
-+#endif
- }
- 
- int net_time_usage(struct net_context *c, int argc, const char **argv)
diff --git a/net/samba41/files/patch-source3__winbindd__wscript_build b/net/samba41/files/patch-source3__winbindd__wscript_build
deleted file mode 100644
index 5e1fc538a7fc..000000000000
--- a/net/samba41/files/patch-source3__winbindd__wscript_build
+++ /dev/null
@@ -1,55 +0,0 @@
---- ./source3/winbindd/wscript_build.orig	2013-02-05 12:25:26.000000000 +0000
-+++ ./source3/winbindd/wscript_build	2013-02-08 11:47:42.280566856 +0000
-@@ -18,9 +18,9 @@
- 
- bld.SAMBA3_LIBRARY('idmap',
-                    source=IDMAP_SRC,
--                   deps='samba-util',
--                   vars=locals(),
-+                   deps='samba-util pdb',
-                    allow_undefined_symbols=True,
-+                   vars=locals(),
-                    private_library=True)
- 
- bld.SAMBA3_SUBSYSTEM('IDMAP_HASH',
-@@ -36,9 +36,9 @@
- 
- bld.SAMBA3_MODULE('idmap_ad',
-                  subsystem='idmap',
--                 allow_undefined_symbols=True,
-                  source='',
-                  deps='IDMAP_AD',
-+                 allow_undefined_symbols=True,
-                  init_function='',
-                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_ad'),
-                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ad') and bld.CONFIG_SET("HAVE_LDAP"))
-@@ -80,6 +80,7 @@
-                  subsystem='idmap',
-                  source=IDMAP_TDB_SRC,
-                  deps='samba-util tdb',
-+                 allow_undefined_symbols=True,
-                  init_function='',
-                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_tdb'),
-                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_tdb'))
-@@ -87,7 +88,7 @@
- bld.SAMBA3_MODULE('idmap_tdb2',
-                  subsystem='idmap',
-                  source=IDMAP_TDB2_SRC,
--                 deps='samba-util tdb',
-+                 deps='samba-util tdb param',
-                  init_function='',
-                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_tdb2'),
-                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_tdb2'))
-@@ -105,10 +106,10 @@
-                  subsystem='idmap',
-                  source=IDMAP_AUTORID_SRC,
-                  deps='samba-util tdb',
-+                 allow_undefined_symbols=True,
-                  init_function='',
-                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_autorid'),
--                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_autorid'),
--                  allow_undefined_symbols=True)
-+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_autorid'))
- 
- 
- NSS_INFO_TEMPLATE_SRC = 'nss_info_template.c'
diff --git a/net/samba41/files/patch-source3__wscript b/net/samba41/files/patch-source3__wscript
deleted file mode 100644
index 5a90e6bf925a..000000000000
--- a/net/samba41/files/patch-source3__wscript
+++ /dev/null
@@ -1,96 +0,0 @@
---- ./source3/wscript.orig	2013-09-06 09:39:57.000000000 +0000
-+++ ./source3/wscript	2013-11-20 00:30:53.150817814 +0000
-@@ -34,6 +34,7 @@
-     opt.SAMBA3_ADD_OPTION('utmp')
-     opt.SAMBA3_ADD_OPTION('pthreadpool', with_name="enable", without_name="disable", default=True)
-     opt.SAMBA3_ADD_OPTION('avahi', with_name="enable", without_name="disable")
-+    opt.SAMBA3_ADD_OPTION('dnssd', with_name="enable", without_name="disable")
-     opt.SAMBA3_ADD_OPTION('iconv')
-     opt.SAMBA3_ADD_OPTION('acl-support')
-     opt.SAMBA3_ADD_OPTION('dnsupdate')
-@@ -315,7 +316,9 @@
- 
-     # Check if the compiler will optimize out functions
-     conf.CHECK_CODE('''
--if (0) {
-+char s = "string";
-+int len = 6;
-+if (sizeof(s) != len && sizeof(s) != sizeof(char *)) {
-     this_function_does_not_exist();
- } else {
-     return 1;
-@@ -493,7 +496,7 @@
-             conf.CHECK_CODE('struct aiocb a; return aio_return(&a);', 'HAVE_AIO_RETURN', msg='Checking for aio_return', headers='aio.h', lib='aio rt')
-             conf.CHECK_CODE('struct aiocb a; return aio_error(&a);', 'HAVE_AIO_ERROR', msg='Checking for aio_error', headers='aio.h', lib='aio rt')
-             conf.CHECK_CODE('struct aiocb a; return aio_cancel(1, &a);', 'HAVE_AIO_CANCEL', msg='Checking for aio_cancel', headers='aio.h', lib='aio rt')
--            conf.CHECK_CODE('const struct aiocb * const a[1]; struct timespec t; return aio_suspend(&a, 1, &t);', 'HAVE_AIO_SUSPEND', msg='Checking for aio_suspend', headers='aio.h', lib='aio rt')
-+            conf.CHECK_CODE('const struct aiocb * const a[1]; struct timespec t; return aio_suspend(a, 1, &t);', 'HAVE_AIO_SUSPEND', msg='Checking for aio_suspend', headers='aio.h', lib='aio rt')
-         if not conf.CONFIG_SET('HAVE_AIO'):
-             conf.DEFINE('HAVE_NO_AIO', '1')
-     else:
-@@ -803,6 +806,17 @@
-         conf.SET_TARGET_TYPE('avahi-common', 'EMPTY')
-         conf.SET_TARGET_TYPE('avahi-client', 'EMPTY')
- 
-+    if Options.options.with_dnssd:
-+        conf.env.with_dnssd = True
-+        if not conf.CHECK_HEADERS('dns_sd.h'):
-+            conf.env.with_dnssd = False
-+        if not conf.CHECK_FUNCS_IN('DNSServiceRegister', 'dns_sd'):
-+            conf.env.with_dnssd = False
-+        if conf.env.with_dnssd:
-+            conf.DEFINE('WITH_DNSSD_SUPPORT', 1)
-+    else:
-+        conf.SET_TARGET_TYPE('dns_sd', 'EMPTY')
-+
-     if Options.options.with_iconv:
-         conf.env.with_iconv = True
-         if not conf.CHECK_FUNCS_IN('iconv_open', 'iconv', headers='iconv.h'):
-@@ -1690,26 +1704,8 @@
- 
-     if PTHREAD_LDFLAGS == 'error':
-         if conf.CHECK_FUNCS_IN('pthread_attr_init', 'pthread'):
--            PTHREAD_CFLAGS='-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS'
--            PTHREAD_LDFLAGS='-lpthread'
--    if PTHREAD_LDFLAGS == 'error':
--        if conf.CHECK_FUNCS_IN('pthread_attr_init', 'pthreads'):
--            PTHREAD_CFLAGS='-D_THREAD_SAFE'
--            PTHREAD_LDFLAGS='-lpthreads'
--    if PTHREAD_LDFLAGS == 'error':
--        if conf.CHECK_FUNCS_IN('pthread_attr_init', 'c_r'):
--            PTHREAD_CFLAGS='-D_THREAD_SAFE -pthread'
-+            PTHREAD_CFLAGS='-pthread'
-             PTHREAD_LDFLAGS='-pthread'
--    if PTHREAD_LDFLAGS == 'error':
--        if conf.CHECK_FUNCS('pthread_attr_init'):
--            PTHREAD_CFLAGS='-D_REENTRANT'
--            PTHREAD_LDFLAGS='-lpthread'
--    # especially for HP-UX, where the CHECK_FUNC macro fails to test for
--    # pthread_attr_init. On pthread_mutex_lock it works there...
--    if PTHREAD_LDFLAGS == 'error':
--        if conf.CHECK_FUNCS_IN('pthread_mutex_lock', 'pthread'):
--            PTHREAD_CFLAGS='-D_REENTRANT'
--            PTHREAD_LDFLAGS='-lpthread'
- 
-     if PTHREAD_CFLAGS != 'error' and PTHREAD_LDFLAGS != 'error':
-         conf.ADD_CFLAGS(PTHREAD_CFLAGS)
-@@ -1783,8 +1779,8 @@
-                                       auth_script vfs_readahead vfs_xattr_tdb vfs_posix_eadb
-                                       vfs_streams_xattr vfs_streams_depot vfs_acl_xattr vfs_acl_tdb
-                                       vfs_smb_traffic_analyzer vfs_preopen vfs_catia vfs_scannedonly
--				      vfs_media_harmony
--				      vfs_commit
-+                                      vfs_media_harmony
-+                                      vfs_commit
-                                       vfs_crossrename vfs_linux_xfs_sgid
-                                       vfs_time_audit idmap_autorid idmap_tdb2
-                                       idmap_rid idmap_hash idmap_rfc2307'''))
-@@ -1830,7 +1826,7 @@
-         default_static_modules.extend(TO_LIST('charset_macosxfs'))
- 
-     if conf.CONFIG_SET('HAVE_GPFS'):
--	default_shared_modules.extend(TO_LIST('vfs_gpfs'))
-+        default_shared_modules.extend(TO_LIST('vfs_gpfs'))
- 
-     if conf.CONFIG_SET('HAVE_LINUX_IOCTL'):
- 	default_shared_modules.extend(TO_LIST('vfs_btrfs'))
diff --git a/net/samba41/files/patch-source3__wscript_build b/net/samba41/files/patch-source3__wscript_build
deleted file mode 100644
index 10c77de5d96e..000000000000
--- a/net/samba41/files/patch-source3__wscript_build
+++ /dev/null
@@ -1,35 +0,0 @@
---- source3/wscript_build.orig	2013-09-06 09:39:57.000000000 +0000
-+++ source3/wscript_build	2013-11-20 00:35:51.687173831 +0000
-@@ -976,11 +986,13 @@
-                     LIBAFS_SETTOKEN
-                     RPC_SERVER
-                     NDR_SMBXSRV
--		    LIBASYS
-+                    LIBASYS
-                     ccan-hash
-                     NDR_SMB_ACL
-                     netapi
--		    NDR_IOCTL
-+                    NDR_IOCTL
-+                    inotify
-+                    dns_sd
-                     ''' + bld.env['dmapi_lib'],
-                     private_library=True,
-                     vars=locals())
-@@ -1261,6 +1273,7 @@
-                  libsmb
-                  msrpc3
-                  RPC_NDR_SRVSVC
-+                 dns_sd
-                  cli_smb_common''')
- 
- bld.SAMBA3_BINARY('net',
-@@ -1613,7 +1626,7 @@
- 
- bld.SAMBA3_PYTHON('pylibsmb',
-                   source='libsmb/pylibsmb.c',
--                  deps='smbclient samba-credentials',
-+                  deps='smbclient samba-credentials libsmb errors',
-                   realname='samba/samba3/libsmb_samba_internal.so'
-                   )
- 
diff --git a/net/samba41/files/patch-source4__dns_server__dns_crypto.c b/net/samba41/files/patch-source4__dns_server__dns_crypto.c
deleted file mode 100644
index 96a6d381d346..000000000000
--- a/net/samba41/files/patch-source4__dns_server__dns_crypto.c
+++ /dev/null
@@ -1,77 +0,0 @@
-From 27b732f6bfcdcd96fd76e89c624f5f18ca944531 Mon Sep 17 00:00:00 2001
-From: Guenter Kukkukk <kukks@samba.org>
-Date: Sat, 16 Feb 2013 16:53:16 +0100
-Subject: [PATCH] Fix internal DNS dyn. update, seen as: ; TSIG error with server: tsig verify failure
-
-The dns update signed response must be handled differently than the TKEY response
-
-Signed-off-by: Guenter Kukkukk <kukks@samba.org>
----
- source4/dns_server/dns_crypto.c |   44 ++++++++++++++++++++++++++++++++------
- 1 files changed, 37 insertions(+), 7 deletions(-)
-
-diff --git a/source4/dns_server/dns_crypto.c b/source4/dns_server/dns_crypto.c
-index 7604a05..71adf68 100644
---- ./source4/dns_server/dns_crypto.c.orig	2012-10-02 08:24:46.000000000 +0000
-+++ ./source4/dns_server/dns_crypto.c	2013-11-18 22:45:12.818702284 +0000
-@@ -244,6 +244,8 @@
- 	DATA_BLOB packet_blob, tsig_blob, sig;
- 	uint8_t *buffer = NULL;
- 	size_t buffer_len = 0;
-+	size_t miclen_bytes = 0;
-+	size_t mic_size = 0;
- 	struct dns_server_tkey * tkey = NULL;
- 	struct dns_res_rec *tsig = talloc_zero(mem_ctx, struct dns_res_rec);
- 
-@@ -298,16 +300,44 @@
- 		return DNS_ERR(SERVER_FAILURE);
- 	}
- 
--	buffer_len = packet_blob.length + tsig_blob.length;
--	buffer = talloc_zero_array(mem_ctx, uint8_t, buffer_len);
--	if (buffer == NULL) {
--		return WERR_NOMEM;
--	}
-+	/* DNS update must be handled differently than the TKEY case */ 
-+	if ((packet->operation & DNS_OPCODE) == DNS_OPCODE_UPDATE) {
-+		/* Here the request MIC must be placed in front of the buffer.
-+		   Calculate the length of the buffer used for the request MIC:
-+		   2 bytes (sizeof uint16_t) for the length itself
-+		   length bytes of the MIC (here 16 + 12 = 28 bytes) */
-+		miclen_bytes = sizeof(state->tsig->rdata.tsig_record.mac_size);
-+		mic_size     = miclen_bytes + state->tsig->rdata.tsig_record.mac_size;
- 
--	memcpy(buffer, packet_blob.data, packet_blob.length);
--	memcpy(buffer+packet_blob.length, tsig_blob.data, tsig_blob.length);
-+		buffer_len = mic_size + packet_blob.length + tsig_blob.length;
-+		buffer = talloc_zero_array(mem_ctx, uint8_t, buffer_len);
-+		if (buffer == NULL) {
-+			return WERR_NOMEM;
-+		}
- 
-+		/* copy the 2 length bytes of request MIC in big-endian order */
-+		RSSVAL(buffer,0,state->tsig->rdata.tsig_record.mac_size);
-+
-+		/* copy the request MIC itself */
-+		memcpy(buffer + miclen_bytes, state->tsig->rdata.tsig_record.mac,
-+			  state->tsig->rdata.tsig_record.mac_size);
-+
-+		/* copy the remaining data */
-+		memcpy(buffer + mic_size, packet_blob.data, packet_blob.length);
-+		memcpy(buffer + mic_size + packet_blob.length, tsig_blob.data, tsig_blob.length);
-+	} else {
-+		buffer_len = packet_blob.length + tsig_blob.length;
-+		buffer = talloc_zero_array(mem_ctx, uint8_t, buffer_len);
-+		if (buffer == NULL) {
-+			return WERR_NOMEM;
-+		}
- 
-+		memcpy(buffer, packet_blob.data, packet_blob.length);
-+		memcpy(buffer+packet_blob.length, tsig_blob.data, tsig_blob.length);
-+	}
-+
-+	/* FIXME: as in the verify case, some padding is wrong */
-+	buffer_len -=2;
- 	status = gensec_sign_packet(tkey->gensec, mem_ctx, buffer, buffer_len,
- 				    buffer, buffer_len, &sig);
- 	if (!NT_STATUS_IS_OK(status)) {
diff --git a/net/samba41/files/patch-source4__heimdal__lib__roken__rkpty.c b/net/samba41/files/patch-source4__heimdal__lib__roken__rkpty.c
deleted file mode 100644
index 7e45b1f09fcc..000000000000
--- a/net/samba41/files/patch-source4__heimdal__lib__roken__rkpty.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- source4/heimdal/lib/roken/rkpty.c.orig	2013-11-05 12:05:01.120532069 +0000
-+++ source4/heimdal/lib/roken/rkpty.c	2013-11-05 12:05:17.764730404 +0000
-@@ -232,7 +232,7 @@
- 		errx(1, "timeout waiting for %s (line %u)",
- 		     c->str, c->lineno);
- 	    else if (alarmset)
--		errx(1, "got a signal %d waiting for %s (line %u)",
-+		errx(1, "got a signal %ld waiting for %s (line %u)",
- 		     alarmset, c->str, c->lineno);
- 	    if (sret <= 0)
- 		errx(1, "end command while waiting for %s (line %u)",
diff --git a/net/samba41/files/patch-source4__ntvfs__sysdep__wscript_build b/net/samba41/files/patch-source4__ntvfs__sysdep__wscript_build
deleted file mode 100644
index a147d65fb580..000000000000
--- a/net/samba41/files/patch-source4__ntvfs__sysdep__wscript_build
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./source4/ntvfs/sysdep/wscript_build.orig	2012-10-02 08:24:48.000000000 +0000
-+++ ./source4/ntvfs/sysdep/wscript_build	2013-02-05 04:12:51.899867297 +0000
-@@ -4,7 +4,7 @@
-                  source='inotify.c',
-                  subsystem='sys_notify',
-                  init_function='sys_notify_inotify_init',
--                 deps='events',
-+                 deps='events inotify',
-                  enabled = bld.CONFIG_SET('HAVE_LINUX_INOTIFY')
-                  )
- 
diff --git a/net/samba41/files/patch-source4__ntvfs__sysdep__wscript_configure b/net/samba41/files/patch-source4__ntvfs__sysdep__wscript_configure
deleted file mode 100644
index bdd6c628cc49..000000000000
--- a/net/samba41/files/patch-source4__ntvfs__sysdep__wscript_configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./source4/ntvfs/sysdep/wscript_configure.orig	2012-10-02 08:24:48.000000000 +0000
-+++ ./source4/ntvfs/sysdep/wscript_configure	2013-02-05 04:12:51.909866322 +0000
-@@ -5,5 +5,8 @@
- conf.CHECK_DECLS('F_SETLEASE', headers='linux/fcntl.h', reverse=True)
- conf.CHECK_DECLS('SA_SIGINFO', headers='signal.h', reverse=True)
- 
-+conf.SET_TARGET_TYPE('inotify', 'EMPTY')
-+conf.CHECK_FUNCS_IN('inotify_init', 'inotify', checklibc=True, headers='sys/inotify.h')
-+
- if (conf.CONFIG_SET('HAVE_SYS_INOTIFY_H')):
-     conf.DEFINE('HAVE_LINUX_INOTIFY', 1)
diff --git a/net/samba41/files/patch-wscript b/net/samba41/files/patch-wscript
deleted file mode 100644
index 7feb2c4c4f1e..000000000000
--- a/net/samba41/files/patch-wscript
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./wscript.orig	2013-01-27 22:58:07.759866676 +0000
-+++ ./wscript	2013-01-27 22:58:27.961081298 +0000
-@@ -43,7 +43,6 @@
-     opt.RECURSE('lib/nss_wrapper')
-     opt.RECURSE('lib/socket_wrapper')
-     opt.RECURSE('lib/uid_wrapper')
--    opt.RECURSE('pidl')
-     opt.RECURSE('source3')
-     opt.RECURSE('lib/util')
- 
-@@ -140,7 +139,6 @@
-     conf.RECURSE('lib/subunit/c')
-     conf.RECURSE('libcli/smbreadline')
-     conf.RECURSE('lib/crypto')
--    conf.RECURSE('pidl')
-     conf.RECURSE('selftest')
-     conf.RECURSE('source3')
- 
diff --git a/net/samba41/files/patch-wscript_build b/net/samba41/files/patch-wscript_build
deleted file mode 100644
index f5f90fd05ff6..000000000000
--- a/net/samba41/files/patch-wscript_build
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./wscript_build.orig	2013-01-27 22:58:14.032166250 +0000
-+++ ./wscript_build	2013-01-27 23:03:34.089892588 +0000
-@@ -130,7 +130,6 @@
- if bld.AD_DC_BUILD_IS_ENABLED():
-     bld.RECURSE('source4/setup')
- bld.RECURSE('source4/scripting')
--bld.RECURSE('pidl')
- bld.RECURSE('lib')
- bld.RECURSE('libds/common')
- bld.RECURSE('source3')
diff --git a/net/samba41/files/pkg-message.in b/net/samba41/files/pkg-message.in
deleted file mode 100644
index 6cdc13d1753d..000000000000
--- a/net/samba41/files/pkg-message.in
+++ /dev/null
@@ -1,22 +0,0 @@
-===============================================================================
-
-How to start: http://wiki.samba.org/index.php/Samba4/HOWTO
-
-* Your configuration is: %%SAMBA4_CONFDIR%%/%%SAMBA4_CONFIG%%
-
-* All the relevant databases are under: %%SAMBA4_LOCKDIR%%
-
-* All the logs are under: %%SAMBA4_LOGDIR%%
-
-* Provisioning script is: %%PREFIX%%/bin/samba-tool
-
-%%NSUPDATE%%You will need to specify location of the 'nsupdate' command in the
-%%NSUPDATE%%%%SAMBA4_CONFIG%% file:
-%%NSUPDATE%%
-%%NSUPDATE%%      nsupdate command = %%PREFIX%%/bin/samba-nsupdate -g
-%%NSUPDATE%%
-For additional documentation check: http://wiki.samba.org/index.php/Samba4
-
-Bug reports should go to the: https://bugzilla.samba.org/
-
-===============================================================================
diff --git a/net/samba41/files/samba_server.in b/net/samba41/files/samba_server.in
deleted file mode 100644
index ea9cbadccf3e..000000000000
--- a/net/samba41/files/samba_server.in
+++ /dev/null
@@ -1,202 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: samba_server
-# REQUIRE: NETWORKING SERVERS DAEMON ldconfig resolv ntpd
-# BEFORE: LOGIN
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
-# to enable this service:
-#
-#samba_server_enable="YES"
-#
-# You can disable/enable any of the Samba daemons by specifying:
-#samba_enable="NO"
-#nmbd_enable="NO"
-#smbd_enable="NO"
-# You need to enable winbindd separately, by adding:
-#winbindd_enable="YES"
-# Configuration file can be set with:
-#samba_server_config="%%SAMBA4_CONFDIR%%/%%SAMBA4_CONFIG%%"
-#
-
-. /etc/rc.subr
-
-name="samba_server"
-rcvar=${name}_enable
-# Defaults
-samba_server_config_default="%%SAMBA4_CONFDIR%%/%%SAMBA4_CONFIG%%"
-smbcontrol_command="%%PREFIX%%/bin/smbcontrol"
-# Custom commands
-extra_commands="reload status"
-
-start_precmd="samba_server_prestart"
-restart_precmd="samba_server_checkconfig"
-reload_precmd="samba_server_checkconfig"
-start_cmd="samba_server_cmd"
-stop_cmd="samba_server_cmd"
-status_cmd="samba_server_cmd"
-reload_cmd="samba_server_reload_cmd"
-rcvar_cmd="samba_server_rcvar_cmd"
-
-samba_server_checkconfig() {
-    echo -n "Performing sanity check on Samba configuration: "
-    if ${testparm_command} >/dev/null 2>&1; then
-	echo "OK"
-    else
-	echo "FAILED"
-	return 1
-    fi
-}
-
-samba_server_prestart() {
-    # Make sure we have our RUNDIR, even if it's on a tmpfs
-    if [ -d "${samba_server_piddir}" -o ! -e "${samba_server_piddir}" ]; then
-	install -d -m 0755 "${samba_server_piddir}"
-    fi
-    # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=200186
-    if [ -d "${samba_server_privatedir}" -o ! -e "${samba_server_privatedir}" ]; then
-	install -d -m 0700 "${samba_server_privatedir}"
-    fi
-#    # Remove smbd.pid before starting up samba(needed for s3fs)
-#    if [ -e "${samba_server_piddir}/smbd.pid" ] ; then
-#	rm -f "${samba_server_piddir}/smbd.pid"
-#    fi
-    samba_server_checkconfig
-}
-
-samba_server_rcvar_cmd() {
-    local name rcvar
-    rcvar=${name}_enable
-    # Prevent recursive calling
-    unset "${rc_arg}_cmd" "${rc_arg}_precmd" "${rc_arg}_postcmd"
-    # Check master variable
-    run_rc_command "${_rc_prefix}${rc_arg}" ${rc_extra_args}
-    # Check dependent variables
-    for name in ${samba_daemons}; do
-	# XXX
-	rcvars=''; v=''
-	rcvar=${name}_enable
-	run_rc_command "${_rc_prefix}${rc_arg}" ${rc_extra_args}
-    done
-}
-
-samba_server_reload_cmd() {
-    local name rcvar command pidfile force_run
-    # Prevent recursive calling
-    unset "${rc_arg}_cmd" "${rc_arg}_precmd" "${rc_arg}_postcmd"
-    # Ignore rcvar and run command
-    if [ -n "${_rc_prefix}" -a "${_rc_prefix}" = "one" ] || [ -n "${rc_force}" ] || [ -n "${rc_fast}" ]; then
-	force_run=yes
-    fi
-    # Apply to all daemons
-    for name in ${samba_daemons}; do
-	rcvar=${name}_enable
-	command="%%PREFIX%%/sbin/${name}"
-	pidfile="${samba_server_piddir}/${name}.pid"
-	# Daemon should be enabled and running
-	if ( [ -n "${rcvar}" ] && checkyesno "${rcvar}" ) || [ -n "$force_run" ]; then
-	    if [ -n "$(check_pidfile "${pidfile}" "${command}")" ]; then
-		debug "reloading ${name} configuration"
-		echo "Reloading ${name}."
-		${smbcontrol_command} "${name}" 'reload-config' ${command_args} >/dev/null 2>&1
-	    fi
-	fi
-    done
-}
-
-samba_server_cmd() {
-    local name rcvar rcvars v command pidfile samba_daemons result force_run
-    # Prevent recursive calling
-    unset "${rc_arg}_cmd" "${rc_arg}_precmd" "${rc_arg}_postcmd"
-    # Stop processes in the reverse order
-    if [ "${rc_arg}" = "stop" ] ; then
-	samba_daemons=$(reverse_list ${samba_daemons})
-    fi
-    # Ignore rcvar and run command
-    if [ -n "${_rc_prefix}" -a "${_rc_prefix}" = "one" ] || [ -n "${rc_force}" ] || [ -n "${rc_fast}" ]; then
-	force_run=yes
-    fi
-    # Assume success
-    result=0
-    # Apply to all daemons
-    for name in ${samba_daemons}; do
-	# XXX
-	rcvars=''; v=''
-	rcvar=${name}_enable
-	command="%%PREFIX%%/sbin/${name}"
-	pidfile="${samba_server_piddir}/${name}.pid"
-	# Daemon should be enabled and running
-	if ( [ -n "${rcvar}" ] && checkyesno "${rcvar}" ) || [ -n "$force_run" ]; then
-	    run_rc_command "${_rc_prefix}${rc_arg}" ${rc_extra_args}
-	    # If any of the commands failed, take it as a global result
-	    result=$((${result} || $?))
-	fi
-    done
-    return ${result}
-}
-
-samba_server_config_init() {
-    local name
-    # Load configuration
-    load_rc_config "${name}"
-    # Defaults
-    samba_server_enable=${samba_server_enable:=NO}
-    samba_server_config=${samba_server_config=${samba_server_config_default}}
-    samba_server_configfile_arg=${samba_server_config:+--configfile="${samba_server_config}"}			#"
-    #testparm_command="%%PREFIX%%/bin/samba-tool testparm --suppress-prompt --verbose ${samba_server_configfile_arg}"
-    testparm_command="%%PREFIX%%/bin/testparm --suppress-prompt --verbose ${samba_server_config}"
-    # Determine what daemons are necessary to run Samba in the current role
-    samba_server_role=$(${testparm_command} --parameter-name='server role' 2>/dev/null)
-    case "${samba_server_role}" in
-	active\ directory\ domain\ controller)
-	    samba_daemons="samba"
-	    ;;
-	auto|*)
-	    samba_daemons="nmbd smbd winbindd"
-	    ;;
-    esac
-    # Load daemons configuration
-    for name in ${samba_daemons}; do
-	load_rc_config "${name}"
-	# If samba_server_enable is 'YES'
-	if [ -n "${rcvar}" ] && checkyesno "${rcvar}"; then
-	    if [ "${name}" != "winbindd" ]; then
-		# Set variable to 'YES' only if it is unset
-		eval ${name}_enable=\${${name}_enable-YES}
-	    else
-		# Winbindd
-		samba_server_idmap=$(${testparm_command} --parameter-name='idmap uid' 2>/dev/null)
-		if [ -n "${samba_server_idmap}" ]; then
-		    winbindd_enable="YES"
-		fi
-	    fi
-	fi
-	# If variable is empty, set it to 'NO'
-	eval ${name}_enable=\${${name}_enable:-NO}
-    done
-    # Fetch parameters from configuration file
-    samba_server_lockdir="$(${testparm_command} --parameter-name='lock directory' 2>/dev/null)"
-    samba_server_lockdir=${samba_server_lockdir:=%%SAMBA4_LOCKDIR%%}
-    samba_server_piddir="$(${testparm_command} --parameter-name='pid directory' 2>/dev/null)"
-    samba_server_piddir=${samba_server_piddir:=%%SAMBA4_RUNDIR%%}
-    samba_server_privatedir="$(${testparm_command} --parameter-name='private dir' 2>/dev/null)"
-    samba_server_privatedir=${samba_server_privatedir:=%%SAMBA4_PRIVATEDIR%%}
-}
-
-# Load configuration variables
-samba_server_config_init
-# Common flags
-command_args=${samba_server_configfile_arg}
-samba_flags=${samba_flags="--daemon"}
-nmbd_flags=${nmbd_flags="--daemon"}
-smbd_flags=${smbd_flags="--daemon"}
-winbindd_flags=${winbindd_flags="--daemon"}
-# Requirements
-required_files="${samba_server_config}"
-required_dirs="${samba_server_lockdir}"
-
-run_rc_command "$1"
diff --git a/net/samba41/pkg-descr b/net/samba41/pkg-descr
deleted file mode 100644
index 6fd81ae265ab..000000000000
--- a/net/samba41/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-Samba4 is an attempt to implement an Active Directory compatible Domain
-Controller.
-
-In short, you can join a WinNT, Win2000, WinXP or Win2003 member server
-to a Samba4 domain, and it will behave much as it does in AD, including
-Kerberos domain logins where applicable.
-
-WWW: http://www.samba.org/
diff --git a/net/samba41/pkg-plist b/net/samba41/pkg-plist
deleted file mode 100644
index 6a7ecb8b9a25..000000000000
--- a/net/samba41/pkg-plist
+++ /dev/null
@@ -1,986 +0,0 @@
-bin/cifsdd
-bin/dbwrap_tool
-bin/eventlogadm
-bin/gentest
-bin/locktest
-bin/masktest
-bin/ndrdump
-bin/net
-bin/nmblookup
-bin/nmblookup4
-bin/ntlm_auth
-bin/oLschema2ldif
-bin/pdbedit
-bin/profiles
-bin/regdiff
-bin/regpatch
-bin/regshell
-bin/regtree
-bin/rpcclient
-bin/samba-regedit
-%%AD_DC%%bin/samba-tool
-bin/sharesec
-bin/smbcacls
-bin/smbclient
-bin/smbclient4
-bin/smbcontrol
-bin/smbcquotas
-bin/smbget
-bin/smbpasswd
-bin/smbspool
-bin/smbstatus
-bin/smbta-util
-bin/smbtar
-bin/smbtorture
-bin/smbtree
-bin/testparm
-bin/wbinfo
-sbin/nmbd
-%%AD_DC%%sbin/samba
-%%AD_DC%%sbin/samba_dnsupdate
-%%AD_DC%%sbin/samba_kcc
-%%AD_DC%%sbin/samba_spnupdate
-%%AD_DC%%sbin/samba_upgradedns
-sbin/smbd
-sbin/winbindd
-include/samba4/charset.h
-include/samba4/core/doserr.h
-include/samba4/core/error.h
-include/samba4/core/ntstatus.h
-include/samba4/core/werror.h
-include/samba4/credentials.h
-include/samba4/dcerpc.h
-%%AD_DC%%include/samba4/dcerpc_server.h
-include/samba4/dlinklist.h
-include/samba4/domain_credentials.h
-include/samba4/gen_ndr/atsvc.h
-include/samba4/gen_ndr/auth.h
-include/samba4/gen_ndr/dcerpc.h
-include/samba4/gen_ndr/drsblobs.h
-include/samba4/gen_ndr/drsuapi.h
-include/samba4/gen_ndr/epmapper.h
-include/samba4/gen_ndr/krb5pac.h
-include/samba4/gen_ndr/lsa.h
-include/samba4/gen_ndr/mgmt.h
-include/samba4/gen_ndr/misc.h
-include/samba4/gen_ndr/nbt.h
-include/samba4/gen_ndr/ndr_atsvc.h
-include/samba4/gen_ndr/ndr_atsvc_c.h
-include/samba4/gen_ndr/ndr_dcerpc.h
-include/samba4/gen_ndr/ndr_drsblobs.h
-include/samba4/gen_ndr/ndr_drsuapi.h
-include/samba4/gen_ndr/ndr_epmapper.h
-include/samba4/gen_ndr/ndr_epmapper_c.h
-include/samba4/gen_ndr/ndr_krb5pac.h
-include/samba4/gen_ndr/ndr_mgmt.h
-include/samba4/gen_ndr/ndr_mgmt_c.h
-include/samba4/gen_ndr/ndr_misc.h
-include/samba4/gen_ndr/ndr_nbt.h
-include/samba4/gen_ndr/ndr_samr.h
-include/samba4/gen_ndr/ndr_samr_c.h
-include/samba4/gen_ndr/ndr_svcctl.h
-include/samba4/gen_ndr/ndr_svcctl_c.h
-include/samba4/gen_ndr/netlogon.h
-include/samba4/gen_ndr/samr.h
-include/samba4/gen_ndr/security.h
-include/samba4/gen_ndr/server_id.h
-include/samba4/gen_ndr/svcctl.h
-include/samba4/gensec.h
-include/samba4/ldap-util.h
-include/samba4/ldap_errors.h
-include/samba4/ldap_message.h
-include/samba4/ldap_ndr.h
-include/samba4/ldb_wrap.h
-include/samba4/libsmbclient.h
-include/samba4/lookup_sid.h
-include/samba4/machine_sid.h
-include/samba4/ndr.h
-include/samba4/ndr/ndr_drsblobs.h
-include/samba4/ndr/ndr_drsuapi.h
-include/samba4/ndr/ndr_nbt.h
-include/samba4/ndr/ndr_svcctl.h
-include/samba4/netapi.h
-include/samba4/param.h
-include/samba4/passdb.h
-include/samba4/policy.h
-include/samba4/read_smb.h
-include/samba4/registry.h
-include/samba4/roles.h
-include/samba4/rpc_common.h
-include/samba4/samba/session.h
-include/samba4/samba/version.h
-include/samba4/samba_util.h
-include/samba4/share.h
-include/samba4/smb2.h
-include/samba4/smb2_constants.h
-include/samba4/smb2_create_blob.h
-include/samba4/smb2_lease.h
-include/samba4/smb2_signing.h
-include/samba4/smb_cli.h
-include/samba4/smb_cliraw.h
-include/samba4/smb_common.h
-include/samba4/smb_composite.h
-include/samba4/smb_constants.h
-%%LDAP%%include/samba4/smb_ldap.h
-include/samba4/smb_raw.h
-include/samba4/smb_raw_interfaces.h
-include/samba4/smb_raw_signing.h
-include/samba4/smb_raw_trans2.h
-include/samba4/smb_request.h
-include/samba4/smb_seal.h
-include/samba4/smb_share_modes.h
-include/samba4/smb_signing.h
-include/samba4/smb_unix_ext.h
-include/samba4/smb_util.h
-include/samba4/smbconf.h
-%%LDAP%%include/samba4/smbldap.h
-include/samba4/tdr.h
-include/samba4/torture.h
-include/samba4/tsocket.h
-include/samba4/tsocket_internal.h
-include/samba4/util/attr.h
-include/samba4/util/byteorder.h
-include/samba4/util/data_blob.h
-include/samba4/util/debug.h
-include/samba4/util/memory.h
-include/samba4/util/safe_string.h
-include/samba4/util/string_wrappers.h
-include/samba4/util/talloc_stack.h
-include/samba4/util/tevent_ntstatus.h
-include/samba4/util/tevent_unix.h
-include/samba4/util/tevent_werror.h
-include/samba4/util/time.h
-include/samba4/util/xfile.h
-include/samba4/util_ldb.h
-include/samba4/wbclient.h
-lib/libdcerpc-atsvc.so
-lib/libdcerpc-atsvc.so.0
-lib/libdcerpc-binding.so
-lib/libdcerpc-binding.so.0
-lib/libdcerpc-samr.so
-lib/libdcerpc-samr.so.0
-%%AD_DC%%lib/libdcerpc-server.so
-%%AD_DC%%lib/libdcerpc-server.so.0
-lib/libdcerpc.so
-lib/libdcerpc.so.0
-lib/libgensec.so
-lib/libgensec.so.0
-lib/libndr-krb5pac.so
-lib/libndr-krb5pac.so.0
-lib/libndr-nbt.so
-lib/libndr-nbt.so.0
-lib/libndr-standard.so
-lib/libndr-standard.so.0
-lib/libndr.so
-lib/libndr.so.0
-lib/libnetapi.so
-lib/libnetapi.so.0
-lib/libpdb.so
-lib/libpdb.so.0
-lib/libregistry.so
-lib/libregistry.so.0
-lib/libsamba-credentials.so
-lib/libsamba-credentials.so.0
-lib/libsamba-hostconfig.so
-lib/libsamba-hostconfig.so.0
-lib/libsamba-policy.so
-lib/libsamba-policy.so.0
-lib/libsamba-util.so
-lib/libsamba-util.so.0
-lib/libsamdb.so
-lib/libsamdb.so.0
-lib/libsmbclient-raw.so
-lib/libsmbclient-raw.so.0
-lib/libsmbconf.so
-lib/libsmbconf.so.0
-%%LDAP%%lib/libsmbldap.so
-%%LDAP%%lib/libsmbldap.so.0
-lib/libsmbsharemodes.so
-lib/libsmbsharemodes.so.0
-lib/libtevent-util.so
-lib/libtevent-util.so.0
-lib/libtorture.so
-lib/libtorture.so.0
-lib/libwbclient.so
-lib/libwbclient.so.0
-lib/mit_samba.so
-lib/nss_winbind.so.1
-lib/nss_wins.so.1
-%%SMBPASS%%lib/pam_smbpass.so
-lib/pam_winbind.so
-lib/winbind_krb5_locator.so
-lib/samba/libCHARSET3.so
-lib/samba/libHDB_SAMBA4.so
-lib/samba/libLIBWBCLIENT_OLD.so
-lib/samba/libMESSAGING.so
-lib/samba/libaddns.so
-lib/samba/libads.so
-lib/samba/libasn1-samba4.so.8
-lib/samba/libasn1util.so
-lib/samba/libauth.so
-lib/samba/libauth4.so
-lib/samba/libauth_sam_reply.so
-lib/samba/libauth_unix_token.so
-lib/samba/libauthkrb5.so
-lib/samba/libccan.so
-lib/samba/libcli-ldap-common.so
-lib/samba/libcli-ldap.so
-lib/samba/libcli-nbt.so
-lib/samba/libcli_cldap.so
-lib/samba/libcli_smb_common.so
-lib/samba/libcli_spoolss.so
-lib/samba/libcliauth.so
-lib/samba/libcluster.so
-lib/samba/libcmdline-credentials.so
-lib/samba/libcom_err-samba4.so.0
-lib/samba/libdb-glue.so
-lib/samba/libdbwrap.so
-lib/samba/libdcerpc-samba.so
-lib/samba/libdcerpc-samba4.so
-lib/samba/libdfs_server_ad.so
-%%AD_DC%%lib/samba/libdlz_bind9_for_torture.so
-lib/samba/libdnsserver_common.so
-lib/samba/libdsdb-module.so
-lib/samba/liberrors.so
-lib/samba/libevents.so
-lib/samba/libflag_mapping.so
-lib/samba/libgpo.so
-lib/samba/libgse.so
-lib/samba/libgssapi-samba4.so.2
-lib/samba/libhcrypto-samba4.so.5
-lib/samba/libhdb-samba4.so.11
-lib/samba/libheimbase-samba4.so.1
-lib/samba/libheimntlm-samba4.so.1
-lib/samba/libhx509-samba4.so.5
-lib/samba/libidmap.so
-lib/samba/libiniparser.so
-lib/samba/libinterfaces.so
-lib/samba/libkdc-samba4.so.2
-lib/samba/libkrb5-samba4.so.26
-lib/samba/libkrb5samba.so
-lib/samba/libldbsamba.so
-lib/samba/liblibcli_lsa3.so
-lib/samba/liblibcli_netlogon3.so
-lib/samba/liblibsmb.so
-lib/samba/libmsrpc3.so
-lib/samba/libndr-samba.so
-lib/samba/libndr-samba4.so
-lib/samba/libnet_keytab.so
-lib/samba/libnetif.so
-lib/samba/libnon_posix_acls.so
-lib/samba/libnpa_tstream.so
-lib/samba/libnss_info.so
-%%AD_DC%%lib/samba/libntvfs.so
-lib/samba/libpac.so
-lib/samba/libpopt_samba3.so
-%%AD_DC%%lib/samba/libposix_eadb.so
-lib/samba/libprinting_migrate.so
-%%AD_DC%%lib/samba/libprocess_model.so
-lib/samba/libreplace.so
-lib/samba/libroken-samba4.so.19
-lib/samba/libsamba-modules.so
-lib/samba/libsamba-net.so
-lib/samba/libsamba-security.so
-lib/samba/libsamba-sockets.so
-lib/samba/libsamba3-util.so
-lib/samba/libsamba_python.so
-lib/samba/libsamdb-common.so
-lib/samba/libsecrets3.so
-lib/samba/libserver-role.so
-%%AD_DC%%lib/samba/libservice.so
-lib/samba/libshares.so
-lib/samba/libsmb_transport.so
-lib/samba/libsmbd_base.so
-lib/samba/libsmbd_conn.so
-lib/samba/libsmbd_shim.so
-lib/samba/libsmbpasswdparser.so
-lib/samba/libsmbregistry.so
-lib/samba/libsubunit.so
-lib/samba/libtdb-wrap.so
-lib/samba/libtdb_compat.so
-lib/samba/libtrusts_util.so
-lib/samba/libutil_cmdline.so
-lib/samba/libutil_ntdb.so
-lib/samba/libutil_reg.so
-lib/samba/libutil_setid.so
-lib/samba/libutil_tdb.so
-lib/samba/libwinbind-client.so
-lib/samba/libwind-samba4.so.0
-lib/samba/libxattr_tdb.so
-%%LDAP%%lib/samba/libsmbldaphelper.so
-%%DEVELOPER%%lib/samba/libnss_wrapper.so
-%%DEVELOPER%%lib/samba/libuid_wrapper.so
-%%DEVELOPER%%lib/samba/libsocket_wrapper.so
-lib/shared-modules/auth/script.so
-%%MODULE_AUTH_SKEL%%lib/shared-modules/auth/skel.so
-%%AD_DC%%lib/shared-modules/bind9/dlz_bind9.so
-%%AD_DC%%lib/shared-modules/bind9/dlz_bind9_9.so
-%%AD_DC%%lib/shared-modules/bind9/dlz_bind9_10.so
-%%AD_DC%%lib/shared-modules/gensec/krb5.so
-lib/shared-modules/idmap/autorid.so
-lib/shared-modules/idmap/hash.so
-lib/shared-modules/idmap/rid.so
-lib/shared-modules/idmap/tdb2.so
-%%AD_DC%%lib/shared-modules/ldb/acl.so
-%%AD_DC%%lib/shared-modules/ldb/aclread.so
-%%AD_DC%%lib/shared-modules/ldb/anr.so
-%%AD_DC%%lib/shared-modules/ldb/descriptor.so
-%%AD_DC%%lib/shared-modules/ldb/dirsync.so
-%%AD_DC%%lib/shared-modules/ldb/extended_dn_in.so
-%%AD_DC%%lib/shared-modules/ldb/extended_dn_out.so
-%%AD_DC%%lib/shared-modules/ldb/extended_dn_store.so
-lib/shared-modules/ldb/ildap.so
-%%AD_DC%%lib/shared-modules/ldb/instancetype.so
-%%AD_DC%%lib/shared-modules/ldb/lazy_commit.so
-lib/shared-modules/ldb/ldbsamba_extensions.so
-%%AD_DC%%lib/shared-modules/ldb/linked_attributes.so
-%%AD_DC%%lib/shared-modules/ldb/local_password.so
-%%AD_DC%%lib/shared-modules/ldb/new_partition.so
-%%AD_DC%%lib/shared-modules/ldb/objectclass.so
-%%AD_DC%%lib/shared-modules/ldb/objectclass_attrs.so
-%%AD_DC%%lib/shared-modules/ldb/objectguid.so
-%%AD_DC%%lib/shared-modules/ldb/operational.so
-%%AD_DC%%lib/shared-modules/ldb/partition.so
-%%AD_DC%%lib/shared-modules/ldb/password_hash.so
-%%AD_DC%%lib/shared-modules/ldb/ranged_results.so
-%%AD_DC%%lib/shared-modules/ldb/repl_meta_data.so
-%%AD_DC%%lib/shared-modules/ldb/resolve_oids.so
-%%AD_DC%%lib/shared-modules/ldb/rootdse.so
-%%AD_DC%%lib/shared-modules/ldb/samba3sam.so
-%%AD_DC%%lib/shared-modules/ldb/samba3sid.so
-%%AD_DC%%lib/shared-modules/ldb/samba_dsdb.so
-%%AD_DC%%lib/shared-modules/ldb/samba_secrets.so
-%%AD_DC%%lib/shared-modules/ldb/samldb.so
-%%AD_DC%%lib/shared-modules/ldb/schema_data.so
-%%AD_DC%%lib/shared-modules/ldb/schema_load.so
-%%AD_DC%%lib/shared-modules/ldb/secrets_tdb_sync.so
-%%AD_DC%%lib/shared-modules/ldb/show_deleted.so
-%%AD_DC%%lib/shared-modules/ldb/simple_dn.so
-%%AD_DC%%lib/shared-modules/ldb/simple_ldap_map.so
-%%AD_DC%%lib/shared-modules/ldb/subtree_delete.so
-%%AD_DC%%lib/shared-modules/ldb/subtree_rename.so
-%%AD_DC%%lib/shared-modules/ldb/update_keytab.so
-%%AD_DC%%lib/shared-modules/ldb/wins_ldb.so
-lib/shared-modules/nss_info/hash.so
-%%MODULE_PERFCOUNT_TEST%%lib/shared-modules/perfcount/test.so
-%%MODULE_PDB_TEST%%lib/shared-modules/pdb/test.so
-%%AD_DC%%lib/shared-modules/process_model/onefork.so
-%%AD_DC%%lib/shared-modules/process_model/prefork.so
-%%AD_DC%%lib/shared-modules/process_model/standard.so
-%%AD_DC%%lib/shared-modules/service/cldap.so
-%%AD_DC%%lib/shared-modules/service/dcerpc.so
-%%AD_DC%%lib/shared-modules/service/dns.so
-%%AD_DC%%lib/shared-modules/service/dns_update.so
-%%AD_DC%%lib/shared-modules/service/drepl.so
-%%AD_DC%%lib/shared-modules/service/kcc.so
-%%AD_DC%%lib/shared-modules/service/kdc.so
-%%AD_DC%%lib/shared-modules/service/ldap.so
-%%AD_DC%%lib/shared-modules/service/nbtd.so
-%%AD_DC%%lib/shared-modules/service/ntp_signd.so
-%%AD_DC%%lib/shared-modules/service/s3fs.so
-%%AD_DC%%lib/shared-modules/service/smb.so
-%%AD_DC%%lib/shared-modules/service/web.so
-%%AD_DC%%lib/shared-modules/service/winbind.so
-%%AD_DC%%lib/shared-modules/service/wrepl.so
-lib/shared-modules/vfs/acl_tdb.so
-lib/shared-modules/vfs/acl_xattr.so
-lib/shared-modules/vfs/aio_fork.so
-%%MODULE_VFS_AIO_POSIX%%lib/shared-modules/vfs/aio_posix.so
-%%MODULE_VFS_AIO_PTHREAD%%lib/shared-modules/vfs/aio_pthread.so
-lib/shared-modules/vfs/audit.so
-lib/shared-modules/vfs/cap.so
-lib/shared-modules/vfs/catia.so
-lib/shared-modules/vfs/commit.so
-lib/shared-modules/vfs/crossrename.so
-lib/shared-modules/vfs/default_quota.so
-lib/shared-modules/vfs/dirsort.so
-lib/shared-modules/vfs/expand_msdfs.so
-lib/shared-modules/vfs/extd_audit.so
-lib/shared-modules/vfs/fake_perms.so
-lib/shared-modules/vfs/full_audit.so
-lib/shared-modules/vfs/linux_xfs_sgid.so
-lib/shared-modules/vfs/media_harmony.so
-lib/shared-modules/vfs/netatalk.so
-%%MODULE_VFS_NOTIFY_FAM%%lib/shared-modules/vfs/notify_fam.so
-%%AD_DC%%lib/shared-modules/vfs/posix_eadb.so
-lib/shared-modules/vfs/preopen.so
-lib/shared-modules/vfs/readahead.so
-lib/shared-modules/vfs/readonly.so
-lib/shared-modules/vfs/recycle.so
-lib/shared-modules/vfs/scannedonly.so
-lib/shared-modules/vfs/shadow_copy.so
-lib/shared-modules/vfs/shadow_copy2.so
-lib/shared-modules/vfs/smb_traffic_analyzer.so
-lib/shared-modules/vfs/streams_depot.so
-lib/shared-modules/vfs/streams_xattr.so
-lib/shared-modules/vfs/syncops.so
-lib/shared-modules/vfs/time_audit.so
-lib/shared-modules/vfs/xattr_tdb.so
-%%DEVELOPER%%lib/shared-modules/vfs/nfs4acl_xattr.so
-lib/shared-modules/vfs/zfsacl.so
-%%LDAP%%lib/shared-modules/idmap/rfc2307.so
-%%MODULE_AUTH_SAMBA4%%lib/shared-modules/auth/samba4.so
-%%MODULE_AUTH_UNIX%%lib/shared-modules/auth/unix.so
-%%MODULE_AUTH_WBC%%lib/shared-modules/auth/wbc.so
-%%MODULE_GPEXT_REGISTRY%%lib/shared-modules/gpext/registry.so
-%%MODULE_GPEXT_SCRIPTS%%lib/shared-modules/gpext/scripts.so
-%%MODULE_GPEXT_SECURITY%%lib/shared-modules/gpext/security.so
-%%MODULE_IDMAP_AD%%lib/shared-modules/idmap/ad.so
-%%MODULE_IDMAP_AD%%lib/shared-modules/nss_info/rfc2307.so
-%%MODULE_IDMAP_AD%%lib/shared-modules/nss_info/sfu.so
-%%MODULE_IDMAP_AD%%lib/shared-modules/nss_info/sfu20.so
-%%MODULE_IDMAP_LDAP%%lib/shared-modules/idmap/ldap.so
-%%MODULE_IDMAP_NSS%%lib/shared-modules/idmap/nss.so
-%%MODULE_IDMAP_PASSDB%%lib/shared-modules/idmap/passdb.so
-%%MODULE_IDMAP_TDB%%lib/shared-modules/idmap/tdb.so
-%%MODULE_NSS_INFO_TEMPLATE%%lib/shared-modules/nss_info/template.so
-%%MODULE_PDB_LDAP%%lib/shared-modules/pdb/ldap.so
-%%MODULE_PDB_SAMBA_DSDB%%lib/shared-modules/pdb/samba_dsdb.so
-%%MODULE_PDB_SMBPASSWD%%lib/shared-modules/pdb/smbpasswd.so
-%%MODULE_PDB_TDBSAM%%lib/shared-modules/pdb/tdbsam.so
-%%MODULE_PDB_WBC_SAM%%lib/shared-modules/pdb/wbc_sam.so
-%%MODULE_VFS_CACHEPRIME%%lib/shared-modules/vfs/cacheprime.so
-%%MODULE_VFS_DFS_SAMBA4%%lib/shared-modules/vfs/dfs_samba4.so
-%%MODULE_VFS_FAKE_ACLS%%lib/shared-modules/vfs/fake_acls.so
-%%MODULE_VFS_SHADOW_COPY_TEST%%lib/shared-modules/vfs/shadow_copy_test.so
-%%MODULE_VFS_SKEL_OPAQUE%%lib/shared-modules/vfs/skel_opaque.so
-%%MODULE_VFS_SKEL_TRANSPARENT%%lib/shared-modules/vfs/skel_transparent.so
-libdata/pkgconfig/dcerpc.pc
-libdata/pkgconfig/dcerpc_atsvc.pc
-libdata/pkgconfig/dcerpc_samr.pc
-%%AD_DC%%libdata/pkgconfig/dcerpc_server.pc
-libdata/pkgconfig/gensec.pc
-libdata/pkgconfig/ndr.pc
-libdata/pkgconfig/ndr_krb5pac.pc
-libdata/pkgconfig/ndr_nbt.pc
-libdata/pkgconfig/ndr_standard.pc
-libdata/pkgconfig/netapi.pc
-libdata/pkgconfig/registry.pc
-libdata/pkgconfig/samba-credentials.pc
-libdata/pkgconfig/samba-hostconfig.pc
-libdata/pkgconfig/samba-policy.pc
-libdata/pkgconfig/samba-util.pc
-libdata/pkgconfig/samdb.pc
-libdata/pkgconfig/smbclient-raw.pc
-libdata/pkgconfig/smbsharemodes.pc
-libdata/pkgconfig/torture.pc
-libdata/pkgconfig/wbclient.pc
-%%DEVELOPER%%%%PYTHON_SITELIBDIR%%/samba/socket_wrapper.so
-%%PYTHON_SITELIBDIR%%/samba/__init__.py
-%%PYTHON_SITELIBDIR%%/samba/_glue.so
-%%PYTHON_SITELIBDIR%%/samba/_ldb.so
-%%PYTHON_SITELIBDIR%%/samba/auth.so
-%%PYTHON_SITELIBDIR%%/samba/com.so
-%%PYTHON_SITELIBDIR%%/samba/common.py
-%%PYTHON_SITELIBDIR%%/samba/credentials.so
-%%PYTHON_SITELIBDIR%%/samba/dbchecker.py
-%%PYTHON_SITELIBDIR%%/samba/dcerpc/__init__.py
-%%PYTHON_SITELIBDIR%%/samba/dcerpc/atsvc.so
-%%PYTHON_SITELIBDIR%%/samba/dcerpc/auth.so
-%%PYTHON_SITELIBDIR%%/samba/dcerpc/base.so
-%%PYTHON_SITELIBDIR%%/samba/dcerpc/dfs.so
-%%PYTHON_SITELIBDIR%%/samba/dcerpc/dns.so
-%%PYTHON_SITELIBDIR%%/samba/dcerpc/dnsp.so
-%%PYTHON_SITELIBDIR%%/samba/dcerpc/dnsserver.so
-%%PYTHON_SITELIBDIR%%/samba/dcerpc/drsblobs.so
-%%PYTHON_SITELIBDIR%%/samba/dcerpc/drsuapi.so
-%%PYTHON_SITELIBDIR%%/samba/dcerpc/echo.so
-%%PYTHON_SITELIBDIR%%/samba/dcerpc/epmapper.so
-%%PYTHON_SITELIBDIR%%/samba/dcerpc/idmap.so
-%%PYTHON_SITELIBDIR%%/samba/dcerpc/initshutdown.so
-%%PYTHON_SITELIBDIR%%/samba/dcerpc/irpc.so
-%%PYTHON_SITELIBDIR%%/samba/dcerpc/krb5pac.so
-%%PYTHON_SITELIBDIR%%/samba/dcerpc/lsa.so
-%%PYTHON_SITELIBDIR%%/samba/dcerpc/mgmt.so
-%%PYTHON_SITELIBDIR%%/samba/dcerpc/misc.so
-%%PYTHON_SITELIBDIR%%/samba/dcerpc/nbt.so
-%%PYTHON_SITELIBDIR%%/samba/dcerpc/netlogon.so
-%%PYTHON_SITELIBDIR%%/samba/dcerpc/samr.so
-%%PYTHON_SITELIBDIR%%/samba/dcerpc/security.so
-%%PYTHON_SITELIBDIR%%/samba/dcerpc/server_id.so
-%%PYTHON_SITELIBDIR%%/samba/dcerpc/smb_acl.so
-%%PYTHON_SITELIBDIR%%/samba/dcerpc/srvsvc.so
-%%PYTHON_SITELIBDIR%%/samba/dcerpc/svcctl.so
-%%PYTHON_SITELIBDIR%%/samba/dcerpc/unixinfo.so
-%%PYTHON_SITELIBDIR%%/samba/dcerpc/winbind.so
-%%PYTHON_SITELIBDIR%%/samba/dcerpc/winreg.so
-%%PYTHON_SITELIBDIR%%/samba/dcerpc/wkssvc.so
-%%PYTHON_SITELIBDIR%%/samba/dcerpc/xattr.so
-%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/dckeytab.so
-%%PYTHON_SITELIBDIR%%/samba/descriptor.py
-%%PYTHON_SITELIBDIR%%/samba/drs_utils.py
-%%PYTHON_SITELIBDIR%%/samba/dsdb.so
-%%PYTHON_SITELIBDIR%%/samba/external/__init__.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/__init__.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/dnssec.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/e164.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/edns.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/entropy.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/exception.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/flags.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/hash.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/inet.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/ipv4.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/ipv6.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/message.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/name.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/namedict.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/node.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/opcode.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/query.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rcode.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdata.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdataclass.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdataset.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdatatype.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/AFSDB.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/CERT.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/CNAME.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/DLV.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/DNAME.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/DNSKEY.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/DS.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/GPOS.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/HINFO.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/HIP.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/ISDN.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/LOC.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/MX.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/NS.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/NSEC.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/NSEC3.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/NSEC3PARAM.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/PTR.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/RP.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/RRSIG.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/RT.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/SOA.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/SPF.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/SSHFP.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/TXT.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/X25.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/__init__.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/A.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/AAAA.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/APL.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/DHCID.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/IPSECKEY.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/KX.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/NAPTR.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/NSAP.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/NSAP_PTR.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/PX.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/SRV.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/WKS.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/__init__.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/__init__.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/dsbase.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/mxbase.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/nsbase.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/txtbase.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/renderer.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/resolver.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/reversename.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rrset.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/set.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/tokenizer.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/tsig.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/tsigkeyring.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/ttl.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/update.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/version.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/wiredata.py
-%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/zone.py
-%%PYTHON_SITELIBDIR%%/samba/external/subunit/__init__.py
-%%PYTHON_SITELIBDIR%%/samba/external/subunit/chunked.py
-%%PYTHON_SITELIBDIR%%/samba/external/subunit/details.py
-%%PYTHON_SITELIBDIR%%/samba/external/subunit/filters.py
-%%PYTHON_SITELIBDIR%%/samba/external/subunit/iso8601.py
-%%PYTHON_SITELIBDIR%%/samba/external/subunit/progress_model.py
-%%PYTHON_SITELIBDIR%%/samba/external/subunit/run.py
-%%PYTHON_SITELIBDIR%%/samba/external/subunit/test_results.py
-%%PYTHON_SITELIBDIR%%/samba/external/subunit/tests/TestUtil.py
-%%PYTHON_SITELIBDIR%%/samba/external/subunit/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/samba/external/subunit/tests/sample-script.py
-%%PYTHON_SITELIBDIR%%/samba/external/subunit/tests/sample-two-script.py
-%%PYTHON_SITELIBDIR%%/samba/external/subunit/tests/test_chunked.py
-%%PYTHON_SITELIBDIR%%/samba/external/subunit/tests/test_details.py
-%%PYTHON_SITELIBDIR%%/samba/external/subunit/tests/test_progress_model.py
-%%PYTHON_SITELIBDIR%%/samba/external/subunit/tests/test_run.py
-%%PYTHON_SITELIBDIR%%/samba/external/subunit/tests/test_subunit_filter.py
-%%PYTHON_SITELIBDIR%%/samba/external/subunit/tests/test_subunit_stats.py
-%%PYTHON_SITELIBDIR%%/samba/external/subunit/tests/test_subunit_tags.py
-%%PYTHON_SITELIBDIR%%/samba/external/subunit/tests/test_tap2subunit.py
-%%PYTHON_SITELIBDIR%%/samba/external/subunit/tests/test_test_protocol.py
-%%PYTHON_SITELIBDIR%%/samba/external/subunit/tests/test_test_results.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/__init__.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/_compat2x.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/_compat3x.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/_spinner.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/compat.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/content.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/content_type.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/deferredruntest.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/distutilscmd.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/helpers.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/matchers/__init__.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/matchers/_basic.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/matchers/_datastructures.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/matchers/_dict.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/matchers/_doctest.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/matchers/_exception.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/matchers/_filesystem.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/matchers/_higherorder.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/matchers/_impl.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/monkey.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/run.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/runtest.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/tags.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/testcase.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/testresult/__init__.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/testresult/doubles.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/testresult/real.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/helpers.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/matchers/__init__.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/matchers/helpers.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/matchers/test_basic.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/matchers/test_datastructures.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/matchers/test_dict.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/matchers/test_doctest.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/matchers/test_exception.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/matchers/test_filesystem.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/matchers/test_higherorder.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/matchers/test_impl.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/test_compat.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/test_content.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/test_content_type.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/test_deferredruntest.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/test_distutilscmd.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/test_fixturesupport.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/test_helpers.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/test_monkey.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/test_run.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/test_runtest.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/test_spinner.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/test_tags.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/test_testcase.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/test_testresult.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/test_testsuite.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/test_with_with.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/testsuite.py
-%%PYTHON_SITELIBDIR%%/samba/external/testtools/utils.py
-%%PYTHON_SITELIBDIR%%/samba/gensec.so
-%%PYTHON_SITELIBDIR%%/samba/getopt.py
-%%PYTHON_SITELIBDIR%%/samba/hostconfig.py
-%%PYTHON_SITELIBDIR%%/samba/idmap.py
-%%PYTHON_SITELIBDIR%%/samba/join.py
-%%PYTHON_SITELIBDIR%%/samba/kcc_utils.py
-%%PYTHON_SITELIBDIR%%/samba/messaging.so
-%%PYTHON_SITELIBDIR%%/samba/ms_display_specifiers.py
-%%PYTHON_SITELIBDIR%%/samba/ms_schema.py
-%%PYTHON_SITELIBDIR%%/samba/ndr.py
-%%PYTHON_SITELIBDIR%%/samba/net.so
-%%PYTHON_SITELIBDIR%%/samba/netbios.so
-%%PYTHON_SITELIBDIR%%/samba/netcmd/__init__.py
-%%PYTHON_SITELIBDIR%%/samba/netcmd/common.py
-%%PYTHON_SITELIBDIR%%/samba/netcmd/dbcheck.py
-%%PYTHON_SITELIBDIR%%/samba/netcmd/delegation.py
-%%PYTHON_SITELIBDIR%%/samba/netcmd/dns.py
-%%PYTHON_SITELIBDIR%%/samba/netcmd/domain.py
-%%PYTHON_SITELIBDIR%%/samba/netcmd/drs.py
-%%PYTHON_SITELIBDIR%%/samba/netcmd/dsacl.py
-%%PYTHON_SITELIBDIR%%/samba/netcmd/fsmo.py
-%%PYTHON_SITELIBDIR%%/samba/netcmd/gpo.py
-%%PYTHON_SITELIBDIR%%/samba/netcmd/group.py
-%%PYTHON_SITELIBDIR%%/samba/netcmd/ldapcmp.py
-%%PYTHON_SITELIBDIR%%/samba/netcmd/main.py
-%%PYTHON_SITELIBDIR%%/samba/netcmd/ntacl.py
-%%PYTHON_SITELIBDIR%%/samba/netcmd/processes.py
-%%PYTHON_SITELIBDIR%%/samba/netcmd/rodc.py
-%%PYTHON_SITELIBDIR%%/samba/netcmd/sites.py
-%%PYTHON_SITELIBDIR%%/samba/netcmd/spn.py
-%%PYTHON_SITELIBDIR%%/samba/netcmd/testparm.py
-%%PYTHON_SITELIBDIR%%/samba/netcmd/time.py
-%%PYTHON_SITELIBDIR%%/samba/netcmd/user.py
-%%PYTHON_SITELIBDIR%%/samba/netcmd/vampire.py
-%%PYTHON_SITELIBDIR%%/samba/ntacls.py
-%%PYTHON_SITELIBDIR%%/samba/param.so
-%%PYTHON_SITELIBDIR%%/samba/policy.so
-%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/posix_eadb.so
-%%PYTHON_SITELIBDIR%%/samba/provision/__init__.py
-%%PYTHON_SITELIBDIR%%/samba/provision/backend.py
-%%PYTHON_SITELIBDIR%%/samba/provision/common.py
-%%PYTHON_SITELIBDIR%%/samba/provision/sambadns.py
-%%PYTHON_SITELIBDIR%%/samba/registry.so
-%%PYTHON_SITELIBDIR%%/samba/samba3/__init__.py
-%%PYTHON_SITELIBDIR%%/samba/samba3/libsmb_samba_internal.so
-%%PYTHON_SITELIBDIR%%/samba/samba3/param.so
-%%PYTHON_SITELIBDIR%%/samba/samba3/passdb.so
-%%PYTHON_SITELIBDIR%%/samba/samba3/smbd.so
-%%PYTHON_SITELIBDIR%%/samba/samdb.py
-%%PYTHON_SITELIBDIR%%/samba/schema.py
-%%PYTHON_SITELIBDIR%%/samba/sd_utils.py
-%%PYTHON_SITELIBDIR%%/samba/security.so
-%%PYTHON_SITELIBDIR%%/samba/sites.py
-%%PYTHON_SITELIBDIR%%/samba/smb.so
-%%PYTHON_SITELIBDIR%%/samba/tdb_util.py
-%%PYTHON_SITELIBDIR%%/samba/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/samba/tests/auth.py
-%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/__init__.py
-%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/ndrdump.py
-%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/samba_tool_drs.py
-%%PYTHON_SITELIBDIR%%/samba/tests/common.py
-%%PYTHON_SITELIBDIR%%/samba/tests/core.py
-%%PYTHON_SITELIBDIR%%/samba/tests/credentials.py
-%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/__init__.py
-%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/bare.py
-%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/dnsserver.py
-%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/misc.py
-%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/registry.py
-%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/rpc_talloc.py
-%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/rpcecho.py
-%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/sam.py
-%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/srvsvc.py
-%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/testrpc.py
-%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/unix.py
-%%PYTHON_SITELIBDIR%%/samba/tests/dns.py
-%%PYTHON_SITELIBDIR%%/samba/tests/docs.py
-%%PYTHON_SITELIBDIR%%/samba/tests/dsdb.py
-%%PYTHON_SITELIBDIR%%/samba/tests/gensec.py
-%%PYTHON_SITELIBDIR%%/samba/tests/getopt.py
-%%PYTHON_SITELIBDIR%%/samba/tests/hostconfig.py
-%%PYTHON_SITELIBDIR%%/samba/tests/libsmb_samba_internal.py
-%%PYTHON_SITELIBDIR%%/samba/tests/messaging.py
-%%PYTHON_SITELIBDIR%%/samba/tests/netcmd.py
-%%PYTHON_SITELIBDIR%%/samba/tests/ntacls.py
-%%PYTHON_SITELIBDIR%%/samba/tests/param.py
-%%PYTHON_SITELIBDIR%%/samba/tests/policy.py
-%%PYTHON_SITELIBDIR%%/samba/tests/posixacl.py
-%%PYTHON_SITELIBDIR%%/samba/tests/provision.py
-%%PYTHON_SITELIBDIR%%/samba/tests/registry.py
-%%PYTHON_SITELIBDIR%%/samba/tests/samba3.py
-%%PYTHON_SITELIBDIR%%/samba/tests/samba3sam.py
-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/__init__.py
-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/base.py
-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/gpo.py
-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/group.py
-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/ntacl.py
-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/processes.py
-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/timecmd.py
-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user.py
-%%PYTHON_SITELIBDIR%%/samba/tests/samdb.py
-%%PYTHON_SITELIBDIR%%/samba/tests/security.py
-%%PYTHON_SITELIBDIR%%/samba/tests/source.py
-%%PYTHON_SITELIBDIR%%/samba/tests/strings.py
-%%PYTHON_SITELIBDIR%%/samba/tests/unicodenames.py
-%%PYTHON_SITELIBDIR%%/samba/tests/upgrade.py
-%%PYTHON_SITELIBDIR%%/samba/tests/upgradeprovision.py
-%%PYTHON_SITELIBDIR%%/samba/tests/upgradeprovisionneeddc.py
-%%PYTHON_SITELIBDIR%%/samba/tests/xattr.py
-%%PYTHON_SITELIBDIR%%/samba/upgrade.py
-%%PYTHON_SITELIBDIR%%/samba/upgradehelpers.py
-%%PYTHON_SITELIBDIR%%/samba/web_server/__init__.py
-%%PYTHON_SITELIBDIR%%/samba/xattr.py
-%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/xattr_native.so
-%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/xattr_tdb.so
-@unexec find %D/%%PYTHON_SITELIBDIR%%/samba -name '*.py[co]' -delete >/dev/null 2>&1
-%%DATADIR%%/codepages/lowcase.dat
-%%DATADIR%%/codepages/upcase.dat
-%%DATADIR%%/codepages/valid.dat
-%%AD_DC%%%%DATADIR%%/setup/DB_CONFIG
-%%AD_DC%%%%DATADIR%%/setup/ad-schema/MS-AD_Schema_2K8_Attributes.txt
-%%AD_DC%%%%DATADIR%%/setup/ad-schema/MS-AD_Schema_2K8_Classes.txt
-%%AD_DC%%%%DATADIR%%/setup/ad-schema/MS-AD_Schema_2K8_R2_Attributes.txt
-%%AD_DC%%%%DATADIR%%/setup/ad-schema/MS-AD_Schema_2K8_R2_Classes.txt
-%%AD_DC%%%%DATADIR%%/setup/ad-schema/licence.txt
-%%AD_DC%%%%DATADIR%%/setup/aggregate_schema.ldif
-%%AD_DC%%%%DATADIR%%/setup/cn=replicator.ldif
-%%AD_DC%%%%DATADIR%%/setup/cn=samba-admin.ldif
-%%AD_DC%%%%DATADIR%%/setup/cn=samba.ldif
-%%AD_DC%%%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k0.txt
-%%AD_DC%%%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k3.txt
-%%AD_DC%%%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k3R2.txt
-%%AD_DC%%%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k8.txt
-%%AD_DC%%%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k8R2.txt
-%%AD_DC%%%%DATADIR%%/setup/dns_update_list
-%%AD_DC%%%%DATADIR%%/setup/fedora-ds-init.ldif
-%%AD_DC%%%%DATADIR%%/setup/fedorads-dna.ldif
-%%AD_DC%%%%DATADIR%%/setup/fedorads-index.ldif
-%%AD_DC%%%%DATADIR%%/setup/fedorads-linked-attributes.ldif
-%%AD_DC%%%%DATADIR%%/setup/fedorads-pam.ldif
-%%AD_DC%%%%DATADIR%%/setup/fedorads-partitions.ldif
-%%AD_DC%%%%DATADIR%%/setup/fedorads-refint-add.ldif
-%%AD_DC%%%%DATADIR%%/setup/fedorads-refint-delete.ldif
-%%AD_DC%%%%DATADIR%%/setup/fedorads-samba.ldif
-%%AD_DC%%%%DATADIR%%/setup/fedorads-sasl.ldif
-%%AD_DC%%%%DATADIR%%/setup/fedorads.inf
-%%AD_DC%%%%DATADIR%%/setup/idmap_init.ldif
-%%AD_DC%%%%DATADIR%%/setup/krb5.conf
-%%AD_DC%%%%DATADIR%%/setup/memberof.conf
-%%AD_DC%%%%DATADIR%%/setup/mmr_serverids.conf
-%%AD_DC%%%%DATADIR%%/setup/mmr_syncrepl.conf
-%%AD_DC%%%%DATADIR%%/setup/modules.conf
-%%AD_DC%%%%DATADIR%%/setup/named.conf
-%%AD_DC%%%%DATADIR%%/setup/named.conf.dlz
-%%AD_DC%%%%DATADIR%%/setup/named.conf.update
-%%AD_DC%%%%DATADIR%%/setup/named.txt
-%%AD_DC%%%%DATADIR%%/setup/olc_mmr.conf
-%%AD_DC%%%%DATADIR%%/setup/olc_seed.ldif
-%%AD_DC%%%%DATADIR%%/setup/olc_serverid.conf
-%%AD_DC%%%%DATADIR%%/setup/olc_syncrepl.conf
-%%AD_DC%%%%DATADIR%%/setup/olc_syncrepl_seed.conf
-%%AD_DC%%%%DATADIR%%/setup/prefixMap.txt
-%%AD_DC%%%%DATADIR%%/setup/provision.ldif
-%%AD_DC%%%%DATADIR%%/setup/provision.reg
-%%AD_DC%%%%DATADIR%%/setup/provision.zone
-%%AD_DC%%%%DATADIR%%/setup/provision_basedn.ldif
-%%AD_DC%%%%DATADIR%%/setup/provision_basedn_modify.ldif
-%%AD_DC%%%%DATADIR%%/setup/provision_basedn_options.ldif
-%%AD_DC%%%%DATADIR%%/setup/provision_basedn_references.ldif
-%%AD_DC%%%%DATADIR%%/setup/provision_computers_add.ldif
-%%AD_DC%%%%DATADIR%%/setup/provision_computers_modify.ldif
-%%AD_DC%%%%DATADIR%%/setup/provision_configuration.ldif
-%%AD_DC%%%%DATADIR%%/setup/provision_configuration_basedn.ldif
-%%AD_DC%%%%DATADIR%%/setup/provision_configuration_modify.ldif
-%%AD_DC%%%%DATADIR%%/setup/provision_configuration_references.ldif
-%%AD_DC%%%%DATADIR%%/setup/provision_dns_accounts_add.ldif
-%%AD_DC%%%%DATADIR%%/setup/provision_dns_add_samba.ldif
-%%AD_DC%%%%DATADIR%%/setup/provision_dnszones_add.ldif
-%%AD_DC%%%%DATADIR%%/setup/provision_dnszones_modify.ldif
-%%AD_DC%%%%DATADIR%%/setup/provision_dnszones_partitions.ldif
-%%AD_DC%%%%DATADIR%%/setup/provision_group_policy.ldif
-%%AD_DC%%%%DATADIR%%/setup/provision_init.ldif
-%%AD_DC%%%%DATADIR%%/setup/provision_partitions.ldif
-%%AD_DC%%%%DATADIR%%/setup/provision_privilege.ldif
-%%AD_DC%%%%DATADIR%%/setup/provision_rootdse_add.ldif
-%%AD_DC%%%%DATADIR%%/setup/provision_rootdse_modify.ldif
-%%AD_DC%%%%DATADIR%%/setup/provision_schema_basedn.ldif
-%%AD_DC%%%%DATADIR%%/setup/provision_schema_basedn_modify.ldif
-%%AD_DC%%%%DATADIR%%/setup/provision_self_join.ldif
-%%AD_DC%%%%DATADIR%%/setup/provision_self_join_config.ldif
-%%AD_DC%%%%DATADIR%%/setup/provision_self_join_modify.ldif
-%%AD_DC%%%%DATADIR%%/setup/provision_self_join_modify_config.ldif
-%%AD_DC%%%%DATADIR%%/setup/provision_users.ldif
-%%AD_DC%%%%DATADIR%%/setup/provision_users_add.ldif
-%%AD_DC%%%%DATADIR%%/setup/provision_users_modify.ldif
-%%AD_DC%%%%DATADIR%%/setup/provision_well_known_sec_princ.ldif
-%%AD_DC%%%%DATADIR%%/setup/refint.conf
-%%AD_DC%%%%DATADIR%%/setup/schema-map-fedora-ds-1.0
-%%AD_DC%%%%DATADIR%%/setup/schema-map-openldap-2.3
-%%AD_DC%%%%DATADIR%%/setup/schema_samba4.ldif
-%%AD_DC%%%%DATADIR%%/setup/secrets.ldif
-%%AD_DC%%%%DATADIR%%/setup/secrets_dns.ldif
-%%AD_DC%%%%DATADIR%%/setup/secrets_init.ldif
-%%AD_DC%%%%DATADIR%%/setup/secrets_sasl_ldap.ldif
-%%AD_DC%%%%DATADIR%%/setup/secrets_simple_ldap.ldif
-%%AD_DC%%%%DATADIR%%/setup/share.ldif
-%%AD_DC%%%%DATADIR%%/setup/slapd.conf
-%%AD_DC%%%%DATADIR%%/setup/spn_update_list
-%%AD_DC%%%%DATADIR%%/setup/ypServ30.ldif
-man/man1/dbwrap_tool.1.gz
-man/man1/findsmb.1.gz
-man/man1/gentest.1.gz
-man/man1/locktest.1.gz
-man/man1/log2pcap.1.gz
-man/man1/masktest.1.gz
-man/man1/ndrdump.1.gz
-man/man1/nmblookup.1.gz
-man/man1/nmblookup4.1.gz
-man/man1/ntlm_auth.1.gz
-man/man1/oLschema2ldif.1.gz
-man/man1/profiles.1.gz
-man/man1/regdiff.1.gz
-man/man1/regpatch.1.gz
-man/man1/regshell.1.gz
-man/man1/regtree.1.gz
-man/man1/rpcclient.1.gz
-man/man1/sharesec.1.gz
-man/man1/smbcacls.1.gz
-man/man1/smbclient.1.gz
-man/man1/smbcontrol.1.gz
-man/man1/smbcquotas.1.gz
-man/man1/smbget.1.gz
-man/man1/smbstatus.1.gz
-man/man1/smbtar.1.gz
-man/man1/smbtorture.1.gz
-man/man1/smbtree.1.gz
-man/man1/testparm.1.gz
-man/man1/vfstest.1.gz
-man/man1/wbinfo.1.gz
-man/man5/lmhosts.5.gz
-man/man5/pam_winbind.conf.5.gz
-man/man5/smb.conf.5.gz
-man/man5/smb4.conf.5.gz
-man/man5/smbgetrc.5.gz
-man/man5/smbpasswd.5.gz
-man/man7/samba.7.gz
-man/man7/winbind_krb5_locator.7.gz
-man/man8/eventlogadm.8.gz
-man/man8/idmap_ad.8.gz
-man/man8/idmap_autorid.8.gz
-man/man8/idmap_hash.8.gz
-man/man8/idmap_ldap.8.gz
-man/man8/idmap_nss.8.gz
-man/man8/idmap_rfc2307.8.gz
-man/man8/idmap_rid.8.gz
-man/man8/idmap_tdb.8.gz
-man/man8/idmap_tdb2.8.gz
-man/man8/net.8.gz
-man/man8/nmbd.8.gz
-man/man8/pam_winbind.8.gz
-man/man8/pdbedit.8.gz
-man/man8/samba-regedit.8.gz
-man/man8/samba-tool.8.gz
-man/man8/samba.8.gz
-man/man8/smbd.8.gz
-man/man8/smbpasswd.8.gz
-man/man8/smbspool.8.gz
-man/man8/smbta-util.8.gz
-man/man8/vfs_acl_tdb.8.gz
-man/man8/vfs_acl_xattr.8.gz
-man/man8/vfs_aio_fork.8.gz
-man/man8/vfs_aio_linux.8.gz
-man/man8/vfs_aio_pthread.8.gz
-man/man8/vfs_audit.8.gz
-man/man8/vfs_btrfs.8.gz
-man/man8/vfs_cacheprime.8.gz
-man/man8/vfs_cap.8.gz
-man/man8/vfs_catia.8.gz
-man/man8/vfs_commit.8.gz
-man/man8/vfs_crossrename.8.gz
-man/man8/vfs_default_quota.8.gz
-man/man8/vfs_dirsort.8.gz
-man/man8/vfs_extd_audit.8.gz
-man/man8/vfs_fake_perms.8.gz
-man/man8/vfs_fileid.8.gz
-man/man8/vfs_full_audit.8.gz
-man/man8/vfs_glusterfs.8.gz
-man/man8/vfs_gpfs.8.gz
-man/man8/vfs_linux_xfs_sgid.8.gz
-man/man8/vfs_media_harmony.8.gz
-man/man8/vfs_netatalk.8.gz
-man/man8/vfs_notify_fam.8.gz
-man/man8/vfs_prealloc.8.gz
-man/man8/vfs_preopen.8.gz
-man/man8/vfs_readahead.8.gz
-man/man8/vfs_readonly.8.gz
-man/man8/vfs_recycle.8.gz
-man/man8/vfs_scannedonly.8.gz
-man/man8/vfs_shadow_copy.8.gz
-man/man8/vfs_shadow_copy2.8.gz
-man/man8/vfs_smb_traffic_analyzer.8.gz
-man/man8/vfs_streams_depot.8.gz
-man/man8/vfs_streams_xattr.8.gz
-man/man8/vfs_syncops.8.gz
-man/man8/vfs_time_audit.8.gz
-man/man8/vfs_tsmsm.8.gz
-man/man8/vfs_xattr_tdb.8.gz
-man/man8/winbindd.8.gz
-@dir lib/shared-modules/perfcount
-@dir lib/shared-modules/pdb
-@dir lib/shared-modules/gpext
-@dir /var/run/samba4
-@dir /var/log/samba4
-@dir /var/db/samba4/private
-@dir /var/db/samba4
author	Rene Ladan <rene@FreeBSD.org>	2016-05-16 13:09:43 +0000
committer	Rene Ladan <rene@FreeBSD.org>	2016-05-16 13:09:43 +0000
commit	c14b1a5d9fba73fa212a8761d64da8a74391ab63 (patch)
tree	f3cdb7db11873de7f8f45bb731adb28472f04852 /net
parent	Update devel/elixir-apex to version 0.5.0. (diff)