3 files changed, 69 insertions, 58 deletions

diff --git a/net/ldapscripts/Makefile b/net/ldapscripts/Makefile
index 0764b2fdc46e..96dde154ca4b 100644
--- a/net/ldapscripts/Makefile
+++ b/net/ldapscripts/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	ldapscripts
-PORTVERSION=	1.6
+PORTVERSION=	1.7
 CATEGORIES=	net
-MASTER_SITES=	http://contribs.martymac.com/ldapscripts/ \
-				${MASTER_SITE_LOCAL}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		http://contribs.martymac.com/ldapscripts/
+MASTER_SITE_SUBDIR=	ldapscripts
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ganael.laplanche@martymac.com
@@ -34,56 +35,66 @@ 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 _ldappasswd.1 _ldapfinger.1
+		_ldaprenamegroup.1 _ldapinit.1 _ldapdeletemachine.1 _ldappasswd.1 _ldapfinger.1 \
+		_ldapmodifygroup.1 _ldapmodifymachine.1 _ldapmodifyuser.1
 MAN5=	ldapscripts.5
 
-# Change /etc to ${LOCALBASE}/etc
+PORTDOCS=	README CHANGELOG COPYING VERSION TODO
+
+# Change /etc to ${PREFIX}/etc
 post-patch:
-	${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|^_RUNTIMEFILE=.*|_RUNTIMEFILE=\"${ETCDIR}/runtime\"|g" ${WRKSRC}/bin/*
+	${REINPLACE_CMD} -E -e "s|^_CONFIGFILE=.*|_CONFIGFILE=\"${ETCDIR}/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
+	${REINPLACE_CMD} -E -e "s|^LDAPSEARCHBIN=.*|LDAPSEARCHBIN=\"${PREFIX}/bin/ldapsearch\"|g" ${WRKSRC}/etc/ldapscripts.conf
+	${REINPLACE_CMD} -E -e "s|^LDAPADDBIN=.*|LDAPADDBIN=\"${PREFIX}/bin/ldapadd\"|g" ${WRKSRC}/etc/ldapscripts.conf
+	${REINPLACE_CMD} -E -e "s|^LDAPDELETEBIN=.*|LDAPDELETEBIN=\"${PREFIX}/bin/ldapdelete\"|g" ${WRKSRC}/etc/ldapscripts.conf
+	${REINPLACE_CMD} -E -e "s|^LDAPMODIFYBIN=.*|LDAPMODIFYBIN=\"${PREFIX}/bin/ldapmodify\"|g" ${WRKSRC}/etc/ldapscripts.conf
+	${REINPLACE_CMD} -E -e "s|^LDAPMODRDNBIN=.*|LDAPMODRDNBIN=\"${PREFIX}/bin/ldapmodrdn\"|g" ${WRKSRC}/etc/ldapscripts.conf
+	${REINPLACE_CMD} -E -e "s|^LDAPPASSWDBIN=.*|LDAPPASSWDBIN=\"${PREFIX}/bin/ldappasswd\"|g" ${WRKSRC}/etc/ldapscripts.conf
 
 # Just copy the scripts
 do-install:
-	${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
-	${CP} ${WRKSRC}/bin/_ldappasswd ${PREFIX}/bin
-	${CP} ${WRKSRC}/bin/_ldapfinger ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/_ldapdeletemachine ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/_ldapinit ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/_lsldap ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/ldapaddgroup ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/ldapadduser ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/ldapdeletegroup ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/ldapdeleteuserfromgroup ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/ldapsetprimarygroup ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/ldapaddmachine ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/ldapaddusertogroup ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/ldapdeleteuser ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/ldaprenameuser ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/_ldaprenamegroup ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/_ldaprenamemachine ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/_ldappasswd ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/_ldapfinger ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/_ldapmodifyuser ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/_ldapmodifygroup ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/_ldapmodifymachine ${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; \
+	${MKDIR} ${ETCDIR}
+	${INSTALL_DATA} ${WRKSRC}/etc/ldapscripts.conf ${ETCDIR}/ldapscripts.conf.sample
+	if [ ! -f ${ETCDIR}/ldapscripts.conf ]; then \
+		${CP} -p ${ETCDIR}/ldapscripts.conf.sample ${ETCDIR}/ldapscripts.conf; \
 	fi
-	${CP} ${WRKSRC}/etc/ldapscripts.conf ${LOCALBASE}/etc/ldapscripts
-	${CP} ${WRKSRC}/etc/runtime ${LOCALBASE}/etc/ldapscripts
-	${CP} ${WRKSRC}/etc/ldapaddgroup.template.sample ${LOCALBASE}/etc/ldapscripts
-	${CP} ${WRKSRC}/etc/ldapadduser.template.sample ${LOCALBASE}/etc/ldapscripts
-	${CP} ${WRKSRC}/etc/ldapaddmachine.template.sample ${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
+	${INSTALL_DATA} ${WRKSRC}/etc/runtime ${ETCDIR}
+	${INSTALL_DATA} ${WRKSRC}/etc/ldapaddgroup.template.sample ${ETCDIR}
+	${INSTALL_DATA} ${WRKSRC}/etc/ldapadduser.template.sample ${ETCDIR}
+	${INSTALL_DATA} ${WRKSRC}/etc/ldapaddmachine.template.sample ${ETCDIR}
+
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/VERSION ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/TODO ${DOCSDIR}
+.endif
 
-	${CP} ${WRKSRC}/man/man1/* ${MANPREFIX}/man/man1
-	${CP} ${WRKSRC}/man/man5/* ${MANPREFIX}/man/man5
+	${INSTALL_MAN} ${WRKSRC}/man/man1/* ${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/man5/* ${MAN5PREFIX}/man/man5
 
 .include <bsd.port.mk>
diff --git a/net/ldapscripts/distinfo b/net/ldapscripts/distinfo
index eefca1245682..5a503de85a94 100644
--- a/net/ldapscripts/distinfo
+++ b/net/ldapscripts/distinfo
@@ -1,3 +1,3 @@
-MD5 (ldapscripts-1.6.tgz) = 4d20152eab6651fe87463b565c106785
-SHA256 (ldapscripts-1.6.tgz) = 6b38dbc96f760c8c8e1fa2979816b84a04b18f7d9a18cbcf8be98257b37286e3
-SIZE (ldapscripts-1.6.tgz) = 21513
+MD5 (ldapscripts-1.7.tgz) = 6d2322170707e8dd28897aa5b20d061d
+SHA256 (ldapscripts-1.7.tgz) = 6dade33e3660c456bd4fbf1cdba465401d1c9f7b0862c1ed8b1d04cffb51d16f
+SIZE (ldapscripts-1.7.tgz) = 24470
diff --git a/net/ldapscripts/pkg-plist b/net/ldapscripts/pkg-plist
index ac2ba2b69fe3..bd743a70bee2 100644
--- a/net/ldapscripts/pkg-plist
+++ b/net/ldapscripts/pkg-plist
@@ -1,14 +1,11 @@
-etc/ldapscripts/ldapscripts.conf
-etc/ldapscripts/runtime
-etc/ldapscripts/ldapaddgroup.template.sample
-etc/ldapscripts/ldapadduser.template.sample
-etc/ldapscripts/ldapaddmachine.template.sample
-etc/ldapscripts/README
-etc/ldapscripts/CHANGELOG
-etc/ldapscripts/COPYING
-etc/ldapscripts/VERSION
-etc/ldapscripts/TODO
-@dirrmtry etc/ldapscripts
+@unexec if cmp -s %D/%%ETCDIR%%/ldapscripts.conf.sample %D/%%ETCDIR%%/ldapscripts.conf; then rm -f %D/%%ETCDIR%%/ldapscripts.conf; fi
+%%ETCDIR%%/ldapscripts.conf.sample
+@exec if [ ! -f %D/%%ETCDIR%%/ldapscripts.conf ] ; then cp -p %D/%F %B/ldapscripts.conf; fi
+%%ETCDIR%%/runtime
+%%ETCDIR%%/ldapaddgroup.template.sample
+%%ETCDIR%%/ldapadduser.template.sample
+%%ETCDIR%%/ldapaddmachine.template.sample
+@dirrmtry %%ETCDIR%%
 bin/_ldapdeletemachine
 bin/_ldapinit
 bin/_lsldap
@@ -25,3 +22,6 @@ bin/_ldaprenamemachine
 bin/_ldaprenamegroup
 bin/_ldappasswd
 bin/_ldapfinger
+bin/_ldapmodifygroup
+bin/_ldapmodifymachine
+bin/_ldapmodifyuser