Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 23 Apr 2014 11:06:58 +0000 (UTC)
From:      Rene Ladan <rene@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r351920 - head/graphics/libwmf
Message-ID:  <201404231106.s3NB6wD1080878@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404231106.s3NB6wD1080878>