4 files changed, 10 insertions, 37 deletions
diff --git a/net/smbldap-tools/Makefile b/net/smbldap-tools/Makefile
index f50a4faf6030..88807a0027fa 100644
--- a/net/smbldap-tools/Makefile
+++ b/net/smbldap-tools/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	smbldap-tools
-PORTVERSION=	0.9.2a
+PORTVERSION=	0.9.3
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	http://download.gna.org/smbldap-tools/packages/ \
+		http://download.gna.org/smbldap-tools/packages/old-release/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	miwi@FreeBSD.org
@@ -27,14 +27,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/a//}
 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:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/configure.pl
 	@${PERL} -pi -e 's#/etc/samba#${PREFIX}/etc#' ${WRKSRC}/configure.pl \
@@ -53,11 +45,11 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/$i ${EXAMPLESDIR}/etc/$i
 	@[ -f ${PREFIX}/etc/${PORTNAME}/$i ] || ${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/etc/${PORTNAME}/$i
 .endfor
-.for i in smbldap-groupadd smbldap-groupdel smbldap-groupmod smbldap-groupshow smbldap-useradd smbldap-userdel smbldap-usermod smbldap-usershow smbldap-passwd smbldap-populate
+.for i in smbldap-groupadd smbldap-groupdel smbldap-groupmod smbldap-groupshow smbldap-useradd smbldap-userdel smbldap-userlist smbldap-usermod smbldap-usershow smbldap-passwd smbldap-populate
 	${INSTALL_SCRIPT} ${WRKSRC}/$i ${PREFIX}/sbin
 .endfor
 .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
+	${INSTALL_SCRIPT} ${WRKSRC}/doc/migration_scripts/$i ${PREFIX}/sbin
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/smbldap_tools.pm ${SITE_PERL}/
 	${INSTALL_DATA} ${WRKSRC}/smb.conf ${EXAMPLESDIR}/
@@ -65,11 +57,7 @@ do-install:
 
 .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 5478a4dbcf36..20e328466814 100644
--- a/net/smbldap-tools/distinfo
+++ b/net/smbldap-tools/distinfo
@@ -1,3 +1,3 @@
-MD5 (smbldap-tools-0.9.2a.tgz) = bb8eb44adb4e7946de5b486acf480c24
-SHA256 (smbldap-tools-0.9.2a.tgz) = 2f85c86f6ad03be7f64308529f493a730be01e90a97bb8b75ece8608bcfea992
-SIZE (smbldap-tools-0.9.2a.tgz) = 299341
+MD5 (smbldap-tools-0.9.3.tgz) = dd0ae8ca80a7f0fe7d63f289c7e7c5ff
+SHA256 (smbldap-tools-0.9.3.tgz) = efc7db89f096f7ff1a487b4c0942eb5b479df987889626d00ffdb542d5dedcc6
+SIZE (smbldap-tools-0.9.3.tgz) = 276016
diff --git a/net/smbldap-tools/pkg-descr b/net/smbldap-tools/pkg-descr
index 34854b7bfc7e..31ba5bccd8c9 100644
--- a/net/smbldap-tools/pkg-descr
+++ b/net/smbldap-tools/pkg-descr
@@ -6,7 +6,7 @@ Additionnaly, some scripts are designed to ease your migration from
 a Windows NT 4.0 PDC Server to a Samba-LDAP PDC Server (Killer?;-):
 smbldap-populate, smbldap-migrate-groups, smbldap-migrate-accounts.
 
-WWW: http://samba.idealx.org/
+WWW: https://gna.org/projects/smbldap-tools/
 
 - Florent Thoumie
 flz@xbsd.org
diff --git a/net/smbldap-tools/pkg-plist b/net/smbldap-tools/pkg-plist
index 4b23fc03a4ec..d6f862c725fe 100644
--- a/net/smbldap-tools/pkg-plist
+++ b/net/smbldap-tools/pkg-plist
@@ -10,6 +10,7 @@ sbin/smbldap-passwd
 sbin/smbldap-populate
 sbin/smbldap-useradd
 sbin/smbldap-userdel
+sbin/smbldap-userlist
 sbin/smbldap-usermod
 sbin/smbldap-usershow
 @unexec if cmp -s %D/etc/smbldap-tools/smbldap.conf %D/%%EXAMPLESDIR%%/etc/smbldap.conf; then rm -f %D/etc/smbldap-tools/smbldap.conf; fi
@@ -22,22 +23,6 @@ sbin/smbldap-usershow
 %%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%%
 @dirrmtry etc/smbldap-tools
 @dirrm %%EXAMPLESDIR%%/etc