3 files changed, 86 insertions, 85 deletions

diff --git a/graphics/imc/Makefile b/graphics/imc/Makefile
index 8c533448fb33..b032bfb1581f 100644
--- a/graphics/imc/Makefile
+++ b/graphics/imc/Makefile
@@ -1,7 +1,7 @@
 # ex:ts=8
-# Ports collection makefile for:	imc
-# Date created:			Apr 30, 2002
-# Whom:				ijliao
+# New ports collection makefile for:	imc
+# Date created:				Apr 30, 2002
+# Whom:					Ying-Chieh Liao <ijliao@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -17,18 +17,20 @@ COMMENT=	Image Compiler
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD \
 		${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_PERL5=	yes
 
-MAN1=	imc.1
+MAN1=		imc.1
 
-.if !defined(NOPORTDOCS)
 post-install:
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${CP} -R ${WRKSRC}/doc/* ${DOCSDIR}
+.endif
+.if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
 	${CP} -R ${WRKSRC}/examples/* ${EXAMPLESDIR}
 .endif
diff --git a/graphics/imc/pkg-descr b/graphics/imc/pkg-descr
index e736fdb087dd..ce8e65543f67 100644
--- a/graphics/imc/pkg-descr
+++ b/graphics/imc/pkg-descr
@@ -1,22 +1,21 @@
-imc, the Image Compiler
+This is the Image Compiler, which generates images from textual description.
+Most important features include:
 
-General features
-
-Generally, the most important features are the following:
-   - Does not need a display to run.
-   - Can be run from the command line or as CGI script. In the latter case,
-     the image is output to the browser (in PNG or JPEG format).
-   - The size of the output image is automatically determined, no size has to
-     be specified (although you can give a fixed size)
-   - Coordinates are in pixels, only positive coordinates are visible. Angles
-     are in integer degrees, no limitations (except the maximum integer limit).
-     Colors can be specified in one of three formats, including X11 color
-     (rgb) strings
-   - A pre-processor can be applied on the input file first; simple arithmetic
-     can be performed.
-   - Supports commands for drawing lines, circles (filled or not), rectangles
-     (filled or not), ellipses (filled or not), arcs and text. Images can also
-     be imported. For text and images an alignment parameter is available, and
-     text and images can be rotated over any angle and can also be mirrored.
+  - Does not need display to run
+  - Can be run from the command line or as CGI script.  In the latter case,
+    the image is output to the browser (in PNG or JPEG format)
+  - The size of the output image is automatically determined, no size has to
+    be specified (although you can give a fixed size
+  - Coordinates are in pixels, only positive coordinates are visible.  Angles
+    are in integer degrees, no limitations (except the maximum integer limit).
+    Colors can be specified in one of three formats, including X11 color
+    (rgb) strings
+  - A pre-processor can be applied on the input file first; simple
+    arithmetic can be performed
+  - Supports commands for drawing lines, circles (filled or not), rectangles
+    (filled or not), ellipses (filled or not), arcs, and text.  Images can
+    also be imported.  For text and images an alignment parameter is
+    available, and text and images can be rotated over any angle and can
+    also be mirrored
 
 WWW: http://users.skynet.be/Peter.Verthez/projects/imc/
diff --git a/graphics/imc/pkg-plist b/graphics/imc/pkg-plist
index 5a7068e40e2e..6b5565837a4a 100644
--- a/graphics/imc/pkg-plist
+++ b/graphics/imc/pkg-plist
@@ -1,60 +1,60 @@
 bin/imc
-%%PORTDOCS%%share/doc/imc/Makefile
-%%PORTDOCS%%share/doc/imc/Makefile.am
-%%PORTDOCS%%share/doc/imc/Makefile.in
-%%PORTDOCS%%share/doc/imc/imc.html
-%%PORTDOCS%%share/doc/imc/imc.ref
-%%PORTDOCS%%share/doc/imc/imc.txt
-%%PORTDOCS%%@dirrm share/doc/imc
-%%PORTDOCS%%share/examples/imc/Makefile
-%%PORTDOCS%%share/examples/imc/Makefile.am
-%%PORTDOCS%%share/examples/imc/Makefile.in
-%%PORTDOCS%%share/examples/imc/arc.imc
-%%PORTDOCS%%share/examples/imc/basic.imc
-%%PORTDOCS%%share/examples/imc/basic2.imc
-%%PORTDOCS%%share/examples/imc/basicjpg.imc
-%%PORTDOCS%%share/examples/imc/basicgif.imc
-%%PORTDOCS%%share/examples/imc/closedarc.imc
-%%PORTDOCS%%share/examples/imc/closedarc2.imc
-%%PORTDOCS%%share/examples/imc/fill.imc
-%%PORTDOCS%%share/examples/imc/grid200x200.imc
-%%PORTDOCS%%share/examples/imc/imagealign1.imc
-%%PORTDOCS%%share/examples/imc/imagealign2.imc
-%%PORTDOCS%%share/examples/imc/imagerotate.imc
-%%PORTDOCS%%share/examples/imc/imcmp.pl
-%%PORTDOCS%%share/examples/imc/next.jpg
-%%PORTDOCS%%share/examples/imc/next.gif
-%%PORTDOCS%%share/examples/imc/next.png
-%%PORTDOCS%%share/examples/imc/origin.imc
-%%PORTDOCS%%share/examples/imc/piechart.imc
-%%PORTDOCS%%share/examples/imc/ref/Makefile.in
-%%PORTDOCS%%share/examples/imc/ref/Makefile.am
-%%PORTDOCS%%share/examples/imc/ref/arc.png.ref
-%%PORTDOCS%%share/examples/imc/ref/basic.png.ref
-%%PORTDOCS%%share/examples/imc/ref/basic2.png.ref
-%%PORTDOCS%%share/examples/imc/ref/basicjpg.png.ref
-%%PORTDOCS%%share/examples/imc/ref/basicgif.png.ref
-%%PORTDOCS%%share/examples/imc/ref/closedarc.png.ref
-%%PORTDOCS%%share/examples/imc/ref/closedarc2.png.ref
-%%PORTDOCS%%share/examples/imc/ref/fill.png.ref
-%%PORTDOCS%%share/examples/imc/ref/grid200x200.png.ref
-%%PORTDOCS%%share/examples/imc/ref/imagealign1.png.ref
-%%PORTDOCS%%share/examples/imc/ref/imagealign2.png.ref
-%%PORTDOCS%%share/examples/imc/ref/imagerotate.png.ref
-%%PORTDOCS%%share/examples/imc/ref/origin.png.ref
-%%PORTDOCS%%share/examples/imc/ref/piechart.png.ref
-%%PORTDOCS%%share/examples/imc/ref/text.png.ref
-%%PORTDOCS%%share/examples/imc/ref/textalign1.png.ref
-%%PORTDOCS%%share/examples/imc/ref/textalign2.png.ref
-%%PORTDOCS%%share/examples/imc/ref/textrotate.png.ref
-%%PORTDOCS%%share/examples/imc/ref/Makefile
-%%PORTDOCS%%share/examples/imc/ref/transparent.png.ref
-%%PORTDOCS%%share/examples/imc/rgb.txt
-%%PORTDOCS%%share/examples/imc/test_script
-%%PORTDOCS%%share/examples/imc/text.imc
-%%PORTDOCS%%share/examples/imc/textalign1.imc
-%%PORTDOCS%%share/examples/imc/textalign2.imc
-%%PORTDOCS%%share/examples/imc/textrotate.imc
-%%PORTDOCS%%share/examples/imc/transparent.imc
-%%PORTDOCS%%@dirrm share/examples/imc/ref
-%%PORTDOCS%%@dirrm share/examples/imc
+%%PORTDOCS%%%%DOCSDIR%%/Makefile
+%%PORTDOCS%%%%DOCSDIR%%/Makefile.am
+%%PORTDOCS%%%%DOCSDIR%%/Makefile.in
+%%PORTDOCS%%%%DOCSDIR%%/imc.html
+%%PORTDOCS%%%%DOCSDIR%%/imc.ref
+%%PORTDOCS%%%%DOCSDIR%%/imc.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.am
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.in
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/arc.imc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic.imc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic2.imc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basicjpg.imc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basicgif.imc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/closedarc.imc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/closedarc2.imc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fill.imc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/grid200x200.imc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/imagealign1.imc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/imagealign2.imc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/imagerotate.imc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/imcmp.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/next.jpg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/next.gif
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/next.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/origin.imc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/piechart.imc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ref/Makefile.in
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ref/Makefile.am
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ref/arc.png.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ref/basic.png.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ref/basic2.png.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ref/basicjpg.png.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ref/basicgif.png.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ref/closedarc.png.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ref/closedarc2.png.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ref/fill.png.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ref/grid200x200.png.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ref/imagealign1.png.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ref/imagealign2.png.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ref/imagerotate.png.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ref/origin.png.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ref/piechart.png.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ref/text.png.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ref/textalign1.png.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ref/textalign2.png.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ref/textrotate.png.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ref/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ref/transparent.png.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rgb.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test_script
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text.imc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/textalign1.imc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/textalign2.imc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/textrotate.imc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/transparent.imc
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/ref
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%