Hi ports (and Tim) -- Attached is an update to a previous submission for comms/fldigi. With this version all the patches go away.
I need this to go in because this version links with fltk-1.3.3 whereas the version we currently have in ports does not. I'm working on the fltk-1.3.3 update now and running it here so I would appreciate someone testing this on fltk-1.3.2
OK? ~Brian
Index: Makefile =================================================================== RCS file: /cvs/ports/comms/fldigi/Makefile,v retrieving revision 1.7 diff -u -p -r1.7 Makefile --- Makefile 16 Sep 2014 16:21:12 -0000 1.7 +++ Makefile 29 Dec 2014 19:25:24 -0000 @@ -2,7 +2,7 @@ COMMENT= soundcard-based software modem for Amateur Radio use -DISTNAME= fldigi-3.21.83 +DISTNAME= fldigi-3.22.04 CATEGORIES= comms hamradio @@ -11,9 +11,9 @@ HOMEPAGE= http://www.w1hkj.com/Fldigi.ht # GPLv3+ PERMIT_PACKAGE_CDROM= Yes -WANTLIB += X11 Xau Xdmcp Xext Xft Xinerama c fltk fltk_images -WANTLIB += fontconfig hamlib jpeg m png portaudio pthread samplerate -WANTLIB += sndfile stdc++ z +WANTLIB += X11 Xau Xcursor Xdmcp Xext Xfixes Xft Xinerama c fltk +WANTLIB += fltk_images fontconfig hamlib jpeg m png portaudio +WANTLIB += pthread samplerate sndfile stdc++ z MASTER_SITES= http://www.w1hkj.com/downloads/fldigi/ Index: distinfo =================================================================== RCS file: /cvs/ports/comms/fldigi/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo 16 Sep 2014 16:21:12 -0000 1.6 +++ distinfo 29 Dec 2014 19:25:24 -0000 @@ -1,2 +1,2 @@ -SHA256 (fldigi-3.21.83.tar.gz) = KYDTK+pXM2vYRh/aqvl6moIgOTCaw5yBMKvbblgzz7s= -SIZE (fldigi-3.21.83.tar.gz) = 2654359 +SHA256 (fldigi-3.22.04.tar.gz) = k2snAt09OrNjDqwBjCqwQwad2RKYWPK24R4dswrkptg= +SIZE (fldigi-3.22.04.tar.gz) = 2822732 Index: patches/patch-scripts_tests_config-h_sh =================================================================== RCS file: patches/patch-scripts_tests_config-h_sh diff -N patches/patch-scripts_tests_config-h_sh --- patches/patch-scripts_tests_config-h_sh 13 May 2013 18:23:51 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-scripts_tests_config-h_sh,v 1.1.1.1 2013/05/13 18:23:51 sthen Exp $ ---- scripts/tests/config-h.sh.orig Wed Feb 6 18:14:44 2013 -+++ scripts/tests/config-h.sh Wed Feb 6 18:14:50 2013 -@@ -4,7 +4,7 @@ - - r=0 - for f in $fldigi_SOURCES $flarq_SOURCES; do -- base=$(echo $f | sed -n '/\.[cC][cCpPxX]\{1,\}/ { s!.*/\(.*\)\.[^.]*$!\1!; p }') -+ base=$(echo $f | gsed -n '/\.[cC][cCpPxX]\{1,\}/ { s!.*/\(.*\)\.[^.]*$!\1!; p }') - test "x$base" = "x" && continue - test -f "fldigi-${base}.${OBJEXT}" || test -f "flarq-${base}.${OBJEXT}" || continue - if ! grep "include.*config\.h" "${srcdir}/${f}" >/dev/null; then Index: patches/patch-scripts_tests_cr_sh =================================================================== RCS file: patches/patch-scripts_tests_cr_sh diff -N patches/patch-scripts_tests_cr_sh --- patches/patch-scripts_tests_cr_sh 13 May 2013 18:23:51 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-scripts_tests_cr_sh,v 1.1.1.1 2013/05/13 18:23:51 sthen Exp $ ---- scripts/tests/cr.sh.orig Wed Feb 6 18:14:44 2013 -+++ scripts/tests/cr.sh Wed Feb 6 18:14:55 2013 -@@ -4,7 +4,7 @@ - - r=0 - for f in $fldigi_SOURCES $flarq_SOURCES $EXTRA_fldigi_SOURCES $EXTRA_DIST; do -- base=$(echo $f | sed -n '/\.[cC][cCpPxX]\{1,\}/ { s!.*/\(.*\)\.[^.]*$!\1!; p }') -+ base=$(echo $f | gsed -n '/\.[cC][cCpPxX]\{1,\}/ { s!.*/\(.*\)\.[^.]*$!\1!; p }') - if test "x$base" != "x" && grep " " "${srcdir}/${f}" >/dev/null; then - echo "E: $f has CRLF line terminators" >&2 - r=1 Index: patches/patch-src_xmlrpcpp_XmlRpcDispatch_cpp =================================================================== RCS file: patches/patch-src_xmlrpcpp_XmlRpcDispatch_cpp diff -N patches/patch-src_xmlrpcpp_XmlRpcDispatch_cpp --- patches/patch-src_xmlrpcpp_XmlRpcDispatch_cpp 22 Mar 2014 01:26:42 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_xmlrpcpp_XmlRpcDispatch_cpp,v 1.3 2014/03/22 01:26:42 sthen Exp $ ---- src/xmlrpcpp/XmlRpcDispatch.cpp.orig Tue Mar 11 13:08:13 2014 -+++ src/xmlrpcpp/XmlRpcDispatch.cpp Sat Mar 22 01:11:37 2014 -@@ -30,7 +30,7 @@ - #include <errno.h> - #include <math.h> - --#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || defined(__OpenBSD__) - # ifdef USE_FTIME - # include <sys/timeb.h> - # endif Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/comms/fldigi/pkg/PLIST,v retrieving revision 1.2 diff -u -p -r1.2 PLIST --- pkg/PLIST 12 Nov 2013 08:22:38 -0000 1.2 +++ pkg/PLIST 29 Dec 2014 19:25:24 -0000 @@ -16,6 +16,7 @@ share/locale/de/LC_MESSAGES/fldigi.mo share/locale/es/LC_MESSAGES/fldigi.mo share/locale/fr/LC_MESSAGES/fldigi.mo share/locale/it/LC_MESSAGES/fldigi.mo +share/locale/nl/LC_MESSAGES/fldigi.mo share/locale/pl/LC_MESSAGES/fldigi.mo share/pixmaps/ share/pixmaps/flarq.xpm
