3 files changed, 42 insertions, 6 deletions

diff --git a/net/smbldap-tools/Makefile b/net/smbldap-tools/Makefile
index 84a9f79728d4..b747e6dd13c0 100644
--- a/net/smbldap-tools/Makefile
+++ b/net/smbldap-tools/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	smbldap-tools
-PORTVERSION=	0.8.7
+PORTVERSION=	0.9.1
 CATEGORIES=	net
 MASTER_SITES=	http://samba.idealx.org/dist/
 EXTRACT_SUFX=	.tgz
@@ -16,12 +16,21 @@ COMMENT=	Useful package for managing users and groups in a LDAP directory
 
 BUILD_DEPENDS=	${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap \
 		${SITE_PERL}/Crypt/SmbHash.pm:${PORTSDIR}/security/p5-Crypt-SmbHash \
+		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
 		${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_PERL5=	yes
 NO_BUILD=	yes
 
+DOC_HTML_LIST =	contents_motif.gif index.html next_motif.gif \
+		previous_motif.gif smbldap-tools.html smbldap-tools001.html \
+		smbldap-tools002.html smbldap-tools003.html \
+		smbldap-tools004.html smbldap-tools005.html \
+		smbldap-tools006.html smbldap-tools007.html \
+		smbldap-tools008.html smbldap-tools009.html \
+		smbldap-tools010.html
+
 post-patch:
 	@${PERL} -pi -e 's#/etc/samba#${PREFIX}/etc/samba#' ${WRKSRC}/configure.pl \
 								${WRKSRC}/smb.conf
@@ -41,11 +50,20 @@ do-install:
 .for i in smbldap-groupadd smbldap-groupdel smbldap-groupmod smbldap-groupshow smbldap-useradd smbldap-userdel smbldap-usermod smbldap-usershow smbldap-passwd smbldap-populate
 	${INSTALL_SCRIPT} ${WRKSRC}/$i ${PREFIX}/sbin
 .endfor
-.for i in smbldap-migrate-accounts smbldap-migrate-groups smbldap-migrate-unix-accounts smbldap-migrate-unix-groups
+.for i in smbldap-migrate-pwdump-accounts smbldap-migrate-pwdump-groups smbldap-migrate-unix-accounts smbldap-migrate-unix-groups
 	${INSTALL_SCRIPT} ${WRKSRC}/doc/$i ${PREFIX}/sbin
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/smbldap_tools.pm ${SITE_PERL}/
 	${INSTALL_DATA} ${WRKSRC}/smb.conf ${EXAMPLESDIR}/
 	${INSTALL_SCRIPT} ${WRKSRC}/configure.pl ${EXAMPLESDIR}/
 
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${MKDIR} ${DOCSDIR}/html
+	${INSTALL_DATA} ${WRKSRC}/doc/smbldap-tools.pdf ${DOCSDIR}/smbldap-tools.pdf
+.for i in ${DOC_HTML_LIST}
+	${INSTALL_DATA} ${WRKSRC}/doc/html/$i ${DOCSDIR}/html/$i
+.endfor
+.endif
+
 .include <bsd.port.mk>
diff --git a/net/smbldap-tools/distinfo b/net/smbldap-tools/distinfo
index 6f1fd725b1ea..7656e0f7eb2f 100644
--- a/net/smbldap-tools/distinfo
+++ b/net/smbldap-tools/distinfo
@@ -1,2 +1,2 @@
-MD5 (smbldap-tools-0.8.7.tgz) = 11564bd9be125aa8e356d14464507522
-SIZE (smbldap-tools-0.8.7.tgz) = 288685
+MD5 (smbldap-tools-0.9.1.tgz) = 12ddaf6393420ee24c4af94152e9ee2e
+SIZE (smbldap-tools-0.9.1.tgz) = 295169
diff --git a/net/smbldap-tools/pkg-plist b/net/smbldap-tools/pkg-plist
index d49f10516038..f15b4e1398c2 100644
--- a/net/smbldap-tools/pkg-plist
+++ b/net/smbldap-tools/pkg-plist
@@ -2,8 +2,8 @@ sbin/smbldap-groupadd
 sbin/smbldap-groupdel
 sbin/smbldap-groupmod
 sbin/smbldap-groupshow
-sbin/smbldap-migrate-accounts
-sbin/smbldap-migrate-groups
+sbin/smbldap-migrate-pwdump-accounts
+sbin/smbldap-migrate-pwdump-groups
 sbin/smbldap-migrate-unix-accounts
 sbin/smbldap-migrate-unix-groups
 sbin/smbldap-passwd
@@ -21,6 +21,24 @@ sbin/smbldap-usershow
 %%EXAMPLESDIR%%/smb.conf
 %%EXAMPLESDIR%%/configure.pl
 %%SITE_PERL%%/smbldap_tools.pm
+%%PORTDOCS%%%%DOCSDIR%%/smbldap-tools.pdf
+%%PORTDOCS%%%%DOCSDIR%%/html/contents_motif.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/next_motif.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/previous_motif.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/smbldap-tools.html
+%%PORTDOCS%%%%DOCSDIR%%/html/smbldap-tools001.html
+%%PORTDOCS%%%%DOCSDIR%%/html/smbldap-tools002.html
+%%PORTDOCS%%%%DOCSDIR%%/html/smbldap-tools003.html
+%%PORTDOCS%%%%DOCSDIR%%/html/smbldap-tools004.html
+%%PORTDOCS%%%%DOCSDIR%%/html/smbldap-tools005.html
+%%PORTDOCS%%%%DOCSDIR%%/html/smbldap-tools006.html
+%%PORTDOCS%%%%DOCSDIR%%/html/smbldap-tools007.html
+%%PORTDOCS%%%%DOCSDIR%%/html/smbldap-tools008.html
+%%PORTDOCS%%%%DOCSDIR%%/html/smbldap-tools009.html
+%%PORTDOCS%%%%DOCSDIR%%/html/smbldap-tools010.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @unexec rmdir %D/etc/smbldap-tools 2> /dev/null || true
 @dirrm %%EXAMPLESDIR%%/etc
 @dirrm %%EXAMPLESDIR%%