From xors@mne.ru  Fri Mar  9 18:28:39 2007
Return-Path: <xors@mne.ru>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 9C05816A400
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  9 Mar 2007 18:28:39 +0000 (UTC)
	(envelope-from xors@mne.ru)
Received: from softel.ru (mail.softel.ru [217.25.84.28])
	by mx1.freebsd.org (Postfix) with ESMTP id 90E8813C4A6
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  9 Mar 2007 18:28:38 +0000 (UTC)
	(envelope-from xors@mne.ru)
Received: from pg.org ([217.25.92.202])
	by softel.ru (8.12.10/8.12.10/check_local-5) with ESMTP id l29ISbpR006241
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 9 Mar 2007 21:28:37 +0300
Received: from xors.pg.org (localhost.pg.org [127.0.0.1])
	by pg.org (8.13.8/8.13.8) with ESMTP id l29IUSIW032849
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 9 Mar 2007 21:30:28 +0300 (MSK)
	(envelope-from xors@xors.pg.org)
Received: (from xors@localhost)
	by xors.pg.org (8.13.8/8.13.8/Submit) id l29IUSR1032844;
	Fri, 9 Mar 2007 21:30:28 +0300 (MSK)
	(envelope-from xors)
Message-Id: <200703091830.l29IUSR1032844@xors.pg.org>
Date: Fri, 9 Mar 2007 21:30:28 +0300 (MSK)
From: Maxim Samsonov <xors@mne.ru>
Reply-To: Maxim Samsonov <xors@mne.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH]: graphics/ImageMagick Correct setup of CPPFLAGS for fontconfig, librsvg and graphviz
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         110141
>Category:       ports
>Synopsis:       [PATCH]: graphics/ImageMagick Correct setup of CPPFLAGS for fontconfig, librsvg and graphviz
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    shaun
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 09 18:30:20 GMT 2007
>Closed-Date:    Tue Apr 03 16:26:29 GMT 2007
>Last-Modified:  Tue Apr  3 16:30:09 GMT 2007
>Originator:     Maxim Samsonov
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
>Environment:
>Description:
Correction of the condition of setup of CPPFLAGS in "configure".
>How-To-Repeat:
>Fix:
--- ImageMagick.diff begins here ---
diff -ubdBrN ImageMagick.orig/files/patch-configure ImageMagick/files/patch-configure
--- ImageMagick.orig/files/patch-configure	Wed May 19 23:48:16 2004
+++ ImageMagick/files/patch-configure	Fri Mar  9 18:57:37 2007
@@ -1,6 +1,6 @@
---- configure.bak	Fri Feb  6 09:19:49 2004
-+++ configure	Wed Apr 21 16:47:25 2004
-@@ -23161,6 +23161,7 @@
+--- configure.bak	Fri Jan 19 18:41:09 2007
++++ configure	Fri Mar  9 18:57:17 2007
+@@ -18914,6 +18914,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,3 +8,30 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -34656,7 +34657,7 @@
+ #define HasFONTCONFIG 1
+ _ACEOF
+ 
+-  if test "$with_modules" == 'no' ; then
++  if test "$with_modules" = 'no' ; then
+     CPPFLAGS="$FONTCONFIG_CFLAGS $CPPFLAGS"
+   fi
+ fi
+@@ -36774,7 +36775,7 @@
+ #define HasGVC 1
+ _ACEOF
+ 
+-  if test "$with_modules" == 'no' ; then
++  if test "$with_modules" = 'no' ; then
+     CPPFLAGS="$GVC_CFLAGS $CPPFLAGS"
+   fi
+ fi
+@@ -37319,7 +37320,7 @@
+ #define HasRSVG 1
+ _ACEOF
+ 
+-  if test "$with_modules" == 'no' ; then
++  if test "$with_modules" = 'no' ; then
+     CPPFLAGS="$RSVG_CFLAGS $CPPFLAGS"
+   fi
+ fi
--- ImageMagick.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->shaun 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Mar 9 18:30:33 UTC 2007 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=110141 
State-Changed-From-To: open->closed 
State-Changed-By: rafan 
State-Changed-When: Tue Apr 3 16:26:27 UTC 2007 
State-Changed-Why:  
Committed with maintainer approval. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/110141: commit references a PR
Date: Tue,  3 Apr 2007 16:25:37 +0000 (UTC)

 rafan       2007-04-03 16:25:26 UTC
 
   FreeBSD ports repository
 
   Modified files:
     graphics/ImageMagick Makefile distinfo pkg-plist 
     graphics/ImageMagick/files patch-configure 
   Added files:
     graphics/ImageMagick/files patch-wand-Wand-config.in 
   Log:
   - Update to 6.3.3-5 [1]
   - SVG support requires X11 support, so mark as IGNORE if WITHOUT_X11
     is defined [2]
   - Correct set CPPFLAGS for fontconfig, librsvg, and graphviz [3]
   
   PR:             ports/109862 [2], ports/110141[3]
   Submitted by:   rafan [1], chinsan [2], Maxim Samsonov <xors at mne.ru> [3]
   Approved by:    shuan
   
   Revision  Changes    Path
   1.236     +4 -2      ports/graphics/ImageMagick/Makefile
   1.109     +3 -3      ports/graphics/ImageMagick/distinfo
   1.9       +30 -3     ports/graphics/ImageMagick/files/patch-configure
   1.1       +11 -0     ports/graphics/ImageMagick/files/patch-wand-Wand-config.in (new)
   1.105     +4 -2      ports/graphics/ImageMagick/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
