Date: Tue, 12 Dec 2017 12:40:15 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r456126 - in head: games/thudboard games/twitch graphics/exact-image graphics/imgv mail/pysieved misc/xdg-menu net-mgmt/py-yapsnmp net/glusterfs net/libproxy-python net/ntlmaps net/poly... Message-ID: <201712121240.vBCCeFFl048460@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Tue Dec 12 12:40:15 2017 New Revision: 456126 URL: https://svnweb.freebsd.org/changeset/ports/456126 Log: - Those ports fail to build with python3 - Add some explicit FLAVOR to dependencies where needed Modified: head/games/thudboard/Makefile head/games/twitch/Makefile head/graphics/exact-image/Makefile head/graphics/imgv/Makefile head/mail/pysieved/Makefile head/misc/xdg-menu/Makefile head/net-mgmt/py-yapsnmp/Makefile head/net/glusterfs/Makefile head/net/libproxy-python/Makefile head/net/ntlmaps/Makefile head/net/polyorb/Makefile head/net/py-gntp/Makefile head/print/scribus/Makefile head/science/ncs/Makefile head/security/fsh/Makefile head/security/py-trustedpickle/Makefile head/sysutils/ganglia-monitor-core/Makefile head/sysutils/heartbeat/Makefile head/sysutils/isomd5sum/Makefile head/sysutils/xen-tools/Makefile head/textproc/py-asv/Makefile head/x11-fm/gnome-commander2/Makefile head/x11/cinnamon/Makefile Modified: head/games/thudboard/Makefile ============================================================================== --- head/games/thudboard/Makefile Tue Dec 12 12:37:57 2017 (r456125) +++ head/games/thudboard/Makefile Tue Dec 12 12:40:15 2017 (r456126) @@ -10,10 +10,10 @@ MASTER_SITES= http://www.million.nl/file/ MAINTAINER= lme@FreeBSD.org COMMENT= The Discworld Boardgame Board -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} NO_WRKSUBDIR= yes -USES= python +USES= python:2.7 SUB_FILES= thudboard Modified: head/games/twitch/Makefile ============================================================================== --- head/games/twitch/Makefile Tue Dec 12 12:37:57 2017 (r456125) +++ head/games/twitch/Makefile Tue Dec 12 12:40:15 2017 (r456126) @@ -19,7 +19,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYGAME} -USES= python +USES= python:2.7 PORTDOCS= AUTHORS BUGS README OPTIONS_DEFINE= DOCS Modified: head/graphics/exact-image/Makefile ============================================================================== --- head/graphics/exact-image/Makefile Tue Dec 12 12:37:57 2017 (r456125) +++ head/graphics/exact-image/Makefile Tue Dec 12 12:40:15 2017 (r456126) @@ -29,7 +29,7 @@ BROKEN_armv7= fails to configure: C++ compiler is not #hack to get custom exactcode configure script to enable tiff support with #broken headers on c++ in base system: CPPFLAGS+= -fpermissive -I${LOCALBASE}/include -USES= gmake jpeg perl5 pkgconfig python tar:bzip2 +USES= gmake jpeg perl5 pkgconfig python:2.7 tar:bzip2 USE_XORG= x11 HAS_CONFIGURE= yes INSTALL_WRKSRC= ${WRKSRC}/objdir Modified: head/graphics/imgv/Makefile ============================================================================== --- head/graphics/imgv/Makefile Tue Dec 12 12:37:57 2017 (r456125) +++ head/graphics/imgv/Makefile Tue Dec 12 12:40:15 2017 (r456126) @@ -13,15 +13,15 @@ COMMENT= Unique and feature rich Image Viewer LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow +RUN_DEPENDS= ${PYGAME} \ + ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} NO_ARCH= yes NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USES= python:run shebangfix +USES= python:2.7 shebangfix SHEBANG_FILES= imgv.py post-patch: Modified: head/mail/pysieved/Makefile ============================================================================== --- head/mail/pysieved/Makefile Tue Dec 12 12:37:57 2017 (r456125) +++ head/mail/pysieved/Makefile Tue Dec 12 12:40:15 2017 (r456126) @@ -14,7 +14,7 @@ COMMENT= Python Managesieve Server LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= python tar:bzip2 +USES= python:2.7 tar:bzip2 USE_RC_SUBR= ${PORTNAME} NO_ARCH= yes Modified: head/misc/xdg-menu/Makefile ============================================================================== --- head/misc/xdg-menu/Makefile Tue Dec 12 12:37:57 2017 (r456125) +++ head/misc/xdg-menu/Makefile Tue Dec 12 12:40:15 2017 (r456126) @@ -19,13 +19,13 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/Help/COPYING RUN_DEPENDS= ${LOCALBASE}/bin/rox:x11-fm/rox-filer \ - ${PYTHON_PKGNAMEPREFIX}xdg>=0:devel/py-xdg \ - ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus + ${PYTHON_PKGNAMEPREFIX}xdg>=0:devel/py-xdg@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} WRKSRC= ${WRKDIR}/XDG-Menu DATADIR= ${PREFIX}/apps/XDG-Menu -USES= python shebangfix +USES= python:2.7 shebangfix SHEBANG_FILES= AppRun AppletRun INSTALLS_ICONS= yes NO_ARCH= yes Modified: head/net-mgmt/py-yapsnmp/Makefile ============================================================================== --- head/net-mgmt/py-yapsnmp/Makefile Tue Dec 12 12:37:57 2017 (r456125) +++ head/net-mgmt/py-yapsnmp/Makefile Tue Dec 12 12:40:15 2017 (r456126) @@ -16,7 +16,7 @@ LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING -USES= gmake libtool python +USES= gmake libtool python:2.7 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -I${PYTHON_INCLUDEDIR} LDFLAGS+= -L${LOCALBASE}/lib Modified: head/net/glusterfs/Makefile ============================================================================== --- head/net/glusterfs/Makefile Tue Dec 12 12:37:57 2017 (r456125) +++ head/net/glusterfs/Makefile Tue Dec 12 12:40:15 2017 (r456126) @@ -14,7 +14,7 @@ LICENSE_COMB= dual LIB_DEPENDS= libargp.so:devel/argp-standalone liburcu-bp.so:sysutils/liburcu -USES= bison gettext libtool pkgconfig python readline shebangfix \ +USES= bison gettext libtool pkgconfig python:2.7 readline shebangfix \ sqlite ssl BROKEN_SSL= libressl Modified: head/net/libproxy-python/Makefile ============================================================================== --- head/net/libproxy-python/Makefile Tue Dec 12 12:37:57 2017 (r456125) +++ head/net/libproxy-python/Makefile Tue Dec 12 12:40:15 2017 (r456126) @@ -18,7 +18,7 @@ PLIST= ${.CURDIR}/pkg-plist INSTALL_WRKSRC= ${CONFIGURE_WRKSRC}/bindings/python NO_ARCH= yes NO_BUILD= yes -USES= python +USES= python:2.7 LIBPROXY_SLAVE= python Modified: head/net/ntlmaps/Makefile ============================================================================== --- head/net/ntlmaps/Makefile Tue Dec 12 12:37:57 2017 (r456125) +++ head/net/ntlmaps/Makefile Tue Dec 12 12:40:15 2017 (r456126) @@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-$ MAINTAINER= kevlo@FreeBSD.org COMMENT= Proxy that authenticates the user using the NTLM protocol -USES= dos2unix python +USES= dos2unix python:2.7 DOCS= COPYING Install.txt changelog.txt readme.txt research.txt Modified: head/net/polyorb/Makefile ============================================================================== --- head/net/polyorb/Makefile Tue Dec 12 12:37:57 2017 (r456125) +++ head/net/polyorb/Makefile Tue Dec 12 12:40:15 2017 (r456126) @@ -15,7 +15,7 @@ LICENSE= GPLv3 BUILD_DEPENDS= xmlada>=3.2:textproc/xmlada -USES= ada gmake python:build shebangfix +USES= ada gmake python:2.7,build shebangfix GNU_CONFIGURE= yes NO_MTREE= yes YEAR= 2014 Modified: head/net/py-gntp/Makefile ============================================================================== --- head/net/py-gntp/Makefile Tue Dec 12 12:37:57 2017 (r456125) +++ head/net/py-gntp/Makefile Tue Dec 12 12:40:15 2017 (r456126) @@ -23,7 +23,7 @@ USE_PYTHON= distutils autoplist .include <bsd.port.pre.mk> .if ${PORT_OPTIONS:MDOCS} -BUILD_DEPENDS+= sphinx-build:textproc/py-sphinx +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${FLAVOR} DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} PYDISTUTILS_BUILD_TARGET+= build_sphinx Modified: head/print/scribus/Makefile ============================================================================== --- head/print/scribus/Makefile Tue Dec 12 12:37:57 2017 (r456125) +++ head/print/scribus/Makefile Tue Dec 12 12:40:15 2017 (r456126) @@ -24,13 +24,13 @@ LIB_DEPENDS= liblcms.so:graphics/lcms \ libcairo.so:graphics/cairo \ libhyphen.so:textproc/hyphen \ libfontconfig.so:x11-fonts/fontconfig -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter \ - ${PYTHON_SITELIBDIR}/PIL/_imaging.so:graphics/py-pillow +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} USE_QT4= corelib gui linguist_build moc_build qmake_build rcc_build uic_build xml network USE_GNOME= libartlgpl2 libxml2 USES= cmake:outsource desktop-file-utils ghostscript:run jpeg \ - pkgconfig python shared-mime-info tar:xz + pkgconfig python:2.7 shared-mime-info tar:xz USE_LDCONFIG= yes CMAKE_ARGS+= -DWANT_HUNSPELL=YES -Wno-ferror-limit Modified: head/science/ncs/Makefile ============================================================================== --- head/science/ncs/Makefile Tue Dec 12 12:37:57 2017 (r456125) +++ head/science/ncs/Makefile Tue Dec 12 12:40:15 2017 (r456126) @@ -12,8 +12,7 @@ COMMENT= Code_Saturne Kernel LICENSE= GPLv2 -BUILD_DEPENDS= cs_preprocess:science/ecs \ - pyrcc4:textproc/py-qt4-xml +BUILD_DEPENDS= cs_preprocess:science/ecs LIB_DEPENDS= libfvm.so:science/fvm \ libmei.so:science/mei RUN_DEPENDS= xmgrace:math/grace \ @@ -21,9 +20,9 @@ RUN_DEPENDS= xmgrace:math/grace \ xterm:x11/xterm \ cs_preprocess:science/ecs -USES= fortran gettext gmake iconv libtool pyqt:4 python shebangfix +USES= fortran gettext gmake iconv libtool pyqt:4 python:2.7 shebangfix USE_GNOME= libxml2 -USE_PYQT= core +USE_PYQT= core xml_build SHEBANG_FILES= bin/runcase.in CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libxml2 GNU_CONFIGURE= yes Modified: head/security/fsh/Makefile ============================================================================== --- head/security/fsh/Makefile Tue Dec 12 12:37:57 2017 (r456125) +++ head/security/fsh/Makefile Tue Dec 12 12:40:15 2017 (r456126) @@ -12,7 +12,7 @@ MASTER_SITES= http://www.lysator.liu.se/fsh/ \ MAINTAINER= ports@FreeBSD.org COMMENT= Fast remote command execution -USES= python +USES= python:2.7 GNU_CONFIGURE= yes INFO= fsh Modified: head/security/py-trustedpickle/Makefile ============================================================================== --- head/security/py-trustedpickle/Makefile Tue Dec 12 12:37:57 2017 (r456125) +++ head/security/py-trustedpickle/Makefile Tue Dec 12 12:40:15 2017 (r456126) @@ -13,7 +13,7 @@ COMMENT= TrustedPickle is a Python (de)Pickler with a LICENSE= BSD2CLAUSE -USES= dos2unix python tar:tgz +USES= dos2unix python:2.7 tar:tgz NO_ARCH= yes PLIST_FILES= %%PYTHON_SITELIBDIR%%/TrustedPickle.py \ Modified: head/sysutils/ganglia-monitor-core/Makefile ============================================================================== --- head/sysutils/ganglia-monitor-core/Makefile Tue Dec 12 12:37:57 2017 (r456125) +++ head/sysutils/ganglia-monitor-core/Makefile Tue Dec 12 12:40:15 2017 (r456126) @@ -25,7 +25,7 @@ OPTIONS_DEFINE= GMETAD OPTIONS_DEFAULT= GMETAD GMETAD_DESC= include gmetad -USES= libtool pkgconfig python +USES= libtool pkgconfig python:2.7 GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-setuid=ganglia --enable-setgid=ganglia \ Modified: head/sysutils/heartbeat/Makefile ============================================================================== --- head/sysutils/heartbeat/Makefile Tue Dec 12 12:37:57 2017 (r456125) +++ head/sysutils/heartbeat/Makefile Tue Dec 12 12:40:15 2017 (r456126) @@ -23,7 +23,7 @@ LIB_DEPENDS= libltdl.so:devel/libltdl \ libxml2.so:textproc/libxml2 BUILD_DEPENDS= bison:devel/bison -USES= autoreconf cpe gettext gmake libtool perl5 pkgconfig python tar:bzip2 \ +USES= autoreconf cpe gettext gmake libtool perl5 pkgconfig python:2.7 tar:bzip2 \ shebangfix SHEBANG_FILES= ldirectord/ldirectord.in \ lib/plugins/stonith/external/ibmrsa-telnet \ Modified: head/sysutils/isomd5sum/Makefile ============================================================================== --- head/sysutils/isomd5sum/Makefile Tue Dec 12 12:37:57 2017 (r456125) +++ head/sysutils/isomd5sum/Makefile Tue Dec 12 12:40:15 2017 (r456126) @@ -13,7 +13,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libpopt.so:devel/popt -USES= gmake python +USES= gmake python:2.7 USE_GITHUB= yes GH_ACCOUNT= rhinstaller Modified: head/sysutils/xen-tools/Makefile ============================================================================== --- head/sysutils/xen-tools/Makefile Tue Dec 12 12:37:57 2017 (r456125) +++ head/sysutils/xen-tools/Makefile Tue Dec 12 12:40:15 2017 (r456126) @@ -29,7 +29,7 @@ ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= "not yet ported to anything other than amd64" USES= cpe gettext gmake libtool localbase:ldflags perl5 pkgconfig \ - python shebangfix + python:2.7 shebangfix USE_GNOME= glib20 USE_LDCONFIG= yes GNU_CONFIGURE= yes Modified: head/textproc/py-asv/Makefile ============================================================================== --- head/textproc/py-asv/Makefile Tue Dec 12 12:37:57 2017 (r456125) +++ head/textproc/py-asv/Makefile Tue Dec 12 12:40:15 2017 (r456126) @@ -13,7 +13,7 @@ COMMENT= Extensible Python module to parse simple text LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -USES= python +USES= python:2.7 NO_ARCH= yes PORTDOCS= README THANKS Modified: head/x11-fm/gnome-commander2/Makefile ============================================================================== --- head/x11-fm/gnome-commander2/Makefile Tue Dec 12 12:37:57 2017 (r456125) +++ head/x11-fm/gnome-commander2/Makefile Tue Dec 12 12:40:15 2017 (r456126) @@ -25,7 +25,7 @@ RUN_DEPENDS= meld:textproc/meld \ yelp:x11/yelp USES= compiler:c++11-lang gettext gmake libtool localbase:ldflags pathfix \ - pkgconfig python tar:xz + pkgconfig python:2.7 tar:xz USE_GNOME= cairo gdkpixbuf2 gnomedocutils gnomeprefix gnomevfs2 intltool libgnomeui USE_XORG= ice sm GNU_CONFIGURE= yes Modified: head/x11/cinnamon/Makefile ============================================================================== --- head/x11/cinnamon/Makefile Tue Dec 12 12:37:57 2017 (r456125) +++ head/x11/cinnamon/Makefile Tue Dec 12 12:40:15 2017 (r456126) @@ -25,18 +25,18 @@ LIB_DEPENDS= libstartup-notification-1.so:x11/startup- libcjs.so:lang/cjs \ libcinnamon-menu-3.so:x11/cinnamon-menus \ libaccountsservice.so:sysutils/accountsservice -RUN_DEPENDS= py*-dbus>=0:devel/py-dbus \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \ ca_root_nss>=0:security/ca_root_nss \ gnome-themes-standard>=3.0.0:x11-themes/gnome-themes-standard \ cinnamon-control-center:sysutils/cinnamon-control-center \ cinnamon-translations>=0:misc/cinnamon-translations \ cinnamon-screensaver:x11/cinnamon-screensaver \ nemo:x11-fm/nemo \ - py*-pillow>=0:graphics/py-pillow \ - py*-lxml>=0:devel/py-lxml + ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} USES= autoreconf compiler:c11 gettext gmake libtool \ - pathfix pkgconfig python shebangfix + pathfix pkgconfig python:2.7 shebangfix USE_GNOME= evolutiondataserver3 gconf2 gnomedesktop3 \ gnomeprefix gtk30 intlhack introspection:build
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712121240.vBCCeFFl048460>