Index: head/net/rdesktop/Makefile
===================================================================
--- head/net/rdesktop/Makefile	(revision 493553)
+++ head/net/rdesktop/Makefile	(revision 493554)
@@ -1,70 +1,72 @@
 # Created by: mwest@uct.ac.za
 # $FreeBSD$
 
 PORTNAME=	rdesktop
-PORTVERSION=	1.8.3
+PORTVERSION=	1.8.4
+DISTVERSIONPREFIX=v
 CATEGORIES=	net comms ipv6
-MASTER_SITES=	SF
 
 MAINTAINER=	gregf@hugops.pw
 COMMENT=	RDP client for Windows NT/2000/2003 Terminal Server
 
 LICENSE=	GPLv3
 
+USES=		autoreconf gmake iconv pkgconfig ssl
 USE_XORG=	x11
-USES=		gmake iconv pkgconfig ssl
+USE_GITHUB=	yes
+
 CONFIGURE_ARGS+=	${ICONV_CONFIGURE_ARG} --disable-credssp
 GNU_CONFIGURE=	yes
 DOCS=		doc/AUTHORS doc/TODO doc/*.txt
 
 OPTIONS_DEFINE=	AO DEBUG DOCS IPV6 SAMPLERATE SMARTCARD
 SMARTCARD_DESC=	Enable SmartCard login via PCSC-lite
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MAO}
 LIB_DEPENDS+=	libao.so:audio/libao
 CONFIGURE_ARGS+=	--with-sound=libao
 .else
 CONFIGURE_ARGS+=	--with-sound=oss
 .endif
 
 .if exists(${LOCALBASE}/lib/libsamplerate.so) || ${PORT_OPTIONS:MSAMPLERATE}
 LIB_DEPENDS+=	libsamplerate.so:audio/libsamplerate
 .endif
 
 .if ${PORT_OPTIONS:MIPV6}
 CONFIGURE_ARGS+=	--with-ipv6
 .endif
 
 .if ${PORT_OPTIONS:MSMARTCARD}
 LIB_DEPENDS+=	libpcsclite.so:devel/pcsc-lite
 .else
 CONFIGURE_ARGS+=	--disable-smartcard
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	--with-debug\
 			--with-debug-kbd\
 			--with-debug-rdp5\
 			--with-debug-clipboard\
 			--with-debug-sound\
 			--with-debug-channel\
 			--with-debug-seamless
 .if ${PORT_OPTIONS:MSMARTCARD}
 CONFIGURE_ARGS+=	--with-debug-smartcard
 .endif
 
 post-configure:
 	${ECHO} "#define WITH_DEBUG_SERIAL 1" >> ${WRKSRC}/rdesktop.h
 .endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/rdesktop ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/doc/rdesktop.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	@${MKDIR} ${STAGEDIR}${DATADIR}/keymaps
 	${INSTALL_DATA} ${WRKSRC}/keymaps/* ${STAGEDIR}${DATADIR}/keymaps
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/net/rdesktop/distinfo
===================================================================
--- head/net/rdesktop/distinfo	(revision 493553)
+++ head/net/rdesktop/distinfo	(revision 493554)
@@ -1,2 +1,3 @@
-SHA256 (rdesktop-1.8.3.tar.gz) = 88b20156b34eff5f1b453f7c724e0a3ff9370a599e69c01dc2bf0b5e650eece4
-SIZE (rdesktop-1.8.3.tar.gz) = 320212
+TIMESTAMP = 1550673649
+SHA256 (rdesktop-rdesktop-v1.8.4_GH0.tar.gz) = 516f04df92f16eba04c96bbf9aeb05b9da686689c2bb5c107e0941583e09f933
+SIZE (rdesktop-rdesktop-v1.8.4_GH0.tar.gz) = 392460
Index: head/net/rdesktop/files/patch-configure
===================================================================
--- head/net/rdesktop/files/patch-configure	(revision 493553)
+++ head/net/rdesktop/files/patch-configure	(nonexistent)
@@ -1,5 +0,0 @@
---- configure.orig	Wed Mar  2 09:35:03 2005
-+++ configure	Mon Mar  7 16:54:07 2005
-@@ -1983 +1983 @@
--    CFLAGS="-g -O2"
-+    #CFLAGS="-g -O2"

Property changes on: head/net/rdesktop/files/patch-configure
___________________________________________________________________
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/rdesktop/pkg-plist
===================================================================
--- head/net/rdesktop/pkg-plist	(revision 493553)
+++ head/net/rdesktop/pkg-plist	(revision 493554)
@@ -1,51 +1,59 @@
 bin/rdesktop
 man/man1/rdesktop.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/ctrl.txt
 %%PORTDOCS%%%%DOCSDIR%%/ipv6.txt
 %%PORTDOCS%%%%DOCSDIR%%/keymap-names.txt
 %%PORTDOCS%%%%DOCSDIR%%/keymapping.txt
 %%PORTDOCS%%%%DOCSDIR%%/licensing.txt
+%%PORTDOCS%%%%DOCSDIR%%/lspci-channel.txt
+%%PORTDOCS%%%%DOCSDIR%%/makerelease.txt
 %%PORTDOCS%%%%DOCSDIR%%/patches.txt
+%%PORTDOCS%%%%DOCSDIR%%/rdpsnd-rec.txt
+%%PORTDOCS%%%%DOCSDIR%%/rdpsnd.txt
 %%PORTDOCS%%%%DOCSDIR%%/redirection.txt
+%%PORTDOCS%%%%DOCSDIR%%/seamlessrdp-channel.txt
 %%DATADIR%%/keymaps/ar
 %%DATADIR%%/keymaps/common
 %%DATADIR%%/keymaps/convert-map
 %%DATADIR%%/keymaps/cs
 %%DATADIR%%/keymaps/da
 %%DATADIR%%/keymaps/de
 %%DATADIR%%/keymaps/de-ch
 %%DATADIR%%/keymaps/en-dv
 %%DATADIR%%/keymaps/en-gb
 %%DATADIR%%/keymaps/en-us
+%%DATADIR%%/keymaps/en-us-intl
 %%DATADIR%%/keymaps/es
 %%DATADIR%%/keymaps/et
 %%DATADIR%%/keymaps/fi
 %%DATADIR%%/keymaps/fo
 %%DATADIR%%/keymaps/fr
 %%DATADIR%%/keymaps/fr-be
+%%DATADIR%%/keymaps/fr-bepo
 %%DATADIR%%/keymaps/fr-ca
 %%DATADIR%%/keymaps/fr-ch
 %%DATADIR%%/keymaps/hr
 %%DATADIR%%/keymaps/he
 %%DATADIR%%/keymaps/hu
 %%DATADIR%%/keymaps/is
 %%DATADIR%%/keymaps/it
 %%DATADIR%%/keymaps/ja
 %%DATADIR%%/keymaps/ko
 %%DATADIR%%/keymaps/lt
 %%DATADIR%%/keymaps/lv
 %%DATADIR%%/keymaps/mk
 %%DATADIR%%/keymaps/modifiers
 %%DATADIR%%/keymaps/nl
 %%DATADIR%%/keymaps/nl-be
 %%DATADIR%%/keymaps/no
 %%DATADIR%%/keymaps/pl
 %%DATADIR%%/keymaps/pt
 %%DATADIR%%/keymaps/pt-br
 %%DATADIR%%/keymaps/ru
 %%DATADIR%%/keymaps/sk
 %%DATADIR%%/keymaps/sl
 %%DATADIR%%/keymaps/sv
 %%DATADIR%%/keymaps/th
 %%DATADIR%%/keymaps/tr