4 files changed, 33 insertions, 37 deletions

diff --git a/comms/gqrx/Makefile b/comms/gqrx/Makefile
index e14a05a7e310..47828b961c08 100644
--- a/comms/gqrx/Makefile
+++ b/comms/gqrx/Makefile
@@ -2,16 +2,15 @@
 # $FreeBSD$
 
 PORTNAME=	gqrx
-PORTVERSION=	20140313
-PORTREVISION=	1
+PORTVERSION=	2.3.1
+PORTEPOCH=	1
 CATEGORIES=	comms hamradio
-MASTER_SITES=	http://contribs.martymac.org/FreeBSD-ports/distfiles/ \
-		LOCAL/martymac
 
 MAINTAINER=	martymac@FreeBSD.org
-COMMENT=	Qt-based software defined radio receiver
+COMMENT=	Software defined radio receiver powered by GNU Radio and Qt
 
 LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libgnuradio-runtime.so:${PORTSDIR}/comms/gnuradio \
 		libgnuradio-analog.so:${PORTSDIR}/comms/gnuradio \
@@ -21,18 +20,21 @@ LIB_DEPENDS=	libgnuradio-runtime.so:${PORTSDIR}/comms/gnuradio \
 		libgnuradio-audio.so:${PORTSDIR}/comms/gnuradio \
 		libgnuradio-osmosdr.so:${PORTSDIR}/comms/gr-osmosdr \
 		libpulse.so:${PORTSDIR}/audio/pulseaudio \
-		libpulse-simple.so:${PORTSDIR}/audio/pulseaudio \
-		libboost_system.so:${PORTSDIR}/devel/boost-libs \
-		libboost_program_options.so:${PORTSDIR}/devel/boost-libs
+		libpulse-simple.so:${PORTSDIR}/audio/pulseaudio
 
-USES=		pkgconfig qmake tar:tgz
-USE_QT5=	buildtools_build core gui svg network widgets
+USE_GITHUB=	yes
+GH_ACCOUNT=	csete
+GH_COMMIT=	4d90b84
+GH_TAGNAME=	v${PORTVERSION}
 
-QMAKE_ARGS+=	VER="${PORTVERSION}"
+USES=		pkgconfig qmake
+USE_QT5=	buildtools_build core gui svg network widgets
 
-PLIST_FILES=	bin/gqrx
+PLIST_FILES=	bin/gqrx share/applications/gqrx.desktop
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gqrx ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/gqrx.desktop \
+		${STAGEDIR}${PREFIX}/share/applications
 
 .include <bsd.port.mk>
diff --git a/comms/gqrx/distinfo b/comms/gqrx/distinfo
index 7918982ee6c8..6943e8af6ab3 100644
--- a/comms/gqrx/distinfo
+++ b/comms/gqrx/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gqrx-20140313.tgz) = a5c0da6243d8216966082ded75a45e0168415bf28878c4c0a1839bcf22737297
-SIZE (gqrx-20140313.tgz) = 1113769
+SHA256 (gqrx-2.3.1.tar.gz) = 8e07337a628e7b172cec8aabb3108e0cb21c243891520cb78349624771cf8c72
+SIZE (gqrx-2.3.1.tar.gz) = 1080951
diff --git a/comms/gqrx/files/patch-gqrx.pro b/comms/gqrx/files/patch-gqrx.pro
index fbfecf20ab41..02a60d27f62b 100644
--- a/comms/gqrx/files/patch-gqrx.pro
+++ b/comms/gqrx/files/patch-gqrx.pro
@@ -1,26 +1,10 @@
---- gqrx.pro.orig	2014-03-10 08:41:02.000000000 +0100
-+++ gqrx.pro	2014-03-26 18:16:08.000000000 +0100
-@@ -56,12 +56,12 @@
-     #QMAKE_CFLAGS_DEBUG += '-g -O0'
- 
-     # Define version string (see below for releases)
--    VER = $$system(git describe --abbrev=8)
-+    #VER = $$system(git describe --abbrev=8)
- 
- } else {
-     DEFINES += QT_NO_DEBUG
-     DEFINES += QT_NO_DEBUG_OUTPUT
--    VER = $$system(git describe --abbrev=1)
-+    #VER = $$system(git describe --abbrev=1)
- 
-     # Release binaries with gr bundled
-     # QMAKE_RPATH & co won't work with origin
-@@ -206,7 +206,7 @@
-                  gnuradio-osmosdr
+--- ./gqrx.pro.orig	2014-08-08 08:21:20.000000000 -0500
++++ ./gqrx.pro	2014-09-05 22:50:58.000000000 -0500
+@@ -206,7 +206,6 @@
  
+ unix:!macx {
      LIBS += -lboost_system$$BOOST_SUFFIX -lboost_program_options$$BOOST_SUFFIX
 -    LIBS += -lrt  # need to include on some distros
-+    #LIBS += -lrt  # need to include on some distros
  }
  
  macx {
diff --git a/comms/gqrx/pkg-descr b/comms/gqrx/pkg-descr
index 88896b5c5952..d0f9d2dc31c6 100644
--- a/comms/gqrx/pkg-descr
+++ b/comms/gqrx/pkg-descr
@@ -1,7 +1,17 @@
 Gqrx is an experimental software defined radio receiver implemented using GNU
-Radio and the Qt GUI toolkit.
+Radio and the Qt GUI toolkit. Currently it supports the following devices:
 
-It can use the Funcube Dongle, RTL2832U-based DVB-T dongles, OsmoSDR devices
-and USRP devices as input source.
+ - Funcube Dongle Pro and Pro+
+ - RTL2832U-based DVB-T dongles (rtlsdr via USB and TCP)
+ - OsmoSDR
+ - USRP
+ - HackRF Jawbreaker
+ - Nuand bladeRF
+ - RFspace SDR-IQ, SDR-IP and NetSDR
+ - Airspy
+ - any other device supported by the gr-osmosdr library
+
+Gqrx can operate as a traditional AM/FM/SSB receiver with audio output or as
+an FFT-only instrument.
 
 WWW: http://gqrx.dk