diff options
author | hubertf <hubertf@pkgsrc.org> | 2002-05-07 23:48:48 +0000 |
---|---|---|
committer | hubertf <hubertf@pkgsrc.org> | 2002-05-07 23:48:48 +0000 |
commit | 33157995eed13d0e79760d2db1a623ddc3cd1fe1 (patch) | |
tree | 7aee6cc15d3c00cbd484dbe83ecb8086ffad12e2 | |
parent | 98242efc2c5b39f674db4244af00f63700313b9b (diff) | |
download | pkgsrc-33157995eed13d0e79760d2db1a623ddc3cd1fe1.tar.gz |
Add some CONFLICTS lines
Noted by Dawid SzymaƱski <dawszy@arhea.net> in PR 16186
-rw-r--r-- | net/ppp-mppe/Makefile | 4 | ||||
-rw-r--r-- | net/ppp/Makefile | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/net/ppp-mppe/Makefile b/net/ppp-mppe/Makefile index a0acebe8f13..090681e6369 100644 --- a/net/ppp-mppe/Makefile +++ b/net/ppp-mppe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2002/01/19 15:22:53 kim Exp $ +# $NetBSD: Makefile,v 1.14 2002/05/07 23:48:49 hubertf Exp $ DISTNAME= ppp-2.3.9 PKGNAME= ppp-mppe-2.3.9 @@ -9,6 +9,8 @@ MAINTAINER= dbj@netbsd.org HOMEPAGE= http://www.moretonbay.com/vpn/releases/ COMMENT= PPP daemon and LKM with MPPE - Microsoft Point-to-Point Encryption +CONFLICTS+= ppp-2.* + OPENSSL_VERS= 0.9.6 OPENSSL_SRC= ${_PKGSRCDIR}/security/openssl/${WRKDIR:T}/openssl-${OPENSSL_VERS} diff --git a/net/ppp/Makefile b/net/ppp/Makefile index 1be9d2d68a7..e88dd859ea5 100644 --- a/net/ppp/Makefile +++ b/net/ppp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/09/20 22:39:43 hubertf Exp $ +# $NetBSD: Makefile,v 1.5 2002/05/07 23:48:48 hubertf Exp $ DISTNAME= ppp-2.3.11 CATEGORIES= net @@ -9,6 +9,8 @@ COMMENT= Point-to-Point Protocol for Internet connections over serial lines ONLY_FOR_PLATFORM= NetBSD-*-* +CONFLICTS+= ppp-mppe-2.* + HAS_CONFIGURE= yes MANCOMPRESSED_IF_MANZ= yes |