diff options
| -rw-r--r-- | news/suck/Makefile | 3 | ||||
| -rw-r--r-- | security/hpn-ssh/Makefile | 8 | ||||
| -rw-r--r-- | security/openssh-portable/Makefile | 8 | ||||
| -rw-r--r-- | security/openssh/Makefile | 1 |
4 files changed, 16 insertions, 4 deletions
diff --git a/news/suck/Makefile b/news/suck/Makefile index efe931062bfc..56f85b6b4737 100644 --- a/news/suck/Makefile +++ b/news/suck/Makefile @@ -16,6 +16,7 @@ MASTER_SITE_SUBDIR= dinoex MAINTAINER= dinoex@FreeBSD.org COMMENT= Receives/sends news to/from localhost via NNTP +CONFLICTS?= suckblow-1.* USE_GMAKE= yes GNU_CONFIGURE= yes MAN1= suck.1 rpost.1 testhost.1 lmove.1 @@ -33,6 +34,7 @@ MAKE_ENV+= DB_TYPE=-DUSE_DBZ DB_LIB=-lcnews MAKE_ENV+= DB_LIB_LOC=-L${LOCALBASE}/lib MAKE_ENV+= INCDIR2=-I${LOCALBASE}/include BUILD_DEPENDS+= ${LOCALBASE}/lib/libcnews.a:${PORTSDIR}/${CNEWS_PORT} +CONFLICTS+= suck-4.* .else CFLAGS+= -DNO_CONFIGDATA MAKE_ENV+= DB_TYPE="-DUSE_INN23 -DDO_TAGGED_HASH" @@ -41,6 +43,7 @@ MAKE_ENV+= DB_LIB_LOC=-L${LOCALBASE}/news/lib MAKE_ENV+= DB_INC_LOC=-I${LOCALBASE}/news/include MAKE_ENV+= INCDIR2=-I${LOCALBASE}/include BUILD_DEPENDS+= ${LOCALBASE}/news/lib/libinn.a:${PORTSDIR}/news/inn +CONFLICTS+= suck-cnews-4.* .endif .if !defined(SUCK_WITHOUT_SSL) && !defined(WITHOUT_SSL) 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 |