3 files changed, 126 insertions, 103 deletions

diff --git a/editors/leo/Makefile b/editors/leo/Makefile
index cb4b31cf2985..43d2c86235df 100644
--- a/editors/leo/Makefile
+++ b/editors/leo/Makefile
@@ -1,5 +1,3 @@
-# ex:ts=8
-#
 # New ports collection makefile for:	leo
 # Date created:			2002/11/17
 # Whom:				Alan Eldridge <ports@geeksrus.net>
@@ -8,110 +6,43 @@
 #
 
 PORTNAME=	leo
-PORTVERSION=	3.11.1
-CATEGORIES=	editors
+PORTVERSION=	3.12.b1
+CATEGORIES=	editors python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTFILES=	${DISTNAME}.zip ${SBOOKFILE} \
-	${EXAMPLESFILES} ${WEBDOCSFILE} ${LEODOCSFILE}
-DIST_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/-beta-/}
+DIST_SUBDIR=	leo
 
 MAINTAINER=	sergei@kolobov.com
-COMMENT=	An advanced outline editor
+COMMENT=	Advanced outline editor for programmers
 
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
+RUN_DEPENDS=	${TKINTER}:${PORTSDIR}/x11-toolkits/py-tkinter
 
 USE_ZIP=	yes
 USE_PYTHON=	yes
-NO_BUILD=	yes
-
-.include <bsd.port.pre.mk>
-
-ICONSDIR=	${LOCALBASE}/share/icons
-DESKTOPDIR=	${LOCALBASE}/share/applnk
-
-SBOOK=		SbooksLeo
-SBOOKFILE=	${SBOOK}.zip
-SBOOKDIR=	${DOCSDIR}/${SBOOK}
-
-EXAMPLES=	cweb.leo noweb.leo python.leo tkinter.leo
-EXAMPLESFILES=	${EXAMPLES:S|leo$|leo.zip|}
-
-WEBDOCS=	LeoWeb
-WEBDOCSFILE=	leodocs.zip
-WEBDOCSDIR=	${DOCSDIR}/${WEBDOCS}
-
-LEODOCS=	LeoDocs
-LEODOCSFILE=	LeoDocs.zip
-LEODOCSDIR=	${DOCSDIR}/${LEODOCS}
-
-PLIST=		${WRKDIR}/plist
-
-BINDIR=		${PREFIX}/bin
-DATADIR=	${PREFIX}/share
-ETCDIR=		${PREFIX}/etc
-LIBDIR=		${PREFIX}/lib
-PKGDATADIR=	${DATADIR}/${DISTNAME}
-
-BIN_SUBDIR=		${BINDIR:S|^${PREFIX}/||}
-DATA_SUBDIR=		${DATADIR:S|^${PREFIX}/||}
-DOCS_SUBDIR=		${DOCSDIR:S|^${PREFIX}/||}
-ETC_SUBDIR=		${ETCDIR:S|^${PREFIX}/||}
-EXAMPLES_SUBDIR=	${EXAMPLESDIR:S|^${PREFIX}/||}
-LIB_SUBDIR=		${LIBDIR:S|^${PREFIX}/||}
-PKGDATA_SUBDIR=		${PKGDATADIR:S|^${PREFIX}/||}
+TKINTER=	${PYTHON_SITELIBDIR}/_tkinter.so
 
-.if defined(NOPORTDOCS)
-ALL_SUBDIRS=	${PKGDATA_SUBDIR}
-.else
-ALL_SUBDIRS=	${PKGDATA_SUBDIR} ${DOCS_SUBDIR} ${EXAMPLES_SUBDIR}
-.endif # defined(NOPORTDOCS)
+WRKSRC=		${WRKDIR}/${DISTNAME:S/-beta-/\ beta\ /}
+LEO_DIR=	${PYTHONPREFIX_SITELIBDIR}/leo
+DOCS=		doc/LICENSE.TXT doc/README.TXT
 
-CPIO?=	/usr/bin/cpio
-SORT?=	/usr/bin/sort
+do-build:
+	${SED} -e 's|@PKGDATADIR@|${LEO_DIR}/src|' ${FILESDIR}/leo.in \
+		> ${WRKDIR}/leo
 
 do-install:
-# install dist
-	${MKDIR} ${PKGDATADIR}
-	cd ${WRKDIR}; ${FIND} ${DISTNAME} \
-		| ${CPIO} -pdmv -R ${LIBOWN}:${LIBGRP} ${DATADIR}
-# fix dist perms
-	${FIND} ${PKGDATADIR} -type f | ${XARGS} ${CHMOD} ${LIBMODE}
+	${INSTALL_SCRIPT} ${WRKDIR}/leo ${PREFIX}/bin/leo
+	@${MKDIR} ${LEO_DIR}
+.for dir in Icons config plugins src
+	@${MKDIR} ${LEO_DIR}/${dir}
+	${INSTALL_DATA} ${WRKSRC}/${dir}/* ${LEO_DIR}/${dir}
+.endfor
+	@${RM} -f ${LEO_DIR}/Icons/*.bmp ${LEO_DIR}/Icons/*.ico
 .if !defined(NOPORTDOCS)
-# install tutorial
-	${MKDIR} ${SBOOKDIR}
-	cd ${WRKDIR}/${SBOOK}; ${FIND} . \
-		| ${CPIO} -pdmv -R ${DOCOWN}:${DOCGRP} ${SBOOKDIR}
-# install web docs
-	${MKDIR} ${WEBDOCSDIR}
-	cd ${WRKDIR}/${WEBDOCS}; ${FIND} . \
-		| ${CPIO} -pdmv -R ${DOCOWN}:${DOCGRP} ${WEBDOCSDIR}
-# install LeoDocs.zip
-	${MKDIR} ${LEODOCSDIR}
-	cd ${WRKDIR}; ${ECHO_CMD} LeoDocs.leo \
-		| ${CPIO} -pdmv -R ${DOCOWN}:${DOCGRP} ${LEODOCSDIR}
-# fix docs perms
-	${FIND} ${DOCSDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} ${DOCMODE}
-# install examples
-	${MKDIR} ${EXAMPLESDIR}
-	cd ${WRKDIR}; ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
-.endif # !defined(NOPORTDOCS)
-# fix dir perms
-	cd ${PREFIX}; ${FIND} ${ALL_SUBDIRS} -type d -print0 \
-		| ${XARGS} -0 ${CHMOD} ${BINMODE}
-# create start script
-	${SED} -e 's|@PKGDATADIR@|${PKGDATADIR}|' \
-		<${FILESDIR}/leo.in >${BINDIR}/leo
-	${CHMOD} ${BINMODE} ${BINDIR}/leo
-	${CHOWN} ${BINOWN}:${BINGRP} ${BINDIR}/leo
-# build plist: bin
-	${ECHO_CMD} "${BIN_SUBDIR}/leo" >${PLIST}
-# build plist: files
-	cd ${PREFIX}; ${FIND} ${ALL_SUBDIRS} -type f \
-		| ${SORT} >>${PLIST}
-# build plist: dirs
-	cd ${PREFIX}; ${FIND} ${ALL_SUBDIRS} -type d \
-		| ${SORT} -r | ${SED} -e 's|^|@dirrm |' >>${PLIST}
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+	@${MKDIR} ${LEO_DIR}/doc
+	${INSTALL_DATA} ${WRKSRC}/doc/LeoDocs.leo ${LEO_DIR}/doc
+.endif
 
-.include <bsd.port.post.mk>
-#EOF
+.include <bsd.port.mk>
diff --git a/editors/leo/distinfo b/editors/leo/distinfo
index c30910f594da..e39ed9470872 100644
--- a/editors/leo/distinfo
+++ b/editors/leo/distinfo
@@ -1,8 +1 @@
-MD5 (leo/leo-3.11.1.zip) = 5add2aa10ba8d6408c769367df026df6
-MD5 (leo/SbooksLeo.zip) = ad62f8cc3bd44c5fbb1fe49a26ad6795
-MD5 (leo/cweb.leo.zip) = c4c278fe1ae775f4368905f33e35217d
-MD5 (leo/noweb.leo.zip) = 7052a7fe0b6827d3bfaf3bd0d5505009
-MD5 (leo/python.leo.zip) = 5fd91ce6402a9040ec9aaa40dd9a61c7
-MD5 (leo/tkinter.leo.zip) = 56847ff596594223db795bcc2a93cd68
-MD5 (leo/leodocs.zip) = 415546378dae95d30ede942294fdeef1
-MD5 (leo/LeoDocs.zip) = 134509178571fb9d725079c835461b0c
+MD5 (leo/leo-3.12-beta-1.zip) = 6f226f25fdd84cf825697fdf11056ec4
diff --git a/editors/leo/pkg-plist b/editors/leo/pkg-plist
new file mode 100644
index 000000000000..2708b6884770
--- /dev/null
+++ b/editors/leo/pkg-plist
@@ -0,0 +1,99 @@
+@comment $FreeBSD$
+bin/leo
+%%PYTHON_SITELIBDIR%%/leo/Icons/LeoWin.gif
+%%PYTHON_SITELIBDIR%%/leo/Icons/Leodoc.gif
+%%PYTHON_SITELIBDIR%%/leo/Icons/Lt_arrow_disabled.gif
+%%PYTHON_SITELIBDIR%%/leo/Icons/Lt_arrow_enabled.gif
+%%PYTHON_SITELIBDIR%%/leo/Icons/Rt_arrow_disabled.gif
+%%PYTHON_SITELIBDIR%%/leo/Icons/Rt_arrow_enabled.gif
+%%PYTHON_SITELIBDIR%%/leo/Icons/ie screenshot.gif
+%%PYTHON_SITELIBDIR%%/leo/Icons/minusnode.gif
+%%PYTHON_SITELIBDIR%%/leo/Icons/plusnode.gif
+%%PYTHON_SITELIBDIR%%/leo/Icons/section_icon.gif
+%%PYTHON_SITELIBDIR%%/leo/Icons/Leoapp.GIF
+%%PYTHON_SITELIBDIR%%/leo/Icons/box00.GIF
+%%PYTHON_SITELIBDIR%%/leo/Icons/box01.GIF
+%%PYTHON_SITELIBDIR%%/leo/Icons/box02.GIF
+%%PYTHON_SITELIBDIR%%/leo/Icons/box03.GIF
+%%PYTHON_SITELIBDIR%%/leo/Icons/box04.GIF
+%%PYTHON_SITELIBDIR%%/leo/Icons/box05.GIF
+%%PYTHON_SITELIBDIR%%/leo/Icons/box06.GIF
+%%PYTHON_SITELIBDIR%%/leo/Icons/box07.GIF
+%%PYTHON_SITELIBDIR%%/leo/Icons/box08.GIF
+%%PYTHON_SITELIBDIR%%/leo/Icons/box09.GIF
+%%PYTHON_SITELIBDIR%%/leo/Icons/box10.GIF
+%%PYTHON_SITELIBDIR%%/leo/Icons/box11.GIF
+%%PYTHON_SITELIBDIR%%/leo/Icons/box12.GIF
+%%PYTHON_SITELIBDIR%%/leo/Icons/box13.GIF
+%%PYTHON_SITELIBDIR%%/leo/Icons/box14.GIF
+%%PYTHON_SITELIBDIR%%/leo/Icons/box15.GIF
+@dirrm %%PYTHON_SITELIBDIR%%/leo/Icons
+%%PYTHON_SITELIBDIR%%/leo/config/leoConfig.leo
+%%PYTHON_SITELIBDIR%%/leo/config/leoConfig.txt
+@dirrm %%PYTHON_SITELIBDIR%%/leo/config
+%%PORTDOCS%%%%PYTHON_SITELIBDIR%%/leo/doc/LeoDocs.leo
+%%PORTDOCS%%@dirrm %%PYTHON_SITELIBDIR%%/leo/doc
+%%PYTHON_SITELIBDIR%%/leo/plugins/__overrideClasses.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/add_directives.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/arrows.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/at_folder.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/color_markup.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/dump_globals.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/empty_leo_file.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/enable_gc.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/french.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/french_fm.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/image.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/import_cisco_config.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/mod_spelling.ini
+%%PYTHON_SITELIBDIR%%/leo/plugins/mod_spelling.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/mod_spelling.txt
+%%PYTHON_SITELIBDIR%%/leo/plugins/mod_test.ini
+%%PYTHON_SITELIBDIR%%/leo/plugins/nav_buttons.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/open_with.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/outline_export.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/override_commands.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/plugins_menu.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/read_only_nodes.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/redefine_put.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/redirect_to_log.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/rst.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/script_io_to_body.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/scripts_menu.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/startfile.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/test.ini
+%%PYTHON_SITELIBDIR%%/leo/plugins/test.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/trace_gc.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/trace_keys.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/trace_tags.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/vim.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/xemacs.py
+@dirrm %%PYTHON_SITELIBDIR%%/leo/plugins
+%%PYTHON_SITELIBDIR%%/leo/src/LeoPy.leo
+%%PYTHON_SITELIBDIR%%/leo/src/leo.py
+%%PYTHON_SITELIBDIR%%/leo/src/leoApp.py
+%%PYTHON_SITELIBDIR%%/leo/src/leoAtFile.py
+%%PYTHON_SITELIBDIR%%/leo/src/leoColor.py
+%%PYTHON_SITELIBDIR%%/leo/src/leoCommands.py
+%%PYTHON_SITELIBDIR%%/leo/src/leoCompare.py
+%%PYTHON_SITELIBDIR%%/leo/src/leoConfig.py
+%%PYTHON_SITELIBDIR%%/leo/src/leoDialog.py
+%%PYTHON_SITELIBDIR%%/leo/src/leoFileCommands.py
+%%PYTHON_SITELIBDIR%%/leo/src/leoFind.py
+%%PYTHON_SITELIBDIR%%/leo/src/leoFindScript.py
+%%PYTHON_SITELIBDIR%%/leo/src/leoFontPanel.py
+%%PYTHON_SITELIBDIR%%/leo/src/leoFrame.py
+%%PYTHON_SITELIBDIR%%/leo/src/leoGlobals.py
+%%PYTHON_SITELIBDIR%%/leo/src/leoImport.py
+%%PYTHON_SITELIBDIR%%/leo/src/leoNodes.py
+%%PYTHON_SITELIBDIR%%/leo/src/leoPlugins.py
+%%PYTHON_SITELIBDIR%%/leo/src/leoPrefs.py
+%%PYTHON_SITELIBDIR%%/leo/src/leoTangle.py
+%%PYTHON_SITELIBDIR%%/leo/src/leoTest.py
+%%PYTHON_SITELIBDIR%%/leo/src/leoTree.py
+%%PYTHON_SITELIBDIR%%/leo/src/leoUndo.py
+@dirrm %%PYTHON_SITELIBDIR%%/leo/src
+@dirrm %%PYTHON_SITELIBDIR%%/leo
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE.TXT
+%%PORTDOCS%%%%DOCSDIR%%/README.TXT
+%%PORTDOCS%%@dirrm %%DOCSDIR%%