From a679a0a82db6b6c62e5180540b9f3f73f686cab2 Mon Sep 17 00:00:00 2001
From: agc <agc>
Date: Thu, 11 Jun 1998 16:05:40 +0000
Subject: Note conflict with socks4 package.

---
 net/socks5/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'net/socks5')

diff --git a/net/socks5/Makefile b/net/socks5/Makefile
index 427f2a2f0e2..6937b6b79db 100644
--- a/net/socks5/Makefile
+++ b/net/socks5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1998/04/15 10:38:40 agc Exp $
+# $NetBSD: Makefile,v 1.10 1998/06/11 16:05:40 agc Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/08/28 06:49:06 obrien Exp
 #
 
@@ -11,6 +11,8 @@ EXTRACT_SUFX=	.gz
 
 MAINTAINER=	ambrisko@ambrisko.roble.com
 
+CONFLICTS=	socks4-2.2
+
 NO_CDROM=	"NEC has a funky license for this software"
 RESTRICTED=	"no commercial use"
 
-- 
cgit v1.2.3