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 --- Makefile 11 Mar 2013 11:41:30 -0000 1.14 +++ Makefile 24 Jul 2014 16:28:08 -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 @@ -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 -0000 1.3 +++ pkg/DESCR 24 Jul 2014 16:28:08 -0000 @@ -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 -0000 1.2 +++ pkg/PLIST 24 Jul 2014 16:28:08 -0000 @@ -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
