From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Aug 31 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 BDE77E89 for ; Sat, 31 Aug 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 9BE7024BE for ; Sat, 31 Aug 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 r7VLA0gp024584 for ; Sat, 31 Aug 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 r7VLA0sv024583; Sat, 31 Aug 2013 21:10:00 GMT (envelope-from gnats) Resent-Date: Sat, 31 Aug 2013 21:10:00 GMT Resent-Message-Id: <201308312110.r7VLA0sv024583@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, Alexander Kojevnikov 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 EA547C33 for ; Sat, 31 Aug 2013 21:02:54 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D607C244A for ; Sat, 31 Aug 2013 21:02:54 +0000 (UTC) Received: from oldred.freebsd.org ([127.0.1.6]) by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r7VL2sFB011803 for ; Sat, 31 Aug 2013 21:02:54 GMT (envelope-from nobody@oldred.freebsd.org) Received: (from nobody@localhost) by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r7VL2s0d011796; Sat, 31 Aug 2013 21:02:54 GMT (envelope-from nobody) Message-Id: <201308312102.r7VL2s0d011796@oldred.freebsd.org> Date: Sat, 31 Aug 2013 21:02:54 GMT From: Alexander Kojevnikov To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/181713: [patch] audio/cmus Fix compilation X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Aug 2013 21:10:00 -0000 >Number: 181713 >Category: ports >Synopsis: [patch] audio/cmus Fix compilation >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Aug 31 21:10:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Alexander Kojevnikov >Release: 9.1-RELEASE >Organization: >Environment: FreeBSD alex-desktop 9.1-RELEASE-p4 FreeBSD 9.1-RELEASE-p4 #0: Mon Jun 17 11:42:37 UTC 2013 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64 >Description: When both multimedia/ffmpeg and multimedia/ffmpeg1 are installed, audio/cmus fails to build. This patch fixes the problem. >How-To-Repeat: >Fix: Patch attached with submission follows: diff --git a/Makefile b/Makefile index 389d875..a5d7939 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ PORTNAME= cmus PORTVERSION= 2.5.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio MASTER_SITES= SF/${PORTNAME} DISTNAME= ${PORTNAME}-v${PORTVERSION} diff --git a/files/patch-scripts-checks.sh b/files/patch-scripts-checks.sh new file mode 100644 index 0000000..7bb56a1 --- /dev/null +++ b/files/patch-scripts-checks.sh @@ -0,0 +1,13 @@ +--- scripts/checks.sh.orig ++++ scripts/checks.sh +@@ -125,8 +125,8 @@ cc_cxx_common() + + case `uname -s` in + *BSD) +- common_cf="$common_cf -I/usr/local/include" +- common_lf="$common_lf -L/usr/local/lib" ++ common_cf="$common_cf -I/usr/local/include/ffmpeg1 -I/usr/local/include" ++ common_lf="$common_lf -L/usr/local/lib/ffmpeg1 -L/usr/local/lib" + ;; + Darwin) + # fink >Release-Note: >Audit-Trail: >Unformatted: