diff options
| author | Diane Bruce <db@FreeBSD.org> | 2018-01-17 17:58:45 +0000 |
|---|---|---|
| committer | Diane Bruce <db@FreeBSD.org> | 2018-01-17 17:58:45 +0000 |
| commit | ef52959748eecf42db3840747cf3c25c4d42bc79 (patch) | |
| tree | 895dfa92ee494b63ff72151f6cb0e74fa2492c35 /comms | |
| parent | a2efd71bf362e159093047b2188a1844f9d56fb2 (diff) | |
| download | ports-ef52959748eecf42db3840747cf3c25c4d42bc79.tar.gz ports-ef52959748eecf42db3840747cf3c25c4d42bc79.zip | |
Notes
Diffstat (limited to 'comms')
| -rw-r--r-- | comms/fllog/Makefile | 2 | ||||
| -rw-r--r-- | comms/fllog/distinfo | 6 | ||||
| -rw-r--r-- | comms/fllog/files/patch-src_misc_re.cxx | 28 | ||||
| -rw-r--r-- | comms/fllog/files/patch-src_xmlrpcpp_XmlRpcBase64.h | 10 |
4 files changed, 4 insertions, 42 deletions
diff --git a/comms/fllog/Makefile b/comms/fllog/Makefile index 030d1e80df8e..d890c1619ec4 100644 --- a/comms/fllog/Makefile +++ b/comms/fllog/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= fllog -PORTVERSION= 1.2.4 +PORTVERSION= 1.2.5 CATEGORIES= comms hamradio MASTER_SITES= SF/fldigi/${PORTNAME} diff --git a/comms/fllog/distinfo b/comms/fllog/distinfo index 58d3a50e6dae..3b40cb068c4c 100644 --- a/comms/fllog/distinfo +++ b/comms/fllog/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1483833165 -SHA256 (fllog-1.2.4.tar.gz) = e4647032b1ebc5f2206edc624a40e331f5ab2b3dd1e33d7698223071d6d9b15b -SIZE (fllog-1.2.4.tar.gz) = 430920 +TIMESTAMP = 1516210152 +SHA256 (fllog-1.2.5.tar.gz) = f47f73bae1fc5c5285ed0564b5d554113985a25234454297db688c32c00b5210 +SIZE (fllog-1.2.5.tar.gz) = 432951 diff --git a/comms/fllog/files/patch-src_misc_re.cxx b/comms/fllog/files/patch-src_misc_re.cxx deleted file mode 100644 index 11ac617ec144..000000000000 --- a/comms/fllog/files/patch-src_misc_re.cxx +++ /dev/null @@ -1,28 +0,0 @@ ---- src/misc/re.cxx.orig 2015-08-12 21:02:27 UTC -+++ src/misc/re.cxx -@@ -120,12 +120,25 @@ void re_t::suboff(size_t n, int* start, - } - } - -+#ifdef __clang__ -+ #if __has_include(<functional>) -+ #include <functional> -+ #define HAS_STD_TR1 -+ #endif -+#endif -+#ifndef HAS_STD_TR1 - #include <tr1/functional> -+#endif - - size_t re_t::hash(void) const - { -+#ifdef HAS_STD_TR1 -+ size_t h = std::hash<string>()(pattern); -+ return h ^ (std::hash<int>()(cflags) + 0x9e3779b9 + (h << 6) + (h >> 2)); -+#else - size_t h = tr1::hash<string>()(pattern); - return h ^ (tr1::hash<int>()(cflags) + 0x9e3779b9 + (h << 6) + (h >> 2)); -+#endif - } - - // ------------------------------------------------------------------------ diff --git a/comms/fllog/files/patch-src_xmlrpcpp_XmlRpcBase64.h b/comms/fllog/files/patch-src_xmlrpcpp_XmlRpcBase64.h deleted file mode 100644 index 1edfc6ada973..000000000000 --- a/comms/fllog/files/patch-src_xmlrpcpp_XmlRpcBase64.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/xmlrpcpp/XmlRpcBase64.h.orig 2015-08-12 21:02:28 UTC -+++ src/xmlrpcpp/XmlRpcBase64.h -@@ -18,6 +18,7 @@ - #if !defined(__BASE64_H_INCLUDED__) - #define __BASE64_H_INCLUDED__ 1 - -+#include <ios> - #include <iterator> - - static |