pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc CONFLICTS between lang/sr and security/srm
details: https://anonhg.NetBSD.org/pkgsrc/rev/1062eb487b0b
branches: trunk
changeset: 609528:1062eb487b0b
user: cheusov <cheusov%pkgsrc.org@localhost>
date: Fri Oct 05 17:17:04 2012 +0000
description:
CONFLICTS between lang/sr and security/srm
diffstat:
lang/sr/Makefile | 6 ++++--
security/srm/Makefile | 5 ++++-
2 files changed, 8 insertions(+), 3 deletions(-)
diffs (44 lines):
diff -r 55faa63a7820 -r 1062eb487b0b lang/sr/Makefile
--- a/lang/sr/Makefile Fri Oct 05 17:15:09 2012 +0000
+++ b/lang/sr/Makefile Fri Oct 05 17:17:04 2012 +0000
@@ -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 @@
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 -r 55faa63a7820 -r 1062eb487b0b security/srm/Makefile
--- a/security/srm/Makefile Fri Oct 05 17:15:09 2012 +0000
+++ b/security/srm/Makefile Fri Oct 05 17:17:04 2012 +0000
@@ -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 @@
GNU_CONFIGURE= yes
+CONFLICTS+= sr-[0-9]* # bin/srm
+
.include "../../mk/bsd.pkg.mk"
Home |
Main Index |
Thread Index |
Old Index