Upgrade to 1.7.

Changelog at <http://www.fpdf.org/en/changelog.php>.

PR:		ports/164650
Submitted by:	Robert Simmons <rsimmons0 (at) gmail.com>

3 files changed, 108 insertions, 111 deletions

diff --git a/print/fpdf/Makefile b/print/fpdf/Makefile
index 9bdc8200b6a9..9664a96a6554 100644
--- a/print/fpdf/Makefile
+++ b/print/fpdf/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	fpdf
-PORTVERSION=	1.6
+PORTVERSION=	1.7
 PORTEPOCH=	1
 CATEGORIES=	print www
-MASTER_SITES=	http://www.fpdf.org/fr/
+MASTER_SITES=	http://www.fpdf.org/en/
 DISTNAME=	${PORTNAME}${PORTVERSION:S|.||}
 EXTRACT_SUFX=	.tgz
 
@@ -19,6 +19,7 @@ COMMENT=	A free PHP class to generate PDF files with pure PHP
 USE_PHP=	zlib
 
 FETCH_CMD=	${FETCH_BINARY} -ARr -o ${DISTDIR}/${DISTFILES}
+USE_DOS2UNIX=	yes
 NO_BUILD=	yes
 
 FPDF_DIR?=	share/fpdf
@@ -28,7 +29,7 @@ SUB_LIST=	FPDF_DIR=${FPDF_DIR}
 PLIST_SUB=	FPDF_DIR=${FPDF_DIR}
 
 EXT2CNV=	afm css htm php txt
-DOCS=		FAQ.htm doc/* fpdf.css histo.htm install.txt tutoriel
+DOCS=		FAQ.htm changelog.htm doc fpdf.css install.txt license.txt tutorial
 
 do-fetch:
 	@if [ ! -f ${DISTDIR}/${DISTFILES} ]; then \
@@ -36,21 +37,13 @@ do-fetch:
 		'${MASTER_SITES}dl.php?v=${PORTVERSION:S|.||}&f=${EXTRACT_SUFX:S|.||}'; \
 	fi
 
-pre-patch:
-	@${ECHO_MSG} "===>   Converting DOS text files to UNIX text files"
-.for ext in ${EXT2CNV}
-	@${FIND} ${WRKSRC} -type f -name "*.${ext}" -print0 | \
-			${XARGS} -0 ${REINPLACE_CMD} -i '' -e 's/
$$//'
-.endfor
-	@${FIND} ${WRKSRC} -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
-
 do-install:
 	${MKDIR} ${PREFIX}/${FPDF_DIR}
 	${INSTALL_DATA} ${WRKSRC}/fpdf.php ${PREFIX}/${FPDF_DIR}
-	${CP} -R ${WRKSRC}/font ${PREFIX}/${FPDF_DIR}
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} "font makefont" ${PREFIX}/${FPDF_DIR}/)
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	${CP} -R ${DOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} "${DOCS}" ${DOCSDIR}/)
 .endif
 
 post-install:
diff --git a/print/fpdf/distinfo b/print/fpdf/distinfo
index 6a1e2e410b6d..726cd9027d6f 100644
--- a/print/fpdf/distinfo
+++ b/print/fpdf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fpdf16.tgz) = 286345ae9fe99e961feab6ca6573bc0d6e56248e697d605ca32c4f3e279f01a5
-SIZE (fpdf16.tgz) = 135111
+SHA256 (fpdf17.tgz) = 6e74f2dead54f538c1080cf353bf1ef3f10e3363402f53aa9b2c8f7f232a3c3a
+SIZE (fpdf17.tgz) = 127075
diff --git a/print/fpdf/pkg-plist b/print/fpdf/pkg-plist
index 4ac5fbd3754f..018b3fb37230 100644
--- a/print/fpdf/pkg-plist
+++ b/print/fpdf/pkg-plist
@@ -1,105 +1,86 @@
 %%PORTDOCS%%%%DOCSDIR%%/FAQ.htm
-%%PORTDOCS%%%%DOCSDIR%%/acceptpagebreak.htm
-%%PORTDOCS%%%%DOCSDIR%%/addfont.htm
-%%PORTDOCS%%%%DOCSDIR%%/addlink.htm
-%%PORTDOCS%%%%DOCSDIR%%/addpage.htm
-%%PORTDOCS%%%%DOCSDIR%%/aliasnbpages.htm
-%%PORTDOCS%%%%DOCSDIR%%/cell.htm
-%%PORTDOCS%%%%DOCSDIR%%/close.htm
-%%PORTDOCS%%%%DOCSDIR%%/error.htm
-%%PORTDOCS%%%%DOCSDIR%%/footer.htm
-%%PORTDOCS%%%%DOCSDIR%%/fpdf.htm
-%%PORTDOCS%%%%DOCSDIR%%/getstringwidth.htm
-%%PORTDOCS%%%%DOCSDIR%%/getx.htm
-%%PORTDOCS%%%%DOCSDIR%%/gety.htm
-%%PORTDOCS%%%%DOCSDIR%%/header.htm
-%%PORTDOCS%%%%DOCSDIR%%/image.htm
-%%PORTDOCS%%%%DOCSDIR%%/index.htm
-%%PORTDOCS%%%%DOCSDIR%%/line.htm
-%%PORTDOCS%%%%DOCSDIR%%/link.htm
-%%PORTDOCS%%%%DOCSDIR%%/ln.htm
-%%PORTDOCS%%%%DOCSDIR%%/multicell.htm
-%%PORTDOCS%%%%DOCSDIR%%/output.htm
-%%PORTDOCS%%%%DOCSDIR%%/pageno.htm
-%%PORTDOCS%%%%DOCSDIR%%/rect.htm
-%%PORTDOCS%%%%DOCSDIR%%/setauthor.htm
-%%PORTDOCS%%%%DOCSDIR%%/setautopagebreak.htm
-%%PORTDOCS%%%%DOCSDIR%%/setcompression.htm
-%%PORTDOCS%%%%DOCSDIR%%/setcreator.htm
-%%PORTDOCS%%%%DOCSDIR%%/setdisplaymode.htm
-%%PORTDOCS%%%%DOCSDIR%%/setdrawcolor.htm
-%%PORTDOCS%%%%DOCSDIR%%/setfillcolor.htm
-%%PORTDOCS%%%%DOCSDIR%%/setfont.htm
-%%PORTDOCS%%%%DOCSDIR%%/setfontsize.htm
-%%PORTDOCS%%%%DOCSDIR%%/setkeywords.htm
-%%PORTDOCS%%%%DOCSDIR%%/setleftmargin.htm
-%%PORTDOCS%%%%DOCSDIR%%/setlinewidth.htm
-%%PORTDOCS%%%%DOCSDIR%%/setlink.htm
-%%PORTDOCS%%%%DOCSDIR%%/setmargins.htm
-%%PORTDOCS%%%%DOCSDIR%%/setrightmargin.htm
-%%PORTDOCS%%%%DOCSDIR%%/setsubject.htm
-%%PORTDOCS%%%%DOCSDIR%%/settextcolor.htm
-%%PORTDOCS%%%%DOCSDIR%%/settitle.htm
-%%PORTDOCS%%%%DOCSDIR%%/settopmargin.htm
-%%PORTDOCS%%%%DOCSDIR%%/setx.htm
-%%PORTDOCS%%%%DOCSDIR%%/setxy.htm
-%%PORTDOCS%%%%DOCSDIR%%/sety.htm
-%%PORTDOCS%%%%DOCSDIR%%/text.htm
-%%PORTDOCS%%%%DOCSDIR%%/write.htm
+%%PORTDOCS%%%%DOCSDIR%%/changelog.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/acceptpagebreak.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/addfont.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/addlink.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/addpage.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/aliasnbpages.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/cell.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/close.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/error.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/footer.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/fpdf.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/getstringwidth.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/getx.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/gety.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/header.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/image.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/index.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/line.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/link.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/ln.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/multicell.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/output.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/pageno.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/rect.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/setauthor.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/setautopagebreak.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/setcompression.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/setcreator.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/setdisplaymode.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/setdrawcolor.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/setfillcolor.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/setfont.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/setfontsize.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/setkeywords.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/setleftmargin.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/setlinewidth.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/setlink.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/setmargins.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/setrightmargin.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/setsubject.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/settextcolor.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/settitle.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/settopmargin.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/setx.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/setxy.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/sety.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/text.htm
+%%PORTDOCS%%%%DOCSDIR%%/doc/write.htm
 %%PORTDOCS%%%%DOCSDIR%%/fpdf.css
-%%PORTDOCS%%%%DOCSDIR%%/histo.htm
 %%PORTDOCS%%%%DOCSDIR%%/install.txt
-%%PORTDOCS%%%%DOCSDIR%%/tutoriel/20k_c1.txt
-%%PORTDOCS%%%%DOCSDIR%%/tutoriel/20k_c2.txt
-%%PORTDOCS%%%%DOCSDIR%%/tutoriel/calligra.afm
-%%PORTDOCS%%%%DOCSDIR%%/tutoriel/calligra.php
-%%PORTDOCS%%%%DOCSDIR%%/tutoriel/calligra.ttf
-%%PORTDOCS%%%%DOCSDIR%%/tutoriel/calligra.z
-%%PORTDOCS%%%%DOCSDIR%%/tutoriel/index.htm
-%%PORTDOCS%%%%DOCSDIR%%/tutoriel/logo.png
-%%PORTDOCS%%%%DOCSDIR%%/tutoriel/logo_pb.png
-%%PORTDOCS%%%%DOCSDIR%%/tutoriel/makefont.php
-%%PORTDOCS%%%%DOCSDIR%%/tutoriel/pays.txt
-%%PORTDOCS%%%%DOCSDIR%%/tutoriel/tuto1.htm
-%%PORTDOCS%%%%DOCSDIR%%/tutoriel/tuto1.php
-%%PORTDOCS%%%%DOCSDIR%%/tutoriel/tuto2.htm
-%%PORTDOCS%%%%DOCSDIR%%/tutoriel/tuto2.php
-%%PORTDOCS%%%%DOCSDIR%%/tutoriel/tuto3.htm
-%%PORTDOCS%%%%DOCSDIR%%/tutoriel/tuto3.php
-%%PORTDOCS%%%%DOCSDIR%%/tutoriel/tuto4.htm
-%%PORTDOCS%%%%DOCSDIR%%/tutoriel/tuto4.php
-%%PORTDOCS%%%%DOCSDIR%%/tutoriel/tuto5.htm
-%%PORTDOCS%%%%DOCSDIR%%/tutoriel/tuto5.php
-%%PORTDOCS%%%%DOCSDIR%%/tutoriel/tuto6.htm
-%%PORTDOCS%%%%DOCSDIR%%/tutoriel/tuto6.php
-%%PORTDOCS%%%%DOCSDIR%%/tutoriel/tuto7.htm
-%%PORTDOCS%%%%DOCSDIR%%/tutoriel/tuto7.php
+%%PORTDOCS%%%%DOCSDIR%%/license.txt
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/20k_c1.txt
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/20k_c2.txt
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/calligra.php
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/calligra.ttf
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/calligra.z
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/countries.txt
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/index.htm
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/logo.png
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/makefont.php
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/tuto1.htm
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/tuto1.php
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/tuto2.htm
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/tuto2.php
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/tuto3.htm
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/tuto3.php
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/tuto4.htm
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/tuto4.php
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/tuto5.htm
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/tuto5.php
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/tuto6.htm
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/tuto6.php
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/tuto7.htm
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/tuto7.php
 %%FPDF_DIR%%/font/courier.php
+%%FPDF_DIR%%/font/courierb.php
+%%FPDF_DIR%%/font/courierbi.php
+%%FPDF_DIR%%/font/courieri.php
 %%FPDF_DIR%%/font/helvetica.php
 %%FPDF_DIR%%/font/helveticab.php
 %%FPDF_DIR%%/font/helveticabi.php
 %%FPDF_DIR%%/font/helveticai.php
-%%FPDF_DIR%%/font/makefont/cp1250.map
-%%FPDF_DIR%%/font/makefont/cp1251.map
-%%FPDF_DIR%%/font/makefont/cp1252.map
-%%FPDF_DIR%%/font/makefont/cp1253.map
-%%FPDF_DIR%%/font/makefont/cp1254.map
-%%FPDF_DIR%%/font/makefont/cp1255.map
-%%FPDF_DIR%%/font/makefont/cp1257.map
-%%FPDF_DIR%%/font/makefont/cp1258.map
-%%FPDF_DIR%%/font/makefont/cp874.map
-%%FPDF_DIR%%/font/makefont/iso-8859-1.map
-%%FPDF_DIR%%/font/makefont/iso-8859-11.map
-%%FPDF_DIR%%/font/makefont/iso-8859-15.map
-%%FPDF_DIR%%/font/makefont/iso-8859-16.map
-%%FPDF_DIR%%/font/makefont/iso-8859-2.map
-%%FPDF_DIR%%/font/makefont/iso-8859-4.map
-%%FPDF_DIR%%/font/makefont/iso-8859-5.map
-%%FPDF_DIR%%/font/makefont/iso-8859-7.map
-%%FPDF_DIR%%/font/makefont/iso-8859-9.map
-%%FPDF_DIR%%/font/makefont/koi8-r.map
-%%FPDF_DIR%%/font/makefont/koi8-u.map
-%%FPDF_DIR%%/font/makefont/makefont.php
 %%FPDF_DIR%%/font/symbol.php
 %%FPDF_DIR%%/font/times.php
 %%FPDF_DIR%%/font/timesb.php
@@ -107,8 +88,31 @@
 %%FPDF_DIR%%/font/timesi.php
 %%FPDF_DIR%%/font/zapfdingbats.php
 %%FPDF_DIR%%/fpdf.php
-@dirrm %%FPDF_DIR%%/font/makefont
+%%FPDF_DIR%%/makefont/cp1250.map
+%%FPDF_DIR%%/makefont/cp1251.map
+%%FPDF_DIR%%/makefont/cp1252.map
+%%FPDF_DIR%%/makefont/cp1253.map
+%%FPDF_DIR%%/makefont/cp1254.map
+%%FPDF_DIR%%/makefont/cp1255.map
+%%FPDF_DIR%%/makefont/cp1257.map
+%%FPDF_DIR%%/makefont/cp1258.map
+%%FPDF_DIR%%/makefont/cp874.map
+%%FPDF_DIR%%/makefont/iso-8859-1.map
+%%FPDF_DIR%%/makefont/iso-8859-11.map
+%%FPDF_DIR%%/makefont/iso-8859-15.map
+%%FPDF_DIR%%/makefont/iso-8859-16.map
+%%FPDF_DIR%%/makefont/iso-8859-2.map
+%%FPDF_DIR%%/makefont/iso-8859-4.map
+%%FPDF_DIR%%/makefont/iso-8859-5.map
+%%FPDF_DIR%%/makefont/iso-8859-7.map
+%%FPDF_DIR%%/makefont/iso-8859-9.map
+%%FPDF_DIR%%/makefont/koi8-r.map
+%%FPDF_DIR%%/makefont/koi8-u.map
+%%FPDF_DIR%%/makefont/makefont.php
+%%FPDF_DIR%%/makefont/ttfparser.php
+@dirrm %%FPDF_DIR%%/makefont
 @dirrm %%FPDF_DIR%%/font
 @dirrm %%FPDF_DIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/tutoriel
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/tutorial
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%