3 files changed, 24 insertions, 28 deletions

diff --git a/math/convertall/Makefile b/math/convertall/Makefile
index e828e6c89ba4..04d75659cd57 100644
--- a/math/convertall/Makefile
+++ b/math/convertall/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	convertall
-PORTVERSION=	0.6.1
+PORTVERSION=	0.7.3
 CATEGORIES=	math
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
 
@@ -12,8 +12,10 @@ COMMENT=	Another unit converter
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
-USES=		pyqt:4 python:3.3+
-USE_PYQT=	core gui
+USES=		pyqt:5 python:3.4+ shebangfix
+USE_PYQT=	sip core gui widgets sip
+
+SHEBANG_FILES=	source/convertall.py
 
 CONFIGURE_ARGS=	-p ${PREFIX} -d ${DOCSDIR} -i ${DATADIR}/icons -b ${STAGEDIR}
 NO_ARCH=	yes
diff --git a/math/convertall/distinfo b/math/convertall/distinfo
index efcd7ce2534a..6576c68fbfa8 100644
--- a/math/convertall/distinfo
+++ b/math/convertall/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1477031474
-SHA256 (convertall-0.6.1.tar.gz) = 11bae7cbde7a06579cf5b650659f54c9621eae043ad975e6ad29cee6d08d220e
-SIZE (convertall-0.6.1.tar.gz) = 277630
+TIMESTAMP = 1518785153
+SHA256 (convertall-0.7.3.tar.gz) = 1228cb1f1def6e1d72d96c75c7d1e4df406625c84bc52eaa530773e35410ff39
+SIZE (convertall-0.7.3.tar.gz) = 280474
diff --git a/math/convertall/pkg-plist b/math/convertall/pkg-plist
index a24361d4540d..381f77d8456b 100644
--- a/math/convertall/pkg-plist
+++ b/math/convertall/pkg-plist
@@ -1,40 +1,36 @@
 bin/convertall
-%%DATADIR%%/__pycache__/cmdline.cpython-%%PYTHON_SUFFIX%%.pyc
 %%DATADIR%%/__pycache__/cmdline.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%DATADIR%%/__pycache__/convertall.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/__pycache__/cmdline.cpython-%%PYTHON_SUFFIX%%.pyc
 %%DATADIR%%/__pycache__/convertall.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%DATADIR%%/__pycache__/convertdlg.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/__pycache__/convertall.cpython-%%PYTHON_SUFFIX%%.pyc
 %%DATADIR%%/__pycache__/convertdlg.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%DATADIR%%/__pycache__/finddlg.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/finddlg.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%DATADIR%%/__pycache__/helpview.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/__pycache__/convertdlg.cpython-%%PYTHON_SUFFIX%%.pyc
 %%DATADIR%%/__pycache__/helpview.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%DATADIR%%/__pycache__/icondict.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/__pycache__/helpview.cpython-%%PYTHON_SUFFIX%%.pyc
 %%DATADIR%%/__pycache__/icondict.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%DATADIR%%/__pycache__/modbutton.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/modbutton.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%DATADIR%%/__pycache__/numedit.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/__pycache__/icondict.cpython-%%PYTHON_SUFFIX%%.pyc
 %%DATADIR%%/__pycache__/numedit.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%DATADIR%%/__pycache__/option.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/__pycache__/numedit.cpython-%%PYTHON_SUFFIX%%.pyc
 %%DATADIR%%/__pycache__/option.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%DATADIR%%/__pycache__/optiondefaults.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/__pycache__/option.cpython-%%PYTHON_SUFFIX%%.pyc
 %%DATADIR%%/__pycache__/optiondefaults.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%DATADIR%%/__pycache__/optiondlg.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/__pycache__/optiondefaults.cpython-%%PYTHON_SUFFIX%%.pyc
 %%DATADIR%%/__pycache__/optiondlg.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%DATADIR%%/__pycache__/recentunits.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/__pycache__/optiondlg.cpython-%%PYTHON_SUFFIX%%.pyc
 %%DATADIR%%/__pycache__/recentunits.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%DATADIR%%/__pycache__/setup.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/__pycache__/recentunits.cpython-%%PYTHON_SUFFIX%%.pyc
 %%DATADIR%%/__pycache__/setup.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%DATADIR%%/__pycache__/unitatom.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/__pycache__/setup.cpython-%%PYTHON_SUFFIX%%.pyc
 %%DATADIR%%/__pycache__/unitatom.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%DATADIR%%/__pycache__/unitdata.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/__pycache__/unitatom.cpython-%%PYTHON_SUFFIX%%.pyc
 %%DATADIR%%/__pycache__/unitdata.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%DATADIR%%/__pycache__/unitedit.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/__pycache__/unitdata.cpython-%%PYTHON_SUFFIX%%.pyc
 %%DATADIR%%/__pycache__/unitedit.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%DATADIR%%/__pycache__/unitgroup.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/__pycache__/unitedit.cpython-%%PYTHON_SUFFIX%%.pyc
 %%DATADIR%%/__pycache__/unitgroup.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%DATADIR%%/__pycache__/unitlistview.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/__pycache__/unitgroup.cpython-%%PYTHON_SUFFIX%%.pyc
 %%DATADIR%%/__pycache__/unitlistview.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/__pycache__/unitlistview.cpython-%%PYTHON_SUFFIX%%.pyc
 %%DATADIR%%/cmdline.py
 %%DATADIR%%/convertall.pro
 %%DATADIR%%/convertall.py
@@ -44,7 +40,6 @@ bin/convertall
 %%NLS%%%%DATADIR%%/data/units_es.dat
 %%NLS%%%%DATADIR%%/data/units_fr.dat
 %%NLS%%%%DATADIR%%/data/units_ru.dat
-%%DATADIR%%/finddlg.py
 %%DATADIR%%/helpview.py
 %%DATADIR%%/icondict.py
 %%DATADIR%%/icons/convertall.svg
@@ -56,7 +51,6 @@ bin/convertall
 %%DATADIR%%/icons/helphome.png
 %%DATADIR%%/icons/helpnext.png
 %%DATADIR%%/icons/helpprevious.png
-%%DATADIR%%/modbutton.py
 %%DATADIR%%/numedit.py
 %%DATADIR%%/option.py
 %%DATADIR%%/optiondefaults.py