Index: head/comms/fllog/Makefile =================================================================== --- head/comms/fllog/Makefile (revision 430847) +++ head/comms/fllog/Makefile (revision 430848) @@ -1,32 +1,31 @@ # Created by: Stephen Hurd # $FreeBSD$ PORTNAME= fllog -PORTVERSION= 1.2.0 +PORTVERSION= 1.2.4 CATEGORIES= comms hamradio -MASTER_SITES= http://www.w1hkj.com/downloads/fllog/ \ - LOCAL/shurd +MASTER_SITES= SF/fldigi/${PORTNAME} MAINTAINER= hamradio@FreeBSD.org COMMENT= Ham Radio logging program LICENSE= GPLv2 LIB_DEPENDS= libfltk.so:x11-toolkits/fltk USES= gmake GNU_CONFIGURE= yes CONFIGURE_ENV= FLTK_CONFIG="${LOCALBASE}/bin/fltk-config" OPTIONS_DEFINE= NATIVE_OPT NATIVE_OPT_DESC= Enable Native Optimizations PLIST_FILES= bin/fllog \ share/applications/fllog.desktop \ share/pixmaps/fllog.xpm NATIVE_OPT_CONFIGURE_ON= --enable-optimizations=native NATIVE_OPT_CONFIGURE_OFF= --enable-optimizations=none .include Index: head/comms/fllog/distinfo =================================================================== --- head/comms/fllog/distinfo (revision 430847) +++ head/comms/fllog/distinfo (revision 430848) @@ -1,2 +1,3 @@ -SHA256 (fllog-1.2.0.tar.gz) = 7cac198e0e9def5853a6b3df1ad1968752a90f0d2d3477e071567fdde4c436d3 -SIZE (fllog-1.2.0.tar.gz) = 422283 +TIMESTAMP = 1483833165 +SHA256 (fllog-1.2.4.tar.gz) = e4647032b1ebc5f2206edc624a40e331f5ab2b3dd1e33d7698223071d6d9b15b +SIZE (fllog-1.2.4.tar.gz) = 430920 Property changes on: head/comms/fllog/distinfo ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -yes \ No newline at end of property +1 \ No newline at end of property Index: head/comms/fllog/files/patch-configure =================================================================== --- head/comms/fllog/files/patch-configure (revision 430847) +++ head/comms/fllog/files/patch-configure (revision 430848) @@ -1,11 +1,11 @@ ---- configure.orig 2014-04-11 13:36:43.000000000 -0700 -+++ configure 2014-04-11 13:36:32.000000000 -0700 -@@ -6857,7 +6857,7 @@ +--- configure.orig 2016-06-24 01:21:41 UTC ++++ configure +@@ -6143,7 +6143,7 @@ $as_echo "$FLTK_CONFIG" >&6; } FLTK_LIBS=`$FLTK_CONFIG --ldflags --use-images` if test "x$target_mingw32" != "xyes"; then if test "x$target_darwin" != "xyes"; then - if grep -q "lX11" <<< "$FLTK_LIBS"; then + if echo "$FLTK_LIBS" | grep -q "lX11"; then FLTK_LIBS="$FLTK_LIBS"; else FLTK_LIBS="$FLTK_LIBS -lm -lX11"; Property changes on: head/comms/fllog/files/patch-configure ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -on \ No newline at end of property +1 \ No newline at end of property Index: head/comms/fllog/files/patch-src_include_logsupport.h =================================================================== --- head/comms/fllog/files/patch-src_include_logsupport.h (nonexistent) +++ head/comms/fllog/files/patch-src_include_logsupport.h (revision 430848) @@ -0,0 +1,9 @@ +--- src/include/logsupport.h.orig 2017-01-08 00:13:11 UTC ++++ src/include/logsupport.h +@@ -1,5 +1,5 @@ + #ifndef LOG_SUPPORT_H +-#define LOG_SUPPORT_h ++#define LOG_SUPPORT_H + + #include + Property changes on: head/comms/fllog/files/patch-src_include_logsupport.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +1 \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/fllog/files/patch-src_misc_re.cxx =================================================================== --- head/comms/fllog/files/patch-src_misc_re.cxx (revision 430847) +++ head/comms/fllog/files/patch-src_misc_re.cxx (revision 430848) @@ -1,28 +1,28 @@ ---- src/misc/re.cxx.orig 2014-02-03 15:43:56.000000000 -0800 -+++ src/misc/re.cxx 2014-04-11 16:24:42.000000000 -0700 -@@ -120,12 +120,25 @@ +--- 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() + #include + #define HAS_STD_TR1 + #endif +#endif +#ifndef HAS_STD_TR1 #include +#endif size_t re_t::hash(void) const { +#ifdef HAS_STD_TR1 + size_t h = std::hash()(pattern); + return h ^ (std::hash()(cflags) + 0x9e3779b9 + (h << 6) + (h >> 2)); +#else size_t h = tr1::hash()(pattern); return h ^ (tr1::hash()(cflags) + 0x9e3779b9 + (h << 6) + (h >> 2)); +#endif } // ------------------------------------------------------------------------ Property changes on: head/comms/fllog/files/patch-src_misc_re.cxx ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -on \ No newline at end of property +1 \ No newline at end of property Index: head/comms/fllog/files/patch-src_xmlrpcpp_XmlRpcBase64.h =================================================================== --- head/comms/fllog/files/patch-src_xmlrpcpp_XmlRpcBase64.h (nonexistent) +++ head/comms/fllog/files/patch-src_xmlrpcpp_XmlRpcBase64.h (revision 430848) @@ -0,0 +1,10 @@ +--- 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 + #include + + static Property changes on: head/comms/fllog/files/patch-src_xmlrpcpp_XmlRpcBase64.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +1 \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property