From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Aug 9 01:50:03 2009 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 0DD211065694 for ; Sun, 9 Aug 2009 01:50:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id D78E08FC1A for ; Sun, 9 Aug 2009 01:50:02 +0000 (UTC) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n791o2DR075094 for ; Sun, 9 Aug 2009 01:50:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n791o2HH075093; Sun, 9 Aug 2009 01:50:02 GMT (envelope-from gnats) Resent-Date: Sun, 9 Aug 2009 01:50:02 GMT Resent-Message-Id: <200908090150.n791o2HH075093@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, Naram Qashat Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1D2721065678 for ; Sun, 9 Aug 2009 01:48:31 +0000 (UTC) (envelope-from cyberbotx@kirby.cyberbotx.com) Received: from QMTA10.emeryville.ca.mail.comcast.net (qmta10.emeryville.ca.mail.comcast.net [76.96.30.17]) by mx1.freebsd.org (Postfix) with ESMTP id 0461C8FC27 for ; Sun, 9 Aug 2009 01:48:29 +0000 (UTC) Received: from OMTA24.emeryville.ca.mail.comcast.net ([76.96.30.92]) by QMTA10.emeryville.ca.mail.comcast.net with comcast id S1ls1c0021zF43QAA1oWYf; Sun, 09 Aug 2009 01:48:30 +0000 Received: from kirby.cyberbotx.com ([68.41.9.25]) by OMTA24.emeryville.ca.mail.comcast.net with comcast id S1qy1c0010YQbD88k1qyep; Sun, 09 Aug 2009 01:51:00 +0000 Received: from kirby.cyberbotx.com (localhost [127.0.0.1]) by kirby.cyberbotx.com (Postfix) with ESMTP id 82E4111447; Sat, 8 Aug 2009 21:48:25 -0400 (EDT) Received: (from root@localhost) by kirby.cyberbotx.com (8.14.2/8.14.2/Submit) id n791mPNO040059; Sat, 8 Aug 2009 21:48:25 -0400 (EDT) (envelope-from cyberbotx) Message-Id: <200908090148.n791mPNO040059@kirby.cyberbotx.com> Date: Sat, 8 Aug 2009 21:48:25 -0400 (EDT) From: Naram Qashat To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: kde@FreeBSD.org Subject: ports/137587: [PATCH] audio/arts: Add more OPTIONS and proper CONFIGURE_ARGS for existing 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: Sun, 09 Aug 2009 01:50:04 -0000 >Number: 137587 >Category: ports >Synopsis: [PATCH] audio/arts: Add more OPTIONS and proper CONFIGURE_ARGS for existing 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: Sun Aug 09 01:50:01 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Naram Qashat >Release: FreeBSD 7.2-STABLE i386 >Organization: >Environment: System: FreeBSD kirby.cyberbotx.com 7.2-STABLE FreeBSD 7.2-STABLE #0: Wed Jun 3 04:24:13 EDT >Description: This adds OPTIONS for audiofile, libmad, and jack. This also updates the checks for jack, esd, and nas to use configure arguments to enable or disable them, removing the need for the REINPLACE_CMDs within pre-configure. Port maintainer (kde@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- arts-1.5.10_2,1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/audio/arts/Makefile /kirby/shared/ports/audio/arts/Makefile --- /usr/ports/audio/arts/Makefile 2009-08-03 12:23:47.000000000 -0400 +++ /kirby/shared/ports/audio/arts/Makefile 2009-08-08 21:43:04.000000000 -0400 @@ -18,9 +18,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Audio system for the KDE integrated X11 desktop -LIB_DEPENDS+= audiofile:${PORTSDIR}/audio/libaudiofile \ - mad:${PORTSDIR}/audio/libmad \ - ogg:${PORTSDIR}/audio/libogg \ +LIB_DEPENDS+= ogg:${PORTSDIR}/audio/libogg \ glib-2.0:${PORTSDIR}/devel/glib20 \ vorbis:${PORTSDIR}/audio/libvorbis @@ -37,42 +35,56 @@ CFLAGS+= -DHAVE_VASPRINTF CONFIGURE_ENV+= DO_NOT_COMPILE="${DO_NOT_COMPILE}" +CONFIGURE_ARGS+= --without-libaudioio --without-sgilibaudio \ + --without-mas --without-alsa -OPTIONS= ESD "Enable esound support" off \ +OPTIONS= AUDIOFILE "Enable audiofile support" on \ + MAD "Enable MAD mp3 decoder support" on \ + JACK "Enable Jack support" on \ + ESD "Enable esound support" off \ NAS "Enable NAS support" off .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include -.if ${ARCH} == "i386" || ${ARCH} == "amd64" +.if !defined(WITHOUT_AUDIOFILE) +LIB_DEPENDS+= audiofile:${PORTSDIR}/audio/libaudiofile +CONFIGURE_ARGS+= --with-audiofile +.else +CONFIGURE_ARGS+= --without-audiofile +.endif + +.if !defined(WITHOUT_MAD) +LIB_DEPENDS+= mad:${PORTSDIR}/audio/libmad +CONFIGURE_ARGS+= --enable-libmad +.else +CONFIGURE_ARGS+= --disable-libmad +.endif + +.if (${ARCH} == "i386" || ${ARCH} == "amd64") && !defined(WITHOUT_JACK) LIB_DEPENDS+= jack:${PORTSDIR}/audio/jack +CONFIGURE_ARGS+= --with-jack +.else +CONFIGURE_ARGS+= --without-jack .endif .if defined(WITH_ESD) USE_GNOME+= esound +CONFIGURE_ARGS+= --with-esd +.else +CONFIGURE_ARGS+= --without-esd .endif .if defined(WITH_NAS) LIB_DEPENDS+= audio:${PORTSDIR}/audio/nas +CONFIGURE_ARGS+= --with-nas +.else +CONFIGURE_ARGS+= --without-nas .endif pre-configure: @${REINPLACE_CMD} -e 's|-O2||g' -e 's|-lpthread|${PTHREAD_LIBS}|g' \ ${WRKSRC}/${CONFIGURE_SCRIPT} -.if defined(WITHOUT_ESD) - ${REINPLACE_CMD} -e 's|arts_libesd_include=yes|arts_libesd_include=no|g' \ - ${WRKSRC}/configure -.endif - -.if defined(WITH_NAS) - ${REINPLACE_CMD} \ - -e 's|LIBS="-laudio $$LIBS"|LIBS="-laudio -lm -lXt -lXau $$LIBS"|g' \ - ${WRKSRC}/configure -.elif defined(WITHOUT_NAS) - ${REINPLACE_CMD} \ - -e 's|ac_cv_lib_audio_AuOpenServer=yes|ac_cv_lib_audio_AuOpenServer=no|g' \ - ${WRKSRC}/configure -.endif post-configure: ${TOUCH} ${WRKSRC}/mcop/arts_export.h.in --- arts-1.5.10_2,1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: