3 files changed, 72 insertions, 43 deletions

diff --git a/misc/flyway/Makefile b/misc/flyway/Makefile
index fe434e9cbbd9..501a1503f642 100644
--- a/misc/flyway/Makefile
+++ b/misc/flyway/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	flyway
-PORTVERSION=	0.3.1
+PORTVERSION=	0.3.2
 CATEGORIES=	misc python
 MASTER_SITES=	http://www.bellz.org/flyway/
 
@@ -16,18 +16,20 @@ COMMENT=	A VFR/IFR Route Planner for Pilots
 
 RUN_DEPENDS=	pyuic:${PORTSDIR}/x11-toolkits/py-qt
 
+USE_X_PREFIX=	yes
 USE_PYTHON=	yes
+USE_REINPLACE=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/FlyWay
+PORTDOCS=	README.html INSTALL LICENSE
 
-do-install:
-	@${MKDIR} ${PYTHON_SITELIBDIR}/${PORTNAME}
-	${CP} ${WRKSRC}/*.py ${PYTHON_SITELIBDIR}/${PORTNAME}
-	${CP} ${WRKSRC}/*.dat ${PYTHON_SITELIBDIR}/${PORTNAME}
-	@${LN} -sf ${PYTHON_SITELIBDIR}/${PORTNAME}/flyway.py ${PREFIX}/bin/flyway
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${CP} ${WRKSRC}/README.html ${DOCSDIR}
+post-patch:
+.if defined(NOPORTDOCS)
+	@${REINPLACE_CMD} -e 's|doc||' \
+		${WRKSRC}/install.py
 .endif
 
+do-install:
+	(cd ${WRKSRC};${PYTHON_CMD} ${WRKSRC}/install.py -p ${PREFIX})
+
 .include <bsd.port.mk>
diff --git a/misc/flyway/distinfo b/misc/flyway/distinfo
index ac8fd0faf701..6d0964a08196 100644
--- a/misc/flyway/distinfo
+++ b/misc/flyway/distinfo
@@ -1,2 +1,2 @@
-MD5 (flyway-0.3.1.tar.gz) = d11865a48419c9a5abc2053b28bbd627
-SIZE (flyway-0.3.1.tar.gz) = 855877
+MD5 (flyway-0.3.2.tar.gz) = 34a9a2dc81e53cc031bed7ab41a4b2d4
+SIZE (flyway-0.3.2.tar.gz) = 891965
diff --git a/misc/flyway/pkg-plist b/misc/flyway/pkg-plist
index 53b070c671b5..3cfdf9a68194 100644
--- a/misc/flyway/pkg-plist
+++ b/misc/flyway/pkg-plist
@@ -1,33 +1,60 @@
 bin/flyway
-lib/%%PYTHON_VERSION%%/site-packages/flyway/apt.dat
-lib/%%PYTHON_VERSION%%/site-packages/flyway/fix.dat
-lib/%%PYTHON_VERSION%%/site-packages/flyway/flyway.py
-lib/%%PYTHON_VERSION%%/site-packages/flyway/flydialogs.py
-lib/%%PYTHON_VERSION%%/site-packages/flyway/flymainwin.py
-lib/%%PYTHON_VERSION%%/site-packages/flyway/helpview.py
-lib/%%PYTHON_VERSION%%/site-packages/flyway/mapdata.py
-lib/%%PYTHON_VERSION%%/site-packages/flyway/mapview.py
-lib/%%PYTHON_VERSION%%/site-packages/flyway/nav.dat
-lib/%%PYTHON_VERSION%%/site-packages/flyway/option.py
-lib/%%PYTHON_VERSION%%/site-packages/flyway/optiondlg.py
-lib/%%PYTHON_VERSION%%/site-packages/flyway/plandata.py
-lib/%%PYTHON_VERSION%%/site-packages/flyway/planview.py
-lib/%%PYTHON_VERSION%%/site-packages/flyway/printpreview.py
-lib/%%PYTHON_VERSION%%/site-packages/flyway/recentfiles.py
-lib/%%PYTHON_VERSION%%/site-packages/flyway/route.py
-lib/%%PYTHON_VERSION%%/site-packages/flyway/routeview.py
-lib/%%PYTHON_VERSION%%/site-packages/flyway/searchstr.py
-lib/%%PYTHON_VERSION%%/site-packages/flyway/textpaint.py
-lib/%%PYTHON_VERSION%%/site-packages/flyway/timeoutsocket.py
-lib/%%PYTHON_VERSION%%/site-packages/flyway/tmpcontrol.py
-lib/%%PYTHON_VERSION%%/site-packages/flyway/tmpmultiedit.py
-lib/%%PYTHON_VERSION%%/site-packages/flyway/tmptextedit.py
-lib/%%PYTHON_VERSION%%/site-packages/flyway/units.py
-lib/%%PYTHON_VERSION%%/site-packages/flyway/waypoint.py
-lib/%%PYTHON_VERSION%%/site-packages/flyway/weatherdata.py
-lib/%%PYTHON_VERSION%%/site-packages/flyway/weatherview.py
-lib/%%PYTHON_VERSION%%/site-packages/flyway/wpview.py
-lib/%%PYTHON_VERSION%%/site-packages/flyway/xpm.py
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/flyway
-%%PORTDOCS%%share/doc/flyway/README.html
-%%PORTDOCS%%@dirrm share/doc/flyway
+lib/flyway/flydialogs.py
+lib/flyway/flydialogs.pyc
+lib/flyway/flymainwin.py
+lib/flyway/flymainwin.pyc
+lib/flyway/flyway.py
+lib/flyway/flyway.pyc
+lib/flyway/helpview.py
+lib/flyway/helpview.pyc
+lib/flyway/mapdata.py
+lib/flyway/mapdata.pyc
+lib/flyway/mapview.py
+lib/flyway/mapview.pyc
+lib/flyway/option.py
+lib/flyway/option.pyc
+lib/flyway/optiondlg.py
+lib/flyway/optiondlg.pyc
+lib/flyway/plandata.py
+lib/flyway/plandata.pyc
+lib/flyway/planview.py
+lib/flyway/planview.pyc
+lib/flyway/printpreview.py
+lib/flyway/printpreview.pyc
+lib/flyway/recentfiles.py
+lib/flyway/recentfiles.pyc
+lib/flyway/route.py
+lib/flyway/route.pyc
+lib/flyway/routeview.py
+lib/flyway/routeview.pyc
+lib/flyway/searchstr.py
+lib/flyway/searchstr.pyc
+lib/flyway/textpaint.py
+lib/flyway/textpaint.pyc
+lib/flyway/timeoutsocket.py
+lib/flyway/timeoutsocket.pyc
+lib/flyway/tmpcontrol.py
+lib/flyway/tmpcontrol.pyc
+lib/flyway/tmpmultiedit.py
+lib/flyway/tmpmultiedit.pyc
+lib/flyway/tmptextedit.py
+lib/flyway/tmptextedit.pyc
+lib/flyway/units.py
+lib/flyway/units.pyc
+lib/flyway/waypoint.py
+lib/flyway/waypoint.pyc
+lib/flyway/weatherdata.py
+lib/flyway/weatherdata.pyc
+lib/flyway/weatherview.py
+lib/flyway/weatherview.pyc
+lib/flyway/wpview.py
+lib/flyway/wpview.pyc
+lib/flyway/xpm.py
+lib/flyway/xpm.pyc
+share/flyway/apt.dat
+share/flyway/fix.dat
+share/flyway/nav.dat
+share/icons/flyway_lg.png
+share/icons/flyway_sm.png
+@dirrm share/flyway
+@dirrm lib/flyway