10 files changed, 112 insertions, 102 deletions

diff --git a/dns/mydns-ng/Makefile b/dns/mydns-ng/Makefile
index 99b8a72ed4ce..08632baf7e6f 100644
--- a/dns/mydns-ng/Makefile
+++ b/dns/mydns-ng/Makefile
@@ -6,14 +6,12 @@
 #
 
 PORTNAME=	mydns
-PORTVERSION=	0.9.3
+PORTVERSION=	0.9.5
 CATEGORIES=	net databases
 MASTER_SITES=	http://mydns.bboy.net/download/
 
 MAINTAINER=	simond@irrelevant.org
 
-LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-confdir=${PREFIX}/etc --without-libiconv-prefix
 USE_BZIP2=	yes
@@ -26,6 +24,14 @@ DOCS=	AUTHORS COPYING ChangeLog NEWS QUICKSTART README TODO
 
 .include <bsd.port.pre.mk>
 
+.if defined (WITH_PGSQL)
+LIB_DEPENDS=	pq.2:${PORTSDIR}/databases/postgresql7
+CONFIGURE_ARGS+=	--without-mysql
+.else
+LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
+CONFIGURE_ARGS+=	--without-pgsql
+.endif
+
 .if !defined(NOPORTDOCS)
 USE_PERL5=	yes
 .else
@@ -34,6 +40,9 @@ pre-configure:
 		${WRKSRC}/doc/Makefile.in
 .endif
 
+post-build:
+	cd ${WRKSRC}/doc && ${MAKE} html
+
 post-install:
 	@${SED} 's|%%%PREFIX%%%|${PREFIX}|g' < ${FILESDIR}/mydns.sh > ${WRKSRC}/mydns.sh
 	@${INSTALL_SCRIPT} ${WRKSRC}/mydns.sh ${PREFIX}/etc/rc.d/mydns.sh.sample
diff --git a/dns/mydns-ng/distinfo b/dns/mydns-ng/distinfo
index 63869ab5bc17..e3e50e5600c6 100644
--- a/dns/mydns-ng/distinfo
+++ b/dns/mydns-ng/distinfo
@@ -1 +1 @@
-MD5 (mydns-0.9.3.tar.bz2) = fc980c4fef68f3b20d697b0996b8bfeb
+MD5 (mydns-0.9.5.tar.bz2) = 4ccda8cc76efed7125223c3bca24c075
diff --git a/dns/mydns-ng/files/patch-Makefile.in b/dns/mydns-ng/files/patch-Makefile.in
index 5553c90a1d8c..0148045df6db 100644
--- a/dns/mydns-ng/files/patch-Makefile.in
+++ b/dns/mydns-ng/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Mon Jul 29 21:37:45 2002
-+++ Makefile.in	Mon Jul 29 21:38:30 2002
-@@ -440,7 +440,6 @@
+--- Makefile.in.orig	Wed Dec 18 15:16:33 2002
++++ Makefile.in	Wed Dec 18 15:16:43 2002
+@@ -529,7 +529,6 @@
  
  install-data-am:
  	@$(NORMAL_INSTALL)
diff --git a/dns/mydns-ng/files/patch-title.texi b/dns/mydns-ng/files/patch-title.texi
index e0d3ee8ec73c..54a256163f45 100644
--- a/dns/mydns-ng/files/patch-title.texi
+++ b/dns/mydns-ng/files/patch-title.texi
@@ -1,11 +1,10 @@
---- doc/texi/title.texi.orig	Sat Sep 21 10:25:27 2002
-+++ doc/texi/title.texi	Sat Sep 21 10:26:04 2002
-@@ -1,3 +1,8 @@
+--- doc/texi/en/title.texi.orig	Fri Nov 15 10:30:48 2002
++++ doc/texi/en/title.texi	Wed Dec 18 15:18:13 2002
+@@ -1,3 +1,7 @@
 +@dircategory Miscellaneous
 +@direntry
 +* mydns: (mydns).               The MySQL based DNS-server.
 +@end direntry
-+
+ 
  @ifinfo
- This is the manual for MyDNS (version @value{PKGVERSION}, @value{PKGDATE}), a MySQL-based DNS server package.
- @value{PKGCOPYRIGHT}
+ This is the manual for MyDNS (version @value{PKGVERSION}, @value{PKGDATE}),
diff --git a/dns/mydns-ng/pkg-plist b/dns/mydns-ng/pkg-plist
index 6e07fc23a167..cb071b949cdc 100644
--- a/dns/mydns-ng/pkg-plist
+++ b/dns/mydns-ng/pkg-plist
@@ -19,44 +19,41 @@ sbin/mydns
 %%PORTDOCS%%share/doc/mydns/TODO
 %%PORTDOCS%%share/doc/mydns/contrib/README
 %%PORTDOCS%%share/doc/mydns/contrib/admin.php
-%%PORTDOCS%%share/doc/mydns/html/mydns.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_1.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_10.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_11.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_12.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_13.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_14.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_15.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_16.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_17.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_18.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_19.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_2.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_20.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_21.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_22.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_23.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_24.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_25.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_26.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_27.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_28.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_29.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_3.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_30.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_31.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_32.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_33.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_34.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_4.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_5.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_6.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_7.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_8.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_9.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_abt.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_ovr.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_toc.html
+%%PORTDOCS%%share/doc/mydns/html/Building-the-source.html
+%%PORTDOCS%%share/doc/mydns/html/Cache-options.html
+%%PORTDOCS%%share/doc/mydns/html/Caching.html
+%%PORTDOCS%%share/doc/mydns/html/Configuration.html
+%%PORTDOCS%%share/doc/mydns/html/Creating-mydns.conf.html
+%%PORTDOCS%%share/doc/mydns/html/Database-options.html
+%%PORTDOCS%%share/doc/mydns/html/Database.html
+%%PORTDOCS%%share/doc/mydns/html/GNU-Free-Documentation-License.html
+%%PORTDOCS%%share/doc/mydns/html/General-options.html
+%%PORTDOCS%%share/doc/mydns/html/Index.html
+%%PORTDOCS%%share/doc/mydns/html/Installation.html
+%%PORTDOCS%%share/doc/mydns/html/Introduction.html
+%%PORTDOCS%%share/doc/mydns/html/Load-balancing.html
+%%PORTDOCS%%share/doc/mydns/html/Misc-options.html
+%%PORTDOCS%%share/doc/mydns/html/Optional-columns.html
+%%PORTDOCS%%share/doc/mydns/html/Preparing-the-database.html
+%%PORTDOCS%%share/doc/mydns/html/RFC-1034.html
+%%PORTDOCS%%share/doc/mydns/html/References.html
+%%PORTDOCS%%share/doc/mydns/html/Round-robin.html
+%%PORTDOCS%%share/doc/mydns/html/Server.html
+%%PORTDOCS%%share/doc/mydns/html/Signals.html
+%%PORTDOCS%%share/doc/mydns/html/TCP-support.html
+%%PORTDOCS%%share/doc/mydns/html/Troubleshooting.html
+%%PORTDOCS%%share/doc/mydns/html/Utilities.html
+%%PORTDOCS%%share/doc/mydns/html/Zone-transfers.html
+%%PORTDOCS%%share/doc/mydns/html/any.active.html
+%%PORTDOCS%%share/doc/mydns/html/in-addr.arpa.html
+%%PORTDOCS%%share/doc/mydns/html/index.html
+%%PORTDOCS%%share/doc/mydns/html/mydnscheck.html
+%%PORTDOCS%%share/doc/mydns/html/mydnsexport.html
+%%PORTDOCS%%share/doc/mydns/html/mydnsimport.html
+%%PORTDOCS%%share/doc/mydns/html/ptr-table.html
+%%PORTDOCS%%share/doc/mydns/html/rr-table.html
+%%PORTDOCS%%share/doc/mydns/html/soa-table.html
+%%PORTDOCS%%share/doc/mydns/html/soa.xfer.html
 %%PORTDOCS%%@dirrm share/doc/mydns/html
 %%PORTDOCS%%@dirrm share/doc/mydns/contrib
 %%PORTDOCS%%@dirrm share/doc/mydns
diff --git a/dns/mydns/Makefile b/dns/mydns/Makefile
index 99b8a72ed4ce..08632baf7e6f 100644
--- a/dns/mydns/Makefile
+++ b/dns/mydns/Makefile
@@ -6,14 +6,12 @@
 #
 
 PORTNAME=	mydns
-PORTVERSION=	0.9.3
+PORTVERSION=	0.9.5
 CATEGORIES=	net databases
 MASTER_SITES=	http://mydns.bboy.net/download/
 
 MAINTAINER=	simond@irrelevant.org
 
-LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-confdir=${PREFIX}/etc --without-libiconv-prefix
 USE_BZIP2=	yes
@@ -26,6 +24,14 @@ DOCS=	AUTHORS COPYING ChangeLog NEWS QUICKSTART README TODO
 
 .include <bsd.port.pre.mk>
 
+.if defined (WITH_PGSQL)
+LIB_DEPENDS=	pq.2:${PORTSDIR}/databases/postgresql7
+CONFIGURE_ARGS+=	--without-mysql
+.else
+LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
+CONFIGURE_ARGS+=	--without-pgsql
+.endif
+
 .if !defined(NOPORTDOCS)
 USE_PERL5=	yes
 .else
@@ -34,6 +40,9 @@ pre-configure:
 		${WRKSRC}/doc/Makefile.in
 .endif
 
+post-build:
+	cd ${WRKSRC}/doc && ${MAKE} html
+
 post-install:
 	@${SED} 's|%%%PREFIX%%%|${PREFIX}|g' < ${FILESDIR}/mydns.sh > ${WRKSRC}/mydns.sh
 	@${INSTALL_SCRIPT} ${WRKSRC}/mydns.sh ${PREFIX}/etc/rc.d/mydns.sh.sample
diff --git a/dns/mydns/distinfo b/dns/mydns/distinfo
index 63869ab5bc17..e3e50e5600c6 100644
--- a/dns/mydns/distinfo
+++ b/dns/mydns/distinfo
@@ -1 +1 @@
-MD5 (mydns-0.9.3.tar.bz2) = fc980c4fef68f3b20d697b0996b8bfeb
+MD5 (mydns-0.9.5.tar.bz2) = 4ccda8cc76efed7125223c3bca24c075
diff --git a/dns/mydns/files/patch-Makefile.in b/dns/mydns/files/patch-Makefile.in
index 5553c90a1d8c..0148045df6db 100644
--- a/dns/mydns/files/patch-Makefile.in
+++ b/dns/mydns/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Mon Jul 29 21:37:45 2002
-+++ Makefile.in	Mon Jul 29 21:38:30 2002
-@@ -440,7 +440,6 @@
+--- Makefile.in.orig	Wed Dec 18 15:16:33 2002
++++ Makefile.in	Wed Dec 18 15:16:43 2002
+@@ -529,7 +529,6 @@
  
  install-data-am:
  	@$(NORMAL_INSTALL)
diff --git a/dns/mydns/files/patch-title.texi b/dns/mydns/files/patch-title.texi
index e0d3ee8ec73c..54a256163f45 100644
--- a/dns/mydns/files/patch-title.texi
+++ b/dns/mydns/files/patch-title.texi
@@ -1,11 +1,10 @@
---- doc/texi/title.texi.orig	Sat Sep 21 10:25:27 2002
-+++ doc/texi/title.texi	Sat Sep 21 10:26:04 2002
-@@ -1,3 +1,8 @@
+--- doc/texi/en/title.texi.orig	Fri Nov 15 10:30:48 2002
++++ doc/texi/en/title.texi	Wed Dec 18 15:18:13 2002
+@@ -1,3 +1,7 @@
 +@dircategory Miscellaneous
 +@direntry
 +* mydns: (mydns).               The MySQL based DNS-server.
 +@end direntry
-+
+ 
  @ifinfo
- This is the manual for MyDNS (version @value{PKGVERSION}, @value{PKGDATE}), a MySQL-based DNS server package.
- @value{PKGCOPYRIGHT}
+ This is the manual for MyDNS (version @value{PKGVERSION}, @value{PKGDATE}),
diff --git a/dns/mydns/pkg-plist b/dns/mydns/pkg-plist
index 6e07fc23a167..cb071b949cdc 100644
--- a/dns/mydns/pkg-plist
+++ b/dns/mydns/pkg-plist
@@ -19,44 +19,41 @@ sbin/mydns
 %%PORTDOCS%%share/doc/mydns/TODO
 %%PORTDOCS%%share/doc/mydns/contrib/README
 %%PORTDOCS%%share/doc/mydns/contrib/admin.php
-%%PORTDOCS%%share/doc/mydns/html/mydns.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_1.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_10.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_11.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_12.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_13.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_14.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_15.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_16.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_17.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_18.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_19.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_2.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_20.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_21.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_22.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_23.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_24.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_25.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_26.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_27.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_28.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_29.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_3.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_30.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_31.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_32.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_33.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_34.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_4.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_5.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_6.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_7.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_8.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_9.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_abt.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_ovr.html
-%%PORTDOCS%%share/doc/mydns/html/mydns_toc.html
+%%PORTDOCS%%share/doc/mydns/html/Building-the-source.html
+%%PORTDOCS%%share/doc/mydns/html/Cache-options.html
+%%PORTDOCS%%share/doc/mydns/html/Caching.html
+%%PORTDOCS%%share/doc/mydns/html/Configuration.html
+%%PORTDOCS%%share/doc/mydns/html/Creating-mydns.conf.html
+%%PORTDOCS%%share/doc/mydns/html/Database-options.html
+%%PORTDOCS%%share/doc/mydns/html/Database.html
+%%PORTDOCS%%share/doc/mydns/html/GNU-Free-Documentation-License.html
+%%PORTDOCS%%share/doc/mydns/html/General-options.html
+%%PORTDOCS%%share/doc/mydns/html/Index.html
+%%PORTDOCS%%share/doc/mydns/html/Installation.html
+%%PORTDOCS%%share/doc/mydns/html/Introduction.html
+%%PORTDOCS%%share/doc/mydns/html/Load-balancing.html
+%%PORTDOCS%%share/doc/mydns/html/Misc-options.html
+%%PORTDOCS%%share/doc/mydns/html/Optional-columns.html
+%%PORTDOCS%%share/doc/mydns/html/Preparing-the-database.html
+%%PORTDOCS%%share/doc/mydns/html/RFC-1034.html
+%%PORTDOCS%%share/doc/mydns/html/References.html
+%%PORTDOCS%%share/doc/mydns/html/Round-robin.html
+%%PORTDOCS%%share/doc/mydns/html/Server.html
+%%PORTDOCS%%share/doc/mydns/html/Signals.html
+%%PORTDOCS%%share/doc/mydns/html/TCP-support.html
+%%PORTDOCS%%share/doc/mydns/html/Troubleshooting.html
+%%PORTDOCS%%share/doc/mydns/html/Utilities.html
+%%PORTDOCS%%share/doc/mydns/html/Zone-transfers.html
+%%PORTDOCS%%share/doc/mydns/html/any.active.html
+%%PORTDOCS%%share/doc/mydns/html/in-addr.arpa.html
+%%PORTDOCS%%share/doc/mydns/html/index.html
+%%PORTDOCS%%share/doc/mydns/html/mydnscheck.html
+%%PORTDOCS%%share/doc/mydns/html/mydnsexport.html
+%%PORTDOCS%%share/doc/mydns/html/mydnsimport.html
+%%PORTDOCS%%share/doc/mydns/html/ptr-table.html
+%%PORTDOCS%%share/doc/mydns/html/rr-table.html
+%%PORTDOCS%%share/doc/mydns/html/soa-table.html
+%%PORTDOCS%%share/doc/mydns/html/soa.xfer.html
 %%PORTDOCS%%@dirrm share/doc/mydns/html
 %%PORTDOCS%%@dirrm share/doc/mydns/contrib
 %%PORTDOCS%%@dirrm share/doc/mydns