Index: head/dns/powerdns/Makefile
===================================================================
--- head/dns/powerdns/Makefile	(revision 85583)
+++ head/dns/powerdns/Makefile	(revision 85584)
@@ -1,110 +1,109 @@
 # New ports collection makefile for:	powerdns
 # Date Created:				14.Jan 2003
 # Whom:					dirk.meyer@dinoex.sub.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=	powerdns
-PORTVERSION=	2.9.8
-PORTREVISION=	1
+PORTVERSION=	2.9.10
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://downloads.powerdns.com/releases/
 DISTNAME=	pdns-${PORTVERSION}
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	An advanced DNS server with SQL backend
 
 USE_GMAKE=	YES
 USE_SUBMAKE=	YES
 USE_REINPLACE=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=	--with-modules="${CONFIGURE_MODULES} pipe" \
 			--with-dynmodules=""
 #			--enable-debug
 
 # use user config if possible
 .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
 .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
 .else
 .if defined(BATCH)
 # default package, can be configured in /etc/make.conf
 POWERDNS_OPTIONS?=	\"PostgreSQL\"
 .endif
 # make INDEX match
 NO_DESCRIBE=yes
 .endif
 
 .if defined(WITH_POSTGRESQL_DRIVER) && !defined(WITHOUT_POSTGRESQL_DRIVER)
 LIB_DEPENDS=	pq[+][+].4:${PORTSDIR}/databases/postgresql-libpq++
 CONFIGURE_ARGS+=	--enable-pgsql
 CONFIGURE_MODULES+=	"gpgsql"
 .else
 CONFIGURE_ARGS+=	--disable-pgsql
 .endif
 
 .if defined(WITH_MYSQL_DRIVER)
 LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 CONFIGURE_ARGS+=	--enable-mysql
 CONFIGURE_MODULES+=	"gmysql"
 .else
 CONFIGURE_ARGS+=	--disable-mysql
 .endif
 
 SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
 		CURDIR2="${.CURDIR}" \
 		MKDIR="${MKDIR}" \
 		DISTNAME="${DISTNAME}" \
 		POWERDNS_OPTIONS="${POWERDNS_OPTIONS}"
 
 MAN8=		pdns_control.8 pdns_server.8 zone2sql.8
 
 pre-everything::
 	@ ${SETENV} ${SCRIPTS_ENV} ${SH} ${FILESDIR}/configure.powerdns
 
 post-install:
 .if !exists(${PREFIX}/etc/pdns.conf)
 	${INSTALL_DATA} ${PREFIX}/etc/pdns.conf-dist ${PREFIX}/etc/pdns.conf
 .endif
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${EXAMPLESDIR}
 .for i in pdns.conf pdns_mysql.sql pdns_postgresql.sql
 	${INSTALL_DATA} ${FILESDIR}/$i ${EXAMPLESDIR}/
 .endfor
 .endif
 
 post-clean:
 	@ ${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
 
 .if defined(NO_DESCRIBE)
 describe:
 .if defined(BATCH)
 	@ ${SETENV} ${SCRIPTS_ENV} ${SH} ${FILESDIR}/configure.powerdns
 .endif
 	@cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} BATCH=yes ${.TARGET}
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500043 && defined(WITH_LDAP)
 LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20
 LIB_DEPENDS+=	lber.2:${PORTSDIR}/net/openldap20
 CONFIGURE_MODULES+=	"ldap"
 
 post-patch:
 	${REINPLACE_CMD} -e 's;-I. ;-I. -I${LOCALBASE}/include ;' \
 		-e 's;la_LDFLAGS =;la_LDFLAGS = -L${LOCALBASE}/lib;' \
 		${WRKSRC}/modules/ldapbackend/Makefile.in
 	${REINPLACE_CMD} -e 's;@LIBDL@;@LIBDL@ -L${LOCALBASE}/lib;' \
 		-e 's;@modulelibs@;@modulelibs@ -llber;' \
 		${WRKSRC}/pdns/Makefile.in
 .endif
 
-.if defined(POWERDNS_WITH_RECURSOR)
+.if ${OSVERSION} >= 500000 && defined(POWERDNS_WITH_RECURSOR)
 CONFIGURE_ARGS+=	--enable-recursor
 PLIST_SUB+=		RECURSOR=""
 .else
 PLIST_SUB+=		RECURSOR="@comment "
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/dns/powerdns/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.9
\ No newline at end of property
+1.10
\ No newline at end of property
Index: head/dns/powerdns/distinfo
===================================================================
--- head/dns/powerdns/distinfo	(revision 85583)
+++ head/dns/powerdns/distinfo	(revision 85584)
@@ -1 +1 @@
-MD5 (pdns-2.9.8.tar.gz) = fdd443276f50520efbe2e2b608499a11
+MD5 (pdns-2.9.10.tar.gz) = a91f15c90f6551fb817cb708e29d5a37

Property changes on: head/dns/powerdns/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/dns/powerdns/files/patch-modules_ldapbackend_powerldap.cc
===================================================================
--- head/dns/powerdns/files/patch-modules_ldapbackend_powerldap.cc	(revision 85583)
+++ head/dns/powerdns/files/patch-modules_ldapbackend_powerldap.cc	(nonexistent)
@@ -1,12 +0,0 @@
-*** modules/ldapbackend/powerldap.cc.orig	Thu Mar 13 20:49:23 2003
---- modules/ldapbackend/powerldap.cc	Thu Mar 13 20:49:46 2003
-***************
-*** 3,9 ****
-  
-  #include <map>
-  #include <vector>
-- // #include <crypt.h>
-  #include <exception>
-  #include <stdexcept>
-  #include <string>
---- 3,8 ----

Property changes on: head/dns/powerdns/files/patch-modules_ldapbackend_powerldap.cc
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/dns/powerdns/files/patch-pdns_pdns_recursor.cc
===================================================================
--- head/dns/powerdns/files/patch-pdns_pdns_recursor.cc	(nonexistent)
+++ head/dns/powerdns/files/patch-pdns_pdns_recursor.cc	(revision 85584)
@@ -0,0 +1,48 @@
+--- pdns/pdns_recursor.cc.orig	Thu Jul  3 10:30:03 2003
++++ pdns/pdns_recursor.cc	Thu Jul 10 16:45:27 2003
+@@ -35,6 +35,10 @@
+ #include "statbag.hh"
+ #include "arguments.hh"
+ #include "syncres.hh"
++#include <fcntl.h>
++#include <fstream>
++
++string s_programname="pdns_recursor";
+ 
+ #ifndef WIN32
+ extern "C" {
+@@ -129,6 +133,17 @@
+   cache[toLower(qname)+"|"+qt.getName()]=content;
+ }
+ 
++static void writePid(void)
++{
++  string fname=arg()["socket-dir"]+"/"+s_programname+".pid";
++  ofstream of(fname.c_str());
++  if(of)
++    of<<getpid()<<endl;
++  else
++    L<<Logger::Error<<"Requested to write pid for "<<getpid()<<" to "<<fname<<"
++failed: "<<strerror(errno)<<endl;
++}
++
+ void init(void)
+ {
+   // prime root cache
+@@ -394,6 +409,7 @@
+     arg().set("daemon","Operate as a daemon")="yes";
+     arg().set("quiet","Suppress logging of questions and answers")="off";
+     arg().set("config-dir","Location of configuration directory (recursor.conf)")=SYSCONFDIR;
++    arg().set("socket-dir","Where the controlsocket will live")=LOCALSTATEDIR;
+     arg().setCmd("help","Provide a helpful message");
+     L.toConsole(Logger::Warning);
+     arg().laxParse(argc,argv); // do a lax parse
+@@ -433,6 +449,8 @@
+       daemonize();
+     }
+     signal(SIGUSR1,usr1Handler);
++
++    writePid();
+ #endif
+ 
+     vector<TCPConnection> tcpconnections;

Property changes on: head/dns/powerdns/files/patch-pdns_pdns_recursor.cc
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/dns/powerdns-devel/Makefile
===================================================================
--- head/dns/powerdns-devel/Makefile	(revision 85583)
+++ head/dns/powerdns-devel/Makefile	(revision 85584)
@@ -1,110 +1,109 @@
 # New ports collection makefile for:	powerdns
 # Date Created:				14.Jan 2003
 # Whom:					dirk.meyer@dinoex.sub.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=	powerdns
-PORTVERSION=	2.9.8
-PORTREVISION=	1
+PORTVERSION=	2.9.10
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://downloads.powerdns.com/releases/
 DISTNAME=	pdns-${PORTVERSION}
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	An advanced DNS server with SQL backend
 
 USE_GMAKE=	YES
 USE_SUBMAKE=	YES
 USE_REINPLACE=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=	--with-modules="${CONFIGURE_MODULES} pipe" \
 			--with-dynmodules=""
 #			--enable-debug
 
 # use user config if possible
 .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
 .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
 .else
 .if defined(BATCH)
 # default package, can be configured in /etc/make.conf
 POWERDNS_OPTIONS?=	\"PostgreSQL\"
 .endif
 # make INDEX match
 NO_DESCRIBE=yes
 .endif
 
 .if defined(WITH_POSTGRESQL_DRIVER) && !defined(WITHOUT_POSTGRESQL_DRIVER)
 LIB_DEPENDS=	pq[+][+].4:${PORTSDIR}/databases/postgresql-libpq++
 CONFIGURE_ARGS+=	--enable-pgsql
 CONFIGURE_MODULES+=	"gpgsql"
 .else
 CONFIGURE_ARGS+=	--disable-pgsql
 .endif
 
 .if defined(WITH_MYSQL_DRIVER)
 LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 CONFIGURE_ARGS+=	--enable-mysql
 CONFIGURE_MODULES+=	"gmysql"
 .else
 CONFIGURE_ARGS+=	--disable-mysql
 .endif
 
 SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
 		CURDIR2="${.CURDIR}" \
 		MKDIR="${MKDIR}" \
 		DISTNAME="${DISTNAME}" \
 		POWERDNS_OPTIONS="${POWERDNS_OPTIONS}"
 
 MAN8=		pdns_control.8 pdns_server.8 zone2sql.8
 
 pre-everything::
 	@ ${SETENV} ${SCRIPTS_ENV} ${SH} ${FILESDIR}/configure.powerdns
 
 post-install:
 .if !exists(${PREFIX}/etc/pdns.conf)
 	${INSTALL_DATA} ${PREFIX}/etc/pdns.conf-dist ${PREFIX}/etc/pdns.conf
 .endif
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${EXAMPLESDIR}
 .for i in pdns.conf pdns_mysql.sql pdns_postgresql.sql
 	${INSTALL_DATA} ${FILESDIR}/$i ${EXAMPLESDIR}/
 .endfor
 .endif
 
 post-clean:
 	@ ${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
 
 .if defined(NO_DESCRIBE)
 describe:
 .if defined(BATCH)
 	@ ${SETENV} ${SCRIPTS_ENV} ${SH} ${FILESDIR}/configure.powerdns
 .endif
 	@cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} BATCH=yes ${.TARGET}
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500043 && defined(WITH_LDAP)
 LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20
 LIB_DEPENDS+=	lber.2:${PORTSDIR}/net/openldap20
 CONFIGURE_MODULES+=	"ldap"
 
 post-patch:
 	${REINPLACE_CMD} -e 's;-I. ;-I. -I${LOCALBASE}/include ;' \
 		-e 's;la_LDFLAGS =;la_LDFLAGS = -L${LOCALBASE}/lib;' \
 		${WRKSRC}/modules/ldapbackend/Makefile.in
 	${REINPLACE_CMD} -e 's;@LIBDL@;@LIBDL@ -L${LOCALBASE}/lib;' \
 		-e 's;@modulelibs@;@modulelibs@ -llber;' \
 		${WRKSRC}/pdns/Makefile.in
 .endif
 
-.if defined(POWERDNS_WITH_RECURSOR)
+.if ${OSVERSION} >= 500000 && defined(POWERDNS_WITH_RECURSOR)
 CONFIGURE_ARGS+=	--enable-recursor
 PLIST_SUB+=		RECURSOR=""
 .else
 PLIST_SUB+=		RECURSOR="@comment "
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/dns/powerdns-devel/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.9
\ No newline at end of property
+1.10
\ No newline at end of property
Index: head/dns/powerdns-devel/distinfo
===================================================================
--- head/dns/powerdns-devel/distinfo	(revision 85583)
+++ head/dns/powerdns-devel/distinfo	(revision 85584)
@@ -1 +1 @@
-MD5 (pdns-2.9.8.tar.gz) = fdd443276f50520efbe2e2b608499a11
+MD5 (pdns-2.9.10.tar.gz) = a91f15c90f6551fb817cb708e29d5a37

Property changes on: head/dns/powerdns-devel/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/dns/powerdns-devel/files/patch-modules_ldapbackend_powerldap.cc
===================================================================
--- head/dns/powerdns-devel/files/patch-modules_ldapbackend_powerldap.cc	(revision 85583)
+++ head/dns/powerdns-devel/files/patch-modules_ldapbackend_powerldap.cc	(nonexistent)
@@ -1,12 +0,0 @@
-*** modules/ldapbackend/powerldap.cc.orig	Thu Mar 13 20:49:23 2003
---- modules/ldapbackend/powerldap.cc	Thu Mar 13 20:49:46 2003
-***************
-*** 3,9 ****
-  
-  #include <map>
-  #include <vector>
-- // #include <crypt.h>
-  #include <exception>
-  #include <stdexcept>
-  #include <string>
---- 3,8 ----

Property changes on: head/dns/powerdns-devel/files/patch-modules_ldapbackend_powerldap.cc
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/dns/powerdns-devel/files/patch-pdns_pdns_recursor.cc
===================================================================
--- head/dns/powerdns-devel/files/patch-pdns_pdns_recursor.cc	(nonexistent)
+++ head/dns/powerdns-devel/files/patch-pdns_pdns_recursor.cc	(revision 85584)
@@ -0,0 +1,48 @@
+--- pdns/pdns_recursor.cc.orig	Thu Jul  3 10:30:03 2003
++++ pdns/pdns_recursor.cc	Thu Jul 10 16:45:27 2003
+@@ -35,6 +35,10 @@
+ #include "statbag.hh"
+ #include "arguments.hh"
+ #include "syncres.hh"
++#include <fcntl.h>
++#include <fstream>
++
++string s_programname="pdns_recursor";
+ 
+ #ifndef WIN32
+ extern "C" {
+@@ -129,6 +133,17 @@
+   cache[toLower(qname)+"|"+qt.getName()]=content;
+ }
+ 
++static void writePid(void)
++{
++  string fname=arg()["socket-dir"]+"/"+s_programname+".pid";
++  ofstream of(fname.c_str());
++  if(of)
++    of<<getpid()<<endl;
++  else
++    L<<Logger::Error<<"Requested to write pid for "<<getpid()<<" to "<<fname<<"
++failed: "<<strerror(errno)<<endl;
++}
++
+ void init(void)
+ {
+   // prime root cache
+@@ -394,6 +409,7 @@
+     arg().set("daemon","Operate as a daemon")="yes";
+     arg().set("quiet","Suppress logging of questions and answers")="off";
+     arg().set("config-dir","Location of configuration directory (recursor.conf)")=SYSCONFDIR;
++    arg().set("socket-dir","Where the controlsocket will live")=LOCALSTATEDIR;
+     arg().setCmd("help","Provide a helpful message");
+     L.toConsole(Logger::Warning);
+     arg().laxParse(argc,argv); // do a lax parse
+@@ -433,6 +449,8 @@
+       daemonize();
+     }
+     signal(SIGUSR1,usr1Handler);
++
++    writePid();
+ #endif
+ 
+     vector<TCPConnection> tcpconnections;

Property changes on: head/dns/powerdns-devel/files/patch-pdns_pdns_recursor.cc
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/net/powerdns/Makefile
===================================================================
--- head/net/powerdns/Makefile	(revision 85583)
+++ head/net/powerdns/Makefile	(revision 85584)
@@ -1,110 +1,109 @@
 # New ports collection makefile for:	powerdns
 # Date Created:				14.Jan 2003
 # Whom:					dirk.meyer@dinoex.sub.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=	powerdns
-PORTVERSION=	2.9.8
-PORTREVISION=	1
+PORTVERSION=	2.9.10
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://downloads.powerdns.com/releases/
 DISTNAME=	pdns-${PORTVERSION}
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	An advanced DNS server with SQL backend
 
 USE_GMAKE=	YES
 USE_SUBMAKE=	YES
 USE_REINPLACE=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=	--with-modules="${CONFIGURE_MODULES} pipe" \
 			--with-dynmodules=""
 #			--enable-debug
 
 # use user config if possible
 .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
 .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
 .else
 .if defined(BATCH)
 # default package, can be configured in /etc/make.conf
 POWERDNS_OPTIONS?=	\"PostgreSQL\"
 .endif
 # make INDEX match
 NO_DESCRIBE=yes
 .endif
 
 .if defined(WITH_POSTGRESQL_DRIVER) && !defined(WITHOUT_POSTGRESQL_DRIVER)
 LIB_DEPENDS=	pq[+][+].4:${PORTSDIR}/databases/postgresql-libpq++
 CONFIGURE_ARGS+=	--enable-pgsql
 CONFIGURE_MODULES+=	"gpgsql"
 .else
 CONFIGURE_ARGS+=	--disable-pgsql
 .endif
 
 .if defined(WITH_MYSQL_DRIVER)
 LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 CONFIGURE_ARGS+=	--enable-mysql
 CONFIGURE_MODULES+=	"gmysql"
 .else
 CONFIGURE_ARGS+=	--disable-mysql
 .endif
 
 SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
 		CURDIR2="${.CURDIR}" \
 		MKDIR="${MKDIR}" \
 		DISTNAME="${DISTNAME}" \
 		POWERDNS_OPTIONS="${POWERDNS_OPTIONS}"
 
 MAN8=		pdns_control.8 pdns_server.8 zone2sql.8
 
 pre-everything::
 	@ ${SETENV} ${SCRIPTS_ENV} ${SH} ${FILESDIR}/configure.powerdns
 
 post-install:
 .if !exists(${PREFIX}/etc/pdns.conf)
 	${INSTALL_DATA} ${PREFIX}/etc/pdns.conf-dist ${PREFIX}/etc/pdns.conf
 .endif
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${EXAMPLESDIR}
 .for i in pdns.conf pdns_mysql.sql pdns_postgresql.sql
 	${INSTALL_DATA} ${FILESDIR}/$i ${EXAMPLESDIR}/
 .endfor
 .endif
 
 post-clean:
 	@ ${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
 
 .if defined(NO_DESCRIBE)
 describe:
 .if defined(BATCH)
 	@ ${SETENV} ${SCRIPTS_ENV} ${SH} ${FILESDIR}/configure.powerdns
 .endif
 	@cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} BATCH=yes ${.TARGET}
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500043 && defined(WITH_LDAP)
 LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20
 LIB_DEPENDS+=	lber.2:${PORTSDIR}/net/openldap20
 CONFIGURE_MODULES+=	"ldap"
 
 post-patch:
 	${REINPLACE_CMD} -e 's;-I. ;-I. -I${LOCALBASE}/include ;' \
 		-e 's;la_LDFLAGS =;la_LDFLAGS = -L${LOCALBASE}/lib;' \
 		${WRKSRC}/modules/ldapbackend/Makefile.in
 	${REINPLACE_CMD} -e 's;@LIBDL@;@LIBDL@ -L${LOCALBASE}/lib;' \
 		-e 's;@modulelibs@;@modulelibs@ -llber;' \
 		${WRKSRC}/pdns/Makefile.in
 .endif
 
-.if defined(POWERDNS_WITH_RECURSOR)
+.if ${OSVERSION} >= 500000 && defined(POWERDNS_WITH_RECURSOR)
 CONFIGURE_ARGS+=	--enable-recursor
 PLIST_SUB+=		RECURSOR=""
 .else
 PLIST_SUB+=		RECURSOR="@comment "
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/net/powerdns/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.9
\ No newline at end of property
+1.10
\ No newline at end of property
Index: head/net/powerdns/distinfo
===================================================================
--- head/net/powerdns/distinfo	(revision 85583)
+++ head/net/powerdns/distinfo	(revision 85584)
@@ -1 +1 @@
-MD5 (pdns-2.9.8.tar.gz) = fdd443276f50520efbe2e2b608499a11
+MD5 (pdns-2.9.10.tar.gz) = a91f15c90f6551fb817cb708e29d5a37

Property changes on: head/net/powerdns/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/net/powerdns/files/patch-modules_ldapbackend_powerldap.cc
===================================================================
--- head/net/powerdns/files/patch-modules_ldapbackend_powerldap.cc	(revision 85583)
+++ head/net/powerdns/files/patch-modules_ldapbackend_powerldap.cc	(nonexistent)
@@ -1,12 +0,0 @@
-*** modules/ldapbackend/powerldap.cc.orig	Thu Mar 13 20:49:23 2003
---- modules/ldapbackend/powerldap.cc	Thu Mar 13 20:49:46 2003
-***************
-*** 3,9 ****
-  
-  #include <map>
-  #include <vector>
-- // #include <crypt.h>
-  #include <exception>
-  #include <stdexcept>
-  #include <string>
---- 3,8 ----

Property changes on: head/net/powerdns/files/patch-modules_ldapbackend_powerldap.cc
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/net/powerdns/files/patch-pdns_pdns_recursor.cc
===================================================================
--- head/net/powerdns/files/patch-pdns_pdns_recursor.cc	(nonexistent)
+++ head/net/powerdns/files/patch-pdns_pdns_recursor.cc	(revision 85584)
@@ -0,0 +1,48 @@
+--- pdns/pdns_recursor.cc.orig	Thu Jul  3 10:30:03 2003
++++ pdns/pdns_recursor.cc	Thu Jul 10 16:45:27 2003
+@@ -35,6 +35,10 @@
+ #include "statbag.hh"
+ #include "arguments.hh"
+ #include "syncres.hh"
++#include <fcntl.h>
++#include <fstream>
++
++string s_programname="pdns_recursor";
+ 
+ #ifndef WIN32
+ extern "C" {
+@@ -129,6 +133,17 @@
+   cache[toLower(qname)+"|"+qt.getName()]=content;
+ }
+ 
++static void writePid(void)
++{
++  string fname=arg()["socket-dir"]+"/"+s_programname+".pid";
++  ofstream of(fname.c_str());
++  if(of)
++    of<<getpid()<<endl;
++  else
++    L<<Logger::Error<<"Requested to write pid for "<<getpid()<<" to "<<fname<<"
++failed: "<<strerror(errno)<<endl;
++}
++
+ void init(void)
+ {
+   // prime root cache
+@@ -394,6 +409,7 @@
+     arg().set("daemon","Operate as a daemon")="yes";
+     arg().set("quiet","Suppress logging of questions and answers")="off";
+     arg().set("config-dir","Location of configuration directory (recursor.conf)")=SYSCONFDIR;
++    arg().set("socket-dir","Where the controlsocket will live")=LOCALSTATEDIR;
+     arg().setCmd("help","Provide a helpful message");
+     L.toConsole(Logger::Warning);
+     arg().laxParse(argc,argv); // do a lax parse
+@@ -433,6 +449,8 @@
+       daemonize();
+     }
+     signal(SIGUSR1,usr1Handler);
++
++    writePid();
+ #endif
+ 
+     vector<TCPConnection> tcpconnections;

Property changes on: head/net/powerdns/files/patch-pdns_pdns_recursor.cc
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property