From freebsd@grem.de  Fri Jun  7 20:29:57 2013
Return-Path: <freebsd@grem.de>
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id 621E6E8
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  7 Jun 2013 20:29:57 +0000 (UTC)
	(envelope-from freebsd@grem.de)
Received: from mail.grem.de (outcast.grem.de [213.239.217.27])
	by mx1.freebsd.org (Postfix) with SMTP id AFCE1130B
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  7 Jun 2013 20:29:55 +0000 (UTC)
Received: (qmail 77693 invoked by uid 0); 7 Jun 2013 20:29:54 -0000
Message-Id: <20130607202954.77692.qmail@mail.grem.de>
Date: 7 Jun 2013 20:29:54 -0000
From: Michael Gmelin <freebsd@grem.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] editors/leo: Leo depends on databases/py-sqlite3
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         179419
>Category:       ports
>Synopsis:       [PATCH] editors/leo: Leo depends on databases/py-sqlite3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    rm
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jun 07 20:40:01 UTC 2013
>Closed-Date:    Tue Jun 11 18:31:24 UTC 2013
>Last-Modified:  Tue Jun 11 18:31:24 UTC 2013
>Originator:     Michael Gmelin
>Release:        FreeBSD 9.1-RELEASE-p2 amd64
>Organization:
Grem Equity GmbH
>Environment:
System: FreeBSD srv 9.1-RELEASE-p2 FreeBSD 9.1-RELEASE-p2 #5 r249052M: Fri May 31 17:50:16 UTC
>Description:
Leo depends on databases/py-sqlite3, the attached patch adds the dependency
and updates Makefile to new-style headers.

Generated with FreeBSD Port Tools 0.99_7 (mode: change, diff: suffix)
>How-To-Repeat:
>Fix:

--- leo-4.10_4.patch begins here ---
diff -ruN ../leo.orig/Makefile ./Makefile
--- ../leo.orig/Makefile	2013-06-07 04:23:22.000000000 +0200
+++ ./Makefile	2013-06-07 22:23:24.251573605 +0200
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	leo
-# Date created:			2002/11/17
-# Whom:				Alan Eldridge <ports@geeksrus.net>
-#
+# Created by: Alan Eldridge <ports@geeksrus.net>
 # $FreeBSD: editors/leo/Makefile 311476 2013-02-03 18:16:54Z makc $
-#
 
 PORTNAME=	leo
 PORTVERSION=	4.10
@@ -19,10 +15,11 @@
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
-RUN_DEPENDS=    ${PYTHON_PKGNAMEPREFIX}qt4-svg>=0:${PORTSDIR}/graphics/py-qt4-svg \
+RUN_DEPENDS=	${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}Pmw>=0:${PORTSDIR}/x11-toolkits/py-Pmw \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \
 		${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui
 
 OPTIONS_DEFINE=	PYENCHANT DOCS
diff -ruN ../leo.orig/Makefile~ ./Makefile~
--- ../leo.orig/Makefile~	1970-01-01 01:00:00.000000000 +0100
+++ ./Makefile~	2013-06-07 22:11:28.000000000 +0200
@@ -0,0 +1,65 @@
+# Created by: Alan Eldridge <ports@geeksrus.net>
+# $FreeBSD: editors/leo/Makefile 311476 2013-02-03 18:16:54Z makc $
+
+PORTNAME=	leo
+PORTVERSION=	4.10
+PORTREVISION=	4
+CATEGORIES=	editors python
+MASTER_SITES=	SF/${PORTNAME}/Leo/${PORTVERSION}%20final
+DISTNAME=	Leo-${PORTVERSION}-final
+DIST_SUBDIR=	leo
+
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Advanced outline editor for programmers
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
+
+RUN_DEPENDS=    ${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}Pmw>=0:${PORTSDIR}/x11-toolkits/py-Pmw \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui
+
+OPTIONS_DEFINE=	PYENCHANT DOCS
+PYENCHANT_DESC=	Enable PyEnchant support
+
+WRKSRC=		${WRKDIR}/Leo-${PORTVERSION}-final
+
+USE_ZIP=	yes
+USE_PYTHON=	2.6+
+
+LEO_DIR=	${PYTHONPREFIX_SITELIBDIR}/leo
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MPYENCHANT}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}enchant>=0:${PORTSDIR}/textproc/py-enchant
+.endif
+
+post-extract:
+	@-${FIND} ${WRKSRC}/leo -type d -empty -delete
+
+do-build:
+	${SED} -e 's|@PKGDATADIR@/leo.py|${LEO_DIR}/core/runLeo.py|' \
+		${FILESDIR}/leo.in > ${WRKDIR}/leo
+
+do-install:
+	${INSTALL_SCRIPT} ${WRKDIR}/leo ${PREFIX}/bin/leo
+	@${MKDIR} ${LEO_DIR}
+	${INSTALL_DATA} ${WRKSRC}/leo/__init__.py ${LEO_DIR}
+	@${MKDIR} ${LEO_DIR}/Icons
+	${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 ${PORT_OPTIONS:MDOCS}
+	@(cd ${WRKSRC}/leo; ${COPYTREE_SHARE} doc ${LEO_DIR})
+.endif
+
+.include <bsd.port.mk>
--- leo-4.10_4.patch ends here ---
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->freebsd-python 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Jun 7 20:40:14 UTC 2013 
Responsible-Changed-Why:  
freebsd-python@ wants this port PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=179419 

From: Michael Gmelin <freebsd@grem.de>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/179419: [PATCH] editors/leo: Leo depends on
 databases/py-sqlite3
Date: Fri, 7 Jun 2013 22:57:22 +0200

 --MP_/ey5hXOWV4OP6DV5J7WSWe7i
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 The original patch contained diffs of a backup file, please find
 attached a clean version.
 
 -- 
 Michael Gmelin
 
 --MP_/ey5hXOWV4OP6DV5J7WSWe7i
 Content-Type: text/x-patch
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename=leo-4.10_4.patch
 
 diff -ruN ../leo.orig/Makefile ./Makefile
 --- ../leo.orig/Makefile	2013-06-07 04:23:22.000000000 +0200
 +++ ./Makefile	2013-06-07 22:23:24.251573605 +0200
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	leo
 -# Date created:			2002/11/17
 -# Whom:				Alan Eldridge <ports@geeksrus.net>
 -#
 +# Created by: Alan Eldridge <ports@geeksrus.net>
  # $FreeBSD: editors/leo/Makefile 311476 2013-02-03 18:16:54Z makc $
 -#
  
  PORTNAME=	leo
  PORTVERSION=	4.10
 @@ -19,10 +15,11 @@
  LICENSE=	MIT
  LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
  
 -RUN_DEPENDS=    ${PYTHON_PKGNAMEPREFIX}qt4-svg>=0:${PORTSDIR}/graphics/py-qt4-svg \
 +RUN_DEPENDS=	${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}Pmw>=0:${PORTSDIR}/x11-toolkits/py-Pmw \
 +		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \
  		${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui
  
  OPTIONS_DEFINE=	PYENCHANT DOCS
 
 --MP_/ey5hXOWV4OP6DV5J7WSWe7i--
Responsible-Changed-From-To: freebsd-python->rm 
Responsible-Changed-By: rm 
Responsible-Changed-When: Mon Jun 10 08:31:09 UTC 2013 
Responsible-Changed-Why:  
I will take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=179419 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/179419: commit references a PR
Date: Tue, 11 Jun 2013 18:22:28 +0000 (UTC)

 Author: rm
 Date: Tue Jun 11 18:22:13 2013
 New Revision: 320619
 URL: http://svnweb.freebsd.org/changeset/ports/320619
 
 Log:
   - trim Makefile header (other changes from PR were committed independently)
   
   while here:
   - whitespace fix in pkg-descr
   - change USE_PYTHON to just ``yes'' (we haven't python's lt 2.6 in the tree)
   
   PR:		179419
   Submitted by:	Michael Gmelin <freebsd@grem.de>
 
 Modified:
   head/editors/leo/Makefile
   head/editors/leo/pkg-descr
 
 Modified: head/editors/leo/Makefile
 ==============================================================================
 --- head/editors/leo/Makefile	Tue Jun 11 17:45:19 2013	(r320618)
 +++ head/editors/leo/Makefile	Tue Jun 11 18:22:13 2013	(r320619)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	leo
 -# Date created:			2002/11/17
 -# Whom:				Alan Eldridge <ports@geeksrus.net>
 -#
 +# Created by: Alan Eldridge <ports@geeksrus.net>
  # $FreeBSD$
 -#
  
  PORTNAME=	leo
  PORTVERSION=	4.10
 @@ -32,7 +28,7 @@ PYENCHANT_DESC=	Enable PyEnchant support
  WRKSRC=		${WRKDIR}/Leo-${PORTVERSION}-final
  
  USE_ZIP=	yes
 -USE_PYTHON=	2.6+
 +USE_PYTHON=	yes
  
  LEO_DIR=	${PYTHONPREFIX_SITELIBDIR}/leo
  
 
 Modified: head/editors/leo/pkg-descr
 ==============================================================================
 --- head/editors/leo/pkg-descr	Tue Jun 11 17:45:19 2013	(r320618)
 +++ head/editors/leo/pkg-descr	Tue Jun 11 18:22:13 2013	(r320619)
 @@ -13,6 +13,6 @@
  * 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 MacOS X.
 -* Leo is Open Software, distributed under the Python License. 
 +* Leo is Open Software, distributed under the Python License.
  
  WWW: http://webpages.charter.net/edreamleo/front.html
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: rm 
State-Changed-When: Tue Jun 11 18:31:21 UTC 2013 
State-Changed-Why:  
Committed what's left, thank you! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=179419 
>Unformatted:
