[Midnightbsd-cvs] mports [17283] trunk/net/rdesktop: rdesktop 1.8.2

[laffer1 at midnightbsd.org]

Revision: 17283
          http://svnweb.midnightbsd.org/mports/?rev=17283
Author:   laffer1
Date:     2014-09-15 00:25:09 -0400 (Mon, 15 Sep 2014)
Log Message:
-----------
rdesktop 1.8.2

Modified Paths:
--------------
    trunk/net/rdesktop/Makefile
    trunk/net/rdesktop/distinfo
    trunk/net/rdesktop/pkg-plist

Modified: trunk/net/rdesktop/Makefile
===================================================================
--- trunk/net/rdesktop/Makefile	2014-09-15 04:23:13 UTC (rev 17282)
+++ trunk/net/rdesktop/Makefile	2014-09-15 04:25:09 UTC (rev 17283)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	rdesktop
-PORTVERSION=	1.8.1
+PORTVERSION=	1.8.2
 PORTREVISION?=	0
 CATEGORIES=	net comms ipv6
 MASTER_SITES=	SF
@@ -12,24 +12,39 @@
 LICENSE=	gpl3
 
 USE_XORG=	x11
-USE_GMAKE=	yes
+USES=		gmake iconv
+CONFIGURE_ARGS+=	${ICONV_CONFIGURE_ARG} --disable-credssp
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 DOCS=		doc/AUTHORS doc/TODO doc/*.txt
-MAN1=		rdesktop.1
 
-#CONFIGURE_ARGS+=	--disable-credssp --disable-smartcard
+OPTIONS_DEFINE=	AO DEBUG DOCS IPV6 SAMPLERATE SMARTCARD
+SMARTCARD_DESC=	Enable SmartCard login via PCSC-lite 
 
-.if !defined(WITHOUT_RDESKTOP_IPV6) && !defined(WITHOUT_IPV6)
+.include <bsd.mport.options.mk>
+
+.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}
+LIB_DEPENDS+=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
+.endif
+
+.if ${PORT_OPTIONS:MIPV6}
 CONFIGURE_ARGS+=	--with-ipv6
 .endif
 
-.if defined(WITH_ICONV)
-USE_ICONV=	yes
-CONFIGURE_ARGS+=	--with-libiconv-prefix=${LOCALBASE}
+.if ${PORT_OPTIONS:MSMARTCARD}
+LIB_DEPENDS+=	libpcsclite.so:${PORTSDIR}/devel/pcsc-lite
+.else
+CONFIGURE_ARGS+=	--disable-smartcard
 .endif
 
-.if defined(WITH_RDESKTOP_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	--with-debug\
 			--with-debug-kbd\
 			--with-debug-rdp5\
@@ -37,6 +52,9 @@
 			--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
@@ -43,13 +61,11 @@
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/rdesktop ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/rdesktop.1 ${MAN1PREFIX}/man/man1
-	@${MKDIR} ${DATADIR}/keymaps
-	${INSTALL_DATA} ${WRKSRC}/keymaps/* ${DATADIR}/keymaps
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
-.endif
+	${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>

Modified: trunk/net/rdesktop/distinfo
===================================================================
--- trunk/net/rdesktop/distinfo	2014-09-15 04:23:13 UTC (rev 17282)
+++ trunk/net/rdesktop/distinfo	2014-09-15 04:25:09 UTC (rev 17283)
@@ -1,2 +1,2 @@
-SHA256 (rdesktop-1.8.1.tar.gz) = 76cc834b89c34d8332f3cb3889483b2ae4d4e8118eeb45a8967c77dd18228246
-SIZE (rdesktop-1.8.1.tar.gz) = 314198
+SHA256 (rdesktop-1.8.2.tar.gz) = fbbf23d49d34c215c5a59b2d91c008b61ead4c9fbe1ccb7223973aed24061a78
+SIZE (rdesktop-1.8.2.tar.gz) = 318270

Modified: trunk/net/rdesktop/pkg-plist
===================================================================
--- trunk/net/rdesktop/pkg-plist	2014-09-15 04:23:13 UTC (rev 17282)
+++ trunk/net/rdesktop/pkg-plist	2014-09-15 04:25:09 UTC (rev 17283)
@@ -1,5 +1,5 @@
- at comment $FreeBSD: ports/net/rdesktop/pkg-plist,v 1.8 2006/09/19 19:56:24 obrien Exp $
 bin/rdesktop
+man/man1/rdesktop.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/ipv6.txt
@@ -45,6 +45,7 @@
 %%DATADIR%%/keymaps/pt
 %%DATADIR%%/keymaps/pt-br
 %%DATADIR%%/keymaps/ru
+%%DATADIR%%/keymaps/sk
 %%DATADIR%%/keymaps/sl
 %%DATADIR%%/keymaps/sv
 %%DATADIR%%/keymaps/th