svn commit: r436980 - in head/comms/fldigi: . files
Diane Bruce
db at FreeBSD.org
Sun Mar 26 19:00:01 UTC 2017
Author: db
Date: Sun Mar 26 18:59:58 2017
New Revision: 436980
URL: https://svnweb.freebsd.org/changeset/ports/436980
Log:
Fix compile bug in FreeBSD 12
as noted here http://beefy12.nyi.freebsd.org/\
data/head-amd64-default/p436864_s315918/logs/fldigi-3.23.20.log
Update to maintenance bug fix release 3.23.21
Clean up missing dependencies as reported by poudriere
Reported by: pkg-fallout
Added:
head/comms/fldigi/files/patch-src_logbook_adif__io.cxx (contents, props changed)
Modified:
head/comms/fldigi/Makefile
head/comms/fldigi/distinfo
head/comms/fldigi/files/patch-src_include_main.h
head/comms/fldigi/files/patch-src_misc_newinstall.cxx
head/comms/fldigi/files/patch-src_widgets_picture.cxx
Modified: head/comms/fldigi/Makefile
==============================================================================
--- head/comms/fldigi/Makefile Sun Mar 26 18:57:11 2017 (r436979)
+++ head/comms/fldigi/Makefile Sun Mar 26 18:59:58 2017 (r436980)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= fldigi
-PORTVERSION= 3.23.20
+PORTVERSION= 3.23.21
CATEGORIES= comms hamradio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}
@@ -13,13 +13,16 @@ LICENSE= GPLv3
BUILD_DEPENDS= asciidoc:textproc/asciidoc\
docbook-xsl>=1.0:textproc/docbook-xsl\
xsltproc:textproc/libxslt
-LIB_DEPENDS= libsamplerate.so:audio/libsamplerate\
- libboost_system.so:devel/boost-libs\
- libfltk.so:x11-toolkits/fltk
+LIB_DEPENDS= libboost_system.so:devel/boost-libs\
+ libpng16.so:graphics/png \
+ libfltk.so:x11-toolkits/fltk \
+ libfontconfig.so:x11-fonts/fontconfig \
+ libsamplerate.so:audio/libsamplerate
USE_CXXSTD= gnu++0x
GNU_CONFIGURE= yes
-USES= compiler:c++11-lib execinfo gmake perl5 pkgconfig shebangfix
+USES= compiler:c++11-lib execinfo jpeg gmake perl5 pkgconfig shebangfix
+USE_XORG= x11 xft xext xfixes xcursor xinerama
CONFIGURE_ENV= FLTK_CONFIG="${LOCALBASE}/bin/fltk-config" \
EXTRA_LIBS="-lexecinfo"
Modified: head/comms/fldigi/distinfo
==============================================================================
--- head/comms/fldigi/distinfo Sun Mar 26 18:57:11 2017 (r436979)
+++ head/comms/fldigi/distinfo Sun Mar 26 18:59:58 2017 (r436980)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1483830837
-SHA256 (fldigi-3.23.20.tar.gz) = 97b5489c4e428ed707aaf6c05a7b46874339031a8e9b24e50f4818c15435fce9
-SIZE (fldigi-3.23.20.tar.gz) = 3215903
+TIMESTAMP = 1490552971
+SHA256 (fldigi-3.23.21.tar.gz) = a70914876a415eba5eec112f752330a1cecbf55aa442f5d9dd466fb75ea11a3b
+SIZE (fldigi-3.23.21.tar.gz) = 3217867
Modified: head/comms/fldigi/files/patch-src_include_main.h
==============================================================================
--- head/comms/fldigi/files/patch-src_include_main.h Sun Mar 26 18:57:11 2017 (r436979)
+++ head/comms/fldigi/files/patch-src_include_main.h Sun Mar 26 18:59:58 2017 (r436980)
@@ -1,4 +1,4 @@
---- src/include/main.h.orig 2016-12-07 04:15:22 UTC
+--- src/include/main.h.orig 2017-01-29 13:26:25 UTC
+++ src/include/main.h
@@ -22,6 +22,8 @@
#define MAIN_H_
Added: head/comms/fldigi/files/patch-src_logbook_adif__io.cxx
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/comms/fldigi/files/patch-src_logbook_adif__io.cxx Sun Mar 26 18:59:58 2017 (r436980)
@@ -0,0 +1,11 @@
+--- src/logbook/adif_io.cxx.orig 2017-01-29 13:26:25 UTC
++++ src/logbook/adif_io.cxx
+@@ -316,7 +316,7 @@ void cAdifIO::do_readfile(const char *fn
+ } else {
+ ptr2 = ptr + 1;
+ }
+- if ((ptr2) > 0 && (unsigned)(ptr2 - ptr) <= p)
++ if ((unsigned long)(ptr2) > 0 && (unsigned long)(ptr2 - ptr) <= p)
+ ptr = strchr(ptr2,'<');
+ else
+ break; // corrupt record
Modified: head/comms/fldigi/files/patch-src_misc_newinstall.cxx
==============================================================================
--- head/comms/fldigi/files/patch-src_misc_newinstall.cxx Sun Mar 26 18:57:11 2017 (r436979)
+++ head/comms/fldigi/files/patch-src_misc_newinstall.cxx Sun Mar 26 18:59:58 2017 (r436980)
@@ -1,4 +1,4 @@
---- src/misc/newinstall.cxx.orig 2016-08-07 11:40:51 UTC
+--- src/misc/newinstall.cxx.orig 2017-01-29 13:26:25 UTC
+++ src/misc/newinstall.cxx
@@ -67,7 +67,7 @@ text[3] = " btu <NAME> <CALL> de <MYCALL
Modified: head/comms/fldigi/files/patch-src_widgets_picture.cxx
==============================================================================
--- head/comms/fldigi/files/patch-src_widgets_picture.cxx Sun Mar 26 18:57:11 2017 (r436979)
+++ head/comms/fldigi/files/patch-src_widgets_picture.cxx Sun Mar 26 18:59:58 2017 (r436980)
@@ -1,4 +1,4 @@
---- src/widgets/picture.cxx.orig 2016-09-18 12:35:58 UTC
+--- src/widgets/picture.cxx.orig 2017-01-29 13:26:25 UTC
+++ src/widgets/picture.cxx
@@ -40,6 +40,7 @@
#include <algorithm>
More information about the svn-ports-head
mailing list