- Update to 2.2.2-ja-1.0.

- Invoke nmbd in advance of smbd to avoid failing in startup.

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

- Add CVS tags.

- Replace /usr/local in the startup script with ${PREFIX}.

1 files changed, 40 insertions, 43 deletions

diff --git a/japanese/samba/Makefile b/japanese/samba/Makefile
index c739c152f190..5995ea8184c8 100644
--- a/japanese/samba/Makefile
+++ b/japanese/samba/Makefile
@@ -21,8 +21,8 @@ MAINTAINER=	nakaji@jp.FreeBSD.org
 
 BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
 
-SAMBA_VERSION=		2.0.10
-SAMBA_JA_VERSION=	1.2
+SAMBA_VERSION=		2.2.2
+SAMBA_JA_VERSION=	1.0
 
 # directories
 VARDIR=		/var
@@ -37,11 +37,11 @@ SAMPLE_CONFIG=	${SAMBA_CONFDIR}/smb.conf.default
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
+USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-i18n-swat --with-included-gettext \
 		--libdir=${SAMBA_CONFDIR} \
 		--localstatedir=${VARDIR} --with-swatdir=${PREFIX}/share/swat \
-		--with-sambabook=${PREFIX}/share/swat/using_samba \
-		--with-lockdir=${VARDIR}/spool/lock \
+		--with-lockdir=${VARDIR}/db/samba \
 		--with-privatedir=${SAMBA_PRIVATE} \
 		--prefix=${PREFIX}
 
@@ -51,31 +51,35 @@ CONFIGURE_ARGS+=--with-krb5=${KRB5_HOME}
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/source
 
-MAN1=		nmblookup.1 smbstatus.1 smbclient.1 smbrun.1 smbtar.1 \
+MAN1=		findsmb.1 nmblookup.1 rpcclient.1 smbcacls.1 \
+		smbcontrol.1 smbstatus.1 smbclient.1 smbrun.1 smbtar.1 \
 		testparm.1 testprns.1 make_smbcodepage.1 smbsh.1 \
-		make_unicodemap.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
+MAN8=		smbd.8 nmbd.8 smbpasswd.8 swat.8 smbspool.8 \
+		smbmnt.8 smbmount.8 smbumount.8 winbindd.8
 MANLANG=	"" ja
 
-pre-install:
-	${RM} -f ${WRKDIR}/${DISTNAME}/docs/manpages/smbmnt.8
-	${RM} -f ${WRKDIR}/${DISTNAME}/docs/manpages/smbmount.8
-	${RM} -f ${WRKDIR}/${DISTNAME}/docs/manpages/smbumount.8
-	${RM} -f ${WRKDIR}/${DISTNAME}/docs/ja/manpages/smbmnt.8.man
-	${RM} -f ${WRKDIR}/${DISTNAME}/docs/ja/manpages/smbmount.8.man
-	${RM} -f ${WRKDIR}/${DISTNAME}/docs/ja/manpages/smbumount.8.man
+post-build:
+	${SED} 's:/usr/local:${PREFIX}:g' ${FILESDIR}/samba.sh.sample \
+		> ${WRKDIR}/samba.sh.sample
 
 post-install:
-	${MKDIR} ${PREFIX}/share/examples/samba
-	${CP} -rp ${WRKDIR}/${DISTNAME}/examples/* ${PREFIX}/share/examples/samba
+	@${STRIP_CMD} ${PREFIX}/sbin/smbd ${PREFIX}/sbin/nmbd ${PREFIX}/sbin/swat
+	@${STRIP_CMD} ${PREFIX}/bin/smbclient ${PREFIX}/bin/smbspool
+	@${STRIP_CMD} ${PREFIX}/bin/testparm ${PREFIX}/bin/testprns ${PREFIX}/bin/testprns ${PREFIX}/bin/smbstatus ${PREFIX}/bin/smbcontrol ${PREFIX}/bin/make_printerdef
+	@${STRIP_CMD} ${PREFIX}/bin/smbpasswd ${PREFIX}/bin/make_smbcodepage ${PREFIX}/bin/rpcclient ${PREFIX}/bin/make_unicodemap ${PREFIX}/bin/make_nftable ${PREFIX}/bin/smbcacls ${PREFIX}/bin/nmblookup
+	@${MKDIR} ${PREFIX}/share/examples/samba
+	@cd ${WRKDIR}/${DISTNAME}/examples; \
+		${TAR}  --exclude .cvsignore -cf - . | ${TAR} -xf - -C ${PREFIX}/share/examples/samba
 	@if [ ! -f ${STARTUP_SCRIPT} ]; then				\
 		${ECHO} "Installing ${STARTUP_SCRIPT} startup file." ;	\
-		${INSTALL_SCRIPT} ${FILESDIR}/samba.sh.sample 		\
+		${INSTALL_SCRIPT} ${WRKDIR}/samba.sh.sample 		\
 			${STARTUP_SCRIPT} ;				\
 	fi
 	@test -d ${SAMBA_SPOOL} || ${MKDIR} ${SAMBA_SPOOL} && ${CHMOD} 1777 ${SAMBA_SPOOL}
+	@test -d ${VARDIR}/db/samba || ${MKDIR} ${VARDIR}/db/samba && ${CHMOD} 0755 ${VARDIR}/db/samba
 	@if [ ! -f ${SAMPLE_CONFIG} ]; then				\
 		${SED} -e 's!%%SAMBA_SPOOL%%!${SAMBA_SPOOL}!'		\
 			-e 's!%%SAMBA_LOGDIR%%!${SAMBA_LOGDIR}!'	\
@@ -83,44 +87,37 @@ post-install:
 			${FILESDIR}/smb.conf.default			\
 			> ${SAMPLE_CONFIG} ;				\
 	fi
-	${INSTALL_SCRIPT} ${WRKDIR}/${DISTNAME}/source/script/mksmbpasswd.sh ${PREFIX}/bin/make_smbpasswd
+	@${INSTALL_SCRIPT} ${WRKDIR}/${DISTNAME}/source/script/mksmbpasswd.sh ${PREFIX}/bin/make_smbpasswd
 
-	${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	\
+	@${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} 600 ${SAMBA_PRIVATE}/smbpasswd*
+	@${CHMOD} 600 ${SAMBA_PRIVATE}/smbpasswd*
 
-	${CHOWN} root:wheel ${PREFIX}/bin/smbpasswd
-	${CHMOD} 111 ${PREFIX}/bin/smbpasswd
+	@${CHOWN} root:wheel ${PREFIX}/bin/smbpasswd
+	@${CHMOD} 111 ${PREFIX}/bin/smbpasswd
 
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/samba
-	${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${PREFIX}/share/doc/samba
-	for i in ${WRKDIR}/${DISTNAME}/README				\
+	@${MKDIR} ${PREFIX}/share/doc/samba
+	@${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${PREFIX}/share/doc/samba
+	@for i in ${WRKDIR}/${DISTNAME}/README				\
 			${WRKDIR}/${DISTNAME}/COPYING			\
 			${WRKDIR}/${DISTNAME}/Manifest			\
 			${WRKDIR}/${DISTNAME}/Read-Manifest-Now		\
 			${WRKDIR}/${DISTNAME}/Roadmap			\
-			${WRKDIR}/${DISTNAME}/WHATSNEW.txt		\
-			${WRKDIR}/${DISTNAME}/docs/*.reg		\
-			${WRKDIR}/${DISTNAME}/docs/THANKS		\
-			${WRKDIR}/${DISTNAME}/docs/announce		\
-			${WRKDIR}/${DISTNAME}/docs/history ; do		\
+			${WRKDIR}/${DISTNAME}/WHATSNEW.txt; do		\
 		${INSTALL_DATA} $$i ${PREFIX}/share/doc/samba ;		\
 	done
-	for i in faq htmldocs textdocs yodldocs ; do			\
-		${MKDIR} ${PREFIX}/share/doc/samba/$$i ;		\
-		for j in ${WRKDIR}/${DISTNAME}/docs/$$i/* ; do		\
-			if [ $$j != ${WRKDIR}/${DISTNAME}/docs/htmldocs/using_samba ] ; then \
-				${INSTALL_DATA} $$j ${PREFIX}/share/doc/samba/$$i ;\
-			fi; \
-		done							\
-	done
-	${MKDIR} ${PREFIX}/share/doc/samba
-	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/swat/README ${PREFIX}/share/doc/samba/README.swat
+	@cd ${WRKDIR}/${DISTNAME}/docs; \
+		${TAR}  --exclude .cvsignore -cf - . | ${TAR} -xf - -C ${PREFIX}/share/doc/samba
+	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/swat/README ${PREFIX}/share/doc/samba/README.swat
 .endif
 
+	@if [ -f ${VARDIR}/spool/lock/browse.dat ]; then \
+		${RM} -f ${VARDIR}/spool/lock/browse.dat; \
+	fi
+
 .include <bsd.port.mk>