Update to latest jp version

PR:		40214
Submitted by:	maintainer

8 files changed, 93 insertions, 153 deletions

diff --git a/japanese/samba/Makefile b/japanese/samba/Makefile
index f771036a039d..844bfbfd280e 100644
--- a/japanese/samba/Makefile
+++ b/japanese/samba/Makefile
@@ -7,14 +7,12 @@
 
 PORTNAME=	samba
 PORTVERSION=	${SAMBA_VERSION}.j${SAMBA_JA_VERSION}
-PORTREVISION=	1
 CATEGORIES=	japanese net
 MASTER_SITES=	ftp://ftp.samba.gr.jp/pub/samba-jp/%SUBDIR%/ \
 		ftp://ftp.iij.ad.jp/pub/SAMBA/samba-jp/%SUBDIR%/ \
 		ftp://SunSITE.tus.ac.jp/pub/archives/packages/samba/samba-jp/%SUBDIR%/ \
 		ftp://ftp.plathome.co.jp/pub/samba/samba-jp/%SUBDIR%/ \
-		ftp://ftp2.samba.gr.jp/pub/samba-jp/%SUBDIR%/ \
-		ftp://ftp.tutrp.tut.ac.jp/pub/mirror/samba-jp/%SUBDIR%/
+		ftp://ftp2.samba.gr.jp/pub/samba-jp/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTNAME}-${SAMBA_VERSION}-ja
 DISTNAME=	${PORTNAME}-${SAMBA_VERSION}-ja-${SAMBA_JA_VERSION}
 
@@ -22,8 +20,8 @@ MAINTAINER=	nakaji@jp.FreeBSD.org
 
 BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
 
-SAMBA_VERSION=		2.2.2
-SAMBA_JA_VERSION=	1.1
+SAMBA_VERSION=		2.2.4
+SAMBA_JA_VERSION=	1.0
 
 # directories
 VARDIR=		/var
@@ -44,22 +42,29 @@ CONFIGURE_ARGS=	--with-i18n-swat --with-included-gettext \
 		--localstatedir=${VARDIR} --with-swatdir=${PREFIX}/share/swat \
 		--with-lockdir=${VARDIR}/db/samba \
 		--with-privatedir=${SAMBA_PRIVATE} \
+		--with-piddir=${VARDIR}/run \
+		--with-pam \
 		--prefix=${PREFIX}
 
 .if defined(KRB5_HOME) && exists(${KRB5_HOME})
 CONFIGURE_ARGS+=--with-krb5=${KRB5_HOME}
 .endif
 
+.if defined(USE_OPENSSL)
+CONFIGURE_ARGS+=	--with-ssl
+.endif
+
 WRKSRC=		${WRKDIR}/${DISTNAME}/source
 
 MAN1=		findsmb.1 nmblookup.1 rpcclient.1 smbcacls.1 \
-		smbcontrol.1 smbstatus.1 smbclient.1 smbrun.1 smbtar.1 \
+		smbcontrol.1 smbstatus.1 smbclient.1 smbtar.1 \
 		testparm.1 testprns.1 make_smbcodepage.1 smbsh.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 \
-		smbmnt.8 smbmount.8 smbumount.8 winbindd.8
+		smbmnt.8 smbmount.8 smbumount.8 winbindd.8 \
+		pdbedit.8
 MANLANG=	"" ja
 
 post-build:
diff --git a/japanese/samba/distinfo b/japanese/samba/distinfo
index b8a0f40d2595..38017d5c1227 100644
--- a/japanese/samba/distinfo
+++ b/japanese/samba/distinfo
@@ -1 +1 @@
-MD5 (samba-2.2.2-ja-1.1.tar.bz2) = 2ba9e3295715942bb1ee2dc243660747
+MD5 (samba-2.2.4-ja-1.0.tar.bz2) = 2f71430fa9684a2c231dedb24f0fd707
diff --git a/japanese/samba/files/patch-aa b/japanese/samba/files/patch-aa
index adec430c5b5d..872243b4e802 100644
--- a/japanese/samba/files/patch-aa
+++ b/japanese/samba/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Fri Nov  9 20:28:07 2001
-+++ Makefile.in	Wed Feb 20 11:48:46 2002
-@@ -51,7 +51,7 @@
+--- Makefile.in.orig	Tue Jun 11 18:48:30 2002
++++ Makefile.in	Mon Jun 17 13:13:44 2002
+@@ -52,7 +52,7 @@
  CONFIGFILE = $(CONFIGDIR)/smb.conf
  LMHOSTSFILE = $(CONFIGDIR)/lmhosts
  DRIVERFILE = $(CONFIGDIR)/printers.def
@@ -9,22 +9,3 @@
  # This is where smbpasswd et al go
  PRIVATEDIR = @privatedir@
  
-@@ -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 = @codepagedir@
- 
-@@ -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)\" -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 cbe23bb25e19..e69de29bb2d1 100644
--- a/japanese/samba/files/patch-ab
+++ b/japanese/samba/files/patch-ab
@@ -1,35 +0,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_("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, "");
- 	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)
diff --git a/japanese/samba/files/patch-ac b/japanese/samba/files/patch-ac
index dd53b8418c1e..e69de29bb2d1 100644
--- a/japanese/samba/files/patch-ac
+++ b/japanese/samba/files/patch-ac
@@ -1,20 +0,0 @@
---- lib/pidfile.c.orig	Fri Jan 15 22:40:47 1999
-+++ lib/pidfile.c	Fri Jan 15 22:41:05 1999
-@@ -37,7 +37,7 @@
- 	unsigned ret;
- 	pstring pidFile;
- 
--	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_lockdir(), name);
-+	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_piddir(), name);
- 
- 	fd = sys_open(pidFile, O_NONBLOCK | O_RDWR, 0644);
- 	if (fd == -1) {
-@@ -78,7 +78,7 @@
- 	pstring pidFile;
- 	int pid;
- 
--	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_lockdir(), name);
-+	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_piddir(), name);
- 
- 	pid = pidfile_pid(name);
- 	if (pid != 0) {
diff --git a/japanese/samba/files/patch-ah b/japanese/samba/files/patch-ah
index 81b1f75158a4..1831962c70fa 100644
--- a/japanese/samba/files/patch-ah
+++ b/japanese/samba/files/patch-ah
@@ -1,5 +1,5 @@
---- lib/util_sock.c.orig	Wed Sep 22 10:52:50 1999
-+++ lib/util_sock.c	Wed Sep 22 11:30:18 1999
+--- lib/util_sock.c.orig	Tue Jun 11 18:48:41 2002
++++ lib/util_sock.c	Mon Jun 17 13:24:27 2002
 @@ -28,6 +28,9 @@
  extern int  sslFd;
  #endif  /* WITH_SSL */
@@ -7,6 +7,6 @@
 +#undef MSG_WAITALL
 +#define MSG_WAITALL 0
 +
- extern int DEBUGLEVEL;
+ /* the last IP received from */
+ struct in_addr lastip;
  
- BOOL passive = False;
diff --git a/japanese/samba/files/patch-ba b/japanese/samba/files/patch-ba
index 80ec35f03203..60e322a6cae9 100644
--- a/japanese/samba/files/patch-ba
+++ b/japanese/samba/files/patch-ba
@@ -1,15 +1,40 @@
---- 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")
+--- configure.in.orig	Thu May  2 20:02:46 2002
++++ configure.in	Thu May  9 02:29:20 2002
+@@ -498,9 +498,23 @@
+ ############################################
+ # we need dlopen/dlclose/dlsym/dlerror for PAM, the password database plugins and the new VFS code
+ AC_CHECK_FUNCS(dlopen)
++case "$host_os" in
++	*bsd*)
++		AC_CHECK_LIB(c, dlopen, [LIBS="$LIBS -lc";
++		AC_DEFINE(HAVE_DLOPEN)])
++		;;
++esac
+ if test x"$ac_cv_func_dlopen" = x"no"; then
+-	AC_CHECK_LIB(dl, dlopen, [LIBS="$LIBS -ldl";
+-	AC_DEFINE(HAVE_DLOPEN)])
++	case "$host_os" in
++	 *bsd*)
++		AC_CHECK_LIB(c, dlopen, [LIBS="$LIBS -lc";
++		AC_DEFINE(HAVE_DLOPEN)])
++		;;
++	     *)
++		AC_CHECK_LIB(dl, dlopen, [LIBS="$LIBS -ldl";
++		AC_DEFINE(HAVE_DLOPEN)])
++		;;
++	esac
+ fi
+ # dlopen/dlclose/dlsym/dlerror will be checked again later and defines will be set then
  
-@@ -1655,7 +1655,7 @@
+@@ -870,6 +884,7 @@
+ 		;;
+ 		*bsd*)  BLDSHARED="true"
+ 			LDSHFLAGS="-shared"
++			DYNEXP="-Wl,--export-dynamic"
+ 			SONAMEFLAG="-Wl,-soname,"
+ 			PICFLAG="-fPIC"
+ 			AC_DEFINE(STAT_ST_BLOCKSIZE,512)
+@@ -1868,7 +1883,7 @@
    yes)
      AC_MSG_RESULT(yes)
      AC_DEFINE(KRB5_AUTH)
@@ -18,3 +43,12 @@
      CFLAGS="$CFLAGS -I$withval/include"
      LDFLAGS="$LDFLAGS -L$withval/lib"
      ;;
+@@ -2042,7 +2057,7 @@
+   yes)
+     AC_MSG_RESULT(yes)
+     AC_DEFINE(WITH_LDAP_SAM)
+-    LIBS="-lldap -llber -lresolv $LIBS"
++    LIBS="-lldap -llber $LIBS"
+     with_smbpasswd_sam=no
+     ;;
+   *)
diff --git a/japanese/samba/pkg-plist b/japanese/samba/pkg-plist
index 28c2b2755f51..4aa223c07458 100644
--- a/japanese/samba/pkg-plist
+++ b/japanese/samba/pkg-plist
@@ -14,6 +14,7 @@ bin/smbstatus
 bin/smbtar
 bin/testparm
 bin/testprns
+bin/tdbbackup
 etc/codepages/codepage.1251
 etc/codepages/codepage.437
 etc/codepages/codepage.737
@@ -39,6 +40,7 @@ etc/codepages/nftable.932
 etc/codepages/nftable.936
 etc/codepages/nftable.949
 etc/codepages/nftable.950
+etc/codepages/nftable.1251
 etc/codepages/nftable.ISO8859-1
 etc/codepages/nftable.ISO8859-13
 etc/codepages/nftable.ISO8859-15
@@ -59,6 +61,7 @@ etc/codepages/unicode_map.932
 etc/codepages/unicode_map.936
 etc/codepages/unicode_map.949
 etc/codepages/unicode_map.950
+etc/codepages/unicode_map.1251
 etc/codepages/unicode_map.ISO8859-1
 etc/codepages/unicode_map.ISO8859-13
 etc/codepages/unicode_map.ISO8859-15
@@ -137,43 +140,16 @@ 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/faq/README.NOW
 share/doc/samba/docbook/global.ent
-share/doc/samba/docbook/howto/samba-pdc-howto.sgml
+share/doc/samba/docbook/howto/README.NOW
 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/pdbedit.8.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
@@ -202,6 +178,8 @@ 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-BDC-HOWTO.sgml
+share/doc/samba/docbook/projdoc/Samba-LDAP-HOWTO.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
@@ -215,6 +193,7 @@ 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/README
 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
@@ -244,7 +223,9 @@ 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-BDC-HOWTO.html
 share/doc/samba/htmldocs/Samba-HOWTO-Collection.html
+share/doc/samba/htmldocs/Samba-LDAP-HOWTO.html
 share/doc/samba/htmldocs/Samba-PDC-HOWTO.html
 share/doc/samba/htmldocs/UNIX_INSTALL.html
 share/doc/samba/htmldocs/findsmb.1.html
@@ -254,10 +235,9 @@ 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/pdbedit.8.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
@@ -268,7 +248,6 @@ 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/smbrun.1.html
 share/doc/samba/htmldocs/smbsh.1.html
 share/doc/samba/htmldocs/smbspool.8.html
 share/doc/samba/htmldocs/smbstatus.1.html
@@ -492,6 +471,7 @@ 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/pdbedit.8.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
@@ -536,7 +516,6 @@ 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
@@ -655,17 +634,8 @@ 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/manpages/findsmb.1
 share/doc/samba/manpages/ja/Makefile
 share/doc/samba/manpages/ja/findsmb.1.man
@@ -675,6 +645,7 @@ 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/pdbedit.8.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
@@ -686,7 +657,6 @@ 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
@@ -702,6 +672,7 @@ 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/pdbedit.8
 share/doc/samba/manpages/rpcclient.1
 share/doc/samba/manpages/samba.7
 share/doc/samba/manpages/smb.conf.5
@@ -713,7 +684,6 @@ 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
@@ -742,6 +712,7 @@ share/doc/samba/textdocs/PROFILES.txt
 share/doc/samba/textdocs/Passwords.txt
 share/doc/samba/textdocs/Printing.txt
 share/doc/samba/textdocs/README.DCEDFS
+share/doc/samba/textdocs/README.NOW
 share/doc/samba/textdocs/README.jis
 share/doc/samba/textdocs/README.sambatar
 share/doc/samba/textdocs/Recent-FAQs.txt
@@ -749,6 +720,7 @@ share/doc/samba/textdocs/RoutedNetworks.txt
 share/doc/samba/textdocs/SCO.txt
 share/doc/samba/textdocs/SMBTAR.notes
 share/doc/samba/textdocs/Samba-OpenSSL.txt
+share/doc/samba/textdocs/Solaris-Winbind-HOWTO.txt
 share/doc/samba/textdocs/Speed.txt
 share/doc/samba/textdocs/Speed2.txt
 share/doc/samba/textdocs/Tracing.txt
@@ -757,9 +729,6 @@ 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/outdated/NTDOMAIN.txt
 share/doc/samba/textdocs/outdated/PRINTER_DRIVER.txt
 share/doc/samba/textdocs/outdated/PROJECTS
@@ -771,7 +740,6 @@ share/doc/samba/yodldocs/README-NOW
 @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
@@ -807,14 +775,20 @@ 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/LDAP/samba-schema-netscapeds4.x
+share/examples/samba/LDAP/samba-schema-netscapeds5.x
+share/examples/samba/LDAP/samba-schema.IBMSecureWay
 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/block.o
+share/examples/samba/VFS/block/block.so
 share/examples/samba/VFS/block/samba-block.conf
 share/examples/samba/VFS/block/smb.conf
+share/examples/samba/VFS/recycle.c
 share/examples/samba/VFS/skel.c
 share/examples/samba/appliance/Makefile
 share/examples/samba/appliance/README
@@ -838,6 +812,7 @@ 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.safer
 share/examples/samba/printing/smbprint.sysv
 share/examples/samba/simple/README
 share/examples/samba/simple/smb.conf
@@ -898,7 +873,9 @@ 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-BDC-HOWTO.html
 share/swat/help/Samba-HOWTO-Collection.html
+share/swat/help/Samba-LDAP-HOWTO.html
 share/swat/help/Samba-PDC-HOWTO.html
 share/swat/help/UNIX_INSTALL.html
 share/swat/help/findsmb.1.html
@@ -908,10 +885,9 @@ 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/pdbedit.8.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
@@ -922,7 +898,6 @@ 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
@@ -1016,6 +991,7 @@ 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/pdbedit.8.html
 share/swat/ja/help/printer_driver2.html
 share/swat/ja/help/quota/fig1.gif
 share/swat/ja/help/quota/fig2.gif
@@ -1061,7 +1037,6 @@ share/swat/ja/help/smbmount.8.html
 share/swat/ja/help/smbmount.txt.html
 share/swat/ja/help/smbpasswd.5.html
 share/swat/ja/help/smbpasswd.8.html
-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