[pkgsrc/trunk]: pkgsrc Per PR pkg/30133 majordomo conflicts with net/bounce.

[garbled <garbled%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c85e43154e80
branches:  trunk
changeset: 505673:c85e43154e80
user:      garbled <garbled%pkgsrc.org@localhost>
date:      Fri Jan 06 02:35:32 2006 +0000

description:
Per PR pkg/30133 majordomo conflicts with net/bounce.

diffstat:

 mail/majordomo/Makefile |  4 +++-
 net/bounce/Makefile     |  4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diffs (36 lines):

diff -r f9de9d1e092f -r c85e43154e80 mail/majordomo/Makefile
--- a/mail/majordomo/Makefile   Fri Jan 06 00:19:44 2006 +0000
+++ b/mail/majordomo/Makefile   Fri Jan 06 02:35:32 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:33 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2006/01/06 02:35:32 garbled Exp $
 
 DISTNAME=              majordomo-1.94.5
 PKGREVISION=           1
@@ -22,6 +22,8 @@
 ADDGROUP=              ${LOCALBASE}/sbin/groupadd
 .endif
 
+CONFLICTS+=            bounce-*
+
 USE_TOOLS+=            perl:run
 
 NO_BIN_ON_FTP=         requires compiled-in hardcoded uid/gid
diff -r f9de9d1e092f -r c85e43154e80 net/bounce/Makefile
--- a/net/bounce/Makefile       Fri Jan 06 00:19:44 2006 +0000
+++ b/net/bounce/Makefile       Fri Jan 06 02:35:32 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/12/05 23:55:13 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2006/01/06 02:37:11 garbled Exp $
 #
 
 DISTNAME=              bounce-0.0
@@ -8,6 +8,8 @@
 MAINTAINER=            p99dreyf%criens.u-psud.fr@localhost
 COMMENT=               Tool to forward TCP connection from one IP to another
 
+CONFLICTS+=            majordomo-*
+
 WRKSRC=                        ${WRKDIR}/bounce
 HAS_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --prefix=${PREFIX:Q}