aboutsummaryrefslogtreecommitdiff
path: root/dns/powerdns-devel
diff options
context:
space:
mode:
authorPav Lucistnik <pav@FreeBSD.org>2005-07-18 12:59:51 +0000
committerPav Lucistnik <pav@FreeBSD.org>2005-07-18 12:59:51 +0000
commit9d658f56fa7fa8f67c127b0f9fffa5941a44cebc (patch)
treee8cf786d0254d91efac7a565694a85bfe01f4732 /dns/powerdns-devel
parentecd685d3d657f3521b18d5107dffe948dc41c540 (diff)
downloadports-9d658f56fa7fa8f67c127b0f9fffa5941a44cebc.tar.gz
ports-9d658f56fa7fa8f67c127b0f9fffa5941a44cebc.zip
Notes
Diffstat (limited to 'dns/powerdns-devel')
-rw-r--r--dns/powerdns-devel/Makefile43
-rw-r--r--dns/powerdns-devel/distinfo4
-rw-r--r--dns/powerdns-devel/files/patch-configure11
-rw-r--r--dns/powerdns-devel/files/patch-modules_gmysqlbackend_Makefile_in11
-rw-r--r--dns/powerdns-devel/files/patch-modules_gpgsqlbackend_Makefile_in27
-rw-r--r--dns/powerdns-devel/files/patch-modules_gpgsqlbackend_OBJECTLIBS12
-rw-r--r--dns/powerdns-devel/files/patch-modules_gsqlitebackend_Makefile_in11
-rw-r--r--dns/powerdns-devel/files/patch-modules_gsqlitebackend_ssqlite_cc10
-rw-r--r--dns/powerdns-devel/files/patch-modules_pipebackend_Makefile_in11
-rw-r--r--dns/powerdns-devel/files/patch-pdns_backends_bind_bindbackend2_cc16
-rw-r--r--dns/powerdns-devel/files/patch-pdns_backends_bind_bindbackend2_hh39
-rw-r--r--dns/powerdns-devel/files/patch-pdns_backends_bind_bindbackend_cc16
-rw-r--r--dns/powerdns-devel/files/patch-pdns_backends_bind_bindbackend_hh39
-rw-r--r--dns/powerdns-devel/files/patch-pdns_logger_cc28
-rw-r--r--dns/powerdns-devel/files/patch-pdns_logger_hh11
-rw-r--r--dns/powerdns-devel/files/patch-pdns_pdns_recursor_cc29
-rw-r--r--dns/powerdns-devel/files/pdns.conf20
-rw-r--r--dns/powerdns-devel/files/pdns.sh.in35
-rw-r--r--dns/powerdns-devel/files/pdns.sh.sample31
-rw-r--r--dns/powerdns-devel/files/pdns_recursor.sh.in35
-rw-r--r--dns/powerdns-devel/files/pkg-message.in15
-rw-r--r--dns/powerdns-devel/pkg-plist5
22 files changed, 149 insertions, 310 deletions
diff --git a/dns/powerdns-devel/Makefile b/dns/powerdns-devel/Makefile
index b07dff8d1f2f..b98468facf87 100644
--- a/dns/powerdns-devel/Makefile
+++ b/dns/powerdns-devel/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= powerdns
-PORTVERSION= 2.9.17
+PORTVERSION= 2.9.18
CATEGORIES= dns ipv6
MASTER_SITES= http://downloads.powerdns.com/releases/
DISTNAME= pdns-${PORTVERSION}
@@ -14,10 +14,13 @@ DISTNAME= pdns-${PORTVERSION}
MAINTAINER= tremere@cainites.net
COMMENT= An advanced DNS server with SQL backend
+LIB_DEPENDS= boost_regex.2:${PORTSDIR}/devel/boost
+
USE_GMAKE= YES
USE_SUBMAKE= YES
USE_REINPLACE= YES
GNU_CONFIGURE= YES
+CXXFLAGS+= -I${PREFIX}/include
CONFIGURE_ARGS+= --with-modules="${CONFIGURE_MODULES} pipe" \
--with-dynmodules=""
# --enable-debug
@@ -27,11 +30,24 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
DISTNAME="${DISTNAME}" \
POWERDNS_OPTIONS="${POWERDNS_OPTIONS}"
MAN8= pdns_control.8 pdns_server.8 zone2sql.8
-STARTUP_SCRIPT= ${PREFIX}/etc/rc.d/pdns.sh.sample
-LIBMAP_CONF= /etc/libmap.conf
+
+SUB_FILES= pkg-message
.include <bsd.port.pre.mk>
+.if ${OSVERSION} >= 500037
+USE_RCORDER= pdns.sh
+RC_DIR= /etc/rc.d
+RC_SUFX=
+.else
+USE_RC_SUBR+= pdns.sh
+RC_DIR= ${PREFIX}/etc/rc.d
+RC_SUFX= .sh
+.endif
+
+PLIST_SUB+= RC_DIR=${RC_DIR} \
+ RC_SUFX=${RC_SUFX}
+
# use user config if possible
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
@@ -72,7 +88,7 @@ PLIST_SUB+= WITHLDAP="@comment "
.endif
.if defined(WITH_SQLITE)
-LIB_DEPENDS= sqlite.2:${PORTSDIR}/databases/sqlite2
+LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite2
CONFIGURE_ARGS+= --enable-sqlite
CONFIGURE_MODULES+= "gsqlite"
.else
@@ -80,6 +96,11 @@ CONFIGURE_ARGS+= --disable-sqlite
.endif
.if defined(POWERDNS_WITH_RECURSOR)
+.if ${OSVERSION} >= 500037
+USE_RCORDER+= pdns_recursor.sh
+.else
+USE_RC_SUBR+= pdns_recursor.sh
+.endif
CONFIGURE_ARGS+= --enable-recursor
PLIST_SUB+= RECURSOR=""
.else
@@ -91,15 +112,13 @@ PLIST_SUB+= RECURSOR="@comment "
UCONTEXT!= ${AWK} '/setcontext/ { print "YES" }' \
/usr/include/ucontext.h
.if ${UCONTEXT} == ""
-BROKEN= setcontext for recursor not found or FreeBSD version lower than 5.0
+BROKEN= "setcontext for recursor not found or FreeBSD version lower than 5.0"
.endif
.endif
.endif
-.if defined(POWERDNS_WITH_RECURSOR) || defined(WITH_LDAP)
.if ${OSVERSION} < 500039
-USE_GCC=3.2
-.endif
+USE_GCC=3.4
.endif
.if defined(NO_DESCRIBE)
@@ -136,12 +155,6 @@ post-install:
${INSTALL_DATA} ${FILESDIR}/$i ${EXAMPLESDIR}/
.endfor
.endif
-.if !exists(${STARTUP_SCRIPT})
- @${ECHO_MSG} "Installing ${STARTUP_SCRIPT} startup file."
- ${SED} -e "s=%%PREFIX%%=${PREFIX}=" \
- ${FILESDIR}/pdns.sh.sample \
- > ${WRKSRC}/pdns.sh.sample
- ${INSTALL_SCRIPT} ${WRKSRC}/pdns.sh.sample ${STARTUP_SCRIPT}
-.endif
+ @${CAT} ${PKGMESSAGE}
.include <bsd.port.post.mk>
diff --git a/dns/powerdns-devel/distinfo b/dns/powerdns-devel/distinfo
index aac7de4a572f..6e080451ab09 100644
--- a/dns/powerdns-devel/distinfo
+++ b/dns/powerdns-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (pdns-2.9.17.tar.gz) = 92489391182dc40012f1de7b2005ea93
-SIZE (pdns-2.9.17.tar.gz) = 782592
+MD5 (pdns-2.9.18.tar.gz) = bcfb0573311e80dbeff0bb16f2764363
+SIZE (pdns-2.9.18.tar.gz) = 825719
diff --git a/dns/powerdns-devel/files/patch-configure b/dns/powerdns-devel/files/patch-configure
deleted file mode 100644
index f4121d2c92d6..000000000000
--- a/dns/powerdns-devel/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig Mon Dec 16 22:45:46 2002
-+++ configure Mon Dec 16 22:45:59 2002
-@@ -10385,7 +10385,7 @@
- echo "$as_me:$LINENO: result: $PGSQL_incdir" >&5
- echo "${ECHO_T}$PGSQL_incdir" >&6
-
--# LIBS="$LIBS -lpq++ -lpq -lssl -lcrypt -lcrypto"
-+# LIBS="$LIBS -lpq++ -lpq -lssl -lcrypto"
- fi
-
-
diff --git a/dns/powerdns-devel/files/patch-modules_gmysqlbackend_Makefile_in b/dns/powerdns-devel/files/patch-modules_gmysqlbackend_Makefile_in
deleted file mode 100644
index dc74b8e00628..000000000000
--- a/dns/powerdns-devel/files/patch-modules_gmysqlbackend_Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/gmysqlbackend/Makefile.in.orig Tue Dec 17 10:38:38 2002
-+++ modules/gmysqlbackend/Makefile.in Tue Dec 17 10:38:39 2002
-@@ -181,7 +181,7 @@
- clean-libLTLIBRARIES:
- -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
- libgmysqlbackend.la: $(libgmysqlbackend_la_OBJECTS) $(libgmysqlbackend_la_DEPENDENCIES)
-- $(CXXLINK) -rpath $(libdir) $(libgmysqlbackend_la_LDFLAGS) $(libgmysqlbackend_la_OBJECTS) $(libgmysqlbackend_la_LIBADD) $(LIBS)
-+# $(CXXLINK) -rpath $(libdir) $(libgmysqlbackend_la_LDFLAGS) $(libgmysqlbackend_la_OBJECTS) $(libgmysqlbackend_la_LIBADD) $(LIBS)
-
- mostlyclean-compile:
- -rm -f *.$(OBJEXT) core *.core
diff --git a/dns/powerdns-devel/files/patch-modules_gpgsqlbackend_Makefile_in b/dns/powerdns-devel/files/patch-modules_gpgsqlbackend_Makefile_in
index a6342919d3fd..29b0dab57327 100644
--- a/dns/powerdns-devel/files/patch-modules_gpgsqlbackend_Makefile_in
+++ b/dns/powerdns-devel/files/patch-modules_gpgsqlbackend_Makefile_in
@@ -1,29 +1,28 @@
---- modules/gpgsqlbackend/Makefile.in.orig Mon Dec 16 22:32:29 2002
-+++ modules/gpgsqlbackend/Makefile.in Fri Dec 20 14:24:06 2002
-@@ -95,7 +95,7 @@
+--- modules/gpgsqlbackend/Makefile.in.orig Sat Jul 16 13:24:53 2005
++++ modules/gpgsqlbackend/Makefile.in Mon Jul 18 14:22:07 2005
+@@ -203,14 +203,14 @@
+ target_alias = @target_alias@
lib_LTLIBRARIES = libgpgsqlbackend.la
-
EXTRA_DIST = OBJECTFILES OBJECTLIBS
-INCLUDES = -I@PGSQL_incdir@
+INCLUDES = -I@includedir@ -I@PGSQL_incdir@
-
libgpgsqlbackend_la_SOURCES = gpgsqlbackend.cc gpgsqlbackend.hh \
spgsql.hh spgsql.cc
-@@ -105,7 +105,7 @@
- -Wl,-Bdynamic
+ libgpgsqlbackend_la_LDFLAGS = @PGSQL_lib@ -Wl,-Bstatic -lpq \
+ -Wl,-Bdynamic
-libgpgsqlbackend_la_LIBADD = -lssl -lcrypt -lcrypto
+libgpgsqlbackend_la_LIBADD = -lssl -lcrypto
- subdir = modules/gpgsqlbackend
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
-@@ -184,7 +184,7 @@
- clean-libLTLIBRARIES:
- -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ all: all-am
+
+ .SUFFIXES:
+@@ -272,7 +272,7 @@
+ rm -f "$${dir}/so_locations"; \
+ done
libgpgsqlbackend.la: $(libgpgsqlbackend_la_OBJECTS) $(libgpgsqlbackend_la_DEPENDENCIES)
- $(CXXLINK) -rpath $(libdir) $(libgpgsqlbackend_la_LDFLAGS) $(libgpgsqlbackend_la_OBJECTS) $(libgpgsqlbackend_la_LIBADD) $(LIBS)
+# $(CXXLINK) -rpath $(libdir) $(libgpgsqlbackend_la_LDFLAGS) $(libgpgsqlbackend_la_OBJECTS) $(libgpgsqlbackend_la_LIBADD) $(LIBS)
mostlyclean-compile:
- -rm -f *.$(OBJEXT) core *.core
+ -rm -f *.$(OBJEXT)
diff --git a/dns/powerdns-devel/files/patch-modules_gpgsqlbackend_OBJECTLIBS b/dns/powerdns-devel/files/patch-modules_gpgsqlbackend_OBJECTLIBS
index 200a917059a1..dd7c21f02974 100644
--- a/dns/powerdns-devel/files/patch-modules_gpgsqlbackend_OBJECTLIBS
+++ b/dns/powerdns-devel/files/patch-modules_gpgsqlbackend_OBJECTLIBS
@@ -1,5 +1,7 @@
---- modules/gpgsqlbackend/OBJECTLIBS.orig Tue Dec 17 08:35:41 2002
-+++ modules/gpgsqlbackend/OBJECTLIBS Tue Dec 17 08:35:50 2002
-@@ -1 +1 @@
---lpq++ -lpq -lssl -lcrypt -lcrypto
-+-lpq++ -lpq -lssl -lcrypto
+--- modules/gpgsqlbackend/OBJECTLIBS.orig Sat Apr 23 23:40:15 2005
++++ modules/gpgsqlbackend/OBJECTLIBS Mon Jul 18 14:21:17 2005
+@@ -1,3 +1,3 @@
+--lpq -lssl -lcrypto -lcrypt -lresolv -lnsl
++-lpq -lssl -lcrypto
+
+
diff --git a/dns/powerdns-devel/files/patch-modules_gsqlitebackend_Makefile_in b/dns/powerdns-devel/files/patch-modules_gsqlitebackend_Makefile_in
deleted file mode 100644
index 015400560a2b..000000000000
--- a/dns/powerdns-devel/files/patch-modules_gsqlitebackend_Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/gsqlitebackend/Makefile.in Fri Mar 5 09:59:34 2004
-+++ modules/gsqlitebackend/Makefile.in Fri Mar 5 10:00:54 2004
-@@ -193,7 +193,7 @@
- clean-libLTLIBRARIES:
- -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
- libgsqlitebackend.la: $(libgsqlitebackend_la_OBJECTS) $(libgsqlitebackend_la_DEPENDENCIES)
-- $(CXXLINK) -rpath $(libdir) $(libgsqlitebackend_la_LDFLAGS) $(libgsqlitebackend_la_OBJECTS) $(libgsqlitebackend_la_LIBADD) $(LIBS)
-+# $(CXXLINK) -rpath $(libdir) $(libgsqlitebackend_la_LDFLAGS) $(libgsqlitebackend_la_OBJECTS) $(libgsqlitebackend_la_LIBADD) $(LIBS)
-
- mostlyclean-compile:
- -rm -f *.$(OBJEXT) core *.core
diff --git a/dns/powerdns-devel/files/patch-modules_gsqlitebackend_ssqlite_cc b/dns/powerdns-devel/files/patch-modules_gsqlitebackend_ssqlite_cc
deleted file mode 100644
index 2a757b0714bb..000000000000
--- a/dns/powerdns-devel/files/patch-modules_gsqlitebackend_ssqlite_cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- modules/gsqlitebackend/ssqlite.cc Fri Mar 5 22:06:33 2004
-+++ modules/gsqlitebackend/ssqlite.cc Fri Mar 5 22:06:56 2004
-@@ -6,6 +6,7 @@
-
- #include "pdns/utility.hh"
- #include <string>
-+#include <unistd.h>
- #include "ssqlite.hh"
- #include <iostream>
-
diff --git a/dns/powerdns-devel/files/patch-modules_pipebackend_Makefile_in b/dns/powerdns-devel/files/patch-modules_pipebackend_Makefile_in
deleted file mode 100644
index c166925057b6..000000000000
--- a/dns/powerdns-devel/files/patch-modules_pipebackend_Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/pipebackend/Makefile.in.orig Tue Dec 17 09:39:14 2002
-+++ modules/pipebackend/Makefile.in Tue Dec 17 09:39:39 2002
-@@ -181,7 +181,7 @@
- clean-libLTLIBRARIES:
- -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
- libpipebackend.la: $(libpipebackend_la_OBJECTS) $(libpipebackend_la_DEPENDENCIES)
-- $(CXXLINK) -rpath $(libdir) $(libpipebackend_la_LDFLAGS) $(libpipebackend_la_OBJECTS) $(libpipebackend_la_LIBADD) $(LIBS)
-+# $(CXXLINK) -rpath $(libdir) $(libpipebackend_la_LDFLAGS) $(libpipebackend_la_OBJECTS) $(libpipebackend_la_LIBADD) $(LIBS)
-
- mostlyclean-compile:
- -rm -f *.$(OBJEXT) core *.core
diff --git a/dns/powerdns-devel/files/patch-pdns_backends_bind_bindbackend2_cc b/dns/powerdns-devel/files/patch-pdns_backends_bind_bindbackend2_cc
deleted file mode 100644
index 657994c5c919..000000000000
--- a/dns/powerdns-devel/files/patch-pdns_backends_bind_bindbackend2_cc
+++ /dev/null
@@ -1,16 +0,0 @@
---- pdns/backends/bind/bindbackend2.cc.orig Sat Oct 4 16:15:46 2003
-+++ pdns/backends/bind/bindbackend2.cc Mon Nov 17 20:54:19 2003
-@@ -61,11 +61,10 @@
- d_loaded=false;
- d_last_check=0;
- d_checknow=false;
-- d_rwlock=new pthread_rwlock_t;
- d_status="Seen in bind configuration";
- d_confcount=0;
-- // cout<<"Generated a new bbdomaininfo: "<<(void*)d_rwlock<<"/"<<getpid()<<endl;
-- pthread_rwlock_init(d_rwlock,0);
-+ // cout<<"Generated a new bbdomaininfo: "<<d_rwlock<<"/"<<getpid()<<endl;
-+ pthread_rwlock_init(&d_rwlock,0);
- }
-
- void BB2DomainInfo::setCheckInterval(time_t seconds)
diff --git a/dns/powerdns-devel/files/patch-pdns_backends_bind_bindbackend2_hh b/dns/powerdns-devel/files/patch-pdns_backends_bind_bindbackend2_hh
deleted file mode 100644
index a35c0411fa9a..000000000000
--- a/dns/powerdns-devel/files/patch-pdns_backends_bind_bindbackend2_hh
+++ /dev/null
@@ -1,39 +0,0 @@
---- pdns/backends/bind/bindbackend2.hh.orig Sun Sep 28 20:20:03 2003
-+++ pdns/backends/bind/bindbackend2.hh Mon Nov 17 20:54:19 2003
-@@ -58,21 +58,20 @@
-
- bool tryRLock()
- {
-- // cout<<"[trylock!] "<<(void*)d_rwlock<<"/"<<getpid()<<endl;
-- return pthread_rwlock_tryrdlock(d_rwlock)!=EBUSY;
-+ // cout<<"[trylock!] "<<d_rwlock<<"/"<<getpid()<<endl;
-+ return pthread_rwlock_tryrdlock(&d_rwlock)!=EBUSY;
- }
-
- void unlock()
- {
-- // cout<<"[unlock] "<<(void*)d_rwlock<<"/"<<getpid()<<endl;
-- pthread_rwlock_unlock(d_rwlock);
-+ // cout<<"[unlock] "<<d_rwlock<<"/"<<getpid()<<endl;
-+ pthread_rwlock_unlock(&d_rwlock);
- }
-
- void lock()
- {
-- //cout<<"[writelock!] "<<(void*)d_rwlock<<"/"<<getpid()<<endl;
--
-- pthread_rwlock_wrlock(d_rwlock);
-+ // cout<<"[writelock!] "<<d_rwlock<<"/"<<getpid()<<endl;
-+ pthread_rwlock_wrlock(&d_rwlock);
- }
-
- void setCheckInterval(time_t seconds);
-@@ -81,7 +80,7 @@
- time_t getCtime();
- time_t d_checkinterval;
- time_t d_lastcheck;
-- pthread_rwlock_t *d_rwlock;
-+ pthread_rwlock_t d_rwlock;
- };
-
-
diff --git a/dns/powerdns-devel/files/patch-pdns_backends_bind_bindbackend_cc b/dns/powerdns-devel/files/patch-pdns_backends_bind_bindbackend_cc
deleted file mode 100644
index 19f7cc671c2f..000000000000
--- a/dns/powerdns-devel/files/patch-pdns_backends_bind_bindbackend_cc
+++ /dev/null
@@ -1,16 +0,0 @@
---- pdns/backends/bind/bindbackend.cc.orig Sat Aug 23 16:35:35 2003
-+++ pdns/backends/bind/bindbackend.cc Mon Nov 17 20:54:19 2003
-@@ -58,11 +58,10 @@
- d_loaded=false;
- d_last_check=0;
- d_checknow=false;
-- d_rwlock=new pthread_rwlock_t;
- d_status="Seen in bind configuration";
- d_confcount=0;
-- //cout<<"Generated a new bbdomaininfo: "<<(void*)d_rwlock<<"/"<<getpid()<<endl;
-- pthread_rwlock_init(d_rwlock,0);
-+ //cout<<"Generated a new bbdomaininfo: "<<d_rwlock<<"/"<<getpid()<<endl;
-+ pthread_rwlock_init(&d_rwlock,0);
- }
-
- void BBDomainInfo::setCheckInterval(time_t seconds)
diff --git a/dns/powerdns-devel/files/patch-pdns_backends_bind_bindbackend_hh b/dns/powerdns-devel/files/patch-pdns_backends_bind_bindbackend_hh
deleted file mode 100644
index 0b9e828b9a38..000000000000
--- a/dns/powerdns-devel/files/patch-pdns_backends_bind_bindbackend_hh
+++ /dev/null
@@ -1,39 +0,0 @@
---- pdns/backends/bind/bindbackend.hh.orig Sat Aug 23 16:35:35 2003
-+++ pdns/backends/bind/bindbackend.hh Mon Nov 17 20:54:19 2003
-@@ -58,21 +58,20 @@
-
- bool tryRLock()
- {
-- // cout<<"[trylock!] "<<(void*)d_rwlock<<"/"<<getpid()<<endl;
-- return pthread_rwlock_tryrdlock(d_rwlock)!=EBUSY;
-+ // cout<<"[trylock!] "<<d_rwlock<<"/"<<getpid()<<endl;
-+ return pthread_rwlock_tryrdlock(&d_rwlock)!=EBUSY;
- }
-
- void unlock()
- {
-- // cout<<"[unlock] "<<(void*)d_rwlock<<"/"<<getpid()<<endl;
-- pthread_rwlock_unlock(d_rwlock);
-+ // cout<<"[unlock] "<<d_rwlock<<"/"<<getpid()<<endl;
-+ pthread_rwlock_unlock(&d_rwlock);
- }
-
- void lock()
- {
-- //cout<<"[writelock!] "<<(void*)d_rwlock<<"/"<<getpid()<<endl;
--
-- pthread_rwlock_wrlock(d_rwlock);
-+ // cout<<"[writelock!] "<<d_rwlock<<"/"<<getpid()<<endl;
-+ pthread_rwlock_wrlock(&d_rwlock);
- }
-
- void setCheckInterval(time_t seconds);
-@@ -80,7 +79,7 @@
- time_t getCtime();
- time_t d_checkinterval;
- time_t d_lastcheck;
-- pthread_rwlock_t *d_rwlock;
-+ pthread_rwlock_t d_rwlock;
- };
-
-
diff --git a/dns/powerdns-devel/files/patch-pdns_logger_cc b/dns/powerdns-devel/files/patch-pdns_logger_cc
deleted file mode 100644
index cc60d58b45f7..000000000000
--- a/dns/powerdns-devel/files/patch-pdns_logger_cc
+++ /dev/null
@@ -1,28 +0,0 @@
---- pdns/logger.cc.orig Fri Feb 11 12:49:28 2005
-+++ pdns/logger.cc Fri Feb 11 12:51:16 2005
-@@ -131,6 +131,25 @@
- return *this;
- }
-
-+Logger& Logger::operator<<(long i)
-+{
-+ ostringstream tmp;
-+ tmp<<i;
-+
-+ *this<<tmp.str();
-+
-+ return *this;
-+}
-+
-+Logger& Logger::operator<<(unsigned long i)
-+{
-+ ostringstream tmp;
-+ tmp<<i;
-+
-+ *this<<tmp.str();
-+
-+ return *this;
-+}
-
- Logger& Logger::operator<<(ostream & (&)(ostream &))
- {
diff --git a/dns/powerdns-devel/files/patch-pdns_logger_hh b/dns/powerdns-devel/files/patch-pdns_logger_hh
deleted file mode 100644
index 239e45f23376..000000000000
--- a/dns/powerdns-devel/files/patch-pdns_logger_hh
+++ /dev/null
@@ -1,11 +0,0 @@
---- pdns/logger.hh.orig Sat Jan 29 12:51:20 2005
-+++ pdns/logger.hh Sat Jan 29 12:52:22 2005
-@@ -111,6 +111,8 @@
- Logger& operator<<(const string &s); //!< log a string
- Logger& operator<<(int); //!< log an int
- Logger& operator<<(unsigned int); //!< log an unsigned int
-+ Logger& operator<<(long); //!< log a long
-+ Logger& operator<<(unsigned long); //!< log an unsigned long
- Logger& operator<<(Urgency); //!< set the urgency, << style
-
- #ifndef WIN32
diff --git a/dns/powerdns-devel/files/patch-pdns_pdns_recursor_cc b/dns/powerdns-devel/files/patch-pdns_pdns_recursor_cc
deleted file mode 100644
index ebc3dfa3df96..000000000000
--- a/dns/powerdns-devel/files/patch-pdns_pdns_recursor_cc
+++ /dev/null
@@ -1,29 +0,0 @@
---- pdns/pdns_recursor.cc.orig Wed Jan 12 15:30:19 2005
-+++ pdns/pdns_recursor.cc Wed Jan 12 15:31:01 2005
-@@ -39,7 +39,7 @@
- #include <fstream>
- #include "recursor_cache.hh"
-
--#ifdef FreeBSD // see cvstrac ticket #26
-+#ifdef __FreeBSD__ // see cvstrac ticket #26
- #include <pthread.h>
- #include <semaphore.h>
- #endif
-@@ -48,7 +48,8 @@
-
- string s_programname="pdns_recursor";
-
--#if !WIN32 && !FreeBSD
-+#ifndef WIN32
-+#ifndef __FreeBSD__
- extern "C" {
- int sem_init(sem_t*, int, unsigned int){return 0;}
- int sem_wait(sem_t*){return 0;}
-@@ -61,6 +62,7 @@
- int pthread_mutex_unlock(pthread_mutex_t *mutex) { return 0; }
-
- }
-+#endif // __FreeBSD__
- #endif // WIN32
-
- StatBag S;
diff --git a/dns/powerdns-devel/files/pdns.conf b/dns/powerdns-devel/files/pdns.conf
index d97daffd5507..8a9074387d69 100644
--- a/dns/powerdns-devel/files/pdns.conf
+++ b/dns/powerdns-devel/files/pdns.conf
@@ -34,12 +34,12 @@
#################################
# chroot If set, chroot to this directory for more security
#
-chroot=/var/empty
+# chroot=
#################################
# config-dir Location of configuration directory (pdns.conf)
#
-# config-dir=/etc
+# config-dir=/usr/local/etc
#################################
# config-name Name of this virtual configuration - will rename the binary image
@@ -54,12 +54,12 @@ chroot=/var/empty
#################################
# daemon Operate as a daemon
#
-daemon=yes
+# daemon=no
#################################
# default-soa-name name to insert in the SOA record if none set in the backend
#
-# default-soa-name=ns.example.com
+# default-soa-name=a.misconfigured.powerdns.server
#################################
# disable-axfr Disable zonetransfers but do allow TCP queries
@@ -69,7 +69,7 @@ daemon=yes
#################################
# disable-tcp Do not listen to TCP queries
#
-disable-tcp=no
+# disable-tcp=no
#################################
# distributor-threads Default number of Distributor (backend) threads to start
@@ -84,7 +84,7 @@ disable-tcp=no
#################################
# guardian Run within a guardian process
#
-guardian=yes
+# guardian=no
#################################
# launch Which backends to launch and order to query them in
@@ -234,7 +234,7 @@ guardian=yes
#################################
# smtpredirector Our smtpredir MX host
#
-smtpredirector=voodoo.codeninja.nl
+# smtpredirector=a.misconfigured.powerdns.smtp.server
#################################
# soa-minimum-ttl Default SOA mininum ttl
@@ -269,12 +269,12 @@ smtpredirector=voodoo.codeninja.nl
#################################
# webserver Start a webserver for monitoring
#
-webserver=yes
+# webserver=no
#################################
# webserver-address IP Address of webserver to listen on
#
-webserver-address=127.0.0.1
+# webserver-address=127.0.0.1
#################################
# webserver-password Password required for accessing the webserver
@@ -284,7 +284,7 @@ webserver-address=127.0.0.1
#################################
# webserver-port Port of webserver to listen on
#
-webserver-port=8081
+# webserver-port=8081
#################################
# webserver-print-arguments If the webserver should print arguments
diff --git a/dns/powerdns-devel/files/pdns.sh.in b/dns/powerdns-devel/files/pdns.sh.in
new file mode 100644
index 000000000000..372ef7707693
--- /dev/null
+++ b/dns/powerdns-devel/files/pdns.sh.in
@@ -0,0 +1,35 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: pdns_server
+# REQUIRE: DAEMON
+# KEYWORD: FreeBSD shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable dovecot:
+#
+#pdns_enable="YES"
+#
+# See pdns_server(8) for flags.
+#
+
+. %%RC_SUBR%%
+
+name=pdns
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/sbin/pdns_server
+
+# set defaults
+
+pdns_enable=${pdns_enable:-"NO"}
+pdns_conf=${pdns_conf:-"%%PREFIX%%/etc/pdns.conf"}
+pdns_flags=${pdns_flags:-""}
+
+load_rc_config ${name}
+
+required_files=${pdns_conf}
+
+run_rc_command "$1"
diff --git a/dns/powerdns-devel/files/pdns.sh.sample b/dns/powerdns-devel/files/pdns.sh.sample
deleted file mode 100644
index b5899e363ee1..000000000000
--- a/dns/powerdns-devel/files/pdns.sh.sample
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-rc_file=${0##*/}
-
-PREFIX=%%PREFIX%%
-
-pdns=${PREFIX}/sbin/pdns_server
-pdnscontrol=${PREFIX}/bin/pdns_control
-pdnsrecursor=${PREFIX}/sbin/pdns_recursor
-recursorpid=/var/run/pdns_recursor.pid
-
-# start
-if [ "x$1" = "x" -o "x$1" = "xstart" ]; then
- if [ -f $pdns ]; then
- echo -n ' PowerDNS'
- if [ -f $pdnsrecursor ]; then
- rm $recursorpid >/dev/null 2>&1
- $pdnsrecursor >/dev/null 2>&1
- fi
- $pdns
- fi
-
-# stop
-elif [ "x$1" = "xstop" ]; then
- if [ -f $pdnscontrol ]; then
- $pdnscontrol quit
- fi
- if [ -r $recursorpid ]; then
- kill `cat $recursorpid` >/dev/null
- fi
-fi
diff --git a/dns/powerdns-devel/files/pdns_recursor.sh.in b/dns/powerdns-devel/files/pdns_recursor.sh.in
new file mode 100644
index 000000000000..006f16e21a12
--- /dev/null
+++ b/dns/powerdns-devel/files/pdns_recursor.sh.in
@@ -0,0 +1,35 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: pdns_recursor
+# REQUIRE: DAEMON
+# KEYWORD: FreeBSD shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable dovecot:
+#
+#pdns_recursor_enable="YES"
+#
+# See http://rtfm.powerdns.com for flags.
+#
+
+. %%RC_SUBR%%
+
+name=pdns_recursor
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/sbin/pdns_recursor
+
+# set defaults
+
+pdns_recursor_enable=${pdns_recursor_enable:-"NO"}
+pdns_recursor_conf=${pdns_recursor_conf:-"%%PREFIX%%/etc/recursor.conf"}
+pdns_recursor_flags=${pdns_recursor_flags:-""}
+
+load_rc_config ${name}
+
+required_files=${pdns_recursor_conf}
+
+run_rc_command "$1"
diff --git a/dns/powerdns-devel/files/pkg-message.in b/dns/powerdns-devel/files/pkg-message.in
new file mode 100644
index 000000000000..bb7595598837
--- /dev/null
+++ b/dns/powerdns-devel/files/pkg-message.in
@@ -0,0 +1,15 @@
+
+*******************************************************************
+ Enable powerdns in /etc/rc.conf with the following line:
+
+ pdns_enable="YES"
+
+ If you want to use the powerdns recursor,
+ you need the following additional line in /etc/rc.conf
+
+ pdns_recursor_enable="YES"
+
+ Configuration templates are available in %%PREFIX%%/etc
+ as pdns.conf-dist.
+*******************************************************************
+
diff --git a/dns/powerdns-devel/pkg-plist b/dns/powerdns-devel/pkg-plist
index 0925e1bcea29..0493279fc7f6 100644
--- a/dns/powerdns-devel/pkg-plist
+++ b/dns/powerdns-devel/pkg-plist
@@ -7,10 +7,13 @@ sbin/pdns_server
%%WITHLDAP%%lib/libldapbackend.a
%%WITHLDAP%%@exec ln -fs libldapbackend.so.0 %D/lib/libldapbackend.so
%%WITHLDAP%%@unexec rm -f %D/lib/libldapbackend.so
+lib/libpipebackend.so.0
+lib/libpipebackend.so
+lib/libpipebackend.la
+lib/libpipebackend.a
%%RECURSOR%%sbin/pdns_recursor
@unexec if cmp -s %D/etc/pdns.conf %D/etc/pdns.conf-dist; then rm -f %D/etc/pdns.conf; fi
etc/pdns.conf-dist
-etc/rc.d/pdns.sh.sample
@exec [ -f %B/pdns.conf ] || cp %B/%f %B/pdns.conf
%%PORTDOCS%%share/examples/powerdns/pdns.conf
%%PORTDOCS%%share/examples/powerdns/pdns_mysql.sql