4 files changed, 12 insertions, 52 deletions

diff --git a/dns/powerdns-devel/Makefile b/dns/powerdns-devel/Makefile
index 4e66263a38e1..8c0d04534a39 100644
--- a/dns/powerdns-devel/Makefile
+++ b/dns/powerdns-devel/Makefile
@@ -6,19 +6,20 @@
 #
 
 PORTNAME=	powerdns
-PORTVERSION=	3.0.${SNAPSHOT}
+PORTVERSION=	2.9.22.${SNAPSHOT}
+PORTEPOCH=	1
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://svn.powerdns.com/snapshots/${REVISION}/
 PKGNAMESUFFIX=	-devel
-DISTNAME=	pdns-${PORTVERSION:S/.${SNAPSHOT}//}-svn.${SNAPSHOT}.${REVISION}
+DISTNAME=	pdns-${PORTVERSION:S/.${SNAPSHOT}//}-snapshot.${SNAPSHOT}.${REVISION}
 
 MAINTAINER=	tremere@cainites.net
 COMMENT=	An advanced DNS server with multiple backends including SQL
 
 BUILD_DEPENDS=	bjam:${PORTSDIR}/devel/boost
 
-SNAPSHOT=	20080625
-REVISION=	1227
+SNAPSHOT=	20080804
+REVISION=	1251
 
 CONFLICTS=	powerdns-[0-2]*
 
@@ -120,6 +121,7 @@ SUB_LIST+=	SLAPD=
 .	endif
 .else
 PLIST_SUB+=		WITHOPENLDAP="@comment "
+SUB_LIST+=		SLAPD=
 .endif
 
 .if defined(WITH_SQLITE)
@@ -147,10 +149,6 @@ CXXFLAGS+=		-L${LOCALBASE}/lib
 PLIST_SUB+=		WITHOPENDBX="@comment "
 .endif
 
-.if ${OSVERSION} < 500039
-USE_GCC=3.4
-.endif
-
 .if defined(WITH_OPENLDAP)
 post-patch:
 	${REINPLACE_CMD} -e 's;-I. ;-I. -I${LOCALBASE}/include ;' \
@@ -165,7 +163,7 @@ post-install:
 .if !exists(${PREFIX}/etc/pdns/pdns.conf)
 	${INSTALL_DATA} ${PREFIX}/etc/pdns/pdns.conf-dist ${PREFIX}/etc/pdns/pdns.conf
 .endif
-.if !defined(NOPORTDOCS)
+.if !defined(NOPORTEXAMPLES)
 	${MKDIR} ${EXAMPLESDIR}
 .for i in pdns.conf
 	${INSTALL_DATA} ${FILESDIR}/$i ${EXAMPLESDIR}/
diff --git a/dns/powerdns-devel/distinfo b/dns/powerdns-devel/distinfo
index af8e99ec617d..8d6cb339121f 100644
--- a/dns/powerdns-devel/distinfo
+++ b/dns/powerdns-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (pdns-3.0-svn.20080625.1227.tar.gz) = 1406a47d529fccef585d81cac1b84167
-SHA256 (pdns-3.0-svn.20080625.1227.tar.gz) = 19017caae0d29bb03c6c301b1b055d2458e4eacf0c2f5d6341505d623bddacb6
-SIZE (pdns-3.0-svn.20080625.1227.tar.gz) = 1043351
+MD5 (pdns-2.9.22-snapshot.20080804.1251.tar.gz) = ece9e77f76e145eec1bcf9a9de420533
+SHA256 (pdns-2.9.22-snapshot.20080804.1251.tar.gz) = 3c335ea5a25b4ec51c7b5336a306b260773538e8cbcf34dd88f6050e25c1d804
+SIZE (pdns-2.9.22-snapshot.20080804.1251.tar.gz) = 1053103
diff --git a/dns/powerdns-devel/files/pdns.in b/dns/powerdns-devel/files/pdns.in
deleted file mode 100644
index af54e0564ec4..000000000000
--- a/dns/powerdns-devel/files/pdns.in
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/dns/powerdns-devel/files/Attic/pdns.in,v 1.4 2007-02-07 04:04:45 alepulver Exp $
-#
-
-# PROVIDE: pdns_server
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable powerdns:
-#
-#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/pdns.conf"}
-pdns_flags=${pdns_flags:-""}
-
-load_rc_config ${name}
-
-required_files=${pdns_conf}
-
-monitor_cmd="${command} --daemon=no --guardian=no --control-console --loglevel=9"
-extra_commands="monitor"
-
-run_rc_command "$1"
diff --git a/dns/powerdns-devel/pkg-plist b/dns/powerdns-devel/pkg-plist
index 0c9e42c37fef..5defeccb8457 100644
--- a/dns/powerdns-devel/pkg-plist
+++ b/dns/powerdns-devel/pkg-plist
@@ -37,6 +37,6 @@ lib/libpipebackend.so.0
 @unexec if cmp -s %D/etc/pdns/pdns.conf %D/etc/pdns/pdns.conf-dist; then rm -f %D/etc/pdns/pdns.conf; fi
 etc/pdns/pdns.conf-dist
 @exec [ -f %B/pdns.conf ] || cp %B/%f %B/pdns.conf
-%%PORTDOCS%%%%EXAMPLESDIR%%/pdns.conf
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pdns.conf
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrmtry etc/pdns