Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/security/ssh-ip-tunnel/Attic/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/security/ssh-ip-tunnel/Attic/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pkgsrc/security/ssh-ip-tunnel/Attic/Makefile	1999/04/09 07:39:45	1.2
+++ pkgsrc/security/ssh-ip-tunnel/Attic/Makefile	1999/04/09 14:49:07	1.3
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 1999/04/09 07:39:45 tron Exp $
+# $NetBSD: Makefile,v 1.3 1999/04/09 14:49:07 tron Exp $
 
 DISTNAME=	vpn-1.0
+PKGNAME=	ssh-ip-tunnel-1.0
 CATEGORIES=	security net
 MASTER_SITES=	http://bleu.west.spy.net/~dustin/soft/
 
@@ -9,6 +10,8 @@ MAINTAINER=	dustin@spy.net
 DEPENDS+=	pty-redir-0.1:../../misc/pty-redir
 DEPENDS+=	ssh-1.2.26:../../security/ssh
 
+CONFLICTS=	vpn-1.0
+
 GNU_CONFIGURE=	YES
 
 .include "../../mk/bsd.pkg.mk"