Mon Sep 16 15:46:07 2013 UTC ()
Fix obviously incorrect operator!= for string_key. Bump revision.


(joerg)
diff -r1.2 -r1.3 pkgsrc/www/cppcms/Makefile
diff -r1.1 -r1.2 pkgsrc/www/cppcms/distinfo
diff -r0 -r1.1 pkgsrc/www/cppcms/patches/patch-cppcms_string__key.h
cvs diff -r1.2 -r1.3 pkgsrc/www/cppcms/Makefile (expand / switch to unified diff)

--- pkgsrc/www/cppcms/Makefile 2013/07/16 14:37:20 1.2
+++ pkgsrc/www/cppcms/Makefile 2013/09/16 15:46:07 1.3
@@ -1,36 +1,40 @@ @@ -1,36 +1,40 @@
1# $NetBSD: Makefile,v 1.2 2013/07/16 14:37:20 joerg Exp $ 1# $NetBSD: Makefile,v 1.3 2013/09/16 15:46:07 joerg Exp $
2 2
3DISTNAME= cppcms-1.0.4 3DISTNAME= cppcms-1.0.4
 4PKGREVISION= 1
4CATEGORIES= www devel 5CATEGORIES= www devel
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cppcms/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cppcms/}
6EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
7 8
8MAINTAINER= joerg@NetBSD.org 9MAINTAINER= joerg@NetBSD.org
9HOMEPAGE= http://cppcms.com/ 10HOMEPAGE= http://cppcms.com/
10COMMENT= High performance C++ web development framework 11COMMENT= High performance C++ web development framework
11LICENSE= gnu-lgpl-v3 12LICENSE= gnu-lgpl-v3
12 13
13USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
14USE_CMAKE= yes 15USE_CMAKE= yes
15 16
16CMAKE_ARGS+= -DPYTHON=${PYTHONBIN} -DDISABLE_GCRYPT=yes 17CMAKE_ARGS+= -DPYTHON=${PYTHONBIN} -DDISABLE_GCRYPT=yes
17 18
18.include "../../mk/compiler.mk" 19.include "../../mk/compiler.mk"
19.if !empty(PKGSRC_COMPILER:Mclang) 20.if !empty(PKGSRC_COMPILER:Mclang)
20CXXFLAGS+= -std=c++11 21CXXFLAGS+= -std=c++11
21.endif 22.endif
22 23
23LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS} 24LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS}
24 25
25TEST_TARGET= test 26TEST_TARGET= test
26TEST_ENV+= LD_LIBRARY_PATH=${WRKSRC}:${WRKSRC}/booster 27TEST_ENV+= LD_LIBRARY_PATH=${WRKSRC}:${WRKSRC}/booster
27 28
28REPLACE_PYTHON= bin/cppcms_tmpl_cc 29REPLACE_PYTHON= bin/cppcms_tmpl_cc
29 30
 31pre-install:
 32 rm -f ${WRKSRC}/cppcms/string_key.h.orig
 33
30.include "../../converters/libiconv/buildlink3.mk" 34.include "../../converters/libiconv/buildlink3.mk"
31.include "../../devel/pcre/buildlink3.mk" 35.include "../../devel/pcre/buildlink3.mk"
32.include "../../devel/zlib/buildlink3.mk" 36.include "../../devel/zlib/buildlink3.mk"
33.include "../../security/openssl/buildlink3.mk" 37.include "../../security/openssl/buildlink3.mk"
34.include "../../textproc/icu/buildlink3.mk" 38.include "../../textproc/icu/buildlink3.mk"
35.include "../../lang/python/application.mk" 39.include "../../lang/python/application.mk"
36.include "../../mk/bsd.pkg.mk" 40.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/www/cppcms/distinfo (expand / switch to unified diff)

--- pkgsrc/www/cppcms/distinfo 2013/07/16 10:12:48 1.1
+++ pkgsrc/www/cppcms/distinfo 2013/09/16 15:46:07 1.2
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1$NetBSD: distinfo,v 1.1 2013/07/16 10:12:48 joerg Exp $ 1$NetBSD: distinfo,v 1.2 2013/09/16 15:46:07 joerg Exp $
2 2
3SHA1 (cppcms-1.0.4.tar.bz2) = 470a3eedbd568b457fe6516b78a9c1f464cdc276 3SHA1 (cppcms-1.0.4.tar.bz2) = 470a3eedbd568b457fe6516b78a9c1f464cdc276
4RMD160 (cppcms-1.0.4.tar.bz2) = 6efa445f8da113ba870010c3a770592587e4198f 4RMD160 (cppcms-1.0.4.tar.bz2) = 6efa445f8da113ba870010c3a770592587e4198f
5Size (cppcms-1.0.4.tar.bz2) = 2331505 bytes 5Size (cppcms-1.0.4.tar.bz2) = 2331505 bytes
6SHA1 (patch-bin_cppcms__run) = 2b9033c82fab2c9aa11acbb200e9a44f9c6364cb 6SHA1 (patch-bin_cppcms__run) = 2b9033c82fab2c9aa11acbb200e9a44f9c6364cb
7SHA1 (patch-booster_lib_locale_test_test__std__formatting.cpp) = 62564e7e8bfcb90cd19195f5ce2296b8b03c02d6 7SHA1 (patch-booster_lib_locale_test_test__std__formatting.cpp) = 62564e7e8bfcb90cd19195f5ce2296b8b03c02d6
8SHA1 (patch-cppcms__boost_cppcms__boost_detail_container__fwd.hpp) = 1de84e42f0b0dfbb9b8c9013c1c515727a917998 8SHA1 (patch-cppcms__boost_cppcms__boost_detail_container__fwd.hpp) = 1de84e42f0b0dfbb9b8c9013c1c515727a917998
9SHA1 (patch-cppcms__boost_cppcms__boost_interprocess_containers_container_container__fwd.hpp) = 77de309397fc180556ac80031fffe70a0aa24e86 9SHA1 (patch-cppcms__boost_cppcms__boost_interprocess_containers_container_container__fwd.hpp) = 77de309397fc180556ac80031fffe70a0aa24e86
10SHA1 (patch-cppcms__boost_cppcms__boost_interprocess_detail_managed__memory__impl.hpp) = 434d6c50cb3a8f5a1ae00d83e63341f6c24dbfcd 10SHA1 (patch-cppcms__boost_cppcms__boost_interprocess_detail_managed__memory__impl.hpp) = 434d6c50cb3a8f5a1ae00d83e63341f6c24dbfcd
11SHA1 (patch-cppcms__boost_cppcms__boost_interprocess_interprocess__fwd.hpp) = 2a17e6659095d5406f63743479aab8f259086ffd 11SHA1 (patch-cppcms__boost_cppcms__boost_interprocess_interprocess__fwd.hpp) = 2a17e6659095d5406f63743479aab8f259086ffd
 12SHA1 (patch-cppcms_string__key.h) = 5532ffc158c6c8d7766a69a7600eea351382a7f4
12SHA1 (patch-private_posix__util.h) = 87b7af8f1aee64f74b002a837f3ae4a456d116d8 13SHA1 (patch-private_posix__util.h) = 87b7af8f1aee64f74b002a837f3ae4a456d116d8
13SHA1 (patch-src_json.cpp) = 4ef9bc4d65c493046b3847a85892ab65cab74add 14SHA1 (patch-src_json.cpp) = 4ef9bc4d65c493046b3847a85892ab65cab74add
14SHA1 (patch-src_util.cpp) = a27f4b164555d68aad950460ffd66fc9329ced62 15SHA1 (patch-src_util.cpp) = a27f4b164555d68aad950460ffd66fc9329ced62
File Added: pkgsrc/www/cppcms/patches/Attic/patch-cppcms_string__key.h
$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);
 		}
 
 		///