From nobody Mon Feb 7 21:54:16 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 9874219BD1CE; Mon, 7 Feb 2022 21:54:16 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jt0KN3kRRz3QfH; Mon, 7 Feb 2022 21:54:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644270856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4WltNS2aiev7w96a65jD8k9yGXh7sJbm3q5lxqO+e7U=; b=FAKWQIEeLhz2oWkDzJ3/c+2ogQO8X5o65vFsinbcTZFW4ZNeNIvr8ttVrMqdapwemwcUbY DKXEyoo08jj3eRULQ6ZVhNL2hj0+ogt3I9m+lEp9r9yNxQ+w7XT9xwHELMEDq/y5lVrKZ8 Eu+haM/axsnM1lKAJ4Ndw/m5ySnIEiKG2he21Xek3zcHjaaAes81g7LPKYQgK9tmo9ZkXe 3KBZZ9OiA867qrUwL2BwDbMCCVNjIeRR9yqaEfJ0+RItt9nT9juJDH88g13cVTkRlqdJy0 4JmnzqwxZkHLyn4iI9wY3DlgQu8jqqfsxDwSVO5fFzeW8a/RZqfeVUdieQ/0Bw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6033753C3; Mon, 7 Feb 2022 21:54:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 217LsGQ9030807; Mon, 7 Feb 2022 21:54:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 217LsGkn030806; Mon, 7 Feb 2022 21:54:16 GMT (envelope-from git) Date: Mon, 7 Feb 2022 21:54:16 GMT Message-Id: <202202072154.217LsGkn030806@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Florian Smeets Subject: git: 3fbf0a24f9d5 - main - www/phpmyfaq: actually make this work with PHP >= 8.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: flo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3fbf0a24f9d5666561c3ef5e908f4e5c25c7227e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644270856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4WltNS2aiev7w96a65jD8k9yGXh7sJbm3q5lxqO+e7U=; b=VpINLholTjXzycVIkp2HVH3aGXk61L6zRw6zG41r4UPEPtVP8nLJFe9hRrFgN98f7mdNjf a0CxcyjBFvzM/cY7WyT8O47Spi9M16PkF3CLgcq4tttd4nzqOCxUSHzJEGP6T1NbDpw9NC 9f6UU+3A56aKQHm3aG/Ma0bO7iGIlmOlczVU4ocgBS2gJN0PoETXVDzlpUbIbJF/9b1oPV 56s1IZzMhHktcqB/tjG76pTev//8/RA0SRl49OkyltIvHZKPmJFabFrK+5Qr0EbvEf51IJ RzwdWFSRgtTIowJlfF6KZ4gcF2LJnREdudG2Fp3Ji88FoXxBCukdPXbmy4ewVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644270856; a=rsa-sha256; cv=none; b=K1obu+6dcDw05R1DGElGXVa+/Z4RnuhqgNWIvktGSKbIuKITbS38Qb01oLaffufREvC32t PqHBBq/KC1IaxN4P9ttz59qNcrej07YdgeHeoarqFBtFHv2yavVLEtHX2wMgCrG1IgBORr INY5JzgR5gSa7J5mvsSGogSUUkBRkS/+V57LGz/6ziq6S3bOq2GkI0aL95NoIxUgEdjbnR OjZulDQSXh8xd1NVkV/vPNroFZJZ6iheoopi6ihWYfU4nTTpSGOJSh6f/3z1K5vzzrY5oq cbtqdkupxRjXAHjl7LfRfrBre6llzSVu2hqxOlO8O1jDWcKBAhj9YJ4TeaODXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by flo: URL: https://cgit.FreeBSD.org/ports/commit/?id=3fbf0a24f9d5666561c3ef5e908f4e5c25c7227e commit 3fbf0a24f9d5666561c3ef5e908f4e5c25c7227e Author: Florian Smeets AuthorDate: 2022-02-07 21:48:08 +0000 Commit: Florian Smeets CommitDate: 2022-02-07 21:48:08 +0000 www/phpmyfaq: actually make this work with PHP >= 8.0 I used the wrong poudriere script to test these changes, it builds with my production settings, where PHP is still set to 7.4, so it didn't catch the build error. PR: 261617 --- www/phpmyfaq/Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/www/phpmyfaq/Makefile b/www/phpmyfaq/Makefile index 6364d6a93d76..0e3644fe86c2 100644 --- a/www/phpmyfaq/Makefile +++ b/www/phpmyfaq/Makefile @@ -13,7 +13,7 @@ LICENSE= MPL20 WRKSRC= ${WRKDIR}/${PORTNAME} USES= cpe php:web -USE_PHP= filter json mysqli pcre pdf session xml xmlrpc xmlwriter zlib +USE_PHP= filter json mysqli pcre session xml xmlrpc xmlwriter zlib FAQ_DIR= attachments data images inc pdf xml NO_BUILD= YES NO_ARCH= YES @@ -25,4 +25,10 @@ do-install: @${MKDIR} ${STAGEDIR}${WWWDIR}/${i} .endfor -.include +.include + +.if ${PHP_VER} < 80 +USE_PHP+= pdf +.endif + +.include