Update to samba-2.0.10-ja-1.1.

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

Add a hack to remove or preserve smbpasswd wisely.

Approved by:	MAINTAINER

4 files changed, 22 insertions, 25 deletions

diff --git a/japanese/samba/Makefile b/japanese/samba/Makefile
index 3e32bb311c29..f8f9a5a29256 100644
--- a/japanese/samba/Makefile
+++ b/japanese/samba/Makefile
@@ -7,7 +7,6 @@
 
 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%/ \
@@ -22,10 +21,8 @@ MAINTAINER=	nakaji@jp.FreeBSD.org
 
 BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
 
-Y2K=		http://us1.samba.org/samba/docs/sambay2k.html
-
 SAMBA_VERSION=		2.0.10
-SAMBA_JA_VERSION=	1.0
+SAMBA_JA_VERSION=	1.1
 
 # directories
 VARDIR=		/var
@@ -87,24 +84,17 @@ post-install:
 			> ${SAMPLE_CONFIG} ;				\
 	fi
 	${INSTALL_SCRIPT} ${WRKDIR}/${DISTNAME}/source/script/mksmbpasswd.sh ${PREFIX}/bin/make_smbpasswd
-	if [ ! -d ${SAMBA_PRIVATE} ] ; then				\
-		${MKDIR} ${SAMBA_PRIVATE} ;				\
-		${CHOWN} root:wheel ${SAMBA_PRIVATE} ;			\
-	fi
-	${CHMOD} 700 ${SAMBA_PRIVATE}
-	if [ ! -f ${SAMBA_PRIVATE}/smbpasswd ] ; then			\
-		${CAT} /etc/passwd | ${PREFIX}/bin/make_smbpasswd > ${SAMBA_PRIVATE}/smbpasswd ; \
-		${CHMOD} 600 ${SAMBA_PRIVATE}/smbpasswd ;			\
+
+	${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} 500 ${SAMBA_PRIVATE}
+	${CHMOD} 600 ${SAMBA_PRIVATE}/smbpasswd*
+
 	${CHOWN} root:wheel ${PREFIX}/bin/smbpasswd
 	${CHMOD} 111 ${PREFIX}/bin/smbpasswd
-.if defined(PACKAGE_BUILDING)
-	${ECHO} "private/smbpasswd" >> ${TMPPLIST}
-	${ECHO} "@dirrm private" >> ${TMPPLIST}
-.else
-	${ECHO} "@unexec echo \"Warning: If you will *NOT* use this package anymore, please remove %D/private/smbpasswd manually.\"" >> ${TMPPLIST}
-.endif
 
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/samba
diff --git a/japanese/samba/distinfo b/japanese/samba/distinfo
index 78761c363fe6..e5f000cce9f7 100644
--- a/japanese/samba/distinfo
+++ b/japanese/samba/distinfo
@@ -1 +1 @@
-MD5 (samba-2.0.10-ja-1.0.tar.bz2) = c1d014933733f0db985f5d696f124996
+MD5 (samba-2.0.10-ja-1.1.tar.bz2) = 9f658071179d30e4dcb220ee35efee38
diff --git a/japanese/samba/pkg-descr b/japanese/samba/pkg-descr
index e01cb0a195b1..d32e506bb0be 100644
--- a/japanese/samba/pkg-descr
+++ b/japanese/samba/pkg-descr
@@ -1,6 +1,6 @@
 Samba Japanese Edition 
 
-Samba Japanese Edition is based on Samba 2.0.7, implemented the
+Samba Japanese Edition is based on Samba 2.0.10, implemented the
 experimental internationalized SWAT and fixed several problems around
 functions for Japanese support.
 
diff --git a/japanese/samba/pkg-plist b/japanese/samba/pkg-plist
index 47a29fed7d0a..9db9d8917c31 100644
--- a/japanese/samba/pkg-plist
+++ b/japanese/samba/pkg-plist
@@ -748,7 +748,14 @@ share/swat/using_samba/ja/this_edition.html
 @dirrm share/swat/using_samba/ja
 @dirrm share/swat/using_samba
 @dirrm share/swat
-@exec mkdir %D/private ; if [ ! -f %D/private/smbpasswd ] ; then chown -R root.wheel %D/private ;  cat /etc/passwd | %D/bin/make_smbpasswd > %D/private/smbpasswd ; chmod 500 %D/private ; chmod 600 %D/private/smbpasswd ; fi
-@exec mkdir -p /var/spool/samba ; chmod 1777 /var/spool/samba
-@exec cat %D/share/doc/samba/README.FreeBSD
-@unexec rm -rf /var/spool/samba
+@exec /bin/mkdir -p -m 500 %D/private
+@exec /usr/sbin/chown -R root:wheel %D/private
+@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
+@unexec /bin/rm -rf /var/spool/samba