Fix configure portability and NetBSD builds, remove stale patch files.

6 files changed, 30 insertions, 47 deletions

diff --git a/devel/libmemcached/distinfo b/devel/libmemcached/distinfo
index ea1d0b981d0..d9a6b61c218 100644
--- a/devel/libmemcached/distinfo
+++ b/devel/libmemcached/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.8 2014/04/01 13:51:56 fhajny Exp $
+$NetBSD: distinfo,v 1.9 2014/04/08 13:23:31 fhajny Exp $
 
 SHA1 (libmemcached-1.0.18.tar.gz) = 8be06b5b95adbc0a7cb0f232e237b648caf783e1
 RMD160 (libmemcached-1.0.18.tar.gz) = 647ea760191755da4832f1a4c78847a330e5b515
 Size (libmemcached-1.0.18.tar.gz) = 1039649 bytes
-SHA1 (patch-configure) = 82927d933832a8bf07b3da276bc330c01e04fc71
+SHA1 (patch-configure) = 413296ba549ee0e4eb5d5ca910f144916a85b02b
 SHA1 (patch-libmemcached_byteorder.cc) = 047f070a47a6e88b5c19c413136e894737b28a7e
+SHA1 (patch-libtest_alarm.cc) = 92120b26fcbbef8ebec0b754d44a3a40b796e602
 SHA1 (patch-libtest_lite.h) = cef673c15034d2e6ab68fdf9ad35366608fca3a0
 SHA1 (patch-libtest_test.hpp) = 66f1cb24ceaea2233acf73974b0249326dca5376
 SHA1 (patch-tests_libmemcached-1.0_ketama.cc) = 707ea7b0f8df721db7d947d82df3e142b70ae5a0
diff --git a/devel/libmemcached/patches/patch-configure b/devel/libmemcached/patches/patch-configure
index de17ab8bfba..85299c338a3 100644
--- a/devel/libmemcached/patches/patch-configure
+++ b/devel/libmemcached/patches/patch-configure
@@ -1,7 +1,18 @@
-$NetBSD: patch-configure,v 1.4 2014/04/01 13:51:56 fhajny Exp $
+$NetBSD: patch-configure,v 1.5 2014/04/08 13:23:31 fhajny Exp $
+
+Fix compile vs. link tests, portability.
 
 --- configure.orig	2014-02-09 11:52:52.000000000 +0000
 +++ configure
+@@ -15921,7 +15921,7 @@ if test "x$ac_cv_prog_cc_c99" != xno; th
+ fi
+ 
+ 
+-if test "x${ac_cv_prog_cc_c99}" == "xno"; then :
++if test "x${ac_cv_prog_cc_c99}" = "xno"; then :
+   as_fn_error $? "No c99 compatible compiler found" "$LINENO" 5
+ fi
+ 
 @@ -26560,15 +26560,15 @@ else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
diff --git a/devel/libmemcached/patches/patch-libmemcached-1.0_deprecated__types.h b/devel/libmemcached/patches/patch-libmemcached-1.0_deprecated__types.h
deleted file mode 100644
index 916eb7da910..00000000000
--- a/devel/libmemcached/patches/patch-libmemcached-1.0_deprecated__types.h
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-libmemcached-1.0_deprecated__types.h,v 1.2 2013/09/13 07:59:01 fhajny Exp $
-
-Add type to overcome a breaking API change.
-https://bugs.launchpad.net/libmemcached/+bug/1190240
---- libmemcached-1.0/deprecated_types.h.orig	2013-04-03 04:22:00.000000000 +0000
-+++ libmemcached-1.0/deprecated_types.h
-@@ -57,4 +57,5 @@ typedef memcached_server_fn memcached_se
- typedef memcached_trigger_key_fn memcached_trigger_key;
- typedef memcached_trigger_delete_key_fn memcached_trigger_delete_key;
- typedef memcached_dump_fn memcached_dump_func;
-+typedef memcached_instance_st *memcached_server_instance_st;
- 
diff --git a/devel/libmemcached/patches/patch-libmemcached-1.0_memcached.h b/devel/libmemcached/patches/patch-libmemcached-1.0_memcached.h
deleted file mode 100644
index acdd8a72e7f..00000000000
--- a/devel/libmemcached/patches/patch-libmemcached-1.0_memcached.h
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-libmemcached-1.0_memcached.h,v 1.1 2013/09/15 12:28:22 joerg Exp $
-
---- libmemcached-1.0/memcached.h.orig	2013-09-14 17:06:48.000000000 +0000
-+++ libmemcached-1.0/memcached.h
-@@ -43,9 +43,13 @@
- #endif
- 
- #ifdef __cplusplus
--#  include <tr1/cinttypes>
- #  include <cstddef>
- #  include <cstdlib>
-+#  if __cplusplus >= 201103L || defined(_LIBCPP_VERSION)
-+#    include <cinttypes>
-+#  else
-+#    include <tr1/cinttypes>
-+#  endif
- #else
- #  include <inttypes.h>
- #  include <stddef.h>
diff --git a/devel/libmemcached/patches/patch-libtest_alarm.cc b/devel/libmemcached/patches/patch-libtest_alarm.cc
new file mode 100644
index 00000000000..0e342296334
--- /dev/null
+++ b/devel/libmemcached/patches/patch-libtest_alarm.cc
@@ -0,0 +1,15 @@
+$NetBSD: patch-libtest_alarm.cc,v 1.1 2014/04/08 13:23:31 fhajny Exp $
+
+Fix narrowing conversion on NetBSD.
+
+--- libtest/alarm.cc.orig	2014-02-09 11:52:42.000000000 +0000
++++ libtest/alarm.cc
+@@ -76,7 +76,7 @@ void set_alarm(long tv_sec, long tv_usec
+     }
+   }
+ 
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__NetBSD__)
+   struct timeval it_value= { time_t(tv_sec), suseconds_t(tv_usec) };
+ #else
+   struct timeval it_value= { tv_sec, tv_usec };
diff --git a/devel/libmemcached/patches/patch-libtest_main.cc b/devel/libmemcached/patches/patch-libtest_main.cc
deleted file mode 100644
index 2a30cd13816..00000000000
--- a/devel/libmemcached/patches/patch-libtest_main.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-libtest_main.cc,v 1.1 2013/09/12 14:20:56 fhajny Exp $
-
-strings.h needed for rindex.
---- libtest/main.cc.orig	2013-04-03 04:22:00.000000000 +0000
-+++ libtest/main.cc
-@@ -45,6 +45,7 @@
- #include <iostream>
- #include <fstream>
- #include <memory>
-+#include <strings.h>
- #include <sys/stat.h>
- #include <sys/time.h>
- #include <sys/types.h>