From owner-svn-ports-all@FreeBSD.ORG  Wed Apr 23 20:42:48 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 024A891D;
 Wed, 23 Apr 2014 20:42:48 +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 E291915BC;
 Wed, 23 Apr 2014 20:42:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3NKgl4Q032169;
 Wed, 23 Apr 2014 20:42:47 GMT (envelope-from antoine@svn.freebsd.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3NKglWU032167;
 Wed, 23 Apr 2014 20:42:47 GMT (envelope-from antoine@svn.freebsd.org)
Message-Id: <201404232042.s3NKglWU032167@svn.freebsd.org>
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Wed, 23 Apr 2014 20:42:47 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r351972 - in head/graphics: libwmf libwmf-nox11
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 20:42:48 -0000

Author: antoine
Date: Wed Apr 23 20:42:47 2014
New Revision: 351972
URL: http://svnweb.freebsd.org/changeset/ports/351972
QAT: https://qat.redports.org/buildarchive/r351972/

Log:
  Move the -nox11 PKGNAMESUFFIX to the -nox11 slave and simplify CONFLICTS
  
  Suggested in:	ports/188785 followup

Modified:
  head/graphics/libwmf-nox11/Makefile
  head/graphics/libwmf/Makefile

Modified: head/graphics/libwmf-nox11/Makefile
==============================================================================
--- head/graphics/libwmf-nox11/Makefile	Wed Apr 23 20:31:48 2014	(r351971)
+++ head/graphics/libwmf-nox11/Makefile	Wed Apr 23 20:42:47 2014	(r351972)
@@ -1,10 +1,13 @@
 # Created by: mm@FreeBSD.org
 # $FreeBSD$
 
+PKGNAMESUFFIX=	-nox11
 PORTSCOUT=	ignore:1
 
+CONFLICTS=	libwmf-[0-9]*
 MASTERDIR=	${.CURDIR}/../libwmf
 OPTIONS_EXCLUDE=	X11
 OPTIONS_FILE_UNSET=	X11
 
+
 .include        "${MASTERDIR}/Makefile"

Modified: head/graphics/libwmf/Makefile
==============================================================================
--- head/graphics/libwmf/Makefile	Wed Apr 23 20:31:48 2014	(r351971)
+++ head/graphics/libwmf/Makefile	Wed Apr 23 20:42:47 2014	(r351972)
@@ -17,6 +17,8 @@ LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/grap
 		libpng.so:${PORTSDIR}/graphics/png \
 		libfreetype.so:${PORTSDIR}/print/freetype2
 
+CONFLICTS?=	libwmf-nox11-[0-9]*
+
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	libxml2
 GNU_CONFIGURE=	yes
@@ -33,14 +35,8 @@ OPTIONS_SUB=	yes
 
 X11_USE=	XORG=x11
 X11_CONFIGURE_OFF=--with-x=no
-.include <bsd.port.options.mk>
 
-.if ! ${PORT_OPTIONS:MX11}
-PKGNAMESUFFIX=	-nox11
-CONFLICTS+=	libwmf-[0-9]*
-.else
-CONFLICTS+=	libwmf-nox11-[0-9]*
-.endif
+.include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|src include fonts doc|src include fonts|g' \