From nobody Mon Sep 4 10:04:58 2023 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 4RfPQ241KBz4rl0c; Mon, 4 Sep 2023 10:04:58 +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 4RfPQ23Zqyz3FZg; Mon, 4 Sep 2023 10:04:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693821898; 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=XIu6MMAH6x0stOLUw681Bbldzk2r2jRpMse+Zud82Ik=; b=dTOZAfqIw10/MsXZp6rJDm7Xk0jE2W+hW4ROI1PVlmssmyo31LXVCib/5U10iXMIad5qME cbjyQhaT+5T29KiSFSRZIDqhCnzTV3b+QXROuycOeL2mNlLYLJu5lhF0yuJbvOKk5rv2mM 4W4+G11JYHUFGt2OswxlzdpjTq9Oyb2a5pw8JZqTK7ahGxAFiPIn34hjo4TwPNlMQEA47M OG2+GXBcHnpQnBM0hoHo5cxOMFwHJ6e2IIXevhDGMXQDtttEMqZbSyJ6dmWjZeN9NEtiR2 L5FawzgK4x+e4TXgGN4b2bG8rtYT7cvYPgr45s9pzhjCj2GX0UavOOVsFrQ5Xw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693821898; a=rsa-sha256; cv=none; b=syUKp52ac2QMpmJApqd/xZH45UmsD+5WUKnlDmdW33wt3SJ3jR44q7qVOprBcSsqZv9MCf OmWitFYVWRWhuQEXrLo006U8DYePi2Go0NJxJP0Q329XE/usW3h0oEXPM0eBzGi6vqgRPV R2/lHlzBPgCCLVxHeunRhcwWH4S9OpwmsNmP37HoJy8xerXJ1u8IYj3C0oHMyiYIKFLIs0 Y2RO31cB1KY/CO/cuTRUO8NpPchwgLmhIrLBj9RTYexbg4Y6PI+hvNUUW12Z9Hj4R3qnVG XVm2QrPRB3GwmbXnNBTeBzgHI2UgLjOg16thLdqSNuMqbtiMnf/wfVD9GefLAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693821898; 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=XIu6MMAH6x0stOLUw681Bbldzk2r2jRpMse+Zud82Ik=; b=LSriNEL0Yqg/SlYPmQyC8o0bXIHF8fOYTSAheRxSABUAwERFoR+GvcuMArYq8Q9l4IgMFb BpiIFnH20aZsWcsaphLrfvhmitECJlbx0Zec+hEBbokpsx5qZkNyXDUGqm7/L9OOXn5VJO cSv49TX6/bpRDCIuQgU+NWxE0YFbeJWU7haxLhZf0vmO3Hksy6kY6Q9n8q2FOvnM1bx9Uk oVujJqOwGWuCGL87YInDQ+AynRxjYHd0397OIhUaMo3RgIo1lxsIRTHb8q3U2YOECrXgA6 XvCljwJV8A0vfmiOLP4TDiw7wunX/gYT96a4fxQJNkRcIMHtfikMI/SIRyDYnA== 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 4RfPQ22X1Cz12mY; Mon, 4 Sep 2023 10:04:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 384A4wLI052149; Mon, 4 Sep 2023 10:04:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 384A4w2A052146; Mon, 4 Sep 2023 10:04:58 GMT (envelope-from git) Date: Mon, 4 Sep 2023 10:04:58 GMT Message-Id: <202309041004.384A4w2A052146@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Juraj Lutter Subject: git: 34212762f08d - main - php.mk: Create php extension ini files as sample 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: otis X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 34212762f08d5fbd37e184176f420970daa967f2 Auto-Submitted: auto-generated The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=34212762f08d5fbd37e184176f420970daa967f2 commit 34212762f08d5fbd37e184176f420970daa967f2 Author: Juraj Lutter AuthorDate: 2023-08-29 11:01:18 +0000 Commit: Juraj Lutter CommitDate: 2023-09-04 09:56:06 +0000 php.mk: Create php extension ini files as sample Create php extension ini files with .sample extension to prevent subsequent upgrades from clobbering the, possibly, user-modified .ini files. Reviewed by: ale, bofh, portmgr Approved by: bofh Differential Revision: https://reviews.freebsd.org/D41630 --- Mk/Uses/php.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Mk/Uses/php.mk b/Mk/Uses/php.mk index 330d58c8226c..fa474064b649 100644 --- a/Mk/Uses/php.mk +++ b/Mk/Uses/php.mk @@ -321,7 +321,7 @@ PHP_MOD_PRIO= 30 PHP_MOD_PRIO= 20 . endif . endif -PHP_EXT_INI_FILE= etc/php/ext-${PHP_MOD_PRIO}-${PHP_MODNAME}.ini +PHP_EXT_INI_FILE= etc/php/ext-${PHP_MOD_PRIO}-${PHP_MODNAME}.ini.sample do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/php/${PHP_EXT_DIR} @@ -356,7 +356,7 @@ add-plist-phpext: >> ${TMPPLIST} @${ECHO_CMD} "@preunexec ${RM} %D/include/php/ext/php_config.h.orig" \ >> ${TMPPLIST} - @${ECHO_CMD} "${PHP_EXT_INI_FILE}" \ + @${ECHO_CMD} "@sample ${PHP_EXT_INI_FILE}" \ >> ${TMPPLIST} @${ECHO_CMD} "[" > ${PHP_EXT_PKGMESSAGE} @${ECHO_CMD} "{" >> ${PHP_EXT_PKGMESSAGE}