2 files changed, 70 insertions, 4 deletions

diff --git a/editors/leo/Makefile b/editors/leo/Makefile
index 20a0829ec4f0..92eea465e99f 100644
--- a/editors/leo/Makefile
+++ b/editors/leo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	leo
 PORTVERSION=	4.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	editors python
 MASTER_SITES=	SF/${PORTNAME}/Leo/${PORTVERSION}%20final
 DISTNAME=	Leo-${PORTVERSION}-final
@@ -26,7 +26,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3
 		${PYTHON_PKGNAMEPREFIX}Pmw>=0:${PORTSDIR}/x11-toolkits/py-Pmw \
 		${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui
 
-OPTIONS=	PYENCHANT "Enable PyEnchant support " off
+OPTIONS_DEFINE=	PYENCHANT DOCS
+PYENCHANT_DESC=	Enable PyEnchant support
 
 WRKSRC=		${WRKDIR}/Leo-${PORTVERSION}-final
 
@@ -37,7 +38,7 @@ LEO_DIR=	${PYTHONPREFIX_SITELIBDIR}/leo
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_PYENCHANT)
+.if ${PORT_OPTIONS:MPYENCHANT}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}enchant>=0:${PORTSDIR}/textproc/py-enchant
 .endif
 
@@ -56,10 +57,12 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/leo/Icons/*.GIF ${LEO_DIR}/Icons
 	${INSTALL_DATA} ${WRKSRC}/leo/Icons/*.gif ${LEO_DIR}/Icons
 	${INSTALL_DATA} ${WRKSRC}/leo/Icons/*.png ${LEO_DIR}/Icons
+	${INSTALL_DATA} ${WRKSRC}/leo/Icons/*.svg ${LEO_DIR}/Icons
+	@(cd ${WRKSRC}/leo/Icons && ${COPYTREE_SHARE} cleo ${LEO_DIR}/Icons)
 .for dir in config core external extensions modes plugins scripts test www
 	@(cd ${WRKSRC}/leo; ${COPYTREE_SHARE} ${dir} ${LEO_DIR})
 .endfor
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@(cd ${WRKSRC}/leo; ${COPYTREE_SHARE} doc ${LEO_DIR})
 .endif
 
diff --git a/editors/leo/pkg-plist b/editors/leo/pkg-plist
index 5841f9c20341..2d68e36e8b67 100644
--- a/editors/leo/pkg-plist
+++ b/editors/leo/pkg-plist
@@ -4,6 +4,8 @@ bin/leo
 %%PYTHON_SITELIBDIR%%/leo/Icons/Leoapp.GIF
 %%PYTHON_SITELIBDIR%%/leo/Icons/Leosplash.GIF
 %%PYTHON_SITELIBDIR%%/leo/Icons/application-x-leo-outline.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/arrows.svg
+%%PYTHON_SITELIBDIR%%/leo/Icons/bubbles.svg
 %%PYTHON_SITELIBDIR%%/leo/Icons/box00.GIF
 %%PYTHON_SITELIBDIR%%/leo/Icons/box01.GIF
 %%PYTHON_SITELIBDIR%%/leo/Icons/box02.GIF
@@ -20,6 +22,65 @@ bin/leo
 %%PYTHON_SITELIBDIR%%/leo/Icons/box13.GIF
 %%PYTHON_SITELIBDIR%%/leo/Icons/box14.GIF
 %%PYTHON_SITELIBDIR%%/leo/Icons/box15.GIF
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/LeoTaskTab.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/bngblk.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/bullet.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/chkblk.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/chkboxblk.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/cleo_icons.svg
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/index.html
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/prg000.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/prg010.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/prg020.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/prg030.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/prg040.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/prg050.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/prg060.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/prg070.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/prg080.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/prg090.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/prg100.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/pri0.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/pri1.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/pri2.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/pri3.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/pri4.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/pri5.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/pri6.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/pri7.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/pri8.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/pri9.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/qryblk.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/small/bngblk.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/small/bullet.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/small/chkblk.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/small/chkboxblk.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/small/prg000.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/small/prg010.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/small/prg020.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/small/prg030.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/small/prg040.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/small/prg050.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/small/prg060.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/small/prg070.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/small/prg080.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/small/prg090.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/small/prg100.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/small/pri0.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/small/pri1.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/small/pri2.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/small/pri3.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/small/pri4.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/small/pri5.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/small/pri6.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/small/pri7.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/small/pri8.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/small/pri9.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/small/qryblk.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/small/xblk.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/small/xgry.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/xblk.png
+%%PYTHON_SITELIBDIR%%/leo/Icons/cleo/xgry.png
 %%PYTHON_SITELIBDIR%%/leo/Icons/leo.gif
 %%PYTHON_SITELIBDIR%%/leo/Icons/leoapp32.png
 %%PYTHON_SITELIBDIR%%/leo/Icons/lt_arrow_disabled.gif
@@ -719,5 +780,7 @@ bin/leo
 %%PORTDOCS%%@dirrm %%PYTHON_SITELIBDIR%%/leo/doc
 @dirrm %%PYTHON_SITELIBDIR%%/leo/core
 @dirrm %%PYTHON_SITELIBDIR%%/leo/config
+@dirrm %%PYTHON_SITELIBDIR%%/leo/Icons/cleo/small
+@dirrm %%PYTHON_SITELIBDIR%%/leo/Icons/cleo
 @dirrm %%PYTHON_SITELIBDIR%%/leo/Icons
 @dirrm %%PYTHON_SITELIBDIR%%/leo