svn commit: r348522 - head/misc/ossp-uuid

[Vasil Dimov]

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 at 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>