Mark freedt and ucspi-tcp as conflicting
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 - 1.15 +++ net/ucspi-tcp/Makefile 24 Jul 2014 15:13:32 - @@ -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 - 1.5 +++ net/ucspi-tcp/pkg/PLIST 24 Jul 2014 15:13:32 - @@ -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/Makefile11 Mar 2013 11:41:30 - 1.14 +++ sysutils/freedt/Makefile24 Jul 2014 15:13:32 - @@ -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 - 1.2 +++ sysutils/freedt/pkg/PLIST 24 Jul 2014 15:13:32 - @@ -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
Re: Mark freedt and ucspi-tcp as conflicting
On 2014/07/24 19:19, Vadim Zhukov wrote: 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) these packages are useful together, I'd rather rename freedt's copy of these.
Re: Mark freedt and ucspi-tcp as conflicting
2014-07-24 19:43 GMT+04:00 Stuart Henderson st...@openbsd.org: On 2014/07/24 19:19, Vadim Zhukov wrote: 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) these packages are useful together, I'd rather rename freedt's copy of these. Will do. -- WBR, Vadim Zhukov
Re: Mark freedt and ucspi-tcp as conflicting
This removes unmarked conflict between freedt and ucspi-tcp.
The ucspi-tcp patch will follow separately because it's related
with other ports.
--
WBR,
Vadim Zhukov
Index: Makefile
===
RCS file: /cvs/ports/sysutils/freedt/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile11 Mar 2013 11:41:30 - 1.14
+++ Makefile24 Jul 2014 16:28:08 -
@@ -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
@@ -16,5 +16,9 @@ WANTLIB= c
MASTER_SITES= http://offog.org/files/
CONFIGURE_STYLE= gnu
+
+post-install:
+ rm -f ${PREFIX}/bin/recordio
+ mv ${PREFIX}/bin/{,f}argv0
.include bsd.port.mk
Index: pkg/DESCR
===
RCS file: /cvs/ports/sysutils/freedt/pkg/DESCR,v
retrieving revision 1.3
diff -u -p -r1.3 DESCR
--- pkg/DESCR 14 Mar 2011 08:44:38 - 1.3
+++ pkg/DESCR 24 Jul 2014 16:28:08 -
@@ -14,3 +14,7 @@ Please note that this package is not a d
daemontools; the internal state files in service directories are
different, and the error messages (and a few of the options) aren't
quite the same.
+
+The recordio script (simple ratelimit -r wrapper) was removed
+to avoid conflict with net/ucspi-tcp. For the same reason the argv0
+was renamed to fargv0.
Index: pkg/PLIST
===
RCS file: /cvs/ports/sysutils/freedt/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 1 Jan 2012 16:16:24 - 1.2
+++ pkg/PLIST 24 Jul 2014 16:28:08 -
@@ -1,12 +1,11 @@
@comment $OpenBSD: PLIST,v 1.2 2012/01/01 16:16:24 sthen Exp $
@bin bin/anonidentd
-@bin bin/argv0
+@bin bin/fargv0
@bin bin/dumblog
@bin bin/envdir
@bin bin/envuidgid
bin/mkservice
@bin bin/ratelimit
-bin/recordio
@bin bin/setlock
@bin bin/setuidgid
@bin bin/softlimit
Re: Mark freedt and ucspi-tcp as conflicting
Add @conflict markers for freedt and (now removed) tcpcat. To be committed right after freedt (see version in @conflict marker). Okay? -- WBR, Vadim Zhukov Index: Makefile === RCS file: /cvs/ports/net/ucspi-tcp/Makefile,v retrieving revision 1.15 diff -u -p -r1.15 Makefile --- Makefile12 Jun 2014 19:00:30 - 1.15 +++ Makefile24 Jul 2014 16:36:02 - @@ -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: pkg/PLIST === RCS file: /cvs/ports/net/ucspi-tcp/pkg/PLIST,v retrieving revision 1.5 diff -u -p -r1.5 PLIST --- pkg/PLIST 12 Jun 2014 19:00:31 - 1.5 +++ pkg/PLIST 24 Jul 2014 16:36:02 - @@ -1,4 +1,6 @@ @comment $OpenBSD: PLIST,v 1.5 2014/06/12 19:00:31 sthen Exp $ +@conflict freedt-0.22p2 +@conflict tcpcat-* @bin bin/addcr @bin bin/argv0 bin/date@
