diff --git a/comms/fldigi/Makefile b/comms/fldigi/Makefile index 67f4214c2e40..6faf899dd85d 100644 --- a/comms/fldigi/Makefile +++ b/comms/fldigi/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= fldigi -PORTVERSION= 4.1.14 -PORTREVISION= 1 +PORTVERSION= 4.1.15 CATEGORIES= comms hamradio MASTER_SITES= SF/${PORTNAME}/${PORTNAME} diff --git a/comms/fldigi/distinfo b/comms/fldigi/distinfo index e6149086092a..21a01ee0e090 100644 --- a/comms/fldigi/distinfo +++ b/comms/fldigi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1594560733 -SHA256 (fldigi-4.1.14.tar.gz) = b21bec36a5ed1c44207da9128c52108ad5263bb2b0772932f9c7f500f6ea2643 -SIZE (fldigi-4.1.14.tar.gz) = 4792805 +TIMESTAMP = 1603624117 +SHA256 (fldigi-4.1.15.tar.gz) = 260a61be714d9a7274adb78a822f210a589f4c344d5444c5f2cbbcd7c466ebbb +SIZE (fldigi-4.1.15.tar.gz) = 4838204 diff --git a/comms/fldigi/files/patch-src_logbook_table.cxx b/comms/fldigi/files/patch-src_logbook_table.cxx new file mode 100644 index 000000000000..e703df9bcd9d --- /dev/null +++ b/comms/fldigi/files/patch-src_logbook_table.cxx @@ -0,0 +1,15 @@ +--- src/logbook/table.cxx.orig 2020-10-17 12:50:46 UTC ++++ src/logbook/table.cxx +@@ -46,10 +46,11 @@ using namespace std; + * nullptr is not available in gcc < 4.6 + * Redefine to NULL for CentOS 6 and OSX Darwin + */ ++#ifndef __FreeBSD__ + #ifndef nullptr + #define nullptr NULL + #endif +- ++#endif + + /* + * ====================================== diff --git a/comms/fldigi/files/patch-src_misc_newinstall.cxx b/comms/fldigi/files/patch-src_misc_newinstall.cxx index 2cc1eca88adc..66ba847483df 100644 --- a/comms/fldigi/files/patch-src_misc_newinstall.cxx +++ b/comms/fldigi/files/patch-src_misc_newinstall.cxx @@ -1,6 +1,6 @@ ---- src/misc/newinstall.cxx.orig 2019-04-18 20:27:04 UTC +--- src/misc/newinstall.cxx.orig 2020-08-10 09:49:03 UTC +++ src/misc/newinstall.cxx -@@ -67,7 +67,7 @@ text[3] = " btu de k\n\ +@@ -69,7 +69,7 @@ text[3] = " btu de k\n\ label[4] = "SK @||"; text[4] = "\n\