Index: head/print/cloudprint/Makefile
===================================================================
--- head/print/cloudprint/Makefile	(revision 403516)
+++ head/print/cloudprint/Makefile	(revision 403517)
@@ -1,32 +1,33 @@
 # Created by: Bernhard Froehlich <decke@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	cloudprint
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	print
 
 MAINTAINER=	decke@FreeBSD.org
 COMMENT=	Google Cloud Print proxy for local CUPS printers
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cups>=0:${PORTSDIR}/print/py-cups \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycups>=0:${PORTSDIR}/print/py-pycups \
 		${PYTHON_PKGNAMEPREFIX}daemon>0:${PORTSDIR}/devel/py-daemon
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	armooo
 GH_TAGNAME=	4618224
 
 NO_ARCH=	yes
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 USE_RC_SUBR=	${PORTNAME}
 
 USERS=		cups
 GROUPS=		cups
 
 SUB_LIST+=	PYTHON_CMD="${PYTHON_CMD}" \
 		CPUSER="${USERS}" \
 		CPGROUP="${GROUPS}"
 
 .include <bsd.port.mk>
Index: head/print/cups-cloud-print/Makefile
===================================================================
--- head/print/cups-cloud-print/Makefile	(revision 403516)
+++ head/print/cups-cloud-print/Makefile	(revision 403517)
@@ -1,45 +1,46 @@
 # $FreeBSD$
 
 PORTNAME=	cups-cloud-print
 PORTVERSION=	20140814.3
+PORTREVISION=	1
 CATEGORIES=	print
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Print using Google Cloud Print
 
 LICENSE=	GPLv3 # (or later)
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	cups-config:${PORTSDIR}/print/cups-client
 RUN_DEPENDS=	cancel:${PORTSDIR}/print/cups-base \
-		${PYTHON_PKGNAMEPREFIX}cups>0:${PORTSDIR}/print/py-cups \
+		${PYTHON_PKGNAMEPREFIX}pycups>0:${PORTSDIR}/print/py-pycups \
 		bash:${PORTSDIR}/shells/bash \
 		${PYTHON_PKGNAMEPREFIX}httplib2>0:${PORTSDIR}/www/py-httplib2
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	simoncadman
 GH_PROJECT=	CUPS-Cloud-Print
 
 USES=		gmake python shebangfix
 SHEBANG_FILES=	testing/*.sh
 GNU_CONFIGURE=	yes
 MAKE_ARGS=	NOPERMS=1
 
 DATADIR=	${PREFIX}/share/cloudprint-cups
 DOCSDIR=	${PREFIX}/share/doc/cloudprint-cups
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/README.md/s|^|#| ; \
 		 /COPYING/s|^|#|' ${WRKSRC}/Makefile.in
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} README.md ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
Index: head/print/system-config-printer/Makefile
===================================================================
--- head/print/system-config-printer/Makefile	(revision 403516)
+++ head/print/system-config-printer/Makefile	(revision 403517)
@@ -1,50 +1,51 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	system-config-printer
 PORTVERSION=	1.4.7
+PORTREVISION=	1
 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:${PORTSDIR}/textproc/xmlto \
 		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml
 LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/cups.so:${PORTSDIR}/print/py-cups \
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/cups.so:${PORTSDIR}/print/py-pycups \
 		${PYTHON_SITELIBDIR}/pycurl.so:${PORTSDIR}/ftp/py-curl \
 		${LOCALBASE}/libexec/cups-pk-helper-mechanism:${PORTSDIR}/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 <bsd.port.mk>
Index: head/x11/xpra/Makefile
===================================================================
--- head/x11/xpra/Makefile	(revision 403516)
+++ head/x11/xpra/Makefile	(revision 403517)
@@ -1,104 +1,104 @@
 # Created by: Steve Wills <swills@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	xpra
 PORTVERSION=	0.15.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://xpra.org/src/
 
 MAINTAINER=	jkim@FreeBSD.org
 COMMENT=	Xpra gives you persistent remote applications for X
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	cython:${PORTSDIR}/lang/cython \
 		${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2
 RUN_DEPENDS=	py${PYTHON_SUFFIX}-lz4>=0.7.0_1:${PORTSDIR}/archivers/py-lz4 \
 		${PYTHON_SITELIBDIR}/rencode/__init__.py:${PORTSDIR}/converters/py-rencode \
 		${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus \
 		${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl \
 		${PYTHON_SITELIBDIR}/OpenGL_accelerate/__init__.py:${PORTSDIR}/graphics/py-opengl-accelerate \
 		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
 		${PYTHON_SITELIBDIR}/avahi/__init__.py:${PORTSDIR}/net/py-avahi \
 		${PYTHON_SITELIBDIR}/netifaces.so:${PORTSDIR}/net/py-netifaces \
-		${PYTHON_SITELIBDIR}/cups.so:${PORTSDIR}/print/py-cups \
+		${PYTHON_SITELIBDIR}/cups.so:${PORTSDIR}/print/py-pycups \
 		ssh-askpass:${PORTSDIR}/security/openssh-askpass \
 		setxkbmap:${PORTSDIR}/x11/setxkbmap \
 		xauth:${PORTSDIR}/x11/xauth \
 		xkbcomp:${PORTSDIR}/x11/xkbcomp \
 		${LOCALBASE}/share/X11/xkb/rules/base:${PORTSDIR}/x11/xkeyboard-config \
 		Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver \
 		${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2 \
 		${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gtkgl/__init__.py:${PORTSDIR}/x11-toolkits/py-gtkglext
 
 USES=		desktop-file-utils pkgconfig python shared-mime-info tar:xz
 USE_PYTHON=	distutils
 USE_XORG=	x11 xcomposite xdamage xfixes xkbfile xrandr xtst
 PLIST_SUB+=	PORTVERSION=${PORTVERSION} PYTHON_VER=${PYTHON_VER}
 
 OPTIONS_DEFINE=		AVCODEC OPENCL SWSCALE VPX WEBP X264 X265
 OPTIONS_DEFAULT=	AVCODEC SWSCALE VPX WEBP X264 X265
 OPTIONS_SUB=		yes
 
 AVCODEC_DESC=	Enable avcodec2 decoder
 OPENCL_DESC=	Enable OpenCL CSC module
 SWSCALE_DESC=	Enable swscale CSC module
 VPX_DESC=	Enable VP8 and VP9 encoder
 WEBP_DESC=	Enable WebP encoder
 X264_DESC=	Enable X264 encoder
 X265_DESC=	Enable X265 encoder
 
 AVCODEC_VARS=		XPRA_OPTIONS+=dec_avcodec2
 OPENCL_LIB_DEPENDS=	libOpenCL.so:${PORTSDIR}/devel/ocl-icd
 OPENCL_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pyopencl/__init__.py:${PORTSDIR}/devel/py-pyopencl
 OPENCL_VARS=		XPRA_OPTIONS+=csc_opencl
 SWSCALE_VARS=		XPRA_OPTIONS+=csc_swscale
 VPX_LIB_DEPENDS=	libvpx.so:${PORTSDIR}/multimedia/libvpx
 VPX_VARS=		XPRA_OPTIONS+=vpx
 WEBP_LIB_DEPENDS=	libwebp.so:${PORTSDIR}/graphics/webp
 WEBP_VARS=		XPRA_OPTIONS+=webp
 X264_LIB_DEPENDS=	libx264.so:${PORTSDIR}/multimedia/libx264
 X264_VARS=		XPRA_OPTIONS+=enc_x264
 X265_LIB_DEPENDS=	libx265.so:${PORTSDIR}/multimedia/x265
 X265_VARS=		XPRA_OPTIONS+=enc_x265
 
 PYDISTUTILS_PKGNAME=	xpra_all
 XPRA_OPTIONS_ALL=	csc_opencl csc_swscale dec_avcodec2
 XPRA_OPTIONS_ALL+=	enc_x264 enc_x265 vpx webp
 XPRA_OPTIONS_ALL+=	${XPRA_OPTIONS_DISABLED}
 XPRA_OPTIONS_DISABLED=	Xdummy Xdummy_wrapper
 XPRA_OPTIONS_DISABLED+=	nvenc3 nvenc4 nvenc5
 
 .include <bsd.port.options.mk>
 
 .for opt in ${XPRA_OPTIONS_ALL}
 .if empty(XPRA_OPTIONS:M${opt})
 PYDISTUTILS_ARGS+=	--without-${opt}
 .else
 PYDISTUTILS_ARGS+=	--with-${opt}
 .endif
 .endfor
 
 .if ${PORT_OPTIONS:MAVCODEC} || ${PORT_OPTIONS:MSWSCALE}
 LIB_DEPENDS+=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
 .endif
 
 .include <bsd.port.pre.mk>
 
 PYDISTUTILS_BUILDARGS+=		${PYDISTUTILS_ARGS}
 PYDISTUTILS_CONFIGUREARGS+=	${PYDISTUTILS_ARGS}
 PYDISTUTILS_INSTALLARGS+=	${PYDISTUTILS_ARGS}
 
 post-patch:
 	${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|' \
 	    ${WRKSRC}/xpra/platform/pycups_printing.py
 
 post-install:
 	${RM} ${STAGEDIR}${ETCDIR}/xpra.conf
 	${INSTALL_DATA} ${WRKSRC}/build/etc/xpra/xpra.conf \
 	    ${STAGEDIR}${ETCDIR}/xpra.conf.sample
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME} -name '*.so' \
 	    -exec ${STRIP_CMD} {} \;
 
 .include <bsd.port.post.mk>