Update to 1.16 release:

- use new PHP framework
- set NO_CDROM

3 files changed, 18 insertions, 22 deletions

diff --git a/graphics/jpgraph/Makefile b/graphics/jpgraph/Makefile
index 3c5e7cac31bc..ebe29cca9f40 100644
--- a/graphics/jpgraph/Makefile
+++ b/graphics/jpgraph/Makefile
@@ -7,24 +7,17 @@
 #
 
 PORTNAME=	jpgraph
-PORTVERSION=	1.14
+PORTVERSION=	1.16
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.aditus.nu/jpgraph/downloads/
+MASTER_SITES=	http://members.chello.se/jpgraph/jpgdownloads/
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Draw both "quick and dirty" graphs with a minimum of code
 
 NO_BUILD=	yes
-USE_PHP=	yes
-WANT_PHP_WEB=	yes
+USE_PHP=	gd
 
-pre-everything::
-	@${ECHO} ""
-	@${ECHO} "You have to configure PHP with GD support."
-	@${ECHO} ""
-	@${ECHO} "If you have already compiled PHP without GD,"
-	@${ECHO} "press CTRL+C now and rebuild it before installing jpgraph."
-	@${ECHO} ""
+NO_CDROM=	"The free version cannot be used in a commercial context"
 
 do-install:
 	@${MKDIR} ${DATADIR}
@@ -35,7 +28,7 @@ do-install:
 	@${MKDIR} ${DOCSDIR}
 	${CP} -R ${WRKSRC}/docs/ ${DOCSDIR}
 	@${MKDIR} ${EXAMPLESDIR}
-	${CP} -R ${WRKSRC}/src/Examples/ ${EXAMPLESDIR}
+	-${CP} ${WRKSRC}/src/Examples/* ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/jpgraph/distinfo b/graphics/jpgraph/distinfo
index 415b4859de4b..b755920d9633 100644
--- a/graphics/jpgraph/distinfo
+++ b/graphics/jpgraph/distinfo
@@ -1,2 +1,2 @@
-MD5 (jpgraph-1.14.tar.gz) = f8d1f344518a1ea24c167db6ddc29c7d
-SIZE (jpgraph-1.14.tar.gz) = 3857614
+MD5 (jpgraph-1.16.tar.gz) = b6ed4802e35ce836d37803b77a44df5c
+SIZE (jpgraph-1.16.tar.gz) = 3862276
diff --git a/graphics/jpgraph/pkg-plist b/graphics/jpgraph/pkg-plist
index caba2cef15ed..efe91b061ae4 100644
--- a/graphics/jpgraph/pkg-plist
+++ b/graphics/jpgraph/pkg-plist
@@ -8,6 +8,9 @@
 %%DATADIR%%/imgdata_pushpins.inc
 %%DATADIR%%/imgdata_squares.inc
 %%DATADIR%%/imgdata_stars.inc
+%%DATADIR%%/jpg-config.inc
+%%DATADIR%%/jpgraph_iconplot.php
+%%DATADIR%%/jpgraph_plotband.php
 %%DATADIR%%/jpgraph.php
 %%DATADIR%%/jpgraph_bar.php
 %%DATADIR%%/jpgraph_canvas.php
@@ -832,14 +835,10 @@
 %%PORTDOCS%%%%DOCSDIR%%/ref/ErrorPlot.html
 %%PORTDOCS%%%%DOCSDIR%%/ref/FieldArrow.html
 %%PORTDOCS%%%%DOCSDIR%%/ref/FieldPlot.html
-%%PORTDOCS%%%%DOCSDIR%%/ref/FlagCache.html
-%%PORTDOCS%%%%DOCSDIR%%/ref/FlagImages.html
 %%PORTDOCS%%%%DOCSDIR%%/ref/Footer.html
 %%PORTDOCS%%%%DOCSDIR%%/ref/FuncGenerator.html
-%%PORTDOCS%%%%DOCSDIR%%/ref/GB2312toUTF8.html
 %%PORTDOCS%%%%DOCSDIR%%/ref/GanttActivityInfo.html
 %%PORTDOCS%%%%DOCSDIR%%/ref/GanttBar.html
-%%PORTDOCS%%%%DOCSDIR%%/ref/GanttConstraint.html
 %%PORTDOCS%%%%DOCSDIR%%/ref/GanttGraph.html
 %%PORTDOCS%%%%DOCSDIR%%/ref/GanttPlotObject.html
 %%PORTDOCS%%%%DOCSDIR%%/ref/GanttScale.html
@@ -852,7 +851,6 @@
 %%PORTDOCS%%%%DOCSDIR%%/ref/IconImage.html
 %%PORTDOCS%%%%DOCSDIR%%/ref/IconPlot.html
 %%PORTDOCS%%%%DOCSDIR%%/ref/Image.html
-%%PORTDOCS%%%%DOCSDIR%%/ref/ImgData.html
 %%PORTDOCS%%%%DOCSDIR%%/ref/Legend.html
 %%PORTDOCS%%%%DOCSDIR%%/ref/LineErrorPlot.html
 %%PORTDOCS%%%%DOCSDIR%%/ref/LinePlot.html
@@ -873,7 +871,6 @@
 %%PORTDOCS%%%%DOCSDIR%%/ref/PolarAxis.html
 %%PORTDOCS%%%%DOCSDIR%%/ref/PolarGraph.html
 %%PORTDOCS%%%%DOCSDIR%%/ref/PolarPlot.html
-%%PORTDOCS%%%%DOCSDIR%%/ref/PredefIcons.html
 %%PORTDOCS%%%%DOCSDIR%%/ref/Progress.html
 %%PORTDOCS%%%%DOCSDIR%%/ref/RadarAxis.html
 %%PORTDOCS%%%%DOCSDIR%%/ref/RadarGraph.html
@@ -889,7 +886,6 @@
 %%PORTDOCS%%%%DOCSDIR%%/ref/SuperScriptText.html
 %%PORTDOCS%%%%DOCSDIR%%/ref/Text.html
 %%PORTDOCS%%%%DOCSDIR%%/ref/TextProperty.html
-%%PORTDOCS%%%%DOCSDIR%%/ref/TextPropertyBelow.html
 %%PORTDOCS%%%%DOCSDIR%%/ref/Ticks.html
 %%PORTDOCS%%%%DOCSDIR%%/ref/class_toc.html
 %%PORTDOCS%%%%DOCSDIR%%/ref/index.html
@@ -923,6 +919,7 @@
 %%PORTDOCS%%%%EXAMPLESDIR%%/bargradsmallex5.php
 %%PORTDOCS%%%%EXAMPLESDIR%%/bargradsmallex6.php
 %%PORTDOCS%%%%EXAMPLESDIR%%/bargradsmallex7.php
+%%PORTDOCS%%%%EXAMPLESDIR%%/barimgex1.php
 %%PORTDOCS%%%%EXAMPLESDIR%%/barintex1.php
 %%PORTDOCS%%%%EXAMPLESDIR%%/barintex2.php
 %%PORTDOCS%%%%EXAMPLESDIR%%/barline_csimex1.php
@@ -938,6 +935,10 @@
 %%PORTDOCS%%%%EXAMPLESDIR%%/bartutex4.php
 %%PORTDOCS%%%%EXAMPLESDIR%%/bartutex5.php
 %%PORTDOCS%%%%EXAMPLESDIR%%/bartutex6.php
+%%PORTDOCS%%%%EXAMPLESDIR%%/bkgimgflagex1.php
+%%PORTDOCS%%%%EXAMPLESDIR%%/bkgimgflagex2.php
+%%PORTDOCS%%%%EXAMPLESDIR%%/bkgimgflagex3.php
+%%PORTDOCS%%%%EXAMPLESDIR%%/bkgimgflagex4.php
 %%PORTDOCS%%%%EXAMPLESDIR%%/blueblack400x300grad.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/boxstockcsimex1.php
 %%PORTDOCS%%%%EXAMPLESDIR%%/boxstockex1.php
@@ -1065,6 +1066,7 @@
 %%PORTDOCS%%%%EXAMPLESDIR%%/ganttex19.php
 %%PORTDOCS%%%%EXAMPLESDIR%%/ganttex30.php
 %%PORTDOCS%%%%EXAMPLESDIR%%/ganttex_slice.php
+%%PORTDOCS%%%%EXAMPLESDIR%%/gantthgridex1.php
 %%PORTDOCS%%%%EXAMPLESDIR%%/gantthourex1.php
 %%PORTDOCS%%%%EXAMPLESDIR%%/gantthourminex1.php
 %%PORTDOCS%%%%EXAMPLESDIR%%/gantticonex1.php
@@ -1116,7 +1118,6 @@
 %%PORTDOCS%%%%EXAMPLESDIR%%/nullvalueex01.php
 %%PORTDOCS%%%%EXAMPLESDIR%%/partiallyfilledlineex1.php
 %%PORTDOCS%%%%EXAMPLESDIR%%/penguin.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/penguin.png.OLD
 %%PORTDOCS%%%%EXAMPLESDIR%%/pie3d_csimex1.php
 %%PORTDOCS%%%%EXAMPLESDIR%%/pie3dex1.php
 %%PORTDOCS%%%%EXAMPLESDIR%%/pie3dex2.php
@@ -1153,6 +1154,7 @@
 %%PORTDOCS%%%%EXAMPLESDIR%%/polarex8.php
 %%PORTDOCS%%%%EXAMPLESDIR%%/polarex9.php
 %%PORTDOCS%%%%EXAMPLESDIR%%/pushpinex1.php
+%%PORTDOCS%%%%EXAMPLESDIR%%/pushpinex2.php
 %%PORTDOCS%%%%EXAMPLESDIR%%/radarex1.php
 %%PORTDOCS%%%%EXAMPLESDIR%%/radarex2.php
 %%PORTDOCS%%%%EXAMPLESDIR%%/radarex3.php
@@ -1166,6 +1168,7 @@
 %%PORTDOCS%%%%EXAMPLESDIR%%/radarex9.php
 %%PORTDOCS%%%%EXAMPLESDIR%%/radarlogex1.php
 %%PORTDOCS%%%%EXAMPLESDIR%%/radarlogex2.php
+%%PORTDOCS%%%%EXAMPLESDIR%%/radarmarkex1.php
 %%PORTDOCS%%%%EXAMPLESDIR%%/rotateex1.php
 %%PORTDOCS%%%%EXAMPLESDIR%%/rotex0.php
 %%PORTDOCS%%%%EXAMPLESDIR%%/rotex1.php