From owner-svn-ports-head@freebsd.org Sun Dec 10 20:48:51 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 09CF8E9BB97; Sun, 10 Dec 2017 20:48:51 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B86C82E4B; Sun, 10 Dec 2017 20:48:50 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBAKmnX4025009; Sun, 10 Dec 2017 20:48:49 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBAKmkbR024971; Sun, 10 Dec 2017 20:48:46 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201712102048.vBAKmkbR024971@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sun, 10 Dec 2017 20:48:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r455913 - in head: archivers/rox-archive audio/decibel-audio-player audio/dir2ogg audio/solfege deskutils/ganyremote deskutils/rox-memo devel/gtkparasite devel/libhid editors/rox-edit e... X-SVN-Group: ports-head X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: in head: archivers/rox-archive audio/decibel-audio-player audio/dir2ogg audio/solfege deskutils/ganyremote deskutils/rox-memo devel/gtkparasite devel/libhid editors/rox-edit emulators/swine emulators/... X-SVN-Commit-Revision: 455913 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Dec 2017 20:48:51 -0000 Author: antoine Date: Sun Dec 10 20:48:45 2017 New Revision: 455913 URL: https://svnweb.freebsd.org/changeset/ports/455913 Log: - Those ports fail to build with python3 - Add some explicit FLAVOR to dependencies where needed Modified: head/archivers/rox-archive/Makefile head/audio/decibel-audio-player/Makefile head/audio/dir2ogg/Makefile head/audio/solfege/Makefile head/deskutils/ganyremote/Makefile head/deskutils/rox-memo/Makefile head/devel/gtkparasite/Makefile head/devel/libhid/Makefile head/editors/rox-edit/Makefile head/emulators/swine/Makefile head/emulators/xen-kernel/Makefile head/games/kajongg/Makefile head/games/magicor/Makefile head/games/openalchemist/Makefile head/graphics/gimp-ez-perspective-plugin/Makefile head/graphics/gimp-resynthesizer/Makefile head/irc/py-supybot-plugins/Makefile head/math/qtiplot/Makefile head/misc/gonvert/Makefile head/multimedia/gstreamer1-libav/Makefile head/multimedia/rox-videothumbnail/Makefile head/net-im/libpurple/Makefile head/net-im/telepathy-mission-control/Makefile head/net-im/telepathy-qt4/Makefile head/net/exaddos/Makefile head/net/gtknetcat/Makefile head/net/mpich2/Makefile head/science/gnudatalanguage/Makefile head/security/gnome-password-generator/Makefile head/security/revelation/Makefile head/sysutils/qzeitgeist/Makefile head/sysutils/u-boot-master/Makefile head/x11-fm/nemo/Makefile head/x11-fm/rox-mime-editor/Makefile head/x11-fm/rox-session/Makefile head/x11-toolkits/hippo-canvas/Makefile head/x11-toolkits/py-gtksourceview/Makefile head/x11/rox-wallpaper/Makefile Modified: head/archivers/rox-archive/Makefile ============================================================================== --- head/archivers/rox-archive/Makefile Sun Dec 10 20:45:32 2017 (r455912) +++ head/archivers/rox-archive/Makefile Sun Dec 10 20:48:45 2017 (r455913) @@ -11,9 +11,9 @@ MAINTAINER= olgeni@FreeBSD.org COMMENT= Archive management tool for the ROX desktop RUN_DEPENDS= ${LOCALBASE}/bin/rox:x11-fm/rox-filer \ - ${LOCALBASE}/lib/ROX-Lib2/python/rox/__init__.py:devel/py-roxlib + ${PYTHON_PKGNAMEPREFIX}roxlib>=0:devel/py-roxlib -USES= python shebangfix tar:bzip2 +USES= python:2.7 shebangfix tar:bzip2 NO_ARCH= yes SHEBANG_FILES= Archive/AppRun Modified: head/audio/decibel-audio-player/Makefile ============================================================================== --- head/audio/decibel-audio-player/Makefile Sun Dec 10 20:45:32 2017 (r455912) +++ head/audio/decibel-audio-player/Makefile Sun Dec 10 20:48:45 2017 (r455913) @@ -10,15 +10,14 @@ MASTER_SITES= http://decibel.silent-blade.org/uploads/ MAINTAINER= somicide@gmail.com COMMENT= Fast GTK+ audio player with an clean and user friendly interface -RUN_DEPENDS= py*-dbus>=0.80:devel/py-dbus \ - py*-mutagen>=1.11:audio/py-mutagen +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.80:devel/py-dbus@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mutagen>=1.11:audio/py-mutagen@${PY_FLAVOR} LICENSE= GPLv2 -USES= python USE_GNOME= pygnome2 pygtk2 USE_GSTREAMER= python good bad -USES= gmake gettext desktop-file-utils +USES= gmake gettext desktop-file-utils python:2.7 NO_BUILD= yes #Audio gstreamer plugins @@ -31,10 +30,10 @@ MPEG4IP_DESC= AAC/MP4P support EXTRAS_DESC= Extra dependencies for plugins AUDIOCD_RUN_DEPENDS= cd-discid>=0.9:audio/cd-discid \ - py*-cddb>=1.4:audio/py-cddb \ + ${PYTHON_PKGNAMEPREFIX}cddb>=1.4:audio/py-cddb@${PY_FLAVOR} \ gstreamer-plugins-cdio>=0.10.16:sysutils/gstreamer-plugins-cdio -EXTRAS_RUN_DEPENDS= py*-pillow>0:graphics/py-pillow \ - py*-notify>=0.1.1:devel/py-notify +EXTRAS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}notify>=0.1.1:devel/py-notify@${PY_FLAVOR} FLAC_USE= GSTREAMER=flac MP3_USE= GSTREAMER=mp3 MPEG4IP_LIB_DEPENDS= libmp4v2.so:multimedia/mp4v2 Modified: head/audio/dir2ogg/Makefile ============================================================================== --- head/audio/dir2ogg/Makefile Sun Dec 10 20:45:32 2017 (r455912) +++ head/audio/dir2ogg/Makefile Sun Dec 10 20:48:45 2017 (r455913) @@ -14,7 +14,7 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= faad:audio/faad \ - mutagen-inspect:audio/py-mutagen \ + ${PYTHON_PKGNAMEPREFIX}mutagen>=0:audio/py-mutagen@${PY_FLAVOR} \ mplayer:multimedia/mplayer \ oggenc:audio/vorbis-tools Modified: head/audio/solfege/Makefile ============================================================================== --- head/audio/solfege/Makefile Sun Dec 10 20:45:32 2017 (r455912) +++ head/audio/solfege/Makefile Sun Dec 10 20:48:45 2017 (r455913) @@ -18,7 +18,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= docbook-xsl>0:textproc/docbook-xsl \ txt2man:textproc/txt2man -USES= gettext gmake makeinfo pathfix pkgconfig python shebangfix +USES= gettext gmake makeinfo pathfix pkgconfig python:2.7 shebangfix SHEBANG_FILES= exercises/standard/lesson-files/bin/csound-play-harmonic-interval.sh USE_GNOME= pygtk2 GNU_CONFIGURE= yes Modified: head/deskutils/ganyremote/Makefile ============================================================================== --- head/deskutils/ganyremote/Makefile Sun Dec 10 20:45:32 2017 (r455912) +++ head/deskutils/ganyremote/Makefile Sun Dec 10 20:48:45 2017 (r455913) @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= anyremote:comms/anyremote -USES= gettext python shebangfix +USES= gettext python:2.7 shebangfix SHEBANG_FILES= ganyremote USE_GNOME= pygtk2 GNU_CONFIGURE= yes Modified: head/deskutils/rox-memo/Makefile ============================================================================== --- head/deskutils/rox-memo/Makefile Sun Dec 10 20:45:32 2017 (r455912) +++ head/deskutils/rox-memo/Makefile Sun Dec 10 20:48:45 2017 (r455913) @@ -11,9 +11,9 @@ MAINTAINER= olgeni@FreeBSD.org COMMENT= Appointment/TODO management for the ROX desktop RUN_DEPENDS= ${LOCALBASE}/bin/rox:x11-fm/rox-filer \ - ${LOCALBASE}/lib/ROX-Lib2/python/rox/__init__.py:devel/py-roxlib + ${PYTHON_PKGNAMEPREFIX}roxlib>=0:devel/py-roxlib -USES= python shebangfix tar:bzip2 +USES= python:2.7 shebangfix tar:bzip2 SHEBANG_FILES= Memo/AppRun Memo/AppletRun do-build: Modified: head/devel/gtkparasite/Makefile ============================================================================== --- head/devel/gtkparasite/Makefile Sun Dec 10 20:45:32 2017 (r455912) +++ head/devel/gtkparasite/Makefile Sun Dec 10 20:48:45 2017 (r455913) @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-static INSTALL_TARGET= install-strip -USES= autoreconf libtool pkgconfig python +USES= autoreconf libtool pkgconfig python:2.7 USE_GNOME= gtk20 pygtk2 WRKSRC= ${WRKDIR}/chipx86-gtkparasite-a3d862d4a91ea27222e4273a6797f3e47efe6e83 PORTDOCS= USAGE Modified: head/devel/libhid/Makefile ============================================================================== --- head/devel/libhid/Makefile Sun Dec 10 20:45:32 2017 (r455912) +++ head/devel/libhid/Makefile Sun Dec 10 20:48:45 2017 (r455913) @@ -17,7 +17,7 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/xsltproc:textproc/libx GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-doxygen --disable-werror INSTALL_TARGET= install-strip -USES= gmake libtool pathfix python +USES= gmake libtool pathfix python:2.7 USE_LDCONFIG= yes EXTRA_PATCHES= ${FILESDIR}/extra-patch-usb Modified: head/editors/rox-edit/Makefile ============================================================================== --- head/editors/rox-edit/Makefile Sun Dec 10 20:45:32 2017 (r455912) +++ head/editors/rox-edit/Makefile Sun Dec 10 20:48:45 2017 (r455913) @@ -11,9 +11,9 @@ MAINTAINER= olgeni@FreeBSD.org COMMENT= Text editor for the ROX desktop RUN_DEPENDS= ${LOCALBASE}/bin/rox:x11-fm/rox-filer \ - ${LOCALBASE}/lib/ROX-Lib2/python/rox/__init__.py:devel/py-roxlib + ${PYTHON_PKGNAMEPREFIX}roxlib>=0:devel/py-roxlib -USES= python tar:bzip2 +USES= python:2.7 tar:bzip2 post-extract: @${FIND} ${WRKSRC} -name .cvsignore | ${XARGS} ${RM} Modified: head/emulators/swine/Makefile ============================================================================== --- head/emulators/swine/Makefile Sun Dec 10 20:45:32 2017 (r455912) +++ head/emulators/swine/Makefile Sun Dec 10 20:48:45 2017 (r455913) @@ -11,11 +11,9 @@ COMMENT= Qt4 graphical Wine frontend LICENSE= GPLv2 -BUILD_DEPENDS= pyrcc4:textproc/py-qt4-xml RUN_DEPENDS= xterm:x11/xterm \ cabextract:archivers/cabextract \ - icotool:graphics/icoutils \ - ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:x11-toolkits/py-qt4-gui + icotool:graphics/icoutils DATADIRLIB= ${PREFIX}/lib/${PORTNAME} @@ -23,8 +21,9 @@ USE_GITHUB= yes GH_ACCOUNT= dswd GH_PROJECT= Swine -USES= gmake python:2.7 +USES= gmake python:2.7 pyqt:4 NO_BUILD= yes +USE_PYQT= gui_run xml_build USE_QT4= linguist_build ONLY_FOR_ARCHS= i386 amd64 Modified: head/emulators/xen-kernel/Makefile ============================================================================== --- head/emulators/xen-kernel/Makefile Sun Dec 10 20:45:32 2017 (r455912) +++ head/emulators/xen-kernel/Makefile Sun Dec 10 20:48:45 2017 (r455913) @@ -14,7 +14,7 @@ LICENSE= GPLv2 ONLY_FOR_ARCHS= amd64 -USES= cpe gmake python:build +USES= cpe gmake python:2.7,build # We need to use ld from ports because the version in base doesn't # support the '--build-id' switch that's needed for live hypervisor Modified: head/games/kajongg/Makefile ============================================================================== --- head/games/kajongg/Makefile Sun Dec 10 20:45:32 2017 (r455912) +++ head/games/kajongg/Makefile Sun Dec 10 20:48:45 2017 (r455913) @@ -8,10 +8,10 @@ CATEGORIES= games kde kde-kde4 MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR} NO_ARCH= yes -USES= cmake:outsource kde:4 python tar:xz shebangfix sqlite +USES= cmake:outsource kde:4 python:2.7 tar:xz shebangfix sqlite USE_KDE= kdelibs pykde4 automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build CMAKE_ARGS= -DINSTALL_KAJONGG:BOOL=TRUE Modified: head/games/magicor/Makefile ============================================================================== --- head/games/magicor/Makefile Sun Dec 10 20:45:32 2017 (r455912) +++ head/games/magicor/Makefile Sun Dec 10 20:48:45 2017 (r455913) @@ -15,7 +15,7 @@ COMMENT= Old-school, puzzle game similar to Solomon's LICENSE= PD LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pygame/__init__.py:devel/py-game +RUN_DEPENDS= ${PYGAME} USES= python:2.7 shebangfix SHEBANG_FILES= *.py @@ -37,7 +37,7 @@ OPTIONS_DEFAULT=EDITOR OPTIONS_SUB= yes EDITOR_DESC= Enable editor -EDITOR_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:x11-toolkits/py-gtk2 +EDITOR_USE= gnome=pygtk2 post-patch: @${REINPLACE_CMD} -e 's|###CONFIG_PATH###|${PREFIX}/etc/magicor/magicor.conf|' \ Modified: head/games/openalchemist/Makefile ============================================================================== --- head/games/openalchemist/Makefile Sun Dec 10 20:45:32 2017 (r455912) +++ head/games/openalchemist/Makefile Sun Dec 10 20:48:45 2017 (r455913) @@ -26,7 +26,7 @@ USE_GNOME= pygtk2 USE_XORG= xxf86vm xi x11 xmu xext xdamage xfixes xau xdmcp xt sm ice USE_GL= gl glu USE_SDL= sdl gfx -USES= autoreconf gmake iconv jpeg pkgconfig python:run shebangfix +USES= autoreconf gmake iconv jpeg pkgconfig python:2.7,run shebangfix SHEBANG_FILES= openalchemist-config PORTDOCS= AUTHORS ChangeLog README TODO Modified: head/graphics/gimp-ez-perspective-plugin/Makefile ============================================================================== --- head/graphics/gimp-ez-perspective-plugin/Makefile Sun Dec 10 20:45:32 2017 (r455912) +++ head/graphics/gimp-ez-perspective-plugin/Makefile Sun Dec 10 20:48:45 2017 (r455913) @@ -22,7 +22,7 @@ LICENSE_DISTFILES= ${DISTNAME}${EXTRACT_SUFX} RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gimp-2.0.pc:graphics/gimp-app \ ${LOCALBASE}/libexec/gimp/2.2/python/gimpfu.py:graphics/py-gimp -USES= python:run zip +USES= python:2.7,run zip NO_BUILD= yes NO_ARCH= yes NO_WRKSUBDIR= yes Modified: head/graphics/gimp-resynthesizer/Makefile ============================================================================== --- head/graphics/gimp-resynthesizer/Makefile Sun Dec 10 20:45:32 2017 (r455912) +++ head/graphics/gimp-resynthesizer/Makefile Sun Dec 10 20:48:45 2017 (r455913) @@ -20,7 +20,7 @@ LIB_DEPENDS= libgimp-2.0.so:graphics/gimp-app USE_GITHUB= yes GH_ACCOUNT= bootchk -USES= autoreconf compiler:nestedfct gettext gmake localbase pkgconfig python:run shebangfix +USES= autoreconf compiler:nestedfct gettext gmake localbase pkgconfig python:2.7,run shebangfix SHEBANG_FILES= PluginScripts/*.py GNU_CONFIGURE= yes Modified: head/irc/py-supybot-plugins/Makefile ============================================================================== --- head/irc/py-supybot-plugins/Makefile Sun Dec 10 20:45:32 2017 (r455912) +++ head/irc/py-supybot-plugins/Makefile Sun Dec 10 20:48:45 2017 (r455913) @@ -12,9 +12,9 @@ DISTNAME= Supybot-plugins-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Official plugin pack for Supybot -RUN_DEPENDS= supybot:irc/py-supybot +RUN_DEPENDS= supybot:irc/py-supybot@${PY_FLAVOR} -USES= python tar:bzip2 +USES= python:2.7 tar:bzip2 post-extract: # Delete, because it now included in irc/py-supybot Modified: head/math/qtiplot/Makefile ============================================================================== --- head/math/qtiplot/Makefile Sun Dec 10 20:45:32 2017 (r455912) +++ head/math/qtiplot/Makefile Sun Dec 10 20:48:45 2017 (r455913) @@ -37,9 +37,8 @@ DOCS_RUN_DEPENDS= qtiplot-doc>=0:math/qtiplot-doc DOCS_USE= QT4=assistant-adp_run PYTHON_DESC= Python scripting support -PYTHON_USES= python:2.7 -PYTHON_BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:x11-toolkits/py-qt4-gui -PYTHON_RUN_DEPENDS= ${PYTHON_BUILD_DEPENDS} +PYTHON_USES= pyqt:4 python:2.7 +PYTHON_USE= pyqt=gui PYTHON_CONFIGURE_ENV= PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR} \ PYTHON_VERSION=${PYTHON_VERSION} Modified: head/misc/gonvert/Makefile ============================================================================== --- head/misc/gonvert/Makefile Sun Dec 10 20:45:32 2017 (r455912) +++ head/misc/gonvert/Makefile Sun Dec 10 20:48:45 2017 (r455913) @@ -12,7 +12,7 @@ COMMENT= Conversion utility that allows conversion bet LICENSE= GPLv2 USE_GNOME= pygtk2 -USES= python +USES= python:2.7 NO_BUILD= yes PORTDOCS= CHANGELOG FAQ README THANKS Modified: head/multimedia/gstreamer1-libav/Makefile ============================================================================== --- head/multimedia/gstreamer1-libav/Makefile Sun Dec 10 20:45:32 2017 (r455912) +++ head/multimedia/gstreamer1-libav/Makefile Sun Dec 10 20:48:45 2017 (r455913) @@ -21,7 +21,7 @@ LIB_DEPENDS= liborc-0.4.so:devel/orc \ PORTSCOUT= limitw:1,even USES= compiler:features gettext-runtime gmake libtool localbase \ - pkgconfig tar:xz + pkgconfig python:build tar:xz USE_LDCONFIG= yes USE_GSTREAMER1= yes USE_GNOME= glib20 Modified: head/multimedia/rox-videothumbnail/Makefile ============================================================================== --- head/multimedia/rox-videothumbnail/Makefile Sun Dec 10 20:45:32 2017 (r455912) +++ head/multimedia/rox-videothumbnail/Makefile Sun Dec 10 20:48:45 2017 (r455913) @@ -11,11 +11,11 @@ MAINTAINER= olgeni@FreeBSD.org COMMENT= Video thumbnail provider for the ROX file manager RUN_DEPENDS= ${LOCALBASE}/bin/rox:x11-fm/rox-filer \ - ${LOCALBASE}/lib/ROX-Lib2/python/rox/__init__.py:devel/py-roxlib + ${PYTHON_PKGNAMEPREFIX}roxlib>=0:devel/py-roxlib WRKSRC= ${WRKDIR}/VideoThumbnail -USES= python +USES= python:2.7 do-build: @${PYTHON_CMD} -m compileall ${WRKSRC} Modified: head/net-im/libpurple/Makefile ============================================================================== --- head/net-im/libpurple/Makefile Sun Dec 10 20:45:32 2017 (r455912) +++ head/net-im/libpurple/Makefile Sun Dec 10 20:48:45 2017 (r455913) @@ -208,7 +208,7 @@ CONFIGURE_ARGS+= --disable-gtkspell .if ${PORT_OPTIONS:MDBUS} LIB_DEPENDS+= libdbus-glib-1.so:devel/dbus-glib .if !defined(PIDGIN_SLAVE) -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/dbus/__init__.py:devel/py-dbus +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} .endif CONFIGURE_ARGS+= --enable-dbus PLIST_SUB+= DBUS="" Modified: head/net-im/telepathy-mission-control/Makefile ============================================================================== --- head/net-im/telepathy-mission-control/Makefile Sun Dec 10 20:45:32 2017 (r455912) +++ head/net-im/telepathy-mission-control/Makefile Sun Dec 10 20:48:45 2017 (r455913) @@ -14,7 +14,7 @@ COMMENT= Telepathy component to apps to abstract detai LIB_DEPENDS= libtelepathy.so:net-im/libtelepathy \ libdbus-glib-1.so:devel/dbus-glib -USES= gmake libtool pathfix pkgconfig +USES= gmake libtool pathfix pkgconfig python:2.7,build USE_GNOME= glib20 libxslt GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include Modified: head/net-im/telepathy-qt4/Makefile ============================================================================== --- head/net-im/telepathy-qt4/Makefile Sun Dec 10 20:45:32 2017 (r455912) +++ head/net-im/telepathy-qt4/Makefile Sun Dec 10 20:48:45 2017 (r455913) @@ -13,10 +13,10 @@ COMMENT= High-level Qt binding for Telepathy LICENSE= LGPL21 -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/_dbus_bindings.so:devel/py-dbus +BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/_dbus_bindings.so:devel/py-dbus@${PY_FLAVOR} LIB_DEPENDS= libtelepathy-farstream.so:net-im/telepathy-farstream \ libtelepathy-glib.so:net-im/telepathy-glib -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_dbus_bindings.so:devel/py-dbus +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_dbus_bindings.so:devel/py-dbus@${PY_FLAVOR} OPTIONS_DEFINE= DOCS Modified: head/net/exaddos/Makefile ============================================================================== --- head/net/exaddos/Makefile Sun Dec 10 20:45:32 2017 (r455912) +++ head/net/exaddos/Makefile Sun Dec 10 20:48:45 2017 (r455913) @@ -12,12 +12,12 @@ COMMENT= Monitor your network for DDoS LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}snmp4-mibs>=0.1.4:net-mgmt/py-snmp4-mibs \ - ${PYTHON_PKGNAMEPREFIX}snmp4>=4.2.3:net-mgmt/py-snmp4 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}snmp4-mibs>=0.1.4:net-mgmt/py-snmp4-mibs@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}snmp4>=4.2.3:net-mgmt/py-snmp4@${PY_FLAVOR} USE_GITHUB= yes GH_ACCOUNT= Exa-Networks -USES= python +USES= python:2.7 SUB_FILES= pkg-message exaddos.sh exaddos.conf.sample SUB_LIST= PYTHON_LIBDIR=${PYTHON_LIBDIR} PYTHON_CMD=${PYTHON_CMD} \ PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} Modified: head/net/gtknetcat/Makefile ============================================================================== --- head/net/gtknetcat/Makefile Sun Dec 10 20:45:32 2017 (r455912) +++ head/net/gtknetcat/Makefile Sun Dec 10 20:48:45 2017 (r455913) @@ -19,7 +19,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser -USES= gmake localbase python shebangfix +USES= gmake localbase python:2.7 shebangfix SHEBANG_FILES= src/gtknetcat.in src/gtknetcat.py USE_GNOME= intlhack pygtk2 GNU_CONFIGURE= yes Modified: head/net/mpich2/Makefile ============================================================================== --- head/net/mpich2/Makefile Sun Dec 10 20:45:32 2017 (r455912) +++ head/net/mpich2/Makefile Sun Dec 10 20:48:45 2017 (r455913) @@ -22,7 +22,7 @@ RUN_DEPENDS= bash:shells/bash GNU_CONFIGURE= yes USES= libtool:keepla localbase fortran perl5 \ - pkgconfig python + pkgconfig python:2.7 USE_GCC= yes USE_LDCONFIG= yes USE_PERL5= build Modified: head/science/gnudatalanguage/Makefile ============================================================================== --- head/science/gnudatalanguage/Makefile Sun Dec 10 20:45:32 2017 (r455912) +++ head/science/gnudatalanguage/Makefile Sun Dec 10 20:48:45 2017 (r455913) @@ -93,7 +93,7 @@ NETCDF_CMAKE_OFF= -DNETCDF:BOOL=NO PYTHON_USES= python:2.7 PYTHON_BUILD_DEPENDS= ${PYNUMPY} PYTHON_RUN_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib + ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} PYTHON_CMAKE_ON= -DPYTHON:BOOL=YES -DPYTHONVERSION:STRING="${PYTHON_VER}" PYTHON_CMAKE_OFF= -DPYTHON:BOOL=NO Modified: head/security/gnome-password-generator/Makefile ============================================================================== --- head/security/gnome-password-generator/Makefile Sun Dec 10 20:45:32 2017 (r455912) +++ head/security/gnome-password-generator/Makefile Sun Dec 10 20:48:45 2017 (r455913) @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= GNOME 2 password generator USE_GNOME= pygnome2 -USES= python +USES= python:2.7 do-build: @cd ${WRKSRC} && ${SED} -e 's|/usr/bin/python|${PYTHON_CMD}|g ; \ Modified: head/security/revelation/Makefile ============================================================================== --- head/security/revelation/Makefile Sun Dec 10 20:45:32 2017 (r455912) +++ head/security/revelation/Makefile Sun Dec 10 20:48:45 2017 (r455913) @@ -12,13 +12,13 @@ COMMENT= Password manager for the GNOME 2 desktop LICENSE= GPLv2 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus \ - ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR} LIB_DEPENDS= libcrack.so:security/cracklib RUN_DEPENDS:= ${BUILD_DEPENDS} \ ${PYTHON_PKGNAMEPREFIX}cracklib>0:security/py-cracklib -USES= desktop-file-utils gettext gmake pathfix pkgconfig python \ +USES= desktop-file-utils gettext gmake pathfix pkgconfig python:2.7 \ shared-mime-info shebangfix tar:bzip2 SHEBANG_FILES= src/revelation.py USE_GNOME= gnomeprefix pygnome2 intltool Modified: head/sysutils/qzeitgeist/Makefile ============================================================================== --- head/sysutils/qzeitgeist/Makefile Sun Dec 10 20:45:32 2017 (r455912) +++ head/sysutils/qzeitgeist/Makefile Sun Dec 10 20:48:45 2017 (r455913) @@ -18,7 +18,7 @@ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= rapper:textproc/raptor2 \ - ${PYTHON_SITELIBDIR}/rdflib/__init__.py:textproc/py-rdflib + ${PYTHON_PKGNAMEPREFIX}rdflib>=0:textproc/py-rdflib@${PY_FLAVOR} USES= cmake kde:4 python:2.7,build tar:bzip2 USE_KDE= automoc4 Modified: head/sysutils/u-boot-master/Makefile ============================================================================== --- head/sysutils/u-boot-master/Makefile Sun Dec 10 20:45:32 2017 (r455912) +++ head/sysutils/u-boot-master/Makefile Sun Dec 10 20:48:45 2017 (r455913) @@ -19,7 +19,7 @@ BUILD_DEPENDS+= gsed:textproc/gsed \ dtc>=1.4.1:sysutils/dtc BUILD_DEPENDS+= ${COMPILER}:devel/${COMPILER} -USES= gmake python:build shebangfix +USES= gmake python:2.7,build shebangfix BINARY_ALIAS= swig=swig3.0 sed=gsed USE_GITHUB= yes Modified: head/x11-fm/nemo/Makefile ============================================================================== --- head/x11-fm/nemo/Makefile Sun Dec 10 20:45:32 2017 (r455912) +++ head/x11-fm/nemo/Makefile Sun Dec 10 20:48:45 2017 (r455913) @@ -11,7 +11,7 @@ COMMENT= File manager for the Cinnamon desktop BUILD_DEPENDS= gnome-icon-theme>=0:misc/gnome-icon-theme \ gtkdocize:textproc/gtk-doc \ - py*-polib>=0:devel/py-polib \ + ${PYTHON_PKGNAMEPREFIX}polib>=0:devel/py-polib@${PY_FLAVOR} \ gnome-autogen.sh:devel/gnome-common \ gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas LIB_DEPENDS= libexif.so:graphics/libexif \ Modified: head/x11-fm/rox-mime-editor/Makefile ============================================================================== --- head/x11-fm/rox-mime-editor/Makefile Sun Dec 10 20:45:32 2017 (r455912) +++ head/x11-fm/rox-mime-editor/Makefile Sun Dec 10 20:48:45 2017 (r455913) @@ -11,9 +11,9 @@ MAINTAINER= olgeni@FreeBSD.org COMMENT= MIME type editor for the ROX desktop RUN_DEPENDS= ${LOCALBASE}/bin/rox:x11-fm/rox-filer \ - ${LOCALBASE}/lib/ROX-Lib2/python/rox/__init__.py:devel/py-roxlib + ${PYTHON_PKGNAMEPREFIX}roxlib>=0:devel/py-roxlib -USES= python shebangfix tar:bzip2 +USES= python:2.7 shebangfix tar:bzip2 SHEBANG_FILES= MIME-Editor/AppRun do-build: Modified: head/x11-fm/rox-session/Makefile ============================================================================== --- head/x11-fm/rox-session/Makefile Sun Dec 10 20:45:32 2017 (r455912) +++ head/x11-fm/rox-session/Makefile Sun Dec 10 20:48:45 2017 (r455913) @@ -14,12 +14,12 @@ LICENSE= GPLv2 LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib RUN_DEPENDS= ${LOCALBASE}/bin/rox:x11-fm/rox-filer \ ${PYTHON_PKGNAMEPREFIX}roxlib>=0:devel/py-roxlib \ - ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus + ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} WRKSRC= ${WRKDIR}/ROX-Session DATADIR= ${PREFIX}/apps/ROX-Session -USES= gettext-tools pkgconfig python +USES= gettext-tools pkgconfig python:2.7 USE_GNOME= gtk20 libxml2 USE_XORG= x11 xext xtst xxf86vm Modified: head/x11-toolkits/hippo-canvas/Makefile ============================================================================== --- head/x11-toolkits/hippo-canvas/Makefile Sun Dec 10 20:45:32 2017 (r455912) +++ head/x11-toolkits/hippo-canvas/Makefile Sun Dec 10 20:48:45 2017 (r455913) @@ -10,11 +10,11 @@ MASTER_SITES= GNOME MAINTAINER= ashish@FreeBSD.org COMMENT= Client stacker popup widget for GTK+ toolkit -BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pycairo.pc:graphics/py-cairo +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR} LIB_DEPENDS= libcroco-0.6.so:textproc/libcroco -RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pycairo.pc:graphics/py-cairo +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR} -USES= gmake libtool pathfix pkgconfig python tar:bzip2 +USES= gmake libtool pathfix pkgconfig python:2.7 tar:bzip2 USE_GNOME= cairo gtk20 glib20 librsvg2 pygtk2 pango GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-gtk-doc --enable-python Modified: head/x11-toolkits/py-gtksourceview/Makefile ============================================================================== --- head/x11-toolkits/py-gtksourceview/Makefile Sun Dec 10 20:45:32 2017 (r455912) +++ head/x11-toolkits/py-gtksourceview/Makefile Sun Dec 10 20:48:45 2017 (r455913) @@ -12,7 +12,7 @@ DISTNAME= pygtksourceview-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org COMMENT= Python bindings for GtkSourceView 2 -USES= gmake libtool:keepla pathfix pkgconfig python tar:bzip2 +USES= gmake libtool:keepla pathfix pkgconfig python:2.7 tar:bzip2 USE_GNOME= gnomeprefix gtksourceview2 pygtk2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-docs Modified: head/x11/rox-wallpaper/Makefile ============================================================================== --- head/x11/rox-wallpaper/Makefile Sun Dec 10 20:45:32 2017 (r455912) +++ head/x11/rox-wallpaper/Makefile Sun Dec 10 20:48:45 2017 (r455913) @@ -11,9 +11,9 @@ MAINTAINER= olgeni@FreeBSD.org COMMENT= Wallpaper management tool for the ROX desktop RUN_DEPENDS= ${LOCALBASE}/bin/rox:x11-fm/rox-filer \ - ${LOCALBASE}/lib/ROX-Lib2/python/rox/__init__.py:devel/py-roxlib + ${PYTHON_PKGNAMEPREFIX}roxlib>=0:devel/py-roxlib -USES= python +USES= python:2.7 WRKSRC= ${WRKDIR}/Wallpaper