Index: head/comms/quisk/Makefile
===================================================================
--- head/comms/quisk/Makefile	(revision 499603)
+++ head/comms/quisk/Makefile	(revision 499604)
@@ -1,33 +1,34 @@
 # Created by: Stephen Hurd <shurd@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	quisk
 PORTVERSION=	4.1.26
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	CHEESESHOP
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Software Defined Radio (SDR)
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libfftw3.so:math/fftw3 \
 		libportaudio.so:audio/portaudio \
 		libasound.so:audio/alsa-lib \
 		libpulse.so:audio/pulseaudio
 
 USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 USE_WX=		3.0+
 
 WX_COMPS=	python
 
 post-extract:
 	${RM} ${WRKSRC}/_quisk.so ${WRKSRC}/sdriqpkg/sdriq.so \
 		${WRKSRC}/freedvpkg/libcodec2_32.so \
 		${WRKSRC}/freedvpkg/libcodec2_64.so
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/setup.py
 
 .include <bsd.port.mk>
Index: head/comms/quisk/files/patch-quisk.py
===================================================================
--- head/comms/quisk/files/patch-quisk.py	(revision 499603)
+++ head/comms/quisk/files/patch-quisk.py	(revision 499604)
@@ -1,16 +1,29 @@
---- quisk.py.orig	2019-04-19 15:47:26 UTC
+--- quisk.py.orig	2018-11-23 17:50:38 UTC
 +++ quisk.py
 @@ -21,6 +21,13 @@ os.chdir(os.path.normpath(os.path.dirnam
  if sys.path[0] != "'.'":		# Make sure the current working directory is on path
    sys.path.insert(0, '.')
  
 +# Hack to ensure unicode is available.
 +import locale
 +locale.setlocale(locale.LC_ALL, '')
 +cloc = locale.getdefaultlocale()
 +if locale.nl_langinfo(locale.CODESET) != 'UTF-8':
 +  locale.setlocale(locale.LC_ALL, (cloc[0], 'UTF-8'))
 +
  import wx, wx.html, wx.lib.buttons, wx.lib.stattext, wx.lib.colourdb, wx.grid, wx.richtext
  import math, cmath, time, traceback, string, select, subprocess
  import threading, pickle, webbrowser
+@@ -3609,9 +3616,9 @@ class App(wx.App):
+     self.file_play_timer = 0
+     self.file_play_source = 0	# 10 == play audio file, 11 == play I/Q sample file, 12 == play CQ message
+     # get the screen size - thanks to Lucian Langa
+-    x1, y1, x2, y2 = wx.Display().GetGeometry()
+-    self.screen_width = x2 - x1
+-    self.screen_height = y2 - y1
++    dispGeo = wx.Display().GetGeometry()
++    self.screen_width = dispGeo.width
++    self.screen_height = dispGeo.height
+     self.Bind(wx.EVT_IDLE, self.OnIdle)
+     self.Bind(wx.EVT_QUERY_END_SESSION, self.OnEndSession)
+     # Restore persistent program state
Index: head/comms/quisk/files/patch-setup.py
===================================================================
--- head/comms/quisk/files/patch-setup.py	(revision 499603)
+++ head/comms/quisk/files/patch-setup.py	(revision 499604)
@@ -1,51 +1,61 @@
 --- setup.py.orig	2018-11-22 14:56:57 UTC
 +++ setup.py
-@@ -18,18 +18,18 @@ if sys.platform != "win32":
-   except ImportError:
-     print ("Please install the package python-wxgtk3.0 or later")
-     missing = True
+@@ -13,23 +13,23 @@ fp.close()
+ 
+ if sys.platform != "win32":
+   missing = False
+-  try:
+-    import wx
+-  except ImportError:
+-    print ("Please install the package python-wxgtk3.0 or later")
+-    missing = True
 -  if not os.path.isfile("/usr/include/fftw3.h"):
 -    print ("Please install the package libfftw3-dev")
 -    missing = True
 -  if not os.path.isdir("/usr/include/alsa"):
 -    print ("Please install the package libasound2-dev")
 -    missing = True
 -  if not os.path.isfile("/usr/include/portaudio.h"):
 -    print ("Please install the package portaudio19-dev")
 -    missing = True
 -  if not os.path.isdir("/usr/include/pulse"):
 -    print ("please install the package libpulse-dev")
 -    missing = True
++#  try:
++#    import wx
++#  except ImportError:
++#    print ("Please install the package python-wxgtk3.0 or later")
++#    missing = True
 +#  if not os.path.isfile("/usr/include/fftw3.h"):
 +#    print ("Please install the package libfftw3-dev")
 +#    missing = True
 +#  if not os.path.isdir("/usr/include/alsa"):
 +#    print ("Please install the package libasound2-dev")
 +#    missing = True
 +#  if not os.path.isfile("/usr/include/portaudio.h"):
 +#    print ("Please install the package portaudio19-dev")
 +#    missing = True
 +#  if not os.path.isdir("/usr/include/pulse"):
 +#    print ("please install the package libpulse-dev")
 +#    missing = True
    if missing:
      ans = raw_input("Do you want to continue (y, N):  ")
      ans = ans.strip()
 @@ -37,6 +37,8 @@ if sys.platform != "win32":
        sys.exit(1)
  
  module1 = Extension ('quisk._quisk',
 +	include_dirs = ['%%LOCALBASE%%/include'],
 +	library_dirs = ['%%LOCALBASE%%/lib'],
  	libraries = ['asound', 'portaudio', 'pulse', 'fftw3', 'm'],
  	sources = ['quisk.c', 'sound.c', 'sound_alsa.c', 'sound_portaudio.c', 'sound_pulseaudio.c',
  		'is_key_down.c', 'microphone.c', 'utility.c',
 @@ -69,8 +71,6 @@ modulew2 = Extension ('quisk.sdriqpkg.sd
  
  # Changes for MacOS support thanks to Mario, DL3LSM.
  modulem1 = Extension ('quisk._quisk',
 -	#include_dirs = ['.'],
 -	#library_dirs = ['.'],
  	libraries = ['portaudio', 'fftw3', 'm', 'pulse'],
  	sources = ['quisk.c', 'sound.c', 'sound_portaudio.c',
  		'is_key_down.c', 'microphone.c', 'utility.c',