svn commit: r356740 - head/net/rdesktop

[Martin Wilke]

Author: miwi
Date: Fri Jun  6 03:49:31 2014
New Revision: 356740
URL: http://svnweb.freebsd.org/changeset/ports/356740
QAT: https://qat.redports.org/buildarchive/r356740/

Log:
  - Update to 1.8.2
  
  PR:		190682

Modified:
  head/net/rdesktop/Makefile
  head/net/rdesktop/distinfo
  head/net/rdesktop/pkg-plist

Modified: head/net/rdesktop/Makefile
==============================================================================
--- head/net/rdesktop/Makefile	Fri Jun  6 03:48:57 2014	(r356739)
+++ head/net/rdesktop/Makefile	Fri Jun  6 03:49:31 2014	(r356740)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rdesktop
-PORTVERSION=	1.7.1
-PORTREVISION?=	1
+PORTVERSION=	1.8.2
 CATEGORIES=	net comms ipv6
 MASTER_SITES=	SF
 
@@ -14,18 +13,21 @@ LICENSE=	GPLv3
 
 USE_XORG=	x11
 USES=		gmake iconv
-CONFIGURE_ARGS+=	${ICONV_CONFIGURE_ARG}
+CONFIGURE_ARGS+=	${ICONV_CONFIGURE_ARG} --disable-credssp
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 DOCS=		doc/AUTHORS doc/TODO doc/*.txt
 
-OPTIONS_DEFINE=	DOCS IPV6 RDESKTOP_DEBUG SAMPLERATE AO
-RDESKTOP_DEBUG_DESC=	Enable debugging
+OPTIONS_DEFINE=	AO DEBUG DOCS IPV6 SAMPLERATE SMARTCARD
+SMARTCARD_DESC=	Enable SmartCard login via PCSC-lite 
 
 .include <bsd.port.options.mk>
 
-.if exists(${LOCALBASE}/lib/libao.so) || ${PORT_OPTIONS:MAO}
+.if ${PORT_OPTIONS:MAO}
 LIB_DEPENDS+=	libao.so:${PORTSDIR}/audio/libao
+CONFIGURE_ARGS+=	--with-sound=libao
+.else
+CONFIGURE_ARGS+=	--with-sound=oss
 .endif
 
 .if exists(${LOCALBASE}/lib/libsamplerate.so) || ${PORT_OPTIONS:MSAMPLERATE}
@@ -36,7 +38,13 @@ LIB_DEPENDS+=	libsamplerate.so:${PORTSDI
 CONFIGURE_ARGS+=	--with-ipv6
 .endif
 
-.if ${PORT_OPTIONS:MRDESKTOP_DEBUG}
+.if ${PORT_OPTIONS:MSMARTCARD}
+LIB_DEPENDS+=	libpcsclite.so:${PORTSDIR}/devel/pcsc-lite
+.else
+CONFIGURE_ARGS+=	--disable-smartcard
+.endif
+
+.if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	--with-debug\
 			--with-debug-kbd\
 			--with-debug-rdp5\
@@ -44,6 +52,9 @@ CONFIGURE_ARGS+=	--with-debug\
 			--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

Modified: head/net/rdesktop/distinfo
==============================================================================
--- head/net/rdesktop/distinfo	Fri Jun  6 03:48:57 2014	(r356739)
+++ head/net/rdesktop/distinfo	Fri Jun  6 03:49:31 2014	(r356740)
@@ -1,2 +1,2 @@
-SHA256 (rdesktop-1.7.1.tar.gz) = d1ea43adeb23ef1ba425983670372a87cd7560baf8c94ba34215105ed2ef8479
-SIZE (rdesktop-1.7.1.tar.gz) = 298808
+SHA256 (rdesktop-1.8.2.tar.gz) = fbbf23d49d34c215c5a59b2d91c008b61ead4c9fbe1ccb7223973aed24061a78
+SIZE (rdesktop-1.8.2.tar.gz) = 318270

Modified: head/net/rdesktop/pkg-plist
==============================================================================
--- head/net/rdesktop/pkg-plist	Fri Jun  6 03:48:57 2014	(r356739)
+++ head/net/rdesktop/pkg-plist	Fri Jun  6 03:49:31 2014	(r356740)
@@ -45,6 +45,7 @@ man/man1/rdesktop.1.gz
 %%DATADIR%%/keymaps/pt
 %%DATADIR%%/keymaps/pt-br
 %%DATADIR%%/keymaps/ru
+%%DATADIR%%/keymaps/sk
 %%DATADIR%%/keymaps/sl
 %%DATADIR%%/keymaps/sv
 %%DATADIR%%/keymaps/th