Update port from 0.7.0 -> 0.8.2

Add knob to choose either OpenLDAP 1 or 2
Add additional mastersite
General Makefile cleanups

PR:		40437
Submitted by:	maintainer

6 files changed, 67 insertions, 24 deletions

diff --git a/net/ldapdiff/Makefile b/net/ldapdiff/Makefile
index 2e01807057fc..7e2b27d8859d 100644
--- a/net/ldapdiff/Makefile
+++ b/net/ldapdiff/Makefile
@@ -6,35 +6,42 @@
 #
 
 PORTNAME=       ldapdiff
-PORTVERSION=    0.7.0
+PORTVERSION=    0.8.2
 CATEGORIES=     net
-MASTER_SITES=   http://webtomware.rhoen.de/
+MASTER_SITES=   http://webtomware.rhoen.de/ \
+		http://unixpages.org/distfiles/
 
 MAINTAINER=     chris@unixpages.org
 
-LIB_DEPENDS=    ldap.2:${PORTSDIR}/net/openldap2
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
-GNU_CONFIGURE=  yes
-CONFIGURE_ARGS= \
-				--prefix=${PREFIX} \
-				--with-ldap-dir=${PREFIX}
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--prefix=${PREFIX} \
+		--with-ldap-dir=${PREFIX} \
+		--with-iconv-dir=${PREFIX}
 
-do-install:
-		${INSTALL_PROGRAM} ${WRKSRC}/ldapdiff ${PREFIX}/bin
-		${INSTALL_DATA} ${WRKSRC}/ldapdiff.conf \
-			${PREFIX}/etc/ldapdiff.conf.sample
-		${MKDIR} ${DATADIR}/plugins
-		${INSTALL_DATA} ${WRKSRC}/plugins/ldapskeleton.c ${DATADIR}/plugins
+.if defined(WITH_OPENLDAP1)
+LIB_DEPENDS+=	ldap.1:${PORTSDIR}/net/openldap
+.else
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap2
+.endif
 
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/ldapdiff ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/ldapdiff.conf \
+		${PREFIX}/etc/ldapdiff.conf.sample
+	@${MKDIR} ${DATADIR}/samples
+.for i in addentry webtomware.init.ldif webtomware.user.ldif
+	${INSTALL_DATA} ${WRKSRC}/samples/${i} ${DATADIR}/samples
+.endfor
+	@${MKDIR} ${DATADIR}/plugins
+	${INSTALL_DATA} ${WRKSRC}/plugins/ldapskeleton.c ${DATADIR}/plugins
 .if !defined(NOPORTDOCS)
-		${MKDIR} ${DOCSDIR}
-		${INSTALL_DATA} ${WRKSRC}/CHANGES ${DOCSDIR}
-		${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-		${INSTALL_DATA} ${WRKSRC}/TODO ${DOCSDIR}
-		${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
+.for i in CHANGES README TODO ChangeLog
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+.endfor
 .endif
-
-post-install:
-		${CAT} ${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/net/ldapdiff/distinfo b/net/ldapdiff/distinfo
index f941a13fd439..8cf0926e101e 100644
--- a/net/ldapdiff/distinfo
+++ b/net/ldapdiff/distinfo
@@ -1 +1 @@
-MD5 (ldapdiff-0.7.0.tar.gz) = 72c5e8091a9d8df09523f7f046819037
+MD5 (ldapdiff-0.8.2.tar.gz) = e58652727f647fac34ee0ff444771154
diff --git a/net/ldapdiff/files/patch-base64.c b/net/ldapdiff/files/patch-base64.c
new file mode 100644
index 000000000000..4a8a80755c4e
--- /dev/null
+++ b/net/ldapdiff/files/patch-base64.c
@@ -0,0 +1,10 @@
+--- base64.c.orig	Sat Jul  6 10:22:29 2002
++++ base64.c	Sat Jul  6 10:22:51 2002
+@@ -46,6 +46,7 @@
+ static const char rcsid[] = "$Id: base64.c,v 1.1 2001/02/22 07:22:08 mellon Exp $";
+ #endif /* not lint */
+ 
++#include <sys/types.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <ctype.h>
diff --git a/net/ldapdiff/files/patch-ldapparse.c b/net/ldapdiff/files/patch-ldapparse.c
new file mode 100644
index 000000000000..b7de0bd5189e
--- /dev/null
+++ b/net/ldapdiff/files/patch-ldapparse.c
@@ -0,0 +1,11 @@
+--- ldapparse.c.orig	Sat Jul  6 10:21:57 2002
++++ ldapparse.c	Sat Jul  6 10:23:34 2002
+@@ -25,6 +25,8 @@
+ #include <stdlib.h>
+ #include <errno.h>
+ 
++#include <sys/types.h>
++
+ #include "ldapdiff.h"
+ #include "base64.h"
+ 
diff --git a/net/ldapdiff/files/patch-ldapwrite.c b/net/ldapdiff/files/patch-ldapwrite.c
new file mode 100644
index 000000000000..51358abba52c
--- /dev/null
+++ b/net/ldapdiff/files/patch-ldapwrite.c
@@ -0,0 +1,11 @@
+--- ldapwrite.c.orig	Sat Jul  6 10:22:20 2002
++++ ldapwrite.c	Sat Jul  6 10:23:16 2002
+@@ -24,6 +24,8 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
++#include <sys/types.h>
++
+ #include "ldapdiff.h"
+ #include "base64.h"
+ 
diff --git a/net/ldapdiff/pkg-plist b/net/ldapdiff/pkg-plist
index 828cfdcff2c5..6690b9ea51d6 100644
--- a/net/ldapdiff/pkg-plist
+++ b/net/ldapdiff/pkg-plist
@@ -1,10 +1,14 @@
 bin/ldapdiff
 etc/ldapdiff.conf.sample
 share/ldapdiff/plugins/ldapskeleton.c
+share/ldapdiff/samples/addentry
+share/ldapdiff/samples/webtomware.init.ldif
+share/ldapdiff/samples/webtomware.user.ldif
+@dirrm share/ldapdiff/plugins
+@dirrm share/ldapdiff/samples
+@dirrm share/ldapdiff
 %%PORTDOCS%%share/doc/ldapdiff/CHANGES
 %%PORTDOCS%%share/doc/ldapdiff/ChangeLog
 %%PORTDOCS%%share/doc/ldapdiff/README
 %%PORTDOCS%%share/doc/ldapdiff/TODO
 %%PORTDOCS%%@dirrm share/doc/ldapdiff
-@dirrm share/ldapdiff/plugins
-@dirrm share/ldapdiff