Index: head/x11/xpra/Makefile =================================================================== --- head/x11/xpra/Makefile (revision 437951) +++ head/x11/xpra/Makefile (revision 437952) @@ -1,130 +1,129 @@ # Created by: Steve Wills # $FreeBSD$ PORTNAME= xpra -PORTVERSION= 2.0 -PORTREVISION= 1 +PORTVERSION= 2.0.1 CATEGORIES= x11 MASTER_SITES= http://xpra.org/src/ MAINTAINER= rezny@FreeBSD.org COMMENT= Xpra gives you persistent remote applications for X LICENSE= GPLv2 BUILD_DEPENDS= cython:lang/cython \ ${PYTHON_PKGNAMEPREFIX}gtk2>2:x11-toolkits/py-gtk2 \ ${PYNUMPY} LIB_DEPENDS= libturbojpeg.so:graphics/libjpeg-turbo \ libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lz4>=0.7.0_1:archivers/py-lz4 \ ${PYTHON_PKGNAMEPREFIX}rencode>1:converters/py-rencode \ ${PYTHON_PKGNAMEPREFIX}dbus>1:devel/py-dbus \ ${PYTHON_PKGNAMEPREFIX}pyinotify>0:devel/py-pyinotify \ ${PYTHON_PKGNAMEPREFIX}xxhash>0:devel/py-xxhash \ ${PYTHON_PKGNAMEPREFIX}pillow>=3.0:graphics/py-pillow \ ${PYTHON_PKGNAMEPREFIX}PyOpenGL>=3.1.0:graphics/py-PyOpenGL \ ${PYTHON_PKGNAMEPREFIX}PyOpenGL-accelerate>=3.1.0:graphics/py-PyOpenGL-accelerate \ ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces \ ssh-askpass:security/openssh-askpass \ ${PYTHON_PKGNAMEPREFIX}cryptography>1:security/py-cryptography \ setxkbmap:x11/setxkbmap \ 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 \ ${PYTHON_PKGNAMEPREFIX}gtkglext>1:x11-toolkits/py-gtkglext \ ${PYNUMPY} USES= desktop-file-utils fortran gettext-runtime pkgconfig python:2 shared-mime-info tar:xz USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk20 pango USE_PYTHON= distutils USE_XORG= x11 xcomposite xdamage xext xfixes xkbfile xrandr xtst PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHON_VER=${PYTHON_VER} 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 CUPS_DESC= Enable CUPS for printer forwarding FFMPEG_DESC= Enable FFmpeg encoder GSTREAMER_DESC= Enable GStreamer for sound forwarding HTML5_DESC= Install HTML5 client interface LIBYUV_DESC= Enable libyuv CSC module (fastest) SWSCALE_DESC= Enable swscale (FFmpeg) CSC module VPX_DESC= Enable VP8 and VP9 codec 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 AVAHI_VARS= XPRA_OPTIONS+=mdns AVCODEC_VARS= XPRA_OPTIONS+=dec_avcodec2 CUPS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycups>1:print/py-pycups CUPS_VARS= XPRA_OPTIONS+=printing FFMPEG_VARS= XPRA_OPTIONS+=enc_ffmpeg GSTREAMER_BUILD_DEPENDS=${PYTHON_PKGNAMEPREFIX}gstreamer1>1:multimedia/py-gstreamer1 GSTREAMER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gstreamer1>1:multimedia/py-gstreamer1 GSTREAMER_USE= GSTREAMER1=flac,lame,mad,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}opencv2>2:graphics/py-opencv2 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 nvenc7 .include .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:MFFMPEG} LIB_DEPENDS+= libavcodec.so:multimedia/ffmpeg .endif .include PYDISTUTILS_BUILDARGS+= ${PYDISTUTILS_ARGS} PYDISTUTILS_CONFIGUREARGS+= ${PYDISTUTILS_ARGS} PYDISTUTILS_INSTALLARGS+= ${PYDISTUTILS_ARGS} post-patch: @${REINPLACE_CMD} -e 's|%%GCC_RUNTIME%%|${LOCALBASE}/lib/gcc${_GCC_VER}|' \ ${WRKSRC}/scripts/xpra ${WRKSRC}/scripts/xpra_launcher @${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|' \ ${WRKSRC}/xpra/platform/pycups_printing.py @${REINPLACE_CMD} -e 's|/usr/sbin|${LOCALBASE}/sbin|' \ ${WRKSRC}/etc/xpra/conf.d/16_printing.conf.in post-install: @${MV} ${STAGEDIR}${ETCDIR}/xorg.conf \ ${STAGEDIR}${ETCDIR}/xorg.conf.sample @${MV} ${STAGEDIR}${ETCDIR}/xpra.conf \ ${STAGEDIR}${ETCDIR}/xpra.conf.sample @${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME} -name '*.so' \ -exec ${STRIP_CMD} {} + .include Index: head/x11/xpra/distinfo =================================================================== --- head/x11/xpra/distinfo (revision 437951) +++ head/x11/xpra/distinfo (revision 437952) @@ -1,3 +1,3 @@ -TIMESTAMP = 1489775415 -SHA256 (xpra-2.0.tar.xz) = ca9e9622a9d435f9591bf60baec50ea02ebad4e0c0017e1df43dfddd6616e807 -SIZE (xpra-2.0.tar.xz) = 1925080 +TIMESTAMP = 1491326916 +SHA256 (xpra-2.0.1.tar.xz) = 685553c0f7cdeadde3d5a7ba48f3cd9d0feaa755e0debbdf198355223c8bc287 +SIZE (xpra-2.0.1.tar.xz) = 1926292 Index: head/x11/xpra/files/patch-setup.py =================================================================== --- head/x11/xpra/files/patch-setup.py (revision 437951) +++ head/x11/xpra/files/patch-setup.py (revision 437952) @@ -1,35 +1,35 @@ ---- setup.py.orig 2017-03-17 07:24:28 UTC +--- setup.py.orig 2017-04-02 13:48:04 UTC +++ setup.py -@@ -1801,12 +1801,12 @@ if WIN32: +@@ -1804,12 +1804,12 @@ if WIN32: else: #OSX and *nix: scripts += ["scripts/xpra", "scripts/xpra_launcher"] - add_data_files("share/man/man1", ["man/xpra.1", "man/xpra_launcher.1"]) + add_data_files("man/man1", ["man/xpra.1", "man/xpra_launcher.1"]) add_data_files("share/xpra", ["README", "COPYING"]) add_data_files("share/xpra/icons", glob.glob("icons/*")) add_data_files("share/applications", ["xdg/xpra_launcher.desktop", "xdg/xpra.desktop"]) add_data_files("share/mime/packages", ["xdg/application-x-xpraconfig.xml"]) - add_data_files("share/icons", ["xdg/xpra.png"]) + add_data_files("share/pixmaps", ["xdg/xpra.png"]) add_data_files("share/appdata", ["xdg/xpra.appdata.xml"]) #here, we override build and install so we can -@@ -1839,7 +1839,7 @@ else: +@@ -1842,7 +1842,7 @@ else: if printing_ENABLED and os.name=="posix": #install "/usr/lib/cups/backend" with 0700 permissions: xpraforwarder_src = os.path.join("cups", "xpraforwarder") - cups_backend_dir = os.path.join(self.install_dir, "lib", "cups", "backend") + cups_backend_dir = os.path.join(self.install_dir, "libexec", "cups", "backend") self.mkpath(cups_backend_dir) xpraforwarder_dst = os.path.join(cups_backend_dir, "xpraforwarder") shutil.copyfile(xpraforwarder_src, xpraforwarder_dst) -@@ -1891,7 +1891,7 @@ else: +@@ -1894,7 +1894,7 @@ else: add_packages("xpra.platform.xposix") remove_packages("xpra.platform.win32", "xpra.platform.darwin") #not supported by all distros, but doesn't hurt to install it anyway: -- add_data_files("lib/tmpfiles.d", ["tmpfiles.d/xpra.conf"]) -+ #add_data_files("lib/tmpfiles.d", ["tmpfiles.d/xpra.conf"]) +- add_data_files("/usr/lib/tmpfiles.d", ["tmpfiles.d/xpra.conf"]) ++ #add_data_files("/usr/lib/tmpfiles.d", ["tmpfiles.d/xpra.conf"]) #gentoo does weird things, calls --no-compile with build *and* install #then expects to find the cython modules!? ie: