From owner-svn-ports-all@FreeBSD.ORG Mon Jun 23 17:20:09 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 28CE4F08; Mon, 23 Jun 2014 17:20:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 F03432ED1; Mon, 23 Jun 2014 17:20:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5NHK8th043804; Mon, 23 Jun 2014 17:20:08 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5NHK8A8043803; Mon, 23 Jun 2014 17:20:08 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201406231720.s5NHK8A8043803@svn.freebsd.org> From: Raphael Kubo da Costa Date: Mon, 23 Jun 2014 17:20:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358976 - head/databases/py-redis X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Jun 2014 17:20:09 -0000 Author: rakuco Date: Mon Jun 23 17:20:08 2014 New Revision: 358976 URL: http://svnweb.freebsd.org/changeset/ports/358976 QAT: https://qat.redports.org/buildarchive/r358976/ Log: - Use the more standard DOCS option instead of HTMLDOCS. - Set PYTHON_CONCURRENT_INSTALL and do not manually set DOCSDIR so that multiple versions can be installed concurrently. PR: 191267 Submitted by: rakuco Approved by: koobs (the actual maintainer :-) Modified: head/databases/py-redis/Makefile Modified: head/databases/py-redis/Makefile ============================================================================== --- head/databases/py-redis/Makefile Mon Jun 23 16:48:53 2014 (r358975) +++ head/databases/py-redis/Makefile Mon Jun 23 17:20:08 2014 (r358976) @@ -3,6 +3,7 @@ PORTNAME= redis PORTVERSION= 2.10.1 +PORTREVISION= 1 CATEGORIES= databases python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,10 +12,8 @@ COMMENT= Python client for Redis key-val LICENSE= MIT -OPTIONS_DEFINE= HIREDIS HTMLDOCS +OPTIONS_DEFINE= DOCS HIREDIS HIREDIS_DESC= High performance response parser (via hiredis) -HTMLDOCS_DESC= Build and install API docs using Sphinx -DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} DOCGEN= ${LOCALBASE}/bin/sphinx-apidoc HIREDIS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hiredis>0:${PORTSDIR}/databases/py-hiredis @@ -22,6 +21,7 @@ HIREDIS_RUN_DEPENDS= ${PYTHON_PKGNAMEPRE USE_PYTHON= yes USE_PYDISTUTILS= yes PYDISTUTILS_AUTOPLIST= yes +PYTHON_CONCURRENT_INSTALL=yes USE_GITHUB= yes GH_ACCOUNT= andymccurdy @@ -29,10 +29,8 @@ GH_PROJECT= ${PORTNAME}-py GH_COMMIT= e7589d7 .include -.if !empty(PORT_OPTIONS:MHTMLDOCS) -. if empty(PORT_OPTIONS:MDOCS) -IGNORE= you cannot build documentation with DOCS option disabled -. endif + +.if ${PORT_OPTIONS:MDOCS} BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sphinx>0:${PORTSDIR}/textproc/py-sphinx BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}MarkupSafe>0:${PORTSDIR}/textproc/py-MarkupSafe PORTDOCS= * @@ -43,7 +41,7 @@ regression-test: build @cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test post-build: -.if ${PORT_OPTIONS:MHTMLDOCS} +.if ${PORT_OPTIONS:MDOCS} @${ECHO_CMD} "Building documentation" @cd ${WRKSRC} && ${DOCGEN} -o apidocs -F -H 'redis-py' \ -V ${PORTVERSION} -A '2014, Andy McCurdy, Mahdi Yusuf' \ @@ -53,7 +51,7 @@ post-build: .endif post-install: -.if ${PORT_OPTIONS:MHTMLDOCS} +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} @${RM} ${WRKSRC}/apidocs/_build/html/.buildinfo @cd ${WRKSRC}/apidocs/_build/html && ${COPYTREE_SHARE} . \