diff options
| -rw-r--r-- | cad/gnucap/Makefile | 4 | ||||
| -rw-r--r-- | games/starfighter/Makefile | 4 | ||||
| -rw-r--r-- | lang/elisp-manual/Makefile | 4 | ||||
| -rw-r--r-- | mail/postfix-current/Makefile | 3 | ||||
| -rw-r--r-- | math/mtl/Makefile | 3 | ||||
| -rw-r--r-- | net/flodo/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/vbetool/Makefile | 4 | ||||
| -rw-r--r-- | textproc/subtitleripper/Makefile | 4 |
8 files changed, 21 insertions, 9 deletions
diff --git a/cad/gnucap/Makefile b/cad/gnucap/Makefile index de6ac250520..af01a2a17ed 100644 --- a/cad/gnucap/Makefile +++ b/cad/gnucap/Makefile @@ -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 @@ COMMENT= General purpose circuit simulator PKG_INSTALLATION_TYPES= overwrite pkgviews +CONFLICTS+= gnucap-2006-07-[0-9]* + USE_LANGUAGES= c c++ USE_TOOLS+= gmake USE_GNU_READLINE= YES diff --git a/games/starfighter/Makefile b/games/starfighter/Makefile index a9ed7c1fbd3..3b5093d8327 100644 --- a/games/starfighter/Makefile +++ b/games/starfighter/Makefile @@ -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_TOOLS+= gmake USE_LANGUAGES= c++ WRKSRC= ${WRKDIR}/${DISTNAME:S/-1$//} +CONFLICTS+= starfighter-1.1-[0-9]* + MAKE_FILE= makefile post-install: diff --git a/lang/elisp-manual/Makefile b/lang/elisp-manual/Makefile index 7f7c162d133..f8f93bc23c0 100644 --- a/lang/elisp-manual/Makefile +++ b/lang/elisp-manual/Makefile @@ -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 @@ MAINTAINER= uebayasi@NetBSD.org 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 --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile index 48743fdca6f..261d9aee463 100644 --- a/mail/postfix-current/Makefile +++ b/mail/postfix-current/Makefile @@ -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 @@ COMMENT= Postfix SMTP server and tools #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 --git a/math/mtl/Makefile b/math/mtl/Makefile index e5eb89eafba..fe35f33ca60 100644 --- a/math/mtl/Makefile +++ b/math/mtl/Makefile @@ -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 @@ COMMENT= Matrix Template Library GNU_CONFIGURE= yes NO_BUILD= yes +CONFLICTS+= mtl-2.1.2-[0-9]* USE_LANGUAGES= c c++ post-install: diff --git a/net/flodo/Makefile b/net/flodo/Makefile index 9558d3f09b4..6b9d7bad603 100644 --- a/net/flodo/Makefile +++ b/net/flodo/Makefile @@ -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 @@ LDFLAGS+= -L${BUILDLINK_PREFIX.libpcap}/lib 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 --git a/sysutils/vbetool/Makefile b/sysutils/vbetool/Makefile index d2fa4e69719..bbc31d7ce3b 100644 --- a/sysutils/vbetool/Makefile +++ b/sysutils/vbetool/Makefile @@ -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 @@ PKG_DESTDIR_SUPPORT= user-destdir 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 --git a/textproc/subtitleripper/Makefile b/textproc/subtitleripper/Makefile index 30936109d87..3e1a95c27ba 100644 --- a/textproc/subtitleripper/Makefile +++ b/textproc/subtitleripper/Makefile @@ -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 @@ USE_TOOLS+= gmake 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 |