Index: head/net/Makefile =================================================================== --- head/net/Makefile (revision 428329) +++ head/net/Makefile (revision 428330) @@ -1,1447 +1,1448 @@ # $FreeBSD$ # COMMENT = Networking tools SUBDIR += 3proxy SUBDIR += 44bsd-rdist SUBDIR += 6tunnel SUBDIR += GeoIP SUBDIR += R-cran-twitteR SUBDIR += Sockets SUBDIR += abills SUBDIR += activemq SUBDIR += adasockets SUBDIR += afpfs-ng SUBDIR += aget SUBDIR += anet SUBDIR += aoe SUBDIR += apinger SUBDIR += appkonference SUBDIR += aprsc SUBDIR += arp-scan SUBDIR += arp-sk SUBDIR += arpdig SUBDIR += arping SUBDIR += arprelease SUBDIR += asio SUBDIR += aslookup SUBDIR += asterisk-chan_sccp SUBDIR += asterisk-g72x SUBDIR += asterisk11 SUBDIR += asterisk13 SUBDIR += avahi SUBDIR += avahi-app SUBDIR += avahi-autoipd SUBDIR += avahi-gtk SUBDIR += avahi-gtk3 SUBDIR += avahi-header SUBDIR += avahi-libdns SUBDIR += avahi-qt4 SUBDIR += avahi-sharp SUBDIR += axa SUBDIR += babeld SUBDIR += balance SUBDIR += bctoolbox SUBDIR += beacon SUBDIR += beanstalkd SUBDIR += belle-sip SUBDIR += bindtest SUBDIR += binkd SUBDIR += bird SUBDIR += bird-devel SUBDIR += bird6 SUBDIR += bittwist SUBDIR += bluemix-cli SUBDIR += bmon SUBDIR += bnxt-kmod SUBDIR += boclient SUBDIR += boinc-client SUBDIR += boinc_curses SUBDIR += bounce SUBDIR += bsdec2-image-upload SUBDIR += bsdproxy SUBDIR += bwi-firmware-kmod SUBDIR += bwn-firmware-kmod SUBDIR += bwping SUBDIR += c3270 SUBDIR += cagibi SUBDIR += ccxstream SUBDIR += cf SUBDIR += chrony SUBDIR += citrix_ica SUBDIR += cjdns SUBDIR += clamz SUBDIR += cloud-init SUBDIR += clusterit SUBDIR += cnd SUBDIR += coda6_client SUBDIR += coda6_server SUBDIR += concourse-fly SUBDIR += corkscrew SUBDIR += corosync SUBDIR += courier-authlib-ldap SUBDIR += crtmpserver SUBDIR += cryptcat SUBDIR += csocks SUBDIR += csync2 SUBDIR += ctrace SUBDIR += cvsup-static SUBDIR += cvsync SUBDIR += cyphesis SUBDIR += czmq SUBDIR += daemonlogger SUBDIR += dante SUBDIR += daq SUBDIR += datapipe SUBDIR += dbeacon SUBDIR += delegate SUBDIR += dgd SUBDIR += dgd-kernel SUBDIR += dgd-lpmud SUBDIR += dhcp6 SUBDIR += dhcpcd SUBDIR += dhcpd SUBDIR += dhcpd-pools SUBDIR += dhcpdump SUBDIR += dhcperf SUBDIR += dhcping SUBDIR += dhcprelay SUBDIR += dhcprelya SUBDIR += dictd SUBDIR += dictd-database SUBDIR += dimes SUBDIR += dpdk SUBDIR += dpinger SUBDIR += drawterm SUBDIR += dropbox-api-command SUBDIR += dropbox-uploader SUBDIR += dshell SUBDIR += dtcp SUBDIR += dtcpclient SUBDIR += e169-stats SUBDIR += easysoap SUBDIR += echoping SUBDIR += elixir-kafka_ex SUBDIR += elixir-oauth2 SUBDIR += empty SUBDIR += enet SUBDIR += erlang-ranch SUBDIR += erlang-xmlrpc SUBDIR += etrace SUBDIR += exabgp SUBDIR += exaddos SUBDIR += findmtu SUBDIR += flowgrep SUBDIR += fonulator SUBDIR += foreman-proxy SUBDIR += fpc-ldap SUBDIR += fpc-pcap SUBDIR += fping SUBDIR += freebsd-tftp SUBDIR += freebsd-uucp SUBDIR += freediameter SUBDIR += freenet6 SUBDIR += freeradius-client SUBDIR += freeradius2 SUBDIR += freeradius3 SUBDIR += freerdp + SUBDIR += freerdp1 SUBDIR += freeswitch SUBDIR += freevrrpd SUBDIR += fspclient SUBDIR += fspd SUBDIR += fsplib SUBDIR += g2ipmsg SUBDIR += geoclue SUBDIR += geocode-glib SUBDIR += geoipupdate SUBDIR += get_iplayer SUBDIR += gfbgraph SUBDIR += gini SUBDIR += gkrellmwireless2 SUBDIR += glflow SUBDIR += glib-networking SUBDIR += glusterfs SUBDIR += gnatsd SUBDIR += gnet2 SUBDIR += gnetcat SUBDIR += gnome-nettool SUBDIR += gnome-online-accounts SUBDIR += gnome-online-miners SUBDIR += gnu-dico SUBDIR += gnu-radius SUBDIR += go-amqp SUBDIR += go-cs SUBDIR += go-geoip SUBDIR += go-httppath SUBDIR += go-httptreemux SUBDIR += go-nats SUBDIR += go.net SUBDIR += gofish SUBDIR += gogoc SUBDIR += google-cloud-sdk SUBDIR += google-daemon SUBDIR += google-startup-scripts SUBDIR += googlecl SUBDIR += gopher SUBDIR += gotthard SUBDIR += gpxe SUBDIR += gq SUBDIR += grdesktop SUBDIR += grilo SUBDIR += grilo-plugins SUBDIR += grive SUBDIR += grive2 SUBDIR += grsync SUBDIR += gsk SUBDIR += gspoof SUBDIR += gssdp SUBDIR += gstreamer-plugins-libmms SUBDIR += gstreamer1-plugins-libmms SUBDIR += gtic SUBDIR += gtk-vnc SUBDIR += gtknetcat SUBDIR += guacamole-server SUBDIR += gupnp SUBDIR += gupnp-av SUBDIR += gupnp-dlna SUBDIR += gupnp-igd SUBDIR += gupnp-ui SUBDIR += gutenfetch SUBDIR += gwhois SUBDIR += h323plus SUBDIR += hanstunnel SUBDIR += haproxy SUBDIR += haproxy-devel SUBDIR += hexinject SUBDIR += hidentd SUBDIR += hinfo SUBDIR += hlmaster SUBDIR += honeyd SUBDIR += hostapd SUBDIR += howl SUBDIR += hping SUBDIR += hping-devel SUBDIR += hs-aws SUBDIR += hs-connection SUBDIR += hs-gsasl SUBDIR += hs-hoauth2 SUBDIR += hs-hostname SUBDIR += hs-iproute SUBDIR += hs-maccatcher SUBDIR += hs-network SUBDIR += hs-network-info SUBDIR += hs-network-multicast SUBDIR += hs-network-protocol-xmpp SUBDIR += hs-network-uri SUBDIR += hs-pcap SUBDIR += hs-publicsuffixlist SUBDIR += hs-sendfile SUBDIR += hs-simple-sendfile SUBDIR += hs-socks SUBDIR += hsflowd SUBDIR += htpdate SUBDIR += http_ping SUBDIR += httping SUBDIR += httpry SUBDIR += hupnp SUBDIR += iaxmodem SUBDIR += icmpinfo SUBDIR += icpld SUBDIR += iet SUBDIR += ifdepd SUBDIR += iffinder SUBDIR += ifstat SUBDIR += ifstated SUBDIR += igmpproxy SUBDIR += iipsrv SUBDIR += ilbc SUBDIR += imapproxy SUBDIR += intel-em-kmod SUBDIR += intel-ixl-kmod SUBDIR += iodine SUBDIR += ip2location SUBDIR += ip6_int SUBDIR += ipdecap SUBDIR += ipgrab SUBDIR += iplog SUBDIR += ipsorc SUBDIR += ipsumdump SUBDIR += ipsvd SUBDIR += ipxe SUBDIR += irrd SUBDIR += isboot-kmod SUBDIR += isc-dhcp43-client SUBDIR += isc-dhcp43-relay SUBDIR += isc-dhcp43-server SUBDIR += istgt SUBDIR += jags SUBDIR += jakarta-commons-net SUBDIR += java-beepcore SUBDIR += jcifs SUBDIR += jgroups SUBDIR += jicmp SUBDIR += jicmp6 SUBDIR += jrdesktop SUBDIR += jsch SUBDIR += jumpgate SUBDIR += jwhois SUBDIR += kafkacat SUBDIR += kamailio SUBDIR += kdenetwork4 SUBDIR += kdenetwork4-filesharing SUBDIR += kdenetwork4-strigi-analyzers SUBDIR += kea SUBDIR += kf5-kxmlrpcclient SUBDIR += kget SUBDIR += kio-upnp-ms SUBDIR += kippo SUBDIR += kissd SUBDIR += knc SUBDIR += knemo-kde4 SUBDIR += krdc SUBDIR += krfb SUBDIR += kwooty SUBDIR += l2tpd SUBDIR += l4ip SUBDIR += ladvd SUBDIR += lambdamoo SUBDIR += latd SUBDIR += ldap-stats SUBDIR += ldap2dns SUBDIR += ldapbrowser SUBDIR += ldapdiff SUBDIR += ldapscripts SUBDIR += ldapsdk SUBDIR += ldapsh SUBDIR += lft SUBDIR += libarms SUBDIR += libbgpdump SUBDIR += libcapn SUBDIR += libcmis SUBDIR += libdmapsharing SUBDIR += libdnet SUBDIR += libexosip2 SUBDIR += libfb SUBDIR += libfixbuf SUBDIR += libgnetwork SUBDIR += libgweather SUBDIR += libilbc SUBDIR += libkfbapi SUBDIR += libkvkontakte SUBDIR += libmaia SUBDIR += libmateweather SUBDIR += libmaxminddb SUBDIR += libmediawiki SUBDIR += libmms SUBDIR += libmxp SUBDIR += libnatpmp SUBDIR += libnet SUBDIR += libnetdude SUBDIR += libnfs SUBDIR += libnids SUBDIR += libnss-cache SUBDIR += libnss-mysql SUBDIR += libnss-pgsql SUBDIR += liboauth SUBDIR += libopennet SUBDIR += liboping SUBDIR += libosip2 SUBDIR += libp0f SUBDIR += libpcap SUBDIR += libpcapnav SUBDIR += libproxy SUBDIR += libproxy-gnome SUBDIR += libproxy-gnome3 SUBDIR += libproxy-kde SUBDIR += libproxy-mozjs SUBDIR += libproxy-perl SUBDIR += libproxy-python SUBDIR += libproxy-webkit SUBDIR += librdkafka SUBDIR += librouteros SUBDIR += librsync SUBDIR += librsync1 SUBDIR += libsocket++ SUBDIR += libsocketcpp SUBDIR += libsrtp SUBDIR += libtnl SUBDIR += libtrace SUBDIR += libunp SUBDIR += libutp SUBDIR += libvncserver SUBDIR += libwebsockets SUBDIR += libzapojit SUBDIR += libzmq2 SUBDIR += libzmq3 SUBDIR += libzmq4 SUBDIR += liferea SUBDIR += linknx SUBDIR += linphone SUBDIR += linux-c6-avahi-libs SUBDIR += linux-c6-openldap SUBDIR += linux-c6-tcp_wrappers-libs SUBDIR += linux-c7-avahi-libs SUBDIR += linux-c7-openldap SUBDIR += linux-c7-tcp_wrappers-libs SUBDIR += linux-f10-nss_ldap SUBDIR += linux-f10-openldap SUBDIR += linuxigd SUBDIR += liveMedia SUBDIR += lla SUBDIR += ltm SUBDIR += lualdap SUBDIR += luasocket SUBDIR += lvwimax SUBDIR += mDNSResponder SUBDIR += macchanger SUBDIR += mad_fcl SUBDIR += malo-firmware-kmod SUBDIR += mdns-repeater SUBDIR += mediastreamer SUBDIR += mediatomb SUBDIR += megatools SUBDIR += mgen SUBDIR += micro_inetd SUBDIR += micro_proxy SUBDIR += minidlna SUBDIR += minisapserver SUBDIR += minissdpd SUBDIR += miniupnpc SUBDIR += miniupnpd SUBDIR += miredo SUBDIR += miruo SUBDIR += mlvpn SUBDIR += mobile-broadband-provider-info SUBDIR += mono-zeroconf SUBDIR += mopd SUBDIR += morebalance SUBDIR += mosh SUBDIR += mosquitto SUBDIR += motsognir SUBDIR += mpd-l2tp-ipv6pd-client SUBDIR += mpd5 SUBDIR += mpich SUBDIR += mpich2 SUBDIR += mping SUBDIR += mrouted SUBDIR += msend SUBDIR += mtr SUBDIR += mtr-nox11 SUBDIR += multicat SUBDIR += nakenchat SUBDIR += nanomsg SUBDIR += nast SUBDIR += nats-streaming-server SUBDIR += nats-top SUBDIR += nbd-server SUBDIR += nc SUBDIR += ncp SUBDIR += ndisc6 SUBDIR += ndpi SUBDIR += nepenthes SUBDIR += nepim SUBDIR += net6 SUBDIR += netatalk SUBDIR += netatalk3 SUBDIR += netcat SUBDIR += netdude SUBDIR += netembryo SUBDIR += netmap SUBDIR += netpipes SUBDIR += netscript SUBDIR += netsed SUBDIR += netselect SUBDIR += netstrain SUBDIR += nettest SUBDIR += netwib SUBDIR += neubot SUBDIR += nfsshell SUBDIR += ng_mikrotik_eoip SUBDIR += ngrep SUBDIR += nifmon SUBDIR += nload SUBDIR += nmsg SUBDIR += nocatsplash SUBDIR += norm SUBDIR += nos-ttb SUBDIR += nph SUBDIR += ns3 SUBDIR += nss-pam-ldapd SUBDIR += nss-pam-ldapd-sasl SUBDIR += nss_ldap SUBDIR += nsscache SUBDIR += ntimed SUBDIR += ntlmaps SUBDIR += ntop SUBDIR += ntopng SUBDIR += ntp SUBDIR += ntp-devel SUBDIR += ntpa SUBDIR += ntraceroute SUBDIR += nusoap SUBDIR += nxproxy SUBDIR += nyancat SUBDIR += nylon SUBDIR += ocserv SUBDIR += ohphone SUBDIR += olsrd SUBDIR += omnitty SUBDIR += onenetd SUBDIR += onioncat SUBDIR += opal SUBDIR += openafs SUBDIR += openbgpd SUBDIR += openbsc SUBDIR += opendpi SUBDIR += openggsn SUBDIR += openh323 SUBDIR += openldap24-client SUBDIR += openldap24-sasl-client SUBDIR += openldap24-server SUBDIR += openmpi SUBDIR += openmpi2 SUBDIR += openmq SUBDIR += openmq-client SUBDIR += openntpd SUBDIR += opennx SUBDIR += openospfd SUBDIR += openpgm SUBDIR += openradius SUBDIR += opensips SUBDIR += openslp SUBDIR += opentracker SUBDIR += openvswitch SUBDIR += ortp SUBDIR += osrtspproxy SUBDIR += ossp-sa SUBDIR += ostinato SUBDIR += owamp SUBDIR += p5-Acme-HTTP SUBDIR += p5-AddressBook SUBDIR += p5-Amazon-SQS-Simple SUBDIR += p5-AnyEvent-MPRPC SUBDIR += p5-AnyEvent-MQTT SUBDIR += p5-AnyEvent-RabbitMQ SUBDIR += p5-AnyEvent-Twitter SUBDIR += p5-AnyEvent-Twitter-Stream SUBDIR += p5-AnyMQ-AMQP SUBDIR += p5-Apache2-SOAP SUBDIR += p5-BBS-Client SUBDIR += p5-BBS-UserInfo SUBDIR += p5-BBS-UserInfo-Maple3 SUBDIR += p5-BBS-UserInfo-Maple3itoc SUBDIR += p5-BBS-UserInfo-Ptt SUBDIR += p5-BBS-UserInfo-SOB SUBDIR += p5-BBS-UserInfo-Wretch SUBDIR += p5-Beanstalk-Client SUBDIR += p5-Cisco-IPPhone SUBDIR += p5-Crypt-DH-GMP SUBDIR += p5-Daemon-Generic SUBDIR += p5-Data-IPV4-Range-Parse SUBDIR += p5-EasyTCP SUBDIR += p5-Event-tcp SUBDIR += p5-File-Rsync SUBDIR += p5-File-RsyncP SUBDIR += p5-Filesys-SmbClient SUBDIR += p5-Frontier-RPC SUBDIR += p5-Geo-IP SUBDIR += p5-Geo-IP-PurePerl SUBDIR += p5-Geo-IPfree SUBDIR += p5-GeoIP2 SUBDIR += p5-Google-SAML-Request SUBDIR += p5-Google-SAML-Response SUBDIR += p5-Growl-GNTP SUBDIR += p5-IO-Interface SUBDIR += p5-IO-Socket-INET6 SUBDIR += p5-IO-Socket-IP SUBDIR += p5-IO-Socket-Multicast SUBDIR += p5-IO-Socket-Multicast6 SUBDIR += p5-IO-Socket-Socks SUBDIR += p5-IO-Socket-Timeout SUBDIR += p5-IO-Socket-UNIX-Util SUBDIR += p5-IP-Anonymous SUBDIR += p5-IP-Country SUBDIR += p5-IPC-Session SUBDIR += p5-JavaScript-RPC SUBDIR += p5-Kafka SUBDIR += p5-MaxMind-DB-Common SUBDIR += p5-MaxMind-DB-Reader SUBDIR += p5-MaxMind-DB-Writer SUBDIR += p5-Net SUBDIR += p5-Net-AMQP SUBDIR += p5-Net-APNS SUBDIR += p5-Net-APNs-Extended SUBDIR += p5-Net-ARP SUBDIR += p5-Net-Address-Ethernet SUBDIR += p5-Net-Address-IPv4-Local SUBDIR += p5-Net-Amazon SUBDIR += p5-Net-Amazon-AWSSign SUBDIR += p5-Net-Amazon-EC2 SUBDIR += p5-Net-Amazon-MechanicalTurk SUBDIR += p5-Net-Amazon-S3 SUBDIR += p5-Net-Amazon-Signature SUBDIR += p5-Net-Amazon-Signature-V3 SUBDIR += p5-Net-Amazon-Signature-V4 SUBDIR += p5-Net-Amazon-Thumbnail SUBDIR += p5-Net-Analysis SUBDIR += p5-Net-Appliance-Phrasebook SUBDIR += p5-Net-Appliance-Session SUBDIR += p5-Net-BGP SUBDIR += p5-Net-Blogger SUBDIR += p5-Net-CIDR-Lite SUBDIR += p5-Net-CIDR-MobileJP SUBDIR += p5-Net-CIDR-Set SUBDIR += p5-Net-CLI-Interact SUBDIR += p5-Net-CSTA SUBDIR += p5-Net-CascadeCopy SUBDIR += p5-Net-Cassandra SUBDIR += p5-Net-Cassandra-Easy SUBDIR += p5-Net-DAV-Server SUBDIR += p5-Net-DHCP SUBDIR += p5-Net-DHCP-Watch SUBDIR += p5-Net-DHCPClient SUBDIR += p5-Net-DLookup SUBDIR += p5-Net-Daemon SUBDIR += p5-Net-Delicious SUBDIR += p5-Net-Dict SUBDIR += p5-Net-Divert SUBDIR += p5-Net-Dropbox-API SUBDIR += p5-Net-EPP SUBDIR += p5-Net-EPP-Proxy SUBDIR += p5-Net-FS-Flickr SUBDIR += p5-Net-FS-Gmail SUBDIR += p5-Net-FTP-AutoReconnect SUBDIR += p5-Net-FTP-File SUBDIR += p5-Net-Finger SUBDIR += p5-Net-Flow SUBDIR += p5-Net-Frame SUBDIR += p5-Net-Frame-Device SUBDIR += p5-Net-Frame-Dump SUBDIR += p5-Net-Frame-Layer-ICMPv6 SUBDIR += p5-Net-Frame-Layer-IPv6 SUBDIR += p5-Net-Frame-Simple SUBDIR += p5-Net-GitHub SUBDIR += p5-Net-Gnats SUBDIR += p5-Net-Google SUBDIR += p5-Net-Google-Analytics SUBDIR += p5-Net-Google-AuthSub SUBDIR += p5-Net-Google-Calendar SUBDIR += p5-Net-Google-Code SUBDIR += p5-Net-Google-DataAPI SUBDIR += p5-Net-Google-PicasaWeb SUBDIR += p5-Net-Google-SafeBrowsing2 SUBDIR += p5-Net-Google-Spreadsheets SUBDIR += p5-Net-Growl SUBDIR += p5-Net-GrowlClient SUBDIR += p5-Net-HL7 SUBDIR += p5-Net-HTTP SUBDIR += p5-Net-HTTP-Spore SUBDIR += p5-Net-HTTP-Spore-Middleware-Header SUBDIR += p5-Net-HTTPS-Any SUBDIR += p5-Net-HTTPS-NB SUBDIR += p5-Net-Hiveminder SUBDIR += p5-Net-INET6Glue SUBDIR += p5-Net-IP-Minimal SUBDIR += p5-Net-IP-RangeCompare SUBDIR += p5-Net-IPTrie SUBDIR += p5-Net-IRR SUBDIR += p5-Net-Ident SUBDIR += p5-Net-Ifconfig-Wrapper SUBDIR += p5-Net-Interface SUBDIR += p5-Net-Jaiku SUBDIR += p5-Net-Jifty SUBDIR += p5-Net-LDAP-AutoDNs SUBDIR += p5-Net-LDAP-AutoServer SUBDIR += p5-Net-LDAP-Express SUBDIR += p5-Net-LDAP-FilterBuilder SUBDIR += p5-Net-LDAP-LDAPhash SUBDIR += p5-Net-LDAP-Makepath SUBDIR += p5-Net-LDAP-Server SUBDIR += p5-Net-LDAP-Server-Test SUBDIR += p5-Net-LDAP-posixAccount SUBDIR += p5-Net-LDAP-posixGroup SUBDIR += p5-Net-Libdnet SUBDIR += p5-Net-Libdnet6 SUBDIR += p5-Net-LimeLight-Purge SUBDIR += p5-Net-MAC SUBDIR += p5-Net-MAC-Vendor SUBDIR += p5-Net-MQTT SUBDIR += p5-Net-Mosso-CloudFiles SUBDIR += p5-Net-MovableType SUBDIR += p5-Net-NBName SUBDIR += p5-Net-NBsocket SUBDIR += p5-Net-NIS SUBDIR += p5-Net-NIS-Listgroup SUBDIR += p5-Net-Nessus-XMLRPC SUBDIR += p5-Net-Nmsg SUBDIR += p5-Net-OAuth SUBDIR += p5-Net-OAuth-Simple SUBDIR += p5-Net-OAuth2 SUBDIR += p5-Net-OpenID-Consumer SUBDIR += p5-Net-OpenSSH SUBDIR += p5-Net-OpenSSH-Parallel SUBDIR += p5-Net-OpenStack-Attack SUBDIR += p5-Net-Packet SUBDIR += p5-Net-Packet-Target SUBDIR += p5-Net-ParseWhois SUBDIR += p5-Net-Patricia SUBDIR += p5-Net-Pcap SUBDIR += p5-Net-PcapUtils SUBDIR += p5-Net-Ping-External SUBDIR += p5-Net-Proxy SUBDIR += p5-Net-PubSubHubbub-Publisher SUBDIR += p5-Net-RTP SUBDIR += p5-Net-RabbitFoot SUBDIR += p5-Net-RabbitMQ SUBDIR += p5-Net-Radius SUBDIR += p5-Net-Random SUBDIR += p5-Net-RawIP SUBDIR += p5-Net-RawSock SUBDIR += p5-Net-Rendezvous-Publish SUBDIR += p5-Net-Riak SUBDIR += p5-Net-Rsh SUBDIR += p5-Net-SAP SUBDIR += p5-Net-SCP SUBDIR += p5-Net-SCP-Expect SUBDIR += p5-Net-SDP SUBDIR += p5-Net-SFTP SUBDIR += p5-Net-SFTP-Foreign SUBDIR += p5-Net-SIP SUBDIR += p5-Net-SMPP SUBDIR += p5-Net-SMS-Clickatell SUBDIR += p5-Net-SMS-Mollie SUBDIR += p5-Net-SMS-PChome SUBDIR += p5-Net-SNPP SUBDIR += p5-Net-SPDY SUBDIR += p5-Net-SSH SUBDIR += p5-Net-SSH-Expect SUBDIR += p5-Net-SSH-Mechanize SUBDIR += p5-Net-SSH-Perl SUBDIR += p5-Net-SSH2 SUBDIR += p5-Net-STOMP-Client SUBDIR += p5-Net-Server SUBDIR += p5-Net-Server-Coro SUBDIR += p5-Net-Server-SS-PreFork SUBDIR += p5-Net-Subnet SUBDIR += p5-Net-Syslog SUBDIR += p5-Net-TCLink SUBDIR += p5-Net-TacacsPlus SUBDIR += p5-Net-TcpDumpLog SUBDIR += p5-Net-Telnet SUBDIR += p5-Net-Telnet-Netscreen SUBDIR += p5-Net-TiVo SUBDIR += p5-Net-Todoist SUBDIR += p5-Net-Traceroute SUBDIR += p5-Net-Traceroute-PurePerl SUBDIR += p5-Net-Traceroute6 SUBDIR += p5-Net-Trackback SUBDIR += p5-Net-Twitter SUBDIR += p5-Net-Twitter-Lite SUBDIR += p5-Net-VNC SUBDIR += p5-Net-Wake SUBDIR += p5-Net-WhitePages SUBDIR += p5-Net-Whois SUBDIR += p5-Net-Whois-ARIN SUBDIR += p5-Net-Whois-IP SUBDIR += p5-Net-Whois-RIPE SUBDIR += p5-Net-Whois-Raw SUBDIR += p5-Net-Works SUBDIR += p5-Net-Write SUBDIR += p5-Net-XWhois SUBDIR += p5-Net-Yadis SUBDIR += p5-Net-Z3950-SimpleServer SUBDIR += p5-Net-Z3950-ZOOM SUBDIR += p5-Net-ext SUBDIR += p5-Net-sFlow SUBDIR += p5-Net-uFTP SUBDIR += p5-NetAddr-IP-Count SUBDIR += p5-NetAddr-MAC SUBDIR += p5-NetPacket SUBDIR += p5-OAI-Harvester SUBDIR += p5-OurNet-BBS SUBDIR += p5-OurNet-BBSAgent SUBDIR += p5-POE-Component-Client-Ident SUBDIR += p5-POE-Component-Client-Keepalive SUBDIR += p5-POE-Component-Client-Ping SUBDIR += p5-POE-Component-Client-Telnet SUBDIR += p5-POE-Component-Client-Traceroute SUBDIR += p5-POE-Component-Client-Twitter SUBDIR += p5-POE-Component-Client-Whois SUBDIR += p5-POE-Component-ControlPort SUBDIR += p5-POE-Component-Generic SUBDIR += p5-POE-Component-Jabber SUBDIR += p5-POE-Component-Pcap SUBDIR += p5-POE-Component-PubSub SUBDIR += p5-POE-Component-Server-Twirc SUBDIR += p5-POEx-Role-TCPServer SUBDIR += p5-POSIX-Socket SUBDIR += p5-POSIX-getpeername SUBDIR += p5-Parallel-Pvm SUBDIR += p5-Phone-Info SUBDIR += p5-PlRPC SUBDIR += p5-Queue-Beanstalk SUBDIR += p5-REST-Application SUBDIR += p5-REST-Google SUBDIR += p5-RPC-EPC-Service SUBDIR += p5-RPC-Simple SUBDIR += p5-RPC-XML SUBDIR += p5-ResourcePool-Resource-Net-LDAP SUBDIR += p5-ResourcePool-Resource-SOAP-Lite SUBDIR += p5-Rose-URI SUBDIR += p5-S3 SUBDIR += p5-SOAP SUBDIR += p5-SOAP-Amazon-S3 SUBDIR += p5-SOAP-Data-Builder SUBDIR += p5-SOAP-Lite SUBDIR += p5-SOAP-MySOAP SUBDIR += p5-SOAP-XML-Client SUBDIR += p5-Samba-LDAP SUBDIR += p5-Server-Starter SUBDIR += p5-Socket SUBDIR += p5-Socket-Class SUBDIR += p5-Socket-GetAddrInfo SUBDIR += p5-Socket-Multicast6 SUBDIR += p5-Socket6 SUBDIR += p5-Socks SUBDIR += p5-Sort-Key-IPv4 SUBDIR += p5-TFTP SUBDIR += p5-Test-URI SUBDIR += p5-URI SUBDIR += p5-URI-FromHash SUBDIR += p5-URI-Match SUBDIR += p5-URI-Nested SUBDIR += p5-URI-OpenURL SUBDIR += p5-URI-Query SUBDIR += p5-URI-SmartURI SUBDIR += p5-URI-Template SUBDIR += p5-URI-Template-Restrict SUBDIR += p5-URI-db SUBDIR += p5-URI-ws SUBDIR += p5-VM-EC2 SUBDIR += p5-VM-EC2-Security-CredentialCache SUBDIR += p5-Validate-Net SUBDIR += p5-WebService-Dropbox SUBDIR += p5-WebService-Prowl SUBDIR += p5-What SUBDIR += p5-X500-DN SUBDIR += p5-XML-Compile-SOAP SUBDIR += p5-XML-Compile-SOAP-AnyEvent SUBDIR += p5-XML-Compile-SOAP-Daemon SUBDIR += p5-XML-Compile-SOAP-WSA SUBDIR += p5-XML-Compile-WSDL11 SUBDIR += p5-XML-Fast SUBDIR += p5-XML-RPC SUBDIR += p5-XML-RPC-Fast SUBDIR += p5-XMLRPC-Lite SUBDIR += p5-XPC SUBDIR += p5-ZConf SUBDIR += p5-ZConf-Bookmarks SUBDIR += p5-ZeroMQ SUBDIR += p5-ldap2pf SUBDIR += p5-ldap2pw SUBDIR += p5-perl-ldap SUBDIR += p5-srv2pf SUBDIR += pacemaker SUBDIR += packetdrill SUBDIR += packter-agent SUBDIR += panoptis SUBDIR += paris-traceroute SUBDIR += passlogd SUBDIR += pathneck SUBDIR += pbnc SUBDIR += pdb SUBDIR += pear-Auth_RADIUS SUBDIR += pear-File_Bittorrent2 SUBDIR += pear-Horde_Kolab_Server SUBDIR += pear-Horde_Kolab_Session SUBDIR += pear-Horde_Ldap SUBDIR += pear-Horde_Rpc SUBDIR += pear-Horde_Scribe SUBDIR += pear-Horde_Socket_Client SUBDIR += pear-Horde_Url SUBDIR += pear-Net_CDDB SUBDIR += pear-Net_CheckIP SUBDIR += pear-Net_DIME SUBDIR += pear-Net_DNSBL SUBDIR += pear-Net_Dict SUBDIR += pear-Net_Finger SUBDIR += pear-Net_Geo SUBDIR += pear-Net_GeoIP SUBDIR += pear-Net_Growl SUBDIR += pear-Net_IDNA SUBDIR += pear-Net_IPv4 SUBDIR += pear-Net_IPv6 SUBDIR += pear-Net_Ident SUBDIR += pear-Net_LDAP SUBDIR += pear-Net_LDAP2 SUBDIR += pear-Net_MAC SUBDIR += pear-Net_NNTP SUBDIR += pear-Net_Nmap SUBDIR += pear-Net_POP3 SUBDIR += pear-Net_Ping SUBDIR += pear-Net_SMS SUBDIR += pear-Net_SMTP SUBDIR += pear-Net_Server SUBDIR += pear-Net_Sieve SUBDIR += pear-Net_Socket SUBDIR += pear-Net_Traceroute SUBDIR += pear-Net_URL SUBDIR += pear-Net_URL2 SUBDIR += pear-Net_URL_Mapper SUBDIR += pear-Net_UserAgent_Detect SUBDIR += pear-Net_UserAgent_Mobile SUBDIR += pear-Net_Vpopmaild SUBDIR += pear-Net_Whois SUBDIR += pear-SOAP SUBDIR += pear-Services_Pingback SUBDIR += pear-Services_Twitter SUBDIR += pear-URI_Template SUBDIR += pear-XML_RPC SUBDIR += pear-XML_RPC2 SUBDIR += pecl-amqp SUBDIR += pecl-apn SUBDIR += pecl-geoip SUBDIR += pecl-gupnp SUBDIR += pecl-ip2location SUBDIR += pecl-mosquitto SUBDIR += pecl-oauth SUBDIR += pecl-oauth2 SUBDIR += pecl-radius SUBDIR += pecl-smbclient SUBDIR += pecl-yaz SUBDIR += pecl-yp SUBDIR += pecl-zmq SUBDIR += pen SUBDIR += pfinger SUBDIR += phamm SUBDIR += php56-ldap SUBDIR += php56-soap SUBDIR += php56-sockets SUBDIR += php56-xmlrpc SUBDIR += php70-ldap SUBDIR += php70-soap SUBDIR += php70-sockets SUBDIR += php70-xmlrpc SUBDIR += phpldapadmin SUBDIR += pim6-tools SUBDIR += pim6dd SUBDIR += pim6sd SUBDIR += pimd SUBDIR += pimdd SUBDIR += pipsecd SUBDIR += pjsip SUBDIR += pjsip-extsrtp SUBDIR += pktanon SUBDIR += pload SUBDIR += plugdaemon SUBDIR += pmf SUBDIR += polyorb SUBDIR += poptop SUBDIR += portfwd SUBDIR += pptpclient SUBDIR += proftpd-mod_ldap SUBDIR += prosearch SUBDIR += proxy-connect SUBDIR += proxy-suite SUBDIR += proxychains SUBDIR += proxychains-ng SUBDIR += prtunnel SUBDIR += ptpd2 SUBDIR += ptunnel SUBDIR += pure-sockets SUBDIR += pvm SUBDIR += pwhois SUBDIR += pxe SUBDIR += pxe-pdhcp SUBDIR += py-GeoIP SUBDIR += py-GeoIP2 SUBDIR += py-amqp SUBDIR += py-amqplib SUBDIR += py-avahi SUBDIR += py-beanstalkc SUBDIR += py-cinderclient SUBDIR += py-cjdns SUBDIR += py-cloudfiles SUBDIR += py-coherence SUBDIR += py-dpkt SUBDIR += py-dugong SUBDIR += py-ec2-cli-tools SUBDIR += py-eventlet SUBDIR += py-glanceclient SUBDIR += py-gntp SUBDIR += py-gspread SUBDIR += py-gspreadsheet SUBDIR += py-haproxy-log-analysis SUBDIR += py-impacket SUBDIR += py-ipaddress SUBDIR += py-iplib SUBDIR += py-kafka-python SUBDIR += py-keystoneclient SUBDIR += py-kombu SUBDIR += py-ldap SUBDIR += py-ldap3 SUBDIR += py-ldaptor SUBDIR += py-libcloud SUBDIR += py-libdnet SUBDIR += py-libnet SUBDIR += py-magic-wormhole SUBDIR += py-matrix-synapse SUBDIR += py-maxminddb SUBDIR += py-miniupnpc SUBDIR += py-msrplib SUBDIR += py-ndg_httpsclient SUBDIR += py-netaddr SUBDIR += py-netif SUBDIR += py-netifaces SUBDIR += py-netlib SUBDIR += py-netstring SUBDIR += py-neutronclient SUBDIR += py-nnpy SUBDIR += py-novaclient SUBDIR += py-ntplib SUBDIR += py-oauth SUBDIR += py-oauth2 SUBDIR += py-openstackclient SUBDIR += py-paho-mqtt SUBDIR += py-pamqp SUBDIR += py-pcap SUBDIR += py-pcapy SUBDIR += py-pcs SUBDIR += py-port-for SUBDIR += py-pybeanstalk SUBDIR += py-pygeoip SUBDIR += py-pyldap SUBDIR += py-pynmsg SUBDIR += py-pynsq SUBDIR += py-pypcap SUBDIR += py-pysendfile SUBDIR += py-pyshark SUBDIR += py-pysmb SUBDIR += py-pysocks SUBDIR += py-pystun SUBDIR += py-python-bitcoinrpc SUBDIR += py-python-ntlm SUBDIR += py-pyvmomi SUBDIR += py-pyzmq SUBDIR += py-qt4-network SUBDIR += py-qt5-network SUBDIR += py-rabbitpy SUBDIR += py-radix SUBDIR += py-raet SUBDIR += py-rainbowstream SUBDIR += py-ripe.atlas.cousteau SUBDIR += py-ripe.atlas.sagan SUBDIR += py-ripe.atlas.tools SUBDIR += py-s3cmd SUBDIR += py-s3transfer SUBDIR += py-simplesoap SUBDIR += py-smbpasswd SUBDIR += py-soappy SUBDIR += py-socketio-client SUBDIR += py-speedtest-cli SUBDIR += py-sshuttle SUBDIR += py-suds SUBDIR += py-terminado SUBDIR += py-tofu SUBDIR += py-tweepy SUBDIR += py-twistedPair SUBDIR += py-twitter SUBDIR += py-twitter-tools SUBDIR += py-txamqp SUBDIR += py-txrestapi SUBDIR += py-upnp-inspector SUBDIR += py-uritemplate SUBDIR += py-urllib3 SUBDIR += py-wolframalpha SUBDIR += py-xmlrpc SUBDIR += py-zope.proxy SUBDIR += py-zsi SUBDIR += py3-netifaces SUBDIR += pygopherd SUBDIR += pynids SUBDIR += pyrad SUBDIR += pythondirector SUBDIR += qadsl SUBDIR += qjsonrpc SUBDIR += qoauth SUBDIR += qt4-network SUBDIR += qt5-network SUBDIR += qtweetlib SUBDIR += quagga SUBDIR += queso SUBDIR += quiterss SUBDIR += quoted SUBDIR += rabbitmq SUBDIR += rabbitmq-c SUBDIR += rabbitmq-c-devel SUBDIR += raddump SUBDIR += radiator SUBDIR += radiusclient SUBDIR += radiusd-cistron SUBDIR += radreport SUBDIR += radsecproxy SUBDIR += radvd SUBDIR += raggle SUBDIR += rclone SUBDIR += rdapper SUBDIR += rdesktop SUBDIR += rdist6 SUBDIR += recvnet SUBDIR += redir SUBDIR += relayd SUBDIR += remmina SUBDIR += remmina-plugin-gnome SUBDIR += remmina-plugin-nx SUBDIR += remmina-plugin-telepathy SUBDIR += remmina-plugin-vnc SUBDIR += remmina-plugin-xdmcp SUBDIR += remmina-plugins SUBDIR += remotebox SUBDIR += remotedesk SUBDIR += repeater SUBDIR += reposado SUBDIR += rfbproxy SUBDIR += rinetd SUBDIR += ripe-whois SUBDIR += rp-pppoe SUBDIR += rsplib SUBDIR += rsync SUBDIR += rsync-bpc SUBDIR += rtg SUBDIR += rtpbreak SUBDIR += rtpproxy SUBDIR += rtptools SUBDIR += ruby-dict SUBDIR += ruby-icmp SUBDIR += ruby-tcpsocketpipe SUBDIR += ruby-tserver SUBDIR += rubygem-amazon-ec2 SUBDIR += rubygem-amq-protocol SUBDIR += rubygem-amqp SUBDIR += rubygem-amqp-utils SUBDIR += rubygem-aws-s3 SUBDIR += rubygem-aws-ses SUBDIR += rubygem-azure SUBDIR += rubygem-azure-core SUBDIR += rubygem-bunny SUBDIR += rubygem-connection_pool SUBDIR += rubygem-dogapi SUBDIR += rubygem-domain_name SUBDIR += rubygem-dropbox-sdk SUBDIR += rubygem-epp-client-afnic SUBDIR += rubygem-epp-client-base SUBDIR += rubygem-epp-client-rgp SUBDIR += rubygem-epp-client-secdns SUBDIR += rubygem-epp-client-smallregistry SUBDIR += rubygem-fog-aliyun SUBDIR += rubygem-fog-atmos SUBDIR += rubygem-fog-aws SUBDIR += rubygem-fog-azure SUBDIR += rubygem-fog-brightbox SUBDIR += rubygem-fog-cloudatcost SUBDIR += rubygem-fog-dynect SUBDIR += rubygem-fog-ecloud SUBDIR += rubygem-fog-google SUBDIR += rubygem-fog-local SUBDIR += rubygem-fog-openstack SUBDIR += rubygem-fog-powerdns SUBDIR += rubygem-fog-profitbricks SUBDIR += rubygem-fog-rackspace SUBDIR += rubygem-fog-radosgw SUBDIR += rubygem-fog-riakcs SUBDIR += rubygem-fog-sakuracloud SUBDIR += rubygem-fog-serverlove SUBDIR += rubygem-fog-softlayer SUBDIR += rubygem-fog-storm_on_demand SUBDIR += rubygem-fog-terremark SUBDIR += rubygem-fog-vmfusion SUBDIR += rubygem-fog-voxel SUBDIR += rubygem-fog-vsphere SUBDIR += rubygem-fog-xenserver SUBDIR += rubygem-geoip SUBDIR += rubygem-gitlab_omniauth-ldap SUBDIR += rubygem-http_parser.rb SUBDIR += rubygem-httpauth SUBDIR += rubygem-ipaddress SUBDIR += rubygem-iproto SUBDIR += rubygem-lita-gems SUBDIR += rubygem-macaddr SUBDIR += rubygem-net-ldap SUBDIR += rubygem-net-netrc SUBDIR += rubygem-net-ping SUBDIR += rubygem-netrc SUBDIR += rubygem-network_interface SUBDIR += rubygem-oauth SUBDIR += rubygem-oauth2 SUBDIR += rubygem-octokit SUBDIR += rubygem-octopress-deploy SUBDIR += rubygem-omniauth-auth0 SUBDIR += rubygem-omniauth-azure-oauth2 SUBDIR += rubygem-omniauth-facebook SUBDIR += rubygem-omniauth-github SUBDIR += rubygem-omniauth-github-discourse SUBDIR += rubygem-omniauth-google-oauth2 SUBDIR += rubygem-omniauth-oauth SUBDIR += rubygem-omniauth-oauth2 SUBDIR += rubygem-omniauth-openid SUBDIR += rubygem-omniauth-twitter SUBDIR += rubygem-open-uri-cached SUBDIR += rubygem-opennebula SUBDIR += rubygem-packetfu SUBDIR += rubygem-pcaprub SUBDIR += rubygem-qiniu SUBDIR += rubygem-rabbiter SUBDIR += rubygem-rbvmomi SUBDIR += rubygem-right_aws SUBDIR += rubygem-right_flexiscale SUBDIR += rubygem-right_gogrid SUBDIR += rubygem-right_http_connection SUBDIR += rubygem-right_slicehost SUBDIR += rubygem-rsync SUBDIR += rubygem-ruby-growl SUBDIR += rubygem-ruby-openid SUBDIR += rubygem-ruby-yadis SUBDIR += rubygem-rubyntlm SUBDIR += rubygem-rubytter SUBDIR += rubygem-rudy SUBDIR += rubygem-rye SUBDIR += rubygem-simple_oauth SUBDIR += rubygem-stompserver SUBDIR += rubygem-t SUBDIR += rubygem-tweetstream SUBDIR += rubygem-twitter SUBDIR += rubygem-twitter-stream SUBDIR += rubygem-twitter4r SUBDIR += rubygem-u2f SUBDIR += rubygem-uri-redis SUBDIR += rubygem-whois SUBDIR += rude SUBDIR += rwhoisd SUBDIR += samba-libsmbclient SUBDIR += samba-nmblookup SUBDIR += samba-smbclient SUBDIR += samba36 SUBDIR += samba42 SUBDIR += samba43 SUBDIR += samba44 SUBDIR += samplicator SUBDIR += sbd SUBDIR += sbm SUBDIR += scamper SUBDIR += scapy SUBDIR += scnc SUBDIR += scr_ipfm SUBDIR += scribe SUBDIR += sdl2_net SUBDIR += sdl_net SUBDIR += seda SUBDIR += self-service-password SUBDIR += sendemail SUBDIR += sendsms SUBDIR += sendsnpp SUBDIR += serveez SUBDIR += serviio SUBDIR += sflowtool SUBDIR += shadowsocks-libev SUBDIR += shelldap SUBDIR += shmux SUBDIR += sie-nmsg SUBDIR += simpleproxy SUBDIR += sip_scenario SUBDIR += sippy_b2bua SUBDIR += siproxd SUBDIR += sipsak SUBDIR += sixxs-aiccu SUBDIR += skstream SUBDIR += sl2tps SUBDIR += slurm SUBDIR += smb4k-kde4 SUBDIR += smbldap-tools SUBDIR += smcroute SUBDIR += smm++ SUBDIR += sngrep SUBDIR += sniffit SUBDIR += sntop SUBDIR += sobby SUBDIR += socat SUBDIR += sock SUBDIR += socketbind SUBDIR += socketpipe SUBDIR += socketw SUBDIR += sofia-sip SUBDIR += softethervpn SUBDIR += spideroak SUBDIR += splatd SUBDIR += spoofer SUBDIR += spread SUBDIR += spread-j SUBDIR += spread4 SUBDIR += sqtop SUBDIR += srelay SUBDIR += ss5 SUBDIR += ssldump SUBDIR += sslh SUBDIR += ssltunnel-client SUBDIR += ssltunnel-server SUBDIR += ssmping SUBDIR += ssspl SUBDIR += ssvnc SUBDIR += stf-6rd-kmod SUBDIR += stone SUBDIR += stund SUBDIR += subnetcalc SUBDIR += suckblow SUBDIR += sup SUBDIR += svnup SUBDIR += syncthing SUBDIR += syncthing-cli SUBDIR += syncthing-discosrv SUBDIR += syncthing-inotify SUBDIR += tableutil SUBDIR += tac_plus4 SUBDIR += tapidbus SUBDIR += tayga SUBDIR += tclsoap SUBDIR += tcludp SUBDIR += tcpcat SUBDIR += tcpdstat SUBDIR += tcpdump SUBDIR += tcpdump398 SUBDIR += tcpflow SUBDIR += tcpick SUBDIR += tcpillust SUBDIR += tcping SUBDIR += tcpkali SUBDIR += tcpmssd SUBDIR += tcpproxy SUBDIR += tcpreen SUBDIR += tcpsg SUBDIR += tcpshow SUBDIR += tcpslice SUBDIR += tcpsplit SUBDIR += tcpstat SUBDIR += tcptestsuite SUBDIR += tcptrace SUBDIR += tcptraceroute SUBDIR += tcptraceroute-devel SUBDIR += tcpview SUBDIR += tcpwatch SUBDIR += tcpxd SUBDIR += tcpxtract SUBDIR += tdetect SUBDIR += tftpgrab SUBDIR += thcrut SUBDIR += throttled SUBDIR += tigervnc SUBDIR += tigervnc-devel SUBDIR += tightvnc SUBDIR += tintin++ SUBDIR += tiny-network-utilities SUBDIR += tinyfugue SUBDIR += tinyldap SUBDIR += tn5250 SUBDIR += tn5250j SUBDIR += toonel SUBDIR += torsocks SUBDIR += traceroute SUBDIR += traff SUBDIR += trafshow SUBDIR += trafshow3 SUBDIR += tramp SUBDIR += trickle SUBDIR += tsclient SUBDIR += tshark SUBDIR += tshark-lite SUBDIR += tsocks SUBDIR += tucan SUBDIR += turnserver SUBDIR += turses SUBDIR += twitux SUBDIR += u6rd SUBDIR += ucarp SUBDIR += udptunnel SUBDIR += udpxy SUBDIR += udt SUBDIR += uget SUBDIR += uhttpmock SUBDIR += ulxmlrpcpp SUBDIR += unfs3 SUBDIR += unison SUBDIR += unison-devel SUBDIR += unison-nox11 SUBDIR += unison232 SUBDIR += unison240 SUBDIR += unix2tcp SUBDIR += uplog SUBDIR += urelay SUBDIR += uriparser SUBDIR += urlendec SUBDIR += usbredir SUBDIR += userfw SUBDIR += utftpd SUBDIR += vblade SUBDIR += vde SUBDIR += vde2 SUBDIR += vinagre SUBDIR += vino SUBDIR += vmware-vsphere-cli SUBDIR += vncreflector SUBDIR += vnstat SUBDIR += vortex SUBDIR += vtun SUBDIR += wackamole SUBDIR += wackford-squeers SUBDIR += wakeonlan SUBDIR += whois SUBDIR += widentd SUBDIR += wireshark SUBDIR += wireshark-lite SUBDIR += wireshark-qt5 SUBDIR += wizd SUBDIR += wlan2eth SUBDIR += wmlj SUBDIR += wmnd SUBDIR += wmnet SUBDIR += wmnet2 SUBDIR += wmnetload SUBDIR += wmnetmon SUBDIR += wmpiki SUBDIR += wmping SUBDIR += wmwave SUBDIR += wmwifi SUBDIR += wmwlmon SUBDIR += wol SUBDIR += wpa_gui SUBDIR += wping SUBDIR += x11vnc SUBDIR += x2goclient SUBDIR += x2goclient-cli SUBDIR += xferstats SUBDIR += xipmsg SUBDIR += xisp SUBDIR += xmlrpc-c SUBDIR += xmlrpc-epi SUBDIR += xorp SUBDIR += xprobe SUBDIR += xpvm SUBDIR += xrdesktop2 SUBDIR += xrdp SUBDIR += xrdp-devel SUBDIR += yami4 SUBDIR += yaph SUBDIR += yate SUBDIR += yaz SUBDIR += yaz++ SUBDIR += yazproxy SUBDIR += yconalyzer SUBDIR += yptransitd SUBDIR += zebra SUBDIR += zebra-server SUBDIR += zeroconf-ioslave SUBDIR += zerotier SUBDIR += zillion SUBDIR += zmap SUBDIR += zsync .include Index: head/net/freerdp/Makefile =================================================================== --- head/net/freerdp/Makefile (revision 428329) +++ head/net/freerdp/Makefile (revision 428330) @@ -1,82 +1,97 @@ # Created by: Alexander Logvinov # $FreeBSD$ PORTNAME= freerdp -PORTVERSION= 1.2.0 -PORTREVISION= 7 +PORTVERSION= 2.0.0.g2016.11.24 CATEGORIES= net comms ipv6 MAINTAINER= bsdports@kyle-evans.net COMMENT= Free implementation of Remote Desktop Protocol LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -USE_LDCONFIG= yes -USES= alias cmake:outsource cpe execinfo pkgconfig compiler:c++11-lib ssl USE_GITHUB= yes GH_ACCOUNT= FreeRDP GH_PROJECT= ${GH_ACCOUNT} -GH_TAGNAME= f5ff6e1 +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 -LDFLAGS+= -L${LOCALBASE}/lib -CFLAGS+= -I${WRKSRC}/include -I${WRKSRC}/winpr/include -I${LOCALBASE}/include +CMAKE_ARGS+= -DWITH_LIBSYSTEMD=OFF -DWITH_WAYLAND=OFF -DWITH_GSTREAMER_0_10=OFF ${CMAKE_ARGS_${ARCH}} -OPTIONS_DEFINE= ALSA CUPS DIRECTFB FFMPEG GSTREAMER PULSEAUDIO SSE X11 +CMAKE_ARGS_aarch64= -DWITH_NEON=ON +CFLAGS_aarch64= -D__ARM_NEON__=__ARM_NEON # clang + +OPTIONS_DEFINE= ALSA CUPS FFMPEG GSTREAMER PULSEAUDIO SSE X11 OPTIONS_DEFAULT= CUPS GSTREAMER X11 OPTIONS_SUB= yes +OPTIONS_DEFINE_armv6= NEON +OPTIONS_EXCLUDE_armv6= SSE + ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib -ALSA_CMAKE_ON= -DWITH_ALSA=ON -ALSA_CMAKE_OFF= -DWITH_ALSA=OFF +ALSA_CMAKE_BOOL= WITH_ALSA CUPS_LIB_DEPENDS= libcups.so:print/cups -CUPS_CMAKE_ON= -DWITH_CUPS=ON -CUPS_CMAKE_OFF= -DWITH_CUPS=OFF +CUPS_CMAKE_BOOL= WITH_CUPS -# outdated and unmaintained upstream -DIRECTFB_DESC= Build FreeRDP DirectFB client (outdated) -DIRECTFB_LIB_DEPENDS= libdirectfb.so:devel/directfb -DIRECTFB_CMAKE_ON= -DWITH_DIRECTFB=ON -DIRECTFB_CMAKE_OFF= -DWITH_DIRECTFB=OFF -# currently DirectFB option fails with clang -DIRECTFB_USE= gcc=yes - FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libavutil.so:multimedia/ffmpeg -FFMPEG_CMAKE_ON= -DWITH_FFMPEG=ON -FFMPEG_CMAKE_OFF= -DWITH_FFMPEG=OFF +FFMPEG_CMAKE_BOOL= WITH_FFMPEG -GSTREAMER_CMAKE_ON= -DWITH_GSTREAMER_1_0=ON -DWITH_GSTREAMER_0_10=OFF -GSTREAMER_CMAKE_OFF= -DWITH_GSTREAMER_1_0=OFF -DWITH_GSTREAMER_0_10=OFF -GSTREAMER_USE= gstreamer1=yes xorg=x11,xextproto,xext,xrandr +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_ON= -DWITH_PULSE=ON -PULSEAUDIO_CMAKE_OFF= -DWITH_PULSE=OFF +PULSEAUDIO_CMAKE_BOOL= WITH_PULSE -SSE_CMAKE_ON= -DWITH_SSE2=ON -SSE_CMAKE_OFF= -DWITH_SSE2=OFF +SSE_CMAKE_BOOL= WITH_SSE2 X11_DESC= Build FreeRDP X11 client X11_BUILD_DEPENDS= xmlto:textproc/xmlto -X11_CMAKE_ON= -DWITH_X11=ON -X11_CMAKE_OFF= -DWITH_X11=OFF -DWITH_XKBFILE=OFF -X11_USE= xorg=x11,xkbfile,xcursor,xextproto,xv,xinerama,xext \ - xcursor,xrandr,xi,xfixes,xrender +X11_CMAKE_ON= -DWITH_XKBDFILE=OFF +X11_CMAKE_BOOL= WITH_X11 +X11_USE= xorg=x11,xkbfile,xcursor,xextproto,xv,xinerama,xext,xrandr,xi,xfixes,xrender -.include +.include -post-extract: - ${REINPLACE_CMD} -e 's|$${CMAKE_INSTALL_LIBDIR}/pkgconfig|libdata/pkgconfig|' \ - -e '/CMAKE_INSTALL_RPATH /d' \ +.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|share/man/man1|man/man1|' \ + @${REINPLACE_CMD} -e 's/OPENBSD/BSD/' \ + ${WRKSRC}/winpr/CMakeLists.txt \ ${WRKSRC}/client/X11/CMakeLists.txt - ${REINPLACE_CMD} -e 's/NetBSD__)/NetBSD__) || defined(__FreeBSD__)/' \ + @${REINPLACE_CMD} -e 's/NetBSD__)/NetBSD__) || defined(__FreeBSD__)/' \ ${WRKSRC}/winpr/libwinpr/utils/trio/triodef.h - ${REINPLACE_CMD} -e 's|||' \ + @${REINPLACE_CMD} -e 's|||' \ ${WRKSRC}/channels/drive/client/statvfs.c -.include + @${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 428329) +++ head/net/freerdp/distinfo (revision 428330) @@ -1,3 +1,3 @@ -TIMESTAMP = 1470755086 -SHA256 (FreeRDP-FreeRDP-1.2.0-f5ff6e1_GH0.tar.gz) = f39c7eaa007a3aef580f364f8f5c0b9208c6c3c8f5f00a4c0ed020a81535eb32 -SIZE (FreeRDP-FreeRDP-1.2.0-f5ff6e1_GH0.tar.gz) = 6033856 +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 Index: head/net/freerdp/files/patch-cmake_ConfigOptions.cmake =================================================================== --- head/net/freerdp/files/patch-cmake_ConfigOptions.cmake (revision 428329) +++ head/net/freerdp/files/patch-cmake_ConfigOptions.cmake (nonexistent) @@ -1,11 +0,0 @@ ---- cmake/ConfigOptions.cmake.orig 2015-11-29 19:53:58 UTC -+++ cmake/ConfigOptions.cmake -@@ -6,7 +6,7 @@ elseif((CMAKE_SYSTEM_PROCESSOR MATCHES " - elseif((CMAKE_SYSTEM_PROCESSOR MATCHES "i386") AND (CMAKE_SIZEOF_VOID_P EQUAL 8) AND (APPLE)) - # Mac is weird like that. - set(TARGET_ARCH "x64") --elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm*") -+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm*") - set(TARGET_ARCH "ARM") - endif() - Property changes on: head/net/freerdp/files/patch-cmake_ConfigOptions.cmake ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/freerdp/files/patch-freerdp.pc.in =================================================================== --- head/net/freerdp/files/patch-freerdp.pc.in (revision 428329) +++ head/net/freerdp/files/patch-freerdp.pc.in (nonexistent) @@ -1,13 +0,0 @@ -Index: freerdp.pc.in -diff -u freerdp.pc.in.orig freerdp.pc.in ---- freerdp.pc.in.orig 2014-09-12 07:46:32.000000000 +0900 -+++ freerdp.pc.in 2015-05-26 02:05:37.874925433 +0900 -@@ -9,7 +9,7 @@ - URL: http://www.freerdp.com/ - Version: @FREERDP_VERSION_FULL@ - Requires: --Requires.private: winpr zlib libssl -+Requires.private: winpr - Libs: -L${libdir} ${libs} - Libs.private: -ldl -lpthread - Cflags: -I${includedir} Property changes on: head/net/freerdp/files/patch-freerdp.pc.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/freerdp/files/patch-cmake-FindOpenSSL.cmake =================================================================== --- head/net/freerdp/files/patch-cmake-FindOpenSSL.cmake (revision 428329) +++ head/net/freerdp/files/patch-cmake-FindOpenSSL.cmake (nonexistent) @@ -1,11 +0,0 @@ ---- cmake/FindOpenSSL.cmake.orig 2013-07-10 04:00:21.000000000 -0400 -+++ cmake/FindOpenSSL.cmake 2015-03-25 19:26:35.154024000 -0400 -@@ -270,7 +270,7 @@ - set(OPENSSL_VERSION "${_OPENSSL_VERSION}") - elseif(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h") - file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str -- REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*") -+ REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*") - - # The version number is encoded as 0xMNNFFPPS: major minor fix patch status - # The status gives if this is a developer or prerelease and is ignored here. Property changes on: head/net/freerdp/files/patch-cmake-FindOpenSSL.cmake ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/freerdp/files/patch-git_434436b7 =================================================================== --- head/net/freerdp/files/patch-git_434436b7 (revision 428329) +++ head/net/freerdp/files/patch-git_434436b7 (nonexistent) @@ -1,74 +0,0 @@ -From 434436b75f00c5475f66ff0f4062e168aa409688 Mon Sep 17 00:00:00 2001 -From: ivan-83 -Date: Tue, 10 Mar 2015 01:21:28 +0300 -Subject: [PATCH] * BSD/FreeBSD build fix - ---- - CMakeLists.txt | 14 ++++++++++++++ - winpr/libwinpr/synch/wait.c | 2 +- - winpr/libwinpr/sysinfo/sysinfo.c | 1 + - winpr/libwinpr/utils/CMakeLists.txt | 4 ++++ - 4 files changed, 20 insertions(+), 1 deletion(-) - -diff CMakeLists.txt CMakeLists.txt -index 0a9144a..386ae67 100644 ---- CMakeLists.txt -+++ CMakeLists.txt -@@ -358,6 +358,14 @@ if(APPLE) - endif() - endif(APPLE) - -+# BSD -+if(${CMAKE_SYSTEM_NAME} MATCHES "BSD") -+ set(BSD TRUE) -+ if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") -+ set(FREEBSD TRUE) -+ endif() -+endif() -+ - # Android - if(ANDROID) - set(WITH_LIBRARY_VERSIONING "OFF") -@@ -618,6 +626,12 @@ set(FREERDP_EXTENSION_PATH "${CMAKE_INSTALL_FULL_LIBDIR}/freerdp/extensions") - include_directories(${CMAKE_CURRENT_BINARY_DIR}) - include_directories(${CMAKE_CURRENT_BINARY_DIR}/include) - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) -+if(BSD) -+ if(IS_DIRECTORY /usr/local/include) -+ include_directories(/usr/local/include) -+ link_directories(/usr/local/lib) -+ endif() -+endif() - - # Configure files - add_definitions("-DHAVE_CONFIG_H") -diff winpr/libwinpr/sysinfo/sysinfo.c winpr/libwinpr/sysinfo/sysinfo.c -index 1529d54..457ab9d 100644 ---- winpr/libwinpr/sysinfo/sysinfo.c -+++ winpr/libwinpr/sysinfo/sysinfo.c -@@ -54,6 +54,7 @@ - #ifndef _WIN32 - - #include -+#include - - #ifdef HAVE_UNISTD_H - #include -diff winpr/libwinpr/utils/CMakeLists.txt winpr/libwinpr/utils/CMakeLists.txt -index e524bf9..501f605 100644 ---- winpr/libwinpr/utils/CMakeLists.txt -+++ winpr/libwinpr/utils/CMakeLists.txt -@@ -113,6 +113,10 @@ if(UNIX) - winpr_library_add(m) - endif() - -+if(BSD) -+ winpr_library_add(execinfo) -+endif() -+ - if(BUILD_TESTING) - add_subdirectory(test) - endif() --- -2.4.1 - Property changes on: head/net/freerdp/files/patch-git_434436b7 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/freerdp/files/patch-winpr.pc.in =================================================================== --- head/net/freerdp/files/patch-winpr.pc.in (revision 428329) +++ head/net/freerdp/files/patch-winpr.pc.in (nonexistent) @@ -1,12 +0,0 @@ -Index: winpr.pc.in -diff -u winpr.pc.in.orig winpr.pc.in ---- winpr.pc.in.orig 2014-09-12 07:46:32.000000000 +0900 -+++ winpr.pc.in 2015-05-26 02:05:59.353925013 +0900 -@@ -9,7 +9,6 @@ - URL: http://www.freerdp.com/ - Version: @WINPR_VERSION_FULL@ - Requires: --Requires.private: zlib libssl - Libs: -L${libdir} ${libs} - Libs.private: -ldl -lrt -lm -lpthread - Cflags: -I${includedir} Property changes on: head/net/freerdp/files/patch-winpr.pc.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/freerdp/files/patch-cmake_FindGStreamer_1_0.cmake =================================================================== --- head/net/freerdp/files/patch-cmake_FindGStreamer_1_0.cmake (revision 428329) +++ head/net/freerdp/files/patch-cmake_FindGStreamer_1_0.cmake (nonexistent) @@ -1,16 +0,0 @@ -Don't use custom code to find the include dirs for gstreamer 1.0 (core). -Since 1.6.0 there are multiple include paths. So use pkg-config to find -which. IMO the rest of this file should use pkg-config.... - ---- cmake/FindGStreamer_1_0.cmake.orig 2015-06-26 15:30:00.000000000 +0200 -+++ cmake/FindGStreamer_1_0.cmake 2015-09-27 10:43:55.754514000 +0200 -@@ -78,7 +78,8 @@ - # 1.1. Find headers and libraries - set(GLIB_ROOT_DIR ${GSTREAMER_1_0_ROOT_DIR}) - find_package(Glib REQUIRED) --FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0 gstreamer-1.0 gst/gst.h gstreamer-1.0) -+pkg_check_modules (GSTREAMER_1_0 gstreamer-1.0) -+#FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0 gstreamer-1.0 gst/gst.h gstreamer-1.0) - FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_BASE gstreamer-base-1.0 gst/gst.h gstbase-1.0) - - # 1.2. Check Gstreamer version Property changes on: head/net/freerdp/files/patch-cmake_FindGStreamer_1_0.cmake ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/freerdp/files/patch-git_1b663cef =================================================================== --- head/net/freerdp/files/patch-git_1b663cef (revision 428329) +++ head/net/freerdp/files/patch-git_1b663cef (nonexistent) @@ -1,57 +0,0 @@ -The patch below comes from upstream and has been slightly adjusted to apply -on the tarball we build. - -From 1b663ceffe51008af7ae9749e5b7999b2f7d6698 Mon Sep 17 00:00:00 2001 -From: Bernhard Miklautz -Date: Fri, 12 Dec 2014 18:26:45 +0100 -Subject: [PATCH] build: cmake 3.1 compatibility - -* fix problem with REMOVE_DUPLICATES on undefined lists -* since 3.1 file(GLOB FILEPATHS RELATIVE .. returns single / instead of // as - previously - necessary adoptions for regex and matches done. Should - work with all cmake versions. - -Tested with 3.1.0-rc3 ---- channels/CMakeLists.txt -+++ channels/CMakeLists.txt -@@ -202,8 +202,8 @@ set(FILENAME "ChannelOptions.cmake") - file(GLOB FILEPATHS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/${FILENAME}") - - foreach(FILEPATH ${FILEPATHS}) -- if(${FILEPATH} MATCHES "^([^/]*)//${FILENAME}") -- string(REGEX REPLACE "^([^/]*)//${FILENAME}" "\\1" DIR ${FILEPATH}) -+ if(${FILEPATH} MATCHES "^([^/]*)/+${FILENAME}") -+ string(REGEX REPLACE "^([^/]*)/+${FILENAME}" "\\1" DIR ${FILEPATH}) - set(CHANNEL_OPTION) - include(${FILEPATH}) - if(${CHANNEL_OPTION}) ---- channels/client/CMakeLists.txt -+++ channels/client/CMakeLists.txt -@@ -24,7 +24,9 @@ set(${MODULE_PREFIX}_SRCS - ${CMAKE_CURRENT_SOURCE_DIR}/addin.c - ${CMAKE_CURRENT_SOURCE_DIR}/addin.h) - -+if(CHANNEL_STATIC_CLIENT_ENTRIES) - list(REMOVE_DUPLICATES CHANNEL_STATIC_CLIENT_ENTRIES) -+endif() - - foreach(STATIC_ENTRY ${CHANNEL_STATIC_CLIENT_ENTRIES}) - foreach(STATIC_MODULE ${CHANNEL_STATIC_CLIENT_MODULES}) ---- third-party/CMakeLists.txt -+++ third-party/CMakeLists.txt -@@ -22,11 +22,11 @@ - file(GLOB all_valid_subdirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/CMakeLists.txt") - - foreach(dir ${all_valid_subdirs}) -- if(${dir} MATCHES "^([^/]*)//CMakeLists.txt") -- string(REGEX REPLACE "^([^/]*)//CMakeLists.txt" "\\1" dir_trimmed ${dir}) -+ if(${dir} MATCHES "^([^/]*)/+CMakeLists.txt") -+ string(REGEX REPLACE "^([^/]*)/+CMakeLists.txt" "\\1" dir_trimmed ${dir}) - message(STATUS "Adding third-party component ${dir_trimmed}") - add_subdirectory(${dir_trimmed}) - endif() - endforeach(dir) - --set(THIRD_PARTY_INCLUDES ${THIRD_PARTY_INCLUDES} PARENT_SCOPE) -\ No newline at end of file -+set(THIRD_PARTY_INCLUDES ${THIRD_PARTY_INCLUDES} PARENT_SCOPE) Property changes on: head/net/freerdp/files/patch-git_1b663cef ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/freerdp/files/patch-libfreerdp-locale-timezone.c =================================================================== --- head/net/freerdp/files/patch-libfreerdp-locale-timezone.c (revision 428329) +++ head/net/freerdp/files/patch-libfreerdp-locale-timezone.c (nonexistent) @@ -1,42 +0,0 @@ -From f5dbe2c9a5fe050c1d7e014d3c1529befb8eea3b Mon Sep 17 00:00:00 2001 -From: ivan-83 -Date: Tue, 10 Mar 2015 04:40:47 +0300 -Subject: [PATCH] * FreeBSD timezone detection patch - ---- - libfreerdp/locale/timezone.c | 15 +++++++++++---- - 1 file changed, 11 insertions(+), 4 deletions(-) - -diff libfreerdp/locale/timezone.c libfreerdp/locale/timezone.c -index 92b74e8..0375f9c 100644 ---- libfreerdp/locale/timezone.c -+++ libfreerdp/locale/timezone.c -@@ -1521,8 +1523,11 @@ char* freerdp_get_unix_timezone_identifier() - return tzid; - } - -+#ifdef __FreeBSD__ -+ fp = fopen("/var/db/zoneinfo", "r"); -+#else - fp = fopen("/etc/timezone", "r"); -- -+#endif - if (fp != NULL) - { - fseek(fp, 0, SEEK_END); -@@ -1678,8 +1683,10 @@ void freerdp_time_zone_detect(TIME_ZONE_INFO* clientTimeZone) - - #ifdef HAVE_TM_GMTOFF - #if defined(__FreeBSD__) -- /*not the best solution, but could not get the right tyepcast*/ -- clientTimeZone->bias = 0; -+ if (local_time->tm_gmtoff >= 0) -+ clientTimeZone->bias = (UINT32) (local_time->tm_gmtoff / 60); -+ else -+ clientTimeZone->bias = (UINT32) (1440 + (INT32) (local_time->tm_gmtoff / 60)); - #else - clientTimeZone->bias = timezone / 60; - #endif --- -2.4.1 - Property changes on: head/net/freerdp/files/patch-libfreerdp-locale-timezone.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/freerdp/files/patch-z001-CMakeLists.txt =================================================================== --- head/net/freerdp/files/patch-z001-CMakeLists.txt (revision 428329) +++ head/net/freerdp/files/patch-z001-CMakeLists.txt (nonexistent) @@ -1,13 +0,0 @@ ---- CMakeLists.txt.intermediate 2015-06-06 13:17:20 UTC -+++ CMakeLists.txt -@@ -322,6 +322,10 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "BSD") - set(FREEBSD TRUE) - endif() - endif() -+if(${CMAKE_SYSTEM_NAME} MATCHES "DragonFly") -+ set(BSD TRUE) -+ set(FREEBSD TRUE) -+endif() - - # Android - if(ANDROID) Property changes on: head/net/freerdp/files/patch-z001-CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/freerdp/files/patch-CMakeLists.txt =================================================================== --- head/net/freerdp/files/patch-CMakeLists.txt (nonexistent) +++ head/net/freerdp/files/patch-CMakeLists.txt (revision 428330) @@ -0,0 +1,14 @@ +--- CMakeLists.txt.orig 2016-11-24 13:19:47 UTC ++++ CMakeLists.txt +@@ -156,6 +156,11 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "BSD") + endif() + endif() + ++if(${CMAKE_SYSTEM_NAME} MATCHES "DragonFly") ++ set(BSD TRUE) ++ set(FREEBSD TRUE) ++endif() ++ + # Configure MSVC Runtime + if(MSVC) + include(MSVCRuntime) Property changes on: head/net/freerdp/files/patch-CMakeLists.txt ___________________________________________________________________ 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-cmake_FindGStreamer__1__0.cmake =================================================================== --- head/net/freerdp/files/patch-cmake_FindGStreamer__1__0.cmake (nonexistent) +++ head/net/freerdp/files/patch-cmake_FindGStreamer__1__0.cmake (revision 428330) @@ -0,0 +1,16 @@ +Don't use custom code to find the include dirs for gstreamer 1.0 (core). +Since 1.6.0 there are multiple include paths. So use pkg-config to find +which. IMO the rest of this file should use pkg-config.... + +--- cmake/FindGStreamer_1_0.cmake.orig 2016-10-21 07:29:51 UTC ++++ cmake/FindGStreamer_1_0.cmake +@@ -78,7 +78,8 @@ endmacro() + # 1.1. Find headers and libraries + set(GLIB_ROOT_DIR ${GSTREAMER_1_0_ROOT_DIR}) + find_package(Glib REQUIRED) +-FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0 gstreamer-1.0 gstreamer-1.0) ++#FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0 gstreamer-1.0 gstreamer-1.0) ++pkg_check_modules (GSTREAMER_1_0 gstreamer-1.0) + FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_BASE gstreamer-base-1.0 gstbase-1.0) + + # 1.2. Check Gstreamer version Property changes on: head/net/freerdp/files/patch-cmake_FindGStreamer__1__0.cmake ___________________________________________________________________ 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-ffmpeg29 =================================================================== --- head/net/freerdp/files/patch-ffmpeg29 (revision 428329) +++ head/net/freerdp/files/patch-ffmpeg29 (revision 428330) @@ -1,77 +1,38 @@ -Description: Replace deprecated FFmpeg API -Author: Andreas Cadhalpun -Last-Update: <2015-11-02> - ---- channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c.orig 2016-06-11 21:12:27.134896000 +0200 -+++ channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c 2016-06-11 21:14:05.282247000 +0200 -@@ -103,7 +103,7 @@ - mdecoder->codec_context->bit_rate = media_type->BitRate; - mdecoder->codec_context->time_base.den = media_type->SamplesPerSecond.Numerator; - mdecoder->codec_context->time_base.num = media_type->SamplesPerSecond.Denominator; -- mdecoder->frame = avcodec_alloc_frame(); -+ mdecoder->frame = av_frame_alloc(); - return TRUE; - } +--- channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c.orig 2016-10-21 07:29:51 UTC ++++ channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c +@@ -346,7 +346,7 @@ static BOOL tsmf_ffmpeg_decode_video(ITS + av_picture_copy((AVPicture*) frame, (AVPicture*) mdecoder->frame, + mdecoder->codec_context->pix_fmt, + mdecoder->codec_context->width, mdecoder->codec_context->height); +- av_free(frame); ++ av_frame_free(&frame); + } -@@ -322,14 +322,14 @@ - mdecoder->codec_context->width, mdecoder->codec_context->height); - mdecoder->decoded_data = malloc(mdecoder->decoded_size); - ZeroMemory(mdecoder->decoded_data, mdecoder->decoded_size); -- frame = avcodec_alloc_frame(); -+ frame = av_frame_alloc(); - avpicture_fill((AVPicture *) frame, mdecoder->decoded_data, - mdecoder->codec_context->pix_fmt, - mdecoder->codec_context->width, mdecoder->codec_context->height); - av_picture_copy((AVPicture *) frame, (AVPicture *) mdecoder->frame, - mdecoder->codec_context->pix_fmt, - mdecoder->codec_context->width, mdecoder->codec_context->height); -- av_free(frame); -+ av_frame_free(&frame); - } return ret; - } -@@ -385,7 +385,7 @@ - (int16_t *) dst, &frame_size, src, src_size); - #else - { -- AVFrame *decoded_frame = avcodec_alloc_frame(); -+ AVFrame *decoded_frame = av_frame_alloc(); - int got_frame = 0; - AVPacket pkt; - av_init_packet(&pkt); -@@ -398,7 +398,7 @@ +@@ -428,7 +428,7 @@ static BOOL tsmf_ffmpeg_decode_audio(ITS decoded_frame->nb_samples, mdecoder->codec_context->sample_fmt, 1); memcpy(dst, decoded_frame->data[0], frame_size); } - av_free(decoded_frame); + av_frame_free(&decoded_frame); } #endif - if(len <= 0 || frame_size <= 0) -@@ -464,7 +464,7 @@ - TSMFFFmpegDecoder *mdecoder = (TSMFFFmpegDecoder *) decoder; - switch(mdecoder->codec_context->pix_fmt) - { -- case PIX_FMT_YUV420P: -+ case AV_PIX_FMT_YUV420P: - return RDP_PIXFMT_I420; - default: - CLOG_ERR("unsupported pixel format %u", -@@ -492,7 +492,7 @@ + if (len <= 0 || frame_size <= 0) +@@ -524,7 +524,7 @@ static void tsmf_ffmpeg_free(ITSMFDecode { - TSMFFFmpegDecoder *mdecoder = (TSMFFFmpegDecoder *) decoder; - if(mdecoder->frame) + TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder; + if (mdecoder->frame) - av_free(mdecoder->frame); + av_frame_free(&mdecoder->frame); - if(mdecoder->decoded_data) - free(mdecoder->decoded_data); - if(mdecoder->codec_context) -@@ -501,7 +501,7 @@ + + free(mdecoder->decoded_data); + +@@ -534,7 +534,7 @@ static void tsmf_ffmpeg_free(ITSMFDecode avcodec_close(mdecoder->codec_context); - if(mdecoder->codec_context->extradata) - free(mdecoder->codec_context->extradata); + + free(mdecoder->codec_context->extradata); - av_free(mdecoder->codec_context); + av_frame_free(&mdecoder->codec_context); } free(decoder); } Index: head/net/freerdp/files/patch-libfreerdp_freerdp.pc.in =================================================================== --- head/net/freerdp/files/patch-libfreerdp_freerdp.pc.in (nonexistent) +++ head/net/freerdp/files/patch-libfreerdp_freerdp.pc.in (revision 428330) @@ -0,0 +1,11 @@ +--- libfreerdp/freerdp.pc.in.orig 2016-10-21 07:29:51 UTC ++++ libfreerdp/freerdp.pc.in +@@ -9,7 +9,7 @@ Description: FreeRDP: A Remote Desktop P + URL: http://www.freerdp.com/ + Version: @FREERDP_VERSION@ + Requires: +-Requires.private: @WINPR_PKG_CONFIG_FILENAME@ libssl ++Requires.private: @WINPR_PKG_CONFIG_FILENAME@ + Libs: -L${libdir} ${libs} + Libs.private: -ldl -lpthread + Cflags: -I${includedir} Property changes on: head/net/freerdp/files/patch-libfreerdp_freerdp.pc.in ___________________________________________________________________ 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_winpr.pc.in =================================================================== --- head/net/freerdp/files/patch-winpr_winpr.pc.in (nonexistent) +++ head/net/freerdp/files/patch-winpr_winpr.pc.in (revision 428330) @@ -0,0 +1,10 @@ +--- winpr/winpr.pc.in.orig 2016-10-21 07:29:51 UTC ++++ winpr/winpr.pc.in +@@ -9,7 +9,6 @@ Description: WinPR: Windows Portable Run + URL: http://www.freerdp.com/ + Version: @WINPR_VERSION@ + Requires: +-Requires.private: libssl + Libs: -L${libdir} ${libs} + Libs.private: -ldl -lrt -lm -lpthread + Cflags: -I${includedir} Property changes on: head/net/freerdp/files/patch-winpr_winpr.pc.in ___________________________________________________________________ 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 428329) +++ head/net/freerdp/pkg-plist (revision 428330) @@ -1,248 +1,222 @@ -%%DIRECTFB%%bin/dfreerdp +bin/winpr-hash +bin/winpr-makecert %%X11%%bin/xfreerdp -include/freerdp/addin.h -include/freerdp/altsec.h -include/freerdp/api.h -include/freerdp/assistance.h -include/freerdp/cache/bitmap.h -include/freerdp/cache/brush.h -include/freerdp/cache/cache.h -include/freerdp/cache/glyph.h -include/freerdp/cache/nine_grid.h -include/freerdp/cache/offscreen.h -include/freerdp/cache/palette.h -include/freerdp/cache/pointer.h -include/freerdp/channels/audin.h -include/freerdp/channels/channels.h -include/freerdp/channels/cliprdr.h -include/freerdp/channels/encomsp.h -include/freerdp/channels/log.h -include/freerdp/channels/rail.h -include/freerdp/channels/rdpdr.h -include/freerdp/channels/rdpgfx.h -include/freerdp/channels/rdpsnd.h -include/freerdp/channels/remdesk.h -include/freerdp/channels/tsmf.h -include/freerdp/channels/wtsvc.h -include/freerdp/client.h -include/freerdp/client/audin.h -include/freerdp/client/channels.h -include/freerdp/client/cliprdr.h -include/freerdp/client/cmdline.h -include/freerdp/client/disp.h -include/freerdp/client/drdynvc.h -include/freerdp/client/encomsp.h -include/freerdp/client/file.h -include/freerdp/client/rail.h -include/freerdp/client/rdpei.h -include/freerdp/client/rdpgfx.h -include/freerdp/client/rdpsnd.h -include/freerdp/client/remdesk.h -include/freerdp/client/tsmf.h -include/freerdp/codec/audio.h -include/freerdp/codec/bitmap.h -include/freerdp/codec/bulk.h -include/freerdp/codec/clear.h -include/freerdp/codec/color.h -include/freerdp/codec/dsp.h -include/freerdp/codec/h264.h -include/freerdp/codec/interleaved.h -include/freerdp/codec/jpeg.h -include/freerdp/codec/mppc.h -include/freerdp/codec/ncrush.h -include/freerdp/codec/nsc.h -include/freerdp/codec/planar.h -include/freerdp/codec/progressive.h -include/freerdp/codec/region.h -include/freerdp/codec/rfx.h -include/freerdp/codec/xcrush.h -include/freerdp/codec/zgfx.h -include/freerdp/codecs.h -include/freerdp/constants.h -include/freerdp/crypto/ber.h -include/freerdp/crypto/certificate.h -include/freerdp/crypto/crypto.h -include/freerdp/crypto/der.h -include/freerdp/crypto/er.h -include/freerdp/crypto/per.h -include/freerdp/crypto/tls.h -include/freerdp/dvc.h -include/freerdp/error.h -include/freerdp/event.h -include/freerdp/extension.h -include/freerdp/freerdp.h -include/freerdp/gdi/16bpp.h -include/freerdp/gdi/32bpp.h -include/freerdp/gdi/8bpp.h -include/freerdp/gdi/bitmap.h -include/freerdp/gdi/brush.h -include/freerdp/gdi/clipping.h -include/freerdp/gdi/dc.h -include/freerdp/gdi/drawing.h -include/freerdp/gdi/gdi.h -include/freerdp/gdi/line.h -include/freerdp/gdi/palette.h -include/freerdp/gdi/pen.h -include/freerdp/gdi/region.h -include/freerdp/gdi/shape.h -include/freerdp/graphics.h -include/freerdp/input.h -include/freerdp/listener.h -include/freerdp/locale/keyboard.h -include/freerdp/locale/locale.h -include/freerdp/locale/timezone.h -include/freerdp/log.h -include/freerdp/message.h -include/freerdp/metrics.h -include/freerdp/peer.h -include/freerdp/pointer.h -include/freerdp/primary.h -include/freerdp/primitives.h -include/freerdp/rail.h -include/freerdp/rail/icon.h -include/freerdp/rail/rail.h -include/freerdp/rail/window.h -include/freerdp/rail/window_list.h -include/freerdp/scancode.h -include/freerdp/secondary.h -include/freerdp/server/audin.h -include/freerdp/server/channels.h -include/freerdp/server/cliprdr.h -include/freerdp/server/drdynvc.h -include/freerdp/server/echo.h -include/freerdp/server/encomsp.h -include/freerdp/server/rdpdr.h -include/freerdp/server/rdpsnd.h -include/freerdp/server/remdesk.h -include/freerdp/server/shadow.h -include/freerdp/settings.h -include/freerdp/svc.h -include/freerdp/types.h -include/freerdp/update.h -include/freerdp/utils/debug.h -include/freerdp/utils/event.h -include/freerdp/utils/msusb.h -include/freerdp/utils/passphrase.h -include/freerdp/utils/pcap.h -include/freerdp/utils/profiler.h -include/freerdp/utils/rail.h -include/freerdp/utils/ringbuffer.h -include/freerdp/utils/signal.h -include/freerdp/utils/stopwatch.h -include/freerdp/utils/svc_plugin.h -include/freerdp/utils/tcp.h -include/freerdp/utils/time.h -include/freerdp/utils/uds.h -include/freerdp/version.h -include/freerdp/window.h -include/winpr/asn1.h -include/winpr/bcrypt.h -include/winpr/bitstream.h -include/winpr/cmdline.h -include/winpr/collections.h -include/winpr/comm.h -include/winpr/credentials.h -include/winpr/credui.h -include/winpr/crt.h -include/winpr/crypto.h -include/winpr/debug.h -include/winpr/dsparse.h -include/winpr/endian.h -include/winpr/environment.h -include/winpr/error.h -include/winpr/file.h -include/winpr/handle.h -include/winpr/heap.h -include/winpr/image.h -include/winpr/ini.h -include/winpr/input.h -include/winpr/interlocked.h -include/winpr/io.h -include/winpr/library.h -include/winpr/locale.h -include/winpr/memory.h -include/winpr/midl.h -include/winpr/ndr.h -include/winpr/nt.h -include/winpr/ntlm.h -include/winpr/path.h -include/winpr/pipe.h -include/winpr/platform.h -include/winpr/pool.h -include/winpr/print.h -include/winpr/registry.h -include/winpr/rpc.h -include/winpr/sam.h -include/winpr/schannel.h -include/winpr/security.h -include/winpr/smartcard.h -include/winpr/spec.h -include/winpr/ssl.h -include/winpr/sspi.h -include/winpr/sspicli.h -include/winpr/stream.h -include/winpr/string.h -include/winpr/synch.h -include/winpr/sysinfo.h -include/winpr/tchar.h -include/winpr/thread.h -include/winpr/timezone.h -include/winpr/tools/makecert.h -include/winpr/windows.h -include/winpr/winhttp.h -include/winpr/winpr.h -include/winpr/winsock.h -include/winpr/wlog.h -include/winpr/wnd.h -include/winpr/wtsapi.h -include/winpr/wtypes.h -lib/cmake/FreeRDP/FreeRDPConfig.cmake -lib/cmake/FreeRDP/FreeRDPConfigVersion.cmake -lib/cmake/FreeRDP/FreeRDPTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/FreeRDP/FreeRDPTargets.cmake -lib/cmake/WinPR/WinPRConfig.cmake -lib/cmake/WinPR/WinPRConfigVersion.cmake -lib/cmake/WinPR/WinPRTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/WinPR/WinPRTargets.cmake -%%ALSA%%lib/freerdp/audin-client-alsa.a -%%PULSEAUDIO%%lib/freerdp/audin-client-pulse.a -lib/freerdp/audin-client.a -lib/freerdp/cliprdr-client.a -lib/freerdp/disp-client.a -lib/freerdp/drdynvc-client.a -lib/freerdp/drive-client.a -lib/freerdp/echo-client.a -lib/freerdp/encomsp-client.a -lib/freerdp/parallel-client.a -%%CUPS%%lib/freerdp/printer-client.a -lib/freerdp/rail-client.a -lib/freerdp/rdpdr-client.a -lib/freerdp/rdpei-client.a -lib/freerdp/rdpgfx-client.a -%%ALSA%%lib/freerdp/rdpsnd-client-alsa.a -%%PULSEAUDIO%%lib/freerdp/rdpsnd-client-pulse.a -lib/freerdp/rdpsnd-client.a -lib/freerdp/remdesk-client.a -lib/freerdp/serial-client.a -lib/freerdp/smartcard-client.a -%%ALSA%%lib/freerdp/tsmf-client-alsa-audio.a -%%FFMPEG%%lib/freerdp/tsmf-client-ffmpeg-decoder.a -%%GSTREAMER%%lib/freerdp/tsmf-client-gstreamer-decoder.a -%%PULSEAUDIO%%lib/freerdp/tsmf-client-pulse-audio.a -lib/freerdp/tsmf-client.a -lib/libfreerdp.so -lib/libfreerdp.so.1.2 -lib/libfreerdp.so.1.2.0 +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.1.2 -lib/libfreerdp-client.so.1.2.0 -lib/libwinpr.so -lib/libwinpr.so.1.1 -lib/libwinpr.so.1.1.0 -lib/libwinpr-makecert-tool.a -%%X11%%lib/libxfreerdp-client.so -%%X11%%lib/libxfreerdp-client.so.1.2 -%%X11%%lib/libxfreerdp-client.so.1.2.0 -libdata/pkgconfig/freerdp.pc -libdata/pkgconfig/winpr.pc +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 +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 Index: head/net/freerdp1/Makefile =================================================================== --- head/net/freerdp1/Makefile (nonexistent) +++ head/net/freerdp1/Makefile (revision 428330) @@ -0,0 +1,97 @@ +# Created by: Alexander Logvinov +# $FreeBSD$ + +PORTNAME= freerdp +PORTVERSION= 1.2.0 +CATEGORIES= net comms ipv6 +PKGNAMESUFFIX= 1 + +MAINTAINER= bsdports@kyle-evans.net +COMMENT= Free implementation of Remote Desktop Protocol + +LICENSE= APACHE20 +LICENSE_FILE= ${WRKSRC}/LICENSE + +USE_LDCONFIG= yes +USES= alias cmake:outsource cpe execinfo pathfix pkgconfig compiler:c++11-lib ssl +USE_GITHUB= yes +GH_ACCOUNT= FreeRDP +GH_PROJECT= ${GH_ACCOUNT} +GH_TAGNAME= f5ff6e1 + +CPE_VENDOR= freerdp_project + +LDFLAGS+= -L${LOCALBASE}/lib +CFLAGS+= -I${WRKSRC}/include -I${WRKSRC}/winpr/include -I${LOCALBASE}/include + +OPTIONS_DEFINE= ALSA CUPS DIRECTFB FFMPEG GSTREAMER PULSEAUDIO SSE X11 +OPTIONS_DEFAULT= CUPS GSTREAMER X11 +OPTIONS_SUB= yes + +ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib +ALSA_CMAKE_ON= -DWITH_ALSA=ON +ALSA_CMAKE_OFF= -DWITH_ALSA=OFF + +CUPS_LIB_DEPENDS= libcups.so:print/cups +CUPS_CMAKE_ON= -DWITH_CUPS=ON +CUPS_CMAKE_OFF= -DWITH_CUPS=OFF + +# outdated and unmaintained upstream +DIRECTFB_DESC= Build FreeRDP DirectFB client (outdated) +DIRECTFB_LIB_DEPENDS= libdirectfb.so:devel/directfb +DIRECTFB_CMAKE_ON= -DWITH_DIRECTFB=ON +DIRECTFB_CMAKE_OFF= -DWITH_DIRECTFB=OFF +# currently DirectFB option fails with clang +DIRECTFB_USE= gcc=yes + +FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ + libavutil.so:multimedia/ffmpeg +FFMPEG_CMAKE_ON= -DWITH_FFMPEG=ON +FFMPEG_CMAKE_OFF= -DWITH_FFMPEG=OFF + +GSTREAMER_CMAKE_ON= -DWITH_GSTREAMER_1_0=ON -DWITH_GSTREAMER_0_10=OFF +GSTREAMER_CMAKE_OFF= -DWITH_GSTREAMER_1_0=OFF -DWITH_GSTREAMER_0_10=OFF +GSTREAMER_USE= gstreamer1=yes xorg=x11,xextproto,xext,xrandr + +PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio +PULSEAUDIO_CMAKE_ON= -DWITH_PULSE=ON +PULSEAUDIO_CMAKE_OFF= -DWITH_PULSE=OFF + +SSE_CMAKE_ON= -DWITH_SSE2=ON +SSE_CMAKE_OFF= -DWITH_SSE2=OFF + +X11_DESC= Build FreeRDP X11 client +X11_BUILD_DEPENDS= xmlto:textproc/xmlto +X11_CMAKE_ON= -DWITH_X11=ON +X11_CMAKE_OFF= -DWITH_X11=OFF -DWITH_XKBFILE=OFF +X11_USE= xorg=x11,xkbfile,xcursor,xextproto,xv,xinerama,xext \ + xcursor,xrandr,xi,xfixes,xrender + +.include + +post-patch: + @${FIND} ${WRKSRC} -name 'CMakeLists.txt' | ${XARGS} \ + ${REINPLACE_CMD} \ + -e 's|list(APPEND $${MODULE_PREFIX}_LIBS freerdp)|list(APPEND $${MODULE_PREFIX}_LIBS freerdp1)|' \ + -e 's|list(APPEND $${MODULE_PREFIX}_LIBS winpr)|list(APPEND $${MODULE_PREFIX}_LIBS winpr1)|' + @${FIND} ${WRKSRC} -name 'CMakeLists.txt' | ${XARGS} \ + ${REINPLACE_CMD} -E \ + -e 's|freerdp winpr|freerdp1 winpr1|' \ + -e 's|winpr freerdp|winpr1 freerdp1|' \ + -e 's|-lwinpr|-lwinpr1|' \ + -e 's|-lfreerdp|-lfreerdp1|' \ + -e 's|^([[:blank:]]*)target_link_libraries\((.+) freerdp\)([[:blank:]]*)$$|\1target_link_libraries(\2 freerdp1)\3|' \ + -e 's|^([[:blank:]]*)target_link_libraries\((.+) winpr\)([[:blank:]]*)$$|\1target_link_libraries(\2 winpr1)\3|' \ + -e 's|^([[:blank:]]*)set\((.+) freerdp (.+) winpr\)([[:blank:]]*)$$|\1set(\2 freerdp1 \3 winpr1)\4|' \ + -e 's|^([[:blank:]]*)set\((.+) winpr\)([[:blank:]]*)$$|\1set(\2 winpr1)\3|' + @${REINPLACE_CMD} -e 's|share/man/man1|man/man1|' \ + ${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 + @${REINPLACE_CMD} -e 's|$${CMAKE_INSTALL_LIBDIR}/cmake|$${CMAKE_INSTALL_PREFIX}/share/cmake/Modules|' \ + ${WRKSRC}/winpr/CMakeLists.txt \ + ${WRKSRC}/CMakeLists.txt + +.include Property changes on: head/net/freerdp1/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/freerdp1/files/patch-client_X11_CMakeLists.txt =================================================================== --- head/net/freerdp1/files/patch-client_X11_CMakeLists.txt (nonexistent) +++ head/net/freerdp1/files/patch-client_X11_CMakeLists.txt (revision 428330) @@ -0,0 +1,70 @@ +--- client/X11/CMakeLists.txt.orig 2016-12-04 14:35:40 UTC ++++ client/X11/CMakeLists.txt +@@ -16,7 +16,7 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + +-set(MODULE_NAME "xfreerdp-client") ++set(MODULE_NAME "xfreerdp1-client") + set(MODULE_PREFIX "FREERDP_CLIENT_X11_CONTROL") + + include(FindDocBookXSL) +@@ -66,7 +66,7 @@ if(WITH_CLIENT_INTERFACE) + else() + set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} cli/xfreerdp.c cli/xfreerdp.h) + add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS}) +- set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "xfreerdp") ++ set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "xfreerdp1") + endif() + + set(${MODULE_PREFIX}_LIBS +@@ -84,31 +84,31 @@ if(WITH_MANPAGES) + + TODAY(MAN_TODAY) + +- configure_file(xfreerdp.1.xml.in xfreerdp.1.xml @ONLY IMMEDIATE) ++ configure_file(xfreerdp.1.xml.in xfreerdp1.1.xml @ONLY IMMEDIATE) + + add_executable(generate_argument_docbook generate_argument_docbook.c) + +- set(GAD_LIBS freerdp-client) +- target_link_libraries(generate_argument_docbook ${GAD_LIBS} freerdp winpr) ++ set(GAD_LIBS freerdp1-client) ++ target_link_libraries(generate_argument_docbook ${GAD_LIBS} freerdp1 winpr1) + +- add_custom_command(OUTPUT xfreerdp.1 ++ add_custom_command(OUTPUT xfreerdp1.1 + COMMAND generate_argument_docbook + COMMAND ${CMAKE_COMMAND} -E copy + ${CMAKE_CURRENT_SOURCE_DIR}/xfreerdp-channels.1.xml ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${CMAKE_COMMAND} -E copy + ${CMAKE_CURRENT_SOURCE_DIR}/xfreerdp-examples.1.xml ${CMAKE_CURRENT_BINARY_DIR} +- COMMAND ${XSLTPROC_EXECUTABLE} ${DOCBOOKXSL_DIR}/manpages/docbook.xsl xfreerdp.1.xml ++ COMMAND ${XSLTPROC_EXECUTABLE} ${DOCBOOKXSL_DIR}/manpages/docbook.xsl xfreerdp1.1.xml + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + DEPENDS +- ${CMAKE_CURRENT_BINARY_DIR}/xfreerdp.1.xml ++ ${CMAKE_CURRENT_BINARY_DIR}/xfreerdp1.1.xml + ${CMAKE_CURRENT_SOURCE_DIR}/xfreerdp-examples.1.xml + ${CMAKE_CURRENT_SOURCE_DIR}/xfreerdp-channels.1.xml + generate_argument_docbook) + +- add_custom_target(xfreerdp.manpage ALL +- DEPENDS xfreerdp.1) ++ add_custom_target(xfreerdp1.manpage ALL ++ DEPENDS xfreerdp1.1) + +- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/xfreerdp.1 DESTINATION share/man/man1) ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/xfreerdp1.1 DESTINATION man/man1) + else() + message(WARNING "WITH_MANPAGES was set, but xsltproc was not found. man-pages will not be installed") + endif() +@@ -199,7 +199,7 @@ endif() + + include_directories(${CMAKE_SOURCE_DIR}/resources) + +-set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp freerdp-client) ++set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp1 freerdp1-client) + target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) + + if(WITH_IPP) Property changes on: head/net/freerdp1/files/patch-client_X11_CMakeLists.txt ___________________________________________________________________ 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/freerdp1/files/patch-client_X11_ModuleOptions.cmake =================================================================== --- head/net/freerdp1/files/patch-client_X11_ModuleOptions.cmake (nonexistent) +++ head/net/freerdp1/files/patch-client_X11_ModuleOptions.cmake (revision 428330) @@ -0,0 +1,8 @@ +--- client/X11/ModuleOptions.cmake.orig 2014-09-11 22:46:32 UTC ++++ client/X11/ModuleOptions.cmake +@@ -1,4 +1,4 @@ + +-set(FREERDP_CLIENT_NAME "xfreerdp") ++set(FREERDP_CLIENT_NAME "xfreerdp1") + set(FREERDP_CLIENT_PLATFORM "X11") + set(FREERDP_CLIENT_VENDOR "FreeRDP") Property changes on: head/net/freerdp1/files/patch-client_X11_ModuleOptions.cmake ___________________________________________________________________ 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/freerdp1/files/patch-client_X11_cli_CMakeLists.txt =================================================================== --- head/net/freerdp1/files/patch-client_X11_cli_CMakeLists.txt (nonexistent) +++ head/net/freerdp1/files/patch-client_X11_cli_CMakeLists.txt (revision 428330) @@ -0,0 +1,23 @@ +--- client/X11/cli/CMakeLists.txt.orig 2016-12-04 14:35:40 UTC ++++ client/X11/cli/CMakeLists.txt +@@ -15,7 +15,7 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + +-set(MODULE_NAME "xfreerdp-cli") ++set(MODULE_NAME "xfreerdp1-cli") + set(MODULE_PREFIX "FREERDP_CLIENT_X11") + + include_directories(..) +@@ -24,9 +24,9 @@ set(${MODULE_PREFIX}_SRCS + xfreerdp.c) + + add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS}) +-set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "xfreerdp" RUNTIME_OUTPUT_DIRECTORY "..") ++set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "xfreerdp1" RUNTIME_OUTPUT_DIRECTORY "..") + +-set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} xfreerdp-client) ++set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} xfreerdp1-client) + + target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) + Property changes on: head/net/freerdp1/files/patch-client_X11_cli_CMakeLists.txt ___________________________________________________________________ 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/freerdp1/files/patch-client_X11_xfreerdp.1.xml.in =================================================================== --- head/net/freerdp1/files/patch-client_X11_xfreerdp.1.xml.in (nonexistent) +++ head/net/freerdp1/files/patch-client_X11_xfreerdp.1.xml.in (revision 428330) @@ -0,0 +1,37 @@ +--- client/X11/xfreerdp.1.xml.in.orig 2014-09-11 22:46:32 UTC ++++ client/X11/xfreerdp.1.xml.in +@@ -16,13 +16,13 @@ PUBLIC "-//OASIS//DTD DocBook XML V4.5// + + + +- xfreerdp ++ xfreerdp1 + 1 + freerdp +- xfreerdp ++ xfreerdp1 + + +- xfreerdp ++ xfreerdp1 + FreeRDP X11 client + + +@@ -30,7 +30,7 @@ PUBLIC "-//OASIS//DTD DocBook XML V4.5// + @MAN_TODAY@ + + +- xfreerdp [file] [options] [/v:server[:port]] ++ xfreerdp1 [file] [options] [/v:server[:port]] + + + +@@ -39,7 +39,7 @@ PUBLIC "-//OASIS//DTD DocBook XML V4.5// + + DESCRIPTION + +- xfreerdp is an X11 Remote Desktop Protocol (RDP) ++ xfreerdp1 is an X11 Remote Desktop Protocol (RDP) + client which is part of the FreeRDP project. An RDP server is built-in + to many editions of Windows. Alternative servers included xrdp and VRDP (VirtualBox). + Property changes on: head/net/freerdp1/files/patch-client_X11_xfreerdp.1.xml.in ___________________________________________________________________ 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/freerdp1/files/patch-client_common_CMakeLists.txt =================================================================== --- head/net/freerdp1/files/patch-client_common_CMakeLists.txt (nonexistent) +++ head/net/freerdp1/files/patch-client_common_CMakeLists.txt (revision 428330) @@ -0,0 +1,20 @@ +--- client/common/CMakeLists.txt.orig 2016-12-04 15:05:17 UTC ++++ client/common/CMakeLists.txt +@@ -15,7 +15,7 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + +-set(MODULE_NAME "freerdp-client") ++set(MODULE_NAME "freerdp1-client") + set(MODULE_PREFIX "FREERDP_CLIENT") + + # Policy CMP0022: INTERFACE_LINK_LIBRARIES defines the link +@@ -58,7 +58,7 @@ set(${MODULE_PREFIX}_LIBS ${${MODULE_PRE + set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} + ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES}) + +-set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr freerdp) ++set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr1 freerdp1) + + target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) + Property changes on: head/net/freerdp1/files/patch-client_common_CMakeLists.txt ___________________________________________________________________ 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/freerdp1/files/patch-freerdp.pc.in =================================================================== --- head/net/freerdp1/files/patch-freerdp.pc.in (nonexistent) +++ head/net/freerdp1/files/patch-freerdp.pc.in (revision 428330) @@ -0,0 +1,12 @@ +Index: freerdp.pc.in +--- freerdp.pc.in.orig 2014-09-11 22:46:32 UTC ++++ freerdp.pc.in +@@ -9,7 +9,7 @@ Description: FreeRDP: A Remote Desktop P + URL: http://www.freerdp.com/ + Version: @FREERDP_VERSION_FULL@ + Requires: +-Requires.private: winpr zlib libssl ++Requires.private: winpr1 + Libs: -L${libdir} ${libs} + Libs.private: -ldl -lpthread + Cflags: -I${includedir} Property changes on: head/net/freerdp1/files/patch-freerdp.pc.in ___________________________________________________________________ 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/freerdp1/files/patch-libfreerdp_CMakeLists.txt =================================================================== --- head/net/freerdp1/files/patch-libfreerdp_CMakeLists.txt (nonexistent) +++ head/net/freerdp1/files/patch-libfreerdp_CMakeLists.txt (revision 428330) @@ -0,0 +1,19 @@ +--- libfreerdp/CMakeLists.txt.orig 2016-12-04 14:35:40 UTC ++++ libfreerdp/CMakeLists.txt +@@ -15,7 +15,7 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + +-set(MODULE_NAME "freerdp") ++set(MODULE_NAME "freerdp1") + set(MODULE_PREFIX "FREERDP") + + # Create imported targets for Intel IPP libraries +@@ -284,6 +284,6 @@ if (WITH_LIBRARY_VERSIONING) + endif() + set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "lib") + +-target_link_libraries(${MODULE_NAME} ${LIBFREERDP_LIBS} winpr) ++target_link_libraries(${MODULE_NAME} ${LIBFREERDP_LIBS} winpr1) + install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT FreeRDPTargets) + set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "FreeRDP/libfreerdp") Property changes on: head/net/freerdp1/files/patch-libfreerdp_CMakeLists.txt ___________________________________________________________________ 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/freerdp1/files/patch-winpr_tools_hash_CMakeLists.txt =================================================================== --- head/net/freerdp1/files/patch-winpr_tools_hash_CMakeLists.txt (nonexistent) +++ head/net/freerdp1/files/patch-winpr_tools_hash_CMakeLists.txt (revision 428330) @@ -0,0 +1,11 @@ +--- winpr/tools/hash/CMakeLists.txt.orig 2016-12-04 14:51:44 UTC ++++ winpr/tools/hash/CMakeLists.txt +@@ -29,7 +29,7 @@ add_executable(${MODULE_NAME} ${${MODULE + set(${MODULE_PREFIX}_LIBS + ${ZLIB_LIBRARIES} + ${OPENSSL_LIBRARIES} +- winpr) ++ winpr1) + + target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) + Property changes on: head/net/freerdp1/files/patch-winpr_tools_hash_CMakeLists.txt ___________________________________________________________________ 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/freerdp1/files/patch-winpr_tools_makecert_CMakeLists.txt =================================================================== --- head/net/freerdp1/files/patch-winpr_tools_makecert_CMakeLists.txt (nonexistent) +++ head/net/freerdp1/files/patch-winpr_tools_makecert_CMakeLists.txt (revision 428330) @@ -0,0 +1,11 @@ +--- winpr/tools/makecert/CMakeLists.txt.orig 2016-12-04 14:56:48 UTC ++++ winpr/tools/makecert/CMakeLists.txt +@@ -28,7 +28,7 @@ add_library(${MODULE_NAME} STATIC ${${MO + set(${MODULE_PREFIX}_LIBS + ${ZLIB_LIBRARIES} + ${OPENSSL_LIBRARIES} +- winpr) ++ winpr1) + + target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) + Property changes on: head/net/freerdp1/files/patch-winpr_tools_makecert_CMakeLists.txt ___________________________________________________________________ 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/freerdp1/files/patch-ffmpeg29 =================================================================== --- head/net/freerdp1/files/patch-ffmpeg29 (nonexistent) +++ head/net/freerdp1/files/patch-ffmpeg29 (revision 428330) @@ -0,0 +1,77 @@ +Description: Replace deprecated FFmpeg API +Author: Andreas Cadhalpun +Last-Update: <2015-11-02> + +--- channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c.orig 2016-06-11 21:12:27.134896000 +0200 ++++ channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c 2016-06-11 21:14:05.282247000 +0200 +@@ -103,7 +103,7 @@ + mdecoder->codec_context->bit_rate = media_type->BitRate; + mdecoder->codec_context->time_base.den = media_type->SamplesPerSecond.Numerator; + mdecoder->codec_context->time_base.num = media_type->SamplesPerSecond.Denominator; +- mdecoder->frame = avcodec_alloc_frame(); ++ mdecoder->frame = av_frame_alloc(); + return TRUE; + } + +@@ -322,14 +322,14 @@ + mdecoder->codec_context->width, mdecoder->codec_context->height); + mdecoder->decoded_data = malloc(mdecoder->decoded_size); + ZeroMemory(mdecoder->decoded_data, mdecoder->decoded_size); +- frame = avcodec_alloc_frame(); ++ frame = av_frame_alloc(); + avpicture_fill((AVPicture *) frame, mdecoder->decoded_data, + mdecoder->codec_context->pix_fmt, + mdecoder->codec_context->width, mdecoder->codec_context->height); + av_picture_copy((AVPicture *) frame, (AVPicture *) mdecoder->frame, + mdecoder->codec_context->pix_fmt, + mdecoder->codec_context->width, mdecoder->codec_context->height); +- av_free(frame); ++ av_frame_free(&frame); + } + return ret; + } +@@ -385,7 +385,7 @@ + (int16_t *) dst, &frame_size, src, src_size); + #else + { +- AVFrame *decoded_frame = avcodec_alloc_frame(); ++ AVFrame *decoded_frame = av_frame_alloc(); + int got_frame = 0; + AVPacket pkt; + av_init_packet(&pkt); +@@ -398,7 +398,7 @@ + decoded_frame->nb_samples, mdecoder->codec_context->sample_fmt, 1); + memcpy(dst, decoded_frame->data[0], frame_size); + } +- av_free(decoded_frame); ++ av_frame_free(&decoded_frame); + } + #endif + if(len <= 0 || frame_size <= 0) +@@ -464,7 +464,7 @@ + TSMFFFmpegDecoder *mdecoder = (TSMFFFmpegDecoder *) decoder; + switch(mdecoder->codec_context->pix_fmt) + { +- case PIX_FMT_YUV420P: ++ case AV_PIX_FMT_YUV420P: + return RDP_PIXFMT_I420; + default: + CLOG_ERR("unsupported pixel format %u", +@@ -492,7 +492,7 @@ + { + TSMFFFmpegDecoder *mdecoder = (TSMFFFmpegDecoder *) decoder; + if(mdecoder->frame) +- av_free(mdecoder->frame); ++ av_frame_free(&mdecoder->frame); + if(mdecoder->decoded_data) + free(mdecoder->decoded_data); + if(mdecoder->codec_context) +@@ -501,7 +501,7 @@ + avcodec_close(mdecoder->codec_context); + if(mdecoder->codec_context->extradata) + free(mdecoder->codec_context->extradata); +- av_free(mdecoder->codec_context); ++ av_frame_free(&mdecoder->codec_context); + } + free(decoder); + } Property changes on: head/net/freerdp1/files/patch-ffmpeg29 ___________________________________________________________________ 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/freerdp1/files/patch-cmake_ConfigOptions.cmake =================================================================== --- head/net/freerdp1/files/patch-cmake_ConfigOptions.cmake (nonexistent) +++ head/net/freerdp1/files/patch-cmake_ConfigOptions.cmake (revision 428330) @@ -0,0 +1,11 @@ +--- cmake/ConfigOptions.cmake.orig 2015-11-29 19:53:58 UTC ++++ cmake/ConfigOptions.cmake +@@ -6,7 +6,7 @@ elseif((CMAKE_SYSTEM_PROCESSOR MATCHES " + elseif((CMAKE_SYSTEM_PROCESSOR MATCHES "i386") AND (CMAKE_SIZEOF_VOID_P EQUAL 8) AND (APPLE)) + # Mac is weird like that. + set(TARGET_ARCH "x64") +-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm*") ++elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm*") + set(TARGET_ARCH "ARM") + endif() + Property changes on: head/net/freerdp1/files/patch-cmake_ConfigOptions.cmake ___________________________________________________________________ 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/freerdp1/files/patch-cmake_FindGStreamer_1_0.cmake =================================================================== --- head/net/freerdp1/files/patch-cmake_FindGStreamer_1_0.cmake (nonexistent) +++ head/net/freerdp1/files/patch-cmake_FindGStreamer_1_0.cmake (revision 428330) @@ -0,0 +1,16 @@ +Don't use custom code to find the include dirs for gstreamer 1.0 (core). +Since 1.6.0 there are multiple include paths. So use pkg-config to find +which. IMO the rest of this file should use pkg-config.... + +--- cmake/FindGStreamer_1_0.cmake.orig 2015-06-26 15:30:00.000000000 +0200 ++++ cmake/FindGStreamer_1_0.cmake 2015-09-27 10:43:55.754514000 +0200 +@@ -78,7 +78,8 @@ + # 1.1. Find headers and libraries + set(GLIB_ROOT_DIR ${GSTREAMER_1_0_ROOT_DIR}) + find_package(Glib REQUIRED) +-FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0 gstreamer-1.0 gst/gst.h gstreamer-1.0) ++pkg_check_modules (GSTREAMER_1_0 gstreamer-1.0) ++#FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0 gstreamer-1.0 gst/gst.h gstreamer-1.0) + FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_BASE gstreamer-base-1.0 gst/gst.h gstbase-1.0) + + # 1.2. Check Gstreamer version Property changes on: head/net/freerdp1/files/patch-cmake_FindGStreamer_1_0.cmake ___________________________________________________________________ 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/freerdp1/files/patch-z001-CMakeLists.txt =================================================================== --- head/net/freerdp1/files/patch-z001-CMakeLists.txt (nonexistent) +++ head/net/freerdp1/files/patch-z001-CMakeLists.txt (revision 428330) @@ -0,0 +1,13 @@ +--- CMakeLists.txt.intermediate 2015-06-06 13:17:20 UTC ++++ CMakeLists.txt +@@ -322,6 +322,10 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "BSD") + set(FREEBSD TRUE) + endif() + endif() ++if(${CMAKE_SYSTEM_NAME} MATCHES "DragonFly") ++ set(BSD TRUE) ++ set(FREEBSD TRUE) ++endif() + + # Android + if(ANDROID) Property changes on: head/net/freerdp1/files/patch-z001-CMakeLists.txt ___________________________________________________________________ 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/freerdp1/files/patch-winpr.pc.in =================================================================== --- head/net/freerdp1/files/patch-winpr.pc.in (nonexistent) +++ head/net/freerdp1/files/patch-winpr.pc.in (revision 428330) @@ -0,0 +1,12 @@ +Index: winpr.pc.in +diff -u winpr.pc.in.orig winpr.pc.in +--- winpr.pc.in.orig 2014-09-12 07:46:32.000000000 +0900 ++++ winpr.pc.in 2015-05-26 02:05:59.353925013 +0900 +@@ -9,7 +9,6 @@ + URL: http://www.freerdp.com/ + Version: @WINPR_VERSION_FULL@ + Requires: +-Requires.private: zlib libssl + Libs: -L${libdir} ${libs} + Libs.private: -ldl -lrt -lm -lpthread + Cflags: -I${includedir} Property changes on: head/net/freerdp1/files/patch-winpr.pc.in ___________________________________________________________________ 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/freerdp1/files/patch-git_1b663cef =================================================================== --- head/net/freerdp1/files/patch-git_1b663cef (nonexistent) +++ head/net/freerdp1/files/patch-git_1b663cef (revision 428330) @@ -0,0 +1,57 @@ +The patch below comes from upstream and has been slightly adjusted to apply +on the tarball we build. + +From 1b663ceffe51008af7ae9749e5b7999b2f7d6698 Mon Sep 17 00:00:00 2001 +From: Bernhard Miklautz +Date: Fri, 12 Dec 2014 18:26:45 +0100 +Subject: [PATCH] build: cmake 3.1 compatibility + +* fix problem with REMOVE_DUPLICATES on undefined lists +* since 3.1 file(GLOB FILEPATHS RELATIVE .. returns single / instead of // as + previously - necessary adoptions for regex and matches done. Should + work with all cmake versions. + +Tested with 3.1.0-rc3 +--- channels/CMakeLists.txt ++++ channels/CMakeLists.txt +@@ -202,8 +202,8 @@ set(FILENAME "ChannelOptions.cmake") + file(GLOB FILEPATHS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/${FILENAME}") + + foreach(FILEPATH ${FILEPATHS}) +- if(${FILEPATH} MATCHES "^([^/]*)//${FILENAME}") +- string(REGEX REPLACE "^([^/]*)//${FILENAME}" "\\1" DIR ${FILEPATH}) ++ if(${FILEPATH} MATCHES "^([^/]*)/+${FILENAME}") ++ string(REGEX REPLACE "^([^/]*)/+${FILENAME}" "\\1" DIR ${FILEPATH}) + set(CHANNEL_OPTION) + include(${FILEPATH}) + if(${CHANNEL_OPTION}) +--- channels/client/CMakeLists.txt ++++ channels/client/CMakeLists.txt +@@ -24,7 +24,9 @@ set(${MODULE_PREFIX}_SRCS + ${CMAKE_CURRENT_SOURCE_DIR}/addin.c + ${CMAKE_CURRENT_SOURCE_DIR}/addin.h) + ++if(CHANNEL_STATIC_CLIENT_ENTRIES) + list(REMOVE_DUPLICATES CHANNEL_STATIC_CLIENT_ENTRIES) ++endif() + + foreach(STATIC_ENTRY ${CHANNEL_STATIC_CLIENT_ENTRIES}) + foreach(STATIC_MODULE ${CHANNEL_STATIC_CLIENT_MODULES}) +--- third-party/CMakeLists.txt ++++ third-party/CMakeLists.txt +@@ -22,11 +22,11 @@ + file(GLOB all_valid_subdirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/CMakeLists.txt") + + foreach(dir ${all_valid_subdirs}) +- if(${dir} MATCHES "^([^/]*)//CMakeLists.txt") +- string(REGEX REPLACE "^([^/]*)//CMakeLists.txt" "\\1" dir_trimmed ${dir}) ++ if(${dir} MATCHES "^([^/]*)/+CMakeLists.txt") ++ string(REGEX REPLACE "^([^/]*)/+CMakeLists.txt" "\\1" dir_trimmed ${dir}) + message(STATUS "Adding third-party component ${dir_trimmed}") + add_subdirectory(${dir_trimmed}) + endif() + endforeach(dir) + +-set(THIRD_PARTY_INCLUDES ${THIRD_PARTY_INCLUDES} PARENT_SCOPE) +\ No newline at end of file ++set(THIRD_PARTY_INCLUDES ${THIRD_PARTY_INCLUDES} PARENT_SCOPE) Property changes on: head/net/freerdp1/files/patch-git_1b663cef ___________________________________________________________________ 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/freerdp1/files/patch-git_434436b7 =================================================================== --- head/net/freerdp1/files/patch-git_434436b7 (nonexistent) +++ head/net/freerdp1/files/patch-git_434436b7 (revision 428330) @@ -0,0 +1,74 @@ +From 434436b75f00c5475f66ff0f4062e168aa409688 Mon Sep 17 00:00:00 2001 +From: ivan-83 +Date: Tue, 10 Mar 2015 01:21:28 +0300 +Subject: [PATCH] * BSD/FreeBSD build fix + +--- + CMakeLists.txt | 14 ++++++++++++++ + winpr/libwinpr/synch/wait.c | 2 +- + winpr/libwinpr/sysinfo/sysinfo.c | 1 + + winpr/libwinpr/utils/CMakeLists.txt | 4 ++++ + 4 files changed, 20 insertions(+), 1 deletion(-) + +diff CMakeLists.txt CMakeLists.txt +index 0a9144a..386ae67 100644 +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -358,6 +358,14 @@ if(APPLE) + endif() + endif(APPLE) + ++# BSD ++if(${CMAKE_SYSTEM_NAME} MATCHES "BSD") ++ set(BSD TRUE) ++ if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") ++ set(FREEBSD TRUE) ++ endif() ++endif() ++ + # Android + if(ANDROID) + set(WITH_LIBRARY_VERSIONING "OFF") +@@ -618,6 +626,12 @@ set(FREERDP_EXTENSION_PATH "${CMAKE_INSTALL_FULL_LIBDIR}/freerdp/extensions") + include_directories(${CMAKE_CURRENT_BINARY_DIR}) + include_directories(${CMAKE_CURRENT_BINARY_DIR}/include) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) ++if(BSD) ++ if(IS_DIRECTORY /usr/local/include) ++ include_directories(/usr/local/include) ++ link_directories(/usr/local/lib) ++ endif() ++endif() + + # Configure files + add_definitions("-DHAVE_CONFIG_H") +diff winpr/libwinpr/sysinfo/sysinfo.c winpr/libwinpr/sysinfo/sysinfo.c +index 1529d54..457ab9d 100644 +--- winpr/libwinpr/sysinfo/sysinfo.c ++++ winpr/libwinpr/sysinfo/sysinfo.c +@@ -54,6 +54,7 @@ + #ifndef _WIN32 + + #include ++#include + + #ifdef HAVE_UNISTD_H + #include +diff winpr/libwinpr/utils/CMakeLists.txt winpr/libwinpr/utils/CMakeLists.txt +index e524bf9..501f605 100644 +--- winpr/libwinpr/utils/CMakeLists.txt ++++ winpr/libwinpr/utils/CMakeLists.txt +@@ -113,6 +113,10 @@ if(UNIX) + winpr_library_add(m) + endif() + ++if(BSD) ++ winpr_library_add(execinfo) ++endif() ++ + if(BUILD_TESTING) + add_subdirectory(test) + endif() +-- +2.4.1 + Property changes on: head/net/freerdp1/files/patch-git_434436b7 ___________________________________________________________________ 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/freerdp1/files/patch-libfreerdp-locale-timezone.c =================================================================== --- head/net/freerdp1/files/patch-libfreerdp-locale-timezone.c (nonexistent) +++ head/net/freerdp1/files/patch-libfreerdp-locale-timezone.c (revision 428330) @@ -0,0 +1,42 @@ +From f5dbe2c9a5fe050c1d7e014d3c1529befb8eea3b Mon Sep 17 00:00:00 2001 +From: ivan-83 +Date: Tue, 10 Mar 2015 04:40:47 +0300 +Subject: [PATCH] * FreeBSD timezone detection patch + +--- + libfreerdp/locale/timezone.c | 15 +++++++++++---- + 1 file changed, 11 insertions(+), 4 deletions(-) + +diff libfreerdp/locale/timezone.c libfreerdp/locale/timezone.c +index 92b74e8..0375f9c 100644 +--- libfreerdp/locale/timezone.c ++++ libfreerdp/locale/timezone.c +@@ -1521,8 +1523,11 @@ char* freerdp_get_unix_timezone_identifier() + return tzid; + } + ++#ifdef __FreeBSD__ ++ fp = fopen("/var/db/zoneinfo", "r"); ++#else + fp = fopen("/etc/timezone", "r"); +- ++#endif + if (fp != NULL) + { + fseek(fp, 0, SEEK_END); +@@ -1678,8 +1683,10 @@ void freerdp_time_zone_detect(TIME_ZONE_INFO* clientTimeZone) + + #ifdef HAVE_TM_GMTOFF + #if defined(__FreeBSD__) +- /*not the best solution, but could not get the right tyepcast*/ +- clientTimeZone->bias = 0; ++ if (local_time->tm_gmtoff >= 0) ++ clientTimeZone->bias = (UINT32) (local_time->tm_gmtoff / 60); ++ else ++ clientTimeZone->bias = (UINT32) (1440 + (INT32) (local_time->tm_gmtoff / 60)); + #else + clientTimeZone->bias = timezone / 60; + #endif +-- +2.4.1 + Property changes on: head/net/freerdp1/files/patch-libfreerdp-locale-timezone.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/freerdp1/files/patch-cmake-FindOpenSSL.cmake =================================================================== --- head/net/freerdp1/files/patch-cmake-FindOpenSSL.cmake (nonexistent) +++ head/net/freerdp1/files/patch-cmake-FindOpenSSL.cmake (revision 428330) @@ -0,0 +1,11 @@ +--- cmake/FindOpenSSL.cmake.orig 2013-07-10 04:00:21.000000000 -0400 ++++ cmake/FindOpenSSL.cmake 2015-03-25 19:26:35.154024000 -0400 +@@ -270,7 +270,7 @@ + set(OPENSSL_VERSION "${_OPENSSL_VERSION}") + elseif(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h") + file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str +- REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*") ++ REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*") + + # The version number is encoded as 0xMNNFFPPS: major minor fix patch status + # The status gives if this is a developer or prerelease and is ignored here. Property changes on: head/net/freerdp1/files/patch-cmake-FindOpenSSL.cmake ___________________________________________________________________ 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/freerdp1/pkg-plist =================================================================== --- head/net/freerdp1/pkg-plist (nonexistent) +++ head/net/freerdp1/pkg-plist (revision 428330) @@ -0,0 +1,248 @@ +%%DIRECTFB%%bin/dfreerdp1 +%%X11%%bin/xfreerdp1 +include/freerdp/addin.h +include/freerdp/altsec.h +include/freerdp/api.h +include/freerdp/assistance.h +include/freerdp/cache/bitmap.h +include/freerdp/cache/brush.h +include/freerdp/cache/cache.h +include/freerdp/cache/glyph.h +include/freerdp/cache/nine_grid.h +include/freerdp/cache/offscreen.h +include/freerdp/cache/palette.h +include/freerdp/cache/pointer.h +include/freerdp/channels/audin.h +include/freerdp/channels/channels.h +include/freerdp/channels/cliprdr.h +include/freerdp/channels/encomsp.h +include/freerdp/channels/log.h +include/freerdp/channels/rail.h +include/freerdp/channels/rdpdr.h +include/freerdp/channels/rdpgfx.h +include/freerdp/channels/rdpsnd.h +include/freerdp/channels/remdesk.h +include/freerdp/channels/tsmf.h +include/freerdp/channels/wtsvc.h +include/freerdp/client.h +include/freerdp/client/audin.h +include/freerdp/client/channels.h +include/freerdp/client/cliprdr.h +include/freerdp/client/cmdline.h +include/freerdp/client/disp.h +include/freerdp/client/drdynvc.h +include/freerdp/client/encomsp.h +include/freerdp/client/file.h +include/freerdp/client/rail.h +include/freerdp/client/rdpei.h +include/freerdp/client/rdpgfx.h +include/freerdp/client/rdpsnd.h +include/freerdp/client/remdesk.h +include/freerdp/client/tsmf.h +include/freerdp/codec/audio.h +include/freerdp/codec/bitmap.h +include/freerdp/codec/bulk.h +include/freerdp/codec/clear.h +include/freerdp/codec/color.h +include/freerdp/codec/dsp.h +include/freerdp/codec/h264.h +include/freerdp/codec/interleaved.h +include/freerdp/codec/jpeg.h +include/freerdp/codec/mppc.h +include/freerdp/codec/ncrush.h +include/freerdp/codec/nsc.h +include/freerdp/codec/planar.h +include/freerdp/codec/progressive.h +include/freerdp/codec/region.h +include/freerdp/codec/rfx.h +include/freerdp/codec/xcrush.h +include/freerdp/codec/zgfx.h +include/freerdp/codecs.h +include/freerdp/constants.h +include/freerdp/crypto/ber.h +include/freerdp/crypto/certificate.h +include/freerdp/crypto/crypto.h +include/freerdp/crypto/der.h +include/freerdp/crypto/er.h +include/freerdp/crypto/per.h +include/freerdp/crypto/tls.h +include/freerdp/dvc.h +include/freerdp/error.h +include/freerdp/event.h +include/freerdp/extension.h +include/freerdp/freerdp.h +include/freerdp/gdi/16bpp.h +include/freerdp/gdi/32bpp.h +include/freerdp/gdi/8bpp.h +include/freerdp/gdi/bitmap.h +include/freerdp/gdi/brush.h +include/freerdp/gdi/clipping.h +include/freerdp/gdi/dc.h +include/freerdp/gdi/drawing.h +include/freerdp/gdi/gdi.h +include/freerdp/gdi/line.h +include/freerdp/gdi/palette.h +include/freerdp/gdi/pen.h +include/freerdp/gdi/region.h +include/freerdp/gdi/shape.h +include/freerdp/graphics.h +include/freerdp/input.h +include/freerdp/listener.h +include/freerdp/locale/keyboard.h +include/freerdp/locale/locale.h +include/freerdp/locale/timezone.h +include/freerdp/log.h +include/freerdp/message.h +include/freerdp/metrics.h +include/freerdp/peer.h +include/freerdp/pointer.h +include/freerdp/primary.h +include/freerdp/primitives.h +include/freerdp/rail.h +include/freerdp/rail/icon.h +include/freerdp/rail/rail.h +include/freerdp/rail/window.h +include/freerdp/rail/window_list.h +include/freerdp/scancode.h +include/freerdp/secondary.h +include/freerdp/server/audin.h +include/freerdp/server/channels.h +include/freerdp/server/cliprdr.h +include/freerdp/server/drdynvc.h +include/freerdp/server/echo.h +include/freerdp/server/encomsp.h +include/freerdp/server/rdpdr.h +include/freerdp/server/rdpsnd.h +include/freerdp/server/remdesk.h +include/freerdp/server/shadow.h +include/freerdp/settings.h +include/freerdp/svc.h +include/freerdp/types.h +include/freerdp/update.h +include/freerdp/utils/debug.h +include/freerdp/utils/event.h +include/freerdp/utils/msusb.h +include/freerdp/utils/passphrase.h +include/freerdp/utils/pcap.h +include/freerdp/utils/profiler.h +include/freerdp/utils/rail.h +include/freerdp/utils/ringbuffer.h +include/freerdp/utils/signal.h +include/freerdp/utils/stopwatch.h +include/freerdp/utils/svc_plugin.h +include/freerdp/utils/tcp.h +include/freerdp/utils/time.h +include/freerdp/utils/uds.h +include/freerdp/version.h +include/freerdp/window.h +include/winpr/asn1.h +include/winpr/bcrypt.h +include/winpr/bitstream.h +include/winpr/cmdline.h +include/winpr/collections.h +include/winpr/comm.h +include/winpr/credentials.h +include/winpr/credui.h +include/winpr/crt.h +include/winpr/crypto.h +include/winpr/debug.h +include/winpr/dsparse.h +include/winpr/endian.h +include/winpr/environment.h +include/winpr/error.h +include/winpr/file.h +include/winpr/handle.h +include/winpr/heap.h +include/winpr/image.h +include/winpr/ini.h +include/winpr/input.h +include/winpr/interlocked.h +include/winpr/io.h +include/winpr/library.h +include/winpr/locale.h +include/winpr/memory.h +include/winpr/midl.h +include/winpr/ndr.h +include/winpr/nt.h +include/winpr/ntlm.h +include/winpr/path.h +include/winpr/pipe.h +include/winpr/platform.h +include/winpr/pool.h +include/winpr/print.h +include/winpr/registry.h +include/winpr/rpc.h +include/winpr/sam.h +include/winpr/schannel.h +include/winpr/security.h +include/winpr/smartcard.h +include/winpr/spec.h +include/winpr/ssl.h +include/winpr/sspi.h +include/winpr/sspicli.h +include/winpr/stream.h +include/winpr/string.h +include/winpr/synch.h +include/winpr/sysinfo.h +include/winpr/tchar.h +include/winpr/thread.h +include/winpr/timezone.h +include/winpr/tools/makecert.h +include/winpr/windows.h +include/winpr/winhttp.h +include/winpr/winpr.h +include/winpr/winsock.h +include/winpr/wlog.h +include/winpr/wnd.h +include/winpr/wtsapi.h +include/winpr/wtypes.h +%%ALSA%%lib/freerdp/audin-client-alsa.a +%%PULSEAUDIO%%lib/freerdp/audin-client-pulse.a +lib/freerdp/audin-client.a +lib/freerdp/cliprdr-client.a +lib/freerdp/disp-client.a +lib/freerdp/drdynvc-client.a +lib/freerdp/drive-client.a +lib/freerdp/echo-client.a +lib/freerdp/encomsp-client.a +lib/freerdp/parallel-client.a +%%CUPS%%lib/freerdp/printer-client.a +lib/freerdp/rail-client.a +lib/freerdp/rdpdr-client.a +lib/freerdp/rdpei-client.a +lib/freerdp/rdpgfx-client.a +%%ALSA%%lib/freerdp/rdpsnd-client-alsa.a +%%PULSEAUDIO%%lib/freerdp/rdpsnd-client-pulse.a +lib/freerdp/rdpsnd-client.a +lib/freerdp/remdesk-client.a +lib/freerdp/serial-client.a +lib/freerdp/smartcard-client.a +%%ALSA%%lib/freerdp/tsmf-client-alsa-audio.a +%%FFMPEG%%lib/freerdp/tsmf-client-ffmpeg-decoder.a +%%GSTREAMER%%lib/freerdp/tsmf-client-gstreamer-decoder.a +%%PULSEAUDIO%%lib/freerdp/tsmf-client-pulse-audio.a +lib/freerdp/tsmf-client.a +lib/libfreerdp1.so +lib/libfreerdp1.so.1.2 +lib/libfreerdp1.so.1.2.0 +lib/libfreerdp1-client.so +lib/libfreerdp1-client.so.1.2 +lib/libfreerdp1-client.so.1.2.0 +lib/libwinpr1.so +lib/libwinpr1.so.1.1 +lib/libwinpr1.so.1.1.0 +lib/libwinpr-makecert-tool.a +%%X11%%lib/libxfreerdp1-client.so +%%X11%%lib/libxfreerdp1-client.so.1.2 +%%X11%%lib/libxfreerdp1-client.so.1.2.0 +libdata/pkgconfig/freerdp.pc +libdata/pkgconfig/winpr.pc +%%X11%%man/man1/xfreerdp1.1.gz +share/cmake/Modules/FreeRDP/FreeRDPConfig.cmake +share/cmake/Modules/FreeRDP/FreeRDPConfigVersion.cmake +share/cmake/Modules/FreeRDP/FreeRDPTargets-%%CMAKE_BUILD_TYPE%%.cmake +share/cmake/Modules/FreeRDP/FreeRDPTargets.cmake +share/cmake/Modules/WinPR/WinPRConfig.cmake +share/cmake/Modules/WinPR/WinPRConfigVersion.cmake +share/cmake/Modules/WinPR/WinPRTargets-%%CMAKE_BUILD_TYPE%%.cmake +share/cmake/Modules/WinPR/WinPRTargets.cmake Property changes on: head/net/freerdp1/pkg-plist ___________________________________________________________________ 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/freerdp1/distinfo =================================================================== --- head/net/freerdp1/distinfo (nonexistent) +++ head/net/freerdp1/distinfo (revision 428330) @@ -0,0 +1,3 @@ +TIMESTAMP = 1470755086 +SHA256 (FreeRDP-FreeRDP-1.2.0-f5ff6e1_GH0.tar.gz) = f39c7eaa007a3aef580f364f8f5c0b9208c6c3c8f5f00a4c0ed020a81535eb32 +SIZE (FreeRDP-FreeRDP-1.2.0-f5ff6e1_GH0.tar.gz) = 6033856 Property changes on: head/net/freerdp1/distinfo ___________________________________________________________________ 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/freerdp1/pkg-descr =================================================================== --- head/net/freerdp1/pkg-descr (nonexistent) +++ head/net/freerdp1/pkg-descr (revision 428330) @@ -0,0 +1,6 @@ +FreeRDP is a free implementation of the Remote Desktop Protocol (RDP), +released under the Apache license. Enjoy the freedom of using your +software wherever you want, the way you want it, in a world where +interoperability can finally liberate your computing experience. + +WWW: http://www.freerdp.com/ Property changes on: head/net/freerdp1/pkg-descr ___________________________________________________________________ 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/guacamole-server/Makefile =================================================================== --- head/net/guacamole-server/Makefile (revision 428329) +++ head/net/guacamole-server/Makefile (revision 428330) @@ -1,77 +1,77 @@ # Created by: Ultima # $FreeBSD$ PORTNAME= guacamole-server PORTVERSION= 0.9.9 PORTREVISION= 2 CATEGORIES= net MAINTAINER= ultima1252@gmail.com COMMENT= HTML5 Clientless Remote Desktop LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libossp-uuid.so:misc/ossp-uuid \ libpng.so:graphics/png CONFLICTS_BUILD=pulseaudio-*+jack_* ffmpeg-*+jack_* USE_GITHUB= yes GH_ACCOUNT= glyptodon USES= autoreconf jpeg libtool localbase pkgconfig shebangfix ssl USE_GNOME= cairo SHEBANG_FILES= ${WRKSRC}/src/protocols/rdp/keymaps/generate.pl GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-guacd-conf=${PREFIX}/etc/guacd/guacd.conf USE_LDCONFIG= yes MAKE_JOBS_UNSAFE= yes USERS= guacamole GROUPS= guacamole USE_RC_SUBR= guacd SUB_LIST+= GUACD_USER=${USERS} \ GUACD_GROUP=${GROUPS} OPTIONS_DEFINE= RDP SSH VNC VORBIS PULSEAUDIO WEBP OPTIONS_DEFAULT= RDP SSH VNC VORBIS PULSEAUDIO WEBP OPTIONS_SUB= yes PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_DESC?= VNC audio support (Experimental) -RDP_LIB_DEPENDS= libfreerdp.so:net/freerdp +RDP_LIB_DEPENDS= libfreerdp1.so:net/freerdp1 RDP_DESC?= RDP Protocal Support SSH_LIB_DEPENDS= libssh2.so:security/libssh2 SSH_USE= GNOME=pango SSH_DESC?= SSH Support VNC_LIB_DEPENDS= libvncserver.so:net/libvncserver VNC_DESC?= VNC Protocol Support VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis \ libogg.so:audio/libogg VORBIS_DESC?= Ogg Vorbis for compression WEBP_LIB_DEPENDS= libwebp.so:graphics/webp WEBP_DESC?= WebP support .include post-patch: @${REINPLACE_CMD} 's|/etc/ssl|${PREFIX}/etc/ssl|g ; \ s|/etc/guacamole|${PREFIX}/etc/guacd|g' \ ${WRKSRC}/src/guacd/man/guacd.conf.5 post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libguac.so.* .if ${PORT_OPTIONS:MSSH} @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libguac-client-ssh.so.* .endif .if ${PORT_OPTIONS:MRDP} @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/freerdp/guacsnd-client.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/freerdp/guacdr-client.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/freerdp/guacsvc-client.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libguac-client-rdp.so.* .endif .if ${PORT_OPTIONS:MVNC} @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libguac-client-vnc.so.* .endif .include Index: head/net/guacamole-server/files/patch-configure.ac =================================================================== --- head/net/guacamole-server/files/patch-configure.ac (nonexistent) +++ head/net/guacamole-server/files/patch-configure.ac (revision 428330) @@ -0,0 +1,66 @@ +--- configure.ac.orig 2016-12-04 15:16:36 UTC ++++ configure.ac +@@ -389,13 +389,13 @@ then + event_interface=unknown + + # libfreerdp-core / libfreerdp +- AC_CHECK_LIB([freerdp-core], [freerdp_new], +- [RDP_LIBS="$RDP_LIBS -lfreerdp-core"], +- [AC_CHECK_LIB([freerdp], [freerdp_new], +- [RDP_LIBS="$RDP_LIBS -lfreerdp -lfreerdp-client"], ++ AC_CHECK_LIB([freerdp1-core], [freerdp_new], ++ [RDP_LIBS="$RDP_LIBS -lfreerdp1-core"], ++ [AC_CHECK_LIB([freerdp1], [freerdp_new], ++ [RDP_LIBS="$RDP_LIBS -lfreerdp1 -lfreerdp1-client"], + [AC_MSG_WARN([ + -------------------------------------------- +- Unable to find libfreerdp-core / libfreerdp ++ Unable to find libfreerdp1-core / libfreerdp1 + RDP will be disabled. + --------------------------------------------]) + have_freerdp=no])]) +@@ -405,33 +405,33 @@ fi + # libfreerdp-cache + if test "x${have_freerdp}" = "xyes" + then +- AC_CHECK_LIB([freerdp-cache], [glyph_cache_register_callbacks], +- [RDP_LIBS="$RDP_LIBS -lfreerdp-cache"]) ++ AC_CHECK_LIB([freerdp1-cache], [glyph_cache_register_callbacks], ++ [RDP_LIBS="$RDP_LIBS -lfreerdp1-cache"]) + fi + + # libfreerdp-channels (1.0) / libfreerdp-client + libfreerdp-core (1.1) + if test "x${have_freerdp}" = "xyes" + then +- AC_CHECK_LIB([freerdp-client], [freerdp_channels_new], +- [RDP_LIBS="$RDP_LIBS -lfreerdp-client"], +- [AC_CHECK_LIB([freerdp-channels], [freerdp_channels_new], +- [RDP_LIBS="$RDP_LIBS -lfreerdp-channels" ++ AC_CHECK_LIB([freerdp1-client], [freerdp_channels_new], ++ [RDP_LIBS="$RDP_LIBS -lfreerdp1-client"], ++ [AC_CHECK_LIB([freerdp1-channels], [freerdp_channels_new], ++ [RDP_LIBS="$RDP_LIBS -lfreerdp1-channels" + legacy_freerdp_extensions=yes])], +- [-lfreerdp-core]) ++ [-lfreerdp1-core]) + fi + + # libfreerdp-utils + if test "x${have_freerdp}" = "xyes" + then +- AC_CHECK_LIB([freerdp-utils], [svc_plugin_init], +- [RDP_LIBS="$RDP_LIBS -lfreerdp-utils"]) ++ AC_CHECK_LIB([freerdp1-utils], [svc_plugin_init], ++ [RDP_LIBS="$RDP_LIBS -lfreerdp1-utils"]) + fi + + # libfreerdp-codec + if test "x${have_freerdp}" = "xyes" + then +- AC_CHECK_LIB([freerdp-codec], [freerdp_image_convert], +- [RDP_LIBS="$RDP_LIBS -lfreerdp-codec"]) ++ AC_CHECK_LIB([freerdp1-codec], [freerdp_image_convert], ++ [RDP_LIBS="$RDP_LIBS -lfreerdp1-codec"]) + fi + + # Available color conversion functions Property changes on: head/net/guacamole-server/files/patch-configure.ac ___________________________________________________________________ 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/vinagre/Makefile =================================================================== --- head/net/vinagre/Makefile (revision 428329) +++ head/net/vinagre/Makefile (revision 428330) @@ -1,57 +1,63 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ PORTNAME= vinagre PORTVERSION= 3.18.2 PORTREVISION= 3 CATEGORIES= net gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= VNC client for the GNOME Desktop -BUILD_DEPENDS= itstool:textproc/itstool +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= desktop-file-utils gettext gmake gnome pathfix pkgconfig \ - shared-mime-info tar:xz +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 Index: head/net/vinagre/files/patch-configure.ac =================================================================== --- head/net/vinagre/files/patch-configure.ac (nonexistent) +++ head/net/vinagre/files/patch-configure.ac (revision 428330) @@ -0,0 +1,30 @@ +From 8d072483ffff3a4e752c35811fb562f61d206f68 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Fri, 22 Apr 2016 14:54:09 -0700 +Subject: [PATCH] handle new freerdp pkgconfig name + +freerdp has now changed its pkgconfig name to 'freerdp2' - +https://github.com/FreeRDP/FreeRDP/commit/6fa36081 . Assuming +we can build against both 1 and 2, we should handle both names. +--- configure.ac.orig 2016-09-20 06:02:32 UTC ++++ configure.ac +@@ -59,6 +59,7 @@ AM_CONDITIONAL([VINAGRE_ENABLE_SSH], [te + + # Whether to enable support for RDP. + RDP_DEPS="freerdp x11" ++RDP_2_DEPS="freerdp2 x11" + AC_ARG_ENABLE([rdp], + [AS_HELP_STRING([--disable-rdp], + [Disable Remote Desktop Protocol (RDP) support])]) +@@ -68,7 +69,10 @@ AS_IF([test "x$enable_rdp" != "xno"], + [have_rdp=yes + PKG_CHECK_EXISTS(freerdp >= 1.1, + [AC_DEFINE([HAVE_FREERDP_1_1], [1], [FreeRDP is of version 1.1 or newer])], [])], +- [have_rdp=no])], ++ [PKG_CHECK_EXISTS([$RDP_2_DEPS], ++ [have_rdp=yes ++ RDP_DEPS=$RDP_2_DEPS ++ AC_DEFINE([HAVE_FREERDP_1_1], [1], [FreeRDP is of version 1.1 or newer])], [have_rdp=no])])], + [have_rdp=no]) + + AS_IF([test "x$have_rdp" = "xyes"], Property changes on: head/net/vinagre/files/patch-configure.ac ___________________________________________________________________ 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/vinagre/files/patch-plugins_rdp_vinagre-rdp-tab.c =================================================================== --- head/net/vinagre/files/patch-plugins_rdp_vinagre-rdp-tab.c (nonexistent) +++ head/net/vinagre/files/patch-plugins_rdp_vinagre-rdp-tab.c (revision 428330) @@ -0,0 +1,119 @@ +--- plugins/rdp/vinagre-rdp-tab.c.orig 2015-10-06 15:40:06 UTC ++++ plugins/rdp/vinagre-rdp-tab.c +@@ -476,16 +476,18 @@ frdp_drawing_area_draw (GtkWidget *area, + return TRUE; + } + +-static void ++static BOOL + frdp_begin_paint (rdpContext *context) + { + rdpGdi *gdi = context->gdi; + + gdi->primary->hdc->hwnd->invalid->null = 1; + gdi->primary->hdc->hwnd->ninvalid = 0; ++ ++ return TRUE; + } + +-static void ++static BOOL + frdp_end_paint (rdpContext *context) + { + VinagreRdpTab *rdp_tab = ((frdpContext *) context)->rdp_tab; +@@ -495,7 +497,7 @@ frdp_end_paint (rdpContext *context) + gint x, y, w, h; + + if (gdi->primary->hdc->hwnd->invalid->null) +- return; ++ return FALSE; + + x = gdi->primary->hdc->hwnd->invalid->x; + y = gdi->primary->hdc->hwnd->invalid->y; +@@ -517,6 +519,8 @@ frdp_end_paint (rdpContext *context) + { + gtk_widget_queue_draw_area (priv->display, x, y, w, h); + } ++ ++ return TRUE; + } + + static BOOL +@@ -591,11 +595,15 @@ frdp_post_connect (freerdp *instance) + #if defined(FREERDP_VERSION_MAJOR) && defined(FREERDP_VERSION_MINOR) && \ + !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && \ + FREERDP_VERSION_MINOR >= 2)) +- CLRBUF_24BPP, ++ CLRBUF_24BPP, NULL + #else +- CLRBUF_32BPP, ++#ifdef CLRBUF_32BPP ++ CLRBUF_32BPP, NULL ++#else ++ PIXEL_FORMAT_BGRA32 ++#endif + #endif +- NULL); ++ ); + gdi = instance->context->gdi; + + instance->update->BeginPaint = frdp_begin_paint; +@@ -862,7 +870,7 @@ frdp_mouse_moved (GtkWidget *widget + return TRUE; + } + +-static gboolean ++static BOOL + frdp_authenticate (freerdp *instance, + char **username, + char **password, +@@ -934,11 +942,13 @@ frdp_authenticate (freerdp *instance, + return TRUE; + } + +-static BOOL +-frdp_certificate_verify (freerdp *instance, +- char *subject, +- char *issuer, +- char *fingerprint) ++static DWORD ++frdp_certificate_verify (freerdp *instance, ++ const char *common_name, ++ const char *subject, ++ const char *issuer, ++ const char *fingerprint, ++ BOOL host_mismatch) + { + VinagreTab *tab = VINAGRE_TAB (((frdpContext *) instance->context)->rdp_tab); + GtkBuilder *builder; +@@ -973,12 +983,15 @@ frdp_certificate_verify (freerdp *instan + + + #if HAVE_FREERDP_1_1 +-static BOOL +-frdp_changed_certificate_verify (freerdp *instance, +- char *subject, +- char *issuer, +- char *new_fingerprint, +- char *old_fingerprint) ++static DWORD ++frdp_changed_certificate_verify (freerdp *instance, ++ const char *common_name, ++ const char *subject, ++ const char *issuer, ++ const char *new_fingerprint, ++ const char *old_subject, ++ const char *old_issuer, ++ const char *old_fingerprint) + { + VinagreTab *tab = VINAGRE_TAB (((frdpContext *) instance->context)->rdp_tab); + GtkBuilder *builder; +@@ -1108,7 +1107,7 @@ open_freerdp (VinagreRdpTab *rdp_tab) + settings->encryption_level = ENCRYPTION_LEVEL_CLIENT_COMPATIBLE; + #endif + #include +-#if (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 2 && FREERDP_VERSION_REVISION >= 1) ++#if (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 2 && FREERDP_VERSION_REVISION >= 1) || (FREERDP_VERSION_MAJOR == 2) + settings->UseRdpSecurityLayer = FALSE; + #else + settings->DisableEncryption = FALSE; Property changes on: head/net/vinagre/files/patch-plugins_rdp_vinagre-rdp-tab.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