Import of pkgsrc-2015Q1

devel/cssc/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2013/05/09 20:05:35 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2015/03/14 14:24:48 tnn Exp $
 #
 
-DISTNAME=	CSSC-1.3.0
+DISTNAME=	CSSC-1.4.0
 PKGNAME=	${DISTNAME:tl}
 CATEGORIES=	devel scm
 MASTER_SITES=	${MASTER_SITE_GNU:=cssc/}
@@ -26,4 +26,5 @@ INFO_FILES=	yes
 CXXFLAGS+=	-std=c++11
 .endif
 
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

devel/cssc/distinfo

@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.13 2013/05/09 20:05:35 joerg Exp $
+$NetBSD: distinfo,v 1.14 2014/12/12 08:32:42 mef Exp $
 
-SHA1 (CSSC-1.3.0.tar.gz) = 5f9d7338c58efd9fed7b774843045433b61aed12
-RMD160 (CSSC-1.3.0.tar.gz) = 4318632f0c243ee59639ea9226e0a3d2409e9763
-Size (CSSC-1.3.0.tar.gz) = 1608481 bytes
-SHA1 (patch-aa) = 3f29e0b6835b85129088e36e3fd415a9535772df
-SHA1 (patch-ad) = aecbc9bc595bb48c090ce3bad87631400ce0a34b
-SHA1 (patch-unit-tests_googletest_include_gtest_internal_gtest-port.h) = 8cc87780d3d37999b9b497180ac84b75f735060b
+SHA1 (CSSC-1.4.0.tar.gz) = 9c1509f4da99d10081d3bd5489d272fdab8bc35a
+RMD160 (CSSC-1.4.0.tar.gz) = 6619af3566de003ed171bd9f3f2a0c216f47e99a
+Size (CSSC-1.4.0.tar.gz) = 2012122 bytes
+SHA1 (patch-ad) = d5b5f575d35c092a9b1d03cd744d948fc55a8f58
+SHA1 (patch-unit-tests_googletest_include_gtest_internal_gtest-port.h) = c7f9be5a756c41ff5a6da9c164093156600edf06

devel/cssc/patches/patch-aa

@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2004/10/18 18:49:39 seb Exp $
-
---- tests/admin/y-flag.sh.orig	2004-10-10 12:51:16.000000000 +0200
-+++ tests/admin/y-flag.sh
-@@ -16,7 +16,7 @@ remove $s $g $z foo command.log last.com
- remove expected.stderr got.stderr expected.stdout got.stdout
- 
- # Figure out if we ahous expect the thing to work.
--if admin -n -i/dev/null -fyM ${s} >/dev/null 2>&1 || $TESTING_CSSC
-+if ${admin} -n -i/dev/null -fyM ${s} >/dev/null 2>&1 || $TESTING_CSSC
- then
-     echo "We are testing an SCCS implementation that supports the y flag.  Good."
- else
-@@ -26,6 +26,7 @@ else
-     success
-     exit 0
- fi
-+remove s.bar
- 
- 
- remove foo

devel/cssc/patches/patch-ad

@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.4 2011/02/02 11:29:07 ryoon Exp $
+$NetBSD: patch-ad,v 1.5 2014/12/12 08:32:42 mef Exp $
 
 --- bsd/sccs.c.orig	2010-05-16 17:31:33.000000000 +0000
-+++ bsd/sccs.c
++++ src/sccs.c
 @@ -1964,8 +1964,6 @@ unedit (const char *fn)
     */
    if (delete)

devel/cssc/patches/patch-unit-tests_googletest_include_gtest_internal_gtest-port.h

@@ -1,29 +1,12 @@
-$NetBSD: patch-unit-tests_googletest_include_gtest_internal_gtest-port.h,v 1.3 2013/05/09 20:05:35 joerg Exp $
+$NetBSD: patch-unit-tests_googletest_include_gtest_internal_gtest-port.h,v 1.4 2014/12/12 08:32:42 mef Exp $
 
---- unit-tests/googletest/include/gtest/internal/gtest-port.h.orig	2013-05-07 19:58:35.000000000 +0000
-+++ unit-tests/googletest/include/gtest/internal/gtest-port.h
-@@ -173,6 +173,7 @@
+--- unit-tests/googletest/include/gtest/internal/gtest-port.h.orig	2014-07-01 06:33:31.000000000 +0900
++++ unit-tests/googletest/include/gtest/internal/gtest-port.h	2014-12-12 16:46:31.000000000 +0900
+@@ -261,6 +261,7 @@
  #include <stdlib.h>
  #include <stdio.h>
  #include <string.h>
 +#include <unistd.h>
  #ifndef _WIN32_WCE
- #include <sys/stat.h>
- #endif  // !_WIN32_WCE
-@@ -432,6 +432,16 @@
- #define BOOST_TR1_DETAIL_CONFIG_HPP_INCLUDED
- #include <tuple>
- 
-+# elif __cplusplus >= 201103L
-+#  include <tuple>
-+namespace std {
-+  namespace tr1 {
-+    using ::std::tuple;
-+    using ::std::tuple_element;
-+    using ::std::tuple_size;
-+    using ::std::get;
-+  }
-+}
- #elif defined(__GNUC__) && (GTEST_GCC_VER_ >= 40000)
- // GCC 4.0+ implements tr1/tuple in the <tr1/tuple> header.  This does
- // not conform to the TR1 spec, which requires the header to be <tuple>.
+ # include <sys/types.h>
+ # include <sys/stat.h>