summaryrefslogtreecommitdiff
path: root/devel/ossp-uuid
diff options
context:
space:
mode:
authordrochner <drochner>2013-03-19 10:24:24 +0000
committerdrochner <drochner>2013-03-19 10:24:24 +0000
commit43f46c63be8f3d119b61fedf8f79acc6fd11fa32 (patch)
tree3f8b5b6433849ff2c11b928d86962587459681a2 /devel/ossp-uuid
parent831191eae982decef5a804f06f06df1f22d6e07f (diff)
downloadpkgsrc-43f46c63be8f3d119b61fedf8f79acc6fd11fa32.tar.gz
update CONFLICT line: libuuid is not in "wip" anymore
Diffstat (limited to 'devel/ossp-uuid')
-rw-r--r--devel/ossp-uuid/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/devel/ossp-uuid/Makefile b/devel/ossp-uuid/Makefile
index be99f0ca184..0190135949f 100644
--- a/devel/ossp-uuid/Makefile
+++ b/devel/ossp-uuid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2013/03/02 10:44:34 tron Exp $
+# $NetBSD: Makefile,v 1.7 2013/03/19 10:24:24 drochner Exp $
#
DISTNAME= uuid-1.6.2
@@ -11,8 +11,9 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.ossp.org/pkg/lib/uuid/
COMMENT= C-API and command line tool for generating UUIDs
-# conflicts with packages in pkgsrc-wip
-#CONFLICTS= e2fsprogs>1.32 libuuid-[0-9]* # libuuid.* uuid.pc uuid.3
+CONFLICTS= libuuid-[0-9]* # libuuid.* uuid.pc uuid.3
+# conflicts with package in pkgsrc-wip
+#CONFLICTS+= e2fsprogs>1.32 # libuuid.* uuid.pc uuid.3
USE_LIBTOOL= yes
PKGCONFIG_OVERRIDE+= ${WRKSRC}/uuid.pc.in