6 files changed, 45 insertions, 73 deletions

diff --git a/net/ldap2dns/Makefile b/net/ldap2dns/Makefile
index 266334e40344..3480d09b31c4 100644
--- a/net/ldap2dns/Makefile
+++ b/net/ldap2dns/Makefile
@@ -1,44 +1,66 @@
-# New ports collection makefile for:	ldap2dns
-# Date created:				29 September 2003
-# Whom:					Bruce M Simpson <bms@FreeBSD.org>
-#
+# Created by: Bruce M Simpson <bms@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	ldap2dns
-PORTVERSION=	0.4.1
-PORTREVISION=	2
+PORTVERSION=	0.4.2
 CATEGORIES=	net
-MASTER_SITES=	http://projects.alkaloid.net/e107_files/downloads/
+MASTER_SITES=	http://cloud.github.com/downloads/bklang/ldap2dns/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Maintain DNS zones using an LDAP directory
 
-DEPRECATED=	No more public distfiles
-EXPIRATION_DATE=	2012-10-20
+LICENSE=	GPLv2
 
 RUN_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
 		p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
 
+OPTIONS_DEFINE=	DOCS
+
+USE_PERL5_RUN=	yes
 USE_GMAKE=	yes
 USE_OPENLDAP=	yes
-USE_PERL5=	yes
 
-MAKE_ENV=	INC=-I${PREFIX}/include LIB=-L${PREFIX}/lib
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+MAN1=		ldap2dns.1
+
+PORTDOCS=	*
+
+PLIST_FILES=	bin/ldap2dns \
+		bin/ldap2dnsd \
+		%%DATADIR%%/axfr2ldap.pl \
+		%%DATADIR%%/data2ldif.pl \
+		%%DATADIR%%/ldap2dns.schema \
+		%%DATADIR%%/ldap2tinydns-conf
+PLIST_DIRS=	%%DATADIR%%
+
 
+.include <bsd.port.options.mk>
 post-patch:
-	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," ${WRKSRC}/ldap2dns.c
-	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," ${WRKSRC}/ldap2tinydns-conf
+	@${REINPLACE_CMD} -e \
+		's|^CC=|CC?=| ; \
+		s|^LD=.*|LD=$$(CC)|' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e \
+		's|"/etc|"${PREFIX}/etc|' ${WRKSRC}/ldap2dns.c
+	@${REINPLACE_CMD} -e \
+		's|^/etc|${PREFIX}/etc|' ${WRKSRC}/ldap2dns.1
+	@${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_PROGRAM} ${WRKSRC}/ldap2dns ${PREFIX}/bin
+	${LN} -sf ldap2dns ${PREFIX}/bin/ldap2dnsd
+	${INSTALL_MAN} ${WRKSRC}/ldap2dns.1 ${MANPREFIX}/man/man1
+	@${MKDIR} ${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_DATA} ${WRKSRC}/ldap2tinydns-conf ${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/axfr2ldap.pl ${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/data2ldif.pl ${DATADIR}
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/README.html ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/example.ldif ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/net/ldap2dns/distinfo b/net/ldap2dns/distinfo
index c227e13debe2..f95598ea52d5 100644
--- a/net/ldap2dns/distinfo
+++ b/net/ldap2dns/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ldap2dns-0.4.1.tar.gz) = 870614b685a54dedc17c108c201b8aa30146865c03887358c06fad58cb6e2f60
-SIZE (ldap2dns-0.4.1.tar.gz) = 54857
+SHA256 (ldap2dns-0.4.2.tar.gz) = 23a24bd2233dafeb40cc2d755fa24cc4bd1207e92fdee614e642ea1064711b98
+SIZE (ldap2dns-0.4.2.tar.gz) = 61325
diff --git a/net/ldap2dns/files/patch-Makefile b/net/ldap2dns/files/patch-Makefile
deleted file mode 100644
index 35d791385ffa..000000000000
--- a/net/ldap2dns/files/patch-Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
---- Makefile.orig	Thu Oct 19 20:54:23 2006
-+++ Makefile	Sun Oct 29 16:56:03 2006
-@@ -3,12 +3,12 @@
- RELEASE=0
- CC=gcc
- DEBUG_CFLAGS=-g -ggdb
--CFLAGS=-O2
-+CFLAGS=-O2 -I$(PREFIX)/include
- LIBS=-lldap -llber
- LD=gcc 
--LDFLAGS=
--INSTALL_PREFIX=
--PREFIXDIR=$(INSTALL_PREFIX)/usr
-+LDFLAGS= $(LIB)
-+INSTALL_PREFIX=$(PREFIX)
-+PREFIXDIR=$(INSTALL_PREFIX)
- LDAPCONFDIR=$(INSTALL_PREFIX)/etc/openldap
- SPECFILE=ldap2dns.spec
- DISTRIBUTION=redhat
-@@ -40,6 +40,7 @@
- 	$(LD) $(LDFLAGS) $(LIBS) -o $@ $+
- 
- ldap2dns.o: ldap2dns.c
-+	echo $(CFLAGS)
- 	$(CC) $(CFLAGS) -DVERSION='"$(VERSION)"' -c $< -o $@
- 
- ldap2dns.o-dbg: ldap2dns.c
diff --git a/net/ldap2dns/files/patch-ldap2dns.c b/net/ldap2dns/files/patch-ldap2dns.c
deleted file mode 100644
index 75108c943f8d..000000000000
--- a/net/ldap2dns/files/patch-ldap2dns.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ldap2dns.c.orig	Thu Oct 19 20:54:23 2006
-+++ ldap2dns.c	Sun Oct 29 16:41:24 2006
-@@ -18,7 +18,7 @@
- #include <sys/types.h>
- 
- #define UPDATE_INTERVAL 59
--#define LDAP_CONF "/etc/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/pkg-descr b/net/ldap2dns/pkg-descr
index 096227f21ac4..5eda6530a0ca 100644
--- a/net/ldap2dns/pkg-descr
+++ b/net/ldap2dns/pkg-descr
@@ -5,7 +5,4 @@ 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://projects.alkaloid.net/
-
-Bruce
-bms@spc.org
+WWW: https://github.com/bklang/ldap2dns
diff --git a/net/ldap2dns/pkg-plist b/net/ldap2dns/pkg-plist
deleted file mode 100644
index 47039ef20653..000000000000
--- a/net/ldap2dns/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-bin/ldap2dns
-bin/ldap2dnsd
-%%DATADIR%%/README.html
-%%DATADIR%%/ldap2dns.schema
-%%DATADIR%%/example.ldif
-%%DATADIR%%/axfr2ldap.pl
-%%DATADIR%%/data2ldif.pl
-%%DATADIR%%/ldap2tinydns-conf
-@dirrm %%DATADIR%%