5 files changed, 6 insertions, 55 deletions

diff --git a/japanese/samba/Makefile b/japanese/samba/Makefile
index f8f9a5a29256..c739c152f190 100644
--- a/japanese/samba/Makefile
+++ b/japanese/samba/Makefile
@@ -22,7 +22,7 @@ MAINTAINER=	nakaji@jp.FreeBSD.org
 BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
 
 SAMBA_VERSION=		2.0.10
-SAMBA_JA_VERSION=	1.1
+SAMBA_JA_VERSION=	1.2
 
 # directories
 VARDIR=		/var
@@ -85,7 +85,7 @@ 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	\
diff --git a/japanese/samba/distinfo b/japanese/samba/distinfo
index e5f000cce9f7..8ef5d72920d9 100644
--- a/japanese/samba/distinfo
+++ b/japanese/samba/distinfo
@@ -1 +1 @@
-MD5 (samba-2.0.10-ja-1.1.tar.bz2) = 9f658071179d30e4dcb220ee35efee38
+MD5 (samba-2.0.10-ja-1.2.tar.bz2) = 1b451aebc4dba7b95f462951c8712d43
diff --git a/japanese/samba/files/patch-ak b/japanese/samba/files/patch-ak
index 11d28eed5372..86fdfde18f55 100644
--- a/japanese/samba/files/patch-ak
+++ b/japanese/samba/files/patch-ak
@@ -1,5 +1,5 @@
---- script/installswat.sh.orig	Wed Jul 26 15:58:59 2000
-+++ script/installswat.sh	Wed Jul 26 15:59:26 2000
+--- script/installswat.sh.orig	Sat Oct 27 16:35:54 2001
++++ script/installswat.sh	Mon Nov 26 12:08:58 2001
 @@ -16,7 +16,7 @@
    langdir=$SWATDIR/$ln
    for d in $SWATDIR $langdir $langdir/help $langdir/images $langdir/include; do
@@ -18,12 +18,3 @@
              if [ ! -d $d ]; then
                  echo Failed to make directory $d, does $USER have privileges?
                  exit 1
-@@ -131,7 +131,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-da b/japanese/samba/files/patch-da
deleted file mode 100644
index bfd328127dae..000000000000
--- a/japanese/samba/files/patch-da
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/util.c~	Fri Oct 20 01:20:08 2000
-+++ lib/util.c	Thu Jan 11 13:47:55 2001
-@@ -1605,7 +1605,7 @@
-    extend a file with ftruncate. Provide alternate implementation
-    for this */
-
--#ifdef HAVE_FTRUNCATE_EXTEND
-+#ifdef 0 /*HAVE_FTRUNCATE_EXTEND*/
-   return sys_ftruncate(fd, len);
- #else
-   SMB_STRUCT_STAT st;
diff --git a/japanese/samba/pkg-plist b/japanese/samba/pkg-plist
index 9db9d8917c31..0359c67d0149 100644
--- a/japanese/samba/pkg-plist
+++ b/japanese/samba/pkg-plist
@@ -307,35 +307,6 @@ 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/HowToUseSamba/1-18.html
-share/swat/ja/help/HowToUseSamba/1-19.html
-share/swat/ja/help/HowToUseSamba/1-6.html
-share/swat/ja/help/HowToUseSamba/MSNET1.GIF
-share/swat/ja/help/HowToUseSamba/MSNETW2.GIF
-share/swat/ja/help/HowToUseSamba/PRTCL95.GIF
-share/swat/ja/help/HowToUseSamba/SAMBA1.GIF
-share/swat/ja/help/HowToUseSamba/WGRPNT1.GIF
-share/swat/ja/help/HowToUseSamba/globals.gif
-share/swat/ja/help/HowToUseSamba/home.gif
-share/swat/ja/help/HowToUseSamba/index.html
-share/swat/ja/help/HowToUseSamba/passwd.gif
-share/swat/ja/help/HowToUseSamba/printers.gif
-share/swat/ja/help/HowToUseSamba/printtool1.gif
-share/swat/ja/help/HowToUseSamba/printtool2.gif
-share/swat/ja/help/HowToUseSamba/printtool3.gif
-share/swat/ja/help/HowToUseSamba/printtool4.gif
-share/swat/ja/help/HowToUseSamba/printtool5.gif
-share/swat/ja/help/HowToUseSamba/printtool6.gif
-share/swat/ja/help/HowToUseSamba/samba.gif
-share/swat/ja/help/HowToUseSamba/shares.gif
-share/swat/ja/help/HowToUseSamba/status.gif
-share/swat/ja/help/HowToUseSamba/swat1.gif
-share/swat/ja/help/HowToUseSamba/userhome.gif
-share/swat/ja/help/HowToUseSamba/userprofile.gif
-share/swat/ja/help/HowToUseSamba/viewconfig.gif
-share/swat/ja/help/HowToUseSamba/x-1-256.gif
-share/swat/ja/help/HowToUseSamba/x-2-256.gif
-share/swat/ja/help/HowToUseSamba/x-3-256.gif
 share/swat/ja/help/Application_Serving.txt.html
 share/swat/ja/help/BROWSING-Config.txt.html
 share/swat/ja/help/BROWSING.txt.html
@@ -369,6 +340,7 @@ share/swat/ja/help/nmbd.8.html
 share/swat/ja/help/nmblookup.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.7.html
 share/swat/ja/help/samba2.html
 share/swat/ja/help/sambafaq-1.html
@@ -413,7 +385,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/HowToUseSamba
 @dirrm share/swat/ja/help
 @dirrm share/swat/ja/images
 @dirrm share/swat/ja/include