3 files changed, 51 insertions, 26 deletions

diff --git a/net/ldapscripts/Makefile b/net/ldapscripts/Makefile
index 0af58bc5c259..77a88fdd79a7 100644
--- a/net/ldapscripts/Makefile
+++ b/net/ldapscripts/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ldapscripts
-PORTVERSION=	1.3
+PORTVERSION=	1.4
 CATEGORIES=	net
 MASTER_SITES=	http://contribs.martymac.com/ldapscripts/
 EXTRACT_SUFX=	.tgz
@@ -14,48 +14,68 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ganael.laplanche@martymac.com
 COMMENT=	Scripts to manage posix accounts in an OpenLDAP directory
 
-RUN_DEPENDS=	ldapadd:${PORTSDIR}/net/openldap23-server \
-		ldapsearch:${PORTSDIR}/net/openldap23-server \
-		ldapdelete:${PORTSDIR}/net/openldap23-server \
-		ldapmodify:${PORTSDIR}/net/openldap23-server \
-		slappasswd:${PORTSDIR}/net/openldap23-server
+RUN_DEPENDS=	ldapadd:${PORTSDIR}/net/openldap23-client \
+		ldapsearch:${PORTSDIR}/net/openldap23-client \
+		ldapdelete:${PORTSDIR}/net/openldap23-client \
+		ldapmodify:${PORTSDIR}/net/openldap23-client \
+		ldapmodrdn:${PORTSDIR}/net/openldap23-client \
+		ldappasswd:${PORTSDIR}/net/openldap23-client
 
 USE_REINPLACE=	yes
 
+MANLANG=	""
+MANCOMPRESSED=	no
+MAN1=		ldapaddgroup.1 ldapaddmachine.1 ldapadduser.1 ldapaddusertogroup.1 \
+		ldapdeletegroup.1 ldapdeleteuser.1 ldapdeleteuserfromgroup.1 \
+		ldaprenameuser.1 ldapsetprimarygroup.1 _lsldap.1 _ldaprenamemachine.1 \
+		_ldaprenamegroup.1 _ldapinit.1 _ldapdeletemachine.1
+MAN5=		ldapscripts.5
+
 # Change /etc to ${LOCALBASE}/etc
 post-patch:
-.for file in _ldapdeletemachine _ldapinit _lsldap ldapaddgroup ldapadduser ldapdeletegroup \
-		ldapdeleteuserfromgroup ldapsetprimarygroup ldapaddmachine ldapaddusertogroup ldapdeleteuser \
-		ldapscripts.conf runtime README CHANGELOG COPYING VERSION
-	${REINPLACE_CMD} -E -e "s|/etc/ldapscripts|${LOCALBASE}/etc/ldapscripts|g" ${WRKSRC}/${file}
-.endfor
+	${REINPLACE_CMD} -E -e "s|^_RUNTIMEFILE=.*|_RUNTIMEFILE=\"${LOCALBASE}/etc/ldapscripts/runtime\"|g" ${WRKSRC}/bin/*
+	${REINPLACE_CMD} -E -e "s|^_CONFIGFILE=.*|_CONFIGFILE=\"${LOCALBASE}/etc/ldapscripts/ldapscripts.conf\"|g" ${WRKSRC}/etc/runtime
+
+	${REINPLACE_CMD} -E -e "s|^LDAPSEARCHBIN=.*|LDAPSEARCHBIN=\"${LOCALBASE}/bin/ldapsearch\"|g" ${WRKSRC}/etc/ldapscripts.conf
+	${REINPLACE_CMD} -E -e "s|^LDAPADDBIN=.*|LDAPADDBIN=\"${LOCALBASE}/bin/ldapadd\"|g" ${WRKSRC}/etc/ldapscripts.conf
+	${REINPLACE_CMD} -E -e "s|^LDAPDELETEBIN=.*|LDAPDELETEBIN=\"${LOCALBASE}/bin/ldapdelete\"|g" ${WRKSRC}/etc/ldapscripts.conf
+	${REINPLACE_CMD} -E -e "s|^LDAPMODIFYBIN=.*|LDAPMODIFYBIN=\"${LOCALBASE}/bin/ldapmodify\"|g" ${WRKSRC}/etc/ldapscripts.conf
+	${REINPLACE_CMD} -E -e "s|^LDAPMODRDNBIN=.*|LDAPMODRDNBIN=\"${LOCALBASE}/bin/ldapmodrdn\"|g" ${WRKSRC}/etc/ldapscripts.conf
+	${REINPLACE_CMD} -E -e "s|^LDAPPASSWDBIN=.*|LDAPPASSWDBIN=\"${LOCALBASE}/bin/ldappasswd\"|g" ${WRKSRC}/etc/ldapscripts.conf
 
 # We do not use any Makefile
 do-build:
 
 # Just copy the scripts
 do-install:
-	${CP} ${WRKSRC}/_ldapdeletemachine ${PREFIX}/bin
-	${CP} ${WRKSRC}/_ldapinit ${PREFIX}/bin
-	${CP} ${WRKSRC}/_lsldap ${PREFIX}/bin
-	${CP} ${WRKSRC}/ldapaddgroup ${PREFIX}/bin
-	${CP} ${WRKSRC}/ldapadduser ${PREFIX}/bin
-	${CP} ${WRKSRC}/ldapdeletegroup ${PREFIX}/bin
-	${CP} ${WRKSRC}/ldapdeleteuserfromgroup ${PREFIX}/bin
-	${CP} ${WRKSRC}/ldapsetprimarygroup ${PREFIX}/bin
-	${CP} ${WRKSRC}/ldapaddmachine ${PREFIX}/bin
-	${CP} ${WRKSRC}/ldapaddusertogroup ${PREFIX}/bin
-	${CP} ${WRKSRC}/ldapdeleteuser ${PREFIX}/bin
+	${CP} ${WRKSRC}/bin/_ldapdeletemachine ${PREFIX}/bin
+	${CP} ${WRKSRC}/bin/_ldapinit ${PREFIX}/bin
+	${CP} ${WRKSRC}/bin/_lsldap ${PREFIX}/bin
+	${CP} ${WRKSRC}/bin/ldapaddgroup ${PREFIX}/bin
+	${CP} ${WRKSRC}/bin/ldapadduser ${PREFIX}/bin
+	${CP} ${WRKSRC}/bin/ldapdeletegroup ${PREFIX}/bin
+	${CP} ${WRKSRC}/bin/ldapdeleteuserfromgroup ${PREFIX}/bin
+	${CP} ${WRKSRC}/bin/ldapsetprimarygroup ${PREFIX}/bin
+	${CP} ${WRKSRC}/bin/ldapaddmachine ${PREFIX}/bin
+	${CP} ${WRKSRC}/bin/ldapaddusertogroup ${PREFIX}/bin
+	${CP} ${WRKSRC}/bin/ldapdeleteuser ${PREFIX}/bin
+	${CP} ${WRKSRC}/bin/ldaprenameuser ${PREFIX}/bin
+	${CP} ${WRKSRC}/bin/_ldaprenamegroup ${PREFIX}/bin
+	${CP} ${WRKSRC}/bin/_ldaprenamemachine ${PREFIX}/bin
 
 	${MKDIR} ${LOCALBASE}/etc/ldapscripts
 	if [ -f ${LOCALBASE}/etc/ldapscripts/ldapscripts.conf ]; then \
 		${CP} ${LOCALBASE}/etc/ldapscripts/ldapscripts.conf ${LOCALBASE}/etc/ldapscripts/ldapscripts.conf.old; \
 	fi
-	${CP} ${WRKSRC}/ldapscripts.conf ${LOCALBASE}/etc/ldapscripts
-	${CP} ${WRKSRC}/runtime ${LOCALBASE}/etc/ldapscripts
+	${CP} ${WRKSRC}/etc/ldapscripts.conf ${LOCALBASE}/etc/ldapscripts
+	${CP} ${WRKSRC}/etc/runtime ${LOCALBASE}/etc/ldapscripts
 	${CP} ${WRKSRC}/README ${LOCALBASE}/etc/ldapscripts
 	${CP} ${WRKSRC}/CHANGELOG ${LOCALBASE}/etc/ldapscripts
 	${CP} ${WRKSRC}/COPYING ${LOCALBASE}/etc/ldapscripts
 	${CP} ${WRKSRC}/VERSION ${LOCALBASE}/etc/ldapscripts
+	${CP} ${WRKSRC}/TODO ${LOCALBASE}/etc/ldapscripts
+
+	${CP} ${WRKSRC}/man/man1/* ${MANPREFIX}/man/man1
+	${CP} ${WRKSRC}/man/man5/* ${MANPREFIX}/man/man5
 
 .include <bsd.port.mk>
diff --git a/net/ldapscripts/distinfo b/net/ldapscripts/distinfo
index 673d2e1efb59..7818bf977393 100644
--- a/net/ldapscripts/distinfo
+++ b/net/ldapscripts/distinfo
@@ -1,2 +1,3 @@
-MD5 (ldapscripts-1.3.tgz) = ba297b68e199c222f2971249561bcc6d
-SIZE (ldapscripts-1.3.tgz) = 14292
+MD5 (ldapscripts-1.4.tgz) = 3e063297a5188922803a451cdbf7dd61
+SHA256 (ldapscripts-1.4.tgz) = 472173f895c60bad047fe84f1b64638f20a291c0aed3a3da9de601f54d5ab7a5
+SIZE (ldapscripts-1.4.tgz) = 18812
diff --git a/net/ldapscripts/pkg-plist b/net/ldapscripts/pkg-plist
index 5df1cff48cef..aa2b5d8e83d6 100644
--- a/net/ldapscripts/pkg-plist
+++ b/net/ldapscripts/pkg-plist
@@ -4,6 +4,7 @@ etc/ldapscripts/README
 etc/ldapscripts/CHANGELOG
 etc/ldapscripts/COPYING
 etc/ldapscripts/VERSION
+etc/ldapscripts/TODO
 @unexec rmdir %D/etc/ldapscripts 2>/dev/null || true
 bin/_ldapdeletemachine
 bin/_ldapinit
@@ -16,3 +17,6 @@ bin/ldapdeletegroup
 bin/ldapdeleteuser
 bin/ldapdeleteuserfromgroup
 bin/ldapsetprimarygroup
+bin/ldaprenameuser
+bin/_ldaprenamemachine
+bin/_ldaprenamegroup