From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Sep 22 21:10:00 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id A5C4AE62 for ; Sun, 22 Sep 2013 21:10:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 840A726A9 for ; Sun, 22 Sep 2013 21:10:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r8MLA09P070492 for ; Sun, 22 Sep 2013 21:10:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r8MLA0JZ070491; Sun, 22 Sep 2013 21:10:00 GMT (envelope-from gnats) Resent-Date: Sun, 22 Sep 2013 21:10:00 GMT Resent-Message-Id: <201309222110.r8MLA0JZ070491@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Guido Falsi Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 6F80AE49; Sun, 22 Sep 2013 21:07:13 +0000 (UTC) (envelope-from mad@micro.madpilot.net) Received: from micro.madpilot.net (micro.madpilot.net [88.149.173.206]) by mx1.freebsd.org (Postfix) with ESMTP id 041FA269E; Sun, 22 Sep 2013 21:07:12 +0000 (UTC) Received: from micro.madpilot.net (localhost [127.0.0.1]) by micro.madpilot.net (Postfix) with ESMTP id 3cjgzc6WXKz313; Sun, 22 Sep 2013 23:00:28 +0200 (CEST) Received: from micro.madpilot.net ([127.0.0.1]) by micro.madpilot.net (micro.madpilot.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id O_kCo4tSi3rL; Sun, 22 Sep 2013 23:00:25 +0200 (CEST) Received: by micro.madpilot.net (Postfix, from userid 1000) id 3cjgzY57wHz312; Sun, 22 Sep 2013 23:00:25 +0200 (CEST) Message-Id: <3cjgzY57wHz312@micro.madpilot.net> Date: Sun, 22 Sep 2013 23:00:25 +0200 (CEST) From: Guido Falsi To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.114 Subject: ports/182305: [PATCH] net/rdesktop: Apply iconv fixxes and convert to new options frameowork Cc: obrien@FreeBSD.org X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Guido Falsi List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Sep 2013 21:10:00 -0000 >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@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 -.if exists(${LOCALBASE}/lib/libao.so) || defined(WITH_LIBAO) -LIB_DEPENDS+= ao.4:${PORTSDIR}/audio/libao +.include + +.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 +.include >Release-Note: >Audit-Trail: >Unformatted: