Index: head/deskutils/gnome-documents/Makefile =================================================================== --- head/deskutils/gnome-documents/Makefile (revision 456216) +++ head/deskutils/gnome-documents/Makefile (revision 456217) @@ -1,49 +1,49 @@ # Created by: Gustau Perez i Querol # $FreeBSD$ PORTNAME= gnome-documents PORTVERSION= 3.18.2 PORTREVISION= 2 CATEGORIES= deskutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= Document manager application designed to work with GNOME 3 LICENSE= GPLv2 BUILD_DEPENDS= itstool:textproc/itstool \ docbook-xsl>=0:textproc/docbook-xsl LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \ libwebkit2gtk-4.0.so:www/webkit2-gtk3 \ libclutter-1.0.so:graphics/clutter \ libclutter-gtk-1.0.so:graphics/clutter-gtk3 \ libevview3.so:graphics/evince \ libgdata.so:devel/libgdata \ libgoa-1.0.so:net/gnome-online-accounts \ libgjs.so:lang/gjs \ libtracker-sparql-1.0.so:sysutils/tracker \ libzapojit-0.0.so:net/libzapojit -RUN_DEPENDS= py2?-dbus>0:devel/py-dbus \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \ ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss \ unoconv:textproc/unoconv PORTSCOUT= limitw:1,even USES= compiler:c++11-lib gettext gmake gnome libtool pathfix \ - pkgconfig tar:xz + pkgconfig python:2.7 tar:xz USE_GNOME= gnomedesktop3 gtk30 intlhack \ introspection:build librsvg2 libxml2 GNU_CONFIGURE= yes INSTALLS_ICONS= yes USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip GLIB_SCHEMAS= org.gnome.Documents.enums.xml \ org.gnome.books.gschema.xml \ org.gnome.documents.gschema.xml .include Index: head/deskutils/spice-gtk/Makefile =================================================================== --- head/deskutils/spice-gtk/Makefile (revision 456216) +++ head/deskutils/spice-gtk/Makefile (revision 456217) @@ -1,68 +1,69 @@ # Created by: olevole@olevole.ru # $FreeBSD$ PORTNAME= spice-gtk PORTVERSION= 0.33 PORTREVISION?= 0 CATEGORIES?= deskutils gnome MASTER_SITES= http://www.spice-space.org/download/gtk/ MAINTAINER= olevole@olevole.ru COMMENT?= Gtk client and libraries for SPICE remote desktop servers LICENSE= GPLv2 USE_XORG= pixman USE_GNOME= gnomeprefix gtk20 gtk30 intltool introspection:build USES= autoreconf cpe gmake jpeg libtool pkgconfig tar:bzip2 \ python ssl localbase:ldflags CPE_VENDOR= redhat BUILD_DEPENDS= spice-protocol>=0.12.10:devel/spice-protocol \ - ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.1:devel/py-pyparsing + ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.1:devel/py-pyparsing@${PY_FLAVOR} RUN_DEPENDS= spice-protocol>=0.12.10:devel/spice-protocol .if defined(SPICE_SLAVE) PORTREVISION= 1 CATEGORIES+= python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +USES:= ${USES:Npython} python:2.7 BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}gtk2>=0:x11-toolkits/py-gtk2 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}gtk2>=0:x11-toolkits/py-gtk2 CONFIGURE_ARGS+= --with-python .endif SPICE_SSL_CFLAGS= -I${OPENSSLINC} SPICE_SSL_LIBS= -L${OPENSSLLIB} -lcrypto -lssl CONFIGURE_ENV+= SSL_CFLAGS="${SPICE_SSL_CFLAGS}" SSL_LIBS="${SPICE_SSL_LIBS}" \ OPENSSL_CFLAGS="${SPICE_SSL_CFLAGS}" OPENSSL_LIBS="${SPICE_SSL_LIBS}" GNU_CONFIGURE= yes USE_LDCONFIG= yes # we can't use pathfix with USES=autoreconf MAKE_ARGS= pkgconfigdir="$(PREFIX)/libdata/pkgconfig" INSTALL_TARGET= install-strip OPTIONS_DEFINE= NLS DOCS SASL OPTIONS_DEFAULT= GSTREAMER SASL OPTIONS_SUB= yes NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls OPTIONS_SINGLE= AUDIO OPTIONS_SINGLE_AUDIO= GSTREAMER PULSEAUDIO NOAUDIO NOAUDIO_DESC= Disable audio backend GSTREAMER_CONFIGURE_ON= --with-audio=gstreamer GSTREAMER_USE= GSTREAMER1=yes PULSEAUDIO_CONFIGURE_ON= --with-audio=pulse PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CONFIGURE_ENABLE= pulse NOAUDIO_CONFIGURE_ON= --with-audio=no SASL_CONFIGURE_WITH= sasl=yes SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 .include Index: head/multimedia/totem/Makefile =================================================================== --- head/multimedia/totem/Makefile (revision 456216) +++ head/multimedia/totem/Makefile (revision 456217) @@ -1,95 +1,95 @@ # Created by: Hendrik Scholz # $FreeBSD$ PORTNAME= totem PORTVERSION= 3.18.1 PORTREVISION= 2 CATEGORIES= multimedia gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= Gstreamer-based video player for the GNOME 3 Desktop BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \ ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:misc/gnome-icon-theme \ - pylint${PYTHON_PKGNAMESUFFIX}>=0:devel/pylint \ + pylint:devel/pylint \ appstream-glib>=0:devel/appstream-glib \ itstool:textproc/itstool \ grilo-plugins2>=0:net/grilo-plugins2 LIB_DEPENDS= libgdata.so:devel/libgdata \ libdbus-glib-1.so:devel/dbus-glib \ libclutter-gst-3.0.so:multimedia/clutter-gst3 \ libclutter-gtk-1.0.so:graphics/clutter-gtk3 \ libpeas-1.0.so:devel/libpeas \ libtotem-plparser.so:multimedia/totem-pl-parser RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \ ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:misc/gnome-icon-theme \ ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py-libpeas@${PY_FLAVOR} \ gnome-settings-daemon>=2.91.0:sysutils/gnome-settings-daemon \ gnome-icon-theme-symbolic>=2.91.0:x11-themes/gnome-icon-theme-symbolic \ grilo-plugins2>=0:net/grilo-plugins2 PORTSCOUT= limitw:1,even USES= desktop-file-utils gettext gmake gnome libtool \ pathfix pkgconfig python:2 tar:xz USE_GNOME= gtk30 intlhack introspection:build libxml2 nautilus3 \ pygobject3 USE_XORG= x11 xproto xtst ice sm USE_GSTREAMER1= core good bad soup ugly INSTALLS_ICONS= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include -Wno-error=format-nonliteral CFLAGS+= -I${LOCALBASE}/include -Wno-error=format-nonliteral LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= LIBS="-lXrandr" CONFIGURE_ARGS= --with-plugins="${TOTEM_PLUGINS}" #CONFIGURE_ENV+= APPDATA_VALIDATE="${LOCALBASE}/bin/appdata-validate --nonet" MAKE_ENV= XDG_CACHE_HOME=${WRKDIR} INSTALL_TARGET= install-strip GLIB_SCHEMAS= org.gnome.totem.enums.xml \ org.gnome.totem.gschema.xml \ org.gnome.totem.plugins.opensubtitles.gschema.xml OPTIONS_DEFINE= LIRC PLIST_SUB+= PYVER=${PYTHON_VER:S/.//} OPTIONS_DEFAULT= # check configure script for allowed_plugins="..." for new plugins TOTEM_PLUGINS= apple-trailers autoload-subtitles brasero-disc-recorder chapters \ dbusservice im-status grilo gromit iplayer media-player-keys \ nautilus ontop opensubtitles properties recent \ save-file screensaver screenshot sidebar-test skipto vimeo \ youtube # pythonconsole samplepython # vala sample-vala # iplayer zeitgeist-dp grilo .include .if ${PORT_OPTIONS:MLIRC} LIB_DEPENDS+= liblirc_client.so:comms/lirc PLIST_SUB+= LIRC="" TOTEM_PLUGINS:= ${TOTEM_PLUGINS} lirc .else PLIST_SUB+= LIRC="@comment " .endif .if defined(WITH_DVD_DEVICE) DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE} .else DEFAULT_DVD_DEVICE=/dev/cd0 .endif pre-everything:: @${ECHO_MSG} "===> The default DVD device is ${DEFAULT_DVD_DEVICE}" @${ECHO_MSG} "===> Define WITH_DVD_DEVICE if you want to change the default" @${ECHO_MSG} "===> For example, 'make WITH_DVD_DEVICE=\"/dev/somedevice\"'" .include Index: head/net/cjdns/Makefile =================================================================== --- head/net/cjdns/Makefile (revision 456216) +++ head/net/cjdns/Makefile (revision 456217) @@ -1,42 +1,42 @@ # Created by: Yuri Victorovich # $FreeBSD$ PORTNAME= cjdns PORTVERSION= 20 DISTVERSIONPREFIX= cjdns-v CATEGORIES= net security MAINTAINER= yuri@rawbw.com COMMENT= Routing engine designed for security, scalability, speed LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= node:www/node \ bash:shells/bash USE_GITHUB= yes GH_ACCOUNT= cjdelisle -USES= gmake python +USES= gmake python:2.7 USE_RC_SUBR= cjdns SUB_FILES= cjdns pkg-message SUB_LIST= LOCALBASE=${LOCALBASE} PLIST_FILES= bin/cjdroute bin/run-cjdroute man/man5/cjdroute.conf.5.gz post-patch: @${REINPLACE_CMD} -i '' -e 's|/etc/|${LOCALBASE}/etc/|g' \ ${WRKSRC}/contrib/sh/run-cjdroute.sh do-build: cd ${WRKSRC} && ./do do-install: ${INSTALL_PROGRAM} ${WRKSRC}/cjdroute ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/contrib/sh/run-cjdroute.sh ${STAGEDIR}${PREFIX}/bin/run-cjdroute ${INSTALL_MAN} ${WRKSRC}/doc/man/cjdroute.conf.5 ${STAGEDIR}${MANPREFIX}/man/man5 do-test: ${WRKSRC}/cjdroute --bench .include Index: head/print/system-config-printer/Makefile =================================================================== --- head/print/system-config-printer/Makefile (revision 456216) +++ head/print/system-config-printer/Makefile (revision 456217) @@ -1,51 +1,51 @@ # Created by: Michael Johnson # $FreeBSD$ PORTNAME= system-config-printer PORTVERSION= 1.4.7 PORTREVISION= 3 CATEGORIES= print gnome MASTER_SITES= http://cyberelk.net/tim/data/${PORTNAME}/${PORTVERSION:R}/ MAINTAINER= gnome@FreeBSD.org COMMENT= CUPS configuration Gtk+2.0 GUI BUILD_DEPENDS= xmlto:textproc/xmlto \ docbook-xml>0:textproc/docbook-xml LIB_DEPENDS= libcups.so:print/cups -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/cups.so:print/py-pycups \ - ${PYTHON_SITELIBDIR}/pycurl.so:ftp/py-pycurl \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycups>=0:print/py-pycups@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycurl>=0:ftp/py-pycurl@${PY_FLAVOR} \ ${LOCALBASE}/libexec/cups-pk-helper-mechanism:print/cups-pk-helper # 1.5 series is python3 ignore them for now. PORTSCOUT= limitw:1,even GNU_CONFIGURE= yes USES= desktop-file-utils gettext gmake pathfix pkgconfig python:2 \ shebangfix tar:xz CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USE_GNOME= intlhack pygobject3 CONFIGURE_ARGS= --without-udev-rules \ --without-systemdsystemunitdir PLIST_SUB= PYTHON_VER=${PYTHON_VERSION:S/python//} SHEBANG_FILES= *.py troubleshoot/*.py xml/validate.py PYDISTUTILS_PKGNAME= cupshelpers PYDISTUTILS_PKGVERSION= 1.0 post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g; \ s|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/applet.py ${WRKSRC}/check-device-ids.py \ ${WRKSRC}/cupshelpers/cupshelpers.py \ ${WRKSRC}/cupshelpers/xmldriverprefs.py \ ${WRKSRC}/dbus/org.fedoraproject.Config.Printing.service \ ${WRKSRC}/newprinter.py ${WRKSRC}/probe_printer.py @${REINPLACE_CMD} -e 's|setup.py install.*|setup.py install -c -O1 --prefix=${PREFIX} --root=${STAGEDIR}|g' \ ${WRKSRC}/Makefile.in .include