Index: head/net/freerdp/Makefile =================================================================== --- head/net/freerdp/Makefile (revision 447435) +++ head/net/freerdp/Makefile (revision 447436) @@ -1,99 +1,95 @@ # Created by: Alexander Logvinov # $FreeBSD$ PORTNAME= freerdp -PORTVERSION= 2.0.0.g2016.11.24 -PORTREVISION= 4 +DISTVERSION= 2.0.0-rc0 CATEGORIES= net comms ipv6 MAINTAINER= kevans@FreeBSD.org COMMENT= Free implementation of Remote Desktop Protocol LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE USE_GITHUB= yes GH_ACCOUNT= FreeRDP GH_PROJECT= ${GH_ACCOUNT} -GH_TAGNAME= 2a6dbab USES= alias cmake:outsource compiler:c++11-lib cpe execinfo gettext localbase pathfix pkgconfig ssl USE_LDCONFIG= yes CPE_VENDOR= freerdp_project CMAKE_ARGS+= -DWITH_LIBSYSTEMD=OFF -DWITH_WAYLAND=OFF -DWITH_GSTREAMER_0_10=OFF ${CMAKE_ARGS_${ARCH}} CMAKE_ARGS_aarch64= -DWITH_NEON=ON CFLAGS_aarch64= -D__ARM_NEON__=__ARM_NEON # clang OPTIONS_DEFINE= ALSA CUPS FFMPEG GSTREAMER PULSEAUDIO X11 OPTIONS_DEFAULT= CUPS GSTREAMER X11 OPTIONS_SUB= yes OPTIONS_DEFINE_armv6= NEON OPTIONS_DEFINE_amd64= SSE OPTIONS_DEFINE_i386= SSE OPTIONS_DEFAULT_amd64= SSE ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CMAKE_BOOL= WITH_ALSA CUPS_LIB_DEPENDS= libcups.so:print/cups CUPS_CMAKE_BOOL= WITH_CUPS FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libavutil.so:multimedia/ffmpeg FFMPEG_CMAKE_BOOL= WITH_FFMPEG GSTREAMER_CMAKE_BOOL= WITH_GSTREAMER_1_0 GSTREAMER_USE= gnome=glib20 gstreamer1=yes xorg=x11,xextproto,xext,xrandr GSTREAMER_LIB_DEPENDS= libgstbase-1.0.so:multimedia/gstreamer1 NEON_DESC= Enable Media Processing Engine instructions NEON_CMAKE_BOOL= WITH_NEON .if ! ${CFLAGS:M-march*} NEON_CFLAGS= -march=armv7-a .endif PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CMAKE_BOOL= WITH_PULSE SSE_CMAKE_BOOL= WITH_SSE2 X11_DESC= Build FreeRDP X11 client X11_BUILD_DEPENDS= xmlto:textproc/xmlto X11_CMAKE_BOOL= WITH_X11 X11_CMAKE_OFF= -DWITH_XKBFILE=OFF X11_USE= xorg=x11,xkbfile,xcursor,xextproto,xv,xinerama,xext,xrandr,xi,xfixes,xrender .include .if ${OPSYS} == "FreeBSD" && ${ARCH} == "armv6" .if ${OSVERSION} < 1100500 || \ (${OSVERSION} >= 1100500 && ${OSVERSION} < 1100504) || \ (${OSVERSION} >= 1200000 && ${OSVERSION} < 1200008) BROKEN= Fails to build on ARMv6 (libm bug). See: r305380 (HEAD), r305971 (stable/11) [\#199422, \#211965] \ Please update to a later (fixed) version. .endif .endif post-patch: @${REINPLACE_CMD} -e '/CMAKE_INSTALL_RPATH /d' \ ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -e 's/OPENBSD/BSD/' \ ${WRKSRC}/winpr/CMakeLists.txt \ ${WRKSRC}/client/X11/CMakeLists.txt @${REINPLACE_CMD} -e 's/NetBSD__)/NetBSD__) || defined(__FreeBSD__)/' \ ${WRKSRC}/winpr/libwinpr/utils/trio/triodef.h - @${REINPLACE_CMD} -e 's|||' \ - ${WRKSRC}/channels/drive/client/statvfs.c @${RM} ${WRKSRC}/cmake/FindOpenSSL.cmake @${REINPLACE_CMD} -e 's|$${CMAKE_INSTALL_LIBDIR}/cmake|$${CMAKE_INSTALL_PREFIX}/share/cmake/Modules|' \ ${WRKSRC}/client/CMakeLists.txt \ ${WRKSRC}/winpr/CMakeLists.txt \ ${WRKSRC}/uwac/CMakeLists.txt \ ${WRKSRC}/server/CMakeLists.txt \ ${WRKSRC}/server/shadow/CMakeLists.txt \ ${WRKSRC}/libfreerdp/CMakeLists.txt .include Index: head/net/freerdp/distinfo =================================================================== --- head/net/freerdp/distinfo (revision 447435) +++ head/net/freerdp/distinfo (revision 447436) @@ -1,3 +1,3 @@ -TIMESTAMP = 1480005507 -SHA256 (FreeRDP-FreeRDP-2.0.0.g2016.11.24-2a6dbab_GH0.tar.gz) = 2a8550c3b067f49353614c4dc13fff4b2c0cf7653dd765c8e44eccaf8c79f20b -SIZE (FreeRDP-FreeRDP-2.0.0.g2016.11.24-2a6dbab_GH0.tar.gz) = 6417326 +TIMESTAMP = 1501924476 +SHA256 (FreeRDP-FreeRDP-2.0.0-rc0_GH0.tar.gz) = b432d92f529646f3e914513c8202c66ce167405082ee5b9e6d15ba4321ff6664 +SIZE (FreeRDP-FreeRDP-2.0.0-rc0_GH0.tar.gz) = 6486533 Index: head/net/freerdp/files/patch-libfreerdp_crypto_crypto.c =================================================================== --- head/net/freerdp/files/patch-libfreerdp_crypto_crypto.c (nonexistent) +++ head/net/freerdp/files/patch-libfreerdp_crypto_crypto.c (revision 447436) @@ -0,0 +1,11 @@ +--- libfreerdp/crypto/crypto.c.orig 2017-08-05 09:35:32 UTC ++++ libfreerdp/crypto/crypto.c +@@ -388,7 +388,7 @@ BOOL x509_verify_certificate(CryptoCert cert, char* ce + if (cert_ctx == NULL) + goto end; + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) + OpenSSL_add_all_algorithms(); + #else + OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \ Property changes on: head/net/freerdp/files/patch-libfreerdp_crypto_crypto.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/freerdp/files/patch-libfreerdp_crypto_tls.c =================================================================== --- head/net/freerdp/files/patch-libfreerdp_crypto_tls.c (revision 447435) +++ head/net/freerdp/files/patch-libfreerdp_crypto_tls.c (revision 447436) @@ -1,32 +1,27 @@ ---- libfreerdp/crypto/tls.c.orig 2016-11-24 14:45:22 UTC +--- libfreerdp/crypto/tls.c.orig 2017-07-24 08:46:54 UTC +++ libfreerdp/crypto/tls.c -@@ -218,9 +218,9 @@ static long bio_rdp_tls_ctrl(BIO* bio, i - case BIO_CTRL_RESET: - SSL_shutdown(tls->ssl); +@@ -853,13 +853,13 @@ int tls_connect(rdpTls* tls, BIO* underlying) + if (!tls_prepare(tls, underlying, SSLv23_client_method(), options, TRUE)) + return FALSE; -- if (tls->ssl->handshake_func == tls->ssl->method->ssl_connect) -+ if (SSL_in_connect_init(tls->ssl)) - SSL_set_connect_state(tls->ssl); -- else if (tls->ssl->handshake_func == tls->ssl->method->ssl_accept) -+ else if (SSL_in_accept_init(tls->ssl)) - SSL_set_accept_state(tls->ssl); - - SSL_clear(tls->ssl); -@@ -805,7 +805,7 @@ int tls_connect(rdpTls* tls, BIO* underl +-#ifndef OPENSSL_NO_TLSEXT ++#if !defined(OPENSSL_NO_TLSEXT) && !defined(LIBRESSL_VERSION_NUMBER) + SSL_set_tlsext_host_name(tls->ssl, tls->hostname); + #endif return tls_do_handshake(tls, TRUE); } --#ifndef OPENSSL_NO_TLSEXT -+#if !defined(OPENSSL_NO_TLSEXT) && !defined(LIBRESSL_VERSION_NUMBER) +-#if defined(MICROSOFT_IOS_SNI_BUG) && !defined(OPENSSL_NO_TLSEXT) ++#if defined(MICROSOFT_IOS_SNI_BUG) && !defined(OPENSSL_NO_TLSEXT) && !defined(LIBRESSL_VERSION_NUMBER) static void tls_openssl_tlsext_debug_callback(SSL* s, int client_server, int type, unsigned char* data, int len, void* arg) { -@@ -949,7 +949,7 @@ BOOL tls_accept(rdpTls* tls, BIO* underl +@@ -1002,7 +1002,7 @@ BOOL tls_accept(rdpTls* tls, BIO* underlying, rdpSetti return FALSE; } --#ifndef OPENSSL_NO_TLSEXT -+#if !defined(OPENSSL_NO_TLSEXT) && !defined(LIBRESSL_VERSION_NUMBER) - /** - * The Microsoft iOS clients eventually send a null or even double null - * terminated hostname in the SNI TLS extension! +-#if defined(MICROSOFT_IOS_SNI_BUG) && !defined(OPENSSL_NO_TLSEXT) ++#if defined(MICROSOFT_IOS_SNI_BUG) && !defined(OPENSSL_NO_TLSEXT) && !defined(LIBRESSL_VERSION_NUMBER) + SSL_set_tlsext_debug_callback(tls->ssl, tls_openssl_tlsext_debug_callback); + #endif + return tls_do_handshake(tls, FALSE) > 0; Index: head/net/freerdp/files/patch-winpr_libwinpr_crypto_hash.c =================================================================== --- head/net/freerdp/files/patch-winpr_libwinpr_crypto_hash.c (nonexistent) +++ head/net/freerdp/files/patch-winpr_libwinpr_crypto_hash.c (revision 447436) @@ -0,0 +1,29 @@ +--- winpr/libwinpr/crypto/hash.c.orig 2017-08-05 09:37:24 UTC ++++ winpr/libwinpr/crypto/hash.c +@@ -178,7 +178,7 @@ BOOL winpr_HMAC_Init(WINPR_HMAC_CTX* ctx, WINPR_MD_TYP + if (!evp || !hmac) + return FALSE; + +-#if (OPENSSL_VERSION_NUMBER < 0x10000000L) ++#if (OPENSSL_VERSION_NUMBER < 0x10000000L) || defined(LIBRESSL_VERSION_NUMBER) + HMAC_Init_ex(hmac, key, keylen, evp, NULL); /* no return value on OpenSSL 0.9.x */ + return TRUE; + #else +@@ -214,7 +214,7 @@ BOOL winpr_HMAC_Update(WINPR_HMAC_CTX* ctx, const BYTE + #if defined(WITH_OPENSSL) + HMAC_CTX* hmac = (HMAC_CTX*) ctx; + +-#if (OPENSSL_VERSION_NUMBER < 0x10000000L) ++#if (OPENSSL_VERSION_NUMBER < 0x10000000L) || defined(LIBRESSL_VERSION_NUMBER) + HMAC_Update(hmac, input, ilen); /* no return value on OpenSSL 0.9.x */ + return TRUE; + #else +@@ -244,7 +244,7 @@ BOOL winpr_HMAC_Final(WINPR_HMAC_CTX* ctx, BYTE* outpu + + #if defined(WITH_OPENSSL) + hmac = (HMAC_CTX*) ctx; +-#if (OPENSSL_VERSION_NUMBER < 0x10000000L) ++#if (OPENSSL_VERSION_NUMBER < 0x10000000L) || defined(LIBRESSL_VERSION_NUMBER) + HMAC_Final(hmac, output, NULL); /* no return value on OpenSSL 0.9.x */ + return TRUE; + #else Property changes on: head/net/freerdp/files/patch-winpr_libwinpr_crypto_hash.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/freerdp/files/patch-winpr_libwinpr_utils_ssl.c =================================================================== --- head/net/freerdp/files/patch-winpr_libwinpr_utils_ssl.c (nonexistent) +++ head/net/freerdp/files/patch-winpr_libwinpr_utils_ssl.c (revision 447436) @@ -0,0 +1,56 @@ +--- winpr/libwinpr/utils/ssl.c.orig 2017-07-24 08:46:54 UTC ++++ winpr/libwinpr/utils/ssl.c +@@ -58,7 +58,7 @@ struct CRYPTO_dynlock_value + }; + + +-#if (OPENSSL_VERSION_NUMBER < 0x10000000L) ++#if (OPENSSL_VERSION_NUMBER < 0x10000000L) || defined(LIBRESSL_VERSION_NUMBER) + static unsigned long _winpr_openssl_id(void) + { + return (unsigned long)GetCurrentThreadId(); +@@ -172,7 +172,7 @@ static BOOL _winpr_openssl_initialize_locking(void) + } + + /* Use the deprecated CRYPTO_get_id_callback() if building against OpenSSL < 1.0.0 */ +-#if (OPENSSL_VERSION_NUMBER < 0x10000000L) ++#if (OPENSSL_VERSION_NUMBER < 0x10000000L) || defined(LIBRESSL_VERSION_NUMBER) + + if (CRYPTO_get_id_callback()) + { +@@ -222,7 +222,7 @@ static BOOL _winpr_openssl_cleanup_locking(void) + CRYPTO_set_dynlock_destroy_callback(NULL); + } + +-#if (OPENSSL_VERSION_NUMBER < 0x10000000L) ++#if (OPENSSL_VERSION_NUMBER < 0x10000000L) || defined(LIBRESSL_VERSION_NUMBER) + + if (CRYPTO_get_id_callback() == _winpr_openssl_id) + { +@@ -255,7 +255,7 @@ static BOOL CALLBACK _winpr_openssl_initialize(PINIT_O + } + #endif + /* SSL_load_error_strings() is void */ +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) + SSL_load_error_strings(); + /* SSL_library_init() always returns "1" */ + SSL_library_init(); +@@ -296,7 +296,7 @@ BOOL winpr_CleanupSSL(DWORD flags) + #ifdef WINPR_OPENSSL_LOCKING_REQUIRED + _winpr_openssl_cleanup_locking(); + #endif +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) + CRYPTO_cleanup_all_ex_data(); + ERR_free_strings(); + EVP_cleanup(); +@@ -307,7 +307,7 @@ BOOL winpr_CleanupSSL(DWORD flags) + #ifdef WINPR_OPENSSL_LOCKING_REQUIRED + if (flags & WINPR_SSL_CLEANUP_THREAD) + { +-#if (OPENSSL_VERSION_NUMBER < 0x10000000L) ++#if (OPENSSL_VERSION_NUMBER < 0x10000000L) || defined(LIBRESSL_VERSION_NUMBER) + ERR_remove_state(0); + #else + ERR_remove_thread_state(NULL); Property changes on: head/net/freerdp/files/patch-winpr_libwinpr_utils_ssl.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/freerdp/files/patch-winpr_tools_makecert_makecert.c =================================================================== --- head/net/freerdp/files/patch-winpr_tools_makecert_makecert.c (nonexistent) +++ head/net/freerdp/files/patch-winpr_tools_makecert_makecert.c (revision 447436) @@ -0,0 +1,38 @@ +--- winpr/tools/makecert/makecert.c.orig 2017-07-24 08:46:54 UTC ++++ winpr/tools/makecert/makecert.c +@@ -620,7 +620,7 @@ int makecert_context_output_certificate_file(MAKECERT_ + printf("Using default export password \"password\"\n"); + } + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) + OpenSSL_add_all_algorithms(); + OpenSSL_add_all_ciphers(); + OpenSSL_add_all_digests(); +@@ -1008,7 +1008,7 @@ int makecert_context_process(MAKECERT_CONTEXT* context + key_length = atoi(arg->Value); + } + +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) + context->rsa = RSA_generate_key(key_length, RSA_F4, NULL, NULL); + #else + { +@@ -1043,7 +1043,7 @@ int makecert_context_process(MAKECERT_CONTEXT* context + { + ASN1_TIME* before; + ASN1_TIME* after; +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) + before = X509_get_notBefore(context->x509); + after = X509_get_notAfter(context->x509); + #else +@@ -1242,7 +1242,7 @@ void makecert_context_free(MAKECERT_CONTEXT* context) + #ifdef WITH_OPENSSL + X509_free(context->x509); + EVP_PKEY_free(context->pkey); +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) + CRYPTO_cleanup_all_ex_data(); + #endif + #endif Property changes on: head/net/freerdp/files/patch-winpr_tools_makecert_makecert.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/freerdp/pkg-plist =================================================================== --- head/net/freerdp/pkg-plist (revision 447435) +++ head/net/freerdp/pkg-plist (revision 447436) @@ -1,222 +1,224 @@ bin/winpr-hash bin/winpr-makecert %%X11%%bin/xfreerdp include/freerdp2/freerdp/addin.h include/freerdp2/freerdp/altsec.h include/freerdp2/freerdp/api.h include/freerdp2/freerdp/assistance.h include/freerdp2/freerdp/autodetect.h include/freerdp2/freerdp/build-config.h include/freerdp2/freerdp/cache/bitmap.h include/freerdp2/freerdp/cache/brush.h include/freerdp2/freerdp/cache/cache.h include/freerdp2/freerdp/cache/glyph.h include/freerdp2/freerdp/cache/nine_grid.h include/freerdp2/freerdp/cache/offscreen.h include/freerdp2/freerdp/cache/palette.h include/freerdp2/freerdp/cache/pointer.h include/freerdp2/freerdp/channels/audin.h include/freerdp2/freerdp/channels/channels.h include/freerdp2/freerdp/channels/cliprdr.h include/freerdp2/freerdp/channels/encomsp.h include/freerdp2/freerdp/channels/log.h include/freerdp2/freerdp/channels/rail.h include/freerdp2/freerdp/channels/rdpdr.h include/freerdp2/freerdp/channels/rdpei.h include/freerdp2/freerdp/channels/rdpgfx.h include/freerdp2/freerdp/channels/rdpsnd.h include/freerdp2/freerdp/channels/remdesk.h include/freerdp2/freerdp/channels/tsmf.h include/freerdp2/freerdp/channels/wtsvc.h include/freerdp2/freerdp/client.h include/freerdp2/freerdp/client/audin.h include/freerdp2/freerdp/client/channels.h include/freerdp2/freerdp/client/cliprdr.h include/freerdp2/freerdp/client/cmdline.h include/freerdp2/freerdp/client/disp.h include/freerdp2/freerdp/client/drdynvc.h include/freerdp2/freerdp/client/encomsp.h include/freerdp2/freerdp/client/file.h include/freerdp2/freerdp/client/rail.h include/freerdp2/freerdp/client/rdpei.h include/freerdp2/freerdp/client/rdpgfx.h include/freerdp2/freerdp/client/rdpsnd.h include/freerdp2/freerdp/client/remdesk.h include/freerdp2/freerdp/client/tsmf.h include/freerdp2/freerdp/codec/audio.h include/freerdp2/freerdp/codec/bitmap.h include/freerdp2/freerdp/codec/bulk.h include/freerdp2/freerdp/codec/clear.h include/freerdp2/freerdp/codec/color.h include/freerdp2/freerdp/codec/dsp.h include/freerdp2/freerdp/codec/h264.h include/freerdp2/freerdp/codec/interleaved.h include/freerdp2/freerdp/codec/jpeg.h include/freerdp2/freerdp/codec/mppc.h include/freerdp2/freerdp/codec/ncrush.h include/freerdp2/freerdp/codec/nsc.h include/freerdp2/freerdp/codec/planar.h include/freerdp2/freerdp/codec/progressive.h include/freerdp2/freerdp/codec/region.h include/freerdp2/freerdp/codec/rfx.h include/freerdp2/freerdp/codec/xcrush.h include/freerdp2/freerdp/codec/zgfx.h include/freerdp2/freerdp/codecs.h include/freerdp2/freerdp/constants.h include/freerdp2/freerdp/crypto/ber.h include/freerdp2/freerdp/crypto/certificate.h include/freerdp2/freerdp/crypto/crypto.h include/freerdp2/freerdp/crypto/der.h include/freerdp2/freerdp/crypto/er.h include/freerdp2/freerdp/crypto/per.h include/freerdp2/freerdp/crypto/tls.h include/freerdp2/freerdp/dvc.h include/freerdp2/freerdp/error.h include/freerdp2/freerdp/event.h include/freerdp2/freerdp/extension.h include/freerdp2/freerdp/freerdp.h include/freerdp2/freerdp/gdi/bitmap.h include/freerdp2/freerdp/gdi/dc.h include/freerdp2/freerdp/gdi/gdi.h include/freerdp2/freerdp/gdi/gfx.h include/freerdp2/freerdp/gdi/pen.h include/freerdp2/freerdp/gdi/region.h include/freerdp2/freerdp/gdi/shape.h include/freerdp2/freerdp/graphics.h include/freerdp2/freerdp/input.h include/freerdp2/freerdp/listener.h include/freerdp2/freerdp/locale/keyboard.h include/freerdp2/freerdp/locale/locale.h include/freerdp2/freerdp/log.h include/freerdp2/freerdp/message.h include/freerdp2/freerdp/metrics.h include/freerdp2/freerdp/peer.h include/freerdp2/freerdp/pointer.h include/freerdp2/freerdp/primary.h include/freerdp2/freerdp/primitives.h include/freerdp2/freerdp/rail.h include/freerdp2/freerdp/scancode.h include/freerdp2/freerdp/secondary.h include/freerdp2/freerdp/server/audin.h include/freerdp2/freerdp/server/channels.h include/freerdp2/freerdp/server/cliprdr.h include/freerdp2/freerdp/server/drdynvc.h include/freerdp2/freerdp/server/echo.h include/freerdp2/freerdp/server/encomsp.h include/freerdp2/freerdp/server/rdpdr.h include/freerdp2/freerdp/server/rdpei.h include/freerdp2/freerdp/server/rdpgfx.h include/freerdp2/freerdp/server/rdpsnd.h include/freerdp2/freerdp/server/remdesk.h include/freerdp2/freerdp/server/shadow.h include/freerdp2/freerdp/session.h include/freerdp2/freerdp/settings.h include/freerdp2/freerdp/svc.h include/freerdp2/freerdp/types.h include/freerdp2/freerdp/update.h include/freerdp2/freerdp/utils/msusb.h include/freerdp2/freerdp/utils/passphrase.h include/freerdp2/freerdp/utils/pcap.h include/freerdp2/freerdp/utils/profiler.h include/freerdp2/freerdp/utils/ringbuffer.h include/freerdp2/freerdp/utils/signal.h include/freerdp2/freerdp/utils/stopwatch.h include/freerdp2/freerdp/version.h include/freerdp2/freerdp/window.h include/winpr2/winpr/asn1.h include/winpr2/winpr/bcrypt.h include/winpr2/winpr/bitstream.h include/winpr2/winpr/clipboard.h include/winpr2/winpr/cmdline.h include/winpr2/winpr/collections.h include/winpr2/winpr/comm.h include/winpr2/winpr/credentials.h include/winpr2/winpr/credui.h include/winpr2/winpr/crt.h include/winpr2/winpr/crypto.h include/winpr2/winpr/debug.h include/winpr2/winpr/dsparse.h include/winpr2/winpr/endian.h include/winpr2/winpr/environment.h include/winpr2/winpr/error.h include/winpr2/winpr/file.h include/winpr2/winpr/handle.h include/winpr2/winpr/heap.h include/winpr2/winpr/image.h include/winpr2/winpr/ini.h include/winpr2/winpr/input.h include/winpr2/winpr/interlocked.h include/winpr2/winpr/intrin.h include/winpr2/winpr/io.h include/winpr2/winpr/library.h include/winpr2/winpr/locale.h include/winpr2/winpr/memory.h include/winpr2/winpr/midl.h include/winpr2/winpr/ndr.h include/winpr2/winpr/nt.h include/winpr2/winpr/ntlm.h include/winpr2/winpr/pack.h include/winpr2/winpr/path.h include/winpr2/winpr/pipe.h include/winpr2/winpr/platform.h include/winpr2/winpr/pool.h include/winpr2/winpr/print.h include/winpr2/winpr/registry.h include/winpr2/winpr/rpc.h include/winpr2/winpr/sam.h include/winpr2/winpr/schannel.h include/winpr2/winpr/security.h include/winpr2/winpr/shell.h include/winpr2/winpr/smartcard.h include/winpr2/winpr/spec.h include/winpr2/winpr/ssl.h include/winpr2/winpr/sspi.h include/winpr2/winpr/sspicli.h include/winpr2/winpr/stream.h include/winpr2/winpr/string.h include/winpr2/winpr/synch.h include/winpr2/winpr/sysinfo.h include/winpr2/winpr/tchar.h include/winpr2/winpr/thread.h include/winpr2/winpr/timezone.h include/winpr2/winpr/tools/makecert.h include/winpr2/winpr/user.h include/winpr2/winpr/version.h include/winpr2/winpr/windows.h include/winpr2/winpr/winhttp.h include/winpr2/winpr/winpr.h include/winpr2/winpr/winsock.h include/winpr2/winpr/wlog.h include/winpr2/winpr/wnd.h include/winpr2/winpr/wtsapi.h include/winpr2/winpr/wtypes.h -lib/libfreerdp-client.so -lib/libfreerdp-client.so.2 -lib/libfreerdp-client.so.2.0.0 -lib/libfreerdp.so -lib/libfreerdp.so.2 -lib/libfreerdp.so.2.0.0 -lib/libwinpr-tools.so -lib/libwinpr-tools.so.2 -lib/libwinpr-tools.so.2.0.0 -lib/libwinpr.so -lib/libwinpr.so.2 -lib/libwinpr.so.2.0.0 +lib/libfreerdp-client2.so +lib/libfreerdp-client2.so.2 +lib/libfreerdp-client2.so.2.0.0 +lib/libfreerdp2.so +lib/libfreerdp2.so.2 +lib/libfreerdp2.so.2.0.0 +lib/libwinpr-tools2.so +lib/libwinpr-tools2.so.2 +lib/libwinpr-tools2.so.2.0.0 +lib/libwinpr2.so +lib/libwinpr2.so.2 +lib/libwinpr2.so.2.0.0 libdata/pkgconfig/freerdp-client2.pc libdata/pkgconfig/freerdp2.pc libdata/pkgconfig/winpr-tools2.pc libdata/pkgconfig/winpr2.pc -man/man1/wlog.1.gz -%%X11%%man/man1/xfreerdp.1.gz share/cmake/Modules/FreeRDP-Client2/FreeRDP-ClientConfig.cmake share/cmake/Modules/FreeRDP-Client2/FreeRDP-ClientConfigVersion.cmake share/cmake/Modules/FreeRDP-Client2/FreeRDP-ClientTargets-%%CMAKE_BUILD_TYPE%%.cmake share/cmake/Modules/FreeRDP-Client2/FreeRDP-ClientTargets.cmake share/cmake/Modules/FreeRDP2/FreeRDPConfig.cmake share/cmake/Modules/FreeRDP2/FreeRDPConfigVersion.cmake share/cmake/Modules/FreeRDP2/FreeRDPTargets-%%CMAKE_BUILD_TYPE%%.cmake share/cmake/Modules/FreeRDP2/FreeRDPTargets.cmake share/cmake/Modules/WinPR2/WinPRConfig.cmake share/cmake/Modules/WinPR2/WinPRConfigVersion.cmake share/cmake/Modules/WinPR2/WinPRTargets-%%CMAKE_BUILD_TYPE%%.cmake share/cmake/Modules/WinPR2/WinPRTargets.cmake +share/man/man1/winpr-hash.1 +share/man/man1/winpr-makecert.1 +%%X11%%share/man/man1/xfreerdp.1 +share/man/man7/wlog.7 Index: head/net/remmina-plugin-rdp/Makefile =================================================================== --- head/net/remmina-plugin-rdp/Makefile (revision 447435) +++ head/net/remmina-plugin-rdp/Makefile (revision 447436) @@ -1,17 +1,18 @@ # Created by: Alexander Logvinov # $FreeBSD$ PKGNAMESUFFIX= -rdp +PORTREVISION= 1 COMMENT= Remmina plugin for RDP protocol -LIB_DEPENDS= libfreerdp.so:net/freerdp +LIB_DEPENDS= libfreerdp2.so:net/freerdp USE_GNOME+= cairo USE_XORG+= ice sm x11 xext MASTERDIR= ${.CURDIR}/../remmina-plugins PLIST_SUB+= ICONS="" SSH="" .include "${MASTERDIR}/Makefile" Index: head/net/vinagre/Makefile =================================================================== --- head/net/vinagre/Makefile (revision 447435) +++ head/net/vinagre/Makefile (revision 447436) @@ -1,63 +1,63 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ PORTNAME= vinagre PORTVERSION= 3.18.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= VNC client for the GNOME Desktop LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= appstream-glib>=0:devel/appstream-glib \ itstool:textproc/itstool \ gnome-autogen.sh:devel/gnome-common \ yelp-tools>=0:textproc/yelp-tools LIB_DEPENDS= libgtk-vnc-2.0.so:net/gtk-vnc \ libgdbm.so:databases/gdbm \ libsecret-1.so:security/libsecret RUN_DEPENDS= gnome-icon-theme>=0:misc/gnome-icon-theme PORTSCOUT= limitw:1,even USES= autoreconf desktop-file-utils gettext gmake gnome pathfix \ pkgconfig shared-mime-info tar:xz USE_GNOME= gtk30 intlhack libxml2 vte3 GNU_CONFIGURE= yes INSTALLS_ICONS= yes CONFIGURE_ARGS= --enable-ssh CPPFLAGS+= -I${LOCALBASE}/include -Wno-format-nonliteral LDFLAGS+= -L${LOCALBASE}/lib GLIB_SCHEMAS= org.gnome.Vinagre.gschema.xml OPTIONS_SUB= yes OPTIONS_DEFINE= AVAHI SPICE TELEPATHY RDP DOCS OPTIONS_DEFAULT=AVAHI SPICE TELEPATHY RDP AVAHI_CONFIGURE_WITH= avahi AVAHI_LIB_DEPENDS= libavahi-ui-gtk3.so:net/avahi-gtk3 SPICE_DESC= SPICE protocol support SPICE_CONFIGURE_ENABLE= spice SPICE_BUILD_DEPENDS= spice-gtk>=0.30_1:deskutils/spice-gtk SPICE_LIB_DEPENDS= libspice-client-gtk-3.0.so:deskutils/spice-gtk TELEPATHY_DESC= Telepathy integration TELEPATHY_CONFIGURE_WITH= telepathy TELEPATHY_LIB_DEPENDS= libtelepathy-glib.so:net-im/telepathy-glib \ libdbus-glib-1.so:devel/dbus-glib RDP_DESC= MS Windows remote desktop support RDP_CONFIGURE_ENABLE= rdp RDP_BUILD_DEPENDS= xfreerdp:net/freerdp RDP_RUN_DEPENDS= xfreerdp:net/freerdp post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in AUTHORS COPYING ChangeLog NEWS README ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor .include