6 files changed, 24 insertions, 42 deletions

diff --git a/dns/mydns-ng/Makefile b/dns/mydns-ng/Makefile
index 538a9eeb493a..b4c9918403bb 100644
--- a/dns/mydns-ng/Makefile
+++ b/dns/mydns-ng/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	mydns
-PORTVERSION=	0.10.0
-PORTREVISION=	3
+PORTVERSION=	0.10.1
 CATEGORIES=	dns databases
 MASTER_SITES=	http://mydns.bboy.net/download/
 
-MAINTAINER=	simond@irrelevant.org
+MAINTAINER=	sysadmin@alexdupre.com
 COMMENT=	DNS server designed to utilize the MySQL database
 
 LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext \
@@ -28,8 +27,6 @@ MAN8=		mydns.8 mydnscheck.8 mydnsexport.8 mydnsimport.8 mydns-conf.8
 
 DOCS=		AUTHORS COPYING ChangeLog NEWS QUICKSTART.mysql QUICKSTART.postgres README TODO
 
-.include <bsd.port.pre.mk>
-
 .if defined (WITH_ALIAS)
 CONFIGURE_ARGS+=--enable-alias
 .endif
@@ -39,19 +36,13 @@ CONFIGURE_ARGS+=--with-openssl
 .endif
 
 .if defined (WITH_PGSQL)
-LIB_DEPENDS+=	pq.3:${PORTSDIR}/databases/postgresql7
+LIB_DEPENDS+=	pq.3:${PORTSDIR}/databases/postgresql-client
 CONFIGURE_ARGS+=--without-mysql
 PKGNAMESUFFIX=	-pg
 .else
 CONFIGURE_ARGS+=--without-pgsql
 PKGNAMESUFFIX=	-mysql
-.if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.10)
-LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
-.elif exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.14)
-LIB_DEPENDS+=	mysqlclient.14:${PORTSDIR}/databases/mysql41-client
-.else
-LIB_DEPENDS+=	mysqlclient.12:${PORTSDIR}/databases/mysql40-client
-.endif
+USE_MYSQL=	yes
 .endif
 
 pre-fetch:
@@ -60,7 +51,7 @@ pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "      WITH_PGSQL=yes          Build with PostgreSQL support"
 	@${ECHO} "      WITH_ALIAS=yes          Enable server side aliases"
-	@${ECHO} "      WITH_OPENSSL=yes        Enable OpenSSL (needed if MySQL is linked with OpenSSL"
+	@${ECHO} "      WITH_OPENSSL=yes        Enable OpenSSL (needed if MySQL is linked with OpenSSL)"
 	@${ECHO} ""
 
 post-install:
@@ -78,4 +69,4 @@ post-install:
 	@${PREFIX}/sbin/mydns --dump-config >${PREFIX}/etc/mydns.conf.sample
 	@${SED} -e 's,%%%PREFIX%%%,${PREFIX},g' ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/dns/mydns-ng/distinfo b/dns/mydns-ng/distinfo
index 6bf12d38efa9..a067c2a16413 100644
--- a/dns/mydns-ng/distinfo
+++ b/dns/mydns-ng/distinfo
@@ -1 +1 @@
-MD5 (mydns-0.10.0.tar.bz2) = 4791990d1017fa85461dcc9fa31089f7
+MD5 (mydns-0.10.1.tar.bz2) = a931f7fdd3398dbd441ef8cce12793c6
diff --git a/dns/mydns-ng/files/patch-src::mydns::conf.c b/dns/mydns-ng/files/patch-src::mydns::conf.c
index 797c70c7805d..4b49ce8a838f 100644
--- a/dns/mydns-ng/files/patch-src::mydns::conf.c
+++ b/dns/mydns-ng/files/patch-src::mydns::conf.c
@@ -1,11 +1,11 @@
---- src/mydns/conf.c.orig	Fri Nov 28 12:04:45 2003
-+++ src/mydns/conf.c	Fri Nov 28 12:04:58 2003
-@@ -351,7 +351,7 @@
+--- src/mydns/conf.c.orig	Fri Dec 12 06:02:22 2003
++++ src/mydns/conf.c	Tue Dec 16 08:16:03 2003
+@@ -429,7 +429,7 @@
  
  	/* Set additional where clauses if provided */
  	mydns_set_soa_where_clause(conf_get(&Conf, "soa-where", NULL));
 -	mydns_set_rr_where_clause(conf_get(&Conf, "soa-where", NULL));
 +	mydns_set_rr_where_clause(conf_get(&Conf, "rr-where", NULL));
- }
- /*--- load_config() -----------------------------------------------------------------------------*/
  
+ 	/* Set recursive server if specified */
+ 	conf_set_recursive();
diff --git a/dns/mydns/Makefile b/dns/mydns/Makefile
index 538a9eeb493a..b4c9918403bb 100644
--- a/dns/mydns/Makefile
+++ b/dns/mydns/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	mydns
-PORTVERSION=	0.10.0
-PORTREVISION=	3
+PORTVERSION=	0.10.1
 CATEGORIES=	dns databases
 MASTER_SITES=	http://mydns.bboy.net/download/
 
-MAINTAINER=	simond@irrelevant.org
+MAINTAINER=	sysadmin@alexdupre.com
 COMMENT=	DNS server designed to utilize the MySQL database
 
 LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext \
@@ -28,8 +27,6 @@ MAN8=		mydns.8 mydnscheck.8 mydnsexport.8 mydnsimport.8 mydns-conf.8
 
 DOCS=		AUTHORS COPYING ChangeLog NEWS QUICKSTART.mysql QUICKSTART.postgres README TODO
 
-.include <bsd.port.pre.mk>
-
 .if defined (WITH_ALIAS)
 CONFIGURE_ARGS+=--enable-alias
 .endif
@@ -39,19 +36,13 @@ CONFIGURE_ARGS+=--with-openssl
 .endif
 
 .if defined (WITH_PGSQL)
-LIB_DEPENDS+=	pq.3:${PORTSDIR}/databases/postgresql7
+LIB_DEPENDS+=	pq.3:${PORTSDIR}/databases/postgresql-client
 CONFIGURE_ARGS+=--without-mysql
 PKGNAMESUFFIX=	-pg
 .else
 CONFIGURE_ARGS+=--without-pgsql
 PKGNAMESUFFIX=	-mysql
-.if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.10)
-LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
-.elif exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.14)
-LIB_DEPENDS+=	mysqlclient.14:${PORTSDIR}/databases/mysql41-client
-.else
-LIB_DEPENDS+=	mysqlclient.12:${PORTSDIR}/databases/mysql40-client
-.endif
+USE_MYSQL=	yes
 .endif
 
 pre-fetch:
@@ -60,7 +51,7 @@ pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "      WITH_PGSQL=yes          Build with PostgreSQL support"
 	@${ECHO} "      WITH_ALIAS=yes          Enable server side aliases"
-	@${ECHO} "      WITH_OPENSSL=yes        Enable OpenSSL (needed if MySQL is linked with OpenSSL"
+	@${ECHO} "      WITH_OPENSSL=yes        Enable OpenSSL (needed if MySQL is linked with OpenSSL)"
 	@${ECHO} ""
 
 post-install:
@@ -78,4 +69,4 @@ post-install:
 	@${PREFIX}/sbin/mydns --dump-config >${PREFIX}/etc/mydns.conf.sample
 	@${SED} -e 's,%%%PREFIX%%%,${PREFIX},g' ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/dns/mydns/distinfo b/dns/mydns/distinfo
index 6bf12d38efa9..a067c2a16413 100644
--- a/dns/mydns/distinfo
+++ b/dns/mydns/distinfo
@@ -1 +1 @@
-MD5 (mydns-0.10.0.tar.bz2) = 4791990d1017fa85461dcc9fa31089f7
+MD5 (mydns-0.10.1.tar.bz2) = a931f7fdd3398dbd441ef8cce12793c6
diff --git a/dns/mydns/files/patch-src::mydns::conf.c b/dns/mydns/files/patch-src::mydns::conf.c
index 797c70c7805d..4b49ce8a838f 100644
--- a/dns/mydns/files/patch-src::mydns::conf.c
+++ b/dns/mydns/files/patch-src::mydns::conf.c
@@ -1,11 +1,11 @@
---- src/mydns/conf.c.orig	Fri Nov 28 12:04:45 2003
-+++ src/mydns/conf.c	Fri Nov 28 12:04:58 2003
-@@ -351,7 +351,7 @@
+--- src/mydns/conf.c.orig	Fri Dec 12 06:02:22 2003
++++ src/mydns/conf.c	Tue Dec 16 08:16:03 2003
+@@ -429,7 +429,7 @@
  
  	/* Set additional where clauses if provided */
  	mydns_set_soa_where_clause(conf_get(&Conf, "soa-where", NULL));
 -	mydns_set_rr_where_clause(conf_get(&Conf, "soa-where", NULL));
 +	mydns_set_rr_where_clause(conf_get(&Conf, "rr-where", NULL));
- }
- /*--- load_config() -----------------------------------------------------------------------------*/
  
+ 	/* Set recursive server if specified */
+ 	conf_set_recursive();