8 files changed, 42 insertions, 15 deletions

diff --git a/comms/tlf/Makefile b/comms/tlf/Makefile
index cd624e48b54b..3aefd6f36633 100644
--- a/comms/tlf/Makefile
+++ b/comms/tlf/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tlf
-PORTVERSION=	1.2.2
+PORTVERSION=	1.2.3
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.hs-mittweida.de/tb/ \
 		LOCAL/db
@@ -16,13 +16,14 @@ LIB_DEPENDS=	libglib-2.0.so:devel/glib20
 
 USES=		pkgconfig
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	PANEL_LIB=-lpanel
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 
 OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	HAMLIB
 HAMLIB_DESC=	Support rig control via hamlib
-OPTION_DEFAULT=	HAMLIB
+OPTIONS_DEFAULT=HAMLIB
 
 HAMLIB_LIB_DEPENDS=	libhamlib.so:comms/hamlib
 HAMLIB_CONFIGURE_ENABLE=hamlib
diff --git a/comms/tlf/distinfo b/comms/tlf/distinfo
index fcb6076cc3ec..0426b9013dd3 100644
--- a/comms/tlf/distinfo
+++ b/comms/tlf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tlf-1.2.2.tar.gz) = dc4bd660cfd145ed193993bf7dfb1544b05b2f615a8fe5d2cc6da1403a9744ed
-SIZE (tlf-1.2.2.tar.gz) = 594524
+SHA256 (tlf-1.2.3.tar.gz) = def2af96ec084744baa7efbbf92b969d04e84fb62b184692cf181c45be5754ad
+SIZE (tlf-1.2.3.tar.gz) = 622883
diff --git a/comms/tlf/files/patch-share_logcfg.dat b/comms/tlf/files/patch-share_logcfg.dat
index ca40e14f5a7b..2b090cb2de1a 100644
--- a/comms/tlf/files/patch-share_logcfg.dat
+++ b/comms/tlf/files/patch-share_logcfg.dat
@@ -1,4 +1,4 @@
---- share/logcfg.dat.orig	2013-11-20 07:45:58 UTC
+--- share/logcfg.dat.orig	2016-01-16 17:45:20 UTC
 +++ share/logcfg.dat
 @@ -27,8 +27,8 @@ RULES=cqww
  #                               #
@@ -9,5 +9,5 @@
 +#EDITOR=joe
 +EDITOR=vi
  #EDITOR=e3
- #EDITOR=MC
+ #EDITOR=mcedit
  #
diff --git a/comms/tlf/files/patch-src_netkeyer.c b/comms/tlf/files/patch-src_netkeyer.c
new file mode 100644
index 000000000000..cb501184ffd0
--- /dev/null
+++ b/comms/tlf/files/patch-src_netkeyer.c
@@ -0,0 +1,13 @@
+--- src/netkeyer.c.orig	2016-01-16 17:45:20 UTC
++++ src/netkeyer.c
+@@ -17,7 +17,9 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  */
+ 
+-
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
+ #include <netdb.h>
+ #include <string.h>
+ #include <unistd.h>
diff --git a/comms/tlf/files/patch-src_readcalls.c b/comms/tlf/files/patch-src_readcalls.c
index 223a6ab39d59..19186ed985bd 100644
--- a/comms/tlf/files/patch-src_readcalls.c
+++ b/comms/tlf/files/patch-src_readcalls.c
@@ -1,6 +1,6 @@
---- src/readcalls.c.orig	2015-11-03 16:15:23 UTC
+--- src/readcalls.c.orig	2016-01-16 17:45:20 UTC
 +++ src/readcalls.c
-@@ -641,7 +641,7 @@ int synclog(char *synclogfile)
+@@ -637,7 +637,7 @@ int synclog(char *synclogfile)
  
      showmsg("Merging logfiles...\n");
      sleep(1);
diff --git a/comms/tlf/files/patch-src_sockserv.c b/comms/tlf/files/patch-src_sockserv.c
new file mode 100644
index 000000000000..4ef4e0c1576b
--- /dev/null
+++ b/comms/tlf/files/patch-src_sockserv.c
@@ -0,0 +1,11 @@
+--- src/sockserv.c.orig	2016-01-16 17:45:20 UTC
++++ src/sockserv.c
+@@ -23,6 +23,8 @@
+ /* Written by N2RJT - Dave Brown */
+ 
+ 
++#include <sys/socket.h>
++#include <netinet/in.h>
+ #include <errno.h>
+ #include <netdb.h>
+ #include <stdio.h>
diff --git a/comms/tlf/files/patch-src_writecabrillo.c b/comms/tlf/files/patch-src_writecabrillo.c
index fc57ec3785f2..b1b34d075f8a 100644
--- a/comms/tlf/files/patch-src_writecabrillo.c
+++ b/comms/tlf/files/patch-src_writecabrillo.c
@@ -1,11 +1,11 @@
---- src/writecabrillo.c.orig	2015-11-03 16:18:24 UTC
+--- src/writecabrillo.c.orig	2016-04-07 07:00:33 UTC
 +++ src/writecabrillo.c
-@@ -21,8 +21,6 @@
- 	 *   write cabrillo  file
- 	 *
+@@ -23,8 +23,6 @@
  	 *--------------------------------------------------------------*/
+ 
+ 
 -#define _XOPEN_SOURCE 500
 -#define _GNU_SOURCE
- #include "writecabrillo.h"
- #include "ui_utils.h"
- #include <glib.h>
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
diff --git a/comms/tlf/pkg-plist b/comms/tlf/pkg-plist
index 4201cfca2b03..9eb2b27a07d4 100644
--- a/comms/tlf/pkg-plist
+++ b/comms/tlf/pkg-plist
@@ -16,6 +16,7 @@ man/man1/tlf.1.gz
 %%DATADIR%%/rules/aadx_as
 %%DATADIR%%/rules/aadx_dx
 %%DATADIR%%/rules/arrl10m_dx
+%%DATADIR%%/rules/arrl160m_usa
 %%DATADIR%%/rules/arrldx_dx
 %%DATADIR%%/rules/arrldx_usa
 %%DATADIR%%/rules/arrlfd
@@ -48,3 +49,4 @@ man/man1/tlf.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/README.ssb
 %%PORTDOCS%%%%DOCSDIR%%/README_QTC.txt
 %%PORTDOCS%%%%DOCSDIR%%/README_QTC_RTTY.txt
+%%PORTDOCS%%%%DOCSDIR%%/README.RTTY