ports/182305: [PATCH] net/rdesktop: Apply iconv fixxes and convert to new options frameowork

[Guido Falsi]

>Number:         182305
>Category:       ports
>Synopsis:       [PATCH] net/rdesktop: Apply iconv fixxes and convert to new options frameowork
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Sep 22 21:10:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Guido Falsi
>Release:        FreeBSD 9.1-STABLE amd64
>Organization:
none
>Environment:
System: FreeBSD micro.madpilot.net 9.1-STABLE FreeBSD 9.1-STABLE #21 r252026: Thu Jun 20 16:27:06 CEST 2013 root at micro.madpilot.net:/usr/obj/usr/src/sys/MICRO amd64

>Description:

Hi,

Fellow committer marino sent me oatches to allow the rdesktop port
to compile correctly also on DragonFly BSD, these are the changes
related to iconv support.

I integrated those and converted the port to the new options
framework, leaving the port's logic the same. I only added
OPTIONS_DEFINE.

While here I also converted to the new LIB_DEPENDS format too.

Can you approve these changes?

Thank you.

>How-To-Repeat:
>Fix:

Index: Makefile
===================================================================
--- Makefile	(revision 327897)
+++ Makefile	(working copy)
@@ -11,34 +11,35 @@
 COMMENT=	RDP client for Windows NT/2000/2003 Terminal Server
 
 LICENSE=	GPLv3
+
 USE_XORG=	x11
-USE_GMAKE=	yes
+USES=		gmake iconv
+CONFIGURE_ARGS+=	${ICONV_CONFIGURE_ARG}
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 DOCS=		doc/AUTHORS doc/TODO doc/*.txt
 MAN1=		rdesktop.1
 
+OPTIONS_DEFINE=	DOCS IPV6 RDESKTOP_DEBUG SAMPLERATE AO
+RDESKTOP_DEBUG_DESC=	Enable debugging
+
 NO_STAGE=	yes
-.include <bsd.port.pre.mk>
 
-.if exists(${LOCALBASE}/lib/libao.so) || defined(WITH_LIBAO)
-LIB_DEPENDS+=	ao.4:${PORTSDIR}/audio/libao
+.include <bsd.port.options.mk>
+
+.if exists(${LOCALBASE}/lib/libao.so) || ${PORT_OPTIONS:MAO}
+LIB_DEPENDS+=	libao.so:${PORTSDIR}/audio/libao
 .endif
 
-.if exists(${LOCALBASE}/lib/libsamplerate.so) || defined(WITH_LIBSAMPLERATE)
-LIB_DEPENDS+=	samplerate.1:${PORTSDIR}/audio/libsamplerate
+.if exists(${LOCALBASE}/lib/libsamplerate.so) || ${PORT_OPTIONS:MSAMPLERATE}
+LIB_DEPENDS+=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
 .endif
 
-.if !defined(WITHOUT_RDESKTOP_IPV6) && !defined(WITHOUT_IPV6)
+.if ${PORT_OPTIONS:MIPV6}
 CONFIGURE_ARGS+=	--with-ipv6
 .endif
 
-.if defined(WITH_ICONV)
-USES+=		iconv
-CONFIGURE_ARGS+=	${ICONV_CONFIGURE_ARG}
-.endif
-
-.if defined(WITH_RDESKTOP_DEBUG)
+.if ${PORT_OPTIONS:MRDESKTOP_DEBUG}
 CONFIGURE_ARGS+=	--with-debug\
 			--with-debug-kbd\
 			--with-debug-rdp5\
@@ -56,9 +57,9 @@
 	${INSTALL_MAN} ${WRKSRC}/doc/rdesktop.1 ${MAN1PREFIX}/man/man1
 	@${MKDIR} ${DATADIR}/keymaps
 	${INSTALL_DATA} ${WRKSRC}/keymaps/* ${DATADIR}/keymaps
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
>Release-Note:
>Audit-Trail:
>Unformatted: