- Move net/samba-devel to net/samba3

PR:		ports/67564
Submitted by:	Joerg Pulz <Joerg.Pulz@frm2.tum.de>
Approved by:	maintainer
Repocopy by:	marcus

17 files changed, 3 insertions, 1897 deletions

diff --git a/net/Makefile b/net/Makefile
index a37ce0792d35..b62a8c3138b9 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -596,7 +596,7 @@
     SUBDIR += rude
     SUBDIR += rwhois
     SUBDIR += samba
-    SUBDIR += samba-devel
+    SUBDIR += samba3
     SUBDIR += samba-libsmbclient
     SUBDIR += sambasentinel
     SUBDIR += samplicator
diff --git a/net/py-samba/Makefile b/net/py-samba/Makefile
index 296c44218b25..2b4896eae561 100644
--- a/net/py-samba/Makefile
+++ b/net/py-samba/Makefile
@@ -14,7 +14,7 @@ COMMENT=		Python bindings for Samba
 
 CONFLICTS=
 
-SAMBA_PORT=		samba-devel
+SAMBA_PORT=		samba3
 SAMBA_SUBPORT=		yes
 
 MASTERDIR=		${.CURDIR}/../${SAMBA_PORT}
diff --git a/net/samba-devel/Makefile b/net/samba-devel/Makefile
deleted file mode 100644
index 82bf9e0185f2..000000000000
--- a/net/samba-devel/Makefile
+++ /dev/null
@@ -1,364 +0,0 @@
-# New ports collection makefile for:	samba
-# Date created:				11th Feb 1995
-# Whom:					gpalmer
-#
-# $FreeBSD$
-#
-
-PORTNAME=		samba
-PORTVERSION=		3.0.4
-PORTREVISION?=		2
-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_ICONV=		yes
-USE_AUTOCONF_VER=	253
-
-LATEST_LINK?=		${PKGNAMEPREFIX}${PORTNAME}-3${PKGNAMESUFFIX}
-EXAMPLESDIR=		${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}${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?=		${VARDIR}/db/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}
-
-.if !defined(SAMBA_SUBPORT)
-OPTIONS=	LDAP		"With LDAP support" on \
-		ADS		"With Active Directory support" on \
-		CUPS		"With CUPS printing support" on \
-		WINBIND		"With WinBIND support" on \
-		ACL_SUPPORT	"With ACL support" off \
-		SYSLOG		"With Syslog support" off \
-		QUOTAS		"With Quota support" off \
-		UTMP		"With UTMP support" on \
-		MSDFS		"With MSDFS support" off \
-		SAM_XML		"With XML smbpasswd backend" off \
-		SAM_MYSQL	"With MYSQL smbpasswd backend" off \
-		SAM_PGSQL	"With PostgreSQL smbpasswd backend" off \
-		SAM_OLD_LDAP	"With Samba2.x LDAP smbpasswd backend" off \
-		PAM_SMBPASS	"With SMB PAM module" off \
-		POPT		"With installed POPT library" on \
-		I18N		"With i18n patch" off
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if !defined(SAMBA_SUBPORT)
-
-USE_RC_SUBR=		yes
-
-CONFIGURE_ARGS+=	--with-pam --with-readline --with-sendfile-support \
-			--without-libsmbclient --without-python
-
-.if defined(WITH_CUPS)
-LIB_DEPENDS+=		cups.2:${PORTSDIR}/print/cups-base
-CONFIGURE_ARGS+=	--enable-cups
-CUPS=			cups
-.else
-CONFIGURE_ARGS+=	--disable-cups
-CUPS=			""
-.endif
-
-.if defined(WITH_SYSLOG)
-CONFIGURE_ARGS+=	--with-syslog
-.else
-CONFIGURE_ARGS+=	--without-syslog
-.endif
-
-.if defined(WITH_QUOTAS)
-CONFIGURE_ARGS+=	--with-quotas
-.else
-CONFIGURE_ARGS+=	--without-quotas
-.endif
-
-.if defined(WITHOUT_UTMP)
-CONFIGURE_ARGS+=	--without-utmp
-.endif
-
-.if defined(WITH_MSDFS)
-CONFIGURE_ARGS+=	--with-msdfs
-.endif
-
-.if !defined(WITHOUT_WINBIND)
-CONFIGURE_ARGS+=	--with-winbind
-PLIST_SUB+=		WINBIND=""
-.if ${OSVERSION} >= 500112
-WITH_WINBIND_NSS=	yes
-.endif
-.else
-CONFIGURE_ARGS+=	--without-winbind
-PLIST_SUB+=		WINBIND="@comment "
-.endif
-
-.if defined(WITH_WINBIND_NSS)
-PLIST_SUB+=		WINBIND_NSS=""
-.else
-PLIST_SUB+=		WINBIND_NSS="@comment "
-.endif
-
-.if !defined(WITHOUT_LDAP)
-WANT_LDAP=		yes
-.endif
-# SAM
-.if defined(WITH_SAM_XML)
-LIB_DEPENDS+=		xml2.5:${PORTSDIR}/textproc/libxml2
-CONFIGURE_ARGS+=	--with-xml-prefix=${LOCALBASE}
-WANT_EXPSAM_MODULES+=	xml
-PLIST_SUB+=		SAMXML=""
-.else
-PLIST_SUB+=		SAMXML="@comment "
-.endif
-
-.if defined(WITH_SAM_MYSQL)
-USE_MYSQL=		yes
-CONFIGURE_ARGS+=	--with-mysql-prefix=${LOCALBASE}
-WANT_EXPSAM_MODULES+=	mysql
-PLIST_SUB+=		SAMMYSQL=""
-.else
-PLIST_SUB+=		SAMMYSQL="@comment "
-.endif
-
-.if defined(WITH_SAM_PGSQL)
-LIB_DEPENDS+=		pq.3:${PORTSDIR}/databases/postgresql7
-CONFIGURE_ARGS+=	--with-pgsql-prefix=${LOCALBASE}
-WANT_EXPSAM_MODULES+=	pgsql
-PLIST_SUB+=		SAMPGSQL=""
-.else
-PLIST_SUB+=		SAMPGSQL="@comment "
-.endif
-
-.if defined(WITH_SAM_OLD_LDAP)
-WANT_LDAP=		yes
-CONFIGURE_ARGS+=	--with-ldapsam
-.else
-CONFIGURE_ARGS+=	--without-ldapsam
-.endif
-
-.if defined(WANT_EXPSAM_MODULES) && !empty(WANT_EXPSAM_MODULES)
-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(WITH_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)
-CONFIGURE_ARGS+=	--with-krb5=${KRB5_HOME}
-.elif defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.a)
-CONFIGURE_ARGS+=	--with-krb5=${HEIMDAL_HOME}
-.elif ( defined(MAKE_KERBEROS5) || ${OSVERSION} > 500105 ) && exists(${DESTDIR}/usr/lib/libkrb5.a)
-CONFIGURE_ARGS+=	--with-krb5=${DESTDIR}/usr
-.else
-LIB_DEPENDS+=		krb5:${PORTSDIR}/security/heimdal
-CONFIGURE_ARGS+=	--with-krb5=${LOCALBASE}
-.endif
-.else
-CONFIGURE_ARGS+=	--without-krb5
-.endif
-
-.if defined(WANT_LDAP)
-USE_OPENLDAP=		yes
-CONFIGURE_ARGS+=	--with-ldap
-.else
-CONFIGURE_ARGS+=	--without-ldap
-.endif
-
-.if !defined(SAMBA_SUBPORT)
-
-MAN1=		findsmb.1 nmblookup.1 log2pcap.1 rpcclient.1 \
-		smbget.1 smbcacls.1 smbclient.1 smbcontrol.1 smbsh.1 \
-		smbstatus.1 smbtar.1 testparm.1 testprns.1 vfstest.1 \
-		ntlm_auth.1 profiles.1 smbcquotas.1 smbtree.1
-MAN5=		lmhosts.5 smb.conf.5 smbpasswd.5
-MAN7=		samba.7
-MAN8=		nmbd.8 smbd.8 net.8 pdbedit.8 smbpasswd.8 smbspool.8 \
-		swat.8 tdbdump.8 tdbbackup.8
-.if !defined(WITHOUT_WINBIND)
-MAN1+=		wbinfo.1
-MAN8+=		winbindd.8
-.endif
-
-.if !defined(WITHOUT_WINBIND)
-WINBIND_FILTER=		${SED} -e 's|%%WINBIND%%||g'
-.else
-WINBIND_FILTER=		${GREP} -v '^%%WINBIND%%'
-.endif
-
-.if defined(WITH_I18N)
-# Based on patch from miraclelinux.com.
-# http://www.miraclelinux.com/english/technet/samba30/index.html
-PATCH_SITES=	http://dist.bsdlab.org/
-PATCHFILES=	samba-${PORTVERSION}-i18n-20040521.bz2
-PATCH_DIST_STRIP=	-p1
-PLIST_SUB+=		I18N=""
-.else
-PLIST_SUB+=		I18N="@comment "
-.endif
-
-PLIST_SUB+=		RC_DIR=${RC_DIR} \
-			SAMBA_LOGDIR=${SAMBA_LOGDIR} \
-			SAMBA_LOCKDIR=${SAMBA_LOCKDIR}
-
-RC_SCRIPTS_SUB=		PREFIX=${PREFIX} \
-			CUPS=${CUPS} \
-			RC_SUBR=${RC_SUBR} \
-			SAMBA_CONFDIR=${SAMBA_CONFDIR} \
-			SAMBA_CONFIG=${SAMBA_CONFIG} \
-			SAMBA_LOGDIR=${SAMBA_LOGDIR} \
-			SAMBA_RUNDIR=${SAMBA_RUNDIR} \
-			SAMBA_LOCKDIR=${SAMBA_LOCKDIR} \
-			SAMBA_SPOOL=${SAMBA_SPOOL}
-
-pre-fetch:
-	@${ECHO_MSG} "===>  -------------------------------------------"
-	@${ECHO_MSG} "===>  Run 'make config' to (re)configure the port"
-	@${ECHO_MSG} "===>  -------------------------------------------"
-
-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
-	@${MKDIR} ${MAN${sect}PREFIX}/man/man${sect}
-.for man in ${MAN${sect}}
-	@${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/manpages/${man} ${MAN${sect}PREFIX}/man/man${sect}
-.endfor
-.endfor
-	@${MKDIR} ${EXAMPLESDIR}
-	@${CP} -Rp ${WRKDIR}/${DISTNAME}/examples/* ${EXAMPLESDIR}
-.if defined(WITH_PAM_SMBPASS)
-	@${MKDIR} ${EXAMPLESDIR}/pam_smbpass
-	@${CP} -Rp ${WRKSRC}/pam_smbpass/samples/* ${EXAMPLESDIR}/pam_smbpass
-.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
-	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} 	\
-		${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
-	@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
-	@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}
-	@${ECHO_CMD} "@exec ${CHMOD} 0755 ${SAMBA_LOGDIR}" >> ${TMPPLIST}
-	@${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
-	@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 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
-	@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}
-	@${ECHO_CMD} "@exec ${CHMOD} 700 ${SAMBA_PRIVATE}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec ${CHOWN} root:wheel ${SAMBA_PRIVATE}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec ${RMDIR} ${SAMBA_PRIVATE} 2>/dev/null || true" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec ${ECHO_CMD} \"Warning: If you will *NOT* use this package anymore, please remove ${SAMBA_PRIVATE}/* manually.\"" >> ${TMPPLIST}
-.if !defined(WITHOUT_WINBIND)
-.if defined(WITH_WINBIND_NSS)
-	${INSTALL_PROGRAM} ${WRKSRC}/nsswitch/nss_winbind.so ${SAMBA_LIBDIR}/nss_winbind.so.1
-	${INSTALL_PROGRAM} ${WRKSRC}/nsswitch/nss_wins.so ${SAMBA_LIBDIR}/nss_wins.so.1
-.endif
-	${INSTALL_PROGRAM} ${WRKSRC}/nsswitch/pam_winbind.so ${SAMBA_LIBDIR}
-.endif
-.if defined(WITH_PAM_SMBPASS)
-	@${INSTALL_PROGRAM} ${WRKSRC}/bin/pam_smbpass.so ${SAMBA_LIBDIR}
-.endif
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${CP} -Rp ${WRKDIR}/${DISTNAME}/docs/registry ${DOCSDIR}
-.for d in devel guide howto
-	@${CP} -Rp ${WRKDIR}/${DISTNAME}/docs/htmldocs/${d} ${DOCSDIR}
-.endfor
-	@${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${DOCSDIR}
-.for f in README COPYING Manifest Read-Manifest-Now Roadmap \
-		WHATSNEW.txt docs/THANKS docs/history
-	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/${f} ${DOCSDIR}
-.endfor
-.endif
-	@${CAT} ${PKGMESSAGE}
-# !SAMBA_SUBPORT
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/net/samba-devel/distinfo b/net/samba-devel/distinfo
deleted file mode 100644
index a5b09ffb7604..000000000000
--- a/net/samba-devel/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 (samba-3.0.4.tar.gz) = 0156265c1e95ac662deef386f615504f
-SIZE (samba-3.0.4.tar.gz) = 15046252
-MD5 (samba-3.0.4-i18n-20040521.bz2) = 24158c2fd00b47ff5b0bcad23cae16e1
-SIZE (samba-3.0.4-i18n-20040521.bz2) = 18982
diff --git a/net/samba-devel/files/README.FreeBSD b/net/samba-devel/files/README.FreeBSD
deleted file mode 100644
index 5bc20d291549..000000000000
--- a/net/samba-devel/files/README.FreeBSD
+++ /dev/null
@@ -1,21 +0,0 @@
-If you want to use samba ports,
-
-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. Type '/usr/local/etc/rc.d/samba.sh start' or reboot.
-
-See document files in /usr/local/share/doc/samba and example config files in
-/usr/local/share/examples/samba for details.
-
-FreeBSD Samba ports for localization and encrypt passwords support are no
-longer provided because these supports have been integrated into the
-original distribution since 1.9.18.  If you're Western European or Japanese
-Windows users, please set "client code page" parameter in smb.conf (1.9.18
-does not support Chinese Windows. If you want to use Chinese samba, please
-use chinese/samba port).  See smb.conf.sample for details.  If you want to
-use NT4+SP3 or Win95+updates clients, set "encrypt passwords" parameter to
-yes and use smbpasswd [username] to use /usr/local/private/smbpasswd for
-authentication.
-
-FreeBSD Samba-devel port maintainer: Timur Bakeyev <timur@gnu.org>
diff --git a/net/samba-devel/files/patch-Makefile.in b/net/samba-devel/files/patch-Makefile.in
deleted file mode 100644
index efeaa5e5b20e..000000000000
--- a/net/samba-devel/files/patch-Makefile.in
+++ /dev/null
@@ -1,55 +0,0 @@
---- Makefile.in.orig	Sun Apr  4 09:37:15 2004
-+++ Makefile.in	Mon Apr  5 20:43:42 2004
-@@ -101,6 +101,7 @@
- LIBSMBCLIENT_MAJOR=0
- LIBSMBCLIENT_MINOR=1
- 
-+NSS_VERSION=1
- 
- FLAGS1 = $(CFLAGS) @FLAGS1@ -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper  -I. $(CPPFLAGS) -I$(srcdir)
- FLAGS2 = 
-@@ -957,8 +958,8 @@
- 		@SONAMEFLAG@`basename $@`
- 
- bin/libsmbclient.@SHLIBEXT@: $(LIBSMBCLIENT_PICOBJS)
--	@echo Linking libsmbclient shared library $@
--	@$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) $(DYNEXP) $(LIBS) \
-+	@echo Linking libsmbclient shared library $@.$(LIBSMBCLIENT_MAJOR)
-+	@$(SHLD) $(LDSHFLAGS) -o $@.$(LIBSMBCLIENT_MAJOR) $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) $(DYNEXP) $(LIBS) \
- 		$(KRB5LIBS) $(LDAP_LIBS) \
- 		@SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR)
- 
-@@ -1041,13 +1042,13 @@
- @WINBIND_NSS@: $(WINBIND_NSS_PICOBJS)
- 	@echo "Linking $@"
- 	@$(SHLD) $(WINBIND_NSS_LDSHFLAGS) -o $@ $(WINBIND_NSS_PICOBJS) \
--		@WINBIND_NSS_EXTRA_LIBS@ @SONAMEFLAG@`basename $@`
-+		@WINBIND_NSS_EXTRA_LIBS@ @SONAMEFLAG@`basename $@`.$(NSS_VERSION)
- 
- @WINBIND_WINS_NSS@: $(WINBIND_WINS_NSS_PICOBJS)
- 	@echo "Linking $@"
- 	@$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_WINS_NSS_PICOBJS) \
- 		$(LDAP_LIBS) $(KRB5LIBS) -lc \
--		@SONAMEFLAG@`basename $@`
-+		@SONAMEFLAG@`basename $@`.$(NSS_VERSION)
- 
- nsswitch/pam_winbind.@SHLIBEXT@: $(PAM_WINBIND_PICOBJ) bin/.dummy
- 	@echo "Linking $@"
-@@ -1218,7 +1219,7 @@
- 
- bin/t_snprintf@EXEEXT@: lib/snprintf.c
- 	$(CC) $(FLAGS) -o $@ -DTEST_SNPRINTF lib/snprintf.c -lm
--install: installbin installman installscripts installdat installswat installmodules @INSTALLCLIENT@
-+install: installbin installscripts installdat installswat installmodules @INSTALLCLIENT@
- 
- install-everything: install installmodules
- 
-@@ -1270,7 +1271,7 @@
- 
- installclientlib: installdirs libsmbclient
- 	@$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)${prefix}/lib
--	-$(INSTALLCLIENTCMD_SH) bin/libsmbclient.@SHLIBEXT@ $(DESTDIR)${prefix}/lib
-+	-$(INSTALLCLIENTCMD_SH) bin/libsmbclient.@SHLIBEXT@.$(LIBSMBCLIENT_MAJOR) $(DESTDIR)${prefix}/lib
- 	-$(INSTALLCLIENTCMD_A) bin/libsmbclient.a $(DESTDIR)${prefix}/lib
- 	@$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)${prefix}/include
- 	-$(INSTALLCMD) $(srcdir)/include/libsmbclient.h $(DESTDIR)${prefix}/include
diff --git a/net/samba-devel/files/patch-aclocal.m4 b/net/samba-devel/files/patch-aclocal.m4
deleted file mode 100644
index 36c172411d1e..000000000000
--- a/net/samba-devel/files/patch-aclocal.m4
+++ /dev/null
@@ -1,104 +0,0 @@
---- aclocal.m4.orig	Sat Apr  3 22:30:01 2004
-+++ aclocal.m4	Sat Apr  3 22:33:24 2004
-@@ -564,89 +564,20 @@
-     jm_cv_lib_iconv=""
-     jm_cv_giconv=no
-     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_func_iconv=yes
--      jm_cv_biconv=yes
--      jm_cv_include="biconv.h"
--      jm_cv_lib_iconv="biconv")
--      LIBS="$jm_save_LIBS"
--
--    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="")
--
--      dnl Standard iconv.h include, lib in glibc or libc ...
--      if test "$jm_cv_func_iconv" != yes; then
--        AC_TRY_LINK([#include <stdlib.h>
-+    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="")
--
--          if test "$jm_cv_lib_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(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")
--
--           LIBS="$jm_save_LIBS"
--
--        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"
--        fi
--      fi
--    fi
--  fi
-+    [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"
-   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
--      else 
--        AC_DEFINE(HAVE_ICONV, 1, [What header to include for iconv() function: iconv.h])
--        AC_MSG_RESULT(yes)
--        ICONV_FOUND=yes
--      fi
--    fi
-+    AC_DEFINE(HAVE_ICONV, 1, [What header to include for iconv() function: iconv.h])
-+    AC_MSG_RESULT(yes)
-+    ICONV_FOUND=yes
-   else
-     AC_MSG_RESULT(no)
-   fi
diff --git a/net/samba-devel/files/patch-aj b/net/samba-devel/files/patch-aj
deleted file mode 100644
index 8804493c38df..000000000000
--- a/net/samba-devel/files/patch-aj
+++ /dev/null
@@ -1,15 +0,0 @@
---- include/local.h.orig	Fri Jul  6 03:01:26 2001
-+++ include/local.h	Tue Oct 16 17:20:36 2001
-@@ -176,10 +176,10 @@
-  * Default passwd chat script.
-  */
- 
--#define DEFAULT_PASSWD_CHAT "*new*password* %n\\n *new*password* %n\\n *changed*"
-+#define DEFAULT_PASSWD_CHAT "*\\n*ew\\spassword* %n\\n *ew\\spassword* %n\\n *updating\\sthe\\sdatabase...\\npasswd:\\sdone\\n"
- 
- /* Minimum length of allowed password when changing UNIX password. */
--#define MINPASSWDLENGTH 5
-+#define MINPASSWDLENGTH 6
- 
- /* maximum ID number used for session control. This cannot be larger
-    than 62*62 for the current code */
diff --git a/net/samba-devel/files/patch-lib_util_str.c b/net/samba-devel/files/patch-lib_util_str.c
deleted file mode 100644
index f5450d387648..000000000000
--- a/net/samba-devel/files/patch-lib_util_str.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- lib/util_str.c.orig	Tue Apr 20 22:42:55 2004
-+++ lib/util_str.c	Fri May 14 02:02:30 2004
-@@ -1980,10 +1980,16 @@
- {
- 	int bits = 0;
- 	int char_count = 0;
--	size_t out_cnt = 0;
--	size_t len = data.length;
--	size_t output_len = data.length * 2;
--	char *result = malloc(output_len); /* get us plenty of space */
-+	size_t out_cnt, len, output_len;
-+	char *result;
-+
-+        if (!data.length || !data.data)
-+		return NULL;
-+
-+	out_cnt = 0;
-+	len = data.length;
-+	output_len = data.length * 2;
-+	result = malloc(output_len); /* get us plenty of space */
- 
- 	while (len-- && out_cnt < (data.length * 2) - 5) {
- 		int c = (unsigned char) *(data.data++);
diff --git a/net/samba-devel/files/patch-script_installbin.sh b/net/samba-devel/files/patch-script_installbin.sh
deleted file mode 100644
index 66a0577eeb16..000000000000
--- a/net/samba-devel/files/patch-script_installbin.sh
+++ /dev/null
@@ -1,12 +0,0 @@
---- script/installbin.sh.orig	Tue Mar  9 15:33:32 2004
-+++ script/installbin.sh	Tue Mar  9 15:35:43 2004
-@@ -17,8 +17,7 @@
-  p2=`basename $p`
-  echo Installing $p as $BINDIR/$p2
-  if [ -f $BINDIR/$p2 ]; then
--   rm -f $BINDIR/$p2.old
--   mv $BINDIR/$p2 $BINDIR/$p2.old
-+   rm -f $BINDIR/$p2 $BINDIR/$p2.old
-  fi
-  cp $p $BINDIR/
-  chmod $INSTALLPERMS $BINDIR/$p2
diff --git a/net/samba-devel/files/patch-script_installscripts.sh b/net/samba-devel/files/patch-script_installscripts.sh
deleted file mode 100644
index 4091df6c4290..000000000000
--- a/net/samba-devel/files/patch-script_installscripts.sh
+++ /dev/null
@@ -1,12 +0,0 @@
---- script/installscripts.sh.orig	Tue Mar  9 15:35:54 2004
-+++ script/installscripts.sh	Tue Mar  9 15:36:38 2004
-@@ -25,8 +25,7 @@
-   p2=`basename $p`
-   echo Installing $BINDIR/$p2
-   if [ -f $BINDIR/$p2 ]; then
--    rm -f $BINDIR/$p2.old
--    mv $BINDIR/$p2 $BINDIR/$p2.old
-+    rm -f $BINDIR/$p2 $BINDIR/$p2.old
-   fi
-   cp $p $BINDIR/
-   chmod $INSTALLPERMS $BINDIR/$p2
diff --git a/net/samba-devel/files/samba.sh.sample b/net/samba-devel/files/samba.sh.sample
deleted file mode 100644
index 1b51ab40b6d8..000000000000
--- a/net/samba-devel/files/samba.sh.sample
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: nmbd smbd
-%%WINBIND%%# PROVIDE: winbindd
-# REQUIRE: NETWORKING SERVERS named %%CUPS%%
-# BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable samba:
-#
-#samba_enable="YES"
-#
-# or, for fine grain control
-#
-#nmbd_enable="YES"
-#smbd_enable="YES"
-%%WINBIND%%#winbindd_enable="YES"
-#
-
-. %%RC_SUBR%%
-
-name=samba
-rcvar=`set_rcvar`
-
-load_rc_config $name
-# Set defaults
-samba_config=${samba_config:-"%%SAMBA_CONFIG%%"}
-# Config file is required
-if [ ! -r ${samba_config} ]; then
-    warn "${samba_config} is not readable."
-    case $1 in
-	force*) : ;;
-	*) exit 1 ;;
-    esac
-fi
-
-if test -n ${samba_enable:-""} && checkyesno samba_enable; then
-    nmbd_enable=${nmbd_enable:-"YES"}
-    smbd_enable=${smbd_enable:-"YES"}
-%%WINBIND%%    winbindd_enable=${winbindd_enable:-"YES"}
-%%WINBIND%%    # Check, that winbind is actally configured
-%%WINBIND%%    if [ ! "`egrep -i '(idmap.*uid|winbind.*uid)' ${samba_config} 2>/dev/null | egrep -v [\#\;]`" ]; then
-%%WINBIND%%    	#warn "Winbind support is not configured"
-%%WINBIND%%	winbindd_enable="NO"
-%%WINBIND%%    fi
-fi
-
-# Hack until run_rc_command() get rid of exit()
-samba_stop() {
-    pid=$(check_pidfile ${pidfile} ${command})
-    if [ -z ${pid} ]; then
-	echo "${name} not running? (check ${pidfile})."
-	return 1
-    fi
-    echo "Stopping ${command}."
-    kill -${sig_stop:-TERM} ${pid}
-    [ $? -ne 0 ] && [ -z "$rc_force" ] && return 1
-    wait_for_pids ${pid}
-}
-
-nmbd_precmd() {
-    # XXX: Never delete winbindd_idmap, winbindd_cache and group_mapping
-    if [ -d "%%SAMBA_LOCKDIR%%" ]; then
-	echo "Starting SAMBA: removing stale tdbs :"
-	for file in connections.tdb locking.tdb messages.tdb \
-		    sessionid.tdb unexpected.tdb brlock.tdb \
-		    namelist.debug
-	do
-	    rm -vf "%%SAMBA_LOCKDIR%%/$file"
-	done
-    fi
-}
-
-# nmbd
-name=nmbd
-rcvar=`set_rcvar`
-command="%%PREFIX%%/sbin/${name}"
-required_dirs="%%SAMBA_LOCKDIR%%"
-pidfile=%%SAMBA_RUNDIR%%/${name}.pid
-start_precmd="nmbd_precmd"
-stop_cmd="samba_stop"
-# Defaults
-nmbd_enable=${nmbd_enable:-"NO"}
-nmbd_flags=${nmbd_flags:-"-D"}
-command_args="${nmbd_flags} -s ${samba_config}"
-
-load_rc_config $name
-run_rc_command "$1"
-
-# smbd
-name=smbd
-rcvar=`set_rcvar`
-command="%%PREFIX%%/sbin/${name}"
-pidfile=%%SAMBA_RUNDIR%%/${name}.pid
-start_precmd=":"
-stop_cmd="samba_stop"
-# Defaults
-smbd_enable=${smbd_enable:-"NO"}
-smbd_flags=${smbd_flags:-"-D"}
-command_args="${smbd_flags} -s ${samba_config}"
-
-load_rc_config $name
-run_rc_command "$1"
-%%WINBIND%%
-%%WINBIND%%# winbindd
-%%WINBIND%%name=winbindd
-%%WINBIND%%rcvar=`set_rcvar`
-%%WINBIND%%command="%%PREFIX%%/sbin/${name}"
-%%WINBIND%%required_dirs="%%SAMBA_LOCKDIR%%"
-%%WINBIND%%pidfile=%%SAMBA_RUNDIR%%/${name}.pid
-%%WINBIND%%start_precmd=":"
-%%WINBIND%%stop_cmd="samba_stop"
-%%WINBIND%%# Defaults
-%%WINBIND%%winbindd_enable=${winbindd_enable:-"NO"}
-%%WINBIND%%winbindd_flags=${winbindd_flags:-""}
-%%WINBIND%%command_args="${winbindd_flags} -s ${samba_config}"
-%%WINBIND%%
-%%WINBIND%%load_rc_config $name
-%%WINBIND%%run_rc_command "$1"
diff --git a/net/samba-devel/files/smb.conf.default b/net/samba-devel/files/smb.conf.default
deleted file mode 100644
index 860441415069..000000000000
--- a/net/samba-devel/files/smb.conf.default
+++ /dev/null
@@ -1,277 +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 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) 
-# 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: REDHAT4
-   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 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:
-#         SO_RCVBUF=8192 SO_SNDBUF=8192
-   socket options = TCP_NODELAY
-
-# 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 = ASCII
-;   unix charset = ASCII
-;   dos charset = ASCII
-
-# 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
-
-
diff --git a/net/samba-devel/pkg-descr b/net/samba-devel/pkg-descr
deleted file mode 100644
index 28f431acf0f7..000000000000
--- a/net/samba-devel/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/samba-devel/pkg-message b/net/samba-devel/pkg-message
deleted file mode 100644
index 2346286df435..000000000000
--- a/net/samba-devel/pkg-message
+++ /dev/null
@@ -1,21 +0,0 @@
-******************************************************************************
-Starting from Samba 3.0.3 this port doesn't create 'smbpasswd' file
-automatically. 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 Samba-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.
-------------------------------------------------------------------------------
-NOTICE: *.tdb files have been moved from /var/run/samba/ to /var/db/samba/!
-NOTICE: Please, move them manually, if necessary, at least winbind_*.tdb.
-******************************************************************************
diff --git a/net/samba-devel/pkg-plist b/net/samba-devel/pkg-plist
deleted file mode 100644
index 6a53e2d5a203..000000000000
--- a/net/samba-devel/pkg-plist
+++ /dev/null
@@ -1,851 +0,0 @@
-bin/findsmb
-bin/make_smbpasswd
-bin/net
-bin/nmblookup
-bin/ntlm_auth
-bin/pdbedit
-bin/profiles
-bin/rpcclient
-bin/smbcacls
-bin/smbclient
-bin/smbcontrol
-bin/smbcquotas
-bin/smbpasswd
-bin/smbspool
-bin/smbstatus
-bin/smbtar
-bin/smbtree
-bin/tdbbackup
-bin/tdbdump
-bin/testparm
-bin/testprns
-%%WINBIND%%bin/wbinfo
-@unexec %D/etc/rc.d/samba.sh forcestop 2>/dev/null || true
-etc/rc.d/samba.sh
-@unexec if cmp -s %D/etc/smb.conf %D/etc/smb.conf.default; then rm -f %D/etc/smb.conf; fi
-etc/smb.conf.default
-sbin/smbd
-sbin/nmbd
-sbin/swat
-%%WINBIND%%sbin/winbindd
-lib/samba/lowcase.dat
-lib/samba/upcase.dat
-lib/samba/valid.dat
-lib/samba/de.msg
-lib/samba/en.msg
-lib/samba/fr.msg
-lib/samba/it.msg
-lib/samba/ja.msg
-lib/samba/nl.msg
-lib/samba/pl.msg
-lib/samba/tr.msg
-lib/samba/vfs/audit.so
-lib/samba/vfs/cap.so
-lib/samba/vfs/default_quota.so
-lib/samba/vfs/expand_msdfs.so
-lib/samba/vfs/extd_audit.so
-lib/samba/vfs/fake_perms.so
-%%I18N%%lib/samba/vfs/hex.so
-lib/samba/vfs/netatalk.so
-lib/samba/vfs/readonly.so
-lib/samba/vfs/recycle.so
-lib/samba/vfs/shadow_copy.so
-lib/samba/charset/CP437.so
-lib/samba/charset/CP850.so
-%%SAMMYSQL%%lib/samba/pdb/mysql.so
-%%SAMPGSQL%%lib/samba/pdb/pgsql.so
-%%SAMXML%%lib/samba/pdb/xml.so
-%%WINBIND_NSS%%lib/nss_winbind.so.1
-%%WINBIND_NSS%%lib/nss_wins.so.1
-%%WINBIND%%lib/pam_winbind.so
-%%SMBPASS%%lib/pam_smbpass.so
-@dirrm lib/samba/rpc
-@dirrm lib/samba/pdb
-@dirrm lib/samba/idmap
-@dirrm lib/samba/charset
-@dirrm lib/samba/auth
-@unexec rmdir %D/lib/samba/vfs 2>/dev/null || true
-@unexec rmdir %D/lib/samba 2>/dev/null || true
-%%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
-%%EXAMPLESDIR%%/LDAP/README
-%%EXAMPLESDIR%%/LDAP/convertSambaAccount
-%%EXAMPLESDIR%%/LDAP/ldapsync.pl
-%%EXAMPLESDIR%%/LDAP/samba-nds.schema
-%%EXAMPLESDIR%%/LDAP/samba-schema-netscapeds4.x
-%%EXAMPLESDIR%%/LDAP/samba-schema-netscapeds5.x
-%%EXAMPLESDIR%%/LDAP/samba-schema.IBMSecureWay
-%%EXAMPLESDIR%%/LDAP/samba.schema
-%%EXAMPLESDIR%%/LDAP/samba.schema.at.IBM-DS
-%%EXAMPLESDIR%%/LDAP/samba.schema.oc.IBM-DS
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/CONTRIBUTORS
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/COPYING
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/ChangeLog
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/FILES
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/INFRASTRUCTURE
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/INSTALL
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/Makefile
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/README
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/TODO
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/cgi/README
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/cgi/ldappass.cgi
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd/Makefile
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd/getopt.c
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd/getopt.h
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd/md4.c
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd/mkntpwd.c
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd/mkntpwd.h
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd/smbdes.c
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-groupadd.pl
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-groupdel.pl
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-groupmod.pl
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-groupshow.pl
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-migrate-accounts.pl
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-migrate-groups.pl
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-passwd.pl
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-populate.pl
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-tools.spec
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-useradd.pl
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-userdel.pl
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-usermod.pl
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-usershow.pl
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap_conf.pm
-%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap_tools.pm
-%%EXAMPLESDIR%%/README
-%%EXAMPLESDIR%%/VFS/Makefile.in
-%%EXAMPLESDIR%%/VFS/README
-%%EXAMPLESDIR%%/VFS/autogen.sh
-%%EXAMPLESDIR%%/VFS/configure.in
-%%EXAMPLESDIR%%/VFS/install-sh
-%%EXAMPLESDIR%%/VFS/shadow_copy_test.c
-%%EXAMPLESDIR%%/VFS/skel_opaque.c
-%%EXAMPLESDIR%%/VFS/skel_transparent.c
-%%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%%/nss/nss_winbind.c
-%%EXAMPLESDIR%%/nss/nss_winbind.h
-%%EXAMPLESDIR%%/nss/wbtest.c
-%%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
-%%SMBPASS%%@dirrm %%EXAMPLESDIR%%/pam_smbpass
-@dirrm %%EXAMPLESDIR%%/wins_hook
-@dirrm %%EXAMPLESDIR%%/validchars
-@dirrm %%EXAMPLESDIR%%/tridge
-@dirrm %%EXAMPLESDIR%%/svr4-startup
-@dirrm %%EXAMPLESDIR%%/scripts
-@dirrm %%EXAMPLESDIR%%/printing
-@dirrm %%EXAMPLESDIR%%/printer-accounting
-@dirrm %%EXAMPLESDIR%%/pdb/mysql
-@dirrm %%EXAMPLESDIR%%/pdb
-@dirrm %%EXAMPLESDIR%%/ntlogon
-@dirrm %%EXAMPLESDIR%%/nss
-@dirrm %%EXAMPLESDIR%%/misc
-@dirrm %%EXAMPLESDIR%%/genlogon
-@dirrm %%EXAMPLESDIR%%/dce-dfs
-@dirrm %%EXAMPLESDIR%%/autofs
-@dirrm %%EXAMPLESDIR%%/auth
-@dirrm %%EXAMPLESDIR%%/VFS
-@dirrm %%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd
-@dirrm %%EXAMPLESDIR%%/LDAP/smbldap-tools/cgi
-@dirrm %%EXAMPLESDIR%%/LDAP/smbldap-tools
-@dirrm %%EXAMPLESDIR%%/LDAP
-@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/Manifest
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
-%%PORTDOCS%%%%DOCSDIR%%/Read-Manifest-Now
-%%PORTDOCS%%%%DOCSDIR%%/Roadmap
-%%PORTDOCS%%%%DOCSDIR%%/THANKS
-%%PORTDOCS%%%%DOCSDIR%%/WHATSNEW.txt
-%%PORTDOCS%%%%DOCSDIR%%/devel/CodingSuggestions.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/Packaging.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/architecture.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/contributing.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/debug.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/index.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/internals.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/modules.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/netbios.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/ntdomain.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/parsing.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/pr01.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/printing.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/pt01.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/pt02.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/pt03.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/pt04.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/pt05.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/pwencrypt.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/registry.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/rpc-plugin.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/sam.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/samba.css
-%%PORTDOCS%%%%DOCSDIR%%/devel/tracing.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/unix-smb.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/vfs.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/windows-debug.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/wins.html
-%%PORTDOCS%%%%DOCSDIR%%/guide/2000users.html
-%%PORTDOCS%%%%DOCSDIR%%/guide/Big500users.html
-%%PORTDOCS%%%%DOCSDIR%%/guide/DomApps.html
-%%PORTDOCS%%%%DOCSDIR%%/guide/HA.html
-%%PORTDOCS%%%%DOCSDIR%%/guide/appendix.html
-%%PORTDOCS%%%%DOCSDIR%%/guide/go01.html
-%%PORTDOCS%%%%DOCSDIR%%/guide/happy.html
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/AccountingNetwork.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/Charity-Network.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/Domain-WorkgroupAnnouncement.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/HostAnnouncment.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/LocalMasterAnnouncement.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/NullConnect.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/UNIX-Samba-and-LDAP.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/UserConnect.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/UserMgrNT4.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/WINREPRESSME-Capture.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/WINREPRESSME-Capture2.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/Windows-ME-WINEPRESSME-Startup-30min-ProtocolStats.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/Windows-ME-WINEPRESSME-Startup-30min-TraceStats.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/WindowsXP-NullConnection.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/WindowsXP-UserConnection.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/XP-screen001.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/acct2net.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/ch7-dual-additive-LDAP-Ok.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/ch7-dual-additive-LDAP.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/ch7-fail-overLDAP.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/ch7-singleLDAP.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/ch8-migration.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/chap4-net.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/chap5-net.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/chap6-net.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/chap7-idresol.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/chap7-net-A.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/chap7-net-Ar.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/chap7-net.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/chap7-net2-B.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/chap7-net2-Br.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/chap7-net2.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/chap7-net2r.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/chap7-netr.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/chap9-ADSDC.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/chap9-SambaDC.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/lam-config.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/lam-group-members.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/lam-groups.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/lam-hosts.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/lam-login.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/lam-users.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/openmag.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/wxpp001.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/wxpp004.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/wxpp006.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/wxpp007.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/wxpp008.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/wxpp010.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/wxpp011.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/wxpp012.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/wxpp013.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/wxpp015.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/index.html
-%%PORTDOCS%%%%DOCSDIR%%/guide/ix01.html
-%%PORTDOCS%%%%DOCSDIR%%/guide/kerberos.html
-%%PORTDOCS%%%%DOCSDIR%%/guide/migration.html
-%%PORTDOCS%%%%DOCSDIR%%/guide/pr01.html
-%%PORTDOCS%%%%DOCSDIR%%/guide/pr02.html
-%%PORTDOCS%%%%DOCSDIR%%/guide/pr03.html
-%%PORTDOCS%%%%DOCSDIR%%/guide/preface.html
-%%PORTDOCS%%%%DOCSDIR%%/guide/primer.html
-%%PORTDOCS%%%%DOCSDIR%%/guide/samba.css
-%%PORTDOCS%%%%DOCSDIR%%/guide/secure.html
-%%PORTDOCS%%%%DOCSDIR%%/guide/simple.html
-%%PORTDOCS%%%%DOCSDIR%%/guide/small.html
-%%PORTDOCS%%%%DOCSDIR%%/guide/unixclients.html
-%%PORTDOCS%%%%DOCSDIR%%/history
-%%PORTDOCS%%%%DOCSDIR%%/howto/AccessControls.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/AdvancedNetworkManagement.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/Appendix.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/Backup.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/CUPS-printing.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/ClientConfig.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/DNSDHCP.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/FastStart.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/InterdomainTrusts.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/IntroSMB.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/NT4Migration.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/NetworkBrowsing.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/Other-Clients.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/PolicyMgmt.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/Portability.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/ProfileMgmt.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/SWAT.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/SambaHA.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/ServerType.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/StandAloneServer.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/VFS.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/bugreport.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/compiling.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/diagnosis.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/domain-member.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/go01.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/groupmapping.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/10small.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/11small.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/12small.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/13small.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/14small.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/1small.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/2small.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/3small.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/4small.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/5small.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/6small.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/7small.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/8small.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/9small.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/a_small.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/access1.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/browsing1.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/cups1.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/cups2.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/domain.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/ethereal1.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/ethereal2.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/idmap-gid2sid.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/idmap-groups.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/idmap-sid2gid.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/idmap-sid2uid.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/idmap-store-gid2sid.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/idmap-uid2sid.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/idmap.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/idmap_winbind_no_loop.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/pdftoepsonusb.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/pdftosocket.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/trusts1.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/index.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/install.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/integrate-ms-networks.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/introduction.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/ix01.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/locking.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/migration.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/msdfs.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/optional.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/pam.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/passdb.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/pr01.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/pr02.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/pr03.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/printing.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/problems.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/samba-bdc.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/samba-pdc.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/samba.css
-%%PORTDOCS%%%%DOCSDIR%%/howto/securing-samba.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/speed.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/troubleshooting.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/type.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/unicode.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/upgrading-to-3.0.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/winbind.html
-%%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%%@dirrm %%DOCSDIR%%/registry
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/howto/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/howto
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/guide/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/guide
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/devel
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-share/swat/help/devel/CodingSuggestions.html
-share/swat/help/devel/Packaging.html
-share/swat/help/devel/architecture.html
-share/swat/help/devel/contributing.html
-share/swat/help/devel/debug.html
-share/swat/help/devel/index.html
-share/swat/help/devel/internals.html
-share/swat/help/devel/modules.html
-share/swat/help/devel/netbios.html
-share/swat/help/devel/ntdomain.html
-share/swat/help/devel/parsing.html
-share/swat/help/devel/pr01.html
-share/swat/help/devel/printing.html
-share/swat/help/devel/pt01.html
-share/swat/help/devel/pt02.html
-share/swat/help/devel/pt03.html
-share/swat/help/devel/pt04.html
-share/swat/help/devel/pt05.html
-share/swat/help/devel/pwencrypt.html
-share/swat/help/devel/registry.html
-share/swat/help/devel/rpc-plugin.html
-share/swat/help/devel/sam.html
-share/swat/help/devel/tracing.html
-share/swat/help/devel/unix-smb.html
-share/swat/help/devel/vfs.html
-share/swat/help/devel/windows-debug.html
-share/swat/help/devel/wins.html
-share/swat/help/editreg.1.html
-share/swat/help/findsmb.1.html
-share/swat/help/guide/2000users.html
-share/swat/help/guide/AccountingNetwork.png
-share/swat/help/guide/Big500users.html
-share/swat/help/guide/Charity-Network.png
-share/swat/help/guide/DomApps.html
-share/swat/help/guide/Domain-WorkgroupAnnouncement.png
-share/swat/help/guide/HA.html
-share/swat/help/guide/HostAnnouncment.png
-share/swat/help/guide/LocalMasterAnnouncement.png
-share/swat/help/guide/NullConnect.png
-share/swat/help/guide/UNIX-Samba-and-LDAP.png
-share/swat/help/guide/UserConnect.png
-share/swat/help/guide/UserMgrNT4.png
-share/swat/help/guide/WINREPRESSME-Capture.png
-share/swat/help/guide/WINREPRESSME-Capture2.png
-share/swat/help/guide/Windows-ME-WINEPRESSME-Startup-30min-ProtocolStats.png
-share/swat/help/guide/Windows-ME-WINEPRESSME-Startup-30min-TraceStats.png
-share/swat/help/guide/WindowsXP-NullConnection.png
-share/swat/help/guide/WindowsXP-UserConnection.png
-share/swat/help/guide/XP-screen001.png
-share/swat/help/guide/acct2net.png
-share/swat/help/guide/appendix.html
-share/swat/help/guide/ch7-dual-additive-LDAP-Ok.png
-share/swat/help/guide/ch7-dual-additive-LDAP.png
-share/swat/help/guide/ch7-fail-overLDAP.png
-share/swat/help/guide/ch7-singleLDAP.png
-share/swat/help/guide/ch8-migration.png
-share/swat/help/guide/chap4-net.png
-share/swat/help/guide/chap5-net.png
-share/swat/help/guide/chap6-net.png
-share/swat/help/guide/chap7-idresol.png
-share/swat/help/guide/chap7-net-A.png
-share/swat/help/guide/chap7-net-Ar.png
-share/swat/help/guide/chap7-net.png
-share/swat/help/guide/chap7-net2-B.png
-share/swat/help/guide/chap7-net2-Br.png
-share/swat/help/guide/chap7-net2.png
-share/swat/help/guide/chap7-net2r.png
-share/swat/help/guide/chap7-netr.png
-share/swat/help/guide/chap9-ADSDC.png
-share/swat/help/guide/chap9-SambaDC.png
-share/swat/help/guide/go01.html
-share/swat/help/guide/happy.html
-share/swat/help/guide/index.html
-share/swat/help/guide/ix01.html
-share/swat/help/guide/kerberos.html
-share/swat/help/guide/lam-config.png
-share/swat/help/guide/lam-group-members.png
-share/swat/help/guide/lam-groups.png
-share/swat/help/guide/lam-hosts.png
-share/swat/help/guide/lam-login.png
-share/swat/help/guide/lam-users.png
-share/swat/help/guide/migration.html
-share/swat/help/guide/openmag.png
-share/swat/help/guide/pr01.html
-share/swat/help/guide/pr02.html
-share/swat/help/guide/pr03.html
-share/swat/help/guide/preface.html
-share/swat/help/guide/primer.html
-share/swat/help/guide/secure.html
-share/swat/help/guide/simple.html
-share/swat/help/guide/small.html
-share/swat/help/guide/unixclients.html
-share/swat/help/guide/wxpp001.png
-share/swat/help/guide/wxpp004.png
-share/swat/help/guide/wxpp006.png
-share/swat/help/guide/wxpp007.png
-share/swat/help/guide/wxpp008.png
-share/swat/help/guide/wxpp010.png
-share/swat/help/guide/wxpp011.png
-share/swat/help/guide/wxpp012.png
-share/swat/help/guide/wxpp013.png
-share/swat/help/guide/wxpp015.png
-share/swat/help/howto/10small.png
-share/swat/help/howto/11small.png
-share/swat/help/howto/12small.png
-share/swat/help/howto/13small.png
-share/swat/help/howto/14small.png
-share/swat/help/howto/1small.png
-share/swat/help/howto/2small.png
-share/swat/help/howto/3small.png
-share/swat/help/howto/4small.png
-share/swat/help/howto/5small.png
-share/swat/help/howto/6small.png
-share/swat/help/howto/7small.png
-share/swat/help/howto/8small.png
-share/swat/help/howto/9small.png
-share/swat/help/howto/AccessControls.html
-share/swat/help/howto/AdvancedNetworkManagement.html
-share/swat/help/howto/Appendix.html
-share/swat/help/howto/Backup.html
-share/swat/help/howto/CUPS-printing.html
-share/swat/help/howto/ClientConfig.html
-share/swat/help/howto/DNSDHCP.html
-share/swat/help/howto/FastStart.html
-share/swat/help/howto/InterdomainTrusts.html
-share/swat/help/howto/IntroSMB.html
-share/swat/help/howto/NT4Migration.html
-share/swat/help/howto/NetworkBrowsing.html
-share/swat/help/howto/Other-Clients.html
-share/swat/help/howto/PolicyMgmt.html
-share/swat/help/howto/Portability.html
-share/swat/help/howto/ProfileMgmt.html
-share/swat/help/howto/SWAT.html
-share/swat/help/howto/SambaHA.html
-share/swat/help/howto/ServerType.html
-share/swat/help/howto/StandAloneServer.html
-share/swat/help/howto/VFS.html
-share/swat/help/howto/a_small.png
-share/swat/help/howto/access1.png
-share/swat/help/howto/browsing1.png
-share/swat/help/howto/bugreport.html
-share/swat/help/howto/compiling.html
-share/swat/help/howto/cups1.png
-share/swat/help/howto/cups2.png
-share/swat/help/howto/diagnosis.html
-share/swat/help/howto/domain-member.html
-share/swat/help/howto/domain.png
-share/swat/help/howto/ethereal1.png
-share/swat/help/howto/ethereal2.png
-share/swat/help/howto/go01.html
-share/swat/help/howto/groupmapping.html
-share/swat/help/howto/idmap-gid2sid.png
-share/swat/help/howto/idmap-groups.png
-share/swat/help/howto/idmap-sid2gid.png
-share/swat/help/howto/idmap-sid2uid.png
-share/swat/help/howto/idmap-store-gid2sid.png
-share/swat/help/howto/idmap-uid2sid.png
-share/swat/help/howto/idmap.png
-share/swat/help/howto/idmap_winbind_no_loop.png
-share/swat/help/howto/index.html
-share/swat/help/howto/install.html
-share/swat/help/howto/integrate-ms-networks.html
-share/swat/help/howto/introduction.html
-share/swat/help/howto/ix01.html
-share/swat/help/howto/locking.html
-share/swat/help/howto/migration.html
-share/swat/help/howto/msdfs.html
-share/swat/help/howto/optional.html
-share/swat/help/howto/pam.html
-share/swat/help/howto/passdb.html
-share/swat/help/howto/pdftoepsonusb.png
-share/swat/help/howto/pdftosocket.png
-share/swat/help/howto/pr01.html
-share/swat/help/howto/pr02.html
-share/swat/help/howto/pr03.html
-share/swat/help/howto/printing.html
-share/swat/help/howto/problems.html
-share/swat/help/howto/samba-bdc.html
-share/swat/help/howto/samba-pdc.html
-share/swat/help/howto/securing-samba.html
-share/swat/help/howto/speed.html
-share/swat/help/howto/troubleshooting.html
-share/swat/help/howto/trusts1.png
-share/swat/help/howto/type.html
-share/swat/help/howto/unicode.html
-share/swat/help/howto/upgrading-to-3.0.html
-share/swat/help/howto/winbind.html
-share/swat/help/lmhosts.5.html
-share/swat/help/log2pcap.1.html
-share/swat/help/mount.cifs.8.html
-share/swat/help/net.8.html
-share/swat/help/nmbd.8.html
-share/swat/help/nmblookup.1.html
-share/swat/help/ntlm_auth.1.html
-share/swat/help/pdbedit.8.html
-share/swat/help/profiles.1.html
-share/swat/help/rpcclient.1.html
-share/swat/help/samba.7.html
-share/swat/help/smb.conf.5.html
-share/swat/help/smbcacls.1.html
-share/swat/help/smbclient.1.html
-share/swat/help/smbcontrol.1.html
-share/swat/help/smbcquotas.1.html
-share/swat/help/smbd.8.html
-share/swat/help/smbget.1.html
-share/swat/help/smbgetrc.5.html
-share/swat/help/smbmnt.8.html
-share/swat/help/smbmount.8.html
-share/swat/help/smbpasswd.5.html
-share/swat/help/smbpasswd.8.html
-share/swat/help/smbsh.1.html
-share/swat/help/smbspool.8.html
-share/swat/help/smbstatus.1.html
-share/swat/help/smbtar.1.html
-share/swat/help/smbtree.1.html
-share/swat/help/smbumount.8.html
-share/swat/help/swat.8.html
-share/swat/help/tdbbackup.8.html
-share/swat/help/tdbdump.8.html
-share/swat/help/testparm.1.html
-share/swat/help/testprns.1.html
-share/swat/help/vfstest.1.html
-share/swat/help/wbinfo.1.html
-share/swat/help/welcome.html
-share/swat/help/winbindd.8.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/ja/include/footer.html
-share/swat/lang/ja/include/header.html
-share/swat/lang/ja/include/header.nocss.html
-share/swat/lang/ja/include/header_css.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
-share/swat/lang/tr/include/header.html
-share/swat/using_samba/appa.html
-share/swat/using_samba/appb.html
-share/swat/using_samba/appc.html
-share/swat/using_samba/appd.html
-share/swat/using_samba/appe.html
-share/swat/using_samba/appf.html
-share/swat/using_samba/appg.html
-share/swat/using_samba/ch00.html
-share/swat/using_samba/ch01.html
-share/swat/using_samba/ch02.html
-share/swat/using_samba/ch03.html
-share/swat/using_samba/ch04.html
-share/swat/using_samba/ch05.html
-share/swat/using_samba/ch06.html
-share/swat/using_samba/ch07.html
-share/swat/using_samba/ch08.html
-share/swat/using_samba/ch09.html
-share/swat/using_samba/ch10.html
-share/swat/using_samba/ch11.html
-share/swat/using_samba/ch12.html
-share/swat/using_samba/figs/sam2_0101.gif
-share/swat/using_samba/figs/sam2_0102.gif
-share/swat/using_samba/figs/sam2_0103.gif
-share/swat/using_samba/figs/sam2_0104.gif
-share/swat/using_samba/figs/sam2_0105.gif
-share/swat/using_samba/figs/sam2_0106.gif
-share/swat/using_samba/figs/sam2_0107.gif
-share/swat/using_samba/figs/sam2_0108.gif
-share/swat/using_samba/figs/sam2_0109.gif
-share/swat/using_samba/figs/sam2_0110.gif
-share/swat/using_samba/figs/sam2_0111.gif
-share/swat/using_samba/figs/sam2_0112.gif
-share/swat/using_samba/figs/sam2_0113.gif
-share/swat/using_samba/figs/sam2_0114.gif
-share/swat/using_samba/figs/sam2_0201.gif
-share/swat/using_samba/figs/sam2_0202.gif
-share/swat/using_samba/figs/sam2_0203.gif
-share/swat/using_samba/figs/sam2_0204.gif
-share/swat/using_samba/figs/sam2_0301.gif
-share/swat/using_samba/figs/sam2_0302.gif
-share/swat/using_samba/figs/sam2_0303.gif
-share/swat/using_samba/figs/sam2_0304.gif
-share/swat/using_samba/figs/sam2_0305.gif
-share/swat/using_samba/figs/sam2_0306.gif
-share/swat/using_samba/figs/sam2_0307.gif
-share/swat/using_samba/figs/sam2_0308.gif
-share/swat/using_samba/figs/sam2_0309.gif
-share/swat/using_samba/figs/sam2_0310.gif
-share/swat/using_samba/figs/sam2_0311.gif
-share/swat/using_samba/figs/sam2_0312.gif
-share/swat/using_samba/figs/sam2_0313.gif
-share/swat/using_samba/figs/sam2_0314.gif
-share/swat/using_samba/figs/sam2_0315.gif
-share/swat/using_samba/figs/sam2_0316.gif
-share/swat/using_samba/figs/sam2_0317.gif
-share/swat/using_samba/figs/sam2_0318.gif
-share/swat/using_samba/figs/sam2_0319.gif
-share/swat/using_samba/figs/sam2_0320.gif
-share/swat/using_samba/figs/sam2_0321.gif
-share/swat/using_samba/figs/sam2_0322.gif
-share/swat/using_samba/figs/sam2_0323.gif
-share/swat/using_samba/figs/sam2_0324.gif
-share/swat/using_samba/figs/sam2_0325.gif
-share/swat/using_samba/figs/sam2_0326.gif
-share/swat/using_samba/figs/sam2_0327.gif
-share/swat/using_samba/figs/sam2_0328.gif
-share/swat/using_samba/figs/sam2_0329.gif
-share/swat/using_samba/figs/sam2_0330.gif
-share/swat/using_samba/figs/sam2_0331.gif
-share/swat/using_samba/figs/sam2_0332.gif
-share/swat/using_samba/figs/sam2_0333.gif
-share/swat/using_samba/figs/sam2_0334.gif
-share/swat/using_samba/figs/sam2_0335.gif
-share/swat/using_samba/figs/sam2_0336.gif
-share/swat/using_samba/figs/sam2_0337.gif
-share/swat/using_samba/figs/sam2_0338.gif
-share/swat/using_samba/figs/sam2_0339.gif
-share/swat/using_samba/figs/sam2_0340.gif
-share/swat/using_samba/figs/sam2_0341.gif
-share/swat/using_samba/figs/sam2_0342.gif
-share/swat/using_samba/figs/sam2_0343.gif
-share/swat/using_samba/figs/sam2_0344.gif
-share/swat/using_samba/figs/sam2_0345.gif
-share/swat/using_samba/figs/sam2_0346.gif
-share/swat/using_samba/figs/sam2_0347.gif
-share/swat/using_samba/figs/sam2_0348.gif
-share/swat/using_samba/figs/sam2_0349.gif
-share/swat/using_samba/figs/sam2_0350.gif
-share/swat/using_samba/figs/sam2_0351.gif
-share/swat/using_samba/figs/sam2_0352.gif
-share/swat/using_samba/figs/sam2_0353.gif
-share/swat/using_samba/figs/sam2_0354.gif
-share/swat/using_samba/figs/sam2_0355.gif
-share/swat/using_samba/figs/sam2_0356.gif
-share/swat/using_samba/figs/sam2_0357.gif
-share/swat/using_samba/figs/sam2_0358.gif
-share/swat/using_samba/figs/sam2_0359.gif
-share/swat/using_samba/figs/sam2_0360.gif
-share/swat/using_samba/figs/sam2_0361.gif
-share/swat/using_samba/figs/sam2_0401.gif
-share/swat/using_samba/figs/sam2_0402.gif
-share/swat/using_samba/figs/sam2_0403.gif
-share/swat/using_samba/figs/sam2_0404.gif
-share/swat/using_samba/figs/sam2_0405.gif
-share/swat/using_samba/figs/sam2_0406.gif
-share/swat/using_samba/figs/sam2_0407.gif
-share/swat/using_samba/figs/sam2_0408.gif
-share/swat/using_samba/figs/sam2_0409.gif
-share/swat/using_samba/figs/sam2_0410.gif
-share/swat/using_samba/figs/sam2_0411.gif
-share/swat/using_samba/figs/sam2_0412.gif
-share/swat/using_samba/figs/sam2_0413.gif
-share/swat/using_samba/figs/sam2_0414.gif
-share/swat/using_samba/figs/sam2_0415.gif
-share/swat/using_samba/figs/sam2_0416.gif
-share/swat/using_samba/figs/sam2_0417.gif
-share/swat/using_samba/figs/sam2_0501.gif
-share/swat/using_samba/figs/sam2_0502.gif
-share/swat/using_samba/figs/sam2_0503.gif
-share/swat/using_samba/figs/sam2_0504.gif
-share/swat/using_samba/figs/sam2_0505.gif
-share/swat/using_samba/figs/sam2_0506.gif
-share/swat/using_samba/figs/sam2_0507.gif
-share/swat/using_samba/figs/sam2_0508.gif
-share/swat/using_samba/figs/sam2_0601.gif
-share/swat/using_samba/figs/sam2_0602.gif
-share/swat/using_samba/figs/sam2_0603.gif
-share/swat/using_samba/figs/sam2_0604.gif
-share/swat/using_samba/figs/sam2_0605.gif
-share/swat/using_samba/figs/sam2_0701.gif
-share/swat/using_samba/figs/sam2_0801.gif
-share/swat/using_samba/figs/sam2_0802.gif
-share/swat/using_samba/figs/sam2_0803.gif
-share/swat/using_samba/figs/sam2_0804.gif
-share/swat/using_samba/figs/sam2_0805.gif
-share/swat/using_samba/figs/sam2_0806.gif
-share/swat/using_samba/figs/sam2_0807.gif
-share/swat/using_samba/figs/sam2_0808.gif
-share/swat/using_samba/figs/sam2_0809.gif
-share/swat/using_samba/figs/sam2_0810.gif
-share/swat/using_samba/figs/sam2_0811.gif
-share/swat/using_samba/figs/sam2_0901.gif
-share/swat/using_samba/figs/sam2_0902.gif
-share/swat/using_samba/figs/sam2_0903.gif
-share/swat/using_samba/figs/sam2_1001.gif
-share/swat/using_samba/figs/sam2_1002.gif
-share/swat/using_samba/figs/sam2_1003.gif
-share/swat/using_samba/figs/sam2_1004.gif
-share/swat/using_samba/figs/sam2_1005.gif
-share/swat/using_samba/figs/sam2_1006.gif
-share/swat/using_samba/figs/sam2_1101.gif
-share/swat/using_samba/figs/sam2_1102.gif
-share/swat/using_samba/figs/sam2_af01.gif
-share/swat/using_samba/figs/sam2_af02.gif
-share/swat/using_samba/figs/sam2_af03.gif
-share/swat/using_samba/figs/sam2_af04.gif
-share/swat/using_samba/figs/sam2_af05.gif
-share/swat/using_samba/figs/sam2_af06.gif
-share/swat/using_samba/figs/sam2_af07.gif
-share/swat/using_samba/inx.html
-share/swat/using_samba/samba2_s.gif
-share/swat/using_samba/samba2_xs.gif
-share/swat/using_samba/toc.html
-@dirrm share/swat/using_samba/figs
-@dirrm share/swat/using_samba
-@dirrm share/swat/lang/tr/include
-@dirrm share/swat/lang/tr/images
-@dirrm share/swat/lang/tr/help
-@dirrm share/swat/lang/tr
-@dirrm share/swat/lang/ja/include
-@dirrm share/swat/lang/ja/images
-@dirrm share/swat/lang/ja/help
-@dirrm share/swat/lang/ja
-@dirrm share/swat/lang
-@dirrm share/swat/include
-@dirrm share/swat/images
-@dirrm share/swat/help/images
-@dirrm share/swat/help/howto/images
-@dirrm share/swat/help/howto
-@dirrm share/swat/help/guide/images
-@dirrm share/swat/help/guide
-@dirrm share/swat/help/devel
-@dirrm share/swat/help
-@dirrm share/swat
diff --git a/net/samba-libsmbclient/Makefile b/net/samba-libsmbclient/Makefile
index 38f88ac86608..4a5e2dd5d31c 100644
--- a/net/samba-libsmbclient/Makefile
+++ b/net/samba-libsmbclient/Makefile
@@ -13,7 +13,7 @@ COMMENT=		The shared lib from the samba packages
 
 CONFLICTS=
 
-SAMBA_PORT=		samba-devel
+SAMBA_PORT=		samba3
 SAMBA_SUBPORT=		yes
 
 MASTERDIR=		${.CURDIR}/../${SAMBA_PORT}