- Update to 3.0.3.r1

- Rewrite libsmbclient port to not conflict with samba port, stop installing
  libsmbclient in samba port
- Split out python extensions into standalone port

PR:		ports/65976
Submitted by:	Timur I. Bakeyev <timur@gnu.org> (samba-devel maintainer)
Approved by:	Koop Mast (samba-libsmbclient maintainer)

9 files changed, 227 insertions, 332 deletions

diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index d880b79fd326..5a2bbb5e8ea8 100644
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -5,65 +5,62 @@
 # $FreeBSD$
 #
 
-PORTNAME=	samba
-PORTVERSION=	3.0.3.p2
-PORTREVISION?=	1
-PORTEPOCH?=	1
-CATEGORIES?=	net
-MASTER_SITES=	${MASTER_SITE_SAMBA}
-MASTER_SITE_SUBDIR=	pre rc .
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.p/pre/:S/.r/rc/}
-
-MAINTAINER?=	timur@gnu.org
-COMMENT?=	A free SMB and CIFS client and server for UNIX
-
-CONFLICTS?=	ja-samba-2.* samba-2.* sharity-light-1.* samba-libsmbclient-3.*
-
-USE_BZIP2=	yes
-USE_ICONV=	yes
-# directories
-VARDIR=		${DESTDIR}/var
-SAMBA_SPOOL?=	${VARDIR}/spool/samba
-SAMBA_LOGDIR=	${VARDIR}/log/samba
-SAMBA_RUNDIR=	${VARDIR}/run
-SAMBA_LOCKDIR=	${SAMBA_RUNDIR}/samba
-SAMBA_PRIVATE?=	${PREFIX}/private
-SAMBA_CONFDIR?=	${PREFIX}/etc
-SAMBA_SWATDIR=	${PREFIX}/share/swat
-SAMBA_LIBDIR=	${PREFIX}/lib
-RC_DIR?=	${SAMBA_CONFDIR}/rc.d
-SAMBA_CONFIG=	${SAMBA_CONFDIR}/smb.conf
-
-CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include \
-		LDFLAGS=-L${LOCALBASE}/lib
-
-CONFIGURE_ARGS+=--exec-prefix=${PREFIX} \
-		--localstatedir=${VARDIR} \
-		--with-configdir=${SAMBA_CONFDIR} \
-		--with-libdir=${SAMBA_LIBDIR}/samba \
-		--with-swatdir=${SAMBA_SWATDIR} \
-		--with-piddir=${SAMBA_RUNDIR} --with-lockdir=${SAMBA_LOCKDIR} \
-		--with-privatedir=${SAMBA_PRIVATE} \
-		--with-logfilebase=${SAMBA_LOGDIR} \
-		--with-manpages-langs=en
-
-CONFIGURE_ARGS+=--with-libiconv=${LOCALBASE}
-
-WRKSRC=		${WRKDIR}/${DISTNAME}/source
-
-# SUBPORTS end here
-.if defined(SAMBA_SUBPORT)
-.include <bsd.port.mk>
-.else
-
-NO_LATEST_LINK=	yes
-INSTALLS_SHLIB=	yes
-USE_RC_SUBR=	yes
+PORTNAME=		samba
+PORTVERSION=		3.0.3.r1
+PORTREVISION?=		0
+PORTEPOCH?=		1
+CATEGORIES?=		net
+MASTER_SITES=		${MASTER_SITE_SAMBA}
+MASTER_SITE_SUBDIR=	rc . pre
+DISTNAME=		${PORTNAME}-${PORTVERSION:S/.p/pre/:S/.r/rc/}
+
+MAINTAINER?=		timur@gnu.org
+COMMENT?=		A free SMB and CIFS client and server for UNIX
+
+CONFLICTS?=		ja-samba-2.* samba-2.* sharity-light-1.*
+
+USE_BZIP2=		yes
+USE_ICONV=		yes
 USE_AUTOCONF_VER=	253
 
-OPTIONS=	CUPS		"With CUPS printing support" on \
-		LDAP		"With LDAP support" on \
-		ADS		"With Active Directory support" on \
+LATEST_LINK?=		${PKGNAMEPREFIX}${PORTNAME}-3${PKGNAMESUFFIX}
+EXAMPLESDIR=		${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}-3${PKGNAMESUFFIX}
+WRKSRC=			${WRKDIR}/${DISTNAME}/source
+
+# directories
+VARDIR=			${DESTDIR}/var
+SAMBA_SPOOL?=		${VARDIR}/spool/samba
+SAMBA_LOGDIR=		${VARDIR}/log/samba
+SAMBA_RUNDIR=		${VARDIR}/run
+SAMBA_LOCKDIR=		${SAMBA_RUNDIR}/samba
+SAMBA_PRIVATE?=		${PREFIX}/private
+SAMBA_CONFDIR?=		${PREFIX}/etc
+SAMBA_SWATDIR=		${PREFIX}/share/swat
+SAMBA_LIBDIR=		${PREFIX}/lib
+RC_DIR?=		${SAMBA_CONFDIR}/rc.d
+SAMBA_CONFIG=		${SAMBA_CONFDIR}/smb.conf
+
+CONFIGURE_ENV+=		CPPFLAGS=-I${LOCALBASE}/include \
+			LDFLAGS=-L${LOCALBASE}/lib
+
+CONFIGURE_ARGS+=	--exec-prefix=${PREFIX} \
+			--localstatedir=${VARDIR} \
+		        --with-configdir=${SAMBA_CONFDIR} \
+	    		--with-libdir=${SAMBA_LIBDIR}/samba \
+			--with-swatdir=${SAMBA_SWATDIR} \
+			--with-piddir=${SAMBA_RUNDIR} \
+			--with-lockdir=${SAMBA_LOCKDIR} \
+			--with-privatedir=${SAMBA_PRIVATE} \
+			--with-logfilebase=${SAMBA_LOGDIR} \
+			--with-manpages-langs=en
+
+CONFIGURE_ARGS+=	--with-libiconv=${LOCALBASE}
+
+OPTIONS=	LDAP		"With LDAP support" on \
+		ADS		"With Active Directory support" on
+
+.if !defined(SAMBA_SUBPORT)
+OPTIONS+=	CUPS		"With CUPS printing support" on \
 		WINBIND		"With WinBIND support" on \
 		ACL_SUPPORT	"With ACL support" off \
 		SYSLOG		"With Syslog support" off \
@@ -75,26 +72,17 @@ OPTIONS=	CUPS		"With CUPS printing support" on \
 		SAM_PGSQL	"With PostgreSQL smbpasswd backend" off \
 		SAM_OLD_LDAP	"With Samba2.x LDAP smbpasswd backend" off \
 		PAM_SMBPASS	"With SMB PAM module" off \
-		CRACKLIB	"With Cracklib password verification" off \
-		PYTHON		"With Python experimental bindings" off \
 		POPT		"With installed POPT library" on
+.endif
 
 .include <bsd.port.pre.mk>
 
+.if !defined(SAMBA_SUBPORT)
+
+USE_RC_SUBR=		yes
+
 CONFIGURE_ARGS+=	--with-pam --with-readline --with-sendfile-support \
-			--with-libsmbclient
-
-.if defined(WITH_PYTHON)
-USE_PYTHON=		2.1+
-# Hack to make it work with OPTIONS. Breaks portlint
-.include "${PORTSDIR}/Mk/bsd.python.mk"
-CONFIGURE_ARGS+=	--with-python
-PLIST_SUB+=		PYTHON="" \
-			PYTHON_VERSION=${PYTHON_VERSION}
-.else
-CONFIGURE_ARGS+=	--without-python
-PLIST_SUB+=		PYTHON="@comment "
-.endif
+			--without-libsmbclient --without-python
 
 .if defined(WITH_CUPS)
 LIB_DEPENDS+=		cups.2:${PORTSDIR}/print/cups-base
@@ -113,6 +101,8 @@ CONFIGURE_ARGS+=	--without-syslog
 
 .if defined(WITH_QUOTAS)
 CONFIGURE_ARGS+=	--with-quotas
+.else
+CONFIGURE_ARGS+=	--without-quotas
 .endif
 
 .if defined(WITHOUT_UTMP)
@@ -140,21 +130,11 @@ PLIST_SUB+=		WINBIND_NSS=""
 PLIST_SUB+=		WINBIND_NSS="@comment "
 .endif
 
-.if !defined(WITHOUT_ADS)
-WANT_LDAP=		yes
-WANT_KRB5=		yes
-CONFIGURE_ARGS+=	--with-ads
-.else
-CONFIGURE_ARGS+=	--without-ads
-.endif
-
 .if !defined(WITHOUT_LDAP)
 WANT_LDAP=		yes
 .endif
-
 # SAM
 .if defined(WITH_SAM_XML)
-#USE_GNOME=		libxml2
 LIB_DEPENDS+=		xml2.5:${PORTSDIR}/textproc/libxml2
 CONFIGURE_ARGS+=	--with-xml-prefix=${LOCALBASE}
 WANT_EXPSAM_MODULES+=	xml
@@ -193,7 +173,38 @@ WANT_EXPSAM_MODULES!=	${ECHO_CMD} ${WANT_EXPSAM_MODULES} | ${SED} -e 's/ /,/g'
 CONFIGURE_ARGS+=	--with-expsam=${WANT_EXPSAM_MODULES}
 .endif
 # SAM
+.if defined(WITH_PAM_SMBPASS)
+CONFIGURE_ARGS+=	--with-pam_smbpass
+PLIST_SUB+=		SMBPASS=""
+.else
+CONFIGURE_ARGS+=	--without-pam_smbpass
+PLIST_SUB+=		SMBPASS="@comment "
+.endif
+
+.if defined(WITH_ACL_SUPPORT)
+.if ${OSVERSION} < 500018
+BROKEN=			"Requires FreeBSD 5.x at least after 20010326"
+.else
+CONFIGURE_ARGS+=	--with-acl-support
+.endif
+.endif
+
+.if !defined(WITHOUT_POPT)
+LIB_DEPENDS+=		popt.0:${PORTSDIR}/devel/popt
+.else
+CONFIGURE_ARGS+=	--with-included-popt
+.endif
+# !SAMBA_SUBPORT
+.endif
 
+# Common part
+.if !defined(WITHOUT_ADS)
+WANT_LDAP=		yes
+WANT_KRB5=		yes
+CONFIGURE_ARGS+=	--with-ads
+.else
+CONFIGURE_ARGS+=	--without-ads
+.endif
 # Kerberos5 is necessary for ADS
 .if defined(WANT_KRB5)
 .if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a)
@@ -222,34 +233,7 @@ CONFIGURE_ARGS+=	--with-ldap
 CONFIGURE_ARGS+=	--without-ldap
 .endif
 
-.if defined(WITH_PAM_SMBPASS)
-CONFIGURE_ARGS+=	--with-pam_smbpass
-PLIST_SUB+=		SMBPASS=""
-.else
-CONFIGURE_ARGS+=	--without-pam_smbpass
-PLIST_SUB+=		SMBPASS="@comment "
-.endif
-
-.if defined(WITH_CRACKLIB)
-LIB_DEPENDS+=		crack.1:${PORTSDIR}/security/cracklib
-CONFIGURE_ARGS+=	--with-cracklib=${LOCALBASE}/libdata/cracklib/pw_dict
-.else
-CONFIGURE_ARGS+=	--without-cracklib
-.endif
-
-.if defined(WITH_ACL_SUPPORT)
-.if ${OSVERSION} < 500018
-BROKEN=			"Requires FreeBSD 5.x at least after 20010326"
-.else
-CONFIGURE_ARGS+=	--with-acl-support
-.endif
-.endif
-
-.if !defined(WITHOUT_POPT)
-LIB_DEPENDS+=		popt.0:${PORTSDIR}/devel/popt
-.else
-CONFIGURE_ARGS+=	--with-included-popt
-.endif
+.if !defined(SAMBA_SUBPORT)
 
 MLINKS=		samba.7 Samba.7
 MAN1=		findsmb.1 nmblookup.1 log2pcap.1 rpcclient.1 \
@@ -292,6 +276,7 @@ pre-fetch:
 
 post-patch:
 	@${FIND} ${WRKSRC} -name CVS -o -name .cvsignore | ${XARGS} ${RM}
+	@${RM} -rf ${WRKDIR}/${DISTNAME}/examples/libsmbclient
 
 post-install:
 .for sect in 1 5 7 8
@@ -306,12 +291,6 @@ post-install:
 	@${MKDIR} ${EXAMPLESDIR}/pam_smbpass
 	@${CP} -Rp ${WRKSRC}/pam_smbpass/samples/* ${EXAMPLESDIR}/pam_smbpass
 .endif
-.if defined(WITH_PYTHON)
-	@${MKDIR} ${PREFIX}/lib/${PYTHON_VERSION}/site-packages
-	@${CP} -R ${WRKSRC}/build/lib.*/samba ${PREFIX}/lib/${PYTHON_VERSION}/site-packages
-	@${MKDIR} ${EXAMPLESDIR}/python
-	@${CP} -Rp ${WRKSRC}/python/examples/* ${EXAMPLESDIR}/python
-.endif
 	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/}	\
 	    ${FILESDIR}/samba.sh.sample | ${WINBIND_FILTER} > ${WRKDIR}/samba.sh
 	${INSTALL_SCRIPT} ${WRKDIR}/samba.sh ${RC_DIR}/samba.sh
@@ -319,14 +298,14 @@ post-install:
 		${FILESDIR}/smb.conf.default > ${WRKDIR}/smb.conf.default
 	${INSTALL_DATA} ${WRKDIR}/smb.conf.default ${SAMBA_CONFIG}.default
 	${INSTALL_SCRIPT} ${WRKSRC}/script/mksmbpasswd.sh ${PREFIX}/bin/make_smbpasswd
-	# Spool
+# Spool
 	@test -d ${SAMBA_SPOOL} || ${MKDIR} ${SAMBA_SPOOL} &&		\
 	    ${CHMOD} 1777 ${SAMBA_SPOOL} && ${CHOWN} root:wheel ${SAMBA_SPOOL}
 	@${ECHO_CMD} "@exec ${MKDIR} ${SAMBA_SPOOL} 2>/dev/null || true" >> ${TMPPLIST}
 	@${ECHO_CMD} "@exec ${CHMOD} 1777 ${SAMBA_SPOOL}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@exec ${CHOWN} root:wheel ${SAMBA_SPOOL}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${RM} -rf ${SAMBA_SPOOL}" >> ${TMPPLIST}
-	# Logdir
+# Logdir
 	@test -d ${SAMBA_LOGDIR} || ${MKDIR} ${SAMBA_LOGDIR} &&		\
 	    ${CHMOD} 0755 ${SAMBA_LOGDIR} && ${CHOWN} root:wheel ${SAMBA_LOGDIR}
 	@${ECHO_CMD} "@exec ${MKDIR} ${SAMBA_LOGDIR} 2>/dev/null || true" >> ${TMPPLIST}
@@ -334,17 +313,17 @@ post-install:
 	@${ECHO_CMD} "@exec ${CHOWN} root:wheel ${SAMBA_LOGDIR}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${RMDIR} ${SAMBA_LOGDIR} 2>/dev/null || true" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${ECHO_CMD} \"Warning: If you will *NOT* use this package anymore, please remove ${SAMBA_LOGDIR}/* manually.\"" >> ${TMPPLIST}
-	# Lockdir
+# Lockdir
 	@test -d ${SAMBA_LOCKDIR} || ${MKDIR} ${SAMBA_LOCKDIR} &&	\
 	    ${CHMOD} 0755 ${SAMBA_LOCKDIR} && ${CHOWN} root:wheel ${SAMBA_LOCKDIR}
 	@${ECHO_CMD} "@exec ${MKDIR} ${SAMBA_LOCKDIR} 2>/dev/null || true" >> ${TMPPLIST}
 	@${ECHO_CMD} "@exec ${CHMOD} 0755 ${SAMBA_LOCKDIR}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@exec ${CHOWN} root:wheel ${SAMBA_LOCKDIR}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${RM} -rf ${SAMBA_LOCKDIR}/printing" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec for file in `${LS} ${SAMBA_LOCKDIR} | ${GREP} -v '^winbindd_'`; do ${RM} -rf ${SAMBA_LOCKDIR}/${file}; done" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec for f in \`${LS} ${SAMBA_LOCKDIR} | ${GREP} -v '^winbindd_'\`; do ${RM} -rf ${SAMBA_LOCKDIR}/${f}; done" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${RMDIR} ${SAMBA_LOCKDIR} 2>/dev/null || true" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${ECHO_CMD} \"Warning: If you will *NOT* use this package anymore, please remove ${SAMBA_LOCKDIR}/* manually.\"" >> ${TMPPLIST}
-	# Private
+# Private
 	@test -d ${SAMBA_PRIVATE} || ${MKDIR} ${SAMBA_PRIVATE} &&	\
 	    ${CHMOD} 700 ${SAMBA_PRIVATE} && ${CHOWN} root:wheel ${SAMBA_PRIVATE}
 	@${ECHO_CMD} "@exec ${MKDIR} ${SAMBA_PRIVATE} 2>/dev/null || true" >> ${TMPPLIST}
@@ -362,7 +341,6 @@ post-install:
 .if defined(WITH_PAM_SMBPASS)
 	@${INSTALL_PROGRAM} ${WRKSRC}/bin/pam_smbpass.so ${SAMBA_LIBDIR}
 .endif
-	-@${LN} -snf libsmbclient.so.0 ${SAMBA_LIBDIR}/libsmbclient.so
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${DOCSDIR}
@@ -376,7 +354,7 @@ post-install:
 			${WRKDIR}/${DISTNAME}/docs/history ; do		\
 		${INSTALL_DATA} $$i ${DOCSDIR} ;			\
 	done
-	for i in faq Registry htmldocs htmldocs/images ; do		\
+	for i in registry htmldocs htmldocs/images ; do		\
 		${MKDIR} ${DOCSDIR}/$$i ;				\
 		for j in ${WRKDIR}/${DISTNAME}/docs/$$i/* ; do		\
 		    if [ -f $$j ]; then					\
@@ -387,6 +365,7 @@ post-install:
 .endif
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
-
+# !SAMBA_SUBPORT
 .endif
+
+.include <bsd.port.post.mk>
diff --git a/net/samba3/distinfo b/net/samba3/distinfo
index 9027a722700f..de4a691f65b0 100644
--- a/net/samba3/distinfo
+++ b/net/samba3/distinfo
@@ -1,2 +1,2 @@
-MD5 (samba-3.0.3pre2.tar.bz2) = 47464715c375bf4b17453dc534337111
-SIZE (samba-3.0.3pre2.tar.bz2) = 9347649
+MD5 (samba-3.0.3rc1.tar.bz2) = 40c90201667db61fdd5217ea728c7580
+SIZE (samba-3.0.3rc1.tar.bz2) = 9770501
diff --git a/net/samba3/files/patch-configure.in b/net/samba3/files/patch-configure.in
index 88a46040b022..d8b892f83ca4 100644
--- a/net/samba3/files/patch-configure.in
+++ b/net/samba3/files/patch-configure.in
@@ -1,13 +1,5 @@
 --- configure.in.orig	Sun Apr  4 09:37:25 2004
 +++ configure.in	Mon Apr  5 21:21:58 2004
-@@ -2983,7 +2983,6 @@
- 
- 
- dictpath="/usr/lib/cracklib_dict"
--with_cracklib=yes
- ###############################################
- # test for where we get FaciestCheck from
- AC_MSG_CHECKING(where to use cracklib from (default=$dictpath))
 @@ -4118,6 +4117,8 @@
  		# the Linux version.
  		WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_freebsd.o \
diff --git a/net/samba3/files/patch-python_setup.py b/net/samba3/files/patch-python_setup.py
deleted file mode 100644
index fb7a58cf43d9..000000000000
--- a/net/samba3/files/patch-python_setup.py
+++ /dev/null
@@ -1,12 +0,0 @@
---- python/setup.py.orig	Thu Mar  4 05:28:18 2004
-+++ python/setup.py	Thu Mar  4 05:29:35 2004
-@@ -57,6 +57,9 @@
-     if lib[0:2] == "-L":
-         library_dirs.append(lib[2:])
-         continue
-+    if lib[0:2] == "-W":
-+	# Skip linker flags
-+	continue
-     print "Unknown entry '%s' in $LIBS variable passed to setup.py" % lib
-     sys.exit(1)
- 
diff --git a/net/samba3/files/patch-smbd_chgpasswd.c b/net/samba3/files/patch-smbd_chgpasswd.c
deleted file mode 100644
index 104ead0ff325..000000000000
--- a/net/samba3/files/patch-smbd_chgpasswd.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- smbd/chgpasswd.c.orig	Mon Apr  5 21:33:21 2004
-+++ smbd/chgpasswd.c	Mon Apr  5 21:33:34 2004
-@@ -49,7 +49,6 @@
- #include "includes.h"
- 
- #ifdef HAVE_WORKING_CRACKLIB
--#include <crack.h>
- 
- #ifndef HAVE_CRACKLIB_DICTPATH
- #ifndef CRACKLIB_DICTPATH
diff --git a/net/samba3/files/patch-tests_crack.c b/net/samba3/files/patch-tests_crack.c
deleted file mode 100644
index 6d62851c7d7d..000000000000
--- a/net/samba3/files/patch-tests_crack.c
+++ /dev/null
@@ -1,8 +0,0 @@
---- tests/crack.c.orig	Sat Apr  3 18:04:05 2004
-+++ tests/crack.c	Sat Apr  3 01:12:18 2004
-@@ -1,5 +1,3 @@
--#include <crack.h>
--
- #ifndef HAVE_CRACKLIB_DICTPATH
- #ifndef CRACKLIB_DICTPATH
- #define CRACKLIB_DICTPATH SAMBA_CRACKLIB_DICTPATH
diff --git a/net/samba3/files/smb.conf.default b/net/samba3/files/smb.conf.default
index 884ae9bef071..860441415069 100644
--- a/net/samba3/files/smb.conf.default
+++ b/net/samba3/files/smb.conf.default
@@ -3,7 +3,7 @@
 # here. Samba has a huge number of configurable options (perhaps too
 # many!) most of which are not shown in this example
 #
-# For a step by step guide on installing, configuring and using Samba, 
+# For a step by step guide on installing, configuring and using samba, 
 # read the Samba HOWTO Collection.
 #
 # Any line which starts with a ; (semi-colon) or a # (hash) 
diff --git a/net/samba3/pkg-descr b/net/samba3/pkg-descr
index b49d3d9ac57c..28f431acf0f7 100644
--- a/net/samba3/pkg-descr
+++ b/net/samba3/pkg-descr
@@ -2,9 +2,9 @@ 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.
+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.
diff --git a/net/samba3/pkg-plist b/net/samba3/pkg-plist
index d4bb1f250d2d..9bad1795baf2 100644
--- a/net/samba3/pkg-plist
+++ b/net/samba3/pkg-plist
@@ -28,7 +28,6 @@ sbin/smbd
 sbin/nmbd
 sbin/swat
 %%WINBIND%%sbin/winbindd
-include/libsmbclient.h
 lib/samba/lowcase.dat
 lib/samba/upcase.dat
 lib/samba/valid.dat
@@ -54,24 +53,10 @@ lib/samba/charset/CP850.so
 %%SAMMYSQL%%lib/samba/pdb/mysql.so
 %%SAMPGSQL%%lib/samba/pdb/pgsql.so
 %%SAMXML%%lib/samba/pdb/xml.so
-lib/libsmbclient.a
-lib/libsmbclient.so
-lib/libsmbclient.so.0
 %%WINBIND_NSS%%lib/nss_winbind.so.1
 %%WINBIND_NSS%%lib/nss_wins.so.1
 %%WINBIND%%lib/pam_winbind.so
 %%SMBPASS%%lib/pam_smbpass.so
-%%PYTHON%%lib/%%PYTHON_VERSION%%/site-packages/samba/__init__.py
-%%PYTHON%%lib/%%PYTHON_VERSION%%/site-packages/samba/lsa.so
-%%PYTHON%%lib/%%PYTHON_VERSION%%/site-packages/samba/printerdata.py
-%%PYTHON%%lib/%%PYTHON_VERSION%%/site-packages/samba/samr.so
-%%PYTHON%%lib/%%PYTHON_VERSION%%/site-packages/samba/smb.so
-%%PYTHON%%lib/%%PYTHON_VERSION%%/site-packages/samba/spoolss.so
-%%PYTHON%%lib/%%PYTHON_VERSION%%/site-packages/samba/srvsvc.so
-%%PYTHON%%lib/%%PYTHON_VERSION%%/site-packages/samba/tdb.so
-%%PYTHON%%lib/%%PYTHON_VERSION%%/site-packages/samba/tdbpack.so
-%%PYTHON%%lib/%%PYTHON_VERSION%%/site-packages/samba/winbind.so
-%%PYTHON%%lib/%%PYTHON_VERSION%%/site-packages/samba/winreg.so
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/Manifest
 %%PORTDOCS%%%%DOCSDIR%%/README
@@ -81,21 +66,14 @@ lib/libsmbclient.so.0
 %%PORTDOCS%%%%DOCSDIR%%/THANKS
 %%PORTDOCS%%%%DOCSDIR%%/WHATSNEW.txt
 %%PORTDOCS%%%%DOCSDIR%%/history
-%%PORTDOCS%%%%DOCSDIR%%/faq/FAQ-ClientApp.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/FAQ-Install.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/FAQ-errors.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/FAQ-features.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/FAQ-general.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/samba-faq.html
 %%PORTDOCS%%%%DOCSDIR%%/htmldocs/AccessControls.html
 %%PORTDOCS%%%%DOCSDIR%%/htmldocs/AdvancedNetworkManagement.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/Appendixes.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/Appendix.html
 %%PORTDOCS%%%%DOCSDIR%%/htmldocs/Backup.html
 %%PORTDOCS%%%%DOCSDIR%%/htmldocs/CUPS-printing.html
 %%PORTDOCS%%%%DOCSDIR%%/htmldocs/ClientConfig.html
 %%PORTDOCS%%%%DOCSDIR%%/htmldocs/DNSDHCP.html
 %%PORTDOCS%%%%DOCSDIR%%/htmldocs/FastStart.html
-%%PORTDOCS%%%%DOCSDIR%%/htmldocs/Further-Resources.html
 %%PORTDOCS%%%%DOCSDIR%%/htmldocs/InterdomainTrusts.html
 %%PORTDOCS%%%%DOCSDIR%%/htmldocs/IntroSMB.html
 %%PORTDOCS%%%%DOCSDIR%%/htmldocs/NT4Migration.html
@@ -117,6 +95,7 @@ lib/libsmbclient.so.0
 %%PORTDOCS%%%%DOCSDIR%%/htmldocs/domain-member.html
 %%PORTDOCS%%%%DOCSDIR%%/htmldocs/editreg.1.html
 %%PORTDOCS%%%%DOCSDIR%%/htmldocs/findsmb.1.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/go01.html
 %%PORTDOCS%%%%DOCSDIR%%/htmldocs/groupmapping.html
 %%PORTDOCS%%%%DOCSDIR%%/htmldocs/index.html
 %%PORTDOCS%%%%DOCSDIR%%/htmldocs/install.html
@@ -139,6 +118,7 @@ lib/libsmbclient.so.0
 %%PORTDOCS%%%%DOCSDIR%%/htmldocs/pdbedit.8.html
 %%PORTDOCS%%%%DOCSDIR%%/htmldocs/pr01.html
 %%PORTDOCS%%%%DOCSDIR%%/htmldocs/pr02.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/pr03.html
 %%PORTDOCS%%%%DOCSDIR%%/htmldocs/printing.html
 %%PORTDOCS%%%%DOCSDIR%%/htmldocs/problems.html
 %%PORTDOCS%%%%DOCSDIR%%/htmldocs/profiles.1.html
@@ -212,51 +192,25 @@ lib/libsmbclient.so.0
 %%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/pdftoepsonusb.png
 %%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/pdftosocket.png
 %%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/trusts1.png
-%%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/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/WinXP_SignOrSeal.reg
-%%PORTDOCS%%%%DOCSDIR%%/Registry/WindowsTerminalServer.reg
+%%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/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/WinXP_SignOrSeal.reg
+%%PORTDOCS%%%%DOCSDIR%%/registry/WindowsTerminalServer.reg
 %%SMBPASS%%%%EXAMPLESDIR%%/pam_smbpass/README
 %%SMBPASS%%%%EXAMPLESDIR%%/pam_smbpass/kdc-pdc
 %%SMBPASS%%%%EXAMPLESDIR%%/pam_smbpass/password-mature
 %%SMBPASS%%%%EXAMPLESDIR%%/pam_smbpass/password-migration
 %%SMBPASS%%%%EXAMPLESDIR%%/pam_smbpass/password-sync
-%%PYTHON%%%%EXAMPLESDIR%%/python/tdbpack/oldtdbutil.py
-%%PYTHON%%%%EXAMPLESDIR%%/python/tdbpack/tdbtimetrial.py
-%%PYTHON%%%%EXAMPLESDIR%%/python/tdbpack/test_tdbpack.py
-%%PYTHON%%%%EXAMPLESDIR%%/python/spoolss/changeid.py
-%%PYTHON%%%%EXAMPLESDIR%%/python/spoolss/enumprinters.py
-%%PYTHON%%%%EXAMPLESDIR%%/python/spoolss/psec.py
-%%EXAMPLESDIR%%/pdb/Makefile
-%%EXAMPLESDIR%%/pdb/README
-%%EXAMPLESDIR%%/pdb/mysql/mysql.dump
-%%EXAMPLESDIR%%/pdb/mysql/smb.conf
-%%EXAMPLESDIR%%/pdb/pdb_test.c
-%%EXAMPLESDIR%%/pdb/sambapdb.dtd
-%%EXAMPLESDIR%%/validchars/msdos70.out
-%%EXAMPLESDIR%%/validchars/nwdos70.out
-%%EXAMPLESDIR%%/validchars/readme
-%%EXAMPLESDIR%%/validchars/validchr.c
-%%EXAMPLESDIR%%/validchars/validchr.com
-%%EXAMPLESDIR%%/tridge/README
-%%EXAMPLESDIR%%/tridge/smb.conf
-%%EXAMPLESDIR%%/tridge/smb.conf.WinNT
-%%EXAMPLESDIR%%/tridge/smb.conf.fjall
-%%EXAMPLESDIR%%/tridge/smb.conf.lapland
-%%EXAMPLESDIR%%/tridge/smb.conf.vittjokk
-%%EXAMPLESDIR%%/thoralf/smb.conf
-%%EXAMPLESDIR%%/svr4-startup/samba.server
-%%EXAMPLESDIR%%/svr4-startup/README
 %%EXAMPLESDIR%%/LDAP/README
 %%EXAMPLESDIR%%/LDAP/convertSambaAccount
 %%EXAMPLESDIR%%/LDAP/ldapsync.pl
@@ -300,19 +254,7 @@ lib/libsmbclient.so.0
 %%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-usershow.pl
 %%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap_conf.pm
 %%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap_tools.pm
-%%EXAMPLESDIR%%/simple/README
-%%EXAMPLESDIR%%/simple/smb.conf
-%%EXAMPLESDIR%%/printing/prtpub.c
-%%EXAMPLESDIR%%/printing/readme.prtpub
-%%EXAMPLESDIR%%/printing/smbprint
-%%EXAMPLESDIR%%/printing/smbprint-new.sh
-%%EXAMPLESDIR%%/printing/smbprint.sysv
-%%EXAMPLESDIR%%/printer-accounting/README
-%%EXAMPLESDIR%%/printer-accounting/acct-all
-%%EXAMPLESDIR%%/printer-accounting/acct-sum
-%%EXAMPLESDIR%%/printer-accounting/hp5-redir
-%%EXAMPLESDIR%%/printer-accounting/lp-acct
-%%EXAMPLESDIR%%/printer-accounting/printcap
+%%EXAMPLESDIR%%/README
 %%EXAMPLESDIR%%/VFS/Makefile.in
 %%EXAMPLESDIR%%/VFS/README
 %%EXAMPLESDIR%%/VFS/autogen.sh
@@ -321,46 +263,64 @@ lib/libsmbclient.so.0
 %%EXAMPLESDIR%%/VFS/shadow_copy_test.c
 %%EXAMPLESDIR%%/VFS/skel_opaque.c
 %%EXAMPLESDIR%%/VFS/skel_transparent.c
-%%EXAMPLESDIR%%/ntlogon/README
-%%EXAMPLESDIR%%/ntlogon/ntlogon.conf
-%%EXAMPLESDIR%%/ntlogon/ntlogon.py
-%%EXAMPLESDIR%%/wins_hook/README
-%%EXAMPLESDIR%%/wins_hook/dns_update
+%%EXAMPLESDIR%%/auth/Makefile
+%%EXAMPLESDIR%%/auth/auth_skel.c
+%%EXAMPLESDIR%%/autofs/auto.a
+%%EXAMPLESDIR%%/dce-dfs/README
+%%EXAMPLESDIR%%/dce-dfs/smb.conf
+%%EXAMPLESDIR%%/genlogon/genlogon.pl
 %%EXAMPLESDIR%%/misc/extra_smbstatus
 %%EXAMPLESDIR%%/misc/modify_samba_config.pl
 %%EXAMPLESDIR%%/misc/swat.pl
 %%EXAMPLESDIR%%/misc/wall.perl
-%%EXAMPLESDIR%%/libsmbclient/Makefile
-%%EXAMPLESDIR%%/libsmbclient/README
-%%EXAMPLESDIR%%/libsmbclient/testacl.c
-%%EXAMPLESDIR%%/libsmbclient/testbrowse.c
-%%EXAMPLESDIR%%/libsmbclient/testsmbc.c
-%%EXAMPLESDIR%%/libsmbclient/tree.c
-%%EXAMPLESDIR%%/genlogon/genlogon.pl
-%%EXAMPLESDIR%%/dce-dfs/README
-%%EXAMPLESDIR%%/dce-dfs/smb.conf
-%%EXAMPLESDIR%%/autofs/auto.a
-%%EXAMPLESDIR%%/auth/Makefile
-%%EXAMPLESDIR%%/auth/auth_skel.c
-%%EXAMPLESDIR%%/appliance/Makefile
-%%EXAMPLESDIR%%/appliance/README
-%%EXAMPLESDIR%%/appliance/appliance.spec
-%%EXAMPLESDIR%%/appliance/build.sh
-%%EXAMPLESDIR%%/appliance/smb.conf-appliance
 %%EXAMPLESDIR%%/nss/nss_winbind.c
 %%EXAMPLESDIR%%/nss/nss_winbind.h
 %%EXAMPLESDIR%%/nss/wbtest.c
-%%EXAMPLESDIR%%/README
+%%EXAMPLESDIR%%/ntlogon/README
+%%EXAMPLESDIR%%/ntlogon/ntlogon.conf
+%%EXAMPLESDIR%%/ntlogon/ntlogon.py
+%%EXAMPLESDIR%%/pdb/Makefile
+%%EXAMPLESDIR%%/pdb/README
+%%EXAMPLESDIR%%/pdb/mysql/mysql.dump
+%%EXAMPLESDIR%%/pdb/mysql/smb.conf
+%%EXAMPLESDIR%%/pdb/pdb_test.c
+%%EXAMPLESDIR%%/pdb/sambapdb.dtd
+%%EXAMPLESDIR%%/printer-accounting/README
+%%EXAMPLESDIR%%/printer-accounting/acct-all
+%%EXAMPLESDIR%%/printer-accounting/acct-sum
+%%EXAMPLESDIR%%/printer-accounting/hp5-redir
+%%EXAMPLESDIR%%/printer-accounting/lp-acct
+%%EXAMPLESDIR%%/printer-accounting/printcap
+%%EXAMPLESDIR%%/printing/VampireDriversFunctions
+%%EXAMPLESDIR%%/printing/prtpub.c
+%%EXAMPLESDIR%%/printing/readme.prtpub
+%%EXAMPLESDIR%%/printing/smbprint
+%%EXAMPLESDIR%%/printing/smbprint.sysv
+%%EXAMPLESDIR%%/scripts/backtrace
 %%EXAMPLESDIR%%/smb.conf.default
+%%EXAMPLESDIR%%/svr4-startup/README
+%%EXAMPLESDIR%%/svr4-startup/samba.server
+%%EXAMPLESDIR%%/tridge/README
+%%EXAMPLESDIR%%/tridge/smb.conf
+%%EXAMPLESDIR%%/tridge/smb.conf.WinNT
+%%EXAMPLESDIR%%/tridge/smb.conf.fjall
+%%EXAMPLESDIR%%/tridge/smb.conf.lapland
+%%EXAMPLESDIR%%/tridge/smb.conf.vittjokk
+%%EXAMPLESDIR%%/validchars/msdos70.out
+%%EXAMPLESDIR%%/validchars/nwdos70.out
+%%EXAMPLESDIR%%/validchars/readme
+%%EXAMPLESDIR%%/validchars/validchr.c
+%%EXAMPLESDIR%%/validchars/validchr.com
+%%EXAMPLESDIR%%/wins_hook/README
+%%EXAMPLESDIR%%/wins_hook/dns_update
 share/swat/help/AccessControls.html
 share/swat/help/AdvancedNetworkManagement.html
-share/swat/help/Appendixes.html
+share/swat/help/Appendix.html
 share/swat/help/Backup.html
 share/swat/help/CUPS-printing.html
 share/swat/help/ClientConfig.html
 share/swat/help/DNSDHCP.html
 share/swat/help/FastStart.html
-share/swat/help/Further-Resources.html
 share/swat/help/InterdomainTrusts.html
 share/swat/help/IntroSMB.html
 share/swat/help/NT4Migration.html
@@ -382,7 +342,41 @@ share/swat/help/diagnosis.html
 share/swat/help/domain-member.html
 share/swat/help/editreg.1.html
 share/swat/help/findsmb.1.html
+share/swat/help/go01.html
 share/swat/help/groupmapping.html
+share/swat/help/images/10small.png
+share/swat/help/images/11small.png
+share/swat/help/images/12small.png
+share/swat/help/images/13small.png
+share/swat/help/images/14small.png
+share/swat/help/images/1small.png
+share/swat/help/images/2small.png
+share/swat/help/images/3small.png
+share/swat/help/images/4small.png
+share/swat/help/images/5small.png
+share/swat/help/images/6small.png
+share/swat/help/images/7small.png
+share/swat/help/images/8small.png
+share/swat/help/images/9small.png
+share/swat/help/images/a_small.png
+share/swat/help/images/access1.png
+share/swat/help/images/browsing1.png
+share/swat/help/images/cups1.png
+share/swat/help/images/cups2.png
+share/swat/help/images/domain.png
+share/swat/help/images/ethereal1.png
+share/swat/help/images/ethereal2.png
+share/swat/help/images/idmap-gid2sid.png
+share/swat/help/images/idmap-groups.png
+share/swat/help/images/idmap-sid2gid.png
+share/swat/help/images/idmap-sid2uid.png
+share/swat/help/images/idmap-store-gid2sid.png
+share/swat/help/images/idmap-uid2sid.png
+share/swat/help/images/idmap.png
+share/swat/help/images/idmap_winbind_no_loop.png
+share/swat/help/images/pdftoepsonusb.png
+share/swat/help/images/pdftosocket.png
+share/swat/help/images/trusts1.png
 share/swat/help/index.html
 share/swat/help/install.html
 share/swat/help/integrate-ms-networks.html
@@ -404,6 +398,7 @@ share/swat/help/passdb.html
 share/swat/help/pdbedit.8.html
 share/swat/help/pr01.html
 share/swat/help/pr02.html
+share/swat/help/pr03.html
 share/swat/help/printing.html
 share/swat/help/problems.html
 share/swat/help/profiles.1.html
@@ -453,39 +448,6 @@ share/swat/images/shares.gif
 share/swat/images/status.gif
 share/swat/images/viewconfig.gif
 share/swat/images/wizard.gif
-share/swat/help/images/10small.png
-share/swat/help/images/11small.png
-share/swat/help/images/12small.png
-share/swat/help/images/13small.png
-share/swat/help/images/14small.png
-share/swat/help/images/1small.png
-share/swat/help/images/2small.png
-share/swat/help/images/3small.png
-share/swat/help/images/4small.png
-share/swat/help/images/5small.png
-share/swat/help/images/6small.png
-share/swat/help/images/7small.png
-share/swat/help/images/8small.png
-share/swat/help/images/9small.png
-share/swat/help/images/a_small.png
-share/swat/help/images/access1.png
-share/swat/help/images/browsing1.png
-share/swat/help/images/cups1.png
-share/swat/help/images/cups2.png
-share/swat/help/images/domain.png
-share/swat/help/images/ethereal1.png
-share/swat/help/images/ethereal2.png
-share/swat/help/images/idmap-gid2sid.png
-share/swat/help/images/idmap-groups.png
-share/swat/help/images/idmap-sid2gid.png
-share/swat/help/images/idmap-sid2uid.png
-share/swat/help/images/idmap-store-gid2sid.png
-share/swat/help/images/idmap-uid2sid.png
-share/swat/help/images/idmap.png
-share/swat/help/images/idmap_winbind_no_loop.png
-share/swat/help/images/pdftoepsonusb.png
-share/swat/help/images/pdftosocket.png
-share/swat/help/images/trusts1.png
 share/swat/include/footer.html
 share/swat/include/header.html
 share/swat/lang/ja/help/welcome.html
@@ -683,44 +645,36 @@ share/swat/using_samba/samba2_xs.gif
 @dirrm share/swat/help
 @dirrm share/swat
 %%SMBPASS%%@dirrm %%EXAMPLESDIR%%/pam_smbpass
-%%PYTHON%%@dirrm %%EXAMPLESDIR%%/python/spoolss
-%%PYTHON%%@dirrm %%EXAMPLESDIR%%/python/tdbpack
-%%PYTHON%%@dirrm %%EXAMPLESDIR%%/python
-@dirrm %%EXAMPLESDIR%%/wins_hook
-@dirrm %%EXAMPLESDIR%%/validchars
-@dirrm %%EXAMPLESDIR%%/tridge
-@dirrm %%EXAMPLESDIR%%/thoralf
-@dirrm %%EXAMPLESDIR%%/svr4-startup
-@dirrm %%EXAMPLESDIR%%/simple
-@dirrm %%EXAMPLESDIR%%/printing
-@dirrm %%EXAMPLESDIR%%/printer-accounting
+@dirrm %%EXAMPLESDIR%%/VFS
+@dirrm %%EXAMPLESDIR%%/auth
+@dirrm %%EXAMPLESDIR%%/autofs
+@dirrm %%EXAMPLESDIR%%/dce-dfs
+@dirrm %%EXAMPLESDIR%%/genlogon
+@dirrm %%EXAMPLESDIR%%/misc
+@dirrm %%EXAMPLESDIR%%/nss
+@dirrm %%EXAMPLESDIR%%/ntlogon
 @dirrm %%EXAMPLESDIR%%/pdb/mysql
 @dirrm %%EXAMPLESDIR%%/pdb
-@dirrm %%EXAMPLESDIR%%/ntlogon
-@dirrm %%EXAMPLESDIR%%/nss
-@dirrm %%EXAMPLESDIR%%/misc
-@dirrm %%EXAMPLESDIR%%/libsmbclient
-@dirrm %%EXAMPLESDIR%%/genlogon
-@dirrm %%EXAMPLESDIR%%/dce-dfs
-@dirrm %%EXAMPLESDIR%%/autofs
-@dirrm %%EXAMPLESDIR%%/auth
-@dirrm %%EXAMPLESDIR%%/appliance
-@dirrm %%EXAMPLESDIR%%/VFS
+@dirrm %%EXAMPLESDIR%%/printer-accounting
+@dirrm %%EXAMPLESDIR%%/printing
+@dirrm %%EXAMPLESDIR%%/scripts
+@dirrm %%EXAMPLESDIR%%/svr4-startup
+@dirrm %%EXAMPLESDIR%%/tridge
+@dirrm %%EXAMPLESDIR%%/validchars
+@dirrm %%EXAMPLESDIR%%/wins_hook
 @dirrm %%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd
 @dirrm %%EXAMPLESDIR%%/LDAP/smbldap-tools/cgi
 @dirrm %%EXAMPLESDIR%%/LDAP/smbldap-tools
 @dirrm %%EXAMPLESDIR%%/LDAP
 @dirrm %%EXAMPLESDIR%%
-@dirrm lib/samba/vfs
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/htmldocs/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/htmldocs
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/registry
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/samba/rpc
 @dirrm lib/samba/pdb
 @dirrm lib/samba/idmap
 @dirrm lib/samba/charset
 @dirrm lib/samba/auth
-@dirrm lib/samba
-%%PYTHON%%@unexec rmdir -p %D/lib/%%PYTHON_VERSION%%/site-packages/samba/. 2>/dev/null || true
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Registry
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/htmldocs/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/htmldocs
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@unexec rmdir %D/lib/samba/vfs 2>/dev/null || true
+@unexec rmdir %D/lib/samba 2>/dev/null || true