Update to 2.0.7.j2.1.

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

4 files changed, 14 insertions, 34 deletions

diff --git a/japanese/samba/Makefile b/japanese/samba/Makefile
index c890e395aba5..75c206e00f2f 100644
--- a/japanese/samba/Makefile
+++ b/japanese/samba/Makefile
@@ -24,7 +24,7 @@ BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
 Y2K=		http://us1.samba.org/samba/docs/sambay2k.html
 
 SAMBA_VERSION=		2.0.7
-SAMBA_JA_VERSION=	1.3
+SAMBA_JA_VERSION=	2.1
 
 # directories
 VARDIR=		/var
@@ -36,6 +36,7 @@ SAMBA_CONFDIR=	${PREFIX}/etc
 STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/samba.sh.sample
 SAMPLE_CONFIG=	${SAMBA_CONFDIR}/smb.conf.default
 
+USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
 CONFIGURE_ARGS=	--with-i18n-swat --with-included-gettext \
@@ -43,8 +44,7 @@ CONFIGURE_ARGS=	--with-i18n-swat --with-included-gettext \
 		--localstatedir=${VARDIR} --with-swatdir=${PREFIX}/share/swat \
 		--with-sambabook=${PREFIX}/share/swat/using_samba \
 		--with-lockdir=${VARDIR}/spool/lock \
-		--with-privatedir=${SAMBA_PRIVATE} \
-		--with-swat-langfile=${PREFIX}/share/swat-i18n.txt
+		--with-privatedir=${SAMBA_PRIVATE}
 
 .if defined(KRB5_HOME) && exists(${KRB5_HOME})
 CONFIGURE_ARGS+=--with-krb5=${KRB5_HOME}
diff --git a/japanese/samba/distinfo b/japanese/samba/distinfo
index 631ae675bcf1..4d132392d650 100644
--- a/japanese/samba/distinfo
+++ b/japanese/samba/distinfo
@@ -1 +1 @@
-MD5 (samba-2.0.7-ja-1.3.tar.gz) = 39fe6bdad751b9d3af4abcb83191907d
+MD5 (samba-2.0.7-ja-2.1.tar.bz2) = 6dfbd8b2af5886fa89256a47187eaafc
diff --git a/japanese/samba/files/patch-ag b/japanese/samba/files/patch-ag
index eac80026a659..4300c004e5d7 100644
--- a/japanese/samba/files/patch-ag
+++ b/japanese/samba/files/patch-ag
@@ -1,15 +1,15 @@
---- nmbd/nmbd_winsserver.c.orig	Wed Jul 21 10:25:11 1999
-+++ nmbd/nmbd_winsserver.c	Fri Jul 23 15:14:33 1999
-@@ -152,7 +152,7 @@
-   start_async_dns();
- #endif
+--- 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,NULL,"/");
+   trim_string( fname, strlen( fname )+1, NULL, 0, "/", sizeof( "/" ));
    pstrcat(fname,"/");
    pstrcat(fname,WINS_LIST);
-@@ -1551,7 +1551,7 @@
+@@ -1602,7 +1602,7 @@
  	  }
    }
  
diff --git a/japanese/samba/pkg-plist b/japanese/samba/pkg-plist
index 4c1d4bb0e3fe..7d63907ba5ed 100644
--- a/japanese/samba/pkg-plist
+++ b/japanese/samba/pkg-plist
@@ -16,7 +16,6 @@ bin/smbspool
 sbin/smbd
 sbin/nmbd
 sbin/swat
-share/swat-i18n.txt
 share/examples/samba/README
 share/examples/samba/smb.conf.default
 share/examples/samba/smb.conf.default.ja
@@ -47,14 +46,14 @@ 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/smbfnconv
 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/smbfnconv.v1.9
 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
@@ -257,7 +256,6 @@ share/doc/samba/yodldocs/testprns.1.yo
 @dirrm share/doc/samba
 share/locale/en/LC_MESSAGES/i18n_swat.mo
 share/locale/ja/LC_MESSAGES/i18n_swat.mo
-share/locale/ja_JP.SJIS/LC_MESSAGES/i18n_swat.mo
 share/swat/help/welcome.html
 share/swat/help/DOMAIN_MEMBER.html
 share/swat/help/NT_Security.html
@@ -377,6 +375,7 @@ 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/swat.8.html
 share/swat/ja/help/testparm.1.html
@@ -404,25 +403,6 @@ share/swat/ja/include/header_css.html
 @dirrm share/swat/ja/images
 @dirrm share/swat/ja/include
 @dirrm share/swat/ja
-share/swat/ja_JP.SJIS/help/welcome.html
-share/swat/ja_JP.SJIS/images/globals.gif
-share/swat/ja_JP.SJIS/images/home.gif
-share/swat/ja_JP.SJIS/images/passwd.gif
-share/swat/ja_JP.SJIS/images/printers.gif
-share/swat/ja_JP.SJIS/images/samba.gif
-share/swat/ja_JP.SJIS/images/shares.gif
-share/swat/ja_JP.SJIS/images/status.gif
-share/swat/ja_JP.SJIS/images/viewconfig.gif
-share/swat/ja_JP.SJIS/include/footer.html
-share/swat/ja_JP.SJIS/include/header.JP1.html
-share/swat/ja_JP.SJIS/include/header.html
-share/swat/ja_JP.SJIS/include/header.nocss.html
-share/swat/ja_JP.SJIS/include/header.org.html
-share/swat/ja_JP.SJIS/include/header_css.html
-@dirrm share/swat/ja_JP.SJIS/help
-@dirrm share/swat/ja_JP.SJIS/images
-@dirrm share/swat/ja_JP.SJIS/include
-@dirrm share/swat/ja_JP.SJIS
 share/swat/using_samba/appa_01.html
 share/swat/using_samba/appa_02.html
 share/swat/using_samba/appa_03.html