From lioux@uol.com.br  Fri Mar 17 19:56:37 2006
Return-Path: <lioux@uol.com.br>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 245F116A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 17 Mar 2006 19:56:37 +0000 (UTC)
	(envelope-from lioux@uol.com.br)
Received: from vette.gigo.com (vette.gigo.com [216.218.228.114])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E35A343D53
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 17 Mar 2006 19:56:36 +0000 (GMT)
	(envelope-from lioux@uol.com.br)
Received: from 201.24.46.149 (unknown [201.24.46.149])
	by vette.gigo.com (Postfix) with ESMTP id C5A5E56A0
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 17 Mar 2006 11:56:34 -0800 (PST)
Received: (qmail 97949 invoked by uid 1001); 17 Mar 2006 16:55:33 -0300
Message-Id: <20060317195556.97901.qmail@exxodus.fedaykin.here>
Date: 17 Mar 2006 16:55:33 -0300
From: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
Reply-To: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: avleeuwen@piwebs.com
Subject: graphics/ImageMagick: fix pkg-config file when WITH_IMAGEMAGICK_THREADS
X-Send-Pr-Version: 3.113
X-GNATS-Notify: avleeuwen@piwebs.com

>Number:         94614
>Category:       ports
>Synopsis:       graphics/ImageMagick: fix pkg-config file when WITH_IMAGEMAGICK_THREADS
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 17 20:00:33 GMT 2006
>Closed-Date:    Sat Apr 15 02:38:21 GMT 2006
>Last-Modified:  Sat Apr 15 02:38:21 GMT 2006
>Originator:     Mario Sergio Fujikawa Ferreira
>Release:        FreeBSD 6.1-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD exxodus.fedaykin.here 6.1-PRERELEASE FreeBSD 6.1-PRERELEASE #2: Thu Mar 2 16:14:49 BRT 2006 lioux@exxodus:/usr/obj-6.x/usr/src-6.x/sys/LIOUX i386

>Description:

	When ImageMagick is built with thread support, some ports depending on
it do not detect ImageMagick correctly. This is a result of ImageMagick not
adding the proper thread flags on its pkg-config files.

>How-To-Repeat:

	Build graphics/ImageMagick with thread support then try building
multimedia/transcode WITH_IMAGEMAGICK

>Fix:

--- patch-Makefile begins here ---
--- Makefile.orig	Fri Mar 17 16:37:05 2006
+++ Makefile	Fri Mar 17 16:51:07 2006
@@ -7,7 +7,7 @@
 
 PORTNAME=	ImageMagick
 PORTVERSION=	6.2.5.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics perl5
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/ImageMagick/ \
 		${MASTER_SITE_LOCAL:S/%SUBDIR%/pav/}
@@ -52,8 +52,10 @@
      defined(PERL_THREADED) && ${PERL_THREADED} == "true")
 CONFIGURE_ARGS+=	--with-threads
 CONFIGURE_ENV+=		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}"
+WITH_IMAGEMAGICK_THREADS=yes
 .else
 CONFIGURE_ARGS+=	--without-threads
+.undef WITH_IMAGEMAGICK_THREADS
 .endif
 
 # Faster, but poor quality
@@ -227,6 +229,16 @@
 	@${PERL} -pi -e 's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/ltdl/ltdl.c
 	@${PERL} -pi -e 's|timestamp: %ld|timestamp: %d|g' \
 		${WRKSRC}/magick/xwindow.c
+.if defined(WITH_IMAGEMAGICK_THREADS)
+. for pkg_config_file in \
+	Magick++/lib/ImageMagick++.pc.in \
+	wand/Wand.pc.in \
+	magick/ImageMagick.pc.in
+	@${PERL} -pi -e 's|^(Libs.+)$$|\1 ${PTHREAD_LIBS}|; \
+		s|^(Cflags.+)$$|\1 ${PTHREAD_CFLAGS}|' \
+		${WRKSRC}/${pkg_config_file}
+. endfor
+.endif
 
 post-install:
 .if defined(WITHOUT_IMAGEMAGICK_16BIT_PIXEL)
--- patch-Makefile ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Fri Mar 17 20:04:10 UTC 2006 
State-Changed-Why:  
Awaiting maintainers feedback 

http://www.freebsd.org/cgi/query-pr.cgi?pr=94614 
State-Changed-From-To: feedback->closed 
State-Changed-By: mnag 
State-Changed-When: Sat Apr 15 02:38:19 UTC 2006 
State-Changed-Why:  
Committed. Thanks! 

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