Index: head/dns/powerdns/Makefile =================================================================== --- head/dns/powerdns/Makefile (revision 126474) +++ head/dns/powerdns/Makefile (revision 126475) @@ -1,148 +1,147 @@ # New ports collection makefile for: powerdns # Date Created: 14.Jan 2003 # Whom: dirk.meyer@dinoex.sub.org # # $FreeBSD$ # PORTNAME= powerdns -PORTVERSION= 2.9.16 -PORTREVISION= 7 +PORTVERSION= 2.9.17 CATEGORIES= dns ipv6 MASTER_SITES= http://downloads.powerdns.com/releases/ DISTNAME= pdns-${PORTVERSION} MAINTAINER= tremere@cainites.net 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 SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ CURDIR2="${.CURDIR}" \ MKDIR="${MKDIR}" \ 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 # 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" CFLAGS+= -DDLLIMPORT="" .else CONFIGURE_ARGS+= --disable-pgsql .endif .if defined(WITH_MYSQL_DRIVER) USE_MYSQL?= YES CONFIGURE_ARGS+= --enable-mysql CONFIGURE_MODULES+= "gmysql" .else CONFIGURE_ARGS+= --disable-mysql .endif .if defined(WITH_LDAP) USE_OPENLDAP?= YES USE_LIBTOOL_VER= 13 INSTALLS_SHLIB= YES CONFIGURE_MODULES+= "ldap" PLIST_SUB+= WITHLDAP="" .else PLIST_SUB+= WITHLDAP="@comment " .endif .if defined(WITH_SQLITE) LIB_DEPENDS= sqlite.2:${PORTSDIR}/databases/sqlite2 CONFIGURE_ARGS+= --enable-sqlite CONFIGURE_MODULES+= "gsqlite" .else CONFIGURE_ARGS+= --disable-sqlite .endif .if defined(POWERDNS_WITH_RECURSOR) CONFIGURE_ARGS+= --enable-recursor PLIST_SUB+= RECURSOR="" .else PLIST_SUB+= RECURSOR="@comment " .endif .include .if defined(POWERDNS_WITH_RECURSOR) .if exists(/usr/include/ucontext.h) && ${OSVERSION} >= 500000 UCONTEXT!= ${AWK} '/setcontext/ { print "YES" }' \ /usr/include/ucontext.h .if ${UCONTEXT} == "" 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 .endif .if defined(NO_DESCRIBE) describe: .if defined(BATCH) @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${FILESDIR}/configure.powerdns .endif @cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} BATCH=yes ${.TARGET} .endif pre-everything:: @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${FILESDIR}/configure.powerdns post-clean: @ ${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc .if defined(WITH_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 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 pdns_sqlite.sql ${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 .include Property changes on: head/dns/powerdns/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.36 \ No newline at end of property +1.37 \ No newline at end of property Index: head/dns/powerdns/distinfo =================================================================== --- head/dns/powerdns/distinfo (revision 126474) +++ head/dns/powerdns/distinfo (revision 126475) @@ -1,2 +1,2 @@ -MD5 (pdns-2.9.16.tar.gz) = 7e9a859a5a21996dbf7b31cd61731dbc -SIZE (pdns-2.9.16.tar.gz) = 767977 +MD5 (pdns-2.9.17.tar.gz) = 92489391182dc40012f1de7b2005ea93 +SIZE (pdns-2.9.17.tar.gz) = 782592 Property changes on: head/dns/powerdns/distinfo ___________________________________________________________________ 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/files/patch-pdns_pdns_recursor_cc =================================================================== --- head/dns/powerdns/files/patch-pdns_pdns_recursor_cc (revision 126474) +++ head/dns/powerdns/files/patch-pdns_pdns_recursor_cc (revision 126475) @@ -1,33 +1,29 @@ ---- pdns/pdns_recursor.cc.orig Tue Nov 16 21:21:59 2004 -+++ pdns/pdns_recursor.cc Tue Nov 16 21:22:31 2004 -@@ -22,6 +22,8 @@ - #include - #include - #include -+#include -+#include - #ifndef WIN32 - #include - #endif // WIN32 -@@ -42,21 +44,6 @@ - MemRecursorCache RC; +--- 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 + #include "recursor_cache.hh" +-#ifdef FreeBSD // see cvstrac ticket #26 ++#ifdef __FreeBSD__ // see cvstrac ticket #26 + #include + #include + #endif +@@ -48,7 +48,8 @@ + string s_programname="pdns_recursor"; -- --#ifndef WIN32 --extern "C" { -- int sem_init(sem_t*, int, unsigned int){return 0;} -- int sem_wait(sem_t*){return 0;} -- int sem_trywait(sem_t*){return 0;} -- int sem_post(sem_t*){return 0;} -- int sem_getvalue(sem_t*, int*){return 0;} -- pthread_t pthread_self(void){return (pthread_t) 0;} -- int pthread_mutex_init(pthread_mutex_t *mutex, const pthread_mutexattr_t *mutexattr){ return 0; } -- int pthread_mutex_lock(pthread_mutex_t *mutex){ return 0; } -- int pthread_mutex_unlock(pthread_mutex_t *mutex) { return 0; } -- --} --#endif // WIN32 +-#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; - ArgvMap &arg() Property changes on: head/dns/powerdns/files/patch-pdns_pdns_recursor_cc ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/dns/powerdns-devel/Makefile =================================================================== --- head/dns/powerdns-devel/Makefile (revision 126474) +++ head/dns/powerdns-devel/Makefile (revision 126475) @@ -1,148 +1,147 @@ # New ports collection makefile for: powerdns # Date Created: 14.Jan 2003 # Whom: dirk.meyer@dinoex.sub.org # # $FreeBSD$ # PORTNAME= powerdns -PORTVERSION= 2.9.16 -PORTREVISION= 7 +PORTVERSION= 2.9.17 CATEGORIES= dns ipv6 MASTER_SITES= http://downloads.powerdns.com/releases/ DISTNAME= pdns-${PORTVERSION} MAINTAINER= tremere@cainites.net 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 SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ CURDIR2="${.CURDIR}" \ MKDIR="${MKDIR}" \ 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 # 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" CFLAGS+= -DDLLIMPORT="" .else CONFIGURE_ARGS+= --disable-pgsql .endif .if defined(WITH_MYSQL_DRIVER) USE_MYSQL?= YES CONFIGURE_ARGS+= --enable-mysql CONFIGURE_MODULES+= "gmysql" .else CONFIGURE_ARGS+= --disable-mysql .endif .if defined(WITH_LDAP) USE_OPENLDAP?= YES USE_LIBTOOL_VER= 13 INSTALLS_SHLIB= YES CONFIGURE_MODULES+= "ldap" PLIST_SUB+= WITHLDAP="" .else PLIST_SUB+= WITHLDAP="@comment " .endif .if defined(WITH_SQLITE) LIB_DEPENDS= sqlite.2:${PORTSDIR}/databases/sqlite2 CONFIGURE_ARGS+= --enable-sqlite CONFIGURE_MODULES+= "gsqlite" .else CONFIGURE_ARGS+= --disable-sqlite .endif .if defined(POWERDNS_WITH_RECURSOR) CONFIGURE_ARGS+= --enable-recursor PLIST_SUB+= RECURSOR="" .else PLIST_SUB+= RECURSOR="@comment " .endif .include .if defined(POWERDNS_WITH_RECURSOR) .if exists(/usr/include/ucontext.h) && ${OSVERSION} >= 500000 UCONTEXT!= ${AWK} '/setcontext/ { print "YES" }' \ /usr/include/ucontext.h .if ${UCONTEXT} == "" 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 .endif .if defined(NO_DESCRIBE) describe: .if defined(BATCH) @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${FILESDIR}/configure.powerdns .endif @cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} BATCH=yes ${.TARGET} .endif pre-everything:: @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${FILESDIR}/configure.powerdns post-clean: @ ${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc .if defined(WITH_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 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 pdns_sqlite.sql ${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 .include Property changes on: head/dns/powerdns-devel/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.36 \ No newline at end of property +1.37 \ No newline at end of property Index: head/dns/powerdns-devel/distinfo =================================================================== --- head/dns/powerdns-devel/distinfo (revision 126474) +++ head/dns/powerdns-devel/distinfo (revision 126475) @@ -1,2 +1,2 @@ -MD5 (pdns-2.9.16.tar.gz) = 7e9a859a5a21996dbf7b31cd61731dbc -SIZE (pdns-2.9.16.tar.gz) = 767977 +MD5 (pdns-2.9.17.tar.gz) = 92489391182dc40012f1de7b2005ea93 +SIZE (pdns-2.9.17.tar.gz) = 782592 Property changes on: head/dns/powerdns-devel/distinfo ___________________________________________________________________ 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/files/patch-pdns_pdns_recursor_cc =================================================================== --- head/dns/powerdns-devel/files/patch-pdns_pdns_recursor_cc (revision 126474) +++ head/dns/powerdns-devel/files/patch-pdns_pdns_recursor_cc (revision 126475) @@ -1,33 +1,29 @@ ---- pdns/pdns_recursor.cc.orig Tue Nov 16 21:21:59 2004 -+++ pdns/pdns_recursor.cc Tue Nov 16 21:22:31 2004 -@@ -22,6 +22,8 @@ - #include - #include - #include -+#include -+#include - #ifndef WIN32 - #include - #endif // WIN32 -@@ -42,21 +44,6 @@ - MemRecursorCache RC; +--- 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 + #include "recursor_cache.hh" +-#ifdef FreeBSD // see cvstrac ticket #26 ++#ifdef __FreeBSD__ // see cvstrac ticket #26 + #include + #include + #endif +@@ -48,7 +48,8 @@ + string s_programname="pdns_recursor"; -- --#ifndef WIN32 --extern "C" { -- int sem_init(sem_t*, int, unsigned int){return 0;} -- int sem_wait(sem_t*){return 0;} -- int sem_trywait(sem_t*){return 0;} -- int sem_post(sem_t*){return 0;} -- int sem_getvalue(sem_t*, int*){return 0;} -- pthread_t pthread_self(void){return (pthread_t) 0;} -- int pthread_mutex_init(pthread_mutex_t *mutex, const pthread_mutexattr_t *mutexattr){ return 0; } -- int pthread_mutex_lock(pthread_mutex_t *mutex){ return 0; } -- int pthread_mutex_unlock(pthread_mutex_t *mutex) { return 0; } -- --} --#endif // WIN32 +-#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; - ArgvMap &arg() Property changes on: head/dns/powerdns-devel/files/patch-pdns_pdns_recursor_cc ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property