When compiled with X, ImageMagick conflicts with display. Warn

users about the conflict.  Squeeze the pkg-comment files so they
are less than 71 characters.

4 files changed, 8 insertions, 2 deletions

diff --git a/graphics/ImageMagick/pkg-comment b/graphics/ImageMagick/pkg-comment
index 3cc6b88d77a2..80dcf2f820ab 100644
--- a/graphics/ImageMagick/pkg-comment
+++ b/graphics/ImageMagick/pkg-comment
@@ -1 +1 @@
-Image manipulation and (optionally, using X) interactive display tools
+Image processing tools (interactive optional--misc/display conflict)
diff --git a/graphics/ImageMagick/pkg-descr b/graphics/ImageMagick/pkg-descr
index d96b68d439cf..69efe5534d1c 100644
--- a/graphics/ImageMagick/pkg-descr
+++ b/graphics/ImageMagick/pkg-descr
@@ -8,4 +8,7 @@ The package can be built _without_ the GUI (X11) support at all -- it
 will not have the display, import, and animate functionality, but remain
 extremely useful for image manipulation.
 
+The optional "display" utility conflicts with the utility of the
+same name from the misc/display port/package.
+
 WWW: http://www.ImageMagick.org/
diff --git a/misc/display/pkg-comment b/misc/display/pkg-comment
index fbe5ecbaa0d1..5f2a98423a35 100644
--- a/misc/display/pkg-comment
+++ b/misc/display/pkg-comment
@@ -1 +1 @@
-Runs a specified command over and over
+Runs command repeatedly; shows output (can conflict with ImageMagick)
diff --git a/misc/display/pkg-descr b/misc/display/pkg-descr
index 6ff4305c1c35..1a4b95ffbb03 100644
--- a/misc/display/pkg-descr
+++ b/misc/display/pkg-descr
@@ -2,3 +2,6 @@ Display runs a specified command over and over, printing the output
 through curses(3X). The command can be compound and the delay
 between executions is settable on the command line.  The output
 from the command had better fit on a single screen, of course.
+
+This can conflict with the application of the same name from the
+graphics/ImageMagick port/package.