Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 4 Sep 2023 10:04:58 GMT
From:      Juraj Lutter <otis@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 34212762f08d - main - php.mk: Create php extension ini files as sample
Message-ID:  <202309041004.384A4w2A052146@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by otis:

URL: https://cgit.FreeBSD.org/ports/commit/?id=34212762f08d5fbd37e184176f420970daa967f2

commit 34212762f08d5fbd37e184176f420970daa967f2
Author:     Juraj Lutter <otis@FreeBSD.org>
AuthorDate: 2023-08-29 11:01:18 +0000
Commit:     Juraj Lutter <otis@FreeBSD.org>
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}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202309041004.384A4w2A052146>