de-conflict geomview/ImageMagick by renaming the affected manpage.

ok aja@

graphics/ImageMagick/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.129 2013/08/11 18:41:15 zhuk Exp $
+# $OpenBSD: Makefile,v 1.130 2013/08/12 10:03:00 sthen Exp $
 
 SHARED_ONLY=		Yes
 
@@ -6,7 +6,7 @@ COMMENT=		image processing tools
 
 VER=			6.7.7
 DASHVER=		7
-REVISION=		3
+REVISION=		4
 DISTNAME=		ImageMagick-${VER}-${DASHVER}
 PKGNAME=		ImageMagick-${VER}.${DASHVER}
 

graphics/ImageMagick/pkg/PLIST

@@ -1,5 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.43 2013/08/11 18:41:15 zhuk Exp $
-@conflict geomview-*
+@comment $OpenBSD: PLIST,v 1.44 2013/08/12 10:03:00 sthen Exp $
 @conflict p5-PerlMagick-*
 @pkgpath graphics/ImageMagick,no_x11
 bin/Magick++-config

graphics/geomview/Makefile

@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.8 2013/08/11 18:41:15 zhuk Exp $
+# $OpenBSD: Makefile,v 1.9 2013/08/12 10:03:00 sthen Exp $
 
 COMMENT =		geometry viewer for OOGL file formats
 
 V =			1.9.4
 DISTNAME =		geomview-$V
-REVISION=		2
+REVISION =		3
 CATEGORIES =		graphics
 
 HOMEPAGE =		http://www.geomview.org
@@ -53,5 +53,7 @@ post-install:
 	mv ${PREFIX}/man/man5/${i}gv ${PREFIX}/man/man5/${i}
 .endfor
 	chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/geomview/html/
+	# avoid conflict with graphics/ImageMagick
+	mv ${PREFIX}/man/man1/animate.1 ${PREFIX}/man/man1/geomview-animate.1
 
 .include <bsd.port.mk>

graphics/geomview/pkg/PLIST

@@ -1,5 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2013/08/11 18:41:15 zhuk Exp $
-@conflict ImageMagick-*
+@comment $OpenBSD: PLIST,v 1.3 2013/08/12 10:03:00 sthen Exp $
 %%SHARED%%
 @bin bin/anytooff
 @bin bin/anytoucd
@@ -192,7 +191,7 @@ libexec/geomview/drawbdy
 libexec/geomview/gvclock
 @bin libexec/geomview/gvx
 @bin libexec/geomview/nose
-@man man/man1/animate.1
+@man man/man1/geomview-animate.1
 @man man/man1/anytooff.1
 @man man/man1/anytoucd.1
 @man man/man1/bdy.1