5 files changed, 30 insertions, 18 deletions

diff --git a/net/ldap2dns/Makefile b/net/ldap2dns/Makefile
index 29012f998ceb..ef788a11e188 100644
--- a/net/ldap2dns/Makefile
+++ b/net/ldap2dns/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	ldap2dns
-PORTVERSION=	0.3.6
+PORTVERSION=	0.4.1
 CATEGORIES=	net
-MASTER_SITES=	http://projects.alkaloid.net/dist/ldap2dns/
+MASTER_SITES=	http://projects.alkaloid.net/e107_files/downloads/
 
 MAINTAINER=	gerrit.beine@gmx.de
 COMMENT=	Maintain DNS zones using an LDAP directory
@@ -35,6 +35,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/README.html ${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/ldap2tinydns-conf ${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/axfr2ldap.pl ${DATADIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/data2ldap.pl ${DATADIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/data2ldif.pl ${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/net/ldap2dns/distinfo b/net/ldap2dns/distinfo
index 4d5251ccbf68..f29446146b0e 100644
--- a/net/ldap2dns/distinfo
+++ b/net/ldap2dns/distinfo
@@ -1,3 +1,3 @@
-MD5 (ldap2dns-0.3.6.tar.gz) = 471158c024c199a07bcba4ec3559da7e
-SHA256 (ldap2dns-0.3.6.tar.gz) = 026100e852f5fd97739e9c31a03f93bcf696957016fcf214314fd5b98037fc64
-SIZE (ldap2dns-0.3.6.tar.gz) = 47953
+MD5 (ldap2dns-0.4.1.tar.gz) = ce8a394e7d8c02b58809fa6452d76cd5
+SHA256 (ldap2dns-0.4.1.tar.gz) = 870614b685a54dedc17c108c201b8aa30146865c03887358c06fad58cb6e2f60
+SIZE (ldap2dns-0.4.1.tar.gz) = 54857
diff --git a/net/ldap2dns/files/patch-Makefile b/net/ldap2dns/files/patch-Makefile
index 3cceb7e203d8..35d791385ffa 100644
--- a/net/ldap2dns/files/patch-Makefile
+++ b/net/ldap2dns/files/patch-Makefile
@@ -1,7 +1,11 @@
---- Makefile.orig	Tue Aug 13 15:58:27 2002
-+++ Makefile	Mon Sep 29 01:33:57 2003
-@@ -6,9 +6,9 @@
- CFLAGS=$(INC) -DVERSION='"$(VERSION)"'
+--- 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=
@@ -11,5 +15,13 @@
 +INSTALL_PREFIX=$(PREFIX)
 +PREFIXDIR=$(INSTALL_PREFIX)
  LDAPCONFDIR=$(INSTALL_PREFIX)/etc/openldap
- TARFILE=/usr/src/redhat/SOURCES/ldap2dns-$(VERSION).tar.gz
  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
index 3bff6618adb6..75108c943f8d 100644
--- a/net/ldap2dns/files/patch-ldap2dns.c
+++ b/net/ldap2dns/files/patch-ldap2dns.c
@@ -1,10 +1,10 @@
---- 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>
+--- 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_INTERVALL 59
--#define LDAP_CONF "/etc/ldap/ldap.conf"
+ #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
diff --git a/net/ldap2dns/pkg-plist b/net/ldap2dns/pkg-plist
index 67ae7e7eb9af..47039ef20653 100644
--- a/net/ldap2dns/pkg-plist
+++ b/net/ldap2dns/pkg-plist
@@ -4,6 +4,6 @@ bin/ldap2dnsd
 %%DATADIR%%/ldap2dns.schema
 %%DATADIR%%/example.ldif
 %%DATADIR%%/axfr2ldap.pl
-%%DATADIR%%/data2ldap.pl
+%%DATADIR%%/data2ldif.pl
 %%DATADIR%%/ldap2tinydns-conf
 @dirrm %%DATADIR%%