summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2013-09-16 15:46:07 +0000
committerjoerg <joerg@pkgsrc.org>2013-09-16 15:46:07 +0000
commit6b630fd51317967671dbcb7fb9c5613c88caf47a (patch)
tree257ade46ab3f61dec3a45be1e967a7b2d8cb32a1
parentc1f9cdc44964b879850ff75d5a4355e58b676a66 (diff)
downloadpkgsrc-6b630fd51317967671dbcb7fb9c5613c88caf47a.tar.gz
Fix obviously incorrect operator!= for string_key. Bump revision.
-rw-r--r--www/cppcms/Makefile6
-rw-r--r--www/cppcms/distinfo3
-rw-r--r--www/cppcms/patches/patch-cppcms_string__key.h13
3 files changed, 20 insertions, 2 deletions
diff --git a/www/cppcms/Makefile b/www/cppcms/Makefile
index 54d60dd6571..4d4ad77fba9 100644
--- a/www/cppcms/Makefile
+++ b/www/cppcms/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2013/07/16 14:37:20 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2013/09/16 15:46:07 joerg Exp $
DISTNAME= cppcms-1.0.4
+PKGREVISION= 1
CATEGORIES= www devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cppcms/}
EXTRACT_SUFX= .tar.bz2
@@ -27,6 +28,9 @@ TEST_ENV+= LD_LIBRARY_PATH=${WRKSRC}:${WRKSRC}/booster
REPLACE_PYTHON= bin/cppcms_tmpl_cc
+pre-install:
+ rm -f ${WRKSRC}/cppcms/string_key.h.orig
+
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/pcre/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
diff --git a/www/cppcms/distinfo b/www/cppcms/distinfo
index 9054d0feb6a..37dd9538c10 100644
--- a/www/cppcms/distinfo
+++ b/www/cppcms/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2013/07/16 10:12:48 joerg Exp $
+$NetBSD: distinfo,v 1.2 2013/09/16 15:46:07 joerg Exp $
SHA1 (cppcms-1.0.4.tar.bz2) = 470a3eedbd568b457fe6516b78a9c1f464cdc276
RMD160 (cppcms-1.0.4.tar.bz2) = 6efa445f8da113ba870010c3a770592587e4198f
@@ -9,6 +9,7 @@ SHA1 (patch-cppcms__boost_cppcms__boost_detail_container__fwd.hpp) = 1de84e42f0b
SHA1 (patch-cppcms__boost_cppcms__boost_interprocess_containers_container_container__fwd.hpp) = 77de309397fc180556ac80031fffe70a0aa24e86
SHA1 (patch-cppcms__boost_cppcms__boost_interprocess_detail_managed__memory__impl.hpp) = 434d6c50cb3a8f5a1ae00d83e63341f6c24dbfcd
SHA1 (patch-cppcms__boost_cppcms__boost_interprocess_interprocess__fwd.hpp) = 2a17e6659095d5406f63743479aab8f259086ffd
+SHA1 (patch-cppcms_string__key.h) = 5532ffc158c6c8d7766a69a7600eea351382a7f4
SHA1 (patch-private_posix__util.h) = 87b7af8f1aee64f74b002a837f3ae4a456d116d8
SHA1 (patch-src_json.cpp) = 4ef9bc4d65c493046b3847a85892ab65cab74add
SHA1 (patch-src_util.cpp) = a27f4b164555d68aad950460ffd66fc9329ced62
diff --git a/www/cppcms/patches/patch-cppcms_string__key.h b/www/cppcms/patches/patch-cppcms_string__key.h
new file mode 100644
index 00000000000..e04d083715a
--- /dev/null
+++ b/www/cppcms/patches/patch-cppcms_string__key.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-cppcms_string__key.h,v 1.1 2013/09/16 15:46:07 joerg Exp $
+
+--- cppcms/string_key.h.orig 2013-09-16 15:24:39.524666221 +0000
++++ cppcms/string_key.h
+@@ -248,7 +248,7 @@ namespace cppcms {
+ ///
+ bool operator!=(string_key const &other) const
+ {
+- return !(*this!=other);
++ return !(*this==other);
+ }
+
+ ///