diff options
| author | cheusov <cheusov@pkgsrc.org> | 2012-10-05 17:17:04 +0000 |
|---|---|---|
| committer | cheusov <cheusov@pkgsrc.org> | 2012-10-05 17:17:04 +0000 |
| commit | f7d8bd898d324717f2473af1cf78af6ce8859941 (patch) | |
| tree | fdd6815eb9793fb3908dd283dda79967ec0bbe3f | |
| parent | dc59abaddd6c252b5ba4fa643c69a3b4d82a3368 (diff) | |
| download | pkgsrc-f7d8bd898d324717f2473af1cf78af6ce8859941.tar.gz | |
CONFLICTS between lang/sr and security/srm
| -rw-r--r-- | lang/sr/Makefile | 6 | ||||
| -rw-r--r-- | security/srm/Makefile | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/lang/sr/Makefile b/lang/sr/Makefile index e57afb4b0f1..eb0508f9913 100644 --- a/lang/sr/Makefile +++ b/lang/sr/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.22 2012/10/02 20:11:54 asau Exp $ +# $NetBSD: Makefile,v 1.23 2012/10/05 17:17:04 cheusov Exp $ # DISTNAME= sr233 PKGNAME= sr-2.3.3 -PKGREVISION= 7 +PKGREVISION= 8 CATEGORIES= lang parallel MASTER_SITES= ftp://ftp.cs.arizona.edu/sr/ EXTRACT_SUFX= .tar.Z @@ -14,6 +14,8 @@ COMMENT= The SR language compiler and run time system NOT_FOR_PLATFORM= *-*-x86_64 # site: "doesn't run on 64-bit/AMD64" +CONFLICTS+= srm-[0-9]* # bin/srm + MAKE_JOBS_SAFE= no USE_TOOLS+= yacc diff --git a/security/srm/Makefile b/security/srm/Makefile index 0336175228e..e5637fbf1f1 100644 --- a/security/srm/Makefile +++ b/security/srm/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2010/11/01 00:08:15 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2012/10/05 17:17:04 cheusov Exp $ # DISTNAME= srm-1.2.8 +PKGREVISION= 1 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=srm/} @@ -13,4 +14,6 @@ PKG_DESTDIR_SUPPORT= user-destdir GNU_CONFIGURE= yes +CONFLICTS+= sr-[0-9]* # bin/srm + .include "../../mk/bsd.pkg.mk" |