summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoritojun <itojun@pkgsrc.org>2000-03-26 14:28:12 +0000
committeritojun <itojun@pkgsrc.org>2000-03-26 14:28:12 +0000
commit41313b3fc54507115103c8c8f48ba957d2a29f61 (patch)
tree96ca86aaef22b7b7d3bf04fd4444c4fe151f890e
parent435a67a18ea68af0e679ae90d4c4ad34b3cfb5dc (diff)
downloadpkgsrc-41313b3fc54507115103c8c8f48ba957d2a29f61.tar.gz
revise CONFLICTS line.
-rw-r--r--security/ssh/Makefile4
-rw-r--r--security/ssh6/Makefile4
2 files changed, 4 insertions, 4 deletions
diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index 1771ec47494..936bfbb9e83 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2000/03/20 02:25:48 itojun Exp $
+# $NetBSD: Makefile,v 1.77 2000/03/26 14:28:12 itojun Exp $
# FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp
#
@@ -12,7 +12,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.cs.hut.fi/ssh/
-CONFLICTS= openssh-[0-9]* ssh6-*
+CONFLICTS= openssh-[0-9]* ssh6-[0-9]*
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
RESTRICTED= "Crypto; export-controlled"
diff --git a/security/ssh6/Makefile b/security/ssh6/Makefile
index 0a8a0a24854..b7e6713601c 100644
--- a/security/ssh6/Makefile
+++ b/security/ssh6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2000/03/20 02:25:30 itojun Exp $
+# $NetBSD: Makefile,v 1.2 2000/03/26 14:28:13 itojun Exp $
# FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp
#
@@ -13,7 +13,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.cs.hut.fi/ssh/
-CONFLICTS= openssh-[0-9]* ssh-*
+CONFLICTS= openssh-[0-9]* ssh-[0-9]*
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
RESTRICTED= "Crypto; export-controlled"