Reduce dependency on the python2 metaport

PR:		225752
Submitted by:	Yasuhiro KIMURA

21 files changed, 53 insertions, 34 deletions

diff --git a/graphics/electrix/Makefile b/graphics/electrix/Makefile
index 69604f9321c0..5f1f9a2e72be 100644
--- a/graphics/electrix/Makefile
+++ b/graphics/electrix/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	electrix
 PORTVERSION=	0.2.0
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	graphics print
 MASTER_SITES=	SF/${PORTNAME:tl}/${PORTVERSION}
 
@@ -11,7 +11,7 @@ COMMENT=	Application to view PDF files
 
 LICENSE=	GPLv2
 
-USES=		desktop-file-utils pkgconfig python:2 tar:bzip2 waf
+USES=		desktop-file-utils pkgconfig python:2.7 tar:bzip2 waf
 USE_GNOME=	gtk20 glib20 intltool intlhack
 
 MAKE_ENV=	DESTDIR="${STAGEDIR}" \
diff --git a/graphics/gsculpt/Makefile b/graphics/gsculpt/Makefile
index ff4d298212a6..95699610e645 100644
--- a/graphics/gsculpt/Makefile
+++ b/graphics/gsculpt/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gsculpt
 PORTVERSION=	0.99.47
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTNAME:S,-src,,}
 DISTNAME=	gSculpt-${PORTVERSION}-alpha-src
@@ -24,7 +24,7 @@ BROKEN_sparc64=		fails to compile
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S,-src,,}
 
-USES=		pkgconfig python:2 scons
+USES=		pkgconfig python:2.7 scons
 USE_GNOME=	pygtk2
 USE_GL=		glu
 USE_XORG=	x11
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index 7a4d70e576d1..ee086081d87b 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	inkscape
 PORTVERSION=	0.92.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics gnome
 MASTER_SITES=	https://launchpadlibrarian.net/332184472/ \
 		https://inkscape.org/en/gallery/item/11254/ \
@@ -33,7 +33,7 @@ LIB_DEPENDS=	libpopt.so:devel/popt \
 
 USE_GNOME=	gtkmm24 libxml2 libxslt
 USES=		compiler:c++11-lib cmake cpe desktop-file-utils gnome \
-		iconv:wchar_t jpeg pathfix pkgconfig python:2,build \
+		iconv:wchar_t jpeg pathfix pkgconfig python:2.7,build \
 		shebangfix tar:bzip2
 USE_XORG=	x11
 INSTALLS_ICONS=	yes
@@ -81,7 +81,7 @@ USES+=			gettext
 #NLS_USES=		gettext
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|COMMAND python|COMMAND python2|g' \
+	@${REINPLACE_CMD} -e 's|COMMAND python|COMMAND ${PYTHON_VERSION}|g' \
 		${WRKSRC}/share/*/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/graphics/lcms-python/Makefile b/graphics/lcms-python/Makefile
index 03ff2cfde99b..16fb7dc9cc07 100644
--- a/graphics/lcms-python/Makefile
+++ b/graphics/lcms-python/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	lcms
 PORTVERSION=	1.19
+PORTREVISION=	1
 CATEGORIES=	graphics devel python
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	-python
@@ -17,7 +18,7 @@ LIB_DEPENDS=	liblcms.so:graphics/lcms
 BUILD_WRKSRC=	${WRKSRC}/python
 INSTALL_WRKSRC=	${WRKSRC}/python
 
-USES=		python:2
+USES=		python:2.7
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-python
 CONFIGURE_ENV=	PYTHON="${PYTHON_CMD}"
diff --git a/graphics/lcms-python/files/patch-configure b/graphics/lcms-python/files/patch-configure
new file mode 100644
index 000000000000..6c99e9790c5b
--- /dev/null
+++ b/graphics/lcms-python/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	2018-02-06 01:53:28 UTC
++++ configure
+@@ -5287,7 +5287,7 @@ if test "${am_cv_pathless_PYTHON+set}" =
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-	for am_cv_pathless_PYTHON in python python2 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do
++	for am_cv_pathless_PYTHON in python python2 python2.7 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do
+ 	  test "$am_cv_pathless_PYTHON" = none && break
+ 	  prog="import sys, string
+ # split strings by '.' and convert to numeric.  Append some zeros
diff --git a/graphics/mapserver/Makefile b/graphics/mapserver/Makefile
index 07407c51b7e3..dd4e6b33e142 100644
--- a/graphics/mapserver/Makefile
+++ b/graphics/mapserver/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=		mapserver
 PORTVERSION=		7.0.7
+PORTREVISION=	1
 CATEGORIES=		graphics www geography
 MASTER_SITES=		http://download.osgeo.org/mapserver/
 
@@ -43,7 +44,7 @@ WCS_DESC=		WCS Server support
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPYTHON}
-USES+=			python:2
+USES+=			python:2.7
 BUILD_DEPENDS+=		swig3.0:devel/swig30
 BINARY_ALIAS=		swig=swig3.0
 CMAKE_ARGS+=		-DWITH_PYTHON=yes
diff --git a/graphics/mypaint/Makefile b/graphics/mypaint/Makefile
index 991e5ff89a11..13cdf2999ac3 100644
--- a/graphics/mypaint/Makefile
+++ b/graphics/mypaint/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mypaint
 PORTVERSION=	1.2.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/mypaint/mypaint/releases/download/${PORTVERSION:S/^/v/}/
 
@@ -32,7 +32,7 @@ MAKE_ARGS=	prefix=${PREFIX} \
 		python_config="${PYTHON_CMD}-config"
 # XXX Embed RPATH via USES=fortran for py-numpy to load libgcc_s.so from ports
 USES=		desktop-file-utils fortran gettext localbase \
-		pkgconfig python:2 scons tar:xz
+		pkgconfig python:2.7 scons tar:xz
 INSTALL_TARGET=	${STAGEDIR} --install-sandbox=${STAGEDIR}
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
diff --git a/graphics/opencolorio/Makefile b/graphics/opencolorio/Makefile
index 1c0a663d1fc1..a4b432a7bd62 100644
--- a/graphics/opencolorio/Makefile
+++ b/graphics/opencolorio/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	opencolorio
 PORTVERSION=	1.0.9
-PORTREVISION?=	4
+PORTREVISION?=	5
 CATEGORIES=	graphics multimedia
 
 MAINTAINER?=	FreeBSD@Shaneware.biz
@@ -72,7 +72,7 @@ PLIST=		${PKGDIR}/pkg-plist-pyglue
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR}
 LIB_DEPENDS=	libtinyxml.so:textproc/tinyxml \
 		libyaml-cpp03.so:devel/yaml-cpp03
-USES+=		python:2,build
+USES+=		python:2.7,build
 USE_LDCONFIG=	yes
 CMAKE_ARGS+=	-DOCIO_BUILD_APPS:BOOL=OFF \
 		-DOCIO_BUILD_SHARED:BOOL=ON \
diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
index 0892e058d83b..acb4def768dd 100644
--- a/graphics/openimageio/Makefile
+++ b/graphics/openimageio/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	openimageio
 PORTVERSION=	1.7.17
 DISTVERSIONPREFIX=	Release-
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES?=	graphics multimedia
 
 MAINTAINER?=	FreeBSD@Shaneware.biz
@@ -97,7 +97,7 @@ LIB_DEPENDS+=	libOpenImageIO.so:graphics/openimageio \
 		${PY_BOOST}
 PLIST=		${PKGDIR}/pkg-plist-pybind
 #while oiio supports py3, ports doesn't have py3 support for boost-python yet
-USES+=		python:2
+USES+=		python:2.7
 CMAKE_ARGS+=	-DUSE_PYTHON:BOOL=ON -DUSE_PYTHON3:BOOL=OFF \
 		-DOIIO_BUILD_TOOLS:BOOL=OFF -DUSE_FFMPEG:BOOL=OFF
 .endif
diff --git a/graphics/piglit/Makefile b/graphics/piglit/Makefile
index 02a73554d7ed..a1866bdd8299 100644
--- a/graphics/piglit/Makefile
+++ b/graphics/piglit/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	piglit
 PORTVERSION=	20170922
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	x11@FreeBSD.org
@@ -29,7 +30,7 @@ GH_ACCOUNT=	dumbbell
 GH_PROJECT=	piglit
 GH_TAGNAME=	60996b829c85f3df192bc6228108c0a8eaa38afd
 
-USES=		cmake:outsource compiler:c11 pkgconfig python:2
+USES=		cmake:outsource compiler:c11 pkgconfig python:2.7
 USE_GL=		egl gbm gl glu
 USE_XORG=	x11 xcb xext xrender
 
diff --git a/graphics/py-blockdiagcontrib-cisco/Makefile b/graphics/py-blockdiagcontrib-cisco/Makefile
index 2254f8e81db8..ff83c9d63633 100644
--- a/graphics/py-blockdiagcontrib-cisco/Makefile
+++ b/graphics/py-blockdiagcontrib-cisco/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	blockdiagcontrib-cisco
 PORTVERSION=	0.1.8
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,7 +12,7 @@ COMMENT=	Networking shapes for blockdiag designed by Cisco
 
 RUN_DEPENDS=	${PKGNAMEPREFIX}blockdiag>=0.8.0:graphics/py-blockdiag@${FLAVOR}
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/graphics/py-djvulibre/Makefile b/graphics/py-djvulibre/Makefile
index 7e08147170ec..82052ff02062 100644
--- a/graphics/py-djvulibre/Makefile
+++ b/graphics/py-djvulibre/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	python-djvulibre
 PORTVERSION=	0.8
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +15,7 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libdjvulibre.so:graphics/djvulibre
 
-USES=		python:2 pkgconfig
+USES=		python:2.7 pkgconfig
 USE_PYTHON=	autoplist distutils cython
 
 post-patch:
diff --git a/graphics/py-exiv2/Makefile b/graphics/py-exiv2/Makefile
index 2bcf6014f382..579678f4403c 100644
--- a/graphics/py-exiv2/Makefile
+++ b/graphics/py-exiv2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	exiv2
 PORTVERSION=	0.3.2
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	graphics python
 MASTER_SITES=	https://launchpadlibrarian.net/83595798/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,7 +15,7 @@ COMMENT=	Python bindings for exiv2
 LIB_DEPENDS=	libexiv2.so:graphics/exiv2\
 		${PY_BOOST}
 
-USES=		python:2 scons tar:bzip2
+USES=		python:2.7 scons tar:bzip2
 USE_PYTHON=	flavors
 USE_LDCONFIG=	yes
 CXXFLAGS+=	-I${LOCALBASE}/include
diff --git a/graphics/py-gimp/Makefile b/graphics/py-gimp/Makefile
index 3cb8f61083db..84955f8fabb5 100644
--- a/graphics/py-gimp/Makefile
+++ b/graphics/py-gimp/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gimp
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	0
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=
@@ -12,7 +12,7 @@ COMMENT=	GIMP python plugin
 
 GIMP_SLAVE=	pygimp
 
-USES=		python:2
+USES=		python:2.7
 USE_GNOME=	pygtk2
 
 CONFIGURE_ARGS=	--enable-python
diff --git a/graphics/py-pivy/Makefile b/graphics/py-pivy/Makefile
index f845b78b3db6..0210129c27f7 100644
--- a/graphics/py-pivy/Makefile
+++ b/graphics/py-pivy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pivy
 PORTVERSION=	0.5.0
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	https://bitbucket.org/Coin3D/pivy/get/
 DISTNAME=	8eab90908f2a
@@ -17,7 +18,7 @@ LIB_DEPENDS=	libSoQt.so:x11-toolkits/soqt
 
 BROKEN_powerpc64=	fails to link: coin_wrap.o: relocation truncated to fit: R_PPC64_TOC16_DS
 
-USES=		zip python:2
+USES=		zip python:2.7
 USE_PYTHON=	autoplist distutils
 BINARY_ALIAS=	swig=swig3.0
 
diff --git a/graphics/py-sk1/Makefile b/graphics/py-sk1/Makefile
index f826d212abe7..7004b4421957 100644
--- a/graphics/py-sk1/Makefile
+++ b/graphics/py-sk1/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	sk1
 DISTVERSION=	g20171127
+PORTREVISION=	1
 CATEGORIES=	graphics python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -19,7 +20,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pycups>0:print/py-pycups@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${FLAVOR}
 
-USES=		desktop-file-utils python:2
+USES=		desktop-file-utils python:2.7
 USE_GITHUB=	yes
 GH_ACCOUNT=	sk1project
 GH_PROJECT=	sk1-wx
diff --git a/graphics/pymorph/Makefile b/graphics/pymorph/Makefile
index 8a6c2b37ab9c..5255e9091686 100644
--- a/graphics/pymorph/Makefile
+++ b/graphics/pymorph/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pymorph
 PORTVERSION=	0.96
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics python
 MASTER_SITES=	CHEESESHOP
 
@@ -14,7 +14,7 @@ LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS+=	${PYNUMPY}
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/graphics/pysvg/Makefile b/graphics/pysvg/Makefile
index d098f2aedbca..48cb90863fe7 100644
--- a/graphics/pysvg/Makefile
+++ b/graphics/pysvg/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pysvg
 PORTVERSION=	0.2.2
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	CHEESESHOP
 
@@ -11,7 +12,7 @@ COMMENT=	pySVG - creating svg with python
 
 LICENSE=	BSD2CLAUSE
 
-USES=	zip python:2
+USES=	zip python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/graphics/variety/Makefile b/graphics/variety/Makefile
index 5ad2a271db23..6a585bfe0a54 100644
--- a/graphics/variety/Makefile
+++ b/graphics/variety/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	variety
 PORTVERSION=	0.5.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	https://launchpad.net/variety/trunk/${PORTVERSION}/+download/ \
 		http://nivit.altervista.org/FreeBSD/ports/distfiles/
@@ -38,7 +38,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.3.2:www/py-beautifulsoup@${
 
 SHEBANG_FILES=	bin/variety data/scripts/*
 
-USES=	desktop-file-utils gettext python:2 shebangfix gnome
+USES=	desktop-file-utils gettext python:2.7 shebangfix gnome
 USE_GNOME=	pygobject3:run
 USE_PYTHON=	distutils
 
diff --git a/graphics/vigra/Makefile b/graphics/vigra/Makefile
index ffee856370db..1093c72b2b09 100644
--- a/graphics/vigra/Makefile
+++ b/graphics/vigra/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	vigra
 DISTVERSION=	1.11.0
-PORTREVISION=	18
+PORTREVISION=	19
 CATEGORIES=	graphics
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
@@ -18,7 +18,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 LIB_DEPENDS=	libHalf.so:graphics/ilmbase \
 		libsz.so:science/szip
 
-USES=		cmake:outsource python:2,run shebangfix
+USES=		cmake:outsource python:2.7,run shebangfix
 CMAKE_ARGS=	-DDEPENDENCY_SEARCH_PREFIX:PATH=${LOCALBASE} \
 		-DDOCINSTALL:PATH=${DOCSDIR_REL}
 
@@ -44,7 +44,7 @@ OPENEXR_LIB_DEPENDS=	libIlmImf.so:graphics/OpenEXR
 
 NUMPY_DESC=		NumPy mathematical computing (USE Fortran/GCC47+)
 NUMPY_CMAKE_BOOL=	WITH_VIGRANUMPY
-NUMPY_USES=		compiler:gcc-c++11-lib python:2,build
+NUMPY_USES=		compiler:gcc-c++11-lib python:2.7,build
 NUMPY_BUILD_DEPENDS=	nosetests:devel/py-nose \
 			f2py:math/py-numpy
 NUMPY_RUN_DEPENDS=	nosetests:devel/py-nose \
diff --git a/graphics/zbar/Makefile b/graphics/zbar/Makefile
index 12194f5b7f92..cba3a0d5208c 100644
--- a/graphics/zbar/Makefile
+++ b/graphics/zbar/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	zbar
 PORTVERSION=	0.10
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
@@ -37,7 +37,7 @@ V4L_CONFIGURE_ON=	--enable-video=yes
 V4L_CONFIGURE_OFF=	--enable-video=no
 
 PYTHON_USE=		GNOME=pygtk2
-PYTHON_USES=		python:2
+PYTHON_USES=		python:2.7
 PYTHON_CONFIGURE_ON=	--with-python=yes
 PYTHON_CONFIGURE_OFF=	--with-python=no