svn commit: r559495 - in head/databases: phpmyadmin phpmyadmin5

Dima Panov fluffy at FreeBSD.org
Mon Dec 28 15:56:06 UTC 2020


Author: fluffy
Date: Mon Dec 28 15:56:05 2020
New Revision: 559495
URL: https://svnweb.freebsd.org/changeset/ports/559495

Log:
  databases/phpmyadmin*: unbreak build with php80
  
  Drop abandonware pecl-pdflib dependency with php80
  
  PHP80 was introduced more than two month ago,
  maintainer had more than enough time to react and fix the port
  
  With hat:	ports-secteam

Modified:
  head/databases/phpmyadmin/Makefile
  head/databases/phpmyadmin5/Makefile

Modified: head/databases/phpmyadmin/Makefile
==============================================================================
--- head/databases/phpmyadmin/Makefile	Mon Dec 28 15:52:44 2020	(r559494)
+++ head/databases/phpmyadmin/Makefile	Mon Dec 28 15:56:05 2020	(r559495)
@@ -36,7 +36,7 @@ USE_PHP=	ctype filter hash json mysqli session spl xml
 # want this, either turn off GD in the config dialog, or else turn off
 # FONTCONFIG in the graphics/gd port options.
 
-OPTIONS_DEFINE=		BZ2 CURL GD GMP MBSTRING OPCACHE OPENSSL PDF \
+OPTIONS_DEFINE=		BZ2 CURL GD GMP MBSTRING OPCACHE OPENSSL \
 			SODIUM ZIP ZLIB
 OPTIONS_DEFAULT=	BZ2 GD MBSTRING OPENSSL ZIP ZLIB
 
@@ -63,6 +63,10 @@ PLIST_SUB+=	PMA_GRP=${GROUPS}
 SUB_LIST+=	PKGNAME=${PKGNAME}	        \
 		CFG_FILE=${WWWDIR}/${CFG_FILE}
 SUB_FILES+=	pkg-message
+
+.if ${FLAVOR} != php80
+OPTIONS_DEFINE+=	PDF
+.endif
 
 .if !defined(WITHOUT_PHP_DEPENDS)
 

Modified: head/databases/phpmyadmin5/Makefile
==============================================================================
--- head/databases/phpmyadmin5/Makefile	Mon Dec 28 15:52:44 2020	(r559494)
+++ head/databases/phpmyadmin5/Makefile	Mon Dec 28 15:56:05 2020	(r559495)
@@ -35,7 +35,7 @@ USE_PHP=	ctype filter hash json mysqli session spl xml
 # want this, either turn off GD in the config dialog, or else turn off
 # FONTCONFIG in the graphics/gd port options.
 
-OPTIONS_DEFINE=		BZ2 CURL GD GMP MBSTRING OPCACHE OPENSSL PDF \
+OPTIONS_DEFINE=		BZ2 CURL GD GMP MBSTRING OPCACHE OPENSSL \
 			SODIUM ZIP ZLIB
 OPTIONS_DEFAULT=	BZ2 GD MBSTRING OPENSSL ZIP ZLIB
 
@@ -62,6 +62,10 @@ PLIST_SUB+=	PMA_GRP=${GROUPS}
 SUB_LIST+=	PKGNAME=${PKGNAME}	        \
 		CFG_FILE=${WWWDIR}/${CFG_FILE}
 SUB_FILES+=	pkg-message
+
+.if ${FLAVOR} != php80
+OPTIONS_DEFINE+=	PDF
+.endif
 
 .if !defined(WITHOUT_PHP_DEPENDS)
 


More information about the svn-ports-all mailing list