Index: head/comms/cubicsdr/files/patch-src_FrequencyDialog.cpp =================================================================== --- head/comms/cubicsdr/files/patch-src_FrequencyDialog.cpp (revision 522843) +++ head/comms/cubicsdr/files/patch-src_FrequencyDialog.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- src/FrequencyDialog.cpp.orig 2019-02-25 02:39:08 UTC -+++ src/FrequencyDialog.cpp -@@ -218,7 +218,7 @@ void FrequencyDialog::OnChar(wxKeyEvent& event) { - - if (allowed.find_first_of(c) != std::string::npos || c == WXK_DELETE || c == WXK_BACK || c == WXK_NUMPAD_DECIMAL - || (c >= WXK_NUMPAD0 && c <= WXK_NUMPAD9)) { --#ifdef __linux__ -+#if defined(__linux__) || defined(__FreeBSD__) - dialogText->OnChar(event); - event.Skip(); - #else Property changes on: head/comms/cubicsdr/files/patch-src_FrequencyDialog.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/cubicsdr/files/patch-src_util_MouseTracker.cpp =================================================================== --- head/comms/cubicsdr/files/patch-src_util_MouseTracker.cpp (revision 522843) +++ head/comms/cubicsdr/files/patch-src_util_MouseTracker.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- src/util/MouseTracker.cpp.orig 2019-02-25 12:54:38 UTC -+++ src/util/MouseTracker.cpp -@@ -30,7 +30,7 @@ void MouseTracker::OnMouseMoved(wxMouseEvent& event) { - - if (isMouseDown || isMouseRightDown) { - #ifndef __APPLE__ --#ifndef __linux__ -+#if !defined(__linux__) && !defined(__FreeBSD__) - if (horizDragLock && vertDragLock) { - target->WarpPointer(originMouseX * ClientSize.x, (1.0 - originMouseY) * ClientSize.y); - mouseX = originMouseX; Property changes on: head/comms/cubicsdr/files/patch-src_util_MouseTracker.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/cubicsdr/files/patch-src_CubicSDRDefs.h =================================================================== --- head/comms/cubicsdr/files/patch-src_CubicSDRDefs.h (revision 522843) +++ head/comms/cubicsdr/files/patch-src_CubicSDRDefs.h (nonexistent) @@ -1,30 +0,0 @@ ---- src/CubicSDRDefs.h.orig 2018-06-08 03:58:55 UTC -+++ src/CubicSDRDefs.h -@@ -2,6 +2,7 @@ - // SPDX-License-Identifier: GPL-2.0+ - - #pragma once -+#include - - #define CUBICSDR_TITLE "" CUBICSDR_BUILD_TITLE - -@@ -16,7 +17,11 @@ - #ifdef __APPLE__ - #include - #else -- #include -+ #ifdef __FreeBSD__ -+ #include -+ #else -+ #include -+ #endif - #endif - #endif - #endif -@@ -62,4 +67,4 @@ const char filePathSeparator = - - //The maximum number of listed sample rates for a device, to be able to handle - //devices returning an insane amount because they have quasi-continuous ranges (UHD...) --#define DEVICE_SAMPLE_RATES_MAX_NB 25 -\ No newline at end of file -+#define DEVICE_SAMPLE_RATES_MAX_NB 25 Property changes on: head/comms/cubicsdr/files/patch-src_CubicSDRDefs.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/cubicsdr/files/patch-src_AppFrame.cpp =================================================================== --- head/comms/cubicsdr/files/patch-src_AppFrame.cpp (revision 522843) +++ head/comms/cubicsdr/files/patch-src_AppFrame.cpp (nonexistent) @@ -1,20 +0,0 @@ ---- src/AppFrame.cpp.orig 2019-02-25 02:52:05 UTC -+++ src/AppFrame.cpp -@@ -34,7 +34,7 @@ - #include - #include - --#ifdef __linux__ -+#if defined(__linux__) || defined(__FreeBSD__) - #include "CubicSDR.xpm" - #endif - -@@ -79,7 +79,7 @@ std::vector str_explode(const std::string - AppFrame::AppFrame() : - wxFrame(NULL, wxID_ANY, CUBICSDR_TITLE), activeDemodulator(nullptr) { - --#ifdef __linux__ -+#if defined(__linux__) || defined(__FreeBSD__) - SetIcon(wxICON(cubicsdr)); - #endif - Property changes on: head/comms/cubicsdr/files/patch-src_AppFrame.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/cubicsdr/files/patch-src_DemodLabelDialog.cpp =================================================================== --- head/comms/cubicsdr/files/patch-src_DemodLabelDialog.cpp (revision 522843) +++ head/comms/cubicsdr/files/patch-src_DemodLabelDialog.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- src/DemodLabelDialog.cpp.orig 2019-02-25 02:53:22 UTC -+++ src/DemodLabelDialog.cpp -@@ -83,7 +83,7 @@ void DemodLabelDialog::OnChar(wxKeyEvent& event) { - - } - else { --#ifdef __linux__ -+#if defined(__linux__) || defined(__FreeBSD__) - dialogText->OnChar(event); - event.Skip(); - #else Property changes on: head/comms/cubicsdr/files/patch-src_DemodLabelDialog.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/cubicsdr/files/patch-src_util_GLExt.cpp =================================================================== --- head/comms/cubicsdr/files/patch-src_util_GLExt.cpp (revision 522843) +++ head/comms/cubicsdr/files/patch-src_util_GLExt.cpp (nonexistent) @@ -1,20 +0,0 @@ ---- src/util/GLExt.cpp.orig 2018-08-20 16:53:40 UTC -+++ src/util/GLExt.cpp -@@ -9,7 +9,7 @@ - #include - #endif - --#ifdef __linux__ -+#if defined(__linux__) || defined(__FreeBSD__) - #include - #endif - -@@ -60,7 +60,7 @@ void initGLExtensions() { - CGLSetParameter (CGLGetCurrentContext(), kCGLCPSwapInterval, &interval); - #endif - --#ifdef __linux__ -+#if defined(__linux__) || defined(__FreeBSD__) - dlopen("libglx.so",RTLD_LAZY); - - void (*glxSwapIntervalEXTFunc) (Display *dpy, GLXDrawable drawable, int interval) = 0; Property changes on: head/comms/cubicsdr/files/patch-src_util_GLExt.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/cubicsdr/Makefile =================================================================== --- head/comms/cubicsdr/Makefile (revision 522843) +++ head/comms/cubicsdr/Makefile (revision 522844) @@ -1,48 +1,46 @@ # $FreeBSD$ PORTNAME= cubicsdr DISTVERSION= 0.2.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= comms hamradio MAINTAINER= hamradio@FreeBSD.org COMMENT= SDR receiver using liquidsdr LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN= fails to build - RUN_DEPENDS= ${PYNUMPY} \ ${LOCALBASE}/lib/libEGL.so:graphics/mesa-libs \ ${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri LIB_DEPENDS= libSoapySDR.so:misc/soapysdr \ libliquid.so:comms/liquid-dsp \ libpulse.so:audio/pulseaudio \ libhamlib.so:comms/hamlib \ libEGL.so:graphics/mesa-libs \ libwx_gtk3u_core-3.1.so:x11-toolkits/wxgtk31 USES= cmake compiler:c++0x gl python USE_GL+= glu OPTIONS_DEFINE= HAMLIB HAMLIB_DESC= Support rig control via hamlib OPTIONS_DEFAULT= HAMLIB .include .if ${PORT_OPTIONS:MHAMLIB} LIB_DEPENDS+= libhamlib.so:comms/hamlib CMAKE_ARGS+= -DUSE_HAMLIB=1 .endif CMAKE_ARGS+= -DwxWidgets_CONFIG_EXECUTABLE=${LOCALBASE}/bin/wxgtk3u-3.1-config -# if Only I could just do -#USE_WX= 3.1 -#WX_COMPS= wx +USE_WX= 3.1 +WX_COMPS= wx USE_GITHUB= yes GH_ACCOUNT= cjcliffe GH_PROJECT= CubicSDR +GH_TAGNAME= 9c32b97 .include Index: head/comms/cubicsdr/distinfo =================================================================== --- head/comms/cubicsdr/distinfo (revision 522843) +++ head/comms/cubicsdr/distinfo (revision 522844) @@ -1,3 +1,3 @@ -TIMESTAMP = 1551114984 -SHA256 (cjcliffe-CubicSDR-0.2.5_GH0.tar.gz) = 5cb44c110fcbbb70a468b7fa402cf35f84d8901b3dd42d471a90ac3f5db00f4d -SIZE (cjcliffe-CubicSDR-0.2.5_GH0.tar.gz) = 36911106 +TIMESTAMP = 1578325251 +SHA256 (cjcliffe-CubicSDR-0.2.5-9c32b97_GH0.tar.gz) = 46eb12b942c7e38dbfe8a84448a3721b5d9c7c1fd8878f8cad7bd37806352dbf +SIZE (cjcliffe-CubicSDR-0.2.5-9c32b97_GH0.tar.gz) = 35466535 Property changes on: head/comms/cubicsdr/distinfo ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -yes \ No newline at end of property +1 \ No newline at end of property