Fix CONFLICTS (remove redundancy, mostly)

7 files changed, 7 insertions, 21 deletions

diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 1eb5501a894..b6a6d2eec2d 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 1999/02/03 13:00:18 frueauf Exp $
+# $NetBSD: Makefile,v 1.38 1999/02/20 22:48:33 hubertf Exp $
 #
 
 DISTNAME=       fetchmail-4.7.7
@@ -10,8 +10,6 @@ MASTER_SITES=	ftp://ftp.ccil.org/pub/esr/fetchmail/ \
 MAINTAINER=	mycroft@netbsd.org
 HOMEPAGE=	http://sagan.earthspace.net/~esr/fetchmail/
 
-CONFLICTS=	fetchmail-*
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=  LDFLAGS="${CFLAGS}"
 
diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index e5bf7ed2def..cbea3588411 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1999/02/08 23:31:59 tron Exp $
+# $NetBSD: Makefile,v 1.9 1999/02/20 22:48:34 hubertf Exp $
 #
 
 DISTNAME=       imap-4.5
@@ -14,8 +14,6 @@ USE_LIBTOOL=	yes
 
 INST_PROG=	${LIBTOOL} ${INSTALL_PROGRAM}
 INST_LIB=	${LIBTOOL} ${INSTALL_DATA}
-CONFLICTS=	imap-uw-*
-
 MESSAGE_FILE=	${WRKDIR}/.MESSAGE
 
 do-configure:
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 94061e0d9e1..d714ed1b204 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 1999/02/12 18:32:38 tron Exp $
+# $NetBSD: Makefile,v 1.19 1999/02/20 22:48:34 hubertf Exp $
 
 DISTNAME=	mutt-${MUTT_VERSION}
 CATEGORIES=	mail
@@ -13,8 +13,6 @@ HOMEPAGE=	http://www.mutt.org/
 
 DEPENDS+=	ncurses-1.9.9g:../../devel/ncurses
 
-CONFLICTS=	mutt-*
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+= --with-curses=${PREFIX} --with-exec-shell=/bin/ksh \
 		 --with-docdir=${PREFIX}/share/doc/mutt
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index 80904e7cba1..215b0d87779 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 1998/08/20 15:17:10 tsarna Exp $
+# $NetBSD: Makefile,v 1.21 1999/02/20 22:48:34 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/08/04 06:51:28 markm Exp
 #
 
@@ -9,8 +9,6 @@ MASTER_SITES=   ftp://ftp.math.gatech.edu/pub/nmh/
 MAINTAINER=     packages@netbsd.org
 HOMEPAGE=	http://www.math.gatech.edu/nmh/
 
-CONFLICTS=	nmh-0.17 nmh-0.22 nmh-0.23 nmh-0.24 nmh-0.25 nmh-0.26
-
 # Mail Transport Agent - either "smtp" or "sendmail"
 NMH_MTA?=	smtp
 
diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index 91070a35bf3..7b7400aeba4 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 1998/11/13 16:32:37 tv Exp $
+# $NetBSD: Makefile,v 1.28 1999/02/20 22:48:34 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.21 1997/03/26 02:12:07 ache Exp
 #
 
@@ -13,8 +13,6 @@ HOMEPAGE=	http://www.washington.edu/pine/
 # This pkg doesn't build pico or libpico; the pico pkg does that part.
 DEPENDS=	pico-3.4:../../editors/pico
 
-CONFLICTS=	pine-3.96 pine-4.00 pine-4.02
-
 do-configure:
 	${CP} -f ${WRKSRC}/pine/osdep/os-neb.h ${WRKSRC}/pine/osdep/os-neb.h.orig
 	${SED} -e 's@/usr/local/lib/@${PREFIX}/etc/@' \
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index 007fadf3706..7a93047683f 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 1998/09/08 22:15:21 tron Exp $
+# $NetBSD: Makefile,v 1.13 1999/02/20 22:48:34 hubertf Exp $
 #
 
 DISTNAME=		qpopper2.53
@@ -10,8 +10,6 @@ EXTRACT_SUFX=		.tar.Z
 MAINTAINER=		mellon@fugue.com
 HOMEPAGE=		http://eudora.qualcomm.com/freeware/qpop.html
 
-CONFLICTS=		qpopper2.41beta1 qpopper-2.5 qpopper-2.52
-
 MIRROR_DISTFILE=	no
 
 GNU_CONFIGURE=		yes
diff --git a/mail/wmmail/Makefile b/mail/wmmail/Makefile
index 413d630c3cd..568d623dd9a 100644
--- a/mail/wmmail/Makefile
+++ b/mail/wmmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1999/02/02 10:34:40 tron Exp $
+# $NetBSD: Makefile,v 1.6 1999/02/20 22:48:35 hubertf Exp $
 
 DISTNAME=	WMMail.app-0.62
 PKGNAME=	wmmail-0.62
@@ -11,8 +11,6 @@ HOMEPAGE=	http://www.eecg.utoronto.ca/~chanb/wmmail.html
 BUILD_DEPENDS+=	automake:../../devel/automake
 DEPENDS+=	windowmaker-0.51.0:../../x11/windowmaker
 
-CONFLICTS=	wmmail-*
-
 USE_X11BASE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes