Update to 0.7.1

Convert to USES=pyqt
Add NO_ARCH
Fix plist for Python 3.5

3 files changed, 47 insertions, 45 deletions

diff --git a/math/rpcalc/Makefile b/math/rpcalc/Makefile
index 92f62687fc06..f4c4ba47c3ad 100644
--- a/math/rpcalc/Makefile
+++ b/math/rpcalc/Makefile
@@ -2,48 +2,51 @@
 # $FreeBSD$
 
 PORTNAME=	rpcalc
-PORTVERSION=	0.7.0
-PORTREVISION=	1
+PORTVERSION=	0.7.1
 CATEGORIES=	math
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Simple RPN calculator
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:x11-toolkits/py-qt4-gui
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:x11-toolkits/py-qt4-gui
-
-USES=		python:3.3+
+USES=		pyqt:4 python:3.3+
+USE_PYQT=	core gui
 
+CONFIGURE_ARGS=	-p ${PREFIX} -d ${DOCSDIR} -i ${DATADIR}/icons -b ${STAGEDIR}
+NO_ARCH=	yes
 NO_BUILD=	yes
-INSTALLS_ICONS=	yes
+WRKSRC=		${WRKDIR}/rpCalc
 
 DESKTOP_ENTRIES="rpCalc" \
-		"" \
-		"${PREFIX}/share/icons/${PORTNAME}/calc_lg.png" \
+		"RPN Calculator" \
+		"${DATADIR}/icons/calc_lg.png" \
 		"${PORTNAME}" \
 		"Qt;Utility;Calculator;" \
-		"false"
-
-PLIST_SUB=	PYTHON_SUFFIX="${PYTHON_SUFFIX}"
-WRKSRC=		${WRKDIR}/rpCalc
+		false
 
 do-install:
-	(cd ${WRKSRC} && ${PYTHON_CMD} install.py -p ${PREFIX} -b ${STAGEDIR})
-	(cd ${STAGEDIR}${PREFIX} && \
-		${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
-		-d ${DATADIR} -f ${DATADIR_REL})
+	(cd ${WRKSRC} && ${PYTHON_CMD} install.py ${CONFIGURE_ARGS})
 	(cd ${STAGEDIR}${PREFIX} && \
 		${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
 		-d ${DATADIR} -f ${DATADIR_REL})
+	(cd ${STAGEDIR}${DOCSDIR} && ${RM} INSTALL LICENSE)
 
 .include <bsd.port.pre.mk>
 
+.if ${PYTHON_REL} < 3500
+PYOEXTENSION=	pyo
+.else
+PYOEXTENSION=	opt-1.pyc
+.endif
+
+PLIST_SUB+=	PYTHON_SUFFIX="${PYTHON_SUFFIX}" \
+		PYOEXTENSION="${PYOEXTENSION}"
+
 .if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT}
-IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER}
+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/rpcalc/distinfo b/math/rpcalc/distinfo
index 503ef25e12f2..9c81485cfe67 100644
--- a/math/rpcalc/distinfo
+++ b/math/rpcalc/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rpcalc-0.7.0.tar.gz) = 9ce9b955d6d0d1e138807dc364e7d232adff5962eec269a23276479a778c0b00
-SIZE (rpcalc-0.7.0.tar.gz) = 45706
+TIMESTAMP = 1478616238
+SHA256 (rpcalc-0.7.1.tar.gz) = 3b483f4e75d94976d428b1af725ffa55ae2a748ab605b5d4851f2122333aa06b
+SIZE (rpcalc-0.7.1.tar.gz) = 45789
diff --git a/math/rpcalc/pkg-plist b/math/rpcalc/pkg-plist
index bd0b1a86a26b..de0494b8b9f1 100644
--- a/math/rpcalc/pkg-plist
+++ b/math/rpcalc/pkg-plist
@@ -1,42 +1,32 @@
 bin/rpcalc
-@comment %%DOCSDIR%%/INSTALL
-@comment %%DOCSDIR%%/LICENSE
-%%DOCSDIR%%/README.html
-share/icons/rpcalc/calc_lg.png
-share/icons/rpcalc/calc_sm.png
-share/icons/rpcalc/helpback.png
-share/icons/rpcalc/helpforward.png
-share/icons/rpcalc/helphome.png
-share/icons/rpcalc/helpnext.png
-share/icons/rpcalc/helpprevious.png
 %%DATADIR%%/__pycache__/altbasedialog.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/altbasedialog.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/altbasedialog.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%DATADIR%%/__pycache__/calcbutton.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/calcbutton.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/calcbutton.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%DATADIR%%/__pycache__/calccore.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/calccore.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/calccore.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%DATADIR%%/__pycache__/calcdlg.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/calcdlg.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/calcdlg.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%DATADIR%%/__pycache__/calclcd.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/calclcd.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/calclcd.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%DATADIR%%/__pycache__/calcstack.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/calcstack.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/calcstack.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%DATADIR%%/__pycache__/extradisplay.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/extradisplay.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/extradisplay.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%DATADIR%%/__pycache__/helpview.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/helpview.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/helpview.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%DATADIR%%/__pycache__/icondict.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/icondict.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/icondict.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%DATADIR%%/__pycache__/option.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/option.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/option.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%DATADIR%%/__pycache__/optiondefaults.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/optiondefaults.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/optiondefaults.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%DATADIR%%/__pycache__/optiondlg.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/optiondlg.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/optiondlg.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%DATADIR%%/__pycache__/rpcalc.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/rpcalc.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/rpcalc.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%DATADIR%%/__pycache__/setup.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/setup.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/setup.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%DATADIR%%/altbasedialog.py
 %%DATADIR%%/calcbutton.py
 %%DATADIR%%/calccore.py
@@ -46,8 +36,16 @@ share/icons/rpcalc/helpprevious.png
 %%DATADIR%%/extradisplay.py
 %%DATADIR%%/helpview.py
 %%DATADIR%%/icondict.py
+%%DATADIR%%/icons/calc_lg.png
+%%DATADIR%%/icons/calc_sm.png
+%%DATADIR%%/icons/helpback.png
+%%DATADIR%%/icons/helpforward.png
+%%DATADIR%%/icons/helphome.png
+%%DATADIR%%/icons/helpnext.png
+%%DATADIR%%/icons/helpprevious.png
 %%DATADIR%%/option.py
 %%DATADIR%%/optiondefaults.py
 %%DATADIR%%/optiondlg.py
 %%DATADIR%%/rpcalc.py
 %%DATADIR%%/setup.py
+%%DOCSDIR%%/README.html