aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--UPDATING7
-rw-r--r--cad/slffea/Makefile2
-rw-r--r--lang/TenDRA/Makefile2
-rw-r--r--lang/swi-pl/Makefile2
4 files changed, 10 insertions, 3 deletions
diff --git a/UPDATING b/UPDATING
index 1e9ae5670a26..19d89b205b14 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,13 @@ You should get into the habit of checking this file for changes each
time you update your ports collection, before attempting any port
upgrades.
+20050306:
+ AFFECTS: users of math/ploticus
+ AUTHOR: linimon@FreeBSD.org
+
+ ploticus is now installed as bin/ploticus rather than bin/pl to
+ avoid useless conflicts with other ports.
+
20050303:
AFFECTS: users of net/i2p
AUTHOR: lioux@FreeBSD.org
diff --git a/cad/slffea/Makefile b/cad/slffea/Makefile
index a298e04a1c79..9fb185ed0b56 100644
--- a/cad/slffea/Makefile
+++ b/cad/slffea/Makefile
@@ -18,7 +18,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= San Le's Free Finite Element Analysis
-CONFLICTS= ploticus-* swi-pl-* TenDRA-*
+CONFLICTS= swi-pl-* TenDRA-*
USE_REINPLACE= yes
USE_MESA= yes
CFLAGS+= -I${X11BASE}/include ${PTHREAD_CFLAGS}
diff --git a/lang/TenDRA/Makefile b/lang/TenDRA/Makefile
index 584d3d691d44..ae8914f78c3e 100644
--- a/lang/TenDRA/Makefile
+++ b/lang/TenDRA/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME:L}-${PORTVERSION:S/4.//}
MAINTAINER= stefanf@FreeBSD.org
COMMENT= A portable BSD-licensed compiler suite
-CONFLICTS= swi-pl* ploticus-* slffea-*
+CONFLICTS= swi-pl* slffea-*
ONLY_FOR_ARCHS= i386 alpha
DIST_SUBDIR= ${PKGBASE}
diff --git a/lang/swi-pl/Makefile b/lang/swi-pl/Makefile
index 4ac46211e1e4..16fe4aaaaef8 100644
--- a/lang/swi-pl/Makefile
+++ b/lang/swi-pl/Makefile
@@ -15,7 +15,7 @@ DISTNAME= pl-${PORTVERSION}
MAINTAINER= g.gonter@ieee.org
COMMENT= Edinburgh-style Prolog compiler
-CONFLICTS= ploticus-[0-9]* slffea-[0-9]* TenDRA-[0-9]*
+CONFLICTS= slffea-[0-9]* TenDRA-[0-9]*
NOPRECIOUSMAKEVARS=yes
USE_REINPLACE= yes
USE_GMAKE= yes