5 files changed, 16 insertions, 37 deletions

diff --git a/dns/ldapdns/Makefile b/dns/ldapdns/Makefile
index c3581201c3aa..5f279a75d506 100644
--- a/dns/ldapdns/Makefile
+++ b/dns/ldapdns/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ldapdns
-PORTVERSION=	2.06
-PORTREVISION=	2
+PORTVERSION=	2.07
 CATEGORIES=	dns
 MASTER_SITES=	http://bsdforge.com/projects/source/dns/ldapdns/
 
@@ -23,28 +22,21 @@ CONFIGURE_ARGS=	--prefix=${PREFIX}
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_CSTD=	gnu89
+USES=		tar:xz
 
 ALL_TARGET=	default
 
 PROGRAMS=	ldapdns ldapaxfr
 SCRIPTS=	ldapdns-conf ldapaxfr-conf domainname.sh
-DOCS=		AUTHORS CHANGELOG FAQ INSTALL README README.[a-s]*
-
-.include <bsd.port.options.mk>
+PORTDOCS=	AUTHORS CHANGELOG FAQ INSTALL README README.[a-s]*
 
 do-install:
-.for i in ${PROGRAMS}
-	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/bin
-.endfor
-.for i in ${SCRIPTS}
-	${INSTALL_SCRIPT} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/bin
-.endfor
+	${INSTALL_PROGRAM} ${PROGRAMS:S,^,${WRKSRC}/,} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${SCRIPTS:S,^,${WRKSRC}/,} ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/admin
 	${INSTALL_DATA} ${WRKSRC}/sample/* ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/admin/* ${STAGEDIR}${EXAMPLESDIR}/admin
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for i in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
-.endfor
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/dns/ldapdns/distinfo b/dns/ldapdns/distinfo
index 959298b64376..86a9c113af76 100644
--- a/dns/ldapdns/distinfo
+++ b/dns/ldapdns/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ldapdns-2.06.tar.gz) = 2239c91ba643eb2b95ceedc1e0c769bd1375124087eed9509d3920d7af7371e4
-SIZE (ldapdns-2.06.tar.gz) = 120593
+SHA256 (ldapdns-2.07.tar.xz) = 6c7d764f9317bebe209e366b003cb1cdbd30c4d97e4ded3d1040f24d332fbb68
+SIZE (ldapdns-2.07.tar.xz) = 84876
diff --git a/dns/ldapdns/files/patch-ldapdns.c b/dns/ldapdns/files/patch-ldapdns.c
index f72368e30a0f..b79cd2d7d523 100644
--- a/dns/ldapdns/files/patch-ldapdns.c
+++ b/dns/ldapdns/files/patch-ldapdns.c
@@ -1,9 +1,8 @@
---- ldapdns.c.orig	Mon Jun 23 15:56:44 2003
-+++ ldapdns.c	Sun Oct  2 15:13:11 2005
+--- ldapdns.c.orig	2014-05-03 14:11:48.555553477 -0700
++++ ldapdns.c	2014-05-03 14:13:35.212669115 -0700
 @@ -21,6 +21,7 @@
  		list_push(&x, lp->str);
- 		list_push(&seen, lp->str);
- HIT:
+ 		list_push(&seen, lp->str); HIT:
 +		continue;
  	}
  
diff --git a/dns/ldapdns/pkg-descr b/dns/ldapdns/pkg-descr
index afa320d9d318..ed6a22057de5 100644
--- a/dns/ldapdns/pkg-descr
+++ b/dns/ldapdns/pkg-descr
@@ -1,3 +1,5 @@
-ldapdns is a lightweight, high performance DNS server which utilizes LDAP
-as its backend. It is originally based on djbdns and strives to maintain 
-the same goals of performance, security and simplicity.
+ldapdns is a lightweight, high performance DNS server which utilizes
+LDAP as its backend. It was originally based on djbdns, and strives to
+maintain the same goals of performance, security and simplicity.
+
+WWW: http://bsdforge.com/projects/dns/ldapdns
diff --git a/dns/ldapdns/pkg-plist b/dns/ldapdns/pkg-plist
index f3544b805a99..107570ddc5cc 100644
--- a/dns/ldapdns/pkg-plist
+++ b/dns/ldapdns/pkg-plist
@@ -3,20 +3,6 @@ bin/ldapaxfr
 bin/ldapdns-conf
 bin/ldapaxfr-conf
 bin/domainname.sh
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.axfr
-%%PORTDOCS%%%%DOCSDIR%%/README.comparison
-%%PORTDOCS%%%%DOCSDIR%%/README.generic-rr
-%%PORTDOCS%%%%DOCSDIR%%/README.search
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
-%%PORTDOCS%%%%DOCSDIR%%/README.admin
-%%PORTDOCS%%%%DOCSDIR%%/README.configure
-%%PORTDOCS%%%%DOCSDIR%%/README.how-can-i-help
-%%PORTDOCS%%%%DOCSDIR%%/README.quotes
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/admin/add_basic_zone
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/admin/add_generic_record
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/admin/add_sub_alias