This adds explicit @conflict between sysutils/freedt and
net/ucspi-tcp. As far as I can understand, the conflicting items
are interchangeable (freedt is a re-implementation of djb's utils),
and nothing depends on those, so there's likely no point in
de-conflicting.

(personally I see no point in having freedt package at all but
I'd left this question to post-release)

--
WBR,
  Vadim Zhukov


Index: net/ucspi-tcp/Makefile
===================================================================
RCS file: /cvs/ports/net/ucspi-tcp/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- net/ucspi-tcp/Makefile      12 Jun 2014 19:00:30 -0000      1.15
+++ net/ucspi-tcp/Makefile      24 Jul 2014 15:13:32 -0000
@@ -3,7 +3,7 @@
 COMMENT=       tools for building tcp socket client/servers
 
 DISTNAME=      ucspi-tcp-0.88
-REVISION=      0
+REVISION=      1
 CATEGORIES=    net
 
 HOMEPAGE=      http://cr.yp.to/ucspi-tcp.html
Index: net/ucspi-tcp/pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/ucspi-tcp/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- net/ucspi-tcp/pkg/PLIST     12 Jun 2014 19:00:31 -0000      1.5
+++ net/ucspi-tcp/pkg/PLIST     24 Jul 2014 15:13:32 -0000
@@ -1,4 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.5 2014/06/12 19:00:31 sthen Exp $
+@conflict freedt-*
 @bin bin/addcr
 @bin bin/argv0
 bin/date@
Index: sysutils/freedt/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/freedt/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- sysutils/freedt/Makefile    11 Mar 2013 11:41:30 -0000      1.14
+++ sysutils/freedt/Makefile    24 Jul 2014 15:13:32 -0000
@@ -3,7 +3,7 @@
 COMMENT=               reimplementation of Dan Bernstein's daemontools#'
 
 DISTNAME=              freedt-0.22
-REVISION=              1
+REVISION=              2
 CATEGORIES=            sysutils
 
 HOMEPAGE=              http://offog.org/code/freedt.html
Index: sysutils/freedt/pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/freedt/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- sysutils/freedt/pkg/PLIST   1 Jan 2012 16:16:24 -0000       1.2
+++ sysutils/freedt/pkg/PLIST   24 Jul 2014 15:13:32 -0000
@@ -1,4 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.2 2012/01/01 16:16:24 sthen Exp $
+@conflict ucspi-tcp-*
 @bin bin/anonidentd
 @bin bin/argv0
 @bin bin/dumblog

Reply via email to