[pkgsrc/trunk]: pkgsrc Add CONFLICTS line for previous PKGNAME versions.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9376e186e072
branches:  trunk
changeset: 539642:9376e186e072
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Mar 10 10:33:38 2008 +0000

description:
Add CONFLICTS line for previous PKGNAME versions.
Suggested by Alan Barrett.

diffstat:

 cad/gnucap/Makefile              |  4 +++-
 games/starfighter/Makefile       |  4 +++-
 lang/elisp-manual/Makefile       |  4 ++--
 mail/postfix-current/Makefile    |  3 ++-
 math/mtl/Makefile                |  3 ++-
 net/flodo/Makefile               |  4 +++-
 sysutils/vbetool/Makefile        |  4 +++-
 textproc/subtitleripper/Makefile |  4 +++-
 8 files changed, 21 insertions(+), 9 deletions(-)

diffs (142 lines):

diff -r 1b945728adde -r 9376e186e072 cad/gnucap/Makefile
--- a/cad/gnucap/Makefile       Mon Mar 10 09:00:40 2008 +0000
+++ b/cad/gnucap/Makefile       Mon Mar 10 10:33:38 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2008/03/04 12:17:48 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2008/03/10 10:33:38 wiz Exp $
 #
 
 DISTNAME=      gnucap-2006-07-08
@@ -13,6 +13,8 @@
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
+CONFLICTS+=    gnucap-2006-07-[0-9]*
+
 USE_LANGUAGES=         c c++
 USE_TOOLS+=            gmake
 USE_GNU_READLINE=      YES
diff -r 1b945728adde -r 9376e186e072 games/starfighter/Makefile
--- a/games/starfighter/Makefile        Mon Mar 10 09:00:40 2008 +0000
+++ b/games/starfighter/Makefile        Mon Mar 10 10:33:38 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/03/04 12:17:47 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2008/03/10 10:33:38 wiz Exp $
 #
 
 DISTNAME=      starfighter-1.1-1
@@ -16,6 +16,8 @@
 USE_LANGUAGES= c++
 WRKSRC=                ${WRKDIR}/${DISTNAME:S/-1$//}
 
+CONFLICTS+=    starfighter-1.1-[0-9]*
+
 MAKE_FILE=     makefile
 
 post-install:
diff -r 1b945728adde -r 9376e186e072 lang/elisp-manual/Makefile
--- a/lang/elisp-manual/Makefile        Mon Mar 10 09:00:40 2008 +0000
+++ b/lang/elisp-manual/Makefile        Mon Mar 10 10:33:38 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2008/03/06 10:44:46 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2008/03/10 10:33:38 wiz Exp $
 
 DISTNAME=      elisp-manual-21-2.8
 PKGNAME=       elisp-manual-21.2.8
@@ -9,7 +9,7 @@
 HOMEPAGE=      http://www.gnu.org/software/emacs/emacs.html
 COMMENT=       The Emacs Lisp Reference Manual for GNU Emacs Version 21.2
 
-CONFLICTS=     {emacs,emacs-nox11}>=22.1
+CONFLICTS=     {emacs,emacs-nox11}>=22.1 elisp-manual-21-[0-9]*
 
 GNU_CONFIGURE= YES
 INFO_FILES=    # PLIST
diff -r 1b945728adde -r 9376e186e072 mail/postfix-current/Makefile
--- a/mail/postfix-current/Makefile     Mon Mar 10 09:00:40 2008 +0000
+++ b/mail/postfix-current/Makefile     Mon Mar 10 10:33:38 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.95 2008/03/06 10:44:46 wiz Exp $
+# $NetBSD: Makefile,v 1.96 2008/03/10 10:33:38 wiz Exp $
 
 DISTNAME=      postfix-2.6-20080216
 PKGNAME=       postfix-2.6.20080216
@@ -12,6 +12,7 @@
 #LICENSE=      postfix-license
 
 CONFLICTS+=    courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]*
+CONFLICTS+=    postfix-2.6-[0-9]*
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
diff -r 1b945728adde -r 9376e186e072 math/mtl/Makefile
--- a/math/mtl/Makefile Mon Mar 10 09:00:40 2008 +0000
+++ b/math/mtl/Makefile Mon Mar 10 10:33:38 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/03/04 12:17:48 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2008/03/10 10:33:38 wiz Exp $
 
 DISTNAME=              mtl-2.1.2-21
 PKGNAME=               mtl-2.1.2.21
@@ -12,6 +12,7 @@
 GNU_CONFIGURE=         yes
 NO_BUILD=              yes
 
+CONFLICTS+=            mtl-2.1.2-[0-9]*
 USE_LANGUAGES=         c c++
 
 post-install:
diff -r 1b945728adde -r 9376e186e072 net/flodo/Makefile
--- a/net/flodo/Makefile        Mon Mar 10 09:00:40 2008 +0000
+++ b/net/flodo/Makefile        Mon Mar 10 10:33:38 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/03/06 10:44:46 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2008/03/10 10:33:38 wiz Exp $
 #
 
 DISTNAME=              flodo-v4
@@ -18,6 +18,8 @@
 
 INSTALLATION_DIRS=     ${PKGMANDIR}/man8 sbin
 
+CONFLICTS+=            flodo-4-[0-9]*
+
 do-build:
        cd ${WRKSRC} && ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o flodo flodo.c hash.c local_mac.c -lpcap
 
diff -r 1b945728adde -r 9376e186e072 sysutils/vbetool/Makefile
--- a/sysutils/vbetool/Makefile Mon Mar 10 09:00:40 2008 +0000
+++ b/sysutils/vbetool/Makefile Mon Mar 10 10:33:38 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/03/05 23:10:28 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2008/03/10 10:33:38 wiz Exp $
 #
 
 DISTNAME=      vbetool_0.7-1
@@ -15,6 +15,8 @@
 
 ONLY_FOR_PLATFORM+=    Linux-*-i386 NetBSD-*-i386 NetBSD-*-x86_64
 
+CONFLICTS+=    vbetool-0.7-[0-9]*
+
 WRKSRC=                ${WRKDIR}/vbetool-0.7
 USE_TOOLS+=    gmake
 GNU_CONFIGURE= yes
diff -r 1b945728adde -r 9376e186e072 textproc/subtitleripper/Makefile
--- a/textproc/subtitleripper/Makefile  Mon Mar 10 09:00:40 2008 +0000
+++ b/textproc/subtitleripper/Makefile  Mon Mar 10 10:33:38 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2008/03/04 12:17:48 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2008/03/10 10:33:38 wiz Exp $
 #
 
 DISTNAME=      subtitleripper-0.3-1
@@ -18,6 +18,8 @@
 WRKSRC=                        ${WRKDIR}/subtitleripper
 INSTALLATION_DIRS=     bin
 
+CONFLICTS+=    subtitleripper-0.3-[0-9]*
+
 do-install:
        ${SED} -e "s,@PREFIX@,${PREFIX}," <${WRKSRC}/pgm2txt >${WRKDIR}/pgm2txt
        ${INSTALL_SCRIPT} ${WRKDIR}/pgm2txt ${PREFIX}/bin