From owner-freebsd-ports-bugs@FreeBSD.ORG Wed May 19 03:40:02 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D92EE106564A for ; Wed, 19 May 2010 03:40:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (unknown [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id ADC418FC0C for ; Wed, 19 May 2010 03:40:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o4J3e2ue029476 for ; Wed, 19 May 2010 03:40:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o4J3e21d029475; Wed, 19 May 2010 03:40:02 GMT (envelope-from gnats) Resent-Date: Wed, 19 May 2010 03:40:02 GMT Resent-Message-Id: <201005190340.o4J3e21d029475@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, Yuri Pankov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 01F6B106564A for ; Wed, 19 May 2010 03:33:26 +0000 (UTC) (envelope-from yuri.pankov@gmail.com) Received: from fg-out-1718.google.com (fg-out-1718.google.com [72.14.220.154]) by mx1.freebsd.org (Postfix) with ESMTP id 570C08FC0A for ; Wed, 19 May 2010 03:33:24 +0000 (UTC) Received: by fg-out-1718.google.com with SMTP id 22so1827564fge.13 for ; Tue, 18 May 2010 20:33:24 -0700 (PDT) Received: by 10.87.61.22 with SMTP id o22mr12084277fgk.50.1274240004178; Tue, 18 May 2010 20:33:24 -0700 (PDT) Received: from darklight.org.ru ([213.132.76.142]) by mx.google.com with ESMTPS id 22sm10285689fkq.47.2010.05.18.20.33.23 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 18 May 2010 20:33:23 -0700 (PDT) Received: from darklight.org.ru (yuri@darklight.org.ru [127.0.0.1]) by darklight.org.ru (8.14.4/8.14.4) with ESMTP id o4J3XLk9015641; Wed, 19 May 2010 07:33:21 +0400 (MSD) (envelope-from yuri.pankov@gmail.com) Received: (from yuri@localhost) by darklight.org.ru (8.14.4/8.14.4/Submit) id o4J3XKOu015640; Wed, 19 May 2010 07:33:20 +0400 (MSD) (envelope-from yuri.pankov@gmail.com) Message-Id: <201005190333.o4J3XKOu015640@darklight.org.ru> Date: Wed, 19 May 2010 07:33:20 +0400 (MSD) From: Yuri Pankov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: obrien@FreeBSD.org Subject: ports/146720: [PATCH] net/rdesktop: add LIBAO and LIBSAMPLERATE options X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 May 2010 03:40:03 -0000 >Number: 146720 >Category: ports >Synopsis: [PATCH] net/rdesktop: add LIBAO and LIBSAMPLERATE options >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: Wed May 19 03:40:02 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Yuri Pankov >Release: FreeBSD 9.0-CURRENT amd64 >Organization: >Environment: System: FreeBSD darklight.org.ru 9.0-CURRENT FreeBSD 9.0-CURRENT #1: Tue May 18 07:17:39 MSD 2010 >Description: Make audio/libao and audio/libsamplerate dependencies optional, otherwise they are not registered as such (and can't be disabled with configure flags). Port maintainer (obrien@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- rdesktop-1.6.0_1.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/net/rdesktop/Makefile,v retrieving revision 1.47 diff -u -r1.47 Makefile --- Makefile 22 Aug 2009 00:31:42 -0000 1.47 +++ Makefile 19 May 2010 03:16:18 -0000 @@ -7,7 +7,7 @@ PORTNAME= rdesktop PORTVERSION= 1.6.0 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= net comms ipv6 MASTER_SITES= SF @@ -30,6 +30,14 @@ CONFIGURE_ARGS+= --with-libiconv-prefix=${LOCALBASE} .endif +.if defined(WITH_LIBAO) +LIB_DEPENDS+= ao.3:${PORTSDIR}/audio/libao +.endif + +.if defined(WITH_LIBSAMPLERATE) +LIB_DEPENDS+= samplerate.1:${PORTSDIR}/audio/libsamplerate +.endif + .if defined(WITH_RDESKTOP_DEBUG) CONFIGURE_ARGS+= --with-debug\ --with-debug-kbd\ @@ -38,10 +46,20 @@ --with-debug-sound\ --with-debug-channel\ --with-debug-seamless +.endif post-configure: +.if defined(WITH_RDESKTOP_DEBUG) ${ECHO} "#define WITH_DEBUG_SERIAL 1" >> ${WRKSRC}/rdesktop.h .endif +.if !defined(WITH_LIBAO) + @${REINPLACE_CMD} -e 's|-DRDPSND_LIBAO=1||;s|rdpsnd_libao.o||;s|-lao||' \ + ${WRKSRC}/Makefile +.endif +.if !defined(WITH_LIBSAMPLERATE) + @${REINPLACE_CMD} -e 's|-DHAVE_LIBSAMPLERATE=1||;s|-lsamplerate||' \ + ${WRKSRC}/Makefile +.endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/rdesktop ${PREFIX}/bin --- rdesktop-1.6.0_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: