From owner-svn-ports-all@FreeBSD.ORG  Fri Mar  7 08:43:00 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 068ABFE2;
 Fri,  7 Mar 2014 08:43:00 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id E7968ECF;
 Fri,  7 Mar 2014 08:42:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s278gxZJ027605;
 Fri, 7 Mar 2014 08:42:59 GMT (envelope-from thierry@svn.freebsd.org)
Received: (from thierry@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s278gxsZ027604;
 Fri, 7 Mar 2014 08:42:59 GMT (envelope-from thierry@svn.freebsd.org)
Message-Id: <201403070842.s278gxsZ027604@svn.freebsd.org>
From: Thierry Thomas <thierry@FreeBSD.org>
Date: Fri, 7 Mar 2014 08:42:59 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r347344 - head/graphics/GraphicsMagick13
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Mar 2014 08:43:00 -0000

Author: thierry
Date: Fri Mar  7 08:42:59 2014
New Revision: 347344
URL: http://svnweb.freebsd.org/changeset/ports/347344
QAT: https://qat.redports.org/buildarchive/r347344/

Log:
  Fix the linkage problem, even with the default options.
  
  Reviewed by:	tijl

Modified:
  head/graphics/GraphicsMagick13/Makefile

Modified: head/graphics/GraphicsMagick13/Makefile
==============================================================================
--- head/graphics/GraphicsMagick13/Makefile	Fri Mar  7 08:41:11 2014	(r347343)
+++ head/graphics/GraphicsMagick13/Makefile	Fri Mar  7 08:42:59 2014	(r347344)
@@ -3,7 +3,7 @@
 
 PORTNAME=	GraphicsMagick
 PORTVERSION=	1.3.19
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	SF \
 		ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/1.3/
@@ -93,12 +93,6 @@ LIBWMF_PORT=	libwmf-nox11
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 1000024
-.if ${PORT_OPTIONS:MFPX} && ${PORT_OPTIONS:MOPENMP}
-IGNORE=		Cause C++ ABI conflict between clang/libc++ and gcc/libstdc++
-.endif
-.endif
-
 .if !defined(WINDOWS_FONT_DIR)
 # Use fonts installed by x11-fonts/webfonts by default
 WINDOWS_FONT_DIR=${LOCALBASE}/lib/X11/fonts/webfonts
@@ -124,3 +118,6 @@ regression-test: do-build
 		${MAKEFILE} ${MAKE_ARGS} check)
 
 .include <bsd.port.post.mk>
+# The OPENMP option may select gcc as compiler but on architectures
+# that have switched to libc++ clang should be used for C++ code.
+CXX=		c++