pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/security Revert previous: conflicts with openssh (and ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/2cbf1d601881
branches: trunk
changeset: 478871:2cbf1d601881
user: seb <seb%pkgsrc.org@localhost>
date: Sat Jul 31 12:52:42 2004 +0000
description:
Revert previous: conflicts with openssh (and others) are already specified in
Makefile.common.
diffstat:
security/ssh2-nox11/Makefile | 3 +--
security/ssh2/Makefile | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diffs (31 lines):
diff -r 485e05ce810e -r 2cbf1d601881 security/ssh2-nox11/Makefile
--- a/security/ssh2-nox11/Makefile Sat Jul 31 12:24:02 2004 +0000
+++ b/security/ssh2-nox11/Makefile Sat Jul 31 12:52:42 2004 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2004/07/25 12:35:06 grant Exp $
+# $NetBSD: Makefile,v 1.3 2004/07/31 12:52:42 seb Exp $
#
PKGNAME= ${DISTNAME:C/ssh-/ssh2-nox11-/}
COMMENT= Secure Shell client and server for V.2 SSH protocol without X11 support
CONFLICTS= ssh2-[0-9]*
-CONFLICTS+= openssh-[0-9]*
CONFIGURE_ARGS+= --without-x # be explicit
.include "../../security/ssh2/Makefile.common"
diff -r 485e05ce810e -r 2cbf1d601881 security/ssh2/Makefile
--- a/security/ssh2/Makefile Sat Jul 31 12:24:02 2004 +0000
+++ b/security/ssh2/Makefile Sat Jul 31 12:52:42 2004 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2004/07/25 12:35:06 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/07/31 12:52:42 seb Exp $
#
PKGNAME= ${DISTNAME:C/ssh-/ssh2-/}
COMMENT= Secure Shell client and server for V.2 SSH protocol
CONFLICTS= ssh2-nox11-[0-9]*
-CONFLICTS+= openssh-[0-9]*
USE_X11= YES
CONFIGURE_ARGS+= --with-x # be explicit
Home |
Main Index |
Thread Index |
Old Index