10 files changed, 54 insertions, 46 deletions

diff --git a/dns/mydns-ng/Makefile b/dns/mydns-ng/Makefile
index a7a3478443ad..05a1d5c16f7d 100644
--- a/dns/mydns-ng/Makefile
+++ b/dns/mydns-ng/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	mydns
-PORTVERSION=	0.9.10
-PORTREVISION=	1
+PORTVERSION=	0.9.13
+PORTREVISION=	0
 CATEGORIES=	net databases
 MASTER_SITES=	http://mydns.bboy.net/download/
 
@@ -23,10 +23,11 @@ USE_LIBTOOL=	yes
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 
+INFO=		mydns
 MAN5=		mydns.conf.5
-MAN8=		mydns.8 mydnscheck.8 mydnsexport.8 mydnsimport.8
+MAN8=		mydns.8 mydnscheck.8 mydnsexport.8 mydnsimport.8 mydns-conf.8
 
-DOCS=		AUTHORS COPYING ChangeLog NEWS QUICKSTART README TODO
+DOCS=		AUTHORS COPYING ChangeLog NEWS QUICKSTART.mysql QUICKSTART.postgres README TODO
 
 .include <bsd.port.pre.mk>
 
@@ -39,6 +40,8 @@ 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
@@ -53,7 +56,7 @@ post-install:
 .for f in ${DOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
 .endfor
-	@${INSTALL_DATA} ${WRKSRC}/contrib/admin.php ${DOCSDIR}/contrib/
+	@${INSTALL_DATA} ${WRKSRC}/contrib/*.php ${DOCSDIR}/contrib/
 	@${INSTALL_DATA} ${WRKSRC}/contrib/README ${DOCSDIR}/contrib/
 .endif
 	@${PREFIX}/sbin/mydns --dump-config >${PREFIX}/etc/mydns.conf.sample
diff --git a/dns/mydns-ng/distinfo b/dns/mydns-ng/distinfo
index 1024f9894d54..e086e0e2bb6a 100644
--- a/dns/mydns-ng/distinfo
+++ b/dns/mydns-ng/distinfo
@@ -1 +1 @@
-MD5 (mydns-0.9.10.tar.bz2) = 35e2f6bd521c0b3997d1b6cebd5412dc
+MD5 (mydns-0.9.13.tar.bz2) = fc2347d6c005121c0d0eecca228ec572
diff --git a/dns/mydns-ng/files/patch-configure b/dns/mydns-ng/files/patch-configure
index ecd1646e0983..65ebf6726437 100644
--- a/dns/mydns-ng/files/patch-configure
+++ b/dns/mydns-ng/files/patch-configure
@@ -4,7 +4,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+/usr/local/share/libtool/ltconfig $LIBTOOL_DEPS
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/dns/mydns-ng/files/patch-doc::texinfo::title.texi b/dns/mydns-ng/files/patch-doc::mydns.texi
index 40e5fc3b827c..240da03053cb 100644
--- a/dns/mydns-ng/files/patch-doc::texinfo::title.texi
+++ b/dns/mydns-ng/files/patch-doc::mydns.texi
@@ -1,5 +1,5 @@
---- doc/texinfo/title.texi.orig Fri Nov 15 10:30:48 2002
-+++ doc/texinfo/title.texi      Wed Dec 18 15:18:13 2002
+--- doc/mydns.texi.orig Fri Nov 15 10:30:48 2002
++++ doc/mydns.texi      Wed Dec 18 15:18:13 2002
 @@ -1,3 +1,7 @@
 +@dircategory Miscellaneous
 +@direntry
diff --git a/dns/mydns-ng/pkg-plist b/dns/mydns-ng/pkg-plist
index 93de748a7fba..6b5d1251db3e 100644
--- a/dns/mydns-ng/pkg-plist
+++ b/dns/mydns-ng/pkg-plist
@@ -1,23 +1,24 @@
+bin/mydns-conf
 bin/mydnscheck
 bin/mydnsexport
 bin/mydnsimport
+bin/mydnsptrconvert
 etc/mydns.conf.sample
 etc/rc.d/mydns.sh.sample
-@unexec install-info --delete %D/info/mydns.info %D/info/dir
-info/mydns.info
-@exec install-info %D/info/mydns.info %D/info/dir
 sbin/mydns
 share/locale/es/LC_MESSAGES/mydns.mo
 share/locale/fr/LC_MESSAGES/mydns.mo
 share/locale/pt_BR/LC_MESSAGES/mydns.mo
-%%PORTDOCS%%share/doc/mydns/AUTHORS
-%%PORTDOCS%%share/doc/mydns/COPYING
-%%PORTDOCS%%share/doc/mydns/ChangeLog
-%%PORTDOCS%%share/doc/mydns/NEWS
-%%PORTDOCS%%share/doc/mydns/QUICKSTART
-%%PORTDOCS%%share/doc/mydns/README
-%%PORTDOCS%%share/doc/mydns/TODO
-%%PORTDOCS%%share/doc/mydns/contrib/README
-%%PORTDOCS%%share/doc/mydns/contrib/admin.php
-%%PORTDOCS%%@dirrm share/doc/mydns/contrib
-%%PORTDOCS%%@dirrm share/doc/mydns
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/QUICKSTART.mysql
+%%PORTDOCS%%%%DOCSDIR%%/QUICKSTART.postgres
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/contrib/README
+%%PORTDOCS%%%%DOCSDIR%%/contrib/admin.php
+%%PORTDOCS%%%%DOCSDIR%%/contrib/stats.php
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/contrib
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/dns/mydns/Makefile b/dns/mydns/Makefile
index a7a3478443ad..05a1d5c16f7d 100644
--- a/dns/mydns/Makefile
+++ b/dns/mydns/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	mydns
-PORTVERSION=	0.9.10
-PORTREVISION=	1
+PORTVERSION=	0.9.13
+PORTREVISION=	0
 CATEGORIES=	net databases
 MASTER_SITES=	http://mydns.bboy.net/download/
 
@@ -23,10 +23,11 @@ USE_LIBTOOL=	yes
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 
+INFO=		mydns
 MAN5=		mydns.conf.5
-MAN8=		mydns.8 mydnscheck.8 mydnsexport.8 mydnsimport.8
+MAN8=		mydns.8 mydnscheck.8 mydnsexport.8 mydnsimport.8 mydns-conf.8
 
-DOCS=		AUTHORS COPYING ChangeLog NEWS QUICKSTART README TODO
+DOCS=		AUTHORS COPYING ChangeLog NEWS QUICKSTART.mysql QUICKSTART.postgres README TODO
 
 .include <bsd.port.pre.mk>
 
@@ -39,6 +40,8 @@ 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
@@ -53,7 +56,7 @@ post-install:
 .for f in ${DOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
 .endfor
-	@${INSTALL_DATA} ${WRKSRC}/contrib/admin.php ${DOCSDIR}/contrib/
+	@${INSTALL_DATA} ${WRKSRC}/contrib/*.php ${DOCSDIR}/contrib/
 	@${INSTALL_DATA} ${WRKSRC}/contrib/README ${DOCSDIR}/contrib/
 .endif
 	@${PREFIX}/sbin/mydns --dump-config >${PREFIX}/etc/mydns.conf.sample
diff --git a/dns/mydns/distinfo b/dns/mydns/distinfo
index 1024f9894d54..e086e0e2bb6a 100644
--- a/dns/mydns/distinfo
+++ b/dns/mydns/distinfo
@@ -1 +1 @@
-MD5 (mydns-0.9.10.tar.bz2) = 35e2f6bd521c0b3997d1b6cebd5412dc
+MD5 (mydns-0.9.13.tar.bz2) = fc2347d6c005121c0d0eecca228ec572
diff --git a/dns/mydns/files/patch-configure b/dns/mydns/files/patch-configure
index ecd1646e0983..65ebf6726437 100644
--- a/dns/mydns/files/patch-configure
+++ b/dns/mydns/files/patch-configure
@@ -4,7 +4,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+/usr/local/share/libtool/ltconfig $LIBTOOL_DEPS
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/dns/mydns/files/patch-doc::texinfo::title.texi b/dns/mydns/files/patch-doc::mydns.texi
index 40e5fc3b827c..240da03053cb 100644
--- a/dns/mydns/files/patch-doc::texinfo::title.texi
+++ b/dns/mydns/files/patch-doc::mydns.texi
@@ -1,5 +1,5 @@
---- doc/texinfo/title.texi.orig Fri Nov 15 10:30:48 2002
-+++ doc/texinfo/title.texi      Wed Dec 18 15:18:13 2002
+--- doc/mydns.texi.orig Fri Nov 15 10:30:48 2002
++++ doc/mydns.texi      Wed Dec 18 15:18:13 2002
 @@ -1,3 +1,7 @@
 +@dircategory Miscellaneous
 +@direntry
diff --git a/dns/mydns/pkg-plist b/dns/mydns/pkg-plist
index 93de748a7fba..6b5d1251db3e 100644
--- a/dns/mydns/pkg-plist
+++ b/dns/mydns/pkg-plist
@@ -1,23 +1,24 @@
+bin/mydns-conf
 bin/mydnscheck
 bin/mydnsexport
 bin/mydnsimport
+bin/mydnsptrconvert
 etc/mydns.conf.sample
 etc/rc.d/mydns.sh.sample
-@unexec install-info --delete %D/info/mydns.info %D/info/dir
-info/mydns.info
-@exec install-info %D/info/mydns.info %D/info/dir
 sbin/mydns
 share/locale/es/LC_MESSAGES/mydns.mo
 share/locale/fr/LC_MESSAGES/mydns.mo
 share/locale/pt_BR/LC_MESSAGES/mydns.mo
-%%PORTDOCS%%share/doc/mydns/AUTHORS
-%%PORTDOCS%%share/doc/mydns/COPYING
-%%PORTDOCS%%share/doc/mydns/ChangeLog
-%%PORTDOCS%%share/doc/mydns/NEWS
-%%PORTDOCS%%share/doc/mydns/QUICKSTART
-%%PORTDOCS%%share/doc/mydns/README
-%%PORTDOCS%%share/doc/mydns/TODO
-%%PORTDOCS%%share/doc/mydns/contrib/README
-%%PORTDOCS%%share/doc/mydns/contrib/admin.php
-%%PORTDOCS%%@dirrm share/doc/mydns/contrib
-%%PORTDOCS%%@dirrm share/doc/mydns
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/QUICKSTART.mysql
+%%PORTDOCS%%%%DOCSDIR%%/QUICKSTART.postgres
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/contrib/README
+%%PORTDOCS%%%%DOCSDIR%%/contrib/admin.php
+%%PORTDOCS%%%%DOCSDIR%%/contrib/stats.php
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/contrib
+%%PORTDOCS%%@dirrm %%DOCSDIR%%