summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorheinz <heinz@pkgsrc.org>2008-01-06 20:08:24 +0000
committerheinz <heinz@pkgsrc.org>2008-01-06 20:08:24 +0000
commitd0fcb85845b6bad63f44ccea0de4f2dd04002b1c (patch)
tree368c00b4a9153de449147879461d6e5b079e585a /devel
parent874e70d459dc172b4e0387d33c8644f1b1b63fb6 (diff)
downloadpkgsrc-d0fcb85845b6bad63f44ccea0de4f2dd04002b1c.tar.gz
As Aleksey Cheusov correctly observed in PR pkg/37703, this package
does not have files in common with sysutils/e2fsprogs, so they should not conflict. On the other hand, the packages wip/e2fsprogs and wip/libuuid _do_ have files in common with ossp-uuid, so I leave the CONFLICTS line as a comment.
Diffstat (limited to 'devel')
-rw-r--r--devel/ossp-uuid/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/devel/ossp-uuid/Makefile b/devel/ossp-uuid/Makefile
index c36bf521bc1..95fc78ac3fb 100644
--- a/devel/ossp-uuid/Makefile
+++ b/devel/ossp-uuid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/05/20 02:42:27 heinz Exp $
+# $NetBSD: Makefile,v 1.2 2008/01/06 20:08:24 heinz Exp $
#
DISTNAME= uuid-1.6.0
@@ -12,7 +12,8 @@ COMMENT= C-API and command line tool for generating UUIDs
PKG_DESTDIR_SUPPORT= user-destdir
-CONFLICTS= e2fsprogs>1.32 libuuid-[0-9]*
+# conflicts with packages in pkgsrc-wip
+#CONFLICTS= e2fsprogs>1.32 libuuid-[0-9]* # libuuid.* uuid.pc uuid.3
USE_LIBTOOL= yes
PKGCONFIG_OVERRIDE+= ${WRKSRC}/uuid.pc.in