From 6cfdfbc1cd371390f65ac1f5f7e075bed2ac1cae Mon Sep 17 00:00:00 2001 From: Antoine Brodin Date: Tue, 12 Dec 2017 18:35:32 +0000 Subject: [PATCH] - Those ports fail to build with python3 - Add some explicit FLAVOR to dependencies where needed --- devel/geany-plugin-geanypy/Makefile | 2 +- editors/kate-plugin-pate/Makefile | 2 +- emulators/catapult/Makefile | 2 +- games/crossfire-server/Makefile | 2 +- games/kiki/Makefile | 2 +- games/rtb/Makefile | 2 +- graphics/pecomato/Makefile | 2 +- graphics/py-exif/Makefile | 2 +- graphics/truevision/Makefile | 2 +- japanese/libtomoe-gtk/Makefile | 2 +- java/eclipse-pydev/Makefile | 2 +- korean/hunspell/Makefile | 4 ++-- textproc/py-libxslt/Makefile | 6 +----- 13 files changed, 14 insertions(+), 18 deletions(-) diff --git a/devel/geany-plugin-geanypy/Makefile b/devel/geany-plugin-geanypy/Makefile index c49da08161ae..7519e9fddffb 100644 --- a/devel/geany-plugin-geanypy/Makefile +++ b/devel/geany-plugin-geanypy/Makefile @@ -7,7 +7,7 @@ CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} -USES= python +USES= python:2.7 USE_GNOME= pygtk2 .include "${.CURDIR}/../geany-plugins/files/Makefile.common" diff --git a/editors/kate-plugin-pate/Makefile b/editors/kate-plugin-pate/Makefile index e3d78b3923a0..215d61038e6d 100644 --- a/editors/kate-plugin-pate/Makefile +++ b/editors/kate-plugin-pate/Makefile @@ -9,7 +9,7 @@ DISTNAME= kate-${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Support for Python plugins in Kate -USES= cmake:outsource,noninja kde:4 python tar:xz +USES= cmake:outsource,noninja kde:4 python:2.7 tar:xz USE_KDE= kdelibs automoc4 kate \ pykde4_build pykde4_run USE_QT4= gui webkit \ diff --git a/emulators/catapult/Makefile b/emulators/catapult/Makefile index 1b8d08792c7d..dd00d35e66a7 100644 --- a/emulators/catapult/Makefile +++ b/emulators/catapult/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= openmsx:emulators/openmsx OPTIONS_DEFINE= DEBUG DOCS -USES= gmake pkgconfig python:build +USES= gmake pkgconfig python:2.7,build USE_GCC= yes USE_CXXSTD= gnu++0x USE_GNOME= gtk20 libxml2 diff --git a/games/crossfire-server/Makefile b/games/crossfire-server/Makefile index e13ef08ff65e..8a0735e1c3dd 100644 --- a/games/crossfire-server/Makefile +++ b/games/crossfire-server/Makefile @@ -22,7 +22,7 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libpng.so:graphics/png RUN_DEPENDS= bash:shells/bash -USES= autoreconf gmake libtool perl5 python shebangfix tar:bzip2 \ +USES= autoreconf gmake libtool perl5 python:2.7 shebangfix tar:bzip2 \ uidfix GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-static --with-check=no --localstatedir=/var/games diff --git a/games/kiki/Makefile b/games/kiki/Makefile index 0d8e7a7bfa29..ef517ea5617c 100644 --- a/games/kiki/Makefile +++ b/games/kiki/Makefile @@ -13,7 +13,7 @@ COMMENT= Kiki the nanobot is a 3-D puzzle game BUILD_DEPENDS= swig:devel/swig13 -USES= compiler dos2unix gmake python +USES= compiler dos2unix gmake python:2.7 USE_GL= gl glu glut USE_SDL= sdl mixer image DOS2UNIX_REGEX= .*/(Makefile|.*\.cpp|.*\.h|.*\.i)$ diff --git a/games/rtb/Makefile b/games/rtb/Makefile index ab32b674693c..d64c88c31ce8 100644 --- a/games/rtb/Makefile +++ b/games/rtb/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= gsed:textproc/gsed -USES= gettext gmake perl5 pkgconfig python tar:bzip2 +USES= gettext gmake perl5 pkgconfig python:2.7 tar:bzip2 USE_GNOME= gtk20 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-rtb-dir=${PREFIX}/lib/${PORTNAME} diff --git a/graphics/pecomato/Makefile b/graphics/pecomato/Makefile index 403d3be7fd3e..e7a0522ac219 100644 --- a/graphics/pecomato/Makefile +++ b/graphics/pecomato/Makefile @@ -10,7 +10,7 @@ MASTER_SITES= http://www.mollux.org/projects/pecomato/download/sources/ \ MAINTAINER= ehaupt@FreeBSD.org COMMENT= Command-line picture metadata processor -USES= gmake python:build +USES= gmake python:2.7,build MAKEFILE= Makefile.unix diff --git a/graphics/py-exif/Makefile b/graphics/py-exif/Makefile index 5d708ec95d98..d66272fc94e6 100644 --- a/graphics/py-exif/Makefile +++ b/graphics/py-exif/Makefile @@ -12,7 +12,7 @@ DISTNAME= pyexif-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Python library to extract EXIF metadata from JPEG and TIFF image files -USES= python +USES= python:2.7 WRKSRC= ${WRKDIR}/pyexif DATADIR= ${PREFIX}/share/py-exif DOCSDIR= ${PREFIX}/share/doc/py-exif diff --git a/graphics/truevision/Makefile b/graphics/truevision/Makefile index d83568cf28f9..e64d41c8caca 100644 --- a/graphics/truevision/Makefile +++ b/graphics/truevision/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= libgtkglext-x11-1.0.so:x11-toolkits/gtkglext WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} USES= desktop-file-utils gettext gmake libtool pathfix pkgconfig \ - python shared-mime-info tar:bzip2 + python:2.7 shared-mime-info tar:bzip2 USE_GNOME= gnomeprefix intlhack libgnomeui USE_GL= gl GNU_CONFIGURE= yes diff --git a/japanese/libtomoe-gtk/Makefile b/japanese/libtomoe-gtk/Makefile index 6970b438c1c4..a9c1ea8a388c 100644 --- a/japanese/libtomoe-gtk/Makefile +++ b/japanese/libtomoe-gtk/Makefile @@ -14,7 +14,7 @@ COMMENT= TOMOE GTK+ library LIB_DEPENDS= libtomoe.so:japanese/tomoe GNU_CONFIGURE= yes -USES= gmake libtool pathfix pkgconfig python:build +USES= gmake libtool pathfix pkgconfig python:2.7,build USE_GNOME= gtk20 USE_LDCONFIG= yes diff --git a/java/eclipse-pydev/Makefile b/java/eclipse-pydev/Makefile index f79654361881..917b72e74cef 100644 --- a/java/eclipse-pydev/Makefile +++ b/java/eclipse-pydev/Makefile @@ -27,7 +27,7 @@ OPTIONS_DEFINE= JYTHON PLUGINDIR= share/eclipse/dropins/pydev/eclipse/plugins PYDEV_BUNDLES_INFO= ${PREFIX}/${PLUGINDIR}/bundles.info -USES= python zip +USES= python:2.7 zip .include diff --git a/korean/hunspell/Makefile b/korean/hunspell/Makefile index 971910bb1f4a..5ae3c9ff9c21 100644 --- a/korean/hunspell/Makefile +++ b/korean/hunspell/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE_GPLv2+ = ${WRKSRC}/LICENSE.GPL LICENSE_FILE_LGPL21+ = ${WRKSRC}/LICENSE.LGPL LICENSE_FILE_MPL11= ${WRKSRC}/LICENSE.MPL -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} TEST_DEPENDS= hunspell:textproc/hunspell GH_ACCOUNT= changwoo @@ -22,7 +22,7 @@ GH_PROJECT= ${PORTNAME}-dict-ko USE_GITHUB= yes NO_ARCH= yes -USES= python:build,test +USES= python:2.7,build,test PLIST_FILES= %%DATADIR%%/ko_KR.aff \ %%DATADIR%%/ko_KR.dic diff --git a/textproc/py-libxslt/Makefile b/textproc/py-libxslt/Makefile index fb37d71ee9ba..9813b6be791b 100644 --- a/textproc/py-libxslt/Makefile +++ b/textproc/py-libxslt/Makefile @@ -7,10 +7,6 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= gnome@FreeBSD.org COMMENT= Python interface for XSLT C library for GNOME -py34_BROKEN= does not package -py35_BROKEN= does not package -py36_BROKEN= does not package - MASTERDIR= ${.CURDIR}/../libxslt BUILD_WRKSRC= ${WRKSRC}/python INSTALL_WRKSRC= ${BUILD_WRKSRC} @@ -18,7 +14,7 @@ DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist USE_GNOME= libxslt -USES+= python +USES+= python:2.7 USE_PYTHON= flavors CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --with-python=${PYTHON_CMD}