2 files changed, 103 insertions, 103 deletions

diff --git a/math/ploticus/Makefile b/math/ploticus/Makefile
index 9d18d402b508..5373994aee55 100644
--- a/math/ploticus/Makefile
+++ b/math/ploticus/Makefile
@@ -13,8 +13,8 @@ CATEGORIES=	math
 MASTER_SITES=	http://ploticus.sourceforge.net/download/
 DISTNAME=	plsrc${PORTVERSION:S/.//}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Generates plots and graphs from data
+MAINTAINER?=	ports@FreeBSD.org
+COMMENT?=	Generates plots and graphs from data
 
 LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
@@ -38,7 +38,7 @@ MAKE_ARGS=	CC="${CC}" FLAGS="${CFLAGS}" \
 		GDFREETYPE="-DGDFREETYPE" PREFABS_DIR="${DATADIR}"
 ALL_TARGET=	plgd18
 
-.ifdef WITHOUT_X11
+.ifdef (WITHOUT_X11)
 MAKE_ARGS+=	NOXFLAG=-DNOX11 XLIBS= XOBJ=
 PKGNAMESUFFIX=	-nox11
 .else
diff --git a/math/ploticus/pkg-plist b/math/ploticus/pkg-plist
index 14fe49afa96d..285e4910913d 100644
--- a/math/ploticus/pkg-plist
+++ b/math/ploticus/pkg-plist
@@ -1,104 +1,104 @@
 @comment $FreeBSD$
 bin/pl
-%%PORTDOCS%%share/doc/ploticus/Changelog.html
-%%PORTDOCS%%share/doc/ploticus/Contents.html
-%%PORTDOCS%%share/doc/ploticus/Copyright.html
-%%PORTDOCS%%share/doc/ploticus/Download.html
-%%PORTDOCS%%share/doc/ploticus/Faq.html
-%%PORTDOCS%%share/doc/ploticus/Faq.other.html
-%%PORTDOCS%%share/doc/ploticus/Feedback.html
-%%PORTDOCS%%share/doc/ploticus/Feedback00.html
-%%PORTDOCS%%share/doc/ploticus/Problems.html
-%%PORTDOCS%%share/doc/ploticus/Versions.html
-%%PORTDOCS%%share/doc/ploticus/Welcome.html
-%%PORTDOCS%%share/doc/ploticus/annotate.html
-%%PORTDOCS%%share/doc/ploticus/api.html
-%%PORTDOCS%%share/doc/ploticus/areadef.html
-%%PORTDOCS%%share/doc/ploticus/attributetypes.html
-%%PORTDOCS%%share/doc/ploticus/autorange.html
-%%PORTDOCS%%share/doc/ploticus/axis.html
-%%PORTDOCS%%share/doc/ploticus/bars.html
-%%PORTDOCS%%share/doc/ploticus/breakaxis.html
-%%PORTDOCS%%share/doc/ploticus/categories.html
-%%PORTDOCS%%share/doc/ploticus/catslide.html
-%%PORTDOCS%%share/doc/ploticus/cgi.html
-%%PORTDOCS%%share/doc/ploticus/changes20.html
-%%PORTDOCS%%share/doc/ploticus/clickmap.html
-%%PORTDOCS%%share/doc/ploticus/color.html
-%%PORTDOCS%%share/doc/ploticus/commalist.html
-%%PORTDOCS%%share/doc/ploticus/condex.html
-%%PORTDOCS%%share/doc/ploticus/config.html
-%%PORTDOCS%%share/doc/ploticus/control.html
-%%PORTDOCS%%share/doc/ploticus/controlling.html
-%%PORTDOCS%%share/doc/ploticus/curvefit.html
-%%PORTDOCS%%share/doc/ploticus/dataformat.html
-%%PORTDOCS%%share/doc/ploticus/dates.html
-%%PORTDOCS%%share/doc/ploticus/defineunits.html
-%%PORTDOCS%%share/doc/ploticus/drawcommands.html
-%%PORTDOCS%%share/doc/ploticus/dynamic.html
-%%PORTDOCS%%share/doc/ploticus/fonts.html
-%%PORTDOCS%%share/doc/ploticus/functions.html
-%%PORTDOCS%%share/doc/ploticus/getdata.html
-%%PORTDOCS%%share/doc/ploticus/gifpatent.html
-%%PORTDOCS%%share/doc/ploticus/gpl.gif
-%%PORTDOCS%%share/doc/ploticus/import.html
-%%PORTDOCS%%share/doc/ploticus/index.html
-%%PORTDOCS%%share/doc/ploticus/interactive.html
-%%PORTDOCS%%share/doc/ploticus/legend.html
-%%PORTDOCS%%share/doc/ploticus/legendentry.html
-%%PORTDOCS%%share/doc/ploticus/license.jpg
-%%PORTDOCS%%share/doc/ploticus/limits.html
-%%PORTDOCS%%share/doc/ploticus/line.html
-%%PORTDOCS%%share/doc/ploticus/linedetails.html
-%%PORTDOCS%%share/doc/ploticus/lineplot.html
-%%PORTDOCS%%share/doc/ploticus/new.gif
-%%PORTDOCS%%share/doc/ploticus/nonunix.html
-%%PORTDOCS%%share/doc/ploticus/page.html
-%%PORTDOCS%%share/doc/ploticus/paper.html
-%%PORTDOCS%%share/doc/ploticus/pie.html
-%%PORTDOCS%%share/doc/ploticus/pl.1.html
-%%PORTDOCS%%share/doc/ploticus/ploticus.1.html
-%%PORTDOCS%%share/doc/ploticus/ploticus.gif
-%%PORTDOCS%%share/doc/ploticus/plshellsql.html
-%%PORTDOCS%%share/doc/ploticus/pltab.1.html
-%%PORTDOCS%%share/doc/ploticus/posters.html
-%%PORTDOCS%%share/doc/ploticus/prefab_chron.html
-%%PORTDOCS%%share/doc/ploticus/prefab_dist.html
-%%PORTDOCS%%share/doc/ploticus/prefab_draw.html
-%%PORTDOCS%%share/doc/ploticus/prefab_lines.html
-%%PORTDOCS%%share/doc/ploticus/prefab_multidist.html
-%%PORTDOCS%%share/doc/ploticus/prefab_pie.html
-%%PORTDOCS%%share/doc/ploticus/prefab_scat.html
-%%PORTDOCS%%share/doc/ploticus/prefab_stack.html
-%%PORTDOCS%%share/doc/ploticus/prefab_stdparms.html
-%%PORTDOCS%%share/doc/ploticus/prefab_vbars.html
-%%PORTDOCS%%share/doc/ploticus/prefabs.html
-%%PORTDOCS%%share/doc/ploticus/prepress.html
-%%PORTDOCS%%share/doc/ploticus/print.html
-%%PORTDOCS%%share/doc/ploticus/processdata.html
-%%PORTDOCS%%share/doc/ploticus/rangebar.html
-%%PORTDOCS%%share/doc/ploticus/rangesweep.html
-%%PORTDOCS%%share/doc/ploticus/rect.html
-%%PORTDOCS%%share/doc/ploticus/scaleunits.html
-%%PORTDOCS%%share/doc/ploticus/scatterplot.html
-%%PORTDOCS%%share/doc/ploticus/scripts.html
-%%PORTDOCS%%share/doc/ploticus/settings.html
-%%PORTDOCS%%share/doc/ploticus/settings.inc.html
-%%PORTDOCS%%share/doc/ploticus/shell.html
-%%PORTDOCS%%share/doc/ploticus/slides.html
-%%PORTDOCS%%share/doc/ploticus/specialchars.html
-%%PORTDOCS%%share/doc/ploticus/sql.html
-%%PORTDOCS%%share/doc/ploticus/svg.html
-%%PORTDOCS%%share/doc/ploticus/swf.html
-%%PORTDOCS%%share/doc/ploticus/symboldetails.html
-%%PORTDOCS%%share/doc/ploticus/tabulate.html
-%%PORTDOCS%%share/doc/ploticus/textdetails.html
-%%PORTDOCS%%share/doc/ploticus/times.html
-%%PORTDOCS%%share/doc/ploticus/trailer.html
-%%PORTDOCS%%share/doc/ploticus/usedata.html
-%%PORTDOCS%%share/doc/ploticus/variables.html
-%%PORTDOCS%%share/doc/ploticus/vector.html
-%%PORTDOCS%%share/doc/ploticus/web.html
+%%PORTDOCS%%%%DOCSDIR%%/Changelog.html
+%%PORTDOCS%%%%DOCSDIR%%/Contents.html
+%%PORTDOCS%%%%DOCSDIR%%/Copyright.html
+%%PORTDOCS%%%%DOCSDIR%%/Download.html
+%%PORTDOCS%%%%DOCSDIR%%/Faq.html
+%%PORTDOCS%%%%DOCSDIR%%/Faq.other.html
+%%PORTDOCS%%%%DOCSDIR%%/Feedback.html
+%%PORTDOCS%%%%DOCSDIR%%/Feedback00.html
+%%PORTDOCS%%%%DOCSDIR%%/Problems.html
+%%PORTDOCS%%%%DOCSDIR%%/Versions.html
+%%PORTDOCS%%%%DOCSDIR%%/Welcome.html
+%%PORTDOCS%%%%DOCSDIR%%/annotate.html
+%%PORTDOCS%%%%DOCSDIR%%/api.html
+%%PORTDOCS%%%%DOCSDIR%%/areadef.html
+%%PORTDOCS%%%%DOCSDIR%%/attributetypes.html
+%%PORTDOCS%%%%DOCSDIR%%/autorange.html
+%%PORTDOCS%%%%DOCSDIR%%/axis.html
+%%PORTDOCS%%%%DOCSDIR%%/bars.html
+%%PORTDOCS%%%%DOCSDIR%%/breakaxis.html
+%%PORTDOCS%%%%DOCSDIR%%/categories.html
+%%PORTDOCS%%%%DOCSDIR%%/catslide.html
+%%PORTDOCS%%%%DOCSDIR%%/cgi.html
+%%PORTDOCS%%%%DOCSDIR%%/changes20.html
+%%PORTDOCS%%%%DOCSDIR%%/clickmap.html
+%%PORTDOCS%%%%DOCSDIR%%/color.html
+%%PORTDOCS%%%%DOCSDIR%%/commalist.html
+%%PORTDOCS%%%%DOCSDIR%%/condex.html
+%%PORTDOCS%%%%DOCSDIR%%/config.html
+%%PORTDOCS%%%%DOCSDIR%%/control.html
+%%PORTDOCS%%%%DOCSDIR%%/controlling.html
+%%PORTDOCS%%%%DOCSDIR%%/curvefit.html
+%%PORTDOCS%%%%DOCSDIR%%/dataformat.html
+%%PORTDOCS%%%%DOCSDIR%%/dates.html
+%%PORTDOCS%%%%DOCSDIR%%/defineunits.html
+%%PORTDOCS%%%%DOCSDIR%%/drawcommands.html
+%%PORTDOCS%%%%DOCSDIR%%/dynamic.html
+%%PORTDOCS%%%%DOCSDIR%%/fonts.html
+%%PORTDOCS%%%%DOCSDIR%%/functions.html
+%%PORTDOCS%%%%DOCSDIR%%/getdata.html
+%%PORTDOCS%%%%DOCSDIR%%/gifpatent.html
+%%PORTDOCS%%%%DOCSDIR%%/gpl.gif
+%%PORTDOCS%%%%DOCSDIR%%/import.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/interactive.html
+%%PORTDOCS%%%%DOCSDIR%%/legend.html
+%%PORTDOCS%%%%DOCSDIR%%/legendentry.html
+%%PORTDOCS%%%%DOCSDIR%%/license.jpg
+%%PORTDOCS%%%%DOCSDIR%%/limits.html
+%%PORTDOCS%%%%DOCSDIR%%/line.html
+%%PORTDOCS%%%%DOCSDIR%%/linedetails.html
+%%PORTDOCS%%%%DOCSDIR%%/lineplot.html
+%%PORTDOCS%%%%DOCSDIR%%/new.gif
+%%PORTDOCS%%%%DOCSDIR%%/nonunix.html
+%%PORTDOCS%%%%DOCSDIR%%/page.html
+%%PORTDOCS%%%%DOCSDIR%%/paper.html
+%%PORTDOCS%%%%DOCSDIR%%/pie.html
+%%PORTDOCS%%%%DOCSDIR%%/pl.1.html
+%%PORTDOCS%%%%DOCSDIR%%/ploticus.1.html
+%%PORTDOCS%%%%DOCSDIR%%/ploticus.gif
+%%PORTDOCS%%%%DOCSDIR%%/plshellsql.html
+%%PORTDOCS%%%%DOCSDIR%%/pltab.1.html
+%%PORTDOCS%%%%DOCSDIR%%/posters.html
+%%PORTDOCS%%%%DOCSDIR%%/prefab_chron.html
+%%PORTDOCS%%%%DOCSDIR%%/prefab_dist.html
+%%PORTDOCS%%%%DOCSDIR%%/prefab_draw.html
+%%PORTDOCS%%%%DOCSDIR%%/prefab_lines.html
+%%PORTDOCS%%%%DOCSDIR%%/prefab_multidist.html
+%%PORTDOCS%%%%DOCSDIR%%/prefab_pie.html
+%%PORTDOCS%%%%DOCSDIR%%/prefab_scat.html
+%%PORTDOCS%%%%DOCSDIR%%/prefab_stack.html
+%%PORTDOCS%%%%DOCSDIR%%/prefab_stdparms.html
+%%PORTDOCS%%%%DOCSDIR%%/prefab_vbars.html
+%%PORTDOCS%%%%DOCSDIR%%/prefabs.html
+%%PORTDOCS%%%%DOCSDIR%%/prepress.html
+%%PORTDOCS%%%%DOCSDIR%%/print.html
+%%PORTDOCS%%%%DOCSDIR%%/processdata.html
+%%PORTDOCS%%%%DOCSDIR%%/rangebar.html
+%%PORTDOCS%%%%DOCSDIR%%/rangesweep.html
+%%PORTDOCS%%%%DOCSDIR%%/rect.html
+%%PORTDOCS%%%%DOCSDIR%%/scaleunits.html
+%%PORTDOCS%%%%DOCSDIR%%/scatterplot.html
+%%PORTDOCS%%%%DOCSDIR%%/scripts.html
+%%PORTDOCS%%%%DOCSDIR%%/settings.html
+%%PORTDOCS%%%%DOCSDIR%%/settings.inc.html
+%%PORTDOCS%%%%DOCSDIR%%/shell.html
+%%PORTDOCS%%%%DOCSDIR%%/slides.html
+%%PORTDOCS%%%%DOCSDIR%%/specialchars.html
+%%PORTDOCS%%%%DOCSDIR%%/sql.html
+%%PORTDOCS%%%%DOCSDIR%%/svg.html
+%%PORTDOCS%%%%DOCSDIR%%/swf.html
+%%PORTDOCS%%%%DOCSDIR%%/symboldetails.html
+%%PORTDOCS%%%%DOCSDIR%%/tabulate.html
+%%PORTDOCS%%%%DOCSDIR%%/textdetails.html
+%%PORTDOCS%%%%DOCSDIR%%/times.html
+%%PORTDOCS%%%%DOCSDIR%%/trailer.html
+%%PORTDOCS%%%%DOCSDIR%%/usedata.html
+%%PORTDOCS%%%%DOCSDIR%%/variables.html
+%%PORTDOCS%%%%DOCSDIR%%/vector.html
+%%PORTDOCS%%%%DOCSDIR%%/web.html
 share/ploticus/README
 share/ploticus/chron.pl
 share/ploticus/chunk_area
@@ -118,4 +118,4 @@ share/ploticus/scat.pl
 share/ploticus/stack.pl
 share/ploticus/vbars.pl
 @dirrm share/ploticus
-%%PORTDOCS%%@dirrm share/doc/ploticus
+%%PORTDOCS%%@dirrm %%DOCSDIR%%