- Update to 5.1.2

Feature safe:	yes

3 files changed, 75 insertions, 107 deletions

diff --git a/graphics/phplot/Makefile b/graphics/phplot/Makefile
index 187373fbdad3..db882c7c5697 100644
--- a/graphics/phplot/Makefile
+++ b/graphics/phplot/Makefile
@@ -5,12 +5,12 @@
 # $FreeBSD$
 
 PORTNAME=	phplot
-PORTVERSION=	5.1.1
+PORTVERSION=	5.1.2
 CATEGORIES=	graphics www
 MASTER_SITES=	SF:source1 \
-		SF/${PORTNAME}/Manual/20090614:source2
+		SF/${PORTNAME}/Manual/20100628:source2
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:source1 \
-		${PORTNAME}docs-20090614.zip:source2
+		${PORTNAME}docs-20100628.zip:source2
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	A PHP class for creating scientific and business charts
@@ -27,57 +27,6 @@ PHPLOT_DIR=	${PREFIX}/include/php/phplot
 
 LIBS=		phplot.php phplot_data.php rgb.inc.php
 
-DOCS=		DrawGraph.html GetCallback.html PHPlot.html PrintImage.html \
-		RemoveCallback.html SetBackgroundColor.html SetBgImage.html \
-		SetBrowserCache.html SetCallback.html SetDataBorderColors.html \
-		SetDataColors.html SetDataType.html SetDataValues.html \
-		SetDefaultDashedStyle.html SetDefaultTTFont.html SetDrawBrokenLines.html \
-		SetDrawDashedGrid.html SetDrawPlotAreaBackground.html \
-		SetDrawXDataLabelLines.html SetDrawXGrid.html SetDrawYDataLabelLines.html \
-		SetDrawYGrid.html SetErrorBarColors.html SetErrorBarLineWidth.html \
-		SetErrorBarShape.html SetErrorBarSize.html SetFileFormat.html \
-		SetFont.html SetGridColor.html SetImageBorderColor.html SetImageBorderType.html \
-		SetIsInline.html SetLabelColor.html SetLabelScalePosition.html SetLegend.html \
-		SetLegendPixels.html SetLegendStyle.html SetLegendWorld.html SetLightGridColor.html \
-		SetLineSpacing.html SetLineStyles.html SetLineWidths.html SetMarginsPixels.html \
-		SetNumXTicks.html SetNumYTicks.html SetNumberFormat.html SetOutputFile.html \
-		SetPlotAreaBgImage.html SetPlotAreaPixels.html SetPlotAreaWorld.html \
-		SetPlotBgColor.html SetPlotBorderType.html SetPlotType.html SetPointShapes.html \
-		SetPointSizes.html SetPrecisionX.html SetPrecisionY.html SetPrintImage.html \
-		SetRGBArray.html SetShading.html SetSkipBottomTick.html SetSkipLeftTick.html \
-		SetSkipRightTick.html SetSkipTopTick.html SetTTFPath.html SetTextColor.html \
-		SetTickColor.html SetTitle.html SetTitleColor.html SetTransparentColor.html \
-		SetUseTTF.html SetXAxisPosition.html SetXDataLabelPos.html SetXLabelAngle.html \
-		SetXLabelType.html SetXScaleType.html SetXTickCrossing.html SetXTickIncrement.html \
-		SetXTickLabelPos.html SetXTickLength.html SetXTickPos.html SetXTimeFormat.html \
-		SetXTitle.html SetYAxisPosition.html SetYDataLabelPos.html SetYLabelAngle.html \
-		SetYLabelType.html SetYScaleType.html SetYTickCrossing.html SetYTickIncrement.html \
-		SetYTickLabelPos.html SetYTickLength.html SetYTickPos.html SetYTimeFormat.html \
-		SetYTitle.html callbacks-access.html callbacks-names.html callbacks-objects.html \
-		callbacks.html changelog.html conc-colors.html conc-datatypes.html \
-		conc-errors.html conc-extradata.html conc-labels.html conc-overview.html \
-		conc-plottypes.html concepts.html dev-internal.html dev-layout.html dev-legend.html \
-		ex-area1.html ex-bars1.html ex-bars2.html ex-bars3.html ex-bars4.html ex-linepoints1.html \
-		ex-lines2.html ex-pie1.html ex-pie2.html ex-pie3.html ex-points1.html ex-points2.html \
-		ex-squared1.html ex-stackedbars1.html ex-stackedbars2.html ex-thinbarline1.html \
-		ex-thinbarline2.html ex-twoplot1.html examples.html functions.html index.html \
-		install-install.html install-next.html install.html part1.html part3.html \
-		phplotdoc.css preface.html ref-addlstyle.html ref-axes.html ref-callbacks.html \
-		ref-colorstyle.html ref-errorbars.html ref-grid.html ref-iocontrol.html \
-		ref-labels.html ref-legend.html ref-scaling.html ref-textfonts.html ref-ticks.html \
-		ref-titles.html reference.html start-multiple.html starting-create.html \
-		starting-custom.html starting-more.html starting-next.html starting-simple.html \
-		starting.html
-
-EXAMPLES=	area1.png bars1.png bars2.png bars3.png bars4.png linepoints1.png lines1.png \
-		lines2.png pie1.png pie2.png pie3.png points1.png points2.png qs1.png qs2.png \
-		qs3.png squared1.png stackedbars1.png stackedbars2.png thinbarline1.png \
-		thinbarline2.png twoplot1.png
-
-IMAGES=		colors.png error-image.png fonts.png gdinfo.png labels-pie.png labels.png \
-		layout.png legend-layout.png legendstyle.png ticksize.png typical-grid.png \
-		typical-legend.png typical-titles.png
-
 OPTIONS=	FONTS "Install TrueType fonts" on
 
 .if defined(WITH_FONTS)
@@ -87,14 +36,10 @@ LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
 do-install:
 	@${MKDIR} ${PHPLOT_DIR}
 	@${INSTALL_DATA} ${LIBS:S,^,${WRKSRC}/,} ${PHPLOT_DIR}/
+
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${DOCS:S,^,${WRKDIR}/phplotdocs/,} ${DOCSDIR}/
-.endif
-.if !defined(NOPORTEXAMPLES)
-	@${MKDIR} ${EXAMPLESDIR}/images
-	@${INSTALL_DATA} ${EXAMPLES:S,^,${WRKDIR}/phplotdocs/examples/,} ${EXAMPLESDIR}/
-	@${INSTALL_DATA} ${IMAGES:S,^,${WRKDIR}/phplotdocs/images/,} ${EXAMPLESDIR}/images/
+	@cd ${WRKDIR}/phplotdocs && ${COPYTREE_SHARE} . ${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/phplot/distinfo b/graphics/phplot/distinfo
index 9354a19a6f0c..c3b44460f93f 100644
--- a/graphics/phplot/distinfo
+++ b/graphics/phplot/distinfo
@@ -1,6 +1,6 @@
-MD5 (phplot-5.1.1.zip) = 3fe9879d707d183198090fb64d14d34c
-SHA256 (phplot-5.1.1.zip) = 53aaabf83e8f37eaa98aa8829a9ffd669f4de125194d9911bd12e4dd3f2c33e6
-SIZE (phplot-5.1.1.zip) = 110865
-MD5 (phplotdocs-20090614.zip) = b2efead25f95f4e263011cfa1756a4da
-SHA256 (phplotdocs-20090614.zip) = 49bb1b6b54377cdb5d542e846af374313be892a52c9cba4c1b1186458ac5b5d5
-SIZE (phplotdocs-20090614.zip) = 462483
+MD5 (phplot-5.1.2.zip) = 75c55279be97a5660a9d3672ce9be17c
+SHA256 (phplot-5.1.2.zip) = 34b5431f9f01074ee6ee2be15ee0c53b447ec46b26fa5a2ea050f05a093f2bd5
+SIZE (phplot-5.1.2.zip) = 114946
+MD5 (phplotdocs-20100628.zip) = 4f55de1d0f1abd8776848a6771e49ee4
+SHA256 (phplotdocs-20100628.zip) = 9c4b6f977abac54aba083a9559e8b5884ca4d2abbf4152d0e6a0daa6bb4d1640
+SIZE (phplotdocs-20100628.zip) = 1127627
diff --git a/graphics/phplot/pkg-plist b/graphics/phplot/pkg-plist
index 53b4dabd6b18..2857ecb0b004 100644
--- a/graphics/phplot/pkg-plist
+++ b/graphics/phplot/pkg-plist
@@ -1,8 +1,11 @@
 include/php/phplot/phplot.php
 include/php/phplot/phplot_data.php
 include/php/phplot/rgb.inc.php
+@dirrmtry include/php/phplot
 %%PORTDOCS%%%%DOCSDIR%%/DrawGraph.html
 %%PORTDOCS%%%%DOCSDIR%%/GetCallback.html
+%%PORTDOCS%%%%DOCSDIR%%/GetDeviceXY.html
+%%PORTDOCS%%%%DOCSDIR%%/PHPlot-truecolor.html
 %%PORTDOCS%%%%DOCSDIR%%/PHPlot.html
 %%PORTDOCS%%%%DOCSDIR%%/PrintImage.html
 %%PORTDOCS%%%%DOCSDIR%%/RemoveCallback.html
@@ -17,11 +20,10 @@ include/php/phplot/rgb.inc.php
 %%PORTDOCS%%%%DOCSDIR%%/SetDefaultDashedStyle.html
 %%PORTDOCS%%%%DOCSDIR%%/SetDefaultTTFont.html
 %%PORTDOCS%%%%DOCSDIR%%/SetDrawBrokenLines.html
-%%PORTDOCS%%%%DOCSDIR%%/SetDrawXGrid.html
 %%PORTDOCS%%%%DOCSDIR%%/SetDrawDashedGrid.html
 %%PORTDOCS%%%%DOCSDIR%%/SetDrawPlotAreaBackground.html
 %%PORTDOCS%%%%DOCSDIR%%/SetDrawXDataLabelLines.html
-%%PORTDOCS%%%%DOCSDIR%%/SetDrawYDataLabelLines.html
+%%PORTDOCS%%%%DOCSDIR%%/SetDrawXGrid.html
 %%PORTDOCS%%%%DOCSDIR%%/SetDrawYGrid.html
 %%PORTDOCS%%%%DOCSDIR%%/SetErrorBarColors.html
 %%PORTDOCS%%%%DOCSDIR%%/SetErrorBarLineWidth.html
@@ -29,9 +31,12 @@ include/php/phplot/rgb.inc.php
 %%PORTDOCS%%%%DOCSDIR%%/SetErrorBarSize.html
 %%PORTDOCS%%%%DOCSDIR%%/SetFileFormat.html
 %%PORTDOCS%%%%DOCSDIR%%/SetFont.html
+%%PORTDOCS%%%%DOCSDIR%%/SetFontGD.html
+%%PORTDOCS%%%%DOCSDIR%%/SetFontTTF.html
 %%PORTDOCS%%%%DOCSDIR%%/SetGridColor.html
 %%PORTDOCS%%%%DOCSDIR%%/SetImageBorderColor.html
 %%PORTDOCS%%%%DOCSDIR%%/SetImageBorderType.html
+%%PORTDOCS%%%%DOCSDIR%%/SetImageBorderWidth.html
 %%PORTDOCS%%%%DOCSDIR%%/SetIsInline.html
 %%PORTDOCS%%%%DOCSDIR%%/SetLabelColor.html
 %%PORTDOCS%%%%DOCSDIR%%/SetLabelScalePosition.html
@@ -73,7 +78,9 @@ include/php/phplot/rgb.inc.php
 %%PORTDOCS%%%%DOCSDIR%%/SetTransparentColor.html
 %%PORTDOCS%%%%DOCSDIR%%/SetUseTTF.html
 %%PORTDOCS%%%%DOCSDIR%%/SetXAxisPosition.html
+%%PORTDOCS%%%%DOCSDIR%%/SetXDataLabelAngle.html
 %%PORTDOCS%%%%DOCSDIR%%/SetXDataLabelPos.html
+%%PORTDOCS%%%%DOCSDIR%%/SetXDataLabelType.html
 %%PORTDOCS%%%%DOCSDIR%%/SetXLabelAngle.html
 %%PORTDOCS%%%%DOCSDIR%%/SetXLabelType.html
 %%PORTDOCS%%%%DOCSDIR%%/SetXScaleType.html
@@ -85,7 +92,9 @@ include/php/phplot/rgb.inc.php
 %%PORTDOCS%%%%DOCSDIR%%/SetXTimeFormat.html
 %%PORTDOCS%%%%DOCSDIR%%/SetXTitle.html
 %%PORTDOCS%%%%DOCSDIR%%/SetYAxisPosition.html
+%%PORTDOCS%%%%DOCSDIR%%/SetYDataLabelAngle.html
 %%PORTDOCS%%%%DOCSDIR%%/SetYDataLabelPos.html
+%%PORTDOCS%%%%DOCSDIR%%/SetYDataLabelType.html
 %%PORTDOCS%%%%DOCSDIR%%/SetYLabelAngle.html
 %%PORTDOCS%%%%DOCSDIR%%/SetYLabelType.html
 %%PORTDOCS%%%%DOCSDIR%%/SetYScaleType.html
@@ -97,21 +106,26 @@ include/php/phplot/rgb.inc.php
 %%PORTDOCS%%%%DOCSDIR%%/SetYTimeFormat.html
 %%PORTDOCS%%%%DOCSDIR%%/SetYTitle.html
 %%PORTDOCS%%%%DOCSDIR%%/callbacks-access.html
+%%PORTDOCS%%%%DOCSDIR%%/callbacks-drawing.html
 %%PORTDOCS%%%%DOCSDIR%%/callbacks-names.html
 %%PORTDOCS%%%%DOCSDIR%%/callbacks-objects.html
 %%PORTDOCS%%%%DOCSDIR%%/callbacks.html
 %%PORTDOCS%%%%DOCSDIR%%/changelog.html
 %%PORTDOCS%%%%DOCSDIR%%/conc-colors.html
 %%PORTDOCS%%%%DOCSDIR%%/conc-datatypes.html
-%%PORTDOCS%%%%DOCSDIR%%/concepts.html
 %%PORTDOCS%%%%DOCSDIR%%/conc-errors.html
 %%PORTDOCS%%%%DOCSDIR%%/conc-extradata.html
 %%PORTDOCS%%%%DOCSDIR%%/conc-labels.html
 %%PORTDOCS%%%%DOCSDIR%%/conc-overview.html
 %%PORTDOCS%%%%DOCSDIR%%/conc-plottypes.html
+%%PORTDOCS%%%%DOCSDIR%%/conc-text.html
+%%PORTDOCS%%%%DOCSDIR%%/conc-truecolor.html
+%%PORTDOCS%%%%DOCSDIR%%/concepts.html
 %%PORTDOCS%%%%DOCSDIR%%/dev-internal.html
 %%PORTDOCS%%%%DOCSDIR%%/dev-layout.html
 %%PORTDOCS%%%%DOCSDIR%%/dev-legend.html
+%%PORTDOCS%%%%DOCSDIR%%/dev-vars.html
+%%PORTDOCS%%%%DOCSDIR%%/ex-annotate.html
 %%PORTDOCS%%%%DOCSDIR%%/ex-area1.html
 %%PORTDOCS%%%%DOCSDIR%%/ex-bars1.html
 %%PORTDOCS%%%%DOCSDIR%%/ex-bars2.html
@@ -125,13 +139,58 @@ include/php/phplot/rgb.inc.php
 %%PORTDOCS%%%%DOCSDIR%%/ex-points1.html
 %%PORTDOCS%%%%DOCSDIR%%/ex-points2.html
 %%PORTDOCS%%%%DOCSDIR%%/ex-squared1.html
+%%PORTDOCS%%%%DOCSDIR%%/ex-stackedarea1.html
 %%PORTDOCS%%%%DOCSDIR%%/ex-stackedbars1.html
 %%PORTDOCS%%%%DOCSDIR%%/ex-stackedbars2.html
+%%PORTDOCS%%%%DOCSDIR%%/ex-stackedbars3.html
 %%PORTDOCS%%%%DOCSDIR%%/ex-thinbarline1.html
 %%PORTDOCS%%%%DOCSDIR%%/ex-thinbarline2.html
+%%PORTDOCS%%%%DOCSDIR%%/ex-truecolor-histogram.html
 %%PORTDOCS%%%%DOCSDIR%%/ex-twoplot1.html
+%%PORTDOCS%%%%DOCSDIR%%/ex-webform.html
+%%PORTDOCS%%%%DOCSDIR%%/examples/annotate.png
+%%PORTDOCS%%%%DOCSDIR%%/examples/area1.png
+%%PORTDOCS%%%%DOCSDIR%%/examples/bars1.png
+%%PORTDOCS%%%%DOCSDIR%%/examples/bars2.png
+%%PORTDOCS%%%%DOCSDIR%%/examples/bars3.png
+%%PORTDOCS%%%%DOCSDIR%%/examples/bars4.png
+%%PORTDOCS%%%%DOCSDIR%%/examples/histogram.png
+%%PORTDOCS%%%%DOCSDIR%%/examples/linepoints1.png
+%%PORTDOCS%%%%DOCSDIR%%/examples/lines1.png
+%%PORTDOCS%%%%DOCSDIR%%/examples/lines2.png
+%%PORTDOCS%%%%DOCSDIR%%/examples/pie1.png
+%%PORTDOCS%%%%DOCSDIR%%/examples/pie2.png
+%%PORTDOCS%%%%DOCSDIR%%/examples/pie3.png
+%%PORTDOCS%%%%DOCSDIR%%/examples/points1.png
+%%PORTDOCS%%%%DOCSDIR%%/examples/points2.png
+%%PORTDOCS%%%%DOCSDIR%%/examples/qs1.png
+%%PORTDOCS%%%%DOCSDIR%%/examples/qs2.png
+%%PORTDOCS%%%%DOCSDIR%%/examples/qs3.png
+%%PORTDOCS%%%%DOCSDIR%%/examples/squared1.png
+%%PORTDOCS%%%%DOCSDIR%%/examples/stackedarea1.png
+%%PORTDOCS%%%%DOCSDIR%%/examples/stackedbars1.png
+%%PORTDOCS%%%%DOCSDIR%%/examples/stackedbars2.png
+%%PORTDOCS%%%%DOCSDIR%%/examples/stackedbars3.png
+%%PORTDOCS%%%%DOCSDIR%%/examples/thinbarline1.png
+%%PORTDOCS%%%%DOCSDIR%%/examples/thinbarline2.png
+%%PORTDOCS%%%%DOCSDIR%%/examples/twoplot1.png
 %%PORTDOCS%%%%DOCSDIR%%/examples.html
 %%PORTDOCS%%%%DOCSDIR%%/functions.html
+%%PORTDOCS%%%%DOCSDIR%%/images/alpha-blending.png
+%%PORTDOCS%%%%DOCSDIR%%/images/colors.png
+%%PORTDOCS%%%%DOCSDIR%%/images/error-image.png
+%%PORTDOCS%%%%DOCSDIR%%/images/fonts.png
+%%PORTDOCS%%%%DOCSDIR%%/images/gdinfo.png
+%%PORTDOCS%%%%DOCSDIR%%/images/labels-pie.png
+%%PORTDOCS%%%%DOCSDIR%%/images/labels.png
+%%PORTDOCS%%%%DOCSDIR%%/images/layout.png
+%%PORTDOCS%%%%DOCSDIR%%/images/legend-layout.png
+%%PORTDOCS%%%%DOCSDIR%%/images/legendstyle.png
+%%PORTDOCS%%%%DOCSDIR%%/images/ticksize.png
+%%PORTDOCS%%%%DOCSDIR%%/images/typical-grid.png
+%%PORTDOCS%%%%DOCSDIR%%/images/typical-legend.png
+%%PORTDOCS%%%%DOCSDIR%%/images/typical-titles.png
+%%PORTDOCS%%%%DOCSDIR%%/images/webform.png
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/install-install.html
 %%PORTDOCS%%%%DOCSDIR%%/install-next.html
@@ -161,42 +220,6 @@ include/php/phplot/rgb.inc.php
 %%PORTDOCS%%%%DOCSDIR%%/starting-next.html
 %%PORTDOCS%%%%DOCSDIR%%/starting-simple.html
 %%PORTDOCS%%%%DOCSDIR%%/starting.html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/colors.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/error-image.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/fonts.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/gdinfo.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/labels-pie.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/labels.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/layout.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/legend-layout.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/legendstyle.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/ticksize.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/typical-grid.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/typical-legend.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/typical-titles.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/area1.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bars1.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bars2.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bars3.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bars4.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/linepoints1.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lines1.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lines2.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pie1.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pie2.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pie3.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/points1.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/points2.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/qs1.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/qs2.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/qs3.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/squared1.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/stackedbars1.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/stackedbars2.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/thinbarline1.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/thinbarline2.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/twoplot1.png
-@dirrmtry include/php/phplot
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/images
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%