Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 6 Mar 2016 21:57:10 +0000 (UTC)
From:      Ruslan Makhmatkhanov <rm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r410487 - head/x11/xcb-proto
Message-ID:  <201603062157.u26LvArb044915@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rm
Date: Sun Mar  6 21:57:10 2016
New Revision: 410487
URL: https://svnweb.freebsd.org/changeset/ports/410487

Log:
  x11/xcb-proto: fix packaging with python3.5
  
  Utilize py3kplist to fix packaging with python 3.5 and to simplify Makefile.
  Add LICENSE (MIT) and bump PORTREVISION for package changes.
  Add NO_ARCH, while here.
  
  PR:		205859
  Submitted by:	Vladimir Krstulja <vlad-fbsd@acheronmedia.com>
  Submitted by:   FreeBSD@ShaneWare.Biz (py3kplist suggestion)
  Approved by:	maintainer timeout

Modified:
  head/x11/xcb-proto/Makefile
  head/x11/xcb-proto/pkg-plist

Modified: head/x11/xcb-proto/Makefile
==============================================================================
--- head/x11/xcb-proto/Makefile	Sun Mar  6 21:53:42 2016	(r410486)
+++ head/x11/xcb-proto/Makefile	Sun Mar  6 21:57:10 2016	(r410487)
@@ -3,24 +3,22 @@
 
 PORTNAME=	xcb-proto
 PORTVERSION=	1.11
+PORTREVISION=	1
 CATEGORIES=	x11 python
 MASTER_SITES=	http://xcb.freedesktop.org/dist/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	The X protocol C-language Binding (XCB) protocol
 
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 USE_GNOME=	libxml2:build
 XORG_CAT=	proto
 USES=		python
+USE_PYTHON=	py3kplist
+NO_ARCH=	yes
 
 DATADIR=	${PREFIX}/share/xcb
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_MAJOR_VER} == 3
-PLIST_SUB+=	PYTHON_SUFFIX=${PYTHON_SUFFIX} PY3="" PY2="@comment "
-.else
-PLIST_SUB+=	PY2="" PY3="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/x11/xcb-proto/pkg-plist
==============================================================================
--- head/x11/xcb-proto/pkg-plist	Sun Mar  6 21:53:42 2016	(r410486)
+++ head/x11/xcb-proto/pkg-plist	Sun Mar  6 21:57:10 2016	(r410487)
@@ -32,32 +32,20 @@ libdata/pkgconfig/xcb-proto.pc
 %%DATADIR%%/xv.xml
 %%DATADIR%%/xvmc.xml
 %%PYTHON_SITELIBDIR%%/xcbgen/__init__.py
+%%PYTHON_SITELIBDIR%%/xcbgen/__init__.pyc
+%%PYTHON_SITELIBDIR%%/xcbgen/__init__.pyo
 %%PYTHON_SITELIBDIR%%/xcbgen/error.py
+%%PYTHON_SITELIBDIR%%/xcbgen/error.pyc
+%%PYTHON_SITELIBDIR%%/xcbgen/error.pyo
 %%PYTHON_SITELIBDIR%%/xcbgen/expr.py
+%%PYTHON_SITELIBDIR%%/xcbgen/expr.pyc
+%%PYTHON_SITELIBDIR%%/xcbgen/expr.pyo
 %%PYTHON_SITELIBDIR%%/xcbgen/matcher.py
+%%PYTHON_SITELIBDIR%%/xcbgen/matcher.pyc
+%%PYTHON_SITELIBDIR%%/xcbgen/matcher.pyo
 %%PYTHON_SITELIBDIR%%/xcbgen/state.py
+%%PYTHON_SITELIBDIR%%/xcbgen/state.pyc
+%%PYTHON_SITELIBDIR%%/xcbgen/state.pyo
 %%PYTHON_SITELIBDIR%%/xcbgen/xtypes.py
-%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/__init__.pyc
-%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/error.pyc
-%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/expr.pyc
-%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/matcher.pyc
-%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/state.pyc
-%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/xtypes.pyc
-%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/__init__.pyo
-%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/error.pyo
-%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/expr.pyo
-%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/matcher.pyo
-%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/state.pyo
-%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/xtypes.pyo
-%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyo
-%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/error.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/error.cpython-%%PYTHON_SUFFIX%%.pyo
-%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/expr.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/expr.cpython-%%PYTHON_SUFFIX%%.pyo
-%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/matcher.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/matcher.cpython-%%PYTHON_SUFFIX%%.pyo
-%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/state.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/state.cpython-%%PYTHON_SUFFIX%%.pyo
-%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/xtypes.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/xtypes.cpython-%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/xcbgen/xtypes.pyc
+%%PYTHON_SITELIBDIR%%/xcbgen/xtypes.pyo



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