CVS commit: pkgsrc/www/libecap

["Patrick Welche" <prlw1%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   prlw1
Date:           Thu Jun 23 15:05:38 UTC 2016

Modified Files:
        pkgsrc/www/libecap: Makefile distinfo
        pkgsrc/www/libecap/patches: patch-src_libecap_common_memory.h

Log Message:
Fix previous by going the whole hog and requiring C++11.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/libecap/Makefile \
    pkgsrc/www/libecap/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/libecap/patches/patch-src_libecap_common_memory.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/libecap/Makefile
diff -u pkgsrc/www/libecap/Makefile:1.2 pkgsrc/www/libecap/Makefile:1.3
--- pkgsrc/www/libecap/Makefile:1.2     Tue Jun 21 17:57:07 2016
+++ pkgsrc/www/libecap/Makefile Thu Jun 23 15:05:38 2016
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2016/06/21 17:57:07 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/23 15:05:38 prlw1 Exp $
 
 DISTNAME=      libecap-1.0.1
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES=  http://www.measurement-factory.com/tmp/ecap/
 
@@ -15,6 +15,8 @@ USE_LANGUAGES=        c c++
 USE_LIBTOOL=   yes
 USE_TOOLS+=    pkg-config
 
+CXXFLAGS+=     -std=c++11
+
 PKGCONFIG_OVERRIDE+=   libecap.pc.in
 
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/www/libecap/distinfo
diff -u pkgsrc/www/libecap/distinfo:1.2 pkgsrc/www/libecap/distinfo:1.3
--- pkgsrc/www/libecap/distinfo:1.2     Tue Jun 21 17:57:07 2016
+++ pkgsrc/www/libecap/distinfo Thu Jun 23 15:05:38 2016
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2016/06/21 17:57:07 joerg Exp $
+$NetBSD: distinfo,v 1.3 2016/06/23 15:05:38 prlw1 Exp $
 
 SHA1 (libecap-1.0.1.tar.gz) = 89533c2ac77fee7b26f53c20c25a1423ce1498b7
 RMD160 (libecap-1.0.1.tar.gz) = 72cac0074be057805511d33156baacb0eeaef4ed
 SHA512 (libecap-1.0.1.tar.gz) = 0054ad11b3f558d7c623060a69207a1b8e679803cabdf1a2bce4b04335d71c016eec770fc9d2cbf3d0a93502c255cb528305f9f8e6df4e095fcb980667045919
 Size (libecap-1.0.1.tar.gz) = 339799 bytes
-SHA1 (patch-src_libecap_common_memory.h) = 674ed41deea66df513e523ccb40169f961448a0d
+SHA1 (patch-src_libecap_common_memory.h) = ef1b37d342c23539af1c1e0967e3f19044c672a1

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