From owner-svn-ports-all@freebsd.org Mon Dec 28 15:56:06 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B5B634B913A; Mon, 28 Dec 2020 15:56:06 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D4MbV4H0Fz3spq; Mon, 28 Dec 2020 15:56:06 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 85A8B1C223; Mon, 28 Dec 2020 15:56:06 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BSFu6fd071547; Mon, 28 Dec 2020 15:56:06 GMT (envelope-from fluffy@FreeBSD.org) Received: (from fluffy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BSFu6lB071545; Mon, 28 Dec 2020 15:56:06 GMT (envelope-from fluffy@FreeBSD.org) Message-Id: <202012281556.0BSFu6lB071545@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fluffy set sender to fluffy@FreeBSD.org using -f From: Dima Panov Date: Mon, 28 Dec 2020 15:56:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r559495 - in head/databases: phpmyadmin phpmyadmin5 X-SVN-Group: ports-head X-SVN-Commit-Author: fluffy X-SVN-Commit-Paths: in head/databases: phpmyadmin phpmyadmin5 X-SVN-Commit-Revision: 559495 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Dec 2020 15:56:06 -0000 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)