From owner-svn-ports-all@FreeBSD.ORG  Tue Mar 18 07:59:46 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 EEC6B50E;
 Tue, 18 Mar 2014 07:59:46 +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 DC1278D2;
 Tue, 18 Mar 2014 07:59:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2I7xkvw021488;
 Tue, 18 Mar 2014 07:59:46 GMT (envelope-from vd@svn.freebsd.org)
Received: (from vd@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2I7xkqm021487;
 Tue, 18 Mar 2014 07:59:46 GMT (envelope-from vd@svn.freebsd.org)
Message-Id: <201403180759.s2I7xkqm021487@svn.freebsd.org>
From: Vasil Dimov <vd@FreeBSD.org>
Date: Tue, 18 Mar 2014 07:59:46 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r348522 - head/misc/ossp-uuid
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: Tue, 18 Mar 2014 07:59:47 -0000

Author: vd
Date: Tue Mar 18 07:59:46 2014
New Revision: 348522
URL: http://svnweb.freebsd.org/changeset/ports/348522
QAT: https://qat.redports.org/buildarchive/r348522/

Log:
  Followup to r347563: revert a change that sneaked in.

Modified:
  head/misc/ossp-uuid/Makefile

Modified: head/misc/ossp-uuid/Makefile
==============================================================================
--- head/misc/ossp-uuid/Makefile	Tue Mar 18 07:56:38 2014	(r348521)
+++ head/misc/ossp-uuid/Makefile	Tue Mar 18 07:59:46 2014	(r348522)
@@ -12,8 +12,6 @@ PKGNAMEPREFIX=	ossp-
 MAINTAINER=	vd@FreeBSD.org
 COMMENT=	ISO-C API and CLI for generating Universally Unique Identifiers
 
-#CONFLICTS=	e2fsprogs-libuuid-[0-9]*
-
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-shared --enable-static --with-cxx \
@@ -21,6 +19,8 @@ CONFIGURE_ARGS=	--disable-shared --enabl
 
 .if defined(SLAVEPORT) && ${SLAVEPORT}=="perl"
 PKGNAMEPREFIX=	p5-OSSP-
+.else
+CONFLICTS=	e2fsprogs-libuuid-[0-9]*
 .endif
 
 .include <bsd.port.pre.mk>