- Update to 2.2.2-ja-1.0.

- Invoke nmbd in advance of smbd to avoid failing in startup.

PR:		ports/33676
Submitted by:	NAKAJI Hiroyuki <nakaji@jp.freebsd.org> (MAINTAINER)

- Add CVS tags.

- Replace /usr/local in the startup script with ${PREFIX}.

13 files changed, 1100 insertions, 331 deletions

diff --git a/japanese/samba/Makefile b/japanese/samba/Makefile
index c739c152f190..5995ea8184c8 100644
--- a/japanese/samba/Makefile
+++ b/japanese/samba/Makefile
@@ -21,8 +21,8 @@ MAINTAINER=	nakaji@jp.FreeBSD.org
 
 BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
 
-SAMBA_VERSION=		2.0.10
-SAMBA_JA_VERSION=	1.2
+SAMBA_VERSION=		2.2.2
+SAMBA_JA_VERSION=	1.0
 
 # directories
 VARDIR=		/var
@@ -37,11 +37,11 @@ SAMPLE_CONFIG=	${SAMBA_CONFDIR}/smb.conf.default
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
+USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-i18n-swat --with-included-gettext \
 		--libdir=${SAMBA_CONFDIR} \
 		--localstatedir=${VARDIR} --with-swatdir=${PREFIX}/share/swat \
-		--with-sambabook=${PREFIX}/share/swat/using_samba \
-		--with-lockdir=${VARDIR}/spool/lock \
+		--with-lockdir=${VARDIR}/db/samba \
 		--with-privatedir=${SAMBA_PRIVATE} \
 		--prefix=${PREFIX}
 
@@ -51,31 +51,35 @@ CONFIGURE_ARGS+=--with-krb5=${KRB5_HOME}
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/source
 
-MAN1=		nmblookup.1 smbstatus.1 smbclient.1 smbrun.1 smbtar.1 \
+MAN1=		findsmb.1 nmblookup.1 rpcclient.1 smbcacls.1 \
+		smbcontrol.1 smbstatus.1 smbclient.1 smbrun.1 smbtar.1 \
 		testparm.1 testprns.1 make_smbcodepage.1 smbsh.1 \
-		make_unicodemap.1
+		make_unicodemap.1 wbinfo.1
 MAN5=		smb.conf.5 smbpasswd.5 lmhosts.5
 MAN7=		samba.7
-MAN8=		smbd.8 nmbd.8 smbpasswd.8 swat.8 smbspool.8
+MAN8=		smbd.8 nmbd.8 smbpasswd.8 swat.8 smbspool.8 \
+		smbmnt.8 smbmount.8 smbumount.8 winbindd.8
 MANLANG=	"" ja
 
-pre-install:
-	${RM} -f ${WRKDIR}/${DISTNAME}/docs/manpages/smbmnt.8
-	${RM} -f ${WRKDIR}/${DISTNAME}/docs/manpages/smbmount.8
-	${RM} -f ${WRKDIR}/${DISTNAME}/docs/manpages/smbumount.8
-	${RM} -f ${WRKDIR}/${DISTNAME}/docs/ja/manpages/smbmnt.8.man
-	${RM} -f ${WRKDIR}/${DISTNAME}/docs/ja/manpages/smbmount.8.man
-	${RM} -f ${WRKDIR}/${DISTNAME}/docs/ja/manpages/smbumount.8.man
+post-build:
+	${SED} 's:/usr/local:${PREFIX}:g' ${FILESDIR}/samba.sh.sample \
+		> ${WRKDIR}/samba.sh.sample
 
 post-install:
-	${MKDIR} ${PREFIX}/share/examples/samba
-	${CP} -rp ${WRKDIR}/${DISTNAME}/examples/* ${PREFIX}/share/examples/samba
+	@${STRIP_CMD} ${PREFIX}/sbin/smbd ${PREFIX}/sbin/nmbd ${PREFIX}/sbin/swat
+	@${STRIP_CMD} ${PREFIX}/bin/smbclient ${PREFIX}/bin/smbspool
+	@${STRIP_CMD} ${PREFIX}/bin/testparm ${PREFIX}/bin/testprns ${PREFIX}/bin/testprns ${PREFIX}/bin/smbstatus ${PREFIX}/bin/smbcontrol ${PREFIX}/bin/make_printerdef
+	@${STRIP_CMD} ${PREFIX}/bin/smbpasswd ${PREFIX}/bin/make_smbcodepage ${PREFIX}/bin/rpcclient ${PREFIX}/bin/make_unicodemap ${PREFIX}/bin/make_nftable ${PREFIX}/bin/smbcacls ${PREFIX}/bin/nmblookup
+	@${MKDIR} ${PREFIX}/share/examples/samba
+	@cd ${WRKDIR}/${DISTNAME}/examples; \
+		${TAR}  --exclude .cvsignore -cf - . | ${TAR} -xf - -C ${PREFIX}/share/examples/samba
 	@if [ ! -f ${STARTUP_SCRIPT} ]; then				\
 		${ECHO} "Installing ${STARTUP_SCRIPT} startup file." ;	\
-		${INSTALL_SCRIPT} ${FILESDIR}/samba.sh.sample 		\
+		${INSTALL_SCRIPT} ${WRKDIR}/samba.sh.sample 		\
 			${STARTUP_SCRIPT} ;				\
 	fi
 	@test -d ${SAMBA_SPOOL} || ${MKDIR} ${SAMBA_SPOOL} && ${CHMOD} 1777 ${SAMBA_SPOOL}
+	@test -d ${VARDIR}/db/samba || ${MKDIR} ${VARDIR}/db/samba && ${CHMOD} 0755 ${VARDIR}/db/samba
 	@if [ ! -f ${SAMPLE_CONFIG} ]; then				\
 		${SED} -e 's!%%SAMBA_SPOOL%%!${SAMBA_SPOOL}!'		\
 			-e 's!%%SAMBA_LOGDIR%%!${SAMBA_LOGDIR}!'	\
@@ -83,44 +87,37 @@ post-install:
 			${FILESDIR}/smb.conf.default			\
 			> ${SAMPLE_CONFIG} ;				\
 	fi
-	${INSTALL_SCRIPT} ${WRKDIR}/${DISTNAME}/source/script/mksmbpasswd.sh ${PREFIX}/bin/make_smbpasswd
+	@${INSTALL_SCRIPT} ${WRKDIR}/${DISTNAME}/source/script/mksmbpasswd.sh ${PREFIX}/bin/make_smbpasswd
 
-	${MKDIR} -m 500 ${SAMBA_PRIVATE}
-	${CHOWN} root:wheel ${SAMBA_PRIVATE}
-	${CAT} /etc/passwd | ${PREFIX}/bin/make_smbpasswd > ${SAMBA_PRIVATE}/smbpasswd.default
-	if [ ! -e ${SAMBA_PRIVATE}/smbpasswd ]; then	\
+	@${MKDIR} -p -m 500 ${SAMBA_PRIVATE}
+	@${CHOWN} root:wheel ${SAMBA_PRIVATE}
+	@${CAT} /etc/passwd | ${PREFIX}/bin/make_smbpasswd > ${SAMBA_PRIVATE}/smbpasswd.default
+	@if [ ! -e ${SAMBA_PRIVATE}/smbpasswd ]; then	\
 		${CP} -p ${SAMBA_PRIVATE}/smbpasswd.default ${SAMBA_PRIVATE}/smbpasswd ;	\
 	fi
-	${CHMOD} 600 ${SAMBA_PRIVATE}/smbpasswd*
+	@${CHMOD} 600 ${SAMBA_PRIVATE}/smbpasswd*
 
-	${CHOWN} root:wheel ${PREFIX}/bin/smbpasswd
-	${CHMOD} 111 ${PREFIX}/bin/smbpasswd
+	@${CHOWN} root:wheel ${PREFIX}/bin/smbpasswd
+	@${CHMOD} 111 ${PREFIX}/bin/smbpasswd
 
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/samba
-	${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${PREFIX}/share/doc/samba
-	for i in ${WRKDIR}/${DISTNAME}/README				\
+	@${MKDIR} ${PREFIX}/share/doc/samba
+	@${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${PREFIX}/share/doc/samba
+	@for i in ${WRKDIR}/${DISTNAME}/README				\
 			${WRKDIR}/${DISTNAME}/COPYING			\
 			${WRKDIR}/${DISTNAME}/Manifest			\
 			${WRKDIR}/${DISTNAME}/Read-Manifest-Now		\
 			${WRKDIR}/${DISTNAME}/Roadmap			\
-			${WRKDIR}/${DISTNAME}/WHATSNEW.txt		\
-			${WRKDIR}/${DISTNAME}/docs/*.reg		\
-			${WRKDIR}/${DISTNAME}/docs/THANKS		\
-			${WRKDIR}/${DISTNAME}/docs/announce		\
-			${WRKDIR}/${DISTNAME}/docs/history ; do		\
+			${WRKDIR}/${DISTNAME}/WHATSNEW.txt; do		\
 		${INSTALL_DATA} $$i ${PREFIX}/share/doc/samba ;		\
 	done
-	for i in faq htmldocs textdocs yodldocs ; do			\
-		${MKDIR} ${PREFIX}/share/doc/samba/$$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 ;\
-			fi; \
-		done							\
-	done
-	${MKDIR} ${PREFIX}/share/doc/samba
-	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/swat/README ${PREFIX}/share/doc/samba/README.swat
+	@cd ${WRKDIR}/${DISTNAME}/docs; \
+		${TAR}  --exclude .cvsignore -cf - . | ${TAR} -xf - -C ${PREFIX}/share/doc/samba
+	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/swat/README ${PREFIX}/share/doc/samba/README.swat
 .endif
 
+	@if [ -f ${VARDIR}/spool/lock/browse.dat ]; then \
+		${RM} -f ${VARDIR}/spool/lock/browse.dat; \
+	fi
+
 .include <bsd.port.mk>
diff --git a/japanese/samba/distinfo b/japanese/samba/distinfo
index 8ef5d72920d9..1f8407652c5a 100644
--- a/japanese/samba/distinfo
+++ b/japanese/samba/distinfo
@@ -1 +1 @@
-MD5 (samba-2.0.10-ja-1.2.tar.bz2) = 1b451aebc4dba7b95f462951c8712d43
+MD5 (samba-2.2.2-ja-1.0.tar.bz2) = 3938d9491e1e904b421b9ee7807fb745
diff --git a/japanese/samba/files/README.FreeBSD b/japanese/samba/files/README.FreeBSD
index cba6497c58d1..5d18df30a1bb 100644
--- a/japanese/samba/files/README.FreeBSD
+++ b/japanese/samba/files/README.FreeBSD
@@ -1,3 +1,5 @@
+$FreeBSD$
+
 If you want to use samba ports,
 
 1. Copy /usr/local/etc/smb.conf.default to /usr/local/etc/smb.conf, and edit
diff --git a/japanese/samba/files/patch-aa b/japanese/samba/files/patch-aa
index 3633f55c7b8f..25406d04b889 100644
--- a/japanese/samba/files/patch-aa
+++ b/japanese/samba/files/patch-aa
@@ -1,47 +1,30 @@
---- Makefile.in.orig	Wed Apr 26 02:06:11 2000
-+++ Makefile.in	Thu Apr 27 11:08:08 2000
-@@ -25,7 +25,7 @@
- BINDIR = @bindir@
- # we don't use sbindir because we want full compatibility with
- # the previous releases of Samba
--SBINDIR = @bindir@
-+SBINDIR = @sbindir@
- LIBDIR = @libdir@
- VARDIR = @localstatedir@
- MANDIR = @mandir@
-@@ -37,12 +37,13 @@
- # set these to where to find various files
- # These can be overridden by command line switches (see smbd(8))
- # or in smb.conf (see smb.conf(5))
--SMBLOGFILE = $(VARDIR)/log.smb
--NMBLOGFILE = $(VARDIR)/log.nmb
-+LOGDIR=$(VARDIR)/log
-+SMBLOGFILE = $(LOGDIR)/log.smb
-+NMBLOGFILE = $(LOGDIR)/log.nmb
- CONFIGFILE = $(LIBDIR)/smb.conf
- LMHOSTSFILE = $(LIBDIR)/lmhosts
- DRIVERFILE = $(LIBDIR)/printers.def
+--- Makefile.in.orig	Tue Oct 30 13:03:01 2001
++++ Makefile.in	Mon Nov 26 10:40:10 2001
+@@ -51,7 +51,7 @@
+ CONFIGFILE = $(CONFIGDIR)/smb.conf
+ LMHOSTSFILE = $(CONFIGDIR)/lmhosts
+ DRIVERFILE = $(CONFIGDIR)/printers.def
 -PASSWD_PROGRAM = /bin/passwd
 +PASSWD_PROGRAM = /usr/bin/passwd
  # This is where smbpasswd et al go
  PRIVATEDIR = @privatedir@
  
-@@ -54,6 +55,9 @@
- # the directory where lock files go
- LOCKDIR = @lockdir@
+@@ -69,6 +69,9 @@
+ LIBSMBCLIENT_MAJOR=0
+ LIBSMBCLIENT_MINOR=1
  
 +# the directory where pid files go
 +PIDFILEDIR = $(VARDIR)/run
 +
  # The directory where code page definition files go
- CODEPAGEDIR = $(LIBDIR)/codepages
+ CODEPAGEDIR = @codepagedir@
  
-@@ -71,7 +75,7 @@
- PASSWD_FLAGS = -DPASSWD_PROGRAM=\"$(PASSWD_PROGRAM)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\"
- FLAGS1 = $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -DSMBLOGFILE=\"$(SMBLOGFILE)\" -DNMBLOGFILE=\"$(NMBLOGFILE)\"
+@@ -88,7 +91,7 @@
+ PASSWD_FLAGS = -DPASSWD_PROGRAM=\"$(PASSWD_PROGRAM)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" -DTDB_PASSWD_FILE=\"$(TDB_PASSWD_FILE)\"
+ FLAGS1 = $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -DLOGFILEBASE=\"$(LOGFILEBASE)\"
  FLAGS2 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\"  
--FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DSMBRUN=\"$(SMBRUN)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\"
-+FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DPIDFILEDIR=\"$(PIDFILEDIR)\" -DSMBRUN=\"$(SMBRUN)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\"
- FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\" -DBINDIR=\"$(BINDIR)\"
- FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4) -DHAVE_INCLUDES_H
- FLAGS  = $(ISA) $(FLAGS5) $(PASSWD_FLAGS)
+-FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\"
++FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\" -DPIDFILEDIR=\"$(PIDFILEDIR)\"
+ FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\" -DBINDIR=\"$(BINDIR)\" 
+ FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4) -DHAVE_INCLUDES_H   -DI18N_PACKAGE=\"$(I18N_PACKAGE)\" -DSWAT_I18N_PACKAGE=\"$(SWAT_I18N_PACKAGE)\" -DSWAT_I18N_LOCALEDIR=\"$(i18n_localedir)\" -DI18N_LOCALEDIR=\"$(i18n_localedir)\" -Iintl -I$(srcdir)/intl
+ 
diff --git a/japanese/samba/files/patch-ab b/japanese/samba/files/patch-ab
index 9280db4a777d..cbe23bb25e19 100644
--- a/japanese/samba/files/patch-ab
+++ b/japanese/samba/files/patch-ab
@@ -1,35 +1,35 @@
---- param/loadparm.c.orig	Mon May 29 05:48:34 2000
-+++ param/loadparm.c	Wed Jun 28 09:21:07 2000
-@@ -106,6 +106,7 @@
- {
-   char *szPrintcapname;
-   char *szLockDir;
-+  char *szPidDir;
-   char *szRootdir;
-   char *szDefaultService;
-   char *szDfree;
-@@ -821,6 +822,8 @@
-   {N_("preload"),          P_STRING,  P_GLOBAL, &Globals.szAutoServices,    NULL,   NULL,  0},
-   {N_("lock directory"),   P_STRING,  P_GLOBAL, &Globals.szLockDir,         NULL,   NULL,  0},
-   {N_("lock dir"),         P_STRING,  P_GLOBAL, &Globals.szLockDir,         NULL,   NULL,  0},
-+  {N_("pidfile dir"),      P_STRING,  P_GLOBAL, &Globals.szPidDir,          NULL, NULL,  0},
-+  {N_("pidfile directory"),P_STRING,  P_GLOBAL, &Globals.szPidDir,          NULL, NULL,  0},
+--- param/loadparm.c.orig	Tue Oct 30 15:28:59 2001
++++ param/loadparm.c	Mon Nov 26 10:59:34 2001
+@@ -117,6 +117,7 @@
+ 	char *szDeletePrinterCommand;
+ 	char *szOs2DriverMap;
+ 	char *szLockDir;
++	char *szPidDir;
+ 	char *szRootdir;
+ 	char *szDefaultService;
+ 	char *szDfree;
+@@ -998,6 +999,8 @@
+ 	{N_("auto services"), P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_DOS_STRING},
+ 	{N_("lock directory"), P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, 0}, 
+ 	{N_("lock dir"), P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, 0},
++	{N_("pidfile dir"), P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, 0},
++	{N_("pidfile directory"), P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, 0},
  #ifdef WITH_UTMP
-   {N_("utmp directory"),   P_STRING,  P_GLOBAL, &Globals.szUtmpDir,         NULL,   NULL,  0},
-   {N_("utmp dir"),         P_STRING,  P_GLOBAL, &Globals.szUtmpDir,         NULL,   NULL,  0},
-@@ -911,6 +914,7 @@
-   string_set(&Globals.szPrintcapname, PRINTCAP_NAME);
-   string_set(&Globals.szDriverFile, DRIVERFILE);
-   string_set(&Globals.szLockDir, LOCKDIR);
-+  string_set(&Globals.szPidDir, PIDFILEDIR);
-   string_set(&Globals.szRootdir, "/");
+ 	{N_("utmp directory"), P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, 0},
+ 	{N_("wtmp directory"), P_STRING, P_GLOBAL, &Globals.szWtmpDir, NULL, NULL, 0},
+@@ -1232,6 +1235,7 @@
+ 	string_set(&Globals.szPasswdProgram, PASSWD_PROGRAM);
+ 	string_set(&Globals.szPrintcapname, PRINTCAP_NAME);
+ 	string_set(&Globals.szLockDir, LOCKDIR);
++	string_set(&Globals.szPidDir, PIDFILEDIR);
  #ifdef WITH_UTMP
-   string_set(&Globals.szUtmpDir, "");
-@@ -1185,6 +1189,7 @@
- FN_GLOBAL_STRING(lp_serverstring,&Globals.szServerString)
- FN_GLOBAL_STRING(lp_printcapname,&Globals.szPrintcapname)
- FN_GLOBAL_STRING(lp_lockdir,&Globals.szLockDir)
+ 	string_set(&Globals.szUtmpDir, "");
+ 	string_set(&Globals.szWtmpDir, "");
+@@ -1482,6 +1486,7 @@
+ FN_GLOBAL_STRING(lp_deleteprinter_cmd, &Globals.szDeletePrinterCommand)
+ FN_GLOBAL_STRING(lp_os2_driver_map, &Globals.szOs2DriverMap)
+ FN_GLOBAL_STRING(lp_lockdir, &Globals.szLockDir)
 +FN_GLOBAL_STRING(lp_piddir,&Globals.szPidDir)
  #ifdef WITH_UTMP
- FN_GLOBAL_STRING(lp_utmpdir,&Globals.szUtmpDir)
- FN_GLOBAL_STRING(lp_wtmpdir,&Globals.szWtmpDir)
+ FN_GLOBAL_STRING(lp_utmpdir, &Globals.szUtmpDir)
+ FN_GLOBAL_STRING(lp_wtmpdir, &Globals.szWtmpDir)
diff --git a/japanese/samba/files/patch-af b/japanese/samba/files/patch-af
deleted file mode 100644
index 4d0b8cd2da0e..000000000000
--- a/japanese/samba/files/patch-af
+++ /dev/null
@@ -1,9 +0,0 @@
---- script/updatesmbpasswd.sh.orig	Sat May  4 16:50:45 1996
-+++ script/updatesmbpasswd.sh	Wed Feb 10 01:21:05 1999
-@@ -1,5 +1,5 @@
- #!/bin/sh
--nawk 'BEGIN {FS=":"} 
-+awk 'BEGIN {FS=":"} 
- {
- 	if( $0 ~ "^#" ) {
- 		print $0
diff --git a/japanese/samba/files/patch-ag b/japanese/samba/files/patch-ag
deleted file mode 100644
index 4300c004e5d7..000000000000
--- a/japanese/samba/files/patch-ag
+++ /dev/null
@@ -1,20 +0,0 @@
---- nmbd/nmbd_winsserver.c.orig	Fri Aug 11 12:57:48 2000
-+++ nmbd/nmbd_winsserver.c	Tue Nov 21 11:16:44 2000
-@@ -182,7 +182,7 @@
- 
-   add_samba_names_to_subnet(wins_server_subnet);
- 
--  pstrcpy(fname,lp_lockdir());
-+  pstrcpy(fname,"/var/db");
-   trim_string( fname, strlen( fname )+1, NULL, 0, "/", sizeof( "/" ));
-   pstrcat(fname,"/");
-   pstrcat(fname,WINS_LIST);
-@@ -1602,7 +1602,7 @@
- 	  }
-   }
- 
--  slprintf(fname,sizeof(fname),"%s/%s", lp_lockdir(), WINS_LIST);
-+  slprintf(fname,sizeof(fname),"%s/%s", "/var/db", WINS_LIST);
-   all_string_sub(fname,"//", "/", 0);
-   slprintf(fnamenew,sizeof(fnamenew),"%s.%u", fname, (unsigned int)getpid());
- 
diff --git a/japanese/samba/files/patch-ak b/japanese/samba/files/patch-ak
index 86fdfde18f55..9e52b9f22927 100644
--- a/japanese/samba/files/patch-ak
+++ b/japanese/samba/files/patch-ak
@@ -1,15 +1,15 @@
---- script/installswat.sh.orig	Sat Oct 27 16:35:54 2001
-+++ script/installswat.sh	Mon Nov 26 12:08:58 2001
+--- script/installswat.sh.orig	Mon Oct 29 14:56:01 2001
++++ script/installswat.sh	Mon Nov 26 11:40:19 2001
 @@ -16,7 +16,7 @@
    langdir=$SWATDIR/$ln
    for d in $SWATDIR $langdir $langdir/help $langdir/images $langdir/include; do
      if [ ! -d $d ]; then
--        mkdir $d
-+        mkdir -p $d
-         if [ ! -d $d ]; then
-             echo Failed to make directory $d, does $USER have privileges?
-             exit 1
-@@ -84,7 +84,7 @@
+-	mkdir $d
++	mkdir -p $d
+ 	if [ ! -d $d ]; then
+ 	    echo Failed to make directory $d, does $USER have privileges?
+ 	    exit 1
+@@ -83,7 +83,7 @@
  
      for d in $BOOKDIR $BOOKDIR/$ln $BOOKDIR/$ln/figs $BOOKDIR/$ln/gifs; do
          if [ ! -d $d ]; then
@@ -18,3 +18,12 @@
              if [ ! -d $d ]; then
                  echo Failed to make directory $d, does $USER have privileges?
                  exit 1
+@@ -132,7 +132,7 @@
+ 
+     for d in $SWATDIR/$ln/help/HowToUseSamba; do
+         if [ ! -d $d ]; then
+-            mkdir $d
++            mkdir -p $d
+             if [ ! -d $d ]; then
+                 echo Failed to make directory $d, does $USER have privileges?
+                 exit 1
diff --git a/japanese/samba/files/patch-al b/japanese/samba/files/patch-al
new file mode 100644
index 000000000000..27061974a2e4
--- /dev/null
+++ b/japanese/samba/files/patch-al
@@ -0,0 +1,11 @@
+--- script/installcp.sh.orig	Mon Nov 26 13:40:10 2001
++++ script/installcp.sh	Mon Nov 26 13:40:24 2001
+@@ -12,7 +12,7 @@
+ echo Installing codepage files in $CODEPAGEDIR
+ for d in $LIBDIR $CODEPAGEDIR; do
+ if [ ! -d $d ]; then
+-mkdir $d
++mkdir -p $d
+ if [ ! -d $d ]; then
+   echo Failed to make directory $d
+   exit 1
diff --git a/japanese/samba/files/patch-ba b/japanese/samba/files/patch-ba
index 7f46ffd7af1e..80ec35f03203 100644
--- a/japanese/samba/files/patch-ba
+++ b/japanese/samba/files/patch-ba
@@ -1,11 +1,20 @@
---- configure.in.orig	Mon Oct  4 09:03:55 1999
-+++ configure.in	Mon Oct  4 09:04:00 1999
-@@ -1064,7 +1064,7 @@
-   --whithout-krb5          Don't include Kerbers 5 support (default)],
- [   AC_MSG_RESULT(yes)
+--- configure.in.orig	Mon Nov 26 17:55:39 2001
++++ configure.in	Tue Dec 11 00:42:47 2001
+@@ -19,7 +19,7 @@
+     codepagedir="\$(LIBDIR)/codepages"
+     configdir="\$(LIBDIR)"
+     lockdir="\$(VARDIR)/locks"
+-    logfilebase="\$(VARDIR)"
++    logfilebase="\$(VARDIR)/log"
+     privatedir="\${prefix}/private"
+     swatdir="\${prefix}/swat")
+ 
+@@ -1655,7 +1655,7 @@
+   yes)
+     AC_MSG_RESULT(yes)
      AC_DEFINE(KRB5_AUTH)
 -    LIBS="$LIBS -ldes425 -lkrb5 -lcrypto -lcom_err"
 +    LIBS="$LIBS -ldes425 -lkrb5 -lk5crypto -lcom_err"
      CFLAGS="$CFLAGS -I$withval/include"
-     LDFLAGS="$LDFLAGS -L$withval/lib"],
-   AC_MSG_RESULT(no)
+     LDFLAGS="$LDFLAGS -L$withval/lib"
+     ;;
diff --git a/japanese/samba/files/samba.sh.sample b/japanese/samba/files/samba.sh.sample
index e6807ad6d145..abaf42f4520a 100644
--- a/japanese/samba/files/samba.sh.sample
+++ b/japanese/samba/files/samba.sh.sample
@@ -1,4 +1,7 @@
 #!/bin/sh
+#
+# $FreeBSD$
+
 smbspool=/var/spool/samba
 pidfiledir=/var/run
 smbd=/usr/local/sbin/smbd
@@ -11,12 +14,17 @@ if [ "x$1" = "x" -o "x$1" = "xstart" ]; then
 			rm -f $smbspool/*
 		fi
 		echo -n ' Samba'
-		$smbd -D
 		$nmbd -D
+		$smbd -D
 	fi
 
 # stop
 elif [ "x$1" = "xstop" ]; then
 	kill `cat $pidfiledir/smbd.pid`
 	kill `cat $pidfiledir/nmbd.pid`
+
+# restart
+elif [ "x$1" = "xrestart" ]; then
+	$0 stop
+	$0 start
 fi
diff --git a/japanese/samba/files/smb.conf.default b/japanese/samba/files/smb.conf.default
index 374d87a5d41e..4b8767a76d06 100644
--- a/japanese/samba/files/smb.conf.default
+++ b/japanese/samba/files/smb.conf.default
@@ -1,3 +1,5 @@
+# $FreeBSD$
+#
 # これは Samba の設定ファイルです。
 # ここで列挙されているオプションを理解するためには、smb.conf(5) のマニュ
 # アルページを読む必要があります。
diff --git a/japanese/samba/pkg-plist b/japanese/samba/pkg-plist
index 0359c67d0149..a4060dc095d1 100644
--- a/japanese/samba/pkg-plist
+++ b/japanese/samba/pkg-plist
@@ -1,120 +1,38 @@
-bin/smbclient
-bin/smbstatus
-bin/smbpasswd
-bin/nmblookup
-bin/smbtar
-bin/addtosmbpass
-bin/convert_smbpasswd
-bin/testparm
-bin/testprns
 bin/make_nftable
-bin/make_smbpasswd
+bin/make_printerdef
 bin/make_smbcodepage
+bin/make_smbpasswd
 bin/make_unicodemap
-bin/make_printerdef
+bin/nmblookup
 bin/rpcclient
+bin/smbcacls
+bin/smbclient
+bin/smbcontrol
+bin/smbpasswd
 bin/smbspool
-sbin/smbd
-sbin/nmbd
-sbin/swat
-share/examples/samba/README
-share/examples/samba/smb.conf.default
-share/examples/samba/smb.conf.default.ja
-share/examples/samba/add-delete-user-script/README
-share/examples/samba/add-delete-user-script/smb-useradd
-share/examples/samba/add-delete-user-script/smb-userdel
-share/examples/samba/autofs/README
-share/examples/samba/dce-dfs/README
-share/examples/samba/dce-dfs/smb.conf
-share/examples/samba/misc/extra_smbstatus
-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/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.sysv
-share/examples/samba/simple/README
-share/examples/samba/simple/smb.conf
-share/examples/samba/svr4-startup/README
-share/examples/samba/svr4-startup/samba.server
-share/examples/samba/smbchartool/jcode.pl
-share/examples/samba/smbchartool/COPYING.txt
-share/examples/samba/smbchartool/README
-share/examples/samba/smbchartool/INSTALL.sh
-share/examples/samba/smbchartool/capecho
-share/examples/samba/smbchartool/hexecho
-share/examples/samba/smbchartool/dot.bashrc.example
-share/examples/samba/smbchartool/gendir.pl
-share/examples/samba/smbchartool/gengaiji.pl
-share/examples/samba/smbchartool/genibmkanji.pl
-share/examples/samba/smbchartool/hextestkanji.tar.gz
-share/examples/samba/smbchartool/smbchartool.html
-share/examples/samba/smbchartool/smbfnconv
-share/examples/samba/smbchartool/smbutfconv
-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/examples/samba/wins_hook/README
-share/examples/samba/wins_hook/dns_update
-@dirrm share/examples/samba/add-delete-user-script
-@dirrm share/examples/samba/autofs
-@dirrm share/examples/samba/dce-dfs
-@dirrm share/examples/samba/misc
-@dirrm share/examples/samba/printing
-@dirrm share/examples/samba/printer-accounting
-@dirrm share/examples/samba/simple
-@dirrm share/examples/samba/svr4-startup
-@dirrm share/examples/samba/smbchartool
-@dirrm share/examples/samba/thoralf
-@dirrm share/examples/samba/tridge
-@dirrm share/examples/samba/validchars
-@dirrm share/examples/samba/wins_hook
-@dirrm share/examples/samba
-etc/rc.d/samba.sh.sample
-etc/smb.conf.default
+bin/smbstatus
+bin/smbtar
+bin/testparm
+bin/testprns
+etc/codepages/codepage.1251
 etc/codepages/codepage.437
 etc/codepages/codepage.737
 etc/codepages/codepage.775
 etc/codepages/codepage.850
 etc/codepages/codepage.852
+etc/codepages/codepage.857
 etc/codepages/codepage.861
 etc/codepages/codepage.866
 etc/codepages/codepage.932
 etc/codepages/codepage.936
 etc/codepages/codepage.949
 etc/codepages/codepage.950
-etc/codepages/codepage.1251
-etc/codepages/unicode_map.437
-etc/codepages/unicode_map.737
-etc/codepages/unicode_map.850
-etc/codepages/unicode_map.852
-etc/codepages/unicode_map.861
-etc/codepages/unicode_map.866
-etc/codepages/unicode_map.932
-etc/codepages/unicode_map.936
-etc/codepages/unicode_map.949
-etc/codepages/unicode_map.950
-etc/codepages/unicode_map.ISO8859-1
-etc/codepages/unicode_map.ISO8859-2
-etc/codepages/unicode_map.ISO8859-5
-etc/codepages/unicode_map.ISO8859-7
-etc/codepages/unicode_map.KOI8-R
 etc/codepages/nftable.437
 etc/codepages/nftable.737
+etc/codepages/nftable.775
 etc/codepages/nftable.850
 etc/codepages/nftable.852
+etc/codepages/nftable.857
 etc/codepages/nftable.861
 etc/codepages/nftable.866
 etc/codepages/nftable.932
@@ -122,28 +40,181 @@ etc/codepages/nftable.936
 etc/codepages/nftable.949
 etc/codepages/nftable.950
 etc/codepages/nftable.ISO8859-1
+etc/codepages/nftable.ISO8859-13
+etc/codepages/nftable.ISO8859-15
 etc/codepages/nftable.ISO8859-2
 etc/codepages/nftable.ISO8859-5
 etc/codepages/nftable.ISO8859-7
+etc/codepages/nftable.ISO8859-9
 etc/codepages/nftable.KOI8-R
+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/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.KOI8-R
 @dirrm etc/codepages
+etc/rc.d/samba.sh.sample
+etc/smb.conf.default
+private/smbpasswd.default
+sbin/nmbd
+sbin/smbd
+sbin/swat
 share/doc/samba/COPYING
 share/doc/samba/Manifest
-share/doc/samba/NT4_PlainPassword.reg
-share/doc/samba/NT4-Locking.reg
+share/doc/samba/OID/allocated-arcs.txt
+share/doc/samba/OID/samba-oid.mail
 share/doc/samba/README
 share/doc/samba/README.FreeBSD
+share/doc/samba/README.Win2kSP2
+share/doc/samba/README.Win32-Viruses
+share/doc/samba/README.ldap
 share/doc/samba/README.swat
 share/doc/samba/Read-Manifest-Now
+share/doc/samba/Registry/NT4-Locking.reg
+share/doc/samba/Registry/NT4_PlainPassword.reg
+share/doc/samba/Registry/Win2000_PlainPassword.reg
+share/doc/samba/Registry/Win95_PlainPassword.reg
+share/doc/samba/Registry/Win98_PlainPassword.reg
+share/doc/samba/Registry/Win9X-CacheHandling.reg
+share/doc/samba/Registry/WinME_PlainPassword.reg
+share/doc/samba/Registry/WinXP_SignOrSeal.reg
+share/doc/samba/Registry/WindowsTerminalServer.reg
 share/doc/samba/Roadmap
+share/doc/samba/Samba-HOWTO-Collection.pdf
 share/doc/samba/THANKS
 share/doc/samba/WHATSNEW.txt
-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/WindowsTerminalServer.reg
 share/doc/samba/announce
+share/doc/samba/docbook/Makefile.in
+share/doc/samba/docbook/configure
+share/doc/samba/docbook/configure.in
+share/doc/samba/docbook/dbsgml/40chg.txt
+share/doc/samba/docbook/dbsgml/41chg.txt
+share/doc/samba/docbook/dbsgml/50issues.txt
+share/doc/samba/docbook/dbsgml/ChangeLog
+share/doc/samba/docbook/dbsgml/cals-tbl.dtd
+share/doc/samba/docbook/dbsgml/catalog
+share/doc/samba/docbook/dbsgml/dbcent.mod
+share/doc/samba/docbook/dbsgml/dbgenent.mod
+share/doc/samba/docbook/dbsgml/dbhier.mod
+share/doc/samba/docbook/dbsgml/dbnotn.mod
+share/doc/samba/docbook/dbsgml/dbpool.mod
+share/doc/samba/docbook/dbsgml/docbook.cat
+share/doc/samba/docbook/dbsgml/docbook.dcl
+share/doc/samba/docbook/dbsgml/docbook.dtd
+share/doc/samba/docbook/dbsgml/ent/ISOamsa
+share/doc/samba/docbook/dbsgml/ent/ISOamsb
+share/doc/samba/docbook/dbsgml/ent/ISOamsc
+share/doc/samba/docbook/dbsgml/ent/ISOamsn
+share/doc/samba/docbook/dbsgml/ent/ISOamso
+share/doc/samba/docbook/dbsgml/ent/ISOamsr
+share/doc/samba/docbook/dbsgml/ent/ISObox
+share/doc/samba/docbook/dbsgml/ent/ISOcyr1
+share/doc/samba/docbook/dbsgml/ent/ISOcyr2
+share/doc/samba/docbook/dbsgml/ent/ISOdia
+share/doc/samba/docbook/dbsgml/ent/ISOgrk1
+share/doc/samba/docbook/dbsgml/ent/ISOgrk2
+share/doc/samba/docbook/dbsgml/ent/ISOgrk3
+share/doc/samba/docbook/dbsgml/ent/ISOgrk4
+share/doc/samba/docbook/dbsgml/ent/ISOlat1
+share/doc/samba/docbook/dbsgml/ent/ISOlat2
+share/doc/samba/docbook/dbsgml/ent/ISOnum
+share/doc/samba/docbook/dbsgml/ent/ISOpub
+share/doc/samba/docbook/dbsgml/ent/ISOtech
+share/doc/samba/docbook/dbsgml/readme.txt
+share/doc/samba/docbook/docbook.txt
+share/doc/samba/docbook/faq/samba-pdc-faq.sgml
+share/doc/samba/docbook/global.ent
+share/doc/samba/docbook/howto/samba-pdc-howto.sgml
+share/doc/samba/docbook/manpages/findsmb.1.sgml
+share/doc/samba/docbook/manpages/lmhosts.5.sgml
+share/doc/samba/docbook/manpages/make_smbcodepage.1.sgml
+share/doc/samba/docbook/manpages/make_unicodemap.1.sgml
+share/doc/samba/docbook/manpages/nmbd.8.sgml
+share/doc/samba/docbook/manpages/nmblookup.1.sgml
+share/doc/samba/docbook/manpages/pl/README
+share/doc/samba/docbook/manpages/pl/findsmb.1.pl.sgml
+share/doc/samba/docbook/manpages/pl/lmhosts.5.pl.sgml
+share/doc/samba/docbook/manpages/pl/make_smbcodepage.1.pl.sgml
+share/doc/samba/docbook/manpages/pl/make_unicodemap.1.pl.sgml
+share/doc/samba/docbook/manpages/pl/nmbd.8.pl.sgml
+share/doc/samba/docbook/manpages/pl/nmblookup.1.pl.sgml
+share/doc/samba/docbook/manpages/pl/rpcclient.1.pl.sgml
+share/doc/samba/docbook/manpages/pl/samba.7.pl.sgml
+share/doc/samba/docbook/manpages/pl/smb.conf.5.pl.sgml
+share/doc/samba/docbook/manpages/pl/smbcacls.1.pl.sgml
+share/doc/samba/docbook/manpages/pl/smbclient.1.pl.sgml
+share/doc/samba/docbook/manpages/pl/smbcontrol.1.pl.sgml
+share/doc/samba/docbook/manpages/pl/smbd.8.pl.sgml
+share/doc/samba/docbook/manpages/pl/smbmnt.8.pl.sgml
+share/doc/samba/docbook/manpages/pl/smbmount.8.pl.sgml
+share/doc/samba/docbook/manpages/pl/smbpasswd.5.pl.sgml
+share/doc/samba/docbook/manpages/pl/smbpasswd.8.pl.sgml
+share/doc/samba/docbook/manpages/pl/smbsh.1.pl.sgml
+share/doc/samba/docbook/manpages/pl/smbspool.8.pl.sgml
+share/doc/samba/docbook/manpages/pl/smbstatus.1.pl.sgml
+share/doc/samba/docbook/manpages/pl/smbtar.1.pl.sgml
+share/doc/samba/docbook/manpages/pl/smbumount.8.pl.sgml
+share/doc/samba/docbook/manpages/pl/swat.8.pl.sgml
+share/doc/samba/docbook/manpages/pl/testparm.1.pl.sgml
+share/doc/samba/docbook/manpages/pl/testprns.1.pl.sgml
+share/doc/samba/docbook/manpages/pl/wbinfo.1.pl.sgml
+share/doc/samba/docbook/manpages/pl/winbindd.8.pl.sgml
+share/doc/samba/docbook/manpages/rpcclient.1.sgml
+share/doc/samba/docbook/manpages/samba.7.sgml
+share/doc/samba/docbook/manpages/smb.conf.5.sgml
+share/doc/samba/docbook/manpages/smbcacls.1.sgml
+share/doc/samba/docbook/manpages/smbclient.1.sgml
+share/doc/samba/docbook/manpages/smbcontrol.1.sgml
+share/doc/samba/docbook/manpages/smbd.8.sgml
+share/doc/samba/docbook/manpages/smbmnt.8.sgml
+share/doc/samba/docbook/manpages/smbmount.8.sgml
+share/doc/samba/docbook/manpages/smbpasswd.5.sgml
+share/doc/samba/docbook/manpages/smbpasswd.8.sgml
+share/doc/samba/docbook/manpages/smbsh.1.sgml
+share/doc/samba/docbook/manpages/smbspool.8.sgml
+share/doc/samba/docbook/manpages/smbstatus.1.sgml
+share/doc/samba/docbook/manpages/smbtar.1.sgml
+share/doc/samba/docbook/manpages/smbumount.8.sgml
+share/doc/samba/docbook/manpages/swat.8.sgml
+share/doc/samba/docbook/manpages/testparm.1.sgml
+share/doc/samba/docbook/manpages/testprns.1.sgml
+share/doc/samba/docbook/manpages/wbinfo.1.sgml
+share/doc/samba/docbook/manpages/winbindd.8.sgml
+share/doc/samba/docbook/projdoc/CVS-Access.sgml
+share/doc/samba/docbook/projdoc/DOMAIN_MEMBER.sgml
+share/doc/samba/docbook/projdoc/ENCRYPTION.sgml
+share/doc/samba/docbook/projdoc/Integrating-with-Windows.sgml
+share/doc/samba/docbook/projdoc/NT_Security.sgml
+share/doc/samba/docbook/projdoc/OS2-Client-HOWTO.sgml
+share/doc/samba/docbook/projdoc/PAM-Authentication-And-Samba.sgml
+share/doc/samba/docbook/projdoc/Samba-PDC-HOWTO.sgml
+share/doc/samba/docbook/projdoc/UNIX_INSTALL.sgml
+share/doc/samba/docbook/projdoc/msdfs_setup.sgml
+share/doc/samba/docbook/projdoc/printer_driver2.sgml
+share/doc/samba/docbook/projdoc/samba-doc.sgml
+share/doc/samba/docbook/projdoc/winbind.sgml
+share/doc/samba/docbook/scripts/README.ldp_print
+share/doc/samba/docbook/scripts/collateindex.pl
+share/doc/samba/docbook/scripts/fix_print_html.lib
+share/doc/samba/docbook/scripts/ldp_print
+share/doc/samba/docbook/scripts/make-article.pl
+share/doc/samba/docbook/scripts/strip-links.pl
+share/doc/samba/docbook/stylesheets/ldp.dsl.in
 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
@@ -166,59 +237,509 @@ share/doc/samba/faq/sambafaq.html
 share/doc/samba/faq/sambafaq.sgml
 share/doc/samba/faq/sambafaq.txt
 share/doc/samba/history
+share/doc/samba/htmldocs/CVS-Access.html
 share/doc/samba/htmldocs/DOMAIN_MEMBER.html
+share/doc/samba/htmldocs/ENCRYPTION.html
+share/doc/samba/htmldocs/Integrating-with-Windows.html
 share/doc/samba/htmldocs/NT_Security.html
+share/doc/samba/htmldocs/OS2-Client-HOWTO.html
+share/doc/samba/htmldocs/PAM-Authentication-And-Samba.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/make_unicodemap.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/smbpasswd.5.html
 share/doc/samba/htmldocs/smbpasswd.8.html
-share/doc/samba/htmldocs/smbspool.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/smbumount.8.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/using_samba/appa_01.html
+share/doc/samba/htmldocs/using_samba/appa_02.html
+share/doc/samba/htmldocs/using_samba/appa_03.html
+share/doc/samba/htmldocs/using_samba/appa_04.html
+share/doc/samba/htmldocs/using_samba/appa_05.html
+share/doc/samba/htmldocs/using_samba/appb_01.html
+share/doc/samba/htmldocs/using_samba/appb_02.html
+share/doc/samba/htmldocs/using_samba/appb_03.html
+share/doc/samba/htmldocs/using_samba/appc_01.html
+share/doc/samba/htmldocs/using_samba/appd_01.html
+share/doc/samba/htmldocs/using_samba/appe_01.html
+share/doc/samba/htmldocs/using_samba/appf_01.html
+share/doc/samba/htmldocs/using_samba/ch01_01.html
+share/doc/samba/htmldocs/using_samba/ch01_02.html
+share/doc/samba/htmldocs/using_samba/ch01_03.html
+share/doc/samba/htmldocs/using_samba/ch01_04.html
+share/doc/samba/htmldocs/using_samba/ch01_05.html
+share/doc/samba/htmldocs/using_samba/ch01_06.html
+share/doc/samba/htmldocs/using_samba/ch01_07.html
+share/doc/samba/htmldocs/using_samba/ch01_08.html
+share/doc/samba/htmldocs/using_samba/ch02_01.html
+share/doc/samba/htmldocs/using_samba/ch02_02.html
+share/doc/samba/htmldocs/using_samba/ch02_03.html
+share/doc/samba/htmldocs/using_samba/ch02_04.html
+share/doc/samba/htmldocs/using_samba/ch02_05.html
+share/doc/samba/htmldocs/using_samba/ch02_06.html
+share/doc/samba/htmldocs/using_samba/ch03_01.html
+share/doc/samba/htmldocs/using_samba/ch03_02.html
+share/doc/samba/htmldocs/using_samba/ch03_03.html
+share/doc/samba/htmldocs/using_samba/ch04_01.html
+share/doc/samba/htmldocs/using_samba/ch04_02.html
+share/doc/samba/htmldocs/using_samba/ch04_03.html
+share/doc/samba/htmldocs/using_samba/ch04_04.html
+share/doc/samba/htmldocs/using_samba/ch04_05.html
+share/doc/samba/htmldocs/using_samba/ch04_06.html
+share/doc/samba/htmldocs/using_samba/ch04_07.html
+share/doc/samba/htmldocs/using_samba/ch04_08.html
+share/doc/samba/htmldocs/using_samba/ch05_01.html
+share/doc/samba/htmldocs/using_samba/ch05_02.html
+share/doc/samba/htmldocs/using_samba/ch05_03.html
+share/doc/samba/htmldocs/using_samba/ch05_04.html
+share/doc/samba/htmldocs/using_samba/ch05_05.html
+share/doc/samba/htmldocs/using_samba/ch06_01.html
+share/doc/samba/htmldocs/using_samba/ch06_02.html
+share/doc/samba/htmldocs/using_samba/ch06_03.html
+share/doc/samba/htmldocs/using_samba/ch06_04.html
+share/doc/samba/htmldocs/using_samba/ch06_05.html
+share/doc/samba/htmldocs/using_samba/ch06_06.html
+share/doc/samba/htmldocs/using_samba/ch07_01.html
+share/doc/samba/htmldocs/using_samba/ch07_02.html
+share/doc/samba/htmldocs/using_samba/ch07_03.html
+share/doc/samba/htmldocs/using_samba/ch08_01.html
+share/doc/samba/htmldocs/using_samba/ch08_02.html
+share/doc/samba/htmldocs/using_samba/ch08_03.html
+share/doc/samba/htmldocs/using_samba/ch08_04.html
+share/doc/samba/htmldocs/using_samba/ch08_05.html
+share/doc/samba/htmldocs/using_samba/ch08_06.html
+share/doc/samba/htmldocs/using_samba/ch08_07.html
+share/doc/samba/htmldocs/using_samba/ch09_01.html
+share/doc/samba/htmldocs/using_samba/ch09_02.html
+share/doc/samba/htmldocs/using_samba/ch09_03.html
+share/doc/samba/htmldocs/using_samba/figs/sam.0101.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0102.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0103.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0104.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0105.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0106.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0107.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0108.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0109.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0110.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0111.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0112.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0113.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0114.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0201.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0202.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0203.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0204.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0301.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0302.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0303.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0304.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0305.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0306.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0307.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0308.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0309.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0310.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0311.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0312.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0313.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0314.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0315.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0316.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0317.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0318.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0319.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0320.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0321.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0322.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0323.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0324.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0325.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0326.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0327.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0328.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0401.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0402.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0403.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0404.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0405.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0406.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0407.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0501.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0502.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0503.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0504.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0505.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0506.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0507.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0508.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0601.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0602.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0603.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0604.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0605.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0606.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0701.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0702.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0703.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0704.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0705.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0706.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0707.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0708.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0709.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0801.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0802.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0803.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0804.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0805.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0901.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0902.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0903.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0904.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.0905.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.aa01.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.ab01.gif
+share/doc/samba/htmldocs/using_samba/figs/sam.ab02.gif
+share/doc/samba/htmldocs/using_samba/gifs/index.gif
+share/doc/samba/htmldocs/using_samba/gifs/samba.s.gif
+share/doc/samba/htmldocs/using_samba/gifs/txthome.gif
+share/doc/samba/htmldocs/using_samba/gifs/txtnexta.gif
+share/doc/samba/htmldocs/using_samba/gifs/txtpreva.gif
+share/doc/samba/htmldocs/using_samba/index.html
+share/doc/samba/htmldocs/using_samba/inx.html
+share/doc/samba/htmldocs/using_samba/licenseinfo.html
+share/doc/samba/htmldocs/using_samba/this_edition.html
+share/doc/samba/htmldocs/wbinfo.1.html
 share/doc/samba/htmldocs/wfw_slip.htm
-share/doc/samba/textdocs/smbmount.txt
-share/doc/samba/textdocs/NT-Guest-Access.txt
+share/doc/samba/htmldocs/winbind.html
+share/doc/samba/htmldocs/winbindd.8.html
+share/doc/samba/ja/CREDITS.txt
+share/doc/samba/ja/ML.txt
+share/doc/samba/ja/README.txt
+share/doc/samba/ja/WHATSNEW.txt
+share/doc/samba/ja/history
+share/doc/samba/ja/htmldocs/BrowsingFAQ/browsing01.html
+share/doc/samba/ja/htmldocs/BrowsingFAQ/browsing02.html
+share/doc/samba/ja/htmldocs/BrowsingFAQ/fig_1.html
+share/doc/samba/ja/htmldocs/BrowsingFAQ/fig_2.html
+share/doc/samba/ja/htmldocs/BrowsingFAQ/fig_4.html
+share/doc/samba/ja/htmldocs/BrowsingFAQ/fig_5.html
+share/doc/samba/ja/htmldocs/BrowsingFAQ/fig_6.html
+share/doc/samba/ja/htmldocs/BrowsingFAQ/fig_7.html
+share/doc/samba/ja/htmldocs/BrowsingFAQ/fig_8.html
+share/doc/samba/ja/htmldocs/BrowsingFAQ/image/fig1.png
+share/doc/samba/ja/htmldocs/BrowsingFAQ/image/fig2.png
+share/doc/samba/ja/htmldocs/BrowsingFAQ/image/fig4s.png
+share/doc/samba/ja/htmldocs/BrowsingFAQ/image/fig5s.png
+share/doc/samba/ja/htmldocs/BrowsingFAQ/image/fig7s.png
+share/doc/samba/ja/htmldocs/BrowsingFAQ/image/fig8s.png
+share/doc/samba/ja/htmldocs/BrowsingFAQ/index.html
+share/doc/samba/ja/htmldocs/HowToUseSamba2.2/fig05.gif
+share/doc/samba/ja/htmldocs/HowToUseSamba2.2/fig06.gif
+share/doc/samba/ja/htmldocs/HowToUseSamba2.2/fig07.gif
+share/doc/samba/ja/htmldocs/HowToUseSamba2.2/fig08.gif
+share/doc/samba/ja/htmldocs/HowToUseSamba2.2/fig09.gif
+share/doc/samba/ja/htmldocs/HowToUseSamba2.2/fig10.gif
+share/doc/samba/ja/htmldocs/HowToUseSamba2.2/fig11.gif
+share/doc/samba/ja/htmldocs/HowToUseSamba2.2/fig12.gif
+share/doc/samba/ja/htmldocs/HowToUseSamba2.2/fig14.gif
+share/doc/samba/ja/htmldocs/HowToUseSamba2.2/fig15.gif
+share/doc/samba/ja/htmldocs/HowToUseSamba2.2/fig16.gif
+share/doc/samba/ja/htmldocs/HowToUseSamba2.2/fig17.gif
+share/doc/samba/ja/htmldocs/HowToUseSamba2.2/fig18.gif
+share/doc/samba/ja/htmldocs/HowToUseSamba2.2/fig19.gif
+share/doc/samba/ja/htmldocs/HowToUseSamba2.2/fig20.gif
+share/doc/samba/ja/htmldocs/HowToUseSamba2.2/fig21.gif
+share/doc/samba/ja/htmldocs/HowToUseSamba2.2/fig22.gif
+share/doc/samba/ja/htmldocs/HowToUseSamba2.2/fig23.gif
+share/doc/samba/ja/htmldocs/HowToUseSamba2.2/fig24.gif
+share/doc/samba/ja/htmldocs/HowToUseSamba2.2/fig25.gif
+share/doc/samba/ja/htmldocs/HowToUseSamba2.2/index.html
+share/doc/samba/ja/htmldocs/NT_Security.html
+share/doc/samba/ja/htmldocs/diag.html
+share/doc/samba/ja/htmldocs/encrypt-passwd.html
+share/doc/samba/ja/htmldocs/findsmb.1.html
+share/doc/samba/ja/htmldocs/lmhosts.5.html
+share/doc/samba/ja/htmldocs/make_smbcodepage.1.html
+share/doc/samba/ja/htmldocs/make_unicodemap.1.html
+share/doc/samba/ja/htmldocs/msdfs_setup.html
+share/doc/samba/ja/htmldocs/nmbd.8.html
+share/doc/samba/ja/htmldocs/nmblookup.1.html
+share/doc/samba/ja/htmldocs/printer_driver2.html
+share/doc/samba/ja/htmldocs/quota/fig1.gif
+share/doc/samba/ja/htmldocs/quota/fig2.gif
+share/doc/samba/ja/htmldocs/quota/fig3.gif
+share/doc/samba/ja/htmldocs/quota/fig4.gif
+share/doc/samba/ja/htmldocs/quota/fig5.gif
+share/doc/samba/ja/htmldocs/quota/fig6.gif
+share/doc/samba/ja/htmldocs/quota/index.html
+share/doc/samba/ja/htmldocs/rpcclient.1.html
+share/doc/samba/ja/htmldocs/samba-func.html
+share/doc/samba/ja/htmldocs/samba-j.html
+share/doc/samba/ja/htmldocs/samba-pdc-faq.html
+share/doc/samba/ja/htmldocs/samba.7.html
+share/doc/samba/ja/htmldocs/samba2.2_func/fig01.gif
+share/doc/samba/ja/htmldocs/samba2.2_func/fig03.gif
+share/doc/samba/ja/htmldocs/samba2.2_func/fig04.gif
+share/doc/samba/ja/htmldocs/samba2.2_func/fig05.gif
+share/doc/samba/ja/htmldocs/samba2.2_func/fig06.gif
+share/doc/samba/ja/htmldocs/samba2.2_func/fig07.gif
+share/doc/samba/ja/htmldocs/samba2.2_func/index.html
+share/doc/samba/ja/htmldocs/samba2.2_whatsnew/fig01.gif
+share/doc/samba/ja/htmldocs/samba2.2_whatsnew/fig02.gif
+share/doc/samba/ja/htmldocs/samba2.2_whatsnew/fig03.gif
+share/doc/samba/ja/htmldocs/samba2.2_whatsnew/fig04.gif
+share/doc/samba/ja/htmldocs/samba2.2_whatsnew/fig05.gif
+share/doc/samba/ja/htmldocs/samba2.2_whatsnew/index.html
+share/doc/samba/ja/htmldocs/samba2.html
+share/doc/samba/ja/htmldocs/samba_begin.html
+share/doc/samba/ja/htmldocs/sambafaq-1.html
+share/doc/samba/ja/htmldocs/sambafaq-2.html
+share/doc/samba/ja/htmldocs/sambafaq-3.html
+share/doc/samba/ja/htmldocs/sambafaq-4.html
+share/doc/samba/ja/htmldocs/sambafaq-5.html
+share/doc/samba/ja/htmldocs/sambafaq.html
+share/doc/samba/ja/htmldocs/sambafaq.sgml
+share/doc/samba/ja/htmldocs/smb.conf.5.html
+share/doc/samba/ja/htmldocs/smbcacls.1.html
+share/doc/samba/ja/htmldocs/smbclient.1.html
+share/doc/samba/ja/htmldocs/smbcontrol.1.html
+share/doc/samba/ja/htmldocs/smbd.8.html
+share/doc/samba/ja/htmldocs/smbmnt.8.html
+share/doc/samba/ja/htmldocs/smbmount.8.html
+share/doc/samba/ja/htmldocs/smbpasswd.5.html
+share/doc/samba/ja/htmldocs/smbpasswd.8.html
+share/doc/samba/ja/htmldocs/smbrun.1.html
+share/doc/samba/ja/htmldocs/smbsh.1.html
+share/doc/samba/ja/htmldocs/smbspool.8.html
+share/doc/samba/ja/htmldocs/smbstatus.1.html
+share/doc/samba/ja/htmldocs/smbtar.1.html
+share/doc/samba/ja/htmldocs/smbumount.8.html
+share/doc/samba/ja/htmldocs/swat.8.html
+share/doc/samba/ja/htmldocs/testparm.1.html
+share/doc/samba/ja/htmldocs/testprns.1.html
+share/doc/samba/ja/htmldocs/tuning.japanese.html
+share/doc/samba/ja/htmldocs/using_samba/appa_01.html
+share/doc/samba/ja/htmldocs/using_samba/appa_02.html
+share/doc/samba/ja/htmldocs/using_samba/appa_03.html
+share/doc/samba/ja/htmldocs/using_samba/appa_04.html
+share/doc/samba/ja/htmldocs/using_samba/appa_05.html
+share/doc/samba/ja/htmldocs/using_samba/appb_01.html
+share/doc/samba/ja/htmldocs/using_samba/appb_02.html
+share/doc/samba/ja/htmldocs/using_samba/appb_03.html
+share/doc/samba/ja/htmldocs/using_samba/appc_01.html
+share/doc/samba/ja/htmldocs/using_samba/appd_01.html
+share/doc/samba/ja/htmldocs/using_samba/appe_01.html
+share/doc/samba/ja/htmldocs/using_samba/appf_01.html
+share/doc/samba/ja/htmldocs/using_samba/ch01_01.html
+share/doc/samba/ja/htmldocs/using_samba/ch01_02.html
+share/doc/samba/ja/htmldocs/using_samba/ch01_03.html
+share/doc/samba/ja/htmldocs/using_samba/ch01_04.html
+share/doc/samba/ja/htmldocs/using_samba/ch01_05.html
+share/doc/samba/ja/htmldocs/using_samba/ch01_06.html
+share/doc/samba/ja/htmldocs/using_samba/ch01_07.html
+share/doc/samba/ja/htmldocs/using_samba/ch01_08.html
+share/doc/samba/ja/htmldocs/using_samba/ch02_01.html
+share/doc/samba/ja/htmldocs/using_samba/ch02_02.html
+share/doc/samba/ja/htmldocs/using_samba/ch02_03.html
+share/doc/samba/ja/htmldocs/using_samba/ch02_04.html
+share/doc/samba/ja/htmldocs/using_samba/ch02_05.html
+share/doc/samba/ja/htmldocs/using_samba/ch02_06.html
+share/doc/samba/ja/htmldocs/using_samba/ch03_01.html
+share/doc/samba/ja/htmldocs/using_samba/ch03_02.html
+share/doc/samba/ja/htmldocs/using_samba/ch03_03.html
+share/doc/samba/ja/htmldocs/using_samba/ch04_01.html
+share/doc/samba/ja/htmldocs/using_samba/ch04_02.html
+share/doc/samba/ja/htmldocs/using_samba/ch04_03.html
+share/doc/samba/ja/htmldocs/using_samba/ch04_04.html
+share/doc/samba/ja/htmldocs/using_samba/ch04_05.html
+share/doc/samba/ja/htmldocs/using_samba/ch04_06.html
+share/doc/samba/ja/htmldocs/using_samba/ch04_07.html
+share/doc/samba/ja/htmldocs/using_samba/ch04_08.html
+share/doc/samba/ja/htmldocs/using_samba/ch05_01.html
+share/doc/samba/ja/htmldocs/using_samba/ch05_02.html
+share/doc/samba/ja/htmldocs/using_samba/ch05_03.html
+share/doc/samba/ja/htmldocs/using_samba/ch05_04.html
+share/doc/samba/ja/htmldocs/using_samba/ch05_05.html
+share/doc/samba/ja/htmldocs/using_samba/ch06_01.html
+share/doc/samba/ja/htmldocs/using_samba/ch06_02.html
+share/doc/samba/ja/htmldocs/using_samba/ch06_03.html
+share/doc/samba/ja/htmldocs/using_samba/ch06_04.html
+share/doc/samba/ja/htmldocs/using_samba/ch06_05.html
+share/doc/samba/ja/htmldocs/using_samba/ch06_06.html
+share/doc/samba/ja/htmldocs/using_samba/ch07_01.html
+share/doc/samba/ja/htmldocs/using_samba/ch07_02.html
+share/doc/samba/ja/htmldocs/using_samba/ch07_03.html
+share/doc/samba/ja/htmldocs/using_samba/ch08_01.html
+share/doc/samba/ja/htmldocs/using_samba/ch08_02.html
+share/doc/samba/ja/htmldocs/using_samba/ch08_03.html
+share/doc/samba/ja/htmldocs/using_samba/ch08_04.html
+share/doc/samba/ja/htmldocs/using_samba/ch08_05.html
+share/doc/samba/ja/htmldocs/using_samba/ch08_06.html
+share/doc/samba/ja/htmldocs/using_samba/ch08_07.html
+share/doc/samba/ja/htmldocs/using_samba/ch09_01.html
+share/doc/samba/ja/htmldocs/using_samba/ch09_02.html
+share/doc/samba/ja/htmldocs/using_samba/ch09_03.html
+share/doc/samba/ja/htmldocs/using_samba/contributor.html
+share/doc/samba/ja/htmldocs/using_samba/index.html
+share/doc/samba/ja/htmldocs/using_samba/inx.html
+share/doc/samba/ja/htmldocs/using_samba/licenseinfo.html
+share/doc/samba/ja/htmldocs/using_samba/status.html
+share/doc/samba/ja/htmldocs/using_samba/this_edition.html
+share/doc/samba/ja/htmldocs/wbinfo.1.html
+share/doc/samba/ja/htmldocs/whatsamba.html
+share/doc/samba/ja/htmldocs/winbind.html
+share/doc/samba/ja/htmldocs/winbindd.8.html
+share/doc/samba/ja/reg/NT4_PlainPassword.reg
+share/doc/samba/ja/reg/Win2000_PlainPassword.reg
+share/doc/samba/ja/reg/Win95_PlainPassword.reg
+share/doc/samba/ja/reg/Win98_PlainPassword.reg
+share/doc/samba/ja/reg/Win9X-CacheHandling.reg
+share/doc/samba/ja/status.html
+share/doc/samba/ja/status.txt
+share/doc/samba/ja/textdocs/Application_Serving.txt
+share/doc/samba/ja/textdocs/BROWSING-Config.txt
+share/doc/samba/ja/textdocs/BROWSING.txt
+share/doc/samba/ja/textdocs/CRLF-LF-Conversions.txt
+share/doc/samba/ja/textdocs/CVS_ACCESS.txt
+share/doc/samba/ja/textdocs/DIAGNOSIS.txt
+share/doc/samba/ja/textdocs/DOMAIN.txt
+share/doc/samba/ja/textdocs/DOMAIN_MEMBER.txt
+share/doc/samba/ja/textdocs/ENCRYPTION.txt
+share/doc/samba/ja/textdocs/File-Cacheing.txt
+share/doc/samba/ja/textdocs/Macintosh_Clients.txt
+share/doc/samba/ja/textdocs/NT-Guest-Access.txt
+share/doc/samba/ja/textdocs/NTDOMAIN.txt
+share/doc/samba/ja/textdocs/NetBIOS.txt
+share/doc/samba/ja/textdocs/PRINTER_DRIVER.txt
+share/doc/samba/ja/textdocs/PROFILES.txt
+share/doc/samba/ja/textdocs/Passwords.txt
+share/doc/samba/ja/textdocs/README.smbmount.txt
+share/doc/samba/ja/textdocs/Speed.txt
+share/doc/samba/ja/textdocs/Speed2.txt
+share/doc/samba/ja/textdocs/UNIX-SMB.txt
+share/doc/samba/ja/textdocs/UNIX_INSTALL.txt
+share/doc/samba/ja/textdocs/Win95.txt
+share/doc/samba/ja/textdocs/WinNT.txt
+share/doc/samba/ja/textdocs/footer.html
+share/doc/samba/ja/textdocs/header.html
+share/doc/samba/ja/textdocs/security_level.txt
+share/doc/samba/ja/textdocs/smbmount.txt
+share/doc/samba/ja/yodldocs/NT_Security.yo
+share/doc/samba/ja/yodldocs/make_smbcodepage.1.yo
+share/doc/samba/ja/yodldocs/make_unicodemap.1.yo
+share/doc/samba/ja/yodldocs/nmbd.8.yo
+share/doc/samba/ja/yodldocs/smb.conf.5.yo
+share/doc/samba/ja/yodldocs/smbclient.1.yo
+share/doc/samba/ja/yodldocs/smbd.8.yo
+share/doc/samba/ja/yodldocs/smbmnt.8.yo
+share/doc/samba/ja/yodldocs/smbmount.8.yo
+share/doc/samba/ja/yodldocs/smbpasswd.8.yo
+share/doc/samba/ja/yodldocs/smbrun.1.yo
+share/doc/samba/ja/yodldocs/smbspool.8.yo
+share/doc/samba/ja/yodldocs/smbstatus.1.yo
+share/doc/samba/ja/yodldocs/smbtar.1.yo
+share/doc/samba/ja/yodldocs/testprns.1.yo
+share/doc/samba/manpages/findsmb.1
+share/doc/samba/manpages/ja/Makefile
+share/doc/samba/manpages/ja/findsmb.1.man
+share/doc/samba/manpages/ja/install-man.sh
+share/doc/samba/manpages/ja/lmhosts.5.man
+share/doc/samba/manpages/ja/make_smbcodepage.1.man
+share/doc/samba/manpages/ja/make_unicodemap.1.man
+share/doc/samba/manpages/ja/nmbd.8.man
+share/doc/samba/manpages/ja/nmblookup.1.man
+share/doc/samba/manpages/ja/rpcclient.1.man
+share/doc/samba/manpages/ja/samba.7.man
+share/doc/samba/manpages/ja/smb.conf.5.man
+share/doc/samba/manpages/ja/smbcacls.1.man
+share/doc/samba/manpages/ja/smbclient.1.man
+share/doc/samba/manpages/ja/smbcontrol.1.man
+share/doc/samba/manpages/ja/smbd.8.man
+share/doc/samba/manpages/ja/smbmnt.8.man
+share/doc/samba/manpages/ja/smbmount.8.man
+share/doc/samba/manpages/ja/smbpasswd.5.man
+share/doc/samba/manpages/ja/smbpasswd.8.man
+share/doc/samba/manpages/ja/smbrun.1.man
+share/doc/samba/manpages/ja/smbsh.1.man
+share/doc/samba/manpages/ja/smbspool.8.man
+share/doc/samba/manpages/ja/smbstatus.1.man
+share/doc/samba/manpages/ja/smbtar.1.man
+share/doc/samba/manpages/ja/smbumount.8.man
+share/doc/samba/manpages/ja/swat.8.man
+share/doc/samba/manpages/ja/testparm.1.man
+share/doc/samba/manpages/ja/testprns.1.man
+share/doc/samba/manpages/ja/wbinfo.1.man
+share/doc/samba/manpages/ja/winbindd.8.man
+share/doc/samba/manpages/lmhosts.5
+share/doc/samba/manpages/make_smbcodepage.1
+share/doc/samba/manpages/make_unicodemap.1
+share/doc/samba/manpages/nmbd.8
+share/doc/samba/manpages/nmblookup.1
+share/doc/samba/manpages/rpcclient.1
+share/doc/samba/manpages/samba.7
+share/doc/samba/manpages/smb.conf.5
+share/doc/samba/manpages/smbcacls.1
+share/doc/samba/manpages/smbclient.1
+share/doc/samba/manpages/smbcontrol.1
+share/doc/samba/manpages/smbd.8
+share/doc/samba/manpages/smbmnt.8
+share/doc/samba/manpages/smbmount.8
+share/doc/samba/manpages/smbpasswd.5
+share/doc/samba/manpages/smbpasswd.8
+share/doc/samba/manpages/smbrun.1
+share/doc/samba/manpages/smbsh.1
+share/doc/samba/manpages/smbspool.8
+share/doc/samba/manpages/smbstatus.1
+share/doc/samba/manpages/smbtar.1
+share/doc/samba/manpages/smbumount.8
+share/doc/samba/manpages/swat.8
+share/doc/samba/manpages/testparm.1
+share/doc/samba/manpages/testprns.1
+share/doc/samba/manpages/wbinfo.1
+share/doc/samba/manpages/winbindd.8
 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/CRLF-LF-Conversions.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/DOMAIN_CONTROL.txt
-share/doc/samba/textdocs/DOMAIN_MEMBER.txt
-share/doc/samba/textdocs/ENCRYPTION.txt
 share/doc/samba/textdocs/Faxing.txt
-share/doc/samba/textdocs/File-Cacheing.txt
 share/doc/samba/textdocs/GOTCHAS.txt
 share/doc/samba/textdocs/HINTS.txt
 share/doc/samba/textdocs/INSTALL.sambatar
-share/doc/samba/textdocs/MIRRORS.txt
+share/doc/samba/textdocs/Imprints.txt
 share/doc/samba/textdocs/Macintosh_Clients.txt
-share/doc/samba/textdocs/NTDOMAIN.txt
-share/doc/samba/textdocs/NT_Security.txt
 share/doc/samba/textdocs/NetBIOS.txt
-share/doc/samba/textdocs/OS2-Client-HOWTO.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
@@ -228,60 +749,175 @@ 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/Samba-OpenSSL.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_INSTALL.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/sambafaq.txt
+share/doc/samba/textdocs/kurs.pdf
+share/doc/samba/textdocs/kurs.tex
+share/doc/samba/textdocs/logo.ps
+share/doc/samba/textdocs/outdated/NTDOMAIN.txt
+share/doc/samba/textdocs/outdated/PRINTER_DRIVER.txt
+share/doc/samba/textdocs/outdated/PROJECTS
 share/doc/samba/textdocs/security_level.txt
-share/doc/samba/yodldocs/DOMAIN_MEMBER.yo
-share/doc/samba/yodldocs/NT_Security.yo
-share/doc/samba/yodldocs/lmhosts.5.yo
-share/doc/samba/yodldocs/make_smbcodepage.1.yo
-share/doc/samba/yodldocs/make_unicodemap.1.yo
-share/doc/samba/yodldocs/nmbd.8.yo
-share/doc/samba/yodldocs/nmblookup.1.yo
-share/doc/samba/yodldocs/samba.7.yo
-share/doc/samba/yodldocs/smb.conf.5.yo
-share/doc/samba/yodldocs/smbclient.1.yo
-share/doc/samba/yodldocs/smbd.8.yo
-share/doc/samba/yodldocs/smbmnt.8.yo
-share/doc/samba/yodldocs/smbmount.8.yo
-share/doc/samba/yodldocs/smbpasswd.5.yo
-share/doc/samba/yodldocs/smbpasswd.8.yo
-share/doc/samba/yodldocs/smbspool.8.yo
-share/doc/samba/yodldocs/smbrun.1.yo
-share/doc/samba/yodldocs/smbsh.1.yo
-share/doc/samba/yodldocs/smbstatus.1.yo
-share/doc/samba/yodldocs/smbtar.1.yo
-share/doc/samba/yodldocs/swat.8.yo
-share/doc/samba/yodldocs/testparm.1.yo
-share/doc/samba/yodldocs/testprns.1.yo
+share/doc/samba/yodldocs/README-NOW
+@dirrm share/doc/samba/OID
+@dirrm share/doc/samba/Registry
+@dirrm share/doc/samba/docbook/faq
+@dirrm share/doc/samba/docbook/dbsgml/ent
+@dirrm share/doc/samba/docbook/dbsgml
+@dirrm share/doc/samba/docbook/howto
+@dirrm share/doc/samba/docbook/manpages/pl
+@dirrm share/doc/samba/docbook/manpages
+@dirrm share/doc/samba/docbook/projdoc
+@dirrm share/doc/samba/docbook/scripts
+@dirrm share/doc/samba/docbook/stylesheets
+@dirrm share/doc/samba/docbook
 @dirrm share/doc/samba/faq
+@dirrm share/doc/samba/htmldocs/using_samba/figs
+@dirrm share/doc/samba/htmldocs/using_samba/gifs
+@dirrm share/doc/samba/htmldocs/using_samba
 @dirrm share/doc/samba/htmldocs
+@dirrm share/doc/samba/ja/reg
+@dirrm share/doc/samba/ja/htmldocs/quota
+@dirrm share/doc/samba/ja/htmldocs/BrowsingFAQ/image
+@dirrm share/doc/samba/ja/htmldocs/BrowsingFAQ
+@dirrm share/doc/samba/ja/htmldocs/HowToUseSamba2.2
+@dirrm share/doc/samba/ja/htmldocs/samba2.2_func
+@dirrm share/doc/samba/ja/htmldocs/samba2.2_whatsnew
+@dirrm share/doc/samba/ja/htmldocs/using_samba
+@dirrm share/doc/samba/ja/htmldocs
+@dirrm share/doc/samba/ja/textdocs
+@dirrm share/doc/samba/ja/yodldocs
+@dirrm share/doc/samba/ja
+@dirrm share/doc/samba/manpages/ja
+@dirrm share/doc/samba/manpages
+@dirrm share/doc/samba/textdocs/outdated
 @dirrm share/doc/samba/textdocs
 @dirrm share/doc/samba/yodldocs
-@dirrm share/doc/samba
-share/locale/en/LC_MESSAGES/i18n_swat.mo
-share/locale/ja/LC_MESSAGES/i18n_swat.mo
-share/swat/help/welcome.html
+share/examples/samba/LDAP/README
+share/examples/samba/LDAP/export2_smbpasswd.pl
+share/examples/samba/LDAP/export_smbpasswd.pl
+share/examples/samba/LDAP/import2_smbpasswd.pl
+share/examples/samba/LDAP/import_smbpasswd.pl
+share/examples/samba/LDAP/ldapchpasswd
+share/examples/samba/LDAP/ldapsync.pl
+share/examples/samba/LDAP/samba.schema
+share/examples/samba/README
+share/examples/samba/VFS/Makefile
+share/examples/samba/VFS/README
+share/examples/samba/VFS/audit.c
+share/examples/samba/VFS/block/Makefile
+share/examples/samba/VFS/block/block.c
+share/examples/samba/VFS/block/samba-block.conf
+share/examples/samba/VFS/block/smb.conf
+share/examples/samba/VFS/skel.c
+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/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/libsmbclient/testsmbc.c
+share/examples/samba/libsmbclient/tree.c
+share/examples/samba/misc/extra_smbstatus
+share/examples/samba/misc/modify_samba_config.pl
+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/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/smbchartool/COPYING.txt
+share/examples/samba/smbchartool/INSTALL.sh
+share/examples/samba/smbchartool/README
+share/examples/samba/smbchartool/capecho
+share/examples/samba/smbchartool/dot.bashrc.example
+share/examples/samba/smbchartool/gendir.pl
+share/examples/samba/smbchartool/gengaiji.pl
+share/examples/samba/smbchartool/genibmkanji.pl
+share/examples/samba/smbchartool/hexecho
+share/examples/samba/smbchartool/hextestkanji.tar.gz
+share/examples/samba/smbchartool/jcode.pl
+share/examples/samba/smbchartool/smbchartool.html
+share/examples/samba/smbchartool/smbfnconv
+share/examples/samba/smbchartool/smbutfconv
+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
+@dirrm share/examples/samba/LDAP
+@dirrm share/examples/samba/VFS/block
+@dirrm share/examples/samba/VFS
+@dirrm share/examples/samba/appliance
+@dirrm share/examples/samba/autofs
+@dirrm share/examples/samba/dce-dfs
+@dirrm share/examples/samba/libsmbclient
+@dirrm share/examples/samba/misc
+@dirrm share/examples/samba/printer-accounting
+@dirrm share/examples/samba/printing
+@dirrm share/examples/samba/simple
+@dirrm share/examples/samba/smbchartool
+@dirrm share/examples/samba/svr4-startup
+@dirrm share/examples/samba/thoralf
+@dirrm share/examples/samba/tridge
+@dirrm share/examples/samba/validchars
+@dirrm share/examples/samba
+share/locale/en/LC_MESSAGES/samba.mo
+share/locale/en/LC_MESSAGES/samba_swat.mo
+share/locale/ja/LC_MESSAGES/samba.mo
+share/locale/ja/LC_MESSAGES/samba_swat.mo
+share/swat/help/CVS-Access.html
 share/swat/help/DOMAIN_MEMBER.html
+share/swat/help/ENCRYPTION.html
+share/swat/help/Integrating-with-Windows.html
 share/swat/help/NT_Security.html
+share/swat/help/OS2-Client-HOWTO.html
+share/swat/help/PAM-Authentication-And-Samba.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/make_unicodemap.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
@@ -292,10 +928,14 @@ 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/welcome.ja_JP.ujis.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
@@ -306,10 +946,25 @@ share/swat/images/status.gif
 share/swat/images/viewconfig.gif
 share/swat/include/footer.html
 share/swat/include/header.html
-share/swat/include/header_css.html
 share/swat/ja/help/Application_Serving.txt.html
 share/swat/ja/help/BROWSING-Config.txt.html
 share/swat/ja/help/BROWSING.txt.html
+share/swat/ja/help/BrowsingFAQ/browsing01.html
+share/swat/ja/help/BrowsingFAQ/browsing02.html
+share/swat/ja/help/BrowsingFAQ/fig_1.html
+share/swat/ja/help/BrowsingFAQ/fig_2.html
+share/swat/ja/help/BrowsingFAQ/fig_4.html
+share/swat/ja/help/BrowsingFAQ/fig_5.html
+share/swat/ja/help/BrowsingFAQ/fig_6.html
+share/swat/ja/help/BrowsingFAQ/fig_7.html
+share/swat/ja/help/BrowsingFAQ/fig_8.html
+share/swat/ja/help/BrowsingFAQ/image/fig1.png
+share/swat/ja/help/BrowsingFAQ/image/fig2.png
+share/swat/ja/help/BrowsingFAQ/image/fig4s.png
+share/swat/ja/help/BrowsingFAQ/image/fig5s.png
+share/swat/ja/help/BrowsingFAQ/image/fig7s.png
+share/swat/ja/help/BrowsingFAQ/image/fig8s.png
+share/swat/ja/help/BrowsingFAQ/index.html
 share/swat/ja/help/CRLF-LF-Conversions.txt.html
 share/swat/ja/help/CVS_ACCESS.txt.html
 share/swat/ja/help/DIAGNOSIS.txt.html
@@ -317,6 +972,27 @@ share/swat/ja/help/DOMAIN.txt.html
 share/swat/ja/help/DOMAIN_MEMBER.txt.html
 share/swat/ja/help/ENCRYPTION.txt.html
 share/swat/ja/help/File-Cacheing.txt.html
+share/swat/ja/help/HowToUseSamba2.2/fig05.gif
+share/swat/ja/help/HowToUseSamba2.2/fig06.gif
+share/swat/ja/help/HowToUseSamba2.2/fig07.gif
+share/swat/ja/help/HowToUseSamba2.2/fig08.gif
+share/swat/ja/help/HowToUseSamba2.2/fig09.gif
+share/swat/ja/help/HowToUseSamba2.2/fig10.gif
+share/swat/ja/help/HowToUseSamba2.2/fig11.gif
+share/swat/ja/help/HowToUseSamba2.2/fig12.gif
+share/swat/ja/help/HowToUseSamba2.2/fig14.gif
+share/swat/ja/help/HowToUseSamba2.2/fig15.gif
+share/swat/ja/help/HowToUseSamba2.2/fig16.gif
+share/swat/ja/help/HowToUseSamba2.2/fig17.gif
+share/swat/ja/help/HowToUseSamba2.2/fig18.gif
+share/swat/ja/help/HowToUseSamba2.2/fig19.gif
+share/swat/ja/help/HowToUseSamba2.2/fig20.gif
+share/swat/ja/help/HowToUseSamba2.2/fig21.gif
+share/swat/ja/help/HowToUseSamba2.2/fig22.gif
+share/swat/ja/help/HowToUseSamba2.2/fig23.gif
+share/swat/ja/help/HowToUseSamba2.2/fig24.gif
+share/swat/ja/help/HowToUseSamba2.2/fig25.gif
+share/swat/ja/help/HowToUseSamba2.2/index.html
 share/swat/ja/help/Macintosh_Clients.txt.html
 share/swat/ja/help/NT-Guest-Access.txt.html
 share/swat/ja/help/NTDOMAIN.txt.html
@@ -332,17 +1008,43 @@ share/swat/ja/help/UNIX-SMB.txt.html
 share/swat/ja/help/UNIX_INSTALL.txt.html
 share/swat/ja/help/Win95.txt.html
 share/swat/ja/help/WinNT.txt.html
+share/swat/ja/help/diag.html
 share/swat/ja/help/encrypt-passwd.html
+share/swat/ja/help/findsmb.1.html
 share/swat/ja/help/lmhosts.5.html
 share/swat/ja/help/make_smbcodepage.1.html
 share/swat/ja/help/make_unicodemap.1.html
+share/swat/ja/help/msdfs_setup.html
 share/swat/ja/help/nmbd.8.html
 share/swat/ja/help/nmblookup.1.html
+share/swat/ja/help/printer_driver2.html
+share/swat/ja/help/quota/fig1.gif
+share/swat/ja/help/quota/fig2.gif
+share/swat/ja/help/quota/fig3.gif
+share/swat/ja/help/quota/fig4.gif
+share/swat/ja/help/quota/fig5.gif
+share/swat/ja/help/quota/fig6.gif
+share/swat/ja/help/quota/index.html
+share/swat/ja/help/rpcclient.1.html
 share/swat/ja/help/samba-func.html
 share/swat/ja/help/samba-j.html
-share/swat/ja/help/samba_begin.html
+share/swat/ja/help/samba-pdc-faq.html
 share/swat/ja/help/samba.7.html
+share/swat/ja/help/samba2.2_func/fig01.gif
+share/swat/ja/help/samba2.2_func/fig03.gif
+share/swat/ja/help/samba2.2_func/fig04.gif
+share/swat/ja/help/samba2.2_func/fig05.gif
+share/swat/ja/help/samba2.2_func/fig06.gif
+share/swat/ja/help/samba2.2_func/fig07.gif
+share/swat/ja/help/samba2.2_func/index.html
+share/swat/ja/help/samba2.2_whatsnew/fig01.gif
+share/swat/ja/help/samba2.2_whatsnew/fig02.gif
+share/swat/ja/help/samba2.2_whatsnew/fig03.gif
+share/swat/ja/help/samba2.2_whatsnew/fig04.gif
+share/swat/ja/help/samba2.2_whatsnew/fig05.gif
+share/swat/ja/help/samba2.2_whatsnew/index.html
 share/swat/ja/help/samba2.html
+share/swat/ja/help/samba_begin.html
 share/swat/ja/help/sambafaq-1.html
 share/swat/ja/help/sambafaq-2.html
 share/swat/ja/help/sambafaq-3.html
@@ -351,7 +1053,9 @@ share/swat/ja/help/sambafaq-5.html
 share/swat/ja/help/sambafaq.html
 share/swat/ja/help/security_level.txt.html
 share/swat/ja/help/smb.conf.5.html
+share/swat/ja/help/smbcacls.1.html
 share/swat/ja/help/smbclient.1.html
+share/swat/ja/help/smbcontrol.1.html
 share/swat/ja/help/smbd.8.html
 share/swat/ja/help/smbmnt.8.html
 share/swat/ja/help/smbmount.8.html
@@ -362,14 +1066,84 @@ share/swat/ja/help/smbrun.1.html
 share/swat/ja/help/smbsh.1.html
 share/swat/ja/help/smbspool.8.html
 share/swat/ja/help/smbstatus.1.html
-share/swat/ja/help/smbumount.8.html
 share/swat/ja/help/smbtar.1.html
+share/swat/ja/help/smbumount.8.html
 share/swat/ja/help/swat.8.html
 share/swat/ja/help/testparm.1.html
 share/swat/ja/help/testprns.1.html
 share/swat/ja/help/tuning.japanese.html
+share/swat/ja/help/using_samba/appa_01.html
+share/swat/ja/help/using_samba/appa_02.html
+share/swat/ja/help/using_samba/appa_03.html
+share/swat/ja/help/using_samba/appa_04.html
+share/swat/ja/help/using_samba/appa_05.html
+share/swat/ja/help/using_samba/appb_01.html
+share/swat/ja/help/using_samba/appb_02.html
+share/swat/ja/help/using_samba/appb_03.html
+share/swat/ja/help/using_samba/appc_01.html
+share/swat/ja/help/using_samba/appd_01.html
+share/swat/ja/help/using_samba/appe_01.html
+share/swat/ja/help/using_samba/appf_01.html
+share/swat/ja/help/using_samba/ch01_01.html
+share/swat/ja/help/using_samba/ch01_02.html
+share/swat/ja/help/using_samba/ch01_03.html
+share/swat/ja/help/using_samba/ch01_04.html
+share/swat/ja/help/using_samba/ch01_05.html
+share/swat/ja/help/using_samba/ch01_06.html
+share/swat/ja/help/using_samba/ch01_07.html
+share/swat/ja/help/using_samba/ch01_08.html
+share/swat/ja/help/using_samba/ch02_01.html
+share/swat/ja/help/using_samba/ch02_02.html
+share/swat/ja/help/using_samba/ch02_03.html
+share/swat/ja/help/using_samba/ch02_04.html
+share/swat/ja/help/using_samba/ch02_05.html
+share/swat/ja/help/using_samba/ch02_06.html
+share/swat/ja/help/using_samba/ch03_01.html
+share/swat/ja/help/using_samba/ch03_02.html
+share/swat/ja/help/using_samba/ch03_03.html
+share/swat/ja/help/using_samba/ch04_01.html
+share/swat/ja/help/using_samba/ch04_02.html
+share/swat/ja/help/using_samba/ch04_03.html
+share/swat/ja/help/using_samba/ch04_04.html
+share/swat/ja/help/using_samba/ch04_05.html
+share/swat/ja/help/using_samba/ch04_06.html
+share/swat/ja/help/using_samba/ch04_07.html
+share/swat/ja/help/using_samba/ch04_08.html
+share/swat/ja/help/using_samba/ch05_01.html
+share/swat/ja/help/using_samba/ch05_02.html
+share/swat/ja/help/using_samba/ch05_03.html
+share/swat/ja/help/using_samba/ch05_04.html
+share/swat/ja/help/using_samba/ch05_05.html
+share/swat/ja/help/using_samba/ch06_01.html
+share/swat/ja/help/using_samba/ch06_02.html
+share/swat/ja/help/using_samba/ch06_03.html
+share/swat/ja/help/using_samba/ch06_04.html
+share/swat/ja/help/using_samba/ch06_05.html
+share/swat/ja/help/using_samba/ch06_06.html
+share/swat/ja/help/using_samba/ch07_01.html
+share/swat/ja/help/using_samba/ch07_02.html
+share/swat/ja/help/using_samba/ch07_03.html
+share/swat/ja/help/using_samba/ch08_01.html
+share/swat/ja/help/using_samba/ch08_02.html
+share/swat/ja/help/using_samba/ch08_03.html
+share/swat/ja/help/using_samba/ch08_04.html
+share/swat/ja/help/using_samba/ch08_05.html
+share/swat/ja/help/using_samba/ch08_06.html
+share/swat/ja/help/using_samba/ch08_07.html
+share/swat/ja/help/using_samba/ch09_01.html
+share/swat/ja/help/using_samba/ch09_02.html
+share/swat/ja/help/using_samba/ch09_03.html
+share/swat/ja/help/using_samba/contributor.html
+share/swat/ja/help/using_samba/index.html
+share/swat/ja/help/using_samba/inx.html
+share/swat/ja/help/using_samba/licenseinfo.html
+share/swat/ja/help/using_samba/status.html
+share/swat/ja/help/using_samba/this_edition.html
+share/swat/ja/help/wbinfo.1.html
 share/swat/ja/help/welcome.html
 share/swat/ja/help/whatsamba.html
+share/swat/ja/help/winbind.html
+share/swat/ja/help/winbindd.8.html
 share/swat/ja/images/globals.gif
 share/swat/ja/images/home.gif
 share/swat/ja/images/passwd.gif
@@ -385,10 +1159,6 @@ share/swat/ja/include/header.nocss.html
 share/swat/ja/include/header.org.html
 share/swat/ja/include/header.sjis.html
 share/swat/ja/include/header_css.html
-@dirrm share/swat/ja/help
-@dirrm share/swat/ja/images
-@dirrm share/swat/ja/include
-@dirrm share/swat/ja
 share/swat/using_samba/appa_01.html
 share/swat/using_samba/appa_02.html
 share/swat/using_samba/appa_03.html
@@ -450,10 +1220,6 @@ 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/using_samba/figs/sam.0101.gif
 share/swat/using_samba/figs/sam.0102.gif
 share/swat/using_samba/figs/sam.0103.gif
@@ -548,11 +1314,8 @@ 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
-@dirrm share/swat/help
-@dirrm share/swat/images
-@dirrm share/swat/include
-@dirrm share/swat/using_samba/figs
-@dirrm share/swat/using_samba/gifs
+share/swat/using_samba/index.html
+share/swat/using_samba/inx.html
 share/swat/using_samba/ja/appa_01.html
 share/swat/using_samba/ja/appa_02.html
 share/swat/using_samba/ja/appa_03.html
@@ -714,19 +1477,33 @@ share/swat/using_samba/ja/inx.html
 share/swat/using_samba/ja/licenseinfo.html
 share/swat/using_samba/ja/status.html
 share/swat/using_samba/ja/this_edition.html
+share/swat/using_samba/licenseinfo.html
+share/swat/using_samba/this_edition.html
+@dirrm share/swat/ja/help/HowToUseSamba
+@dirrm share/swat/ja/help/BrowsingFAQ/image
+@dirrm share/swat/ja/help/BrowsingFAQ
+@dirrm share/swat/ja/help/HowToUseSamba2.2
+@dirrm share/swat/ja/help/quota
+@dirrm share/swat/ja/help/samba2.2_func
+@dirrm share/swat/ja/help/samba2.2_whatsnew
+@dirrm share/swat/ja/help/using_samba
+@dirrm share/swat/ja/help
+@dirrm share/swat/ja/images
+@dirrm share/swat/ja/include
+@dirrm share/swat/using_samba/figs
+@dirrm share/swat/using_samba/gifs
 @dirrm share/swat/using_samba/ja/figs
 @dirrm share/swat/using_samba/ja/gifs
 @dirrm share/swat/using_samba/ja
 @dirrm share/swat/using_samba
-@dirrm share/swat
-@exec /bin/mkdir -p -m 500 %D/private
-@exec /usr/sbin/chown -R root:wheel %D/private
+@exec /bin/cat %D/share/doc/samba/README.FreeBSD
 @exec /bin/cat /etc/passwd | %D/bin/make_smbpasswd > %D/private/smbpasswd.default
-@unexec if cmp %D/private/smbpasswd.default %D/private/smbpasswd >/dev/null 2>&1; then /bin/rm -f %D/private/smbpasswd ; fi
-private/smbpasswd.default
-@exec if [ ! -e %D/private/smbpasswd ]; then /bin/cp -p %D/private/smbpasswd.default %D/private/smbpasswd; fi
 @exec /bin/chmod 600 %D/private/smbpasswd*
-@unexec /bin/rmdir %D/private 2>/dev/null || true
 @exec /bin/mkdir -p -m 1777 /var/spool/samba
-@exec /bin/cat %D/share/doc/samba/README.FreeBSD
+@exec /bin/mkdir -p -m 500 %D/private
+@exec /usr/sbin/chown -R root:wheel %D/private
+@exec if [ ! -e %D/private/smbpasswd ]; then /bin/cp -p %D/private/smbpasswd.default %D/private/smbpasswd; fi
 @unexec /bin/rm -rf /var/spool/samba
+@unexec /bin/rmdir /var/db/samba 2>/dev/null || true
+@unexec /bin/rmdir %D/private 2>/dev/null || true
+@unexec if cmp %D/private/smbpasswd.default %D/private/smbpasswd >/dev/null 2>&1; then /bin/rm -f %D/private/smbpasswd ; fi