summaryrefslogtreecommitdiff
path: root/mbone
diff options
context:
space:
mode:
authorhubertf <hubertf@pkgsrc.org>1999-02-20 22:48:24 +0000
committerhubertf <hubertf@pkgsrc.org>1999-02-20 22:48:24 +0000
commit2a95ad9c6be52511880e6ee241b087af70706624 (patch)
treef0ac98b899382f539e1e39385f1316edd18626bd /mbone
parent2821cb11104fb7319e84b4cd1808cf56f3604a54 (diff)
downloadpkgsrc-2a95ad9c6be52511880e6ee241b087af70706624.tar.gz
Fix CONFLICTS (remove redundancy, mostly)
Diffstat (limited to 'mbone')
-rw-r--r--mbone/rat/Makefile4
-rw-r--r--mbone/sdr/Makefile4
2 files changed, 2 insertions, 6 deletions
diff --git a/mbone/rat/Makefile b/mbone/rat/Makefile
index b5c19e47e56..1bf57e2c576 100644
--- a/mbone/rat/Makefile
+++ b/mbone/rat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 1999/01/30 23:18:52 agc Exp $
+# $NetBSD: Makefile,v 1.12 1999/02/20 22:48:35 hubertf Exp $
#
DISTNAME= rat-3.0.28
@@ -10,8 +10,6 @@ HOMEPAGE= http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/
DEPENDS+= tk-8.0p2:../../x11/tk80
-CONFLICTS= rat-3.0.24
-
RESTRICTED= "Contains DES encryption"
MIRROR_DISTFILE=no
USE_GMAKE= yes
diff --git a/mbone/sdr/Makefile b/mbone/sdr/Makefile
index b93fe05af0c..8ca0dd5634a 100644
--- a/mbone/sdr/Makefile
+++ b/mbone/sdr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 1999/01/30 23:18:52 agc Exp $
+# $NetBSD: Makefile,v 1.18 1999/02/20 22:48:36 hubertf Exp $
#
DISTNAME= sdr-2.5.8
@@ -10,8 +10,6 @@ HOMEPAGE= http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/
DEPENDS+= tk-8.0p2:../../x11/tk80
-CONFLICTS= sdr-2.4a7mmrz
-
MIRROR_DISTFILE= no
WRKSRC= ${WRKDIR}/sdr
USE_GMAKE= yes