From owner-svn-ports-all@FreeBSD.ORG  Wed Apr 23 11:06:58 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 89B2C53A;
 Wed, 23 Apr 2014 11:06:58 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 76E5C1593;
 Wed, 23 Apr 2014 11:06:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3NB6w9x080879;
 Wed, 23 Apr 2014 11:06:58 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3NB6wD1080878;
 Wed, 23 Apr 2014 11:06:58 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201404231106.s3NB6wD1080878@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Wed, 23 Apr 2014 11:06:58 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r351920 - head/graphics/libwmf
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: Wed, 23 Apr 2014 11:06:58 -0000

Author: rene
Date: Wed Apr 23 11:06:57 2014
New Revision: 351920
URL: http://svnweb.freebsd.org/changeset/ports/351920
QAT: https://qat.redports.org/buildarchive/r351920/

Log:
  Restore conflict with -nox11 variant
  
  Submitted by:	John Hein in PR follow up

Modified:
  head/graphics/libwmf/Makefile

Modified: head/graphics/libwmf/Makefile
==============================================================================
--- head/graphics/libwmf/Makefile	Wed Apr 23 10:07:23 2014	(r351919)
+++ head/graphics/libwmf/Makefile	Wed Apr 23 11:06:57 2014	(r351920)
@@ -37,6 +37,9 @@ X11_CONFIGURE_OFF=--with-x=no
 
 .if ! ${PORT_OPTIONS:MX11}
 PKGNAMESUFFIX=	-nox11
+CONFLICTS+=	libwmf-[0-9]*
+.else
+CONFLICTS+=	libwmf-nox11-[0-9]*
 .endif
 
 post-patch: