diff options
| author | jperkin <jperkin@pkgsrc.org> | 2016-02-16 15:10:48 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2016-02-16 15:10:48 +0000 |
| commit | e9caacf201b37fbe70d4985227d6a2b69bdf0467 (patch) | |
| tree | ee3c7e79965bb899aff36ac85ecfe1397f6e51f0 /www | |
| parent | 09db7765c0f1ecf3b8f09fa75381f5cd129de6ec (diff) | |
| download | pkgsrc-e9caacf201b37fbe70d4985227d6a2b69bdf0467.tar.gz | |
Handle php70's FPM config layout correctly. Bump PKGREVISION.
Diffstat (limited to 'www')
| -rw-r--r-- | www/php-fpm/Makefile | 18 | ||||
| -rw-r--r-- | www/php-fpm/PLIST | 4 |
2 files changed, 18 insertions, 4 deletions
diff --git a/www/php-fpm/Makefile b/www/php-fpm/Makefile index 8c798df02f7..c9d6ea7f78b 100644 --- a/www/php-fpm/Makefile +++ b/www/php-fpm/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.14 2015/09/07 12:02:06 jperkin Exp $ +# $NetBSD: Makefile,v 1.15 2016/02/16 15:10:48 jperkin Exp $ PKGNAME= ${PHP_PKG_PREFIX}-fpm-${PHP_VERSION} +PKGREVISION= 1 CATEGORIES= www HOMEPAGE= http://php-fpm.org/ @@ -32,6 +33,17 @@ EGDIR= ${PREFIX}/share/examples/php CONF_FILES= ${EGDIR}/php-fpm.conf ${PKG_SYSCONFDIR}/php-fpm.conf AUTO_MKDIRS= yes +.include "../../lang/php/phpversion.mk" + +PLIST_VARS+= fpmdotd + +.if ${PKG_PHP_VERSION} >= 70 +CONF_FILES+= ${EGDIR}/php-fpm.d/www.conf ${PKG_SYSCONFDIR}/php-fpm.d/www.conf +OWN_DIRS+= ${PKG_SYSCONFDIR}/php-fpm.d +INSTALLATION_DIRS+= ${EGDIR}/php-fpm.d +PLIST.fpmdotd= yes +.endif + CONFIGURE_ARGS+= --enable-fpm CONFIGURE_ARGS+= --with-fpm-user=${FPM_USER} CONFIGURE_ARGS+= --with-fpm-group=${FPM_GROUP} @@ -45,8 +57,10 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/sapi/fpm/php-fpm ${DESTDIR}${PREFIX}/sbin/php-fpm ${INSTALL_MAN} ${WRKSRC}/sapi/fpm/php-fpm.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/ ${INSTALL_DATA} ${WRKSRC}/sapi/fpm/php-fpm.conf ${DESTDIR}${EGDIR} +.if ${PKG_PHP_VERSION} >= 70 + ${INSTALL_DATA} ${WRKSRC}/sapi/fpm/www.conf ${DESTDIR}${EGDIR}/php-fpm.d +.endif -.include "../../lang/php/phpversion.mk" .include "${PHPPKGSRCDIR}/Makefile.php" .include "${PHPPKGSRCDIR}/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/php-fpm/PLIST b/www/php-fpm/PLIST index b6f0eddaa29..2a30ac1183c 100644 --- a/www/php-fpm/PLIST +++ b/www/php-fpm/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.2 2014/03/11 14:05:18 jperkin Exp $ +@comment $NetBSD: PLIST,v 1.3 2016/02/16 15:10:48 jperkin Exp $ man/man8/php-fpm.8 sbin/php-fpm share/examples/php/php-fpm.conf -@pkgdir share/examples/php +${PLIST.fpmdotd}share/examples/php/php-fpm.d/www.conf |