diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2003-10-12 11:53:31 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2003-10-12 11:53:31 +0000 |
| commit | 62297c98c6331db11209daf7b1ecea949584d266 (patch) | |
| tree | 0d6dbe5b810e79ae57a293993f2517c6fba66ff9 /security | |
| parent | Updated to 0.30 (diff) | |
- add CONFLICTS
Submitted by: eikemeier@fillmore-labs.com
Notes
Notes:
svn path=/head/; revision=90911
Diffstat (limited to 'security')
| -rw-r--r-- | security/hpn-ssh/Makefile | 8 | ||||
| -rw-r--r-- | security/openssh-portable/Makefile | 8 | ||||
| -rw-r--r-- | security/openssh/Makefile | 1 |
3 files changed, 13 insertions, 4 deletions
diff --git a/security/hpn-ssh/Makefile b/security/hpn-ssh/Makefile index 7e4e5650af63..183659897b90 100644 --- a/security/hpn-ssh/Makefile +++ b/security/hpn-ssh/Makefile @@ -20,6 +20,7 @@ MLINKS= ssh.1 slogin.1 MAN5= ssh_config.5 sshd_config.5 MAN8= sftp-server.8 sshd.8 ssh-keysign.8 +CONFLICTS?= openssh-3.* ssh-1.* ssh2-3.* USE_OPENSSL= yes CRYPTOLIBS= -L${OPENSSLLIB} -lcrypto GNU_CONFIGURE= yes @@ -74,6 +75,7 @@ EXTRA_PATCHES+= ${FILESDIR}/batch.patch .if defined(KRB5_HOME) && exists(${KRB5_HOME}) PKGNAMESUFFIX= -gssapi +CONFILCTS+= openssh-portable-* BUILD_DEPENDS+= autoreconf:${PORTSDIR}/devel/autoconf # USE_AUTOCONF_VER= 252 # broken CONFIGURE_ARGS+= --with-kerberos5=${KRB5_HOME} @@ -90,9 +92,11 @@ pre-configure: ${AUTOCONF_ARGS}) .else .if exists(/usr/include/krb5.h) -CONFIGURE_ARGS+= --with-kerberos5 -EXTRA_PATCHES+= ${FILESDIR}/gss-serv.c.patch +CONFIGURE_ARGS+= --with-kerberos5 +EXTRA_PATCHES+= ${FILESDIR}/gss-serv.c.patch .endif +.else +CONFILCTS+= openssh-gssapi-* .endif post-configure: diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile index 7e4e5650af63..183659897b90 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -20,6 +20,7 @@ MLINKS= ssh.1 slogin.1 MAN5= ssh_config.5 sshd_config.5 MAN8= sftp-server.8 sshd.8 ssh-keysign.8 +CONFLICTS?= openssh-3.* ssh-1.* ssh2-3.* USE_OPENSSL= yes CRYPTOLIBS= -L${OPENSSLLIB} -lcrypto GNU_CONFIGURE= yes @@ -74,6 +75,7 @@ EXTRA_PATCHES+= ${FILESDIR}/batch.patch .if defined(KRB5_HOME) && exists(${KRB5_HOME}) PKGNAMESUFFIX= -gssapi +CONFILCTS+= openssh-portable-* BUILD_DEPENDS+= autoreconf:${PORTSDIR}/devel/autoconf # USE_AUTOCONF_VER= 252 # broken CONFIGURE_ARGS+= --with-kerberos5=${KRB5_HOME} @@ -90,9 +92,11 @@ pre-configure: ${AUTOCONF_ARGS}) .else .if exists(/usr/include/krb5.h) -CONFIGURE_ARGS+= --with-kerberos5 -EXTRA_PATCHES+= ${FILESDIR}/gss-serv.c.patch +CONFIGURE_ARGS+= --with-kerberos5 +EXTRA_PATCHES+= ${FILESDIR}/gss-serv.c.patch .endif +.else +CONFILCTS+= openssh-gssapi-* .endif post-configure: diff --git a/security/openssh/Makefile b/security/openssh/Makefile index b27a2fdcd889..06ca62d8e686 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -21,6 +21,7 @@ PATCHFILES= openbsd28_${PORTVERSION}.patch MAINTAINER= dinoex@FreeBSD.org COMMENT= OpenBSD's secure shell client and server (remote login program) +CONFLICTS?= openssh-portable-* openssh--gssapi-* ssh-1.* ssh2-3.* USE_OPENSSL= yes WRKSRC= ${WRKDIR}/ssh |