From uspoerlein@gmail.com  Sun May  7 17:20:59 2006
Return-Path: <uspoerlein@gmail.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7AE5B16A402
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  7 May 2006 17:20:59 +0000 (UTC)
	(envelope-from uspoerlein@gmail.com)
Received: from nf-out-0910.google.com (nf-out-0910.google.com [64.233.182.188])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2C8F343D53
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  7 May 2006 17:20:57 +0000 (GMT)
	(envelope-from uspoerlein@gmail.com)
Received: by nf-out-0910.google.com with SMTP id o25so831383nfa
        for <FreeBSD-gnats-submit@freebsd.org>; Sun, 07 May 2006 10:20:57 -0700 (PDT)
Received: by 10.48.243.10 with SMTP id q10mr557136nfh;
        Sun, 07 May 2006 10:14:05 -0700 (PDT)
Received: from roadrunner.q.local ( [84.149.96.221])
        by mx.gmail.com with ESMTP id p20sm1228117nfc.2006.05.07.10.14.05;
        Sun, 07 May 2006 10:14:05 -0700 (PDT)
Received: from roadrunner.q.local (localhost [127.0.0.1])
	by roadrunner.q.local (8.13.6/8.13.6) with ESMTP id k47GvXQq038158;
	Sun, 7 May 2006 18:57:33 +0200 (CEST)
	(envelope-from q@roadrunner.q.local)
Received: (from q@localhost)
	by roadrunner.q.local (8.13.6/8.13.6/Submit) id k47GvW8K038157;
	Sun, 7 May 2006 18:57:32 +0200 (CEST)
	(envelope-from q)
Message-Id: <200605071657.k47GvW8K038157@roadrunner.q.local>
Date: Sun, 7 May 2006 18:57:32 +0200 (CEST)
From: Ulrich Spoerlein <uspoerlein@gmail.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: holger@e-gitt.net
Subject: [PATCH] multimedia/avifile: Unbreak pkg-config
X-Send-Pr-Version: 3.113
X-GNATS-Notify: holger@e-gitt.net

>Number:         96929
>Category:       ports
>Synopsis:       [PATCH] multimedia/avifile: Unbreak pkg-config
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    lawrance
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun May 07 17:30:09 GMT 2006
>Closed-Date:    Fri May 12 12:34:20 GMT 2006
>Last-Modified:  Fri May 12 12:34:20 GMT 2006
>Originator:     Ulrich Spoerlein
>Release:        FreeBSD 6.1-RC i386
>Organization:
>Environment:
System: FreeBSD roadrunner 6.1-RC FreeBSD 6.1-RC #1: Tue Apr 25 15:39:00 CEST 2006
>Description:
multimedia/transcode failed, as it was looking for the avifile headers
in /usr/local/include/avifile-0.7. But the port installs them to .../avifile

In incorrect (?) pkg-config entry is to blame.

Port maintainer (holger@e-gitt.net) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
# portinstall multimedia/avifile
# pkg-config --cflags avifile
-I/usr/local/include/avifile-0.7
>Fix:

--- avifile-0.7.43_1,2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/multimedia/avifile/Makefile,v
retrieving revision 1.61
diff -u -p -u -r1.61 Makefile
--- Makefile	2 May 2006 23:14:18 -0000	1.61
+++ Makefile	7 May 2006 16:55:03 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	avifile
 PORTVERSION=	0.7.43
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -274,6 +275,9 @@ post-patch:
 	@${REINPLACE_CMD} -E \
 		-e 's|^(pkgconfigdir).*|\1=${PREFIX}/libdata/pkgconfig|' \
 		${WRKSRC}/Makefile.in
+# fix pkg-config DB entry, we don't version the include directory
+	@${REINPLACE_CMD} -E -e \
+		'/^includedir/s|-[0-9.]+$||' ${WRKSRC}/avifile.pc
 # do not install man page for v4l
 	@${REINPLACE_CMD} -E \
 		-e 's|kv4lsetup.1||' ${WRKSRC}/doc/Makefile.in
--- avifile-0.7.43_1,2.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sun May 7 17:32:11 UTC 2006 
State-Changed-Why:  
Awaiting maintainers feedback 

http://www.freebsd.org/cgi/query-pr.cgi?pr=96929 

From: holger <holger@e-gitt.net>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/96929: [PATCH] multimedia/avifile: Unbreak pkg-config
Date: Sun, 7 May 2006 20:45:55 +0200

 Approved.
 
 Best regards,
 Holger
 
State-Changed-From-To: feedback->open 
State-Changed-By: lawrance 
State-Changed-When: Fri May 12 08:19:51 UTC 2006 
State-Changed-Why:  
Maintainer approved. 


Responsible-Changed-From-To: freebsd-ports-bugs->lawrance 
Responsible-Changed-By: lawrance 
Responsible-Changed-When: Fri May 12 08:19:51 UTC 2006 
Responsible-Changed-Why:  
Related to ports/96934 

http://www.freebsd.org/cgi/query-pr.cgi?pr=96929 
State-Changed-From-To: open->closed 
State-Changed-By: lawrance 
State-Changed-When: Fri May 12 12:34:18 UTC 2006 
State-Changed-Why:  
Fix committed, thanks! FYI, the one in the PR didn't build or work 
without changes. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=96929 
>Unformatted:
