Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 5 Oct 2017 18:19:09 +0000 (UTC)
From:      Koop Mast <kwm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r451329 - in head/graphics: py-cairo py-cairo/files py3-cairo py3-cairo/files
Message-ID:  <201710051819.v95IJ92b089174@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kwm
Date: Thu Oct  5 18:19:09 2017
New Revision: 451329
URL: https://svnweb.freebsd.org/changeset/ports/451329

Log:
  Update cairo python bindings to 1.14.1.
  
  * Update MASTER_SITE and WWW to point the new home
  * Build from the same distfile
  * Use python distutils to build the port instead of waf
  * Drop stale MCom $Id
  * Add license
  
  Obtained from:	gnome devel repo

Deleted:
  head/graphics/py-cairo/files/
  head/graphics/py3-cairo/files/
Modified:
  head/graphics/py-cairo/Makefile
  head/graphics/py-cairo/distinfo
  head/graphics/py-cairo/pkg-descr
  head/graphics/py-cairo/pkg-plist
  head/graphics/py3-cairo/Makefile
  head/graphics/py3-cairo/distinfo
  head/graphics/py3-cairo/pkg-descr
  head/graphics/py3-cairo/pkg-plist

Modified: head/graphics/py-cairo/Makefile
==============================================================================
--- head/graphics/py-cairo/Makefile	Thu Oct  5 18:05:36 2017	(r451328)
+++ head/graphics/py-cairo/Makefile	Thu Oct  5 18:19:09 2017	(r451329)
@@ -1,28 +1,30 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#	$MCom: ports/graphics/py-cairo/Makefile,v 1.28 2010/11/15 14:12:13 kwm Exp $
 
 PORTNAME=	cairo
-PORTVERSION=	1.10.0
-PORTREVISION=	2
+PORTVERSION=	1.14.1
 CATEGORIES=	graphics python
-MASTER_SITES=	http://cairographics.org/releases/
+MASTER_SITES=	https://github.com/pygobject/pycairo/releases/download/v${PORTVERSION}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	py2${PORTNAME}-${PORTVERSION}
+DISTNAME=	py${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Python 2 bindings for Cairo
 
-USES=		pkgconfig python:2 shebangfix tar:bzip2 waf
+LICENSE=	LGPL21 MPL11
+LICENSE_COMB=	multi
+LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING-LGPL-2.1
+LICENSE_FILE_MPL11=	${WRKSRC}/COPYING-MPL-1.1
+
+PORTSCOUT=	limitw:1,even
+
+USES=		gnome pkgconfig python:2
+USE_PYTHON=	distutils
 USE_GNOME=	cairo
 
-SHEBANG_FILES=	examples/*.py examples/*/*.py test/*.py
+PLIST_SUB=	PORTVER=${PORTVERSION}
 
 post-install:
-	@cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
-		-d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}
-	@cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
-		-d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}
-	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/cairo/_cairo.so
+	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/cairo/_cairo.so
 
 .include <bsd.port.mk>

Modified: head/graphics/py-cairo/distinfo
==============================================================================
--- head/graphics/py-cairo/distinfo	Thu Oct  5 18:05:36 2017	(r451328)
+++ head/graphics/py-cairo/distinfo	Thu Oct  5 18:19:09 2017	(r451329)
@@ -1,2 +1,3 @@
-SHA256 (py2cairo-1.10.0.tar.bz2) = d30439f06c2ec1a39e27464c6c828b6eface3b22ee17b2de05dc409e429a7431
-SIZE (py2cairo-1.10.0.tar.bz2) = 402070
+TIMESTAMP = 1506343145
+SHA256 (pycairo-1.14.1.tar.gz) = 0d13a0a6eeaf0c357db04392943eb9b25767445608d31dde1307f003f68c5754
+SIZE (pycairo-1.14.1.tar.gz) = 154394

Modified: head/graphics/py-cairo/pkg-descr
==============================================================================
--- head/graphics/py-cairo/pkg-descr	Thu Oct  5 18:05:36 2017	(r451328)
+++ head/graphics/py-cairo/pkg-descr	Thu Oct  5 18:19:09 2017	(r451329)
@@ -1,3 +1,3 @@
 Python 2 bindings for Cairo.
 
-WWW: http://cairographics.org/
+WWW: https://github.com/pygobject/pycairo

Modified: head/graphics/py-cairo/pkg-plist
==============================================================================
--- head/graphics/py-cairo/pkg-plist	Thu Oct  5 18:05:36 2017	(r451328)
+++ head/graphics/py-cairo/pkg-plist	Thu Oct  5 18:19:09 2017	(r451329)
@@ -1,6 +1,10 @@
 include/pycairo/pycairo.h
 %%PYTHON_SITELIBDIR%%/cairo/__init__.py
 %%PYTHON_SITELIBDIR%%/cairo/__init__.pyc
-%%PYTHON_SITELIBDIR%%/cairo/__init__.pyo
+%%PYTHON_SITELIBDIR%%/cairo/__init__.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/cairo/_cairo.so
+%%PYTHON_SITELIBDIR%%/pycairo-%%PORTVER%%-py%%PYTHON_VER%%.egg-info/PKG-INFO
+%%PYTHON_SITELIBDIR%%/pycairo-%%PORTVER%%-py%%PYTHON_VER%%.egg-info/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/pycairo-%%PORTVER%%-py%%PYTHON_VER%%.egg-info/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/pycairo-%%PORTVER%%-py%%PYTHON_VER%%.egg-info/top_level.txt
 libdata/pkgconfig/pycairo.pc

Modified: head/graphics/py3-cairo/Makefile
==============================================================================
--- head/graphics/py3-cairo/Makefile	Thu Oct  5 18:05:36 2017	(r451328)
+++ head/graphics/py3-cairo/Makefile	Thu Oct  5 18:19:09 2017	(r451329)
@@ -1,42 +1,30 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#	$MCom: ports/graphics/py-cairo/Makefile,v 1.28 2010/11/15 14:12:13 kwm Exp $
 
 PORTNAME=	cairo
-PORTVERSION=	1.10.0
-PORTREVISION=	3
+PORTVERSION=	1.14.1
 CATEGORIES=	graphics python
-MASTER_SITES=	http://cairographics.org/releases/
+MASTER_SITES=	https://github.com/pygobject/pycairo/releases/download/v${PORTVERSION}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	py${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Python 3 bindings for Cairo
 
-USES=		pkgconfig python:3 shebangfix tar:bzip2 waf
-USE_GNOME=	cairo
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LICENSE=	LGPL21 MPL11
+LICENSE_COMB=	multi
+LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING-LGPL-2.1
+LICENSE_FILE_MPL11=	${WRKSRC}/COPYING-MPL-1.1
 
-SHEBANG_FILES=	examples/*.py examples/*/*.py test/*.py
+PORTSCOUT=	limitw:1,even
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|python %s|${PYTHON_CMD} %s|g' \
-		${WRKSRC}/test/examples_test.py
+USES=		gnome pkgconfig python:3
+USE_PYTHON=	distutils
+USE_GNOME=	cairo
 
-pre-configure:
-# Run waf configure twice, once to extract waflib and patch and then actual configure
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} || :
-	@cd ${WRKSRC}/.waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6/ && \
-		${PATCH} -p1 < ${FILESDIR}/pycairo-1.10.0-waf-py3_4.patch && \
-		${PATCH} -p1 < ${FILESDIR}/pycairo-1.10.0-waf-py3_5.patch
+PLIST_SUB=	PORTVER=${PORTVERSION}
 
 post-install:
-	@${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/cairo/__init__.py[co]
-	@cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
-		-d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}
-	@cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
-		-d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/cairo/_cairo.so
 
 .include <bsd.port.mk>

Modified: head/graphics/py3-cairo/distinfo
==============================================================================
--- head/graphics/py3-cairo/distinfo	Thu Oct  5 18:05:36 2017	(r451328)
+++ head/graphics/py3-cairo/distinfo	Thu Oct  5 18:19:09 2017	(r451329)
@@ -1,2 +1,3 @@
-SHA256 (pycairo-1.10.0.tar.bz2) = 9aa4078e7eb5be583aeabbe8d87172797717f95e8c4338f0d4a17b683a7253be
-SIZE (pycairo-1.10.0.tar.bz2) = 246556
+TIMESTAMP = 1506344417
+SHA256 (pycairo-1.14.1.tar.gz) = 0d13a0a6eeaf0c357db04392943eb9b25767445608d31dde1307f003f68c5754
+SIZE (pycairo-1.14.1.tar.gz) = 154394

Modified: head/graphics/py3-cairo/pkg-descr
==============================================================================
--- head/graphics/py3-cairo/pkg-descr	Thu Oct  5 18:05:36 2017	(r451328)
+++ head/graphics/py3-cairo/pkg-descr	Thu Oct  5 18:19:09 2017	(r451329)
@@ -1,3 +1,3 @@
 Python 3 bindings for Cairo.
 
-WWW: http://cairographics.org/
+WWW: https://github.com/pygobject/pycairo

Modified: head/graphics/py3-cairo/pkg-plist
==============================================================================
--- head/graphics/py3-cairo/pkg-plist	Thu Oct  5 18:05:36 2017	(r451328)
+++ head/graphics/py3-cairo/pkg-plist	Thu Oct  5 18:19:09 2017	(r451329)
@@ -3,4 +3,8 @@ include/pycairo/py3cairo.h
 %%PYTHON_SITELIBDIR%%/cairo/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/cairo/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/cairo/_cairo.so
+%%PYTHON_SITELIBDIR%%/pycairo-%%PORTVER%%-py%%PYTHON_VER%%.egg-info/PKG-INFO
+%%PYTHON_SITELIBDIR%%/pycairo-%%PORTVER%%-py%%PYTHON_VER%%.egg-info/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/pycairo-%%PORTVER%%-py%%PYTHON_VER%%.egg-info/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/pycairo-%%PORTVER%%-py%%PYTHON_VER%%.egg-info/top_level.txt
 libdata/pkgconfig/py3cairo.pc



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