From owner-svn-ports-head@FreeBSD.ORG Sat Mar 2 22:24:46 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 046D5B63; Sat, 2 Mar 2013 22:24:46 +0000 (UTC) (envelope-from olgeni@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id E99AF707; Sat, 2 Mar 2013 22:24:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r22MOjB8067600; Sat, 2 Mar 2013 22:24:45 GMT (envelope-from olgeni@svn.freebsd.org) Received: (from olgeni@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r22MOjKL067598; Sat, 2 Mar 2013 22:24:45 GMT (envelope-from olgeni@svn.freebsd.org) Message-Id: <201303022224.r22MOjKL067598@svn.freebsd.org> From: Jimmy Olgeni Date: Sat, 2 Mar 2013 22:24:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r313302 - in head/devel/ipython: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Mar 2013 22:24:46 -0000 Author: olgeni Date: Sat Mar 2 22:24:45 2013 New Revision: 313302 URL: http://svnweb.freebsd.org/changeset/ports/313302 Log: - Avoid using PYTHON_SITELIBDIR - Sync BUILD_DEPENDS and RUN_DEPENDS requirements with setup.py - Remove empty doc dirs (fix install/deinstall with package) - Use PORT_OPTIONS with EXAMPLES Modified: head/devel/ipython/Makefile head/devel/ipython/files/patch-setupbase.py (contents, props changed) Modified: head/devel/ipython/Makefile ============================================================================== --- head/devel/ipython/Makefile Sat Mar 2 21:50:49 2013 (r313301) +++ head/devel/ipython/Makefile Sat Mar 2 22:24:45 2013 (r313302) @@ -3,7 +3,7 @@ PORTNAME= ipython PORTVERSION= 0.13.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMESUFFIX= ${PYTHON_PKGNAMESUFFIX} @@ -11,9 +11,9 @@ PKGNAMESUFFIX= ${PYTHON_PKGNAMESUFFIX} MAINTAINER= olgeni@FreeBSD.org COMMENT= An enhanced Interactive Python shell -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pexpect.py:${PORTSDIR}/misc/py-pexpect \ - ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=2:${PORTSDIR}/databases/py-sqlite3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pexpect>=2:${PORTSDIR}/misc/py-pexpect \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>=2:${PORTSDIR}/databases/py-sqlite3 \ ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.1.4:${PORTSDIR}/devel/py-pyzmq USE_PYTHON= yes @@ -36,20 +36,11 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}qt4 .endif .if ${PORT_OPTIONS:MHTML_NOTEBOOK} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tornado>=2.1:${PORTSDIR}/www/py-tornado -.endif - -.ifndef NOPORTDOCS -PORTDOCS= * +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tornado>=2.0:${PORTSDIR}/www/py-tornado .endif post-patch: -.if defined(NOPORTDOCS) - ${REINPLACE_CMD} -e "s#('data',pjoin(docdirbase,'extensions'),igridhelpfiles),# #g" ${WRKSRC}/setupbase.py - ${REINPLACE_CMD} -e "s# + manual_files##g" ${WRKSRC}/setupbase.py -.endif - -.if defined(NOPORTEXAMPLES) +.if ! ${PORT_OPTIONS:MEXAMPLES} ${REINPLACE_CMD} -e "s# + example_files##g" ${WRKSRC}/setupbase.py .endif Modified: head/devel/ipython/files/patch-setupbase.py ============================================================================== --- head/devel/ipython/files/patch-setupbase.py Sat Mar 2 21:50:49 2013 (r313301) +++ head/devel/ipython/files/patch-setupbase.py Sat Mar 2 22:24:45 2013 (r313302) @@ -3,7 +3,7 @@ $FreeBSD$ --- setupbase.py.orig +++ setupbase.py -@@ -197,7 +197,8 @@ +@@ -201,7 +201,8 @@ """ docdirbase = pjoin('share', 'doc', 'ipython') @@ -12,8 +12,8 @@ $FreeBSD$ + examplebase = pjoin('share', 'examples', 'ipython') # Simple file lists can be made by hand - manpages = filter(isfile, glob(pjoin('docs','man','*.1.gz'))) -@@ -211,7 +212,7 @@ + manpages = [f for f in glob(pjoin('docs','man','*.1.gz')) if isfile(f)] +@@ -215,7 +216,7 @@ example_files = make_dir_struct( 'data', pjoin('docs','examples'), @@ -22,3 +22,11 @@ $FreeBSD$ ) manual_files = make_dir_struct( 'data', +@@ -225,7 +226,6 @@ + + # And assemble the entire output list + data_files = [ (manpagebase, manpages), +- (pjoin(docdirbase, 'extensions'), igridhelpfiles), + ] + manual_files + example_files + + return data_files