Thu Jun 23 15:05:38 2016 UTC ()
Fix previous by going the whole hog and requiring C++11.


(prlw1)
diff -r1.2 -r1.3 pkgsrc/www/libecap/Makefile
diff -r1.2 -r1.3 pkgsrc/www/libecap/distinfo
diff -r1.1 -r1.2 pkgsrc/www/libecap/patches/patch-src_libecap_common_memory.h
cvs diff -r1.2 -r1.3 pkgsrc/www/libecap/Makefile (expand / switch to unified diff)

--- pkgsrc/www/libecap/Makefile 2016/06/21 17:57:07 1.2
+++ pkgsrc/www/libecap/Makefile 2016/06/23 15:05:38 1.3
@@ -1,20 +1,22 @@ @@ -1,20 +1,22 @@
1# $NetBSD: Makefile,v 1.2 2016/06/21 17:57:07 joerg Exp $ 1# $NetBSD: Makefile,v 1.3 2016/06/23 15:05:38 prlw1 Exp $
2 2
3DISTNAME= libecap-1.0.1 3DISTNAME= libecap-1.0.1
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= www 5CATEGORIES= www
6MASTER_SITES= http://www.measurement-factory.com/tmp/ecap/ 6MASTER_SITES= http://www.measurement-factory.com/tmp/ecap/
7 7
8MAINTAINER= prlw1@cam.ac.uk 8MAINTAINER= prlw1@cam.ac.uk
9HOMEPAGE= http://www.e-cap.org/ 9HOMEPAGE= http://www.e-cap.org/
10COMMENT= C++ implementation of eCAP API 10COMMENT= C++ implementation of eCAP API
11LICENSE= 2-clause-bsd 11LICENSE= 2-clause-bsd
12 12
13GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
14USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16USE_TOOLS+= pkg-config 16USE_TOOLS+= pkg-config
17 17
 18CXXFLAGS+= -std=c++11
 19
18PKGCONFIG_OVERRIDE+= libecap.pc.in 20PKGCONFIG_OVERRIDE+= libecap.pc.in
19 21
20.include "../../mk/bsd.pkg.mk" 22.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/www/libecap/distinfo (expand / switch to unified diff)

--- pkgsrc/www/libecap/distinfo 2016/06/21 17:57:07 1.2
+++ pkgsrc/www/libecap/distinfo 2016/06/23 15:05:38 1.3
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.2 2016/06/21 17:57:07 joerg Exp $ 1$NetBSD: distinfo,v 1.3 2016/06/23 15:05:38 prlw1 Exp $
2 2
3SHA1 (libecap-1.0.1.tar.gz) = 89533c2ac77fee7b26f53c20c25a1423ce1498b7 3SHA1 (libecap-1.0.1.tar.gz) = 89533c2ac77fee7b26f53c20c25a1423ce1498b7
4RMD160 (libecap-1.0.1.tar.gz) = 72cac0074be057805511d33156baacb0eeaef4ed 4RMD160 (libecap-1.0.1.tar.gz) = 72cac0074be057805511d33156baacb0eeaef4ed
5SHA512 (libecap-1.0.1.tar.gz) = 0054ad11b3f558d7c623060a69207a1b8e679803cabdf1a2bce4b04335d71c016eec770fc9d2cbf3d0a93502c255cb528305f9f8e6df4e095fcb980667045919 5SHA512 (libecap-1.0.1.tar.gz) = 0054ad11b3f558d7c623060a69207a1b8e679803cabdf1a2bce4b04335d71c016eec770fc9d2cbf3d0a93502c255cb528305f9f8e6df4e095fcb980667045919
6Size (libecap-1.0.1.tar.gz) = 339799 bytes 6Size (libecap-1.0.1.tar.gz) = 339799 bytes
7SHA1 (patch-src_libecap_common_memory.h) = 674ed41deea66df513e523ccb40169f961448a0d 7SHA1 (patch-src_libecap_common_memory.h) = ef1b37d342c23539af1c1e0967e3f19044c672a1
cvs diff -r1.1 -r1.2 pkgsrc/www/libecap/patches/patch-src_libecap_common_memory.h (expand / switch to unified diff)

--- pkgsrc/www/libecap/patches/patch-src_libecap_common_memory.h 2016/06/21 17:57:07 1.1
+++ pkgsrc/www/libecap/patches/patch-src_libecap_common_memory.h 2016/06/23 15:05:38 1.2
@@ -1,30 +1,24 @@ @@ -1,30 +1,24 @@
1$NetBSD: patch-src_libecap_common_memory.h,v 1.1 2016/06/21 17:57:07 joerg Exp $ 1$NetBSD: patch-src_libecap_common_memory.h,v 1.2 2016/06/23 15:05:38 prlw1 Exp $
2 2
3--- src/libecap/common/memory.h.orig 2016-06-20 16:15:17.012240492 +0000 3https://bugs.launchpad.net/bugs/1595488
 4
 5--- src/libecap/common/memory.h.orig 2014-10-02 04:05:24.000000000 +0000
4+++ src/libecap/common/memory.h 6+++ src/libecap/common/memory.h
5@@ -4,14 +4,24 @@ 7@@ -4,14 +4,12 @@
6 #define LIBECAP__COMMON_MEMORY_H 8 #define LIBECAP__COMMON_MEMORY_H
7  9
8 #include <libecap/common/libecap.h> 10 #include <libecap/common/libecap.h>
9+#include <ciso646> 11-#include <tr1/memory>
10+ 12-
11+#if __cplusplus >= 201103L || defined(_LIBCPP_VERSION) 13-// TODO: add support for boost pointers if std::tr1 is not available
12+#include <functional> 14+#include <memory>
13+#else 
14 #include <tr1/memory> 
15+#endif 
16  
17 // TODO: add support for boost pointers if std::tr1 is not available 
18  15
19 namespace libecap { 16 namespace libecap {
20- 17
21+#if __cplusplus >= 201103L || defined(_LIBCPP_VERSION) 18-using std::tr1::weak_ptr;
 19-using std::tr1::shared_ptr;
22+using std::weak_ptr; 20+using std::weak_ptr;
23+using std::shared_ptr; 21+using std::shared_ptr;
24+#else 
25 using std::tr1::weak_ptr; 
26 using std::tr1::shared_ptr; 
27+#endif 
28  22
29 } // namespace libecap 23 } // namespace libecap
30  24