x11/xpra: update to 2.5.1

While here, clean up a bit

1 files changed, 54 insertions, 51 deletions

diff --git a/x11/xpra/Makefile b/x11/xpra/Makefile
index 8136a56a0e52..38548c438b8f 100644
--- a/x11/xpra/Makefile
+++ b/x11/xpra/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xpra
-PORTVERSION=	2.4.3
-PORTREVISION=	6
+PORTVERSION=	2.5.1
 CATEGORIES=	x11
 MASTER_SITES=	http://xpra.org/src/
 
@@ -11,46 +10,51 @@ COMMENT=	Xpra gives you persistent remote applications for X
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gtk2>2:x11-toolkits/py-gtk2@${PY_FLAVOR} \
-		${PYNUMPY} \
+BUILD_DEPENDS=	${PYNUMPY} \
+		${PYTHON_PKGNAMEPREFIX}gtk2>2:x11-toolkits/py-gtk2@${PY_FLAVOR} \
 		brotli:archivers/brotli
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libturbojpeg.so:graphics/libjpeg-turbo \
 		libwebp.so:graphics/webp
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lz4>=0.7.0_1:archivers/py-lz4@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}rencode>1:converters/py-rencode@${PY_FLAVOR} \
+RUN_DEPENDS=	${LOCALBASE}/share/X11/xkb/rules/base:x11/xkeyboard-config \
+		${PYNUMPY} \
+		${PYTHON_PKGNAMEPREFIX}cryptography>1:security/py-cryptography@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dbus>1:devel/py-dbus@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pyinotify>0:devel/py-pyinotify@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}xxhash>0:devel/py-xxhash@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}gtk2>2:x11-toolkits/py-gtk2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}gtkglext>1:x11-toolkits/py-gtkglext@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}lz4>=0.7.0_1:archivers/py-lz4@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pillow>=3.0:graphics/py-pillow@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}PyOpenGL>=3.1.0:graphics/py-PyOpenGL@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyinotify>0:devel/py-pyinotify@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}PyOpenGL-accelerate>=3.1.0:graphics/py-PyOpenGL-accelerate@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} \
-		ssh-askpass:security/openssh-askpass \
-		${PYTHON_PKGNAMEPREFIX}cryptography>1:security/py-cryptography@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}PyOpenGL>=3.1.0:graphics/py-PyOpenGL@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}rencode>1:converters/py-rencode@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xxhash>0:devel/py-xxhash@${PY_FLAVOR} \
+		gstreamer1-plugins-pulse>=0:audio/gstreamer1-plugins-pulse \
 		setxkbmap:x11/setxkbmap \
+		ssh-askpass:security/openssh-askpass \
 		xauth:x11/xauth \
 		xkbcomp:x11/xkbcomp \
-		${LOCALBASE}/share/X11/xkb/rules/base:x11/xkeyboard-config \
-		Xvfb:x11-servers/xorg-vfbserver \
-		${PYTHON_PKGNAMEPREFIX}gtk2>2:x11-toolkits/py-gtk2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}gtkglext>1:x11-toolkits/py-gtkglext@${PY_FLAVOR} \
-		${PYNUMPY} \
-		gstreamer1-plugins-pulse>=0:audio/gstreamer1-plugins-pulse
+		Xvfb:x11-servers/xorg-vfbserver
 
-USES=		desktop-file-utils fortran gettext-runtime gnome pkgconfig python:2.7 shared-mime-info shebangfix tar:xz
+USES=		desktop-file-utils fortran gettext-runtime gnome pkgconfig \
+		python:2.7 shared-mime-info shebangfix tar:xz
 
 USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk20 pango
 USE_PYTHON=	cython distutils
 USE_XORG=	x11 xcomposite xdamage xext xfixes xi xkbfile xrandr xtst
-PLIST_SUB+=	PORTVERSION=${PORTVERSION} PYTHON_VER=${PYTHON_VER}
-SHEBANG_FILES=	cups/xpraforwarder scripts/auth_dialog scripts/xpra_udev_product_version
+PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
+		PYTHON_VER=${PYTHON_VER}
+SHEBANG_FILES=	cups/xpraforwarder scripts/auth_dialog \
+		scripts/xpra_udev_product_version
 MAKE_ENV=	XPRA_USE_PROCESS_POLLING=1
 
-OPTIONS_DEFINE=		AVAHI AVCODEC CUPS FFMPEG GSTREAMER HTML5 LIBYUV SWSCALE VPX WEBCAM X264 X265
-OPTIONS_DEFAULT=	AVAHI AVCODEC CUPS FFMPEG GSTREAMER HTML5 LIBYUV SWSCALE VPX X264
+OPTIONS_DEFINE=		AVAHI AVCODEC CUPS FFMPEG GSTREAMER HTML5 LIBYUV \
+			SWSCALE VPX WEBCAM X264 X265
+OPTIONS_DEFAULT=	AVAHI AVCODEC CUPS FFMPEG GSTREAMER HTML5 LIBYUV \
+			SWSCALE VPX X264
 OPTIONS_SUB=		yes
 
 AVCODEC_DESC=	Enable avcodec2 (FFmpeg) decoder
@@ -65,36 +69,35 @@ WEBCAM_DESC=	Enable webcam forwarding (client only)
 X264_DESC=	Enable X264 encoder
 X265_DESC=	Enable X265 encoder (slow)
 
-AVAHI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}avahi>0:net/py-avahi@${PY_FLAVOR}
-AVAHI_VARS=		XPRA_OPTIONS+=mdns
-AVCODEC_VARS=		XPRA_OPTIONS+=dec_avcodec2
-CUPS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycups>1:print/py-pycups@${PY_FLAVOR}
-CUPS_VARS=		XPRA_OPTIONS+=printing
-FFMPEG_VARS=		XPRA_OPTIONS+=enc_ffmpeg
-GSTREAMER_BUILD_DEPENDS=${PYTHON_PKGNAMEPREFIX}gstreamer1>1:multimedia/py-gstreamer1@${PY_FLAVOR}
-GSTREAMER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gstreamer1>1:multimedia/py-gstreamer1@${PY_FLAVOR}
-GSTREAMER_USE=		GSTREAMER1=flac,lame,mpg123,ogg,opus,vorbis,wavpack
-GSTREAMER_VARS=		XPRA_OPTIONS+=sound
-HTML5_VARS=		XPRA_OPTIONS+=html5
-LIBYUV_LIB_DEPENDS=	libyuv.so:graphics/libyuv
-LIBYUV_VARS=		XPRA_OPTIONS+=csc_libyuv
-SWSCALE_LIB_DEPENDS=	libswscale.so:multimedia/ffmpeg
-SWSCALE_VARS=		XPRA_OPTIONS+=csc_swscale
-VPX_LIB_DEPENDS=	libvpx.so:multimedia/libvpx
-VPX_VARS=		XPRA_OPTIONS+=vpx
-WEBCAM_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}opencv>2:graphics/py-opencv@${PY_FLAVOR}
-WEBCAM_VARS=		XPRA_OPTIONS+=webcam
-X264_LIB_DEPENDS=	libx264.so:multimedia/libx264
-X264_VARS=		XPRA_OPTIONS+=enc_x264
-X265_LIB_DEPENDS=	libx265.so:multimedia/x265
-X265_VARS=		XPRA_OPTIONS+=enc_x265
+AVAHI_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}avahi>0:net/py-avahi@${PY_FLAVOR}
+AVAHI_VARS=			XPRA_OPTIONS+=mdns
+AVCODEC_VARS=			XPRA_OPTIONS+=dec_avcodec2
+CUPS_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}pycups>1:print/py-pycups@${PY_FLAVOR}
+CUPS_VARS=			XPRA_OPTIONS+=printing
+FFMPEG_VARS=			XPRA_OPTIONS+=enc_ffmpeg
+GSTREAMER_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gstreamer1>1:multimedia/py-gstreamer1@${PY_FLAVOR}
+GSTREAMER_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}gstreamer1>1:multimedia/py-gstreamer1@${PY_FLAVOR}
+GSTREAMER_USE=			GSTREAMER1=flac,lame,mpg123,ogg,opus,vorbis,wavpack
+GSTREAMER_VARS=			XPRA_OPTIONS+=sound
+HTML5_VARS=			XPRA_OPTIONS+=html5
+LIBYUV_LIB_DEPENDS=		libyuv.so:graphics/libyuv
+LIBYUV_VARS=			XPRA_OPTIONS+=csc_libyuv
+SWSCALE_LIB_DEPENDS=		libswscale.so:multimedia/ffmpeg
+SWSCALE_VARS=			XPRA_OPTIONS+=csc_swscale
+VPX_LIB_DEPENDS=		libvpx.so:multimedia/libvpx
+VPX_VARS=			XPRA_OPTIONS+=vpx
+WEBCAM_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}opencv>2:graphics/py-opencv@${PY_FLAVOR}
+WEBCAM_VARS=			XPRA_OPTIONS+=webcam
+X264_LIB_DEPENDS=		libx264.so:multimedia/libx264
+X264_VARS=			XPRA_OPTIONS+=enc_x264
+X265_LIB_DEPENDS=		libx265.so:multimedia/x265
+X265_VARS=			XPRA_OPTIONS+=enc_x265
 
 PYDISTUTILS_PKGNAME=	xpra_all
-XPRA_OPTIONS_ALL=	csc_libyuv csc_swscale
-XPRA_OPTIONS_ALL+=	dec_avcodec2 enc_ffmpeg enc_x264 enc_x265
-XPRA_OPTIONS_ALL+=	html5 mdns sound printing vpx webcam
-XPRA_OPTIONS_ALL+=	${XPRA_OPTIONS_DISABLED}
-XPRA_OPTIONS_DISABLED=	Xdummy Xdummy_wrapper minify uinput netdev
+XPRA_OPTIONS_ALL+=	${XPRA_OPTIONS_DISABLED} csc_libyuv csc_swscale \
+			dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 html5 mdns \
+			printing sound vpx webcam
+XPRA_OPTIONS_DISABLED=	minify netdev uinput Xdummy Xdummy_wrapper
 
 .include <bsd.port.options.mk>