USE_AUTOCONF implied

Add extra configure args
Add directories to MASTER_SITE_SUBDIR
PORTDOC police with DOCSDIR
pkg-plist cleanup

Submitted by:	pat@databits.net

2 files changed, 330 insertions, 333 deletions

diff --git a/net/samba-devel/Makefile b/net/samba-devel/Makefile
index d12ec12d23b4..56d50fced464 100644
--- a/net/samba-devel/Makefile
+++ b/net/samba-devel/Makefile
@@ -13,14 +13,11 @@ MASTER_SITES=	ftp://ftp.samba.org/pub/samba/%SUBDIR%/ \
 		ftp://de.samba.org/pub/mirror/samba/%SUBDIR%/ \
 		ftp://se.samba.org/pub/samba/%SUBDIR%/ \
 		ftp://ftp.sunet.se/pub/unix/utilities/samba/%SUBDIR%/
-MASTER_SITE_SUBDIR= . old-versions alpha old
-DISTNAME=       samba-${PORTVERSION}
+MASTER_SITE_SUBDIR=	. old-versions alpha old
+DISTNAME=	samba-${PORTVERSION}
 
 MAINTAINER=	dwcjr@FreeBSD.org
 
-NO_LATEST_LINK=	yes
-USE_AUTOCONF=	yes
-
 .if defined(WITH_CUPS)
 LIB_DEPENDS=	cups.2:${PORTSDIR}/print/cups
 .endif
@@ -35,8 +32,9 @@ SAMBA_CONFDIR=	${PREFIX}/etc
 STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/samba.sh.sample
 SAMPLE_CONFIG=	${SAMBA_CONFDIR}/smb.conf.default
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	 --libdir=${SAMBA_CONFDIR} \
+NO_LATEST_LINK=	yes
+USE_AUTOCONF=	yes
+CONFIGURE_ARGS=	--libdir=${SAMBA_CONFDIR} \
 		--localstatedir=${VARDIR} --with-swatdir=${PREFIX}/share/swat \
 		--with-sambabook=${PREFIX}/share/swat/using_samba \
 		--with-lockdir=${VARDIR}/lock --with-privatedir=${SAMBA_PRIVATE}
@@ -44,19 +42,19 @@ CONFIGURE_ARGS=	 --libdir=${SAMBA_CONFDIR} \
 .include <bsd.port.pre.mk>
 
 .if defined(KRB5_HOME) && exists(${KRB5_HOME})
-CONFIGURE_ARGS+=--with-krb5=${KRB5_HOME}
+CONFIGURE_ARGS+=	--with-krb5=${KRB5_HOME}
 .endif
 
 .if defined(WITH_CUPS)
 # This enables CUPS printing support in Samba.
-CONFIGURE_ARGS+=--with-cups=${LOCALBASE}
+CONFIGURE_ARGS+=	--with-cups=${LOCALBASE}
 .endif
 
 .if defined(WITH_ACL_SUPPORT)
 .if ${OSVERSION} < 500018
 BROKEN=	"Requires a recent FreeBSD 5.0-CURRENT"
 .else
-CONFIGURE_ARGS+=--with-acl-support
+CONFIGURE_ARGS+=	--with-acl-support
 .endif
 .endif
 
@@ -108,8 +106,8 @@ post-install:
 .endif
 
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/samba
-	${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${PREFIX}/share/doc/samba
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${DOCSDIR}
 	for i in ${WRKDIR}/${DISTNAME}/README				\
 			${WRKDIR}/${DISTNAME}/COPYING			\
 			${WRKDIR}/${DISTNAME}/Manifest			\
@@ -120,18 +118,17 @@ post-install:
 			${WRKDIR}/${DISTNAME}/docs/THANKS		\
 			${WRKDIR}/${DISTNAME}/docs/announce		\
 			${WRKDIR}/${DISTNAME}/docs/history ; do		\
-		${INSTALL_DATA} $$i ${PREFIX}/share/doc/samba ;		\
+		${INSTALL_DATA} $$i ${DOCSDIR} ;		\
 	done
 	for i in faq htmldocs textdocs ; do			\
-		${MKDIR} ${PREFIX}/share/doc/samba/$$i ;		\
+		${MKDIR} ${DOCSDIR}/$$i ;		\
 		for j in ${WRKDIR}/${DISTNAME}/docs/$$i/* ; do		\
 			if [ $$j != ${WRKDIR}/${DISTNAME}/docs/htmldocs/using_samba ] ; then \
-				${INSTALL_DATA} $$j ${PREFIX}/share/doc/samba/$$i ;\
+				${INSTALL_DATA} $$j ${DOCSDIR}/$$i ;\
 			fi; \
 		done							\
 	done
-	${MKDIR} ${PREFIX}/share/doc/samba
-	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/swat/README ${PREFIX}/share/doc/samba/README.swat
+	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/swat/README ${DOCSDIR}/README.swat
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/net/samba-devel/pkg-plist b/net/samba-devel/pkg-plist
index 04928b54d697..38bbf57a7d3a 100644
--- a/net/samba-devel/pkg-plist
+++ b/net/samba-devel/pkg-plist
@@ -1,226 +1,337 @@
-bin/smbclient
-bin/smbspool
-bin/testparm
-bin/testprns
-bin/smbcacls
-bin/smbstatus
-bin/smbcontrol
-bin/smbpasswd
+bin/convert_smbpasswd
+bin/make_printerdef
 bin/make_smbcodepage
+bin/make_smbpasswd
 bin/make_unicodemap
-bin/rpcclient
 bin/nmblookup
-bin/make_printerdef
+bin/rpcclient
+bin/smbcacls
+bin/smbclient
+bin/smbcontrol
+bin/smbpasswd
+bin/smbspool
+bin/smbstatus
 bin/smbtar
-bin/convert_smbpasswd
-bin/make_smbpasswd
-etc/rc.d/samba.sh.sample
+bin/testparm
+bin/testprns
+etc/codepages/codepage.1251
 etc/codepages/codepage.437
-etc/codepages/unicode_map.437
 etc/codepages/codepage.737
-etc/codepages/unicode_map.737
 etc/codepages/codepage.775
-etc/codepages/unicode_map.775
 etc/codepages/codepage.850
-etc/codepages/unicode_map.850
 etc/codepages/codepage.852
-etc/codepages/unicode_map.852
+etc/codepages/codepage.857
 etc/codepages/codepage.861
-etc/codepages/unicode_map.861
-etc/codepages/codepage.932
-etc/codepages/unicode_map.932
 etc/codepages/codepage.866
-etc/codepages/unicode_map.866
+etc/codepages/codepage.932
+etc/codepages/codepage.936
 etc/codepages/codepage.949
-etc/codepages/unicode_map.949
 etc/codepages/codepage.950
-etc/codepages/unicode_map.950
-etc/codepages/codepage.936
+etc/codepages/unicode_map.437
+etc/codepages/unicode_map.737
+etc/codepages/unicode_map.775
+etc/codepages/unicode_map.850
+etc/codepages/unicode_map.852
+etc/codepages/unicode_map.857
+etc/codepages/unicode_map.861
+etc/codepages/unicode_map.866
+etc/codepages/unicode_map.932
 etc/codepages/unicode_map.936
-etc/codepages/codepage.1251
+etc/codepages/unicode_map.949
+etc/codepages/unicode_map.950
 etc/codepages/unicode_map.ISO8859-1
+etc/codepages/unicode_map.ISO8859-13
+etc/codepages/unicode_map.ISO8859-15
 etc/codepages/unicode_map.ISO8859-2
 etc/codepages/unicode_map.ISO8859-5
 etc/codepages/unicode_map.ISO8859-7
 etc/codepages/unicode_map.ISO8859-9
-etc/codepages/unicode_map.ISO8859-13
-etc/codepages/unicode_map.ISO8859-15
-etc/codepages/codepage.857
-etc/codepages/unicode_map.857
 etc/codepages/unicode_map.KOI8-R
+etc/rc.d/samba.sh.sample
 etc/smb.conf.default
-sbin/smbd
 sbin/nmbd
+sbin/smbd
 sbin/swat
-share/doc/samba/README.FreeBSD
-share/doc/samba/README
-share/doc/samba/COPYING
-share/doc/samba/Manifest
-share/doc/samba/Read-Manifest-Now
-share/doc/samba/Roadmap
-share/doc/samba/WHATSNEW.txt
-share/doc/samba/NT4-Locking.reg
-share/doc/samba/NT4_PlainPassword.reg
-share/doc/samba/Win2000_PlainPassword.reg
-share/doc/samba/Win95_PlainPassword.reg
-share/doc/samba/Win98_PlainPassword.reg
-share/doc/samba/Win9X-CacheHandling.reg
-share/doc/samba/WinME_PlainPassword.reg
-share/doc/samba/WindowsTerminalServer.reg
-share/doc/samba/THANKS
-share/doc/samba/announce
-share/doc/samba/history
-share/doc/samba/faq/Samba-Server-FAQ-1.html
-share/doc/samba/faq/Samba-Server-FAQ-2.html
-share/doc/samba/faq/Samba-Server-FAQ.html
-share/doc/samba/faq/Samba-Server-FAQ.sgml
-share/doc/samba/faq/Samba-meta-FAQ-1.html
-share/doc/samba/faq/Samba-meta-FAQ-2.html
-share/doc/samba/faq/Samba-meta-FAQ-3.html
-share/doc/samba/faq/Samba-meta-FAQ-4.html
-share/doc/samba/faq/Samba-meta-FAQ-5.html
-share/doc/samba/faq/Samba-meta-FAQ-6.html
-share/doc/samba/faq/Samba-meta-FAQ.html
-share/doc/samba/faq/Samba-meta-FAQ.sgml
-share/doc/samba/faq/Samba-meta-FAQ.txt
-share/doc/samba/faq/sambafaq-1.html
-share/doc/samba/faq/sambafaq-2.html
-share/doc/samba/faq/sambafaq-3.html
-share/doc/samba/faq/sambafaq-4.html
-share/doc/samba/faq/sambafaq-5.html
-share/doc/samba/faq/sambafaq.html
-share/doc/samba/faq/sambafaq.sgml
-share/doc/samba/faq/sambafaq.txt
-share/doc/samba/htmldocs/DOMAIN_MEMBER.html
-share/doc/samba/htmldocs/ENCRYPTION.html
-share/doc/samba/htmldocs/NT_Security.html
-share/doc/samba/htmldocs/OS2-Client-HOWTO.html
-share/doc/samba/htmldocs/Samba-HOWTO-Collection.html
-share/doc/samba/htmldocs/Samba-PDC-HOWTO.html
-share/doc/samba/htmldocs/UNIX_INSTALL.html
-share/doc/samba/htmldocs/findsmb.1.html
-share/doc/samba/htmldocs/lmhosts.5.html
-share/doc/samba/htmldocs/make_smbcodepage.1.html
-share/doc/samba/htmldocs/msdfs_setup.html
-share/doc/samba/htmldocs/nmbd.8.html
-share/doc/samba/htmldocs/nmblookup.1.html
-share/doc/samba/htmldocs/printer_driver2.html
-share/doc/samba/htmldocs/rpcclient.1.html
-share/doc/samba/htmldocs/samba-pdc-faq.html
-share/doc/samba/htmldocs/samba-pdc-howto.html
-share/doc/samba/htmldocs/samba.7.html
-share/doc/samba/htmldocs/smb.conf.5.html
-share/doc/samba/htmldocs/smbcacls.1.html
-share/doc/samba/htmldocs/smbclient.1.html
-share/doc/samba/htmldocs/smbcontrol.1.html
-share/doc/samba/htmldocs/smbd.8.html
-share/doc/samba/htmldocs/smbmnt.8.html
-share/doc/samba/htmldocs/smbmount.8.html
-share/doc/samba/htmldocs/smbumount.8.html
-share/doc/samba/htmldocs/smbpasswd.5.html
-share/doc/samba/htmldocs/smbpasswd.8.html
-share/doc/samba/htmldocs/smbrun.1.html
-share/doc/samba/htmldocs/smbsh.1.html
-share/doc/samba/htmldocs/smbspool.8.html
-share/doc/samba/htmldocs/smbstatus.1.html
-share/doc/samba/htmldocs/smbtar.1.html
-share/doc/samba/htmldocs/swat.8.html
-share/doc/samba/htmldocs/testparm.1.html
-share/doc/samba/htmldocs/testprns.1.html
-share/doc/samba/htmldocs/wbinfo.1.html
-share/doc/samba/htmldocs/wfw_slip.htm
-share/doc/samba/htmldocs/winbind.html
-share/doc/samba/htmldocs/winbindd.8.html
-share/doc/samba/textdocs/Application_Serving.txt
-share/doc/samba/textdocs/BROWSING-Config.txt
-share/doc/samba/textdocs/BROWSING.txt
-share/doc/samba/textdocs/BUGS.txt
-share/doc/samba/textdocs/CVS_ACCESS.txt
-share/doc/samba/textdocs/DHCP-Server-Configuration.txt
-share/doc/samba/textdocs/DIAGNOSIS.txt
-share/doc/samba/textdocs/DNIX.txt
-share/doc/samba/textdocs/DOMAIN.txt
-share/doc/samba/textdocs/Faxing.txt
-share/doc/samba/textdocs/GOTCHAS.txt
-share/doc/samba/textdocs/HINTS.txt
-share/doc/samba/textdocs/INSTALL.sambatar
-share/doc/samba/textdocs/Imprints.txt
-share/doc/samba/textdocs/MIRRORS.txt
-share/doc/samba/textdocs/Macintosh_Clients.txt
-share/doc/samba/textdocs/NTDOMAIN.txt
-share/doc/samba/textdocs/NetBIOS.txt
-share/doc/samba/textdocs/PRINTER_DRIVER.txt
-share/doc/samba/textdocs/PROFILES.txt
-share/doc/samba/textdocs/PROJECTS
-share/doc/samba/textdocs/Passwords.txt
-share/doc/samba/textdocs/Printing.txt
-share/doc/samba/textdocs/README.DCEDFS
-share/doc/samba/textdocs/README.jis
-share/doc/samba/textdocs/README.sambatar
-share/doc/samba/textdocs/Recent-FAQs.txt
-share/doc/samba/textdocs/RoutedNetworks.txt
-share/doc/samba/textdocs/SCO.txt
-share/doc/samba/textdocs/SMBTAR.notes
-share/doc/samba/textdocs/SSLeay.txt
-share/doc/samba/textdocs/Speed.txt
-share/doc/samba/textdocs/Speed2.txt
-share/doc/samba/textdocs/Support.txt
-share/doc/samba/textdocs/Tracing.txt
-share/doc/samba/textdocs/UNIX-SMB.txt
-share/doc/samba/textdocs/UNIX_SECURITY.txt
-share/doc/samba/textdocs/Win95.txt
-share/doc/samba/textdocs/WinNT.txt
-share/doc/samba/textdocs/cifsntdomain.txt
-share/doc/samba/textdocs/kurs.pdf
-share/doc/samba/textdocs/kurs.tex
-share/doc/samba/textdocs/logo.ps
-share/doc/samba/textdocs/samba-pdc-faq.txt
-share/doc/samba/textdocs/samba-pdc-howto.txt
-share/doc/samba/textdocs/security_level.txt
-share/doc/samba/README.swat
-share/examples/samba/simple/README
-share/examples/samba/simple/smb.conf
-share/examples/samba/tridge/smb.conf.WinNT
-share/examples/samba/tridge/smb.conf.vittjokk
-share/examples/samba/tridge/smb.conf.fjall
-share/examples/samba/tridge/README
-share/examples/samba/tridge/smb.conf.lapland
-share/examples/samba/tridge/smb.conf
-share/examples/samba/thoralf/smb.conf
-share/examples/samba/svr4-startup/README
-share/examples/samba/svr4-startup/samba.server
+%%PORTDOCS%%share/doc/samba/COPYING
+%%PORTDOCS%%share/doc/samba/Manifest
+%%PORTDOCS%%share/doc/samba/NT4-Locking.reg
+%%PORTDOCS%%share/doc/samba/NT4_PlainPassword.reg
+%%PORTDOCS%%share/doc/samba/README
+%%PORTDOCS%%share/doc/samba/README.FreeBSD
+%%PORTDOCS%%share/doc/samba/README.swat
+%%PORTDOCS%%share/doc/samba/Read-Manifest-Now
+%%PORTDOCS%%share/doc/samba/Roadmap
+%%PORTDOCS%%share/doc/samba/THANKS
+%%PORTDOCS%%share/doc/samba/WHATSNEW.txt
+%%PORTDOCS%%share/doc/samba/Win2000_PlainPassword.reg
+%%PORTDOCS%%share/doc/samba/Win95_PlainPassword.reg
+%%PORTDOCS%%share/doc/samba/Win98_PlainPassword.reg
+%%PORTDOCS%%share/doc/samba/Win9X-CacheHandling.reg
+%%PORTDOCS%%share/doc/samba/WinME_PlainPassword.reg
+%%PORTDOCS%%share/doc/samba/WindowsTerminalServer.reg
+%%PORTDOCS%%share/doc/samba/announce
+%%PORTDOCS%%share/doc/samba/faq/Samba-Server-FAQ-1.html
+%%PORTDOCS%%share/doc/samba/faq/Samba-Server-FAQ-2.html
+%%PORTDOCS%%share/doc/samba/faq/Samba-Server-FAQ.html
+%%PORTDOCS%%share/doc/samba/faq/Samba-Server-FAQ.sgml
+%%PORTDOCS%%share/doc/samba/faq/Samba-meta-FAQ-1.html
+%%PORTDOCS%%share/doc/samba/faq/Samba-meta-FAQ-2.html
+%%PORTDOCS%%share/doc/samba/faq/Samba-meta-FAQ-3.html
+%%PORTDOCS%%share/doc/samba/faq/Samba-meta-FAQ-4.html
+%%PORTDOCS%%share/doc/samba/faq/Samba-meta-FAQ-5.html
+%%PORTDOCS%%share/doc/samba/faq/Samba-meta-FAQ-6.html
+%%PORTDOCS%%share/doc/samba/faq/Samba-meta-FAQ.html
+%%PORTDOCS%%share/doc/samba/faq/Samba-meta-FAQ.sgml
+%%PORTDOCS%%share/doc/samba/faq/Samba-meta-FAQ.txt
+%%PORTDOCS%%share/doc/samba/faq/sambafaq-1.html
+%%PORTDOCS%%share/doc/samba/faq/sambafaq-2.html
+%%PORTDOCS%%share/doc/samba/faq/sambafaq-3.html
+%%PORTDOCS%%share/doc/samba/faq/sambafaq-4.html
+%%PORTDOCS%%share/doc/samba/faq/sambafaq-5.html
+%%PORTDOCS%%share/doc/samba/faq/sambafaq.html
+%%PORTDOCS%%share/doc/samba/faq/sambafaq.sgml
+%%PORTDOCS%%share/doc/samba/faq/sambafaq.txt
+%%PORTDOCS%%share/doc/samba/history
+%%PORTDOCS%%share/doc/samba/htmldocs/DOMAIN_MEMBER.html
+%%PORTDOCS%%share/doc/samba/htmldocs/ENCRYPTION.html
+%%PORTDOCS%%share/doc/samba/htmldocs/NT_Security.html
+%%PORTDOCS%%share/doc/samba/htmldocs/OS2-Client-HOWTO.html
+%%PORTDOCS%%share/doc/samba/htmldocs/Samba-HOWTO-Collection.html
+%%PORTDOCS%%share/doc/samba/htmldocs/Samba-PDC-HOWTO.html
+%%PORTDOCS%%share/doc/samba/htmldocs/UNIX_INSTALL.html
+%%PORTDOCS%%share/doc/samba/htmldocs/findsmb.1.html
+%%PORTDOCS%%share/doc/samba/htmldocs/lmhosts.5.html
+%%PORTDOCS%%share/doc/samba/htmldocs/make_smbcodepage.1.html
+%%PORTDOCS%%share/doc/samba/htmldocs/msdfs_setup.html
+%%PORTDOCS%%share/doc/samba/htmldocs/nmbd.8.html
+%%PORTDOCS%%share/doc/samba/htmldocs/nmblookup.1.html
+%%PORTDOCS%%share/doc/samba/htmldocs/printer_driver2.html
+%%PORTDOCS%%share/doc/samba/htmldocs/rpcclient.1.html
+%%PORTDOCS%%share/doc/samba/htmldocs/samba-pdc-faq.html
+%%PORTDOCS%%share/doc/samba/htmldocs/samba-pdc-howto.html
+%%PORTDOCS%%share/doc/samba/htmldocs/samba.7.html
+%%PORTDOCS%%share/doc/samba/htmldocs/smb.conf.5.html
+%%PORTDOCS%%share/doc/samba/htmldocs/smbcacls.1.html
+%%PORTDOCS%%share/doc/samba/htmldocs/smbclient.1.html
+%%PORTDOCS%%share/doc/samba/htmldocs/smbcontrol.1.html
+%%PORTDOCS%%share/doc/samba/htmldocs/smbd.8.html
+%%PORTDOCS%%share/doc/samba/htmldocs/smbmnt.8.html
+%%PORTDOCS%%share/doc/samba/htmldocs/smbmount.8.html
+%%PORTDOCS%%share/doc/samba/htmldocs/smbpasswd.5.html
+%%PORTDOCS%%share/doc/samba/htmldocs/smbpasswd.8.html
+%%PORTDOCS%%share/doc/samba/htmldocs/smbrun.1.html
+%%PORTDOCS%%share/doc/samba/htmldocs/smbsh.1.html
+%%PORTDOCS%%share/doc/samba/htmldocs/smbspool.8.html
+%%PORTDOCS%%share/doc/samba/htmldocs/smbstatus.1.html
+%%PORTDOCS%%share/doc/samba/htmldocs/smbtar.1.html
+%%PORTDOCS%%share/doc/samba/htmldocs/smbumount.8.html
+%%PORTDOCS%%share/doc/samba/htmldocs/swat.8.html
+%%PORTDOCS%%share/doc/samba/htmldocs/testparm.1.html
+%%PORTDOCS%%share/doc/samba/htmldocs/testprns.1.html
+%%PORTDOCS%%share/doc/samba/htmldocs/wbinfo.1.html
+%%PORTDOCS%%share/doc/samba/htmldocs/wfw_slip.htm
+%%PORTDOCS%%share/doc/samba/htmldocs/winbind.html
+%%PORTDOCS%%share/doc/samba/htmldocs/winbindd.8.html
+%%PORTDOCS%%share/doc/samba/textdocs/Application_Serving.txt
+%%PORTDOCS%%share/doc/samba/textdocs/BROWSING-Config.txt
+%%PORTDOCS%%share/doc/samba/textdocs/BROWSING.txt
+%%PORTDOCS%%share/doc/samba/textdocs/BUGS.txt
+%%PORTDOCS%%share/doc/samba/textdocs/CVS_ACCESS.txt
+%%PORTDOCS%%share/doc/samba/textdocs/DHCP-Server-Configuration.txt
+%%PORTDOCS%%share/doc/samba/textdocs/DIAGNOSIS.txt
+%%PORTDOCS%%share/doc/samba/textdocs/DNIX.txt
+%%PORTDOCS%%share/doc/samba/textdocs/DOMAIN.txt
+%%PORTDOCS%%share/doc/samba/textdocs/Faxing.txt
+%%PORTDOCS%%share/doc/samba/textdocs/GOTCHAS.txt
+%%PORTDOCS%%share/doc/samba/textdocs/HINTS.txt
+%%PORTDOCS%%share/doc/samba/textdocs/INSTALL.sambatar
+%%PORTDOCS%%share/doc/samba/textdocs/Imprints.txt
+%%PORTDOCS%%share/doc/samba/textdocs/MIRRORS.txt
+%%PORTDOCS%%share/doc/samba/textdocs/Macintosh_Clients.txt
+%%PORTDOCS%%share/doc/samba/textdocs/NTDOMAIN.txt
+%%PORTDOCS%%share/doc/samba/textdocs/NetBIOS.txt
+%%PORTDOCS%%share/doc/samba/textdocs/PRINTER_DRIVER.txt
+%%PORTDOCS%%share/doc/samba/textdocs/PROFILES.txt
+%%PORTDOCS%%share/doc/samba/textdocs/PROJECTS
+%%PORTDOCS%%share/doc/samba/textdocs/Passwords.txt
+%%PORTDOCS%%share/doc/samba/textdocs/Printing.txt
+%%PORTDOCS%%share/doc/samba/textdocs/README.DCEDFS
+%%PORTDOCS%%share/doc/samba/textdocs/README.jis
+%%PORTDOCS%%share/doc/samba/textdocs/README.sambatar
+%%PORTDOCS%%share/doc/samba/textdocs/Recent-FAQs.txt
+%%PORTDOCS%%share/doc/samba/textdocs/RoutedNetworks.txt
+%%PORTDOCS%%share/doc/samba/textdocs/SCO.txt
+%%PORTDOCS%%share/doc/samba/textdocs/SMBTAR.notes
+%%PORTDOCS%%share/doc/samba/textdocs/SSLeay.txt
+%%PORTDOCS%%share/doc/samba/textdocs/Speed.txt
+%%PORTDOCS%%share/doc/samba/textdocs/Speed2.txt
+%%PORTDOCS%%share/doc/samba/textdocs/Support.txt
+%%PORTDOCS%%share/doc/samba/textdocs/Tracing.txt
+%%PORTDOCS%%share/doc/samba/textdocs/UNIX-SMB.txt
+%%PORTDOCS%%share/doc/samba/textdocs/UNIX_SECURITY.txt
+%%PORTDOCS%%share/doc/samba/textdocs/Win95.txt
+%%PORTDOCS%%share/doc/samba/textdocs/WinNT.txt
+%%PORTDOCS%%share/doc/samba/textdocs/cifsntdomain.txt
+%%PORTDOCS%%share/doc/samba/textdocs/kurs.pdf
+%%PORTDOCS%%share/doc/samba/textdocs/kurs.tex
+%%PORTDOCS%%share/doc/samba/textdocs/logo.ps
+%%PORTDOCS%%share/doc/samba/textdocs/samba-pdc-faq.txt
+%%PORTDOCS%%share/doc/samba/textdocs/samba-pdc-howto.txt
+%%PORTDOCS%%share/doc/samba/textdocs/security_level.txt
+share/examples/samba/README
 share/examples/samba/VFS/.cvsignore
-share/examples/samba/VFS/audit.c
-share/examples/samba/VFS/README
 share/examples/samba/VFS/Makefile
+share/examples/samba/VFS/README
+share/examples/samba/VFS/audit.c
 share/examples/samba/VFS/skel.c
-share/examples/samba/appliance/appliance.spec
-share/examples/samba/appliance/README
-share/examples/samba/appliance/smb.conf-appliance
 share/examples/samba/appliance/Makefile
+share/examples/samba/appliance/README
+share/examples/samba/appliance/appliance.spec
 share/examples/samba/appliance/build.sh
-share/examples/samba/printing/smbprint
-share/examples/samba/printing/smbprint.newer
-share/examples/samba/printing/smbprint.sysv
-share/examples/samba/validchars/validchr.com
-share/examples/samba/validchars/readme
-share/examples/samba/validchars/validchr.c
-share/examples/samba/validchars/msdos70.out
-share/examples/samba/validchars/nwdos70.out
-share/examples/samba/misc/swat.pl
-share/examples/samba/misc/extra_smbstatus
-share/examples/samba/misc/wall.perl
+share/examples/samba/appliance/smb.conf-appliance
+share/examples/samba/autofs/auto.a
 share/examples/samba/dce-dfs/README
 share/examples/samba/dce-dfs/smb.conf
-share/examples/samba/autofs/auto.a
-share/examples/samba/printer-accounting/hp5-redir
+share/examples/samba/misc/extra_smbstatus
+share/examples/samba/misc/swat.pl
+share/examples/samba/misc/wall.perl
+share/examples/samba/printer-accounting/README
 share/examples/samba/printer-accounting/acct-all
 share/examples/samba/printer-accounting/acct-sum
-share/examples/samba/printer-accounting/README
+share/examples/samba/printer-accounting/hp5-redir
 share/examples/samba/printer-accounting/lp-acct
 share/examples/samba/printer-accounting/printcap
+share/examples/samba/printing/smbprint
+share/examples/samba/printing/smbprint.newer
+share/examples/samba/printing/smbprint.sysv
+share/examples/samba/simple/README
+share/examples/samba/simple/smb.conf
 share/examples/samba/smb.conf.default
-share/examples/samba/README
+share/examples/samba/svr4-startup/README
+share/examples/samba/svr4-startup/samba.server
+share/examples/samba/thoralf/smb.conf
+share/examples/samba/tridge/README
+share/examples/samba/tridge/smb.conf
+share/examples/samba/tridge/smb.conf.WinNT
+share/examples/samba/tridge/smb.conf.fjall
+share/examples/samba/tridge/smb.conf.lapland
+share/examples/samba/tridge/smb.conf.vittjokk
+share/examples/samba/validchars/msdos70.out
+share/examples/samba/validchars/nwdos70.out
+share/examples/samba/validchars/readme
+share/examples/samba/validchars/validchr.c
+share/examples/samba/validchars/validchr.com
+share/swat/help/DOMAIN_MEMBER.html
+share/swat/help/ENCRYPTION.html
+share/swat/help/NT_Security.html
+share/swat/help/OS2-Client-HOWTO.html
+share/swat/help/Samba-HOWTO-Collection.html
+share/swat/help/Samba-PDC-HOWTO.html
+share/swat/help/UNIX_INSTALL.html
+share/swat/help/findsmb.1.html
+share/swat/help/lmhosts.5.html
+share/swat/help/make_smbcodepage.1.html
+share/swat/help/msdfs_setup.html
+share/swat/help/nmbd.8.html
+share/swat/help/nmblookup.1.html
+share/swat/help/printer_driver2.html
+share/swat/help/rpcclient.1.html
+share/swat/help/samba-pdc-faq.html
+share/swat/help/samba-pdc-howto.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/smbd.8.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/smbrun.1.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/smbumount.8.html
+share/swat/help/swat.8.html
+share/swat/help/testparm.1.html
+share/swat/help/testprns.1.html
+share/swat/help/wbinfo.1.html
+share/swat/help/welcome.html
+share/swat/help/winbind.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/include/footer.html
+share/swat/include/header.html
+share/swat/using_samba/appa_01.html
+share/swat/using_samba/appa_02.html
+share/swat/using_samba/appa_03.html
+share/swat/using_samba/appa_04.html
+share/swat/using_samba/appa_05.html
+share/swat/using_samba/appb_01.html
+share/swat/using_samba/appb_02.html
+share/swat/using_samba/appb_03.html
+share/swat/using_samba/appc_01.html
+share/swat/using_samba/appd_01.html
+share/swat/using_samba/appe_01.html
+share/swat/using_samba/appf_01.html
+share/swat/using_samba/ch01_01.html
+share/swat/using_samba/ch01_02.html
+share/swat/using_samba/ch01_03.html
+share/swat/using_samba/ch01_04.html
+share/swat/using_samba/ch01_05.html
+share/swat/using_samba/ch01_06.html
+share/swat/using_samba/ch01_07.html
+share/swat/using_samba/ch01_08.html
+share/swat/using_samba/ch02_01.html
+share/swat/using_samba/ch02_02.html
+share/swat/using_samba/ch02_03.html
+share/swat/using_samba/ch02_04.html
+share/swat/using_samba/ch02_05.html
+share/swat/using_samba/ch02_06.html
+share/swat/using_samba/ch03_01.html
+share/swat/using_samba/ch03_02.html
+share/swat/using_samba/ch03_03.html
+share/swat/using_samba/ch04_01.html
+share/swat/using_samba/ch04_02.html
+share/swat/using_samba/ch04_03.html
+share/swat/using_samba/ch04_04.html
+share/swat/using_samba/ch04_05.html
+share/swat/using_samba/ch04_06.html
+share/swat/using_samba/ch04_07.html
+share/swat/using_samba/ch04_08.html
+share/swat/using_samba/ch05_01.html
+share/swat/using_samba/ch05_02.html
+share/swat/using_samba/ch05_03.html
+share/swat/using_samba/ch05_04.html
+share/swat/using_samba/ch05_05.html
+share/swat/using_samba/ch06_01.html
+share/swat/using_samba/ch06_02.html
+share/swat/using_samba/ch06_03.html
+share/swat/using_samba/ch06_04.html
+share/swat/using_samba/ch06_05.html
+share/swat/using_samba/ch06_06.html
+share/swat/using_samba/ch07_01.html
+share/swat/using_samba/ch07_02.html
+share/swat/using_samba/ch07_03.html
+share/swat/using_samba/ch08_01.html
+share/swat/using_samba/ch08_02.html
+share/swat/using_samba/ch08_03.html
+share/swat/using_samba/ch08_04.html
+share/swat/using_samba/ch08_05.html
+share/swat/using_samba/ch08_06.html
+share/swat/using_samba/ch08_07.html
+share/swat/using_samba/ch09_01.html
+share/swat/using_samba/ch09_02.html
+share/swat/using_samba/ch09_03.html
 share/swat/using_samba/figs/sam.0101.gif
 share/swat/using_samba/figs/sam.0102.gif
 share/swat/using_samba/figs/sam.0103.gif
@@ -315,143 +426,32 @@ share/swat/using_samba/gifs/samba.s.gif
 share/swat/using_samba/gifs/txthome.gif
 share/swat/using_samba/gifs/txtnexta.gif
 share/swat/using_samba/gifs/txtpreva.gif
-share/swat/using_samba/appa_01.html
-share/swat/using_samba/appa_02.html
-share/swat/using_samba/appa_03.html
-share/swat/using_samba/appa_04.html
-share/swat/using_samba/appa_05.html
-share/swat/using_samba/appb_01.html
-share/swat/using_samba/appb_02.html
-share/swat/using_samba/appb_03.html
-share/swat/using_samba/appc_01.html
-share/swat/using_samba/appd_01.html
-share/swat/using_samba/appe_01.html
-share/swat/using_samba/appf_01.html
-share/swat/using_samba/ch01_01.html
-share/swat/using_samba/ch01_02.html
-share/swat/using_samba/ch01_03.html
-share/swat/using_samba/ch01_04.html
-share/swat/using_samba/ch01_05.html
-share/swat/using_samba/ch01_06.html
-share/swat/using_samba/ch01_07.html
-share/swat/using_samba/ch01_08.html
-share/swat/using_samba/ch02_01.html
-share/swat/using_samba/ch02_02.html
-share/swat/using_samba/ch02_03.html
-share/swat/using_samba/ch02_04.html
-share/swat/using_samba/ch02_05.html
-share/swat/using_samba/ch02_06.html
-share/swat/using_samba/ch03_01.html
-share/swat/using_samba/ch03_02.html
-share/swat/using_samba/ch03_03.html
-share/swat/using_samba/ch04_01.html
-share/swat/using_samba/ch04_02.html
-share/swat/using_samba/ch04_03.html
-share/swat/using_samba/ch04_04.html
-share/swat/using_samba/ch04_05.html
-share/swat/using_samba/ch04_06.html
-share/swat/using_samba/ch04_07.html
-share/swat/using_samba/ch04_08.html
-share/swat/using_samba/ch05_01.html
-share/swat/using_samba/ch05_02.html
-share/swat/using_samba/ch05_03.html
-share/swat/using_samba/ch05_04.html
-share/swat/using_samba/ch05_05.html
-share/swat/using_samba/ch06_01.html
-share/swat/using_samba/ch06_02.html
-share/swat/using_samba/ch06_03.html
-share/swat/using_samba/ch06_04.html
-share/swat/using_samba/ch06_05.html
-share/swat/using_samba/ch06_06.html
-share/swat/using_samba/ch07_01.html
-share/swat/using_samba/ch07_02.html
-share/swat/using_samba/ch07_03.html
-share/swat/using_samba/ch08_01.html
-share/swat/using_samba/ch08_02.html
-share/swat/using_samba/ch08_03.html
-share/swat/using_samba/ch08_04.html
-share/swat/using_samba/ch08_05.html
-share/swat/using_samba/ch08_06.html
-share/swat/using_samba/ch08_07.html
-share/swat/using_samba/ch09_01.html
-share/swat/using_samba/ch09_02.html
-share/swat/using_samba/ch09_03.html
 share/swat/using_samba/index.html
 share/swat/using_samba/inx.html
 share/swat/using_samba/licenseinfo.html
 share/swat/using_samba/this_edition.html
-share/swat/help/welcome.html
-share/swat/help/DOMAIN_MEMBER.html
-share/swat/help/ENCRYPTION.html
-share/swat/help/NT_Security.html
-share/swat/help/OS2-Client-HOWTO.html
-share/swat/help/Samba-HOWTO-Collection.html
-share/swat/help/Samba-PDC-HOWTO.html
-share/swat/help/UNIX_INSTALL.html
-share/swat/help/findsmb.1.html
-share/swat/help/lmhosts.5.html
-share/swat/help/make_smbcodepage.1.html
-share/swat/help/msdfs_setup.html
-share/swat/help/nmbd.8.html
-share/swat/help/nmblookup.1.html
-share/swat/help/printer_driver2.html
-share/swat/help/rpcclient.1.html
-share/swat/help/samba-pdc-faq.html
-share/swat/help/samba-pdc-howto.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/smbd.8.html
-share/swat/help/smbmnt.8.html
-share/swat/help/smbmount.8.html
-share/swat/help/smbumount.8.html
-share/swat/help/smbpasswd.5.html
-share/swat/help/smbpasswd.8.html
-share/swat/help/smbrun.1.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/swat.8.html
-share/swat/help/testparm.1.html
-share/swat/help/testprns.1.html
-share/swat/help/wbinfo.1.html
-share/swat/help/winbind.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/include/footer.html
-share/swat/include/header.html
-@dirrm etc/codepages
-@dirrm share/doc/samba/faq
-@dirrm share/doc/samba/htmldocs
-@dirrm share/doc/samba/textdocs
-@dirrm share/doc/samba
-@dirrm share/examples/samba/simple
+@dirrm share/swat/using_samba/gifs
+@dirrm share/swat/using_samba/figs
+@dirrm share/swat/using_samba
+@dirrm share/swat/include
+@dirrm share/swat/images
+@dirrm share/swat/help
+@dirrm share/swat
+@dirrm share/examples/samba/validchars
 @dirrm share/examples/samba/tridge
 @dirrm share/examples/samba/thoralf
 @dirrm share/examples/samba/svr4-startup
-@dirrm share/examples/samba/VFS
-@dirrm share/examples/samba/appliance
+@dirrm share/examples/samba/simple
 @dirrm share/examples/samba/printing
-@dirrm share/examples/samba/validchars
+@dirrm share/examples/samba/printer-accounting
 @dirrm share/examples/samba/misc
 @dirrm share/examples/samba/dce-dfs
 @dirrm share/examples/samba/autofs
-@dirrm share/examples/samba/printer-accounting
+@dirrm share/examples/samba/appliance
+@dirrm share/examples/samba/VFS
 @dirrm share/examples/samba
-@dirrm share/swat/images
-@dirrm share/swat/include
-@dirrm share/swat/help
-@dirrm share/swat/using_samba/figs
-@dirrm share/swat/using_samba/gifs
-@dirrm share/swat/using_samba
-@dirrm share/swat
+%%PORTDOCS%%@dirrm share/doc/samba/textdocs
+%%PORTDOCS%%@dirrm share/doc/samba/htmldocs
+%%PORTDOCS%%@dirrm share/doc/samba/faq
+%%PORTDOCS%%@dirrm share/doc/samba
+@dirrm etc/codepages