Date: Sun, 30 Oct 2005 13:29:06 +0100 (CET) From: Ralf van der Enden <tremere@cainites.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/88231: Update to version 2.9.19 Message-ID: <20051030122906.7A07EF2@mail.cainites.net> Resent-Message-ID: <200510301230.j9UCUJY3021926@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 88231 >Category: ports >Synopsis: Update to version 2.9.19 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Oct 30 12:30:19 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Ralf van der Enden >Release: FreeBSD 5.4-RELEASE-p8 i386 >Organization: >Environment: System: FreeBSD lan.cainites.net 5.4-RELEASE-p8 FreeBSD 5.4-RELEASE-p8 #8: Wed Oct 12 09:15:08 CEST 2005 <tremere@cainites.net>@lan.cainites.net:/usr/obj/usr/src/sys/HELLKERNEL i386 >Description: - Update to version 2.9.19 - Some cosmetic changes to the portfiles >How-To-Repeat: >Fix: --- pdns-2.9.19.diff begins here --- diff -ruN powerdns.org/Makefile powerdns/Makefile --- powerdns.org/Makefile Sun Oct 30 11:15:08 2005 +++ powerdns/Makefile Sun Oct 30 12:45:05 2005 @@ -6,7 +6,7 @@ # PORTNAME= powerdns -PORTVERSION= 2.9.18 +PORTVERSION= 2.9.19 CATEGORIES= dns ipv6 MASTER_SITES= http://downloads.powerdns.com/releases/ DISTNAME= pdns-${PORTVERSION} @@ -36,11 +36,11 @@ .include <bsd.port.pre.mk> .if ${OSVERSION} >= 500037 -USE_RCORDER= pdns.sh +USE_RCORDER= pdns.sh pdns_recursor.sh RC_DIR= /etc/rc.d RC_SUFX= .else -USE_RC_SUBR+= pdns.sh +USE_RC_SUBR+= pdns.sh pdns_recursor.sh RC_DIR= ${PREFIX}/etc/rc.d RC_SUFX= .sh .endif @@ -62,16 +62,16 @@ .if defined(WITH_POSTGRESQL_DRIVER) && !defined(WITHOUT_POSTGRESQL_DRIVER) LIB_DEPENDS+= pq[+][+].4:${PORTSDIR}/databases/postgresql-libpq++ -CONFIGURE_ARGS+= --enable-pgsql +CONFIGURE_ARGS+= --enable-pgsql --with-pgsql-includes=${LOCALBASE}/include CONFIGURE_MODULES+= "gpgsql" -CFLAGS+= -DDLLIMPORT="" +CFLAGS+= -DDLLIMPORT="" .else CONFIGURE_ARGS+= --disable-pgsql .endif .if defined(WITH_MYSQL_DRIVER) USE_MYSQL?= YES -CONFIGURE_ARGS+= --enable-mysql +CONFIGURE_ARGS+= --enable-mysql --with-mysql-includes=${LOCALBASE} CONFIGURE_MODULES+= "gmysql" .else CONFIGURE_ARGS+= --disable-mysql diff -ruN powerdns.org/distinfo powerdns/distinfo --- powerdns.org/distinfo Sun Oct 30 11:15:08 2005 +++ powerdns/distinfo Sun Oct 30 11:17:04 2005 @@ -1,2 +1,2 @@ -MD5 (pdns-2.9.18.tar.gz) = bcfb0573311e80dbeff0bb16f2764363 -SIZE (pdns-2.9.18.tar.gz) = 825719 +MD5 (pdns-2.9.19.tar.gz) = 30c96878b56845329cca5b8a351277b4 +SIZE (pdns-2.9.19.tar.gz) = 855801 diff -ruN powerdns.org/files/configure.powerdns powerdns/files/configure.powerdns --- powerdns.org/files/configure.powerdns Sun Oct 30 11:15:08 2005 +++ powerdns/files/configure.powerdns Sun Oct 30 11:27:17 2005 @@ -13,11 +13,8 @@ --checklist "\n\ Please select desired options:" -1 -1 8 \ PostgreSQL "PostgreSQL driver" ON \ -MySQL323 "MySQL 3.23 driver" OFF \ -MySQL40 "MySQL 4.0 driver" OFF \ -MySQL41 "MySQL 4.1 driver" OFF \ -OpenLDAP22 "OpenLDAP 2.2 backend" OFF \ -OpenLDAP23 "OpenLDAP 2.3 backend" OFF \ +MySQL "MySQL driver" OFF \ +OpenLDAP "OpenLDAP backend" OFF \ SQLite "SQLite backend" OFF \ Recursor "Build Recursor" OFF \ 2> /tmp/checklist.tmp.$$ @@ -47,23 +44,11 @@ \"PostgreSQL\") echo WITH_POSTGRESQL_DRIVER=YES ;; - \"MySQL323\") + \"MySQL\") echo WITH_MYSQL_DRIVER=YES - echo WITH_MYSQL_VER?=323 ;; - \"MySQL40\") - echo WITH_MYSQL_DRIVER=YES - ;; - \"MySQL41\") - echo WITH_MYSQL_DRIVER=YES - echo WITH_MYSQL_VER?=41 - ;; - \"OpenLDAP22\") - echo WITH_LDAP=YES - ;; - \"OpenLDAP23\") + \"OpenLDAP\") echo WITH_LDAP=YES - echo WANT_OPENLDAP_VER?=23 ;; \"SQLite\") echo WITH_SQLITE=YES diff -ruN powerdns.org/files/patch-modules_ldapbackend_utils_hh powerdns/files/patch-modules_ldapbackend_utils_hh --- powerdns.org/files/patch-modules_ldapbackend_utils_hh Sun Oct 30 11:15:08 2005 +++ powerdns/files/patch-modules_ldapbackend_utils_hh Thu Jan 1 01:00:00 1970 @@ -1,42 +0,0 @@ ---- modules/ldapbackend/utils.hh.orig Sat Apr 23 23:40:15 2005 -+++ modules/ldapbackend/utils.hh Thu Jul 28 09:03:14 2005 -@@ -73,7 +73,7 @@ - } - - --inline string ip2ptr4( string ip ) -+inline string ip2ptr4( const string& ip ) - { - string ptr; - vector<string> parts; -@@ -89,7 +89,7 @@ - } - - --inline string ip2ptr6( string ip ) -+inline string ip2ptr6( const string& ip ) - { - string ptr, part, defstr; - vector<string> parts; -@@ -114,6 +114,21 @@ - } - - return ptr + "ip6.arpa"; -+} -+ -+ -+inline string strbind( const string& search, const string& replace, string subject ) -+{ -+ size_t pos = 0; -+ -+ -+ while( ( pos = subject.find( search, pos ) ) != string::npos ) -+ { -+ subject.replace( pos, search.size(), replace ); -+ pos += replace.size(); -+ } -+ -+ return subject; - } - - #endif diff -ruN powerdns.org/files/pdns.sh.in powerdns/files/pdns.sh.in --- powerdns.org/files/pdns.sh.in Sun Oct 30 11:15:08 2005 +++ powerdns/files/pdns.sh.in Sun Oct 30 11:20:10 2005 @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: ports/dns/powerdns/files/pdns.sh.in,v 1.1 2005/07/18 12:59:51 pav Exp $ +# $FreeBSD: ports/dns/powerdns/files/pdns.sh.in,v 1.2 2005/10/30 11:19:55 pav Exp $ # # PROVIDE: pdns_server @@ -8,7 +8,7 @@ # KEYWORD: FreeBSD shutdown # -# Add the following lines to /etc/rc.conf to enable dovecot: +# Add the following lines to /etc/rc.conf to enable powerdns: # #pdns_enable="YES" # diff -ruN powerdns.org/files/pdns_recursor.sh.in powerdns/files/pdns_recursor.sh.in --- powerdns.org/files/pdns_recursor.sh.in Sun Oct 30 11:15:08 2005 +++ powerdns/files/pdns_recursor.sh.in Sun Oct 30 12:40:41 2005 @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: ports/dns/powerdns/files/pdns_recursor.sh.in,v 1.1 2005/07/18 12:59:51 pav Exp $ +# $FreeBSD: ports/dns/powerdns/files/pdns_recursor.sh.in,v 1.2 2005/10/30 12:40:33 pav Exp $ # # PROVIDE: pdns_recursor @@ -8,7 +8,7 @@ # KEYWORD: FreeBSD shutdown # -# Add the following lines to /etc/rc.conf to enable dovecot: +# Add the following lines to /etc/rc.conf to enable pdns_recursor: # #pdns_recursor_enable="YES" # --- pdns-2.9.19.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20051030122906.7A07EF2>