From owner-svn-ports-head@freebsd.org Mon Oct 10 19:32:48 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CA023C0C9EF; Mon, 10 Oct 2016 19:32:48 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A6D67B90; Mon, 10 Oct 2016 19:32:48 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9AJWlbK033706; Mon, 10 Oct 2016 19:32:47 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9AJWluG033705; Mon, 10 Oct 2016 19:32:47 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201610101932.u9AJWluG033705@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 10 Oct 2016 19:32:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r423684 - head/devel/ipython 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.23 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: Mon, 10 Oct 2016 19:32:48 -0000 Author: amdmi3 Date: Mon Oct 10 19:32:47 2016 New Revision: 423684 URL: https://svnweb.freebsd.org/changeset/ports/423684 Log: - Add LICENSE - Add NO_ARCH - Switch to options helpers - Remove obsolete python version condition Modified: head/devel/ipython/Makefile Modified: head/devel/ipython/Makefile ============================================================================== --- head/devel/ipython/Makefile Mon Oct 10 19:32:37 2016 (r423683) +++ head/devel/ipython/Makefile Mon Oct 10 19:32:47 2016 (r423684) @@ -11,6 +11,9 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= ports@FreeBSD.org COMMENT= Enhanced Interactive Python shell +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/COPYING.rst + BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=2:databases/py-sqlite3 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pexpect>=2:misc/py-pexpect \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=2:databases/py-sqlite3 @@ -18,6 +21,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pexp USES= python USE_PYTHON= autoplist distutils USE_GCC= yes # To be removed - Needed as a work-around for numpy, see PR ports/188114 +NO_ARCH= yes OPTIONS_DEFINE= X11 HTML_NOTEBOOK ZMQ EXAMPLES OPTIONS_DEFAULT=X11 ZMQ @@ -29,29 +33,20 @@ OPTIONS_DEFAULT+= HTML_NOTEBOOK HTML_NOTEBOOK_DESC= HTML notebook support ZMQ_DESC= ZMQ support (parallel computing, qt console, notebook) -.include +X11_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:x11-toolkits/py-qt4-gui \ + ${PYTHON_PKGNAMEPREFIX}qt4-svg>=0:graphics/py-qt4-svg \ + ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments + +HTML_NOTEBOOK_RUN_DEPENDS=\ + ${PYTHON_PKGNAMEPREFIX}tornado>=2.0:www/py-tornado \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2 \ + ${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema \ + ${PYTHON_PKGNAMEPREFIX}mistune>=0:textproc/py-mistune \ + ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.1.4:net/py-pyzmq -.if ${PORT_OPTIONS:MX11} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:x11-toolkits/py-qt4-gui \ - ${PYTHON_PKGNAMEPREFIX}qt4-svg>=0:graphics/py-qt4-svg \ - ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments -.endif - -.if ${PORT_OPTIONS:MHTML_NOTEBOOK} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tornado>=2.0:www/py-tornado \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema \ - ${PYTHON_PKGNAMEPREFIX}mistune>=0:textproc/py-mistune -.endif - -.if ${PORT_OPTIONS:MZMQ} || ${PORT_OPTIONS:MHTML_NOTEBOOK} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.1.4:net/py-pyzmq -.endif +ZMQ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.1.4:net/py-pyzmq post-install: -.if ${PORT_OPTIONS:MEXAMPLES} - cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR} -.endif @${ECHO_CMD} "/EASY-INSTALL" > ${WRKDIR}/ex.script @${ECHO_CMD} "a" >> ${WRKDIR}/ex.script @${ECHO_CMD} "import os" >> ${WRKDIR}/ex.script @@ -62,10 +57,7 @@ post-install: ex $${file} < ${WRKDIR}/ex.script > /dev/null; \ done -.include - -.if ${PYTHON_VER} == "3.1" || ${PYTHON_VER} == "3.2" -IGNORE= only Python versions 2.7, 3.3 and 3.4 are supported -.endif +post-install-EXAMPLES-on: + cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} -.include +.include