ports/164489: [patch] Fix rtmp double cflags in pkgconfig module

[Mel Flynn]

>Number:         164489
>Category:       ports
>Synopsis:       [patch] Fix rtmp double cflags in pkgconfig module
>Confidential:   no
>Severity:       critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jan 25 19:10:01 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Mel Flynn
>Release:        FreeBSD 8.2-STABLE amd64
>Organization:
>Environment:
System: FreeBSD datakitty.lan.rachie.is-a-geek.net 8.2-STABLE FreeBSD 8.2-STABLE #5: Fri Nov 11 11:35:54 AKST 2011 mel at datakitty.lan.rachie.is-a-geek.net:/data/obj/data/RELENG_8/src/sys/GENERIC amd64


	
>Description:
The patch on the pkgconfig module is no longer current, as upstream added an
extra line to it. The net result is that two Cflags lines are put into the
module and pkg-config returning non-zero on any request for the module.
As a result, ffmpeg won't build:
config.log:

check_pkg_config librtmp librtmp/rtmp.h RTMP_Socket
ERROR: librtmp not found

Reduced to the offending case:
$ pkg-config --exists librtmp||echo no
no

>How-To-Repeat:
portmaster multimedia/ffmpeg -DWITH_RTMP
>Fix:

	

--- rtmp-pkgconfig.patch begins here ---
Index: patch-librtmp-librtmp.pc.in
===================================================================
RCS file: /home/ncvs/ports/multimedia/rtmpdump/files/patch-librtmp-librtmp.pc.in,v
retrieving revision 1.1
diff -u -r1.1 patch-librtmp-librtmp.pc.in
--- patch-librtmp-librtmp.pc.in	19 Jan 2011 01:58:24 -0000	1.1
+++ patch-librtmp-librtmp.pc.in	25 Jan 2012 18:57:06 -0000
@@ -1,10 +1,11 @@
---- librtmp/librtmp.pc.in.orig	2010-07-01 04:58:34.000000000 +0900
-+++ librtmp/librtmp.pc.in	2011-01-05 23:29:34.000000000 +0900
-@@ -8,5 +8,5 @@
+--- librtmp/librtmp.pc.in.orig	2011-07-11 16:24:33.000000000 -0800
++++ librtmp/librtmp.pc.in	2012-01-25 09:50:06.000000000 -0900
+@@ -8,6 +8,6 @@
  Version: @VERSION@
  Requires: @CRYPTO_REQ@
  URL: http://rtmpdump.mplayerhq.hu
 -Libs: -L${libdir} -lrtmp -lz
--Cflags: -I${incdir}
 +Libs: -L${libdir} -L at OPENSSLLIB@ -lrtmp -lz -lssl -lcrypto
+ Libs.private: @PRIVATE_LIBS@
+-Cflags: -I${incdir}
 +Cflags: -I${incdir} -I at OPENSSLINC@
--- rtmp-pkgconfig.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: