8 files changed, 28 insertions, 42 deletions

diff --git a/japanese/samba/Makefile b/japanese/samba/Makefile
index 37008cbda8bf..5583b68b61ba 100644
--- a/japanese/samba/Makefile
+++ b/japanese/samba/Makefile
@@ -22,7 +22,7 @@ MAINTAINER=	nakaji@jp.FreeBSD.org
 BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext-old
 
 SAMBA_VERSION=		2.2.2
-SAMBA_JA_VERSION=	1.0
+SAMBA_JA_VERSION=	1.1
 
 # directories
 VARDIR=		/var
@@ -89,13 +89,11 @@ post-install:
 	fi
 	@${INSTALL_SCRIPT} ${WRKDIR}/${DISTNAME}/source/script/mksmbpasswd.sh ${PREFIX}/bin/make_smbpasswd
 
-	@${MKDIR} -p -m 500 ${SAMBA_PRIVATE}
+	@${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	\
-		${CP} -p ${SAMBA_PRIVATE}/smbpasswd.default ${SAMBA_PRIVATE}/smbpasswd ;	\
-	fi
-	@${CHMOD} 600 ${SAMBA_PRIVATE}/smbpasswd*
+	@${CAT} /etc/passwd | ${AWK} -F: '$$6 ~ /home/' | ${PREFIX}/bin/make_smbpasswd > ${SAMBA_PRIVATE}/smbpasswd.sample
+	@test -f ${SAMBA_PRIVATE}/smbpasswd || ${TOUCH} ${SAMBA_PRIVATE}/smbpasswd
+	@${CHMOD} 600 ${SAMBA_PRIVATE}/smbpasswd.sample ${SAMBA_PRIVATE}/smbpasswd
 
 	@${CHOWN} root:wheel ${PREFIX}/bin/smbpasswd
 	@${CHMOD} 111 ${PREFIX}/bin/smbpasswd
diff --git a/japanese/samba/distinfo b/japanese/samba/distinfo
index 1f8407652c5a..b8a0f40d2595 100644
--- a/japanese/samba/distinfo
+++ b/japanese/samba/distinfo
@@ -1 +1 @@
-MD5 (samba-2.2.2-ja-1.0.tar.bz2) = 3938d9491e1e904b421b9ee7807fb745
+MD5 (samba-2.2.2-ja-1.1.tar.bz2) = 2ba9e3295715942bb1ee2dc243660747
diff --git a/japanese/samba/files/README.FreeBSD b/japanese/samba/files/README.FreeBSD
index 5d18df30a1bb..421446feee90 100644
--- a/japanese/samba/files/README.FreeBSD
+++ b/japanese/samba/files/README.FreeBSD
@@ -1,6 +1,6 @@
 $FreeBSD$
 
-If you want to use samba ports,
+If you want to use samba-ja,
 
 1. Copy /usr/local/etc/smb.conf.default to /usr/local/etc/smb.conf, and edit
    it.
@@ -10,11 +10,13 @@ If you want to use samba ports,
 See document files in /usr/local/share/doc/samba and example config files in
 /usr/local/share/examples/samba for details.
 
-Samba Japanese Edition is based on Samba 2.0.9, implemented the experimental
+Samba Japanese Edition is based on Samba 2.2.2, implemented the experimental
 internationalized SWAT and fixed several problems arond functions for
 Japanese support. See smb.conf.sample for details. If you want to use
 NT4+SP3 or Win95+updates clients, set "encrypt passwords" parameter to
 yes and use smbpasswd [username] to use /usr/local/private/smbpasswd
 for authentication.
 
+For more information about samba-ja, see http://www.samba.gr.jp/
+
 FreeBSD SAMBA-ja ports maintainer: NAKAJI Hiroyuki <nakaji@jp.freebsd.org>
diff --git a/japanese/samba/files/patch-aa b/japanese/samba/files/patch-aa
index 25406d04b889..adec430c5b5d 100644
--- a/japanese/samba/files/patch-aa
+++ b/japanese/samba/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Tue Oct 30 13:03:01 2001
-+++ Makefile.in	Mon Nov 26 10:40:10 2001
+--- Makefile.in.orig	Fri Nov  9 20:28:07 2001
++++ Makefile.in	Wed Feb 20 11:48:46 2002
 @@ -51,7 +51,7 @@
  CONFIGFILE = $(CONFIGDIR)/smb.conf
  LMHOSTSFILE = $(CONFIGDIR)/lmhosts
diff --git a/japanese/samba/files/patch-ak b/japanese/samba/files/patch-ak
index 9e52b9f22927..cf59571db545 100644
--- a/japanese/samba/files/patch-ak
+++ b/japanese/samba/files/patch-ak
@@ -1,26 +1,17 @@
---- 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
+--- script/installswat.sh.orig	Thu Jan 31 16:56:23 2002
++++ script/installswat.sh	Wed Feb 20 15:36:18 2002
+@@ -10,7 +10,7 @@
+ 
+ for d in $SWATDIR $SWATDIR/help $SWATDIR/images $SWATDIR/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
-@@ -83,7 +83,7 @@
- 
-     for d in $BOOKDIR $BOOKDIR/$ln $BOOKDIR/$ln/figs $BOOKDIR/$ln/gifs; 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
-@@ -132,7 +132,7 @@
+@@ -69,7 +69,7 @@
  
-     for d in $SWATDIR/$ln/help/HowToUseSamba; do
+     for d in $BOOKDIR $BOOKDIR/figs $BOOKDIR/gifs; do
          if [ ! -d $d ]; then
 -            mkdir $d
 +            mkdir -p $d
diff --git a/japanese/samba/files/patch-al b/japanese/samba/files/patch-al
index 27061974a2e4..e69de29bb2d1 100644
--- a/japanese/samba/files/patch-al
+++ b/japanese/samba/files/patch-al
@@ -1,11 +0,0 @@
---- 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/pkg-message b/japanese/samba/pkg-message
new file mode 100644
index 000000000000..52d2ddafd67b
--- /dev/null
+++ b/japanese/samba/pkg-message
@@ -0,0 +1,8 @@
+WARNING: 
+
+The lock directory where browse.dat, wins.dat and other *.tdb files
+are created by smbd and nmbd is changed from /var/spool/lock to
+/var/db/samba.
+
+If you are about to update your japanese/samba from 2.0.10j1.2 to 2.2.2j1.0,
+you need to remove old these files in /var/spool/lock.
diff --git a/japanese/samba/pkg-plist b/japanese/samba/pkg-plist
index a4060dc095d1..28c2b2755f51 100644
--- a/japanese/samba/pkg-plist
+++ b/japanese/samba/pkg-plist
@@ -70,7 +70,7 @@ etc/codepages/unicode_map.KOI8-R
 @dirrm etc/codepages
 etc/rc.d/samba.sh.sample
 etc/smb.conf.default
-private/smbpasswd.default
+private/smbpasswd.sample
 sbin/nmbd
 sbin/smbd
 sbin/swat
@@ -666,7 +666,6 @@ 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
@@ -1479,7 +1478,6 @@ 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