php-pdflib: update to 4.1.2

Use maintained pdflib-lite for build and runtime dependency.

Changelog:

4.1.2
- fix problem in PHP 7 that when extending the PDFlib class it was not possible to access any members of the extended class.

4.1.1
- fix build problem when compiling statically into PHP

4.1.0
- add support for PDFlib 9.1

4.0.1
- fix bug #73249
- improve PHP7 wrapper (fixed crash when extending PDFlib class)

4.0.0
- add support for PHP7

3.0.4
- avoid deprecated warnings for API's which are not yet deprecated when building against an older PDFlib Version.

3.0.3
- fixed bug #66346 (undefined reference to `pdf_begin_pattern_ext')

3.0.2
- support PDFlib 9.0.2

3.0.1
- support PDFlib 9.0.1
- fix bug https://bugs.php.net/bug.php?id=64455
- support for PDFlib 7/8/9 and PDFlib Light
- dropped support for PDFlib 6 and earlier

5 files changed, 9 insertions, 286 deletions

diff --git a/print/php-pdflib/Makefile b/print/php-pdflib/Makefile
index b47978e908a..66da06399cd 100644
--- a/print/php-pdflib/Makefile
+++ b/print/php-pdflib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2016/09/11 17:03:27 taca Exp $
+# $NetBSD: Makefile,v 1.27 2018/12/11 14:15:14 tm Exp $
 
 MODNAME=		pdflib
 PKGMODNAME=		pdf
-PECL_VERSION=		2.1.10
+PECL_VERSION=		4.1.2
 PECL_LEGACY_VERSION_SCHEME=	yes
 CATEGORIES+=		print
 COMMENT=		PHP extension for PDFlib on-the-fly PDF generation
@@ -11,8 +11,8 @@ CONFLICTS=	php-pdf-[0-9]*
 
 PHP_VERSIONS_ACCEPTED=	56
 
-CONFIGURE_ARGS+=	--with-pdflib=shared,${BUILDLINK_PREFIX.pdflib}
+CONFIGURE_ARGS+=	--with-pdflib=shared,${BUILDLINK_PREFIX.pdflib-lite}
 
 .include "../../lang/php/ext.mk"
-.include "../../print/pdflib/buildlink3.mk"
+.include "../../print/pdflib-lite/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/php-pdflib/distinfo b/print/php-pdflib/distinfo
index e191e7948c4..fa578fc459a 100644
--- a/print/php-pdflib/distinfo
+++ b/print/php-pdflib/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.7 2015/11/04 01:01:37 agc Exp $
+$NetBSD: distinfo,v 1.8 2018/12/11 14:15:14 tm Exp $
 
-SHA1 (php-pdflib/pdflib-2.1.10.tgz) = adfb7d0d84e25f0686b524d260d65827de9d9d09
-RMD160 (php-pdflib/pdflib-2.1.10.tgz) = 65dd3567bf1200880378cd8ee01d5341e8d421b7
-SHA512 (php-pdflib/pdflib-2.1.10.tgz) = 8d8d948469e65bc1143e54c737e7780beadb0a679a3d184863bb0de23874b1ff4f62f6979ae4cc89f5a262bb39246c96c92ac2e32a57c8316d14132b03efe76b
-Size (php-pdflib/pdflib-2.1.10.tgz) = 55880 bytes
-SHA1 (patch-pdf.c) = f6a2eb401f5da024df69e6fab119c482d6c8946b
-SHA1 (patch-pdf4.c) = 031c90ac70e3b83a92ea5d7f05388542aad1f2e0
-SHA1 (patch-pdf7.c) = a8cbd01525aa2b4bcbaceb15e82beff1223ce383
+SHA1 (php-pdflib/pdflib-4.1.2.tgz) = 2e9ff9d61547220675de917c5a2424fa941fc4b5
+RMD160 (php-pdflib/pdflib-4.1.2.tgz) = 55a13e9601b3eba90d39a8364b5242623d159720
+SHA512 (php-pdflib/pdflib-4.1.2.tgz) = 0df48587b47f2023c9863f50f71d7425b14dabfce30a5a356698272048197bb112faa788c4ac4c0032340f10795798a54c95e490fa0de4ebd5b6e8983ef064c0
+Size (php-pdflib/pdflib-4.1.2.tgz) = 33081 bytes
diff --git a/print/php-pdflib/patches/patch-pdf.c b/print/php-pdflib/patches/patch-pdf.c
deleted file mode 100644
index e56dddf77d3..00000000000
--- a/print/php-pdflib/patches/patch-pdf.c
+++ /dev/null
@@ -1,156 +0,0 @@
-$NetBSD: patch-pdf.c,v 1.1 2012/06/16 02:59:00 taca Exp $
-
-* Add support for PHP 5.4.x.
-
---- pdf.c.orig	1970-01-01 09:13:24.000000000 +0000
-+++ pdf.c
-@@ -1075,8 +1075,12 @@ PHP_FUNCTION(pdf_add_launchlink)
- #endif /* VIRTUAL_DIR */
- 
- #ifdef PDFLIB_CHECK_OPEN_BASEDIR
--    if (php_check_open_basedir(vfilename TSRMLS_CC) || (PG(safe_mode) &&
--            !php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))) {
-+    if (php_check_open_basedir(vfilename TSRMLS_CC)
-+#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4
-+	|| (PG(safe_mode) &&
-+            !php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))
-+#endif
-+	) {
-         RETURN_FALSE;
-     }
- #endif /* PDFLIB_CHECK_OPEN_BASEDIR */
-@@ -1291,8 +1295,12 @@ PHP_FUNCTION(pdf_add_pdflink)
- #endif /* VIRTUAL_DIR */
- 
- #ifdef PDFLIB_CHECK_OPEN_BASEDIR
--    if (php_check_open_basedir(vfilename TSRMLS_CC) || (PG(safe_mode) &&
--            !php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))) {
-+    if (php_check_open_basedir(vfilename TSRMLS_CC)
-+#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4
-+	|| (PG(safe_mode) &&
-+            !php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))
-+#endif
-+	) {
-         RETURN_FALSE;
-     }
- #endif /* PDFLIB_CHECK_OPEN_BASEDIR */
-@@ -1545,8 +1553,12 @@ PHP_FUNCTION(pdf_attach_file)
- #endif /* VIRTUAL_DIR */
- 
- #ifdef PDFLIB_CHECK_OPEN_BASEDIR
--    if (php_check_open_basedir(vfilename TSRMLS_CC) || (PG(safe_mode) &&
--            !php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))) {
-+    if (php_check_open_basedir(vfilename TSRMLS_CC)
-+#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4
-+	|| (PG(safe_mode) &&
-+            !php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))
-+#endif
-+	) {
-         RETURN_FALSE;
-     }
- #endif /* PDFLIB_CHECK_OPEN_BASEDIR */
-@@ -1609,8 +1621,12 @@ PHP_FUNCTION(pdf_begin_document)
-     vfilename = filename;
- #endif /* VIRTUAL_DIR */
- 
--    if (php_check_open_basedir(vfilename TSRMLS_CC) || (PG(safe_mode) &&
--            !php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))) {
-+    if (php_check_open_basedir(vfilename TSRMLS_CC)
-+#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4
-+	|| (PG(safe_mode) &&
-+            !php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))
-+#endif
-+	) {
-         RETURN_FALSE;
-     }
- 
-@@ -4773,8 +4789,12 @@ PHP_FUNCTION(pdf_load_iccprofile)
- #endif /* VIRTUAL_DIR */
- 
- #ifdef PDFLIB_CHECK_OPEN_BASEDIR
--    if (php_check_open_basedir(vfilename TSRMLS_CC) || (PG(safe_mode) &&
--            !php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))) {
-+    if (php_check_open_basedir(vfilename TSRMLS_CC)
-+#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4
-+	|| (PG(safe_mode) &&
-+            !php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))
-+#endif
-+	) {
-         RETURN_FALSE;
-     }
- #endif /* PDFLIB_CHECK_OPEN_BASEDIR */
-@@ -4836,8 +4856,12 @@ PHP_FUNCTION(pdf_load_image)
- #endif /* VIRTUAL_DIR */
- 
- #ifdef PDFLIB_CHECK_OPEN_BASEDIR
--    if (php_check_open_basedir(vfilename TSRMLS_CC) || (PG(safe_mode) &&
--            !php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))) {
-+    if (php_check_open_basedir(vfilename TSRMLS_CC)
-+#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4
-+	|| (PG(safe_mode) &&
-+            !php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))
-+#endif
-+	) {
-         RETURN_FALSE;
-     }
- #endif /* PDFLIB_CHECK_OPEN_BASEDIR */
-@@ -5037,8 +5061,12 @@ PHP_FUNCTION(pdf_open_ccitt)
- #endif /* VIRTUAL_DIR */
- 
- #ifdef PDFLIB_CHECK_OPEN_BASEDIR
--    if (php_check_open_basedir(vfilename TSRMLS_CC) || (PG(safe_mode) &&
--            !php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))) {
-+    if (php_check_open_basedir(vfilename TSRMLS_CC)
-+#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4
-+	|| (PG(safe_mode) &&
-+            !php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))
-+#endif
-+	) {
-         RETURN_FALSE;
-     }
- #endif /* PDFLIB_CHECK_OPEN_BASEDIR */
-@@ -5102,8 +5130,12 @@ PHP_FUNCTION(pdf_open_file)
-     vfilename = filename;
- #endif /* VIRTUAL_DIR */
- 
--    if (php_check_open_basedir(vfilename TSRMLS_CC) || (PG(safe_mode) &&
--            !php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))) {
-+    if (php_check_open_basedir(vfilename TSRMLS_CC)
-+#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4
-+	|| (PG(safe_mode) &&
-+            !php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))
-+#endif
-+	) {
-         RETURN_FALSE;
-     }
- 
-@@ -5222,8 +5254,12 @@ PHP_FUNCTION(pdf_open_image_file)
- #endif /* VIRTUAL_DIR */
- 
- #ifdef PDFLIB_CHECK_OPEN_BASEDIR
--    if (php_check_open_basedir(vfilename TSRMLS_CC) || (PG(safe_mode) &&
--            !php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))) {
-+    if (php_check_open_basedir(vfilename TSRMLS_CC)
-+#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4
-+	|| (PG(safe_mode) &&
-+            !php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))
-+#endif
-+	) {
-         RETURN_FALSE;
-     }
- #endif /* PDFLIB_CHECK_OPEN_BASEDIR */
-@@ -5287,8 +5323,12 @@ PHP_FUNCTION(pdf_open_pdi)
- #endif /* VIRTUAL_DIR */
- 
- #ifdef PDFLIB_CHECK_OPEN_BASEDIR
--    if (php_check_open_basedir(vfilename TSRMLS_CC) || (PG(safe_mode) &&
--            !php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))) {
-+    if (php_check_open_basedir(vfilename TSRMLS_CC)
-+#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4
-+	|| (PG(safe_mode) &&
-+            !php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))
-+#endif
-+	) {
-         RETURN_FALSE;
-     }
- #endif /* PDFLIB_CHECK_OPEN_BASEDIR */
diff --git a/print/php-pdflib/patches/patch-pdf4.c b/print/php-pdflib/patches/patch-pdf4.c
deleted file mode 100644
index 5d1f27bfb29..00000000000
--- a/print/php-pdflib/patches/patch-pdf4.c
+++ /dev/null
@@ -1,97 +0,0 @@
-$NetBSD: patch-pdf4.c,v 1.1 2012/06/16 02:59:00 taca Exp $
-
-* Add support for PHP 5.4.x.
-
---- pdf4.c.orig	1970-01-01 09:13:24.000000000 +0000
-+++ pdf4.c
-@@ -1846,7 +1846,11 @@ static void _php_pdf_open_image(INTERNAL
- 	image = Z_STRVAL_PP(arg2);
- #endif  
- 
--	if (php_check_open_basedir(image TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(image, "rb+", CHECKUID_CHECK_MODE_PARAM))) {
-+	if (php_check_open_basedir(image TSRMLS_CC)
-+#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4
-+		|| (PG(safe_mode) && !php_checkuid(image, "rb+", CHECKUID_CHECK_MODE_PARAM))
-+#endif
-+		) {
- 		RETURN_FALSE;
- 	}
- 
-@@ -1923,7 +1927,11 @@ PHP_FUNCTION(pdf_open_image_file)
- 	image = Z_STRVAL_PP(arg3);
- #endif  
- 
--	if (php_check_open_basedir(image TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(image, "rb+", CHECKUID_CHECK_MODE_PARAM))) {
-+	if (php_check_open_basedir(image TSRMLS_CC)
-+#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4
-+		|| (PG(safe_mode) && !php_checkuid(image, "rb+", CHECKUID_CHECK_MODE_PARAM))
-+#endif
-+		) {
- 		RETURN_FALSE;
- 	}
- 
-@@ -2345,7 +2353,11 @@ PHP_FUNCTION(pdf_open_file)
- 		convert_to_string_ex(arg2);
- 		filename = Z_STRVAL_PP(arg2);
- 
--		if (php_check_open_basedir(filename TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(filename, "wb+", CHECKUID_CHECK_MODE_PARAM))) {
-+		if (php_check_open_basedir(filename TSRMLS_CC)
-+#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4
-+			|| (PG(safe_mode) && !php_checkuid(filename, "wb+", CHECKUID_CHECK_MODE_PARAM))
-+#endif
-+			) {
- 			RETURN_FALSE;
- 		}
- 		if (php_check_open_basedir(filename TSRMLS_CC)) {
-@@ -2564,7 +2576,11 @@ PHP_FUNCTION(pdf_open_ccitt)
- 	image = Z_STRVAL_PP(arg2);
- #endif  
- 
--	if (php_check_open_basedir(image TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(image, "rb+", CHECKUID_CHECK_MODE_PARAM))) {
-+	if (php_check_open_basedir(image TSRMLS_CC)
-+#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4
-+		|| (PG(safe_mode) && !php_checkuid(image, "rb+", CHECKUID_CHECK_MODE_PARAM))
-+#endif
-+		) {
- 		RETURN_FALSE;
- 	}
- 
-@@ -2617,7 +2633,11 @@ PHP_FUNCTION(pdf_open_image)
- 	image = Z_STRVAL_PP(arg4);
- #endif  
- 
--	if (php_check_open_basedir(image TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(image, "rb+", CHECKUID_CHECK_MODE_PARAM))) {
-+	if (php_check_open_basedir(image TSRMLS_CC)
-+#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4
-+		|| (PG(safe_mode) && !php_checkuid(image, "rb+", CHECKUID_CHECK_MODE_PARAM))
-+#endif
-+		) {
- 		RETURN_FALSE;
- 	}
- 
-@@ -2659,7 +2679,11 @@ PHP_FUNCTION(pdf_attach_file)
- 	convert_to_string_ex(arg9);
- 	convert_to_string_ex(arg10);
- 
--	if (php_check_open_basedir(Z_STRVAL_PP(arg6) TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(Z_STRVAL_PP(arg6), "rb+", CHECKUID_CHECK_MODE_PARAM))) {
-+	if (php_check_open_basedir(Z_STRVAL_PP(arg6) TSRMLS_CC)
-+#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4
-+		|| (PG(safe_mode) && !php_checkuid(Z_STRVAL_PP(arg6), "rb+", CHECKUID_CHECK_MODE_PARAM))
-+#endif
-+		) {
- 		RETURN_FALSE;
- 	}
- 
-@@ -2803,7 +2827,11 @@ PHP_FUNCTION(pdf_open_pdi)
- 	file = Z_STRVAL_PP(arg2);
- #endif  
- 
--	if (php_check_open_basedir(file TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(file, "rb+", CHECKUID_CHECK_MODE_PARAM))) {
-+	if (php_check_open_basedir(file TSRMLS_CC)
-+#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4
-+		|| (PG(safe_mode) && !php_checkuid(file, "rb+", CHECKUID_CHECK_MODE_PARAM))
-+#endif
-+		) {
- 		RETURN_FALSE;
- 	}
- 
diff --git a/print/php-pdflib/patches/patch-pdf7.c b/print/php-pdflib/patches/patch-pdf7.c
deleted file mode 100644
index 837872255e4..00000000000
--- a/print/php-pdflib/patches/patch-pdf7.c
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-pdf7.c,v 1.1 2012/06/16 02:59:00 taca Exp $
-
-* Add support for PHP 5.4.x.
-
---- pdf7.c.orig	1970-01-01 09:13:24.000000000 +0000
-+++ pdf7.c
-@@ -541,8 +541,12 @@ PHP_FUNCTION(pdf_open_pdi)
- 
- #ifdef PDFLIB_CHECK_OPEN_BASEDIR
-     if (vfilename && *vfilename) {
--	if (php_check_open_basedir(vfilename TSRMLS_CC) || (PG(safe_mode) &&
--		!php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))) {
-+	if (php_check_open_basedir(vfilename TSRMLS_CC)
-+#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4
-+	    || (PG(safe_mode) &&
-+		!php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))
-+#endif
-+	    ) {
- 	    RETURN_FALSE;
-     }
-     }