3 files changed, 60 insertions, 42 deletions

diff --git a/math/convertall/Makefile b/math/convertall/Makefile
index 0d1cbfe3dfb1..42cf4d7c8da2 100644
--- a/math/convertall/Makefile
+++ b/math/convertall/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	convertall
-PORTVERSION=	0.3.1
+PORTVERSION=	0.3.2
 CATEGORIES=	math
 MASTER_SITES=	http://bellz.org/convertall/
 
@@ -17,17 +17,31 @@ BUILD_DEPENDS=	pyuic:${PORTSDIR}/x11-toolkits/py-qt
 RUN_DEPENDS=	pyuic:${PORTSDIR}/x11-toolkits/py-qt
 
 WRKSRC=		${WRKDIR}/ConvertAll
+
 USE_PYTHON=	2.4+
-USE_X_PREFIX=	yes
-NO_BUILD=	yes
-PORTDOCS=	README.html INSTALL LICENSE
 
 post-patch:
-.if defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -e 's|doc||' ${WRKSRC}/install.py
-.endif
+	@cd ${WRKSRC}/source && ${REINPLACE_CMD} -e \
+		"/^dataFilePath/s|None|\'${DATADIR}\'|g ; \
+		 /^helpFilePath/s|None|\'${DOCSDIR}\'|g" convertall.py
+
+do-build:
+	@${ECHO_CMD} '#!/bin/sh' > ${WRKDIR}/convertall.sh
+	@${ECHO_CMD} 'exec ${PYTHON_CMD} ${PYTHON_SITELIBDIR}/convertall/convertall.py $$*' >> ${WRKDIR}/convertall.sh
 
 do-install:
-	(cd ${WRKSRC};${PYTHON_CMD} ${WRKSRC}/install.py -p ${PREFIX})
+	${INSTALL_SCRIPT} ${WRKDIR}/convertall.sh ${PREFIX}/bin/convertall
+	@${MKDIR} ${PYTHON_SITELIBDIR}/convertall
+	${INSTALL_DATA} ${WRKSRC}/source/*.py ${PYTHON_SITELIBDIR}/convertall
+	@${CHMOD} ${BINMODE} ${PYTHON_SITELIBDIR}/convertall/convertall.py
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PYTHON_SITELIBDIR}/convertall
+	@${MKDIR} ${PREFIX}/share/icons
+	${INSTALL_DATA} ${WRKSRC}/icons/*.png ${PREFIX}/share/icons
+	@${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/data/*.dat ${DATADIR}
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/math/convertall/distinfo b/math/convertall/distinfo
index 5c92238b97f3..67ad4bb14222 100644
--- a/math/convertall/distinfo
+++ b/math/convertall/distinfo
@@ -1,3 +1,3 @@
-MD5 (convertall-0.3.1.tar.gz) = ec559b9faa4949217751fcc4c38603d9
-SHA256 (convertall-0.3.1.tar.gz) = ec256c41402e4c22860eb69d4f535447f1e5ef2318263970f268561a6d819fd2
-SIZE (convertall-0.3.1.tar.gz) = 38335
+MD5 (convertall-0.3.2.tar.gz) = c273f7f1fa6d97e25a269b9e7d99c300
+SHA256 (convertall-0.3.2.tar.gz) = f8115ef6dfb92779a99e202376a2f7c69e1f1f6dbcedfbce567a7cb1e3daa6f7
+SIZE (convertall-0.3.2.tar.gz) = 39455
diff --git a/math/convertall/pkg-plist b/math/convertall/pkg-plist
index c6d31039a0bf..8c4f3951580e 100644
--- a/math/convertall/pkg-plist
+++ b/math/convertall/pkg-plist
@@ -1,37 +1,41 @@
 bin/convertall
-lib/convertall/convertall.py
-lib/convertall/convertall.pyc
-lib/convertall/convertdlg.py
-lib/convertall/convertdlg.pyc
-lib/convertall/finddlg.py
-lib/convertall/finddlg.pyc
-lib/convertall/helpview.py
-lib/convertall/helpview.pyc
-lib/convertall/numedit.py
-lib/convertall/numedit.pyc
-lib/convertall/numeval1.py
-lib/convertall/numeval1.pyc
-lib/convertall/numeval2.py
-lib/convertall/numeval2.pyc
-lib/convertall/option.py
-lib/convertall/option.pyc
-lib/convertall/optiondlg.py
-lib/convertall/optiondlg.pyc
-lib/convertall/tmpcontrol.py
-lib/convertall/tmpcontrol.pyc
-lib/convertall/unit.py
-lib/convertall/unit.pyc
-lib/convertall/unitdata.py
-lib/convertall/unitdata.pyc
-lib/convertall/unitedit.py
-lib/convertall/unitedit.pyc
-lib/convertall/unitgroup.py
-lib/convertall/unitgroup.pyc
-lib/convertall/unitlistview.py
-lib/convertall/unitlistview.pyc
+%%PYTHON_SITELIBDIR%%/convertall/convertall.py
+%%PYTHON_SITELIBDIR%%/convertall/convertall.pyc
+%%PYTHON_SITELIBDIR%%/convertall/convertdlg.py
+%%PYTHON_SITELIBDIR%%/convertall/convertdlg.pyc
+%%PYTHON_SITELIBDIR%%/convertall/finddlg.py
+%%PYTHON_SITELIBDIR%%/convertall/finddlg.pyc
+%%PYTHON_SITELIBDIR%%/convertall/helpview.py
+%%PYTHON_SITELIBDIR%%/convertall/helpview.pyc
+%%PYTHON_SITELIBDIR%%/convertall/numedit.py
+%%PYTHON_SITELIBDIR%%/convertall/numedit.pyc
+%%PYTHON_SITELIBDIR%%/convertall/numeval1.py
+%%PYTHON_SITELIBDIR%%/convertall/numeval1.pyc
+%%PYTHON_SITELIBDIR%%/convertall/numeval2.py
+%%PYTHON_SITELIBDIR%%/convertall/numeval2.pyc
+%%PYTHON_SITELIBDIR%%/convertall/option.py
+%%PYTHON_SITELIBDIR%%/convertall/option.pyc
+%%PYTHON_SITELIBDIR%%/convertall/optiondlg.py
+%%PYTHON_SITELIBDIR%%/convertall/optiondlg.pyc
+%%PYTHON_SITELIBDIR%%/convertall/tmpcontrol.py
+%%PYTHON_SITELIBDIR%%/convertall/tmpcontrol.pyc
+%%PYTHON_SITELIBDIR%%/convertall/unitatom.py
+%%PYTHON_SITELIBDIR%%/convertall/unitatom.pyc
+%%PYTHON_SITELIBDIR%%/convertall/unitdata.py
+%%PYTHON_SITELIBDIR%%/convertall/unitdata.pyc
+%%PYTHON_SITELIBDIR%%/convertall/unitedit.py
+%%PYTHON_SITELIBDIR%%/convertall/unitedit.pyc
+%%PYTHON_SITELIBDIR%%/convertall/unitgroup.py
+%%PYTHON_SITELIBDIR%%/convertall/unitgroup.pyc
+%%PYTHON_SITELIBDIR%%/convertall/unitlistview.py
+%%PYTHON_SITELIBDIR%%/convertall/unitlistview.pyc
 %%DATADIR%%/units.dat
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/README.html
 share/icons/convertall_lg.png
 share/icons/convertall_sm.png
 @dirrm %%DATADIR%%
-@dirrm lib/convertall
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%PYTHON_SITELIBDIR%%/convertall
 @dirrmtry share/icons