3 files changed, 83 insertions, 46 deletions

diff --git a/math/rpcalc/Makefile b/math/rpcalc/Makefile
index 5473d808a813..4ad2a2a8120d 100644
--- a/math/rpcalc/Makefile
+++ b/math/rpcalc/Makefile
@@ -2,23 +2,41 @@
 # $FreeBSD$
 
 PORTNAME=	rpcalc
-PORTVERSION=	0.6.0
-PORTREVISION=	4
+PORTVERSION=	0.7.0
 CATEGORIES=	math
-MASTER_SITES=	BERLIOS
+MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Simple RPN calculator
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}//PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
-WRKSRC=		${WRKDIR}/rpCalc
+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
+
+USES=		python:3.2+
 
 NO_BUILD=	yes
-USE_PYTHON=	yes
+INSTALLS_ICONS=	yes
+
+DESKTOP_ENTRIES="rpCalc" \
+		"" \
+		"${PREFIX}/share/icons/${PORTNAME}/calc_lg.png" \
+		"${PORTNAME}" \
+		"Qt;Utility;Calculator;" \
+		"false"
+
+PLIST_SUB=	PYTHON_SUFFIX="${PYTHON_SUFFIX}"
+WRKSRC=		${WRKDIR}/rpCalc
 
-NO_STAGE=	yes
 do-install:
-	cd ${WRKSRC} && ${PYTHON_CMD} install.py
+	(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 ${STAGEDIR}${PREFIX} && \
+		${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
+		-d ${DATADIR} -f ${DATADIR_REL})
 
 .include <bsd.port.mk>
diff --git a/math/rpcalc/distinfo b/math/rpcalc/distinfo
index e4a60bdd8d64..503ef25e12f2 100644
--- a/math/rpcalc/distinfo
+++ b/math/rpcalc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rpcalc-0.6.0.tar.gz) = 7ecaea19a0aa6ce799c2abb0bb7f9185d043ab2a854eefa48b3f6e7853fedb3a
-SIZE (rpcalc-0.6.0.tar.gz) = 34458
+SHA256 (rpcalc-0.7.0.tar.gz) = 9ce9b955d6d0d1e138807dc364e7d232adff5962eec269a23276479a778c0b00
+SIZE (rpcalc-0.7.0.tar.gz) = 45706
diff --git a/math/rpcalc/pkg-plist b/math/rpcalc/pkg-plist
index 4ddc53366002..0d4429c2c86b 100644
--- a/math/rpcalc/pkg-plist
+++ b/math/rpcalc/pkg-plist
@@ -1,38 +1,57 @@
 bin/rpcalc
+@comment %%DOCSDIR%%/INSTALL
+@comment %%DOCSDIR%%/LICENSE
+%%DOCSDIR%%/README.html
 share/icons/rpcalc/calc_lg.png
 share/icons/rpcalc/calc_sm.png
-@dirrm share/icons/rpcalc
-@dirrmtry share/icons
-share/doc/rpcalc/LICENSE
-share/doc/rpcalc/README.html
-share/doc/rpcalc/INSTALL
-@dirrm share/doc/rpcalc
-lib/rpcalc/extradisplay.py
-lib/rpcalc/calcbutton.py
-lib/rpcalc/optiondefaults.py
-lib/rpcalc/altbasedialog.py
-lib/rpcalc/icons.py
-lib/rpcalc/calcstack.py
-lib/rpcalc/calccore.py
-lib/rpcalc/option.py
-lib/rpcalc/helpview.py
-lib/rpcalc/setup.py
-lib/rpcalc/calcdlg.py
-lib/rpcalc/calclcd.py
-lib/rpcalc/rpcalc.py
-lib/rpcalc/optiondlg.py
-lib/rpcalc/altbasedialog.pyc
-lib/rpcalc/calcbutton.pyc
-lib/rpcalc/calccore.pyc
-lib/rpcalc/calcdlg.pyc
-lib/rpcalc/calclcd.pyc
-lib/rpcalc/calcstack.pyc
-lib/rpcalc/extradisplay.pyc
-lib/rpcalc/helpview.pyc
-lib/rpcalc/icons.pyc
-lib/rpcalc/option.pyc
-lib/rpcalc/optiondefaults.pyc
-lib/rpcalc/optiondlg.pyc
-lib/rpcalc/rpcalc.pyc
-lib/rpcalc/setup.pyc
-@dirrm lib/rpcalc
+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__/calcbutton.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/__pycache__/calcbutton.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/calccore.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/__pycache__/calccore.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/calcdlg.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/__pycache__/calcdlg.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/calclcd.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/__pycache__/calclcd.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/calcstack.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/__pycache__/calcstack.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/extradisplay.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/__pycache__/extradisplay.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__/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__/rpcalc.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/__pycache__/rpcalc.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/setup.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/__pycache__/setup.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/altbasedialog.py
+%%DATADIR%%/calcbutton.py
+%%DATADIR%%/calccore.py
+%%DATADIR%%/calcdlg.py
+%%DATADIR%%/calclcd.py
+%%DATADIR%%/calcstack.py
+%%DATADIR%%/extradisplay.py
+%%DATADIR%%/helpview.py
+%%DATADIR%%/icondict.py
+%%DATADIR%%/option.py
+%%DATADIR%%/optiondefaults.py
+%%DATADIR%%/optiondlg.py
+%%DATADIR%%/rpcalc.py
+%%DATADIR%%/setup.py
+@dirrmtry %%DOCSDIR%%
+@dirrmtry share/icons/rpcalc
+@dirrmtry %%DATADIR%%/__pycache__
+@dirrmtry %%DATADIR%%