- Update to 0.3.6

- Take maintainership

PR:		ports/91790
Submitted by:	Gerrit Beine <gerrit.beine@gmx.de>

6 files changed, 49 insertions, 22 deletions

diff --git a/net/ldap2dns/Makefile b/net/ldap2dns/Makefile
index 8ab88395f19e..afb91e3f7b0a 100644
--- a/net/ldap2dns/Makefile
+++ b/net/ldap2dns/Makefile
@@ -6,34 +6,36 @@
 #
 
 PORTNAME=	ldap2dns
-PORTVERSION=	0.3.1
-PORTREVISION=	1
+PORTVERSION=	0.3.6
 CATEGORIES=	net
-MASTER_SITES=	http://ldap2dns.tiscover.com/
+MASTER_SITES=	http://projects.alkaloid.net/dist/ldap2dns/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	gerrit.beine@gmx.de
 COMMENT=	Maintain DNS zones using an LDAP directory
 
-USE_OPENLDAP=	yes
-
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS \
 		${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap
 
 USE_GMAKE=	yes
+USE_OPENLDAP=	yes
 USE_PERL5=	yes
+USE_REINPLACE=	yes
+
+MAKE_ENV=	PREFIX=${PREFIX} INC=-I${PREFIX}/include LIB=-L${PREFIX}/lib
 
-MAKE_ENV+=	PREFIX=$(PREFIX)
-MAKE_ENV+=	INC=-I$(PREFIX)/include
-MAKE_ENV+=	LIB=-L$(PREFIX)/lib
+post-patch:
+	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," ${WRKSRC}/ldap2dns.c
+	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," ${WRKSRC}/ldap2tinydns-conf
 
 do-install:
 	${MKDIR} ${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/ldap2dns ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/ldap2dnsd ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/dns.schema ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/example.ldif ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/README.html ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/ldap2dns.schema ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/example.ldif ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/README.html ${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/ldap2tinydns-conf ${DATADIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/import.pl ${DATADIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/axfr2ldap.pl ${DATADIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/data2ldap.pl ${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/net/ldap2dns/distinfo b/net/ldap2dns/distinfo
index c9a6410461e7..4d5251ccbf68 100644
--- a/net/ldap2dns/distinfo
+++ b/net/ldap2dns/distinfo
@@ -1,2 +1,3 @@
-MD5 (ldap2dns-0.3.1.tar.gz) = 3f661468159633a8fdd843db2af97721
-SIZE (ldap2dns-0.3.1.tar.gz) = 40760
+MD5 (ldap2dns-0.3.6.tar.gz) = 471158c024c199a07bcba4ec3559da7e
+SHA256 (ldap2dns-0.3.6.tar.gz) = 026100e852f5fd97739e9c31a03f93bcf696957016fcf214314fd5b98037fc64
+SIZE (ldap2dns-0.3.6.tar.gz) = 47953
diff --git a/net/ldap2dns/files/patch-ldap2dns.c b/net/ldap2dns/files/patch-ldap2dns.c
new file mode 100644
index 000000000000..3bff6618adb6
--- /dev/null
+++ b/net/ldap2dns/files/patch-ldap2dns.c
@@ -0,0 +1,11 @@
+--- ldap2dns.c.orig	Fri Dec 16 20:49:47 2005
++++ ldap2dns.c	Thu Jan 12 18:36:43 2006
+@@ -15,7 +15,7 @@
+ #include <unistd.h>
+ 
+ #define UPDATE_INTERVALL 59
+-#define LDAP_CONF "/etc/ldap/ldap.conf"
++#define LDAP_CONF "%%PREFIX%%/etc/openldap/ldap.conf"
+ #define OUTPUT_DATA 1
+ #define OUTPUT_DB 2
+ #define MAXHOSTS 10
diff --git a/net/ldap2dns/files/patch-ldap2tinydns-conf b/net/ldap2dns/files/patch-ldap2tinydns-conf
new file mode 100644
index 000000000000..439fc54ab707
--- /dev/null
+++ b/net/ldap2dns/files/patch-ldap2tinydns-conf
@@ -0,0 +1,12 @@
+--- ldap2tinydns-conf.orig	Fri Dec 16 20:49:47 2005
++++ ldap2tinydns-conf	Sat Jan 14 12:19:18 2006
+@@ -22,7 +22,8 @@
+ cat << EOF_run > $LDAP2DNSDIR/run
+ #!/bin/sh
+ exec 2>&1
+-exec setuidgid $LDAP2DNSUSER envdir ./env softlimit -d250000 /usr/bin/ldap2dns -e "cd \$TINYDNSDIR && tinydns-data"
++exec envdir ./env sh -c '
++  setuidgid $LDAP2DNSUSER softlimit -d250000 %%PREFIX%%/bin/ldap2dns -e "cd \$TINYDNSDIR && tinydns-data"'
+ EOF_run
+ 
+ chmod +t $LDAP2DNSDIR
diff --git a/net/ldap2dns/pkg-descr b/net/ldap2dns/pkg-descr
index fceec3759216..096227f21ac4 100644
--- a/net/ldap2dns/pkg-descr
+++ b/net/ldap2dns/pkg-descr
@@ -5,7 +5,7 @@ from a LDAP directory. ldap2dns is designed to write ASCII data files used
 by tinydns from the djbdns package, but also may be used to write .db-files
 used by named as found in the BIND package.
 
-WWW: http://ldap2dns.tiscover.com/
+WWW: http://projects.alkaloid.net/
 
 Bruce
 bms@spc.org
diff --git a/net/ldap2dns/pkg-plist b/net/ldap2dns/pkg-plist
index 19f6f487bde0..67ae7e7eb9af 100644
--- a/net/ldap2dns/pkg-plist
+++ b/net/ldap2dns/pkg-plist
@@ -1,8 +1,9 @@
 bin/ldap2dns
 bin/ldap2dnsd
-share/ldap2dns/README.html
-share/ldap2dns/dns.schema
-share/ldap2dns/example.ldif
-share/ldap2dns/import.pl
-share/ldap2dns/ldap2tinydns-conf
-@dirrm share/ldap2dns
+%%DATADIR%%/README.html
+%%DATADIR%%/ldap2dns.schema
+%%DATADIR%%/example.ldif
+%%DATADIR%%/axfr2ldap.pl
+%%DATADIR%%/data2ldap.pl
+%%DATADIR%%/ldap2tinydns-conf
+@dirrm %%DATADIR%%