Date: Sat, 31 Aug 2013 21:02:54 GMT From: Alexander Kojevnikov <alexander@kojevnikov.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/181713: [patch] audio/cmus Fix compilation Message-ID: <201308312102.r7VL2s0d011796@oldred.freebsd.org> Resent-Message-ID: <201308312110.r7VLA0sv024583@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308312102.r7VL2s0d011796>