Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 3 Mar 2015 20:28:56 +0000 (UTC)
From:      Guido Falsi <madpilot@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r380392 - in head/editors/leo: . files
Message-ID:  <201503032028.t23KSuJi078367@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: madpilot
Date: Tue Mar  3 20:28:56 2015
New Revision: 380392
URL: https://svnweb.freebsd.org/changeset/ports/380392
QAT: https://qat.redports.org/buildarchive/r380392/

Log:
  - Update to 5.0
  - Simplify Makefile
  
  PR:		197426
  Submitted by:	tkato432@yahoo.com

Deleted:
  head/editors/leo/files/
  head/editors/leo/pkg-plist
Modified:
  head/editors/leo/Makefile
  head/editors/leo/distinfo
  head/editors/leo/pkg-descr

Modified: head/editors/leo/Makefile
==============================================================================
--- head/editors/leo/Makefile	Tue Mar  3 20:18:07 2015	(r380391)
+++ head/editors/leo/Makefile	Tue Mar  3 20:28:56 2015	(r380392)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	leo
-PORTVERSION=	4.11
-PORTREVISION=	1
+PORTVERSION=	5.0
 CATEGORIES=	editors python
 MASTER_SITES=	SF/${PORTNAME}/Leo/${PORTVERSION}-final
 DISTNAME=	Leo-${PORTVERSION}-final
@@ -13,58 +12,28 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Advanced outline editor for programmers
 
 LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}qt4-svg>=0:${PORTSDIR}/graphics/py-qt4-svg \
-		${PYTHON_PKGNAMEPREFIX}docutils>=0:${PORTSDIR}/textproc/py-docutils \
-		silvercity>=0:${PORTSDIR}/textproc/silvercity \
-		${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui
-
-OPTIONS_DEFINE=	PYENCHANT DOCS
-PYENCHANT_DESC=	Enable PyEnchant support
-PYENCHANT_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}enchant>=0:${PORTSDIR}/textproc/py-enchant
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}qt4-svg>0:${PORTSDIR}/graphics/py-qt4-svg \
+		${PYTHON_PKGNAMEPREFIX}docutils>0:${PORTSDIR}/textproc/py-docutils \
+		silvercity>0:${PORTSDIR}/textproc/silvercity \
+		${PYTHON_PKGNAMEPREFIX}qt4-gui>0:${PORTSDIR}/x11-toolkits/py-qt4-gui
 
-WRKSRC=		${WRKDIR}/Leo-${PORTVERSION}-final
+NO_ARCH=	yes
+
+WRKSRC=		${WRKDIR}/Leo${PORTVERSION}-final
 
 USES=		python shebangfix zip
-SHEBANG_FILES=	leo/doc/html/fixup.pl leo/scripts/LinixInstall.py
+SHEBANG_FILES=	leo/doc/html/fixup.pl
+USE_PYTHON=	autoplist distutils
 
 DESKTOP_ENTRIES="Leo" "Literate Editor with Outlines" \
-		"${LEO_DIR}/Icons/leoapp32.png" "leo" "" ""
-
-LEO_DIR=	${PYTHONPREFIX_SITELIBDIR}/leo
-
-.include <bsd.port.options.mk>
+		"${PYTHONPREFIX_SITELIBDIR}/leo/Icons/leoapp32.png" "leo" "" ""
 
-post-extract:
-	@-${FIND} ${WRKSRC}/leo -type d -empty -delete
+OPTIONS_DEFINE=		DOCS PYENCHANT
 
-post-patch:
-	@${REINPLACE_CMD} -i '' -e \
-		'1s|^\#![[:space:]].*|#!${PYTHON_CMD}|' \
-		${WRKSRC}/leo/test/cgi-bin/edward.py
-
-do-build:
-	${SED} -e 's|@PKGDATADIR@/leo.py|${LEO_DIR}/core/runLeo.py|' \
-		${FILESDIR}/leo.in > ${WRKDIR}/leo
-
-do-install:
-	(cd ${WRKDIR} && ${INSTALL_SCRIPT} leo ${STAGEDIR}${PREFIX}/bin)
-	@${MKDIR} ${STAGEDIR}${LEO_DIR}
-	(cd ${WRKSRC}/leo && ${INSTALL_DATA} __init__.py ${STAGEDIR}${LEO_DIR})
-	@${MKDIR} ${STAGEDIR}${LEO_DIR}/Icons
-.for i in GIF gif png svg
-	(cd ${WRKSRC}/leo/Icons && ${INSTALL_DATA} *.${i} \
-		${STAGEDIR}${LEO_DIR}/Icons)
-.endfor
-.for i in cleo recorder
-	(cd ${WRKSRC}/leo/Icons && ${COPYTREE_SHARE} ${i} \
-		${STAGEDIR}${LEO_DIR}/Icons)
-.endfor
-.for i in config core doc external extensions modes plugins scripts test www
-	(cd ${WRKSRC}/leo && ${COPYTREE_SHARE} ${i} ${STAGEDIR}${LEO_DIR})
-.endfor
-	@-(cd ${STAGEDIR}/${PREFIX} && ${PYTHON_CMD} -m compileall \
-		-d ${PREFIX} -f ${LEO_DIR:S,${PREFIX}/,,})
+PYENCHANT_DESC=		Enable PyEnchant support
+PYENCHANT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}enchant>0:${PORTSDIR}/textproc/py-enchant
 
 .include <bsd.port.mk>

Modified: head/editors/leo/distinfo
==============================================================================
--- head/editors/leo/distinfo	Tue Mar  3 20:18:07 2015	(r380391)
+++ head/editors/leo/distinfo	Tue Mar  3 20:28:56 2015	(r380392)
@@ -1,2 +1,2 @@
-SHA256 (leo/Leo-4.11-final.zip) = eb1fd0e07533db4886fd7962a7d7431244b75239fd161395859e20a7e0f6ba62
-SIZE (leo/Leo-4.11-final.zip) = 7282503
+SHA256 (leo/Leo-5.0-final.zip) = 5635ac753b011a43a3096e5dc18e2d5c6e9f628a40c0ba628c789bccb10928d1
+SIZE (leo/Leo-5.0-final.zip) = 8628999

Modified: head/editors/leo/pkg-descr
==============================================================================
--- head/editors/leo/pkg-descr	Tue Mar  3 20:18:07 2015	(r380391)
+++ head/editors/leo/pkg-descr	Tue Mar  3 20:28:56 2015	(r380392)
@@ -15,7 +15,7 @@
 * Leo is fully scriptable using Python and saves its files in XML
   format.
 * Leo is portable. Leo.py is 100% pure Python and will run on any
-  platform supporting Python and Tk/tcl, including Windows, Linux and
+  platform supporting Python and PyQt, including Windows, Linux and
   MacOS X.
 * Leo is Open Software, distributed under the Python License. 
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503032028.t23KSuJi078367>