diff options
| author | garbled <garbled@pkgsrc.org> | 2006-01-06 02:35:32 +0000 |
|---|---|---|
| committer | garbled <garbled@pkgsrc.org> | 2006-01-06 02:35:32 +0000 |
| commit | 678c07ce3fe10856a1ad005d4accf894c9f5a9d5 (patch) | |
| tree | 72b7864bd7e41e7581aab08ba7ed66b1208de416 | |
| parent | 2b829f436ff9139ef6db0f4fa0b344fc059ec06e (diff) | |
| download | pkgsrc-678c07ce3fe10856a1ad005d4accf894c9f5a9d5.tar.gz | |
Per PR pkg/30133 majordomo conflicts with net/bounce.
| -rw-r--r-- | mail/majordomo/Makefile | 4 | ||||
| -rw-r--r-- | net/bounce/Makefile | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/mail/majordomo/Makefile b/mail/majordomo/Makefile index 7adcd82781a..c9024344bb4 100644 --- a/mail/majordomo/Makefile +++ b/mail/majordomo/Makefile @@ -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 @@ ADDUSER= ${LOCALBASE}/sbin/useradd ADDGROUP= ${LOCALBASE}/sbin/groupadd .endif +CONFLICTS+= bounce-* + USE_TOOLS+= perl:run NO_BIN_ON_FTP= requires compiled-in hardcoded uid/gid diff --git a/net/bounce/Makefile b/net/bounce/Makefile index c1a7120a838..2ce3fbb4a9f 100644 --- a/net/bounce/Makefile +++ b/net/bounce/Makefile @@ -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 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} MAINTAINER= p99dreyf@criens.u-psud.fr COMMENT= Tool to forward TCP connection from one IP to another +CONFLICTS+= majordomo-* + WRKSRC= ${WRKDIR}/bounce HAS_CONFIGURE= yes CONFIGURE_ARGS+= --prefix=${PREFIX:Q} |