1 files changed, 83 insertions, 73 deletions

diff --git a/math/convertall/pkg-plist b/math/convertall/pkg-plist
index 592828968ce7..4f3d8c30003a 100644
--- a/math/convertall/pkg-plist
+++ b/math/convertall/pkg-plist
@@ -1,58 +1,51 @@
 bin/convertall
-%%PYTHON_SITELIBDIR%%/convertall/cmdline.py
-%%PYTHON_SITELIBDIR%%/convertall/cmdline.pyc
-%%PYTHON_SITELIBDIR%%/convertall/cmdline.pyo
-%%PYTHON_SITELIBDIR%%/convertall/convertall.py
-%%PYTHON_SITELIBDIR%%/convertall/convertall.pyc
-%%PYTHON_SITELIBDIR%%/convertall/convertall.pyo
-%%PYTHON_SITELIBDIR%%/convertall/convertdlg.py
-%%PYTHON_SITELIBDIR%%/convertall/convertdlg.pyc
-%%PYTHON_SITELIBDIR%%/convertall/convertdlg.pyo
-%%PYTHON_SITELIBDIR%%/convertall/finddlg.py
-%%PYTHON_SITELIBDIR%%/convertall/finddlg.pyc
-%%PYTHON_SITELIBDIR%%/convertall/finddlg.pyo
-%%PYTHON_SITELIBDIR%%/convertall/helpview.py
-%%PYTHON_SITELIBDIR%%/convertall/helpview.pyc
-%%PYTHON_SITELIBDIR%%/convertall/helpview.pyo
-%%PYTHON_SITELIBDIR%%/convertall/icondict.py
-%%PYTHON_SITELIBDIR%%/convertall/icondict.pyc
-%%PYTHON_SITELIBDIR%%/convertall/icondict.pyo
-%%PYTHON_SITELIBDIR%%/convertall/modbutton.py
-%%PYTHON_SITELIBDIR%%/convertall/modbutton.pyc
-%%PYTHON_SITELIBDIR%%/convertall/modbutton.pyo
-%%PYTHON_SITELIBDIR%%/convertall/numedit.py
-%%PYTHON_SITELIBDIR%%/convertall/numedit.pyc
-%%PYTHON_SITELIBDIR%%/convertall/numedit.pyo
-%%PYTHON_SITELIBDIR%%/convertall/option.py
-%%PYTHON_SITELIBDIR%%/convertall/option.pyc
-%%PYTHON_SITELIBDIR%%/convertall/option.pyo
-%%PYTHON_SITELIBDIR%%/convertall/optiondefaults.py
-%%PYTHON_SITELIBDIR%%/convertall/optiondefaults.pyc
-%%PYTHON_SITELIBDIR%%/convertall/optiondefaults.pyo
-%%PYTHON_SITELIBDIR%%/convertall/optiondlg.py
-%%PYTHON_SITELIBDIR%%/convertall/optiondlg.pyc
-%%PYTHON_SITELIBDIR%%/convertall/optiondlg.pyo
-%%PYTHON_SITELIBDIR%%/convertall/recentunits.py
-%%PYTHON_SITELIBDIR%%/convertall/recentunits.pyc
-%%PYTHON_SITELIBDIR%%/convertall/recentunits.pyo
-%%PYTHON_SITELIBDIR%%/convertall/setup.py
-%%PYTHON_SITELIBDIR%%/convertall/setup.pyc
-%%PYTHON_SITELIBDIR%%/convertall/setup.pyo
-%%PYTHON_SITELIBDIR%%/convertall/unitatom.py
-%%PYTHON_SITELIBDIR%%/convertall/unitatom.pyc
-%%PYTHON_SITELIBDIR%%/convertall/unitatom.pyo
-%%PYTHON_SITELIBDIR%%/convertall/unitdata.py
-%%PYTHON_SITELIBDIR%%/convertall/unitdata.pyc
-%%PYTHON_SITELIBDIR%%/convertall/unitdata.pyo
-%%PYTHON_SITELIBDIR%%/convertall/unitedit.py
-%%PYTHON_SITELIBDIR%%/convertall/unitedit.pyc
-%%PYTHON_SITELIBDIR%%/convertall/unitedit.pyo
-%%PYTHON_SITELIBDIR%%/convertall/unitgroup.py
-%%PYTHON_SITELIBDIR%%/convertall/unitgroup.pyc
-%%PYTHON_SITELIBDIR%%/convertall/unitgroup.pyo
-%%PYTHON_SITELIBDIR%%/convertall/unitlistview.py
-%%PYTHON_SITELIBDIR%%/convertall/unitlistview.pyc
-%%PYTHON_SITELIBDIR%%/convertall/unitlistview.pyo
+%%DATADIR%%/__pycache__/cmdline.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/__pycache__/cmdline.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/convertall.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/__pycache__/convertall.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/convertdlg.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/__pycache__/convertdlg.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/finddlg.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/__pycache__/finddlg.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/helpview.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/__pycache__/helpview.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/icondict.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/__pycache__/icondict.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/modbutton.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/__pycache__/modbutton.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/numedit.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/__pycache__/numedit.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/option.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/__pycache__/option.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/optiondefaults.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/__pycache__/optiondefaults.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/optiondlg.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/__pycache__/optiondlg.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/recentunits.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/__pycache__/recentunits.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/setup.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/__pycache__/setup.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/unitatom.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/__pycache__/unitatom.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/unitdata.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/__pycache__/unitdata.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/unitedit.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/__pycache__/unitedit.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/unitgroup.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/__pycache__/unitgroup.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/unitlistview.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/__pycache__/unitlistview.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/cmdline.py
+%%DATADIR%%/convertall.pro
+%%DATADIR%%/convertall.py
+%%DATADIR%%/convertdlg.py
+%%DATADIR%%/data/units.dat
+%%DATADIR%%/data/units_de.dat
+%%DATADIR%%/data/units_es.dat
+%%DATADIR%%/data/units_fr.dat
+%%DATADIR%%/finddlg.py
+%%DATADIR%%/helpview.py
+%%DATADIR%%/icondict.py
 %%DATADIR%%/icons/convertall.svg
 %%DATADIR%%/icons/convertall_lg.png
 %%DATADIR%%/icons/convertall_med.png
@@ -60,22 +53,39 @@ bin/convertall
 %%DATADIR%%/icons/helpback.png
 %%DATADIR%%/icons/helpforward.png
 %%DATADIR%%/icons/helphome.png
-%%DATADIR%%/translations/convertall_de.qm
-%%DATADIR%%/translations/convertall_es.qm
-%%DATADIR%%/translations/convertall_fr.qm
-%%DATADIR%%/translations/qt_de.qm
-%%DATADIR%%/translations/qt_es.qm
-%%DATADIR%%/translations/qt_fr.qm
-%%DATADIR%%/units.dat
-%%DATADIR%%/units_de.dat
-%%DATADIR%%/units_es.dat
-%%DATADIR%%/units_fr.dat
-%%PORTDOCS%%%%DOCSDIR%%/README.html
-%%PORTDOCS%%%%DOCSDIR%%/README_de.html
-%%PORTDOCS%%%%DOCSDIR%%/README_es.html
-%%PORTDOCS%%%%DOCSDIR%%/README_fr.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/translations
-@dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/convertall
+%%DATADIR%%/icons/helpnext.png
+%%DATADIR%%/icons/helpprevious.png
+%%DATADIR%%/modbutton.py
+%%DATADIR%%/numedit.py
+%%DATADIR%%/option.py
+%%DATADIR%%/optiondefaults.py
+%%DATADIR%%/optiondlg.py
+%%DATADIR%%/recentunits.py
+%%DATADIR%%/setup.py
+%%NLS%%%%DATADIR%%/translations/convertall_de.qm
+%%NLS%%%%DATADIR%%/translations/convertall_de.ts
+%%NLS%%%%DATADIR%%/translations/convertall_es.qm
+%%NLS%%%%DATADIR%%/translations/convertall_es.ts
+%%NLS%%%%DATADIR%%/translations/convertall_fr.qm
+%%NLS%%%%DATADIR%%/translations/convertall_fr.ts
+%%NLS%%%%DATADIR%%/translations/qt_de.qm
+%%NLS%%%%DATADIR%%/translations/qt_de.ts
+%%NLS%%%%DATADIR%%/translations/qt_es.qm
+%%NLS%%%%DATADIR%%/translations/qt_es.ts
+%%NLS%%%%DATADIR%%/translations/qt_fr.qm
+%%NLS%%%%DATADIR%%/translations/qt_fr.ts
+%%DATADIR%%/unitatom.py
+%%DATADIR%%/unitdata.py
+%%DATADIR%%/unitedit.py
+%%DATADIR%%/unitgroup.py
+%%DATADIR%%/unitlistview.py
+%%DOCSDIR%%/README.html
+%%NLS%%%%DOCSDIR%%/README_de.html
+%%NLS%%%%DOCSDIR%%/README_es.html
+%%NLS%%%%DOCSDIR%%/README_fr.html
+@dirrmtry %%DATADIR%%/__pycache__
+@dirrmtry %%DATADIR%%/data
+@dirrmtry %%DATADIR%%/icons
+%%NLS%%@dirrmtry %%DATADIR%%/translations
+@dirrmtry %%DATADIR%%
+@dirrmtry %%DOCSDIR%%