diff options
author | dholland <dholland@pkgsrc.org> | 2013-06-14 22:13:03 +0000 |
---|---|---|
committer | dholland <dholland@pkgsrc.org> | 2013-06-14 22:13:03 +0000 |
commit | 2d9c57a4ddfdc497bfef718e931851eabcba8b79 (patch) | |
tree | 8f8029dfd653f658548e2f8c8ca7cb58ec293f1f /net | |
parent | 6d0c77a329b38396a2697eca4e96104a40baeed6 (diff) | |
download | pkgsrc-2d9c57a4ddfdc497bfef718e931851eabcba8b79.tar.gz |
Patch up C++ semantic whitespace.
Diffstat (limited to 'net')
-rw-r--r-- | net/powerdns-recursor/Makefile | 8 | ||||
-rw-r--r-- | net/powerdns-recursor/distinfo | 4 | ||||
-rw-r--r-- | net/powerdns-recursor/patches/patch-pdns__recursor.cc | 17 |
3 files changed, 25 insertions, 4 deletions
diff --git a/net/powerdns-recursor/Makefile b/net/powerdns-recursor/Makefile index dfbc0b1c926..72ed66dd16d 100644 --- a/net/powerdns-recursor/Makefile +++ b/net/powerdns-recursor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2013/06/10 18:59:09 joerg Exp $ +# $NetBSD: Makefile,v 1.11 2013/06/14 22:13:03 dholland Exp $ # DISTNAME= pdns-recursor-3.3 @@ -28,6 +28,12 @@ INSTALL_MAKE_FLAGS+= CONFIGDIR=${EGDIR} MANDIR=${PREFIX}/${PKGMANDIR} CONF_FILES+= ${EGDIR}/recursor.conf-dist \ ${PKG_SYSCONFDIR}/recursor.conf +SUBST_CLASSES+= whitespace +SUBST_STAGE.whitespace= pre-configure +SUBST_MESSAGE.whitespace= Fixing C++ semantic whitespace. +SUBST_FILES.whitespace= pdns_recursor.cc +SUBST_SED.whitespace= -e 's|"VERSION"|" VERSION "|' + .include "../../mk/compiler.mk" .if !empty(PKGSRC_COMPILER:Mclang) CXXFLAGS+= -std=c++11 -Wno-c++11-narrowing diff --git a/net/powerdns-recursor/distinfo b/net/powerdns-recursor/distinfo index 2812fc2bda6..dc23d1d1ce3 100644 --- a/net/powerdns-recursor/distinfo +++ b/net/powerdns-recursor/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2013/06/10 18:59:09 joerg Exp $ +$NetBSD: distinfo,v 1.9 2013/06/14 22:13:03 dholland Exp $ SHA1 (pdns-recursor-3.3.tar.bz2) = 2f42955b8b8de355709e9072da2d5dbfadd7ffac RMD160 (pdns-recursor-3.3.tar.bz2) = 17bd7ac68892c3fca218c3dc3e70074dd9e748d6 @@ -9,7 +9,7 @@ SHA1 (patch-dns.hh) = 4d24a3c2bad973e05ed4b1c20bacce3b70992e5a SHA1 (patch-dnsparser.hh) = 85dad11c65d242630244a600ab5d857af591db9f SHA1 (patch-kqueuemplexer.cc) = e67ca0cc9703e5ba5f89f85eefd457c72495ca52 SHA1 (patch-pdns__recursor.1) = 33170dd8ec13b0607ebf2ef8366656c565ca4664 -SHA1 (patch-pdns__recursor.cc) = 2f66151305a34229f5789b765434995e2918c4ff +SHA1 (patch-pdns__recursor.cc) = 6a303abf34542efe0e259a88bdd25c9249335574 SHA1 (patch-rec__channel.cc) = 5432261c1771a3ed4498e1ce78494307b153f302 SHA1 (patch-rec__control.1) = e6ea8e7b93e23cd37bddb272e7cd64858cdf7f83 SHA1 (patch-recursor__cache.hh) = f56f189f851fd1e764476851055f2a21e5acbb06 diff --git a/net/powerdns-recursor/patches/patch-pdns__recursor.cc b/net/powerdns-recursor/patches/patch-pdns__recursor.cc index d477ab3de14..5e32d4980c8 100644 --- a/net/powerdns-recursor/patches/patch-pdns__recursor.cc +++ b/net/powerdns-recursor/patches/patch-pdns__recursor.cc @@ -1,6 +1,12 @@ -$NetBSD: patch-pdns__recursor.cc,v 1.1 2012/02/28 10:49:29 roy Exp $ +$NetBSD: patch-pdns__recursor.cc,v 1.2 2013/06/14 22:13:03 dholland Exp $ Cast to int so we use the correct overload. +Fix C++ semantic whitespace. + +Caution: this file is also SUBST'd at pre-configure time to insert +more C++ semantic whitespace around the VERSION macro. Don't roll +those changes back into the pkgsrc patch as one of them contains +an rcsid string. (sigh) --- pdns_recursor.cc.orig 2010-09-21 16:22:09.000000000 +0000 +++ pdns_recursor.cc @@ -13,3 +19,12 @@ Cast to int so we use the correct overload. } lastOutputTime = now; lastQueryCount = SyncRes::s_queries; +@@ -2017,7 +2017,7 @@ int main(int argc, char **argv) + exit(99); + } + if(::arg().mustDo("version")) { +- cerr<<"version: "VERSION<<endl; ++ cerr<<"version: " VERSION <<endl; + exit(99); + } + |