summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhubertf <hubertf@pkgsrc.org>2000-01-27 13:52:35 +0000
committerhubertf <hubertf@pkgsrc.org>2000-01-27 13:52:35 +0000
commit4e1f8b916a166a4bca5e27d9124d232441b43a7c (patch)
treeed66e89c896fbcab30124e19bc09ea091f0abbad
parent3669b8d50199816a3887df9357f3f0f0b00c69be (diff)
downloadpkgsrc-4e1f8b916a166a4bca5e27d9124d232441b43a7c.tar.gz
Adjust CONFLICTS to not clash with the ssh-ip-tunnel package.
-rw-r--r--security/openssh/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 744ac96f9ff..b0e80729eee 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/01/27 13:49:44 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 2000/01/27 13:52:35 hubertf Exp $
#
DISTNAME= openssh-1.2.1pre26
@@ -9,7 +9,7 @@ MASTER_SITES= ftp://thermo.stat.ncsu.edu/pub/openssh/files/
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.openssh.org/
-CONFLICTS= ssh-*
+CONFLICTS= ssh-[0-9]*
USE_PERL5= yes