4 files changed, 119 insertions, 117 deletions

diff --git a/math/convertall/Makefile b/math/convertall/Makefile
index ab2c9c00c6c9..c4d2dda19d81 100644
--- a/math/convertall/Makefile
+++ b/math/convertall/Makefile
@@ -2,56 +2,52 @@
 # $FreeBSD$
 
 PORTNAME=	convertall
-PORTVERSION=	0.5.2
-PORTREVISION=	3
+PORTVERSION=	0.6.0
 CATEGORIES=	math
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
-		${PORTNAME}-i18n-${PORTVERSION}a${EXTRACT_SUFX}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Another unit converter
 
 LICENSE=	GPLv2 # (or later)
+LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui
 
-WRKSRC=		${WRKDIR}/ConvertAll
+USES=		python:3.2+
 
-USE_PYTHON=	yes
+CONFIGURE_ARGS=	-p ${PREFIX} -d ${DOCSDIR} -i ${DATADIR}/icons -b ${STAGEDIR}
+NO_BUILD=	yes
 
-DESKTOP_ENTRIES="ConvertAll" "Unit converter" "${DATADIR}/icons/${PORTNAME}.svg" \
-		"${PORTNAME}" "Utility;Calculator;" true
+PLIST_SUB=	PYTHON_SUFFIX="${PYTHON_SUFFIX}"
+WRKSRC=		${WRKDIR}/ConvertAll
 
-OPTIONS_DEFINE=	DOCS
+DESKTOP_ENTRIES="ConvertAll" \
+		"Unit Converter" \
+		"${DATADIR}/icons/${PORTNAME}.svg" \
+		"${PORTNAME}" \
+		"Qt;Utility;Calculator;" \
+		false
 
-post-patch:
-	@cd ${WRKSRC}/source && ${REINPLACE_CMD} -e \
-		"/^dataFilePath/s|None|\'${DATADIR}\'|g ; \
-		 /^helpFilePath/s|None|\'${DOCSDIR}\'|g ; \
-		 /^iconPath/s|None|\'${DATADIR}/icons\'|g ; \
-		 /^translationPath/s|'translations'|'${DATADIR}/translations'|" convertall.py
+OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
 
-do-build:
-	@${ECHO_CMD} '#!/bin/sh' > ${WRKDIR}/convertall.sh
-	@${ECHO_CMD} 'exec ${PYTHON_CMD} ${PYTHON_SITELIBDIR}/convertall/convertall.py $$*' >> ${WRKDIR}/convertall.sh
-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/source
-	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/source
+NLS_CONFIGURE_OFF=	-s
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/convertall.sh ${STAGEDIR}${PREFIX}/bin/convertall
-	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/convertall
-	${INSTALL_DATA} ${WRKSRC}/source/*.py ${STAGEDIR}${PYTHON_SITELIBDIR}/convertall
-	${INSTALL_DATA} ${WRKSRC}/source/*.pyc ${STAGEDIR}${PYTHON_SITELIBDIR}/convertall
-	${INSTALL_DATA} ${WRKSRC}/source/*.pyo ${STAGEDIR}${PYTHON_SITELIBDIR}/convertall
-	@${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/data/*.dat ${STAGEDIR}${DATADIR}
-	@${MKDIR} ${STAGEDIR}${DATADIR}/icons
-	${INSTALL_DATA} ${WRKSRC}/icons/*.png ${STAGEDIR}${DATADIR}/icons
-	${INSTALL_DATA} ${WRKSRC}/icons/*.svg ${STAGEDIR}${DATADIR}/icons
-	@${MKDIR} ${STAGEDIR}${DATADIR}/translations
-	${INSTALL_DATA} ${WRKSRC}/translations/*.qm ${STAGEDIR}${DATADIR}/translations
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}
-
-.include <bsd.port.mk>
+	(cd ${WRKSRC} && ${PYTHON_CMD} install.py ${CONFIGURE_ARGS})
+	(cd ${STAGEDIR}${PREFIX} && \
+		${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
+		-d ${DATADIR} -f ${DATADIR_REL})
+
+post-install:
+	(cd ${STAGEDIR}${DOCSDIR} && ${RM} INSTALL LICENSE)
+
+.include <bsd.port.pre.mk>
+
+.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT}
+IGNORE=	you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER}
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/math/convertall/distinfo b/math/convertall/distinfo
index c6684cabace3..c92a7931a804 100644
--- a/math/convertall/distinfo
+++ b/math/convertall/distinfo
@@ -1,4 +1,2 @@
-SHA256 (convertall-0.5.2.tar.gz) = 668738a06b20c8367f605a94ade400e0ca1d0fc213f34b1df3b634dc13ea824e
-SIZE (convertall-0.5.2.tar.gz) = 60547
-SHA256 (convertall-i18n-0.5.2a.tar.gz) = 71af7167fd4a6ecdaf74a2ff83ceea7d452f6b20000ba3babf665b65c6810c8c
-SIZE (convertall-i18n-0.5.2a.tar.gz) = 141084
+SHA256 (convertall-0.6.0.tar.gz) = 871ce44bd59566a95b88fdb9c0ce196389a72c56192387a62b308ead358f87c0
+SIZE (convertall-0.6.0.tar.gz) = 204400
diff --git a/math/convertall/pkg-descr b/math/convertall/pkg-descr
index d6eab117547a..0671d50e30e6 100644
--- a/math/convertall/pkg-descr
+++ b/math/convertall/pkg-descr
@@ -1,5 +1,3 @@
-[From README.html]
-
 A unit converter that can combine the units any way you want.  If
 you want to convert from inches per decade, that's fine.  Or from
 meter-pounds.  Or from cubic nautical miles.  The units don't have to
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%%