Fri Apr 17 09:18:54 2020 UTC ()
php-fpm: remove useless variable

pkgsrc changes:
---------------
* Remove USE_PHP_EXT_PATCHES since lang/php/ext.mk is not included.


(triaxx)
diff -r1.30 -r1.31 pkgsrc/www/php-fpm/Makefile
cvs diff -r1.30 -r1.31 pkgsrc/www/php-fpm/Makefile (switch to unified diff)

--- pkgsrc/www/php-fpm/Makefile 2020/04/15 11:57:35 1.30
+++ pkgsrc/www/php-fpm/Makefile 2020/04/17 09:18:54 1.31
@@ -1,65 +1,64 @@ @@ -1,65 +1,64 @@
1# $NetBSD: Makefile,v 1.30 2020/04/15 11:57:35 triaxx Exp $ 1# $NetBSD: Makefile,v 1.31 2020/04/17 09:18:54 triaxx Exp $
2 2
3PKGNAME= ${PHP_PKG_PREFIX}-fpm-${PHP_VERSION} 3PKGNAME= ${PHP_PKG_PREFIX}-fpm-${PHP_VERSION}
4PKGREVISION= 3 4PKGREVISION= 3
5 5
6HOMEPAGE= https://php-fpm.org/ 6HOMEPAGE= https://php-fpm.org/
7MAINTAINER= fhajny@NetBSD.org 7MAINTAINER= fhajny@NetBSD.org
8COMMENT= FPM interface for ${PKG_PHP} 8COMMENT= FPM interface for ${PKG_PHP}
9LICENSE= 2-clause-bsd 9LICENSE= 2-clause-bsd
10 10
11USE_TOOLS+= pkg-config 11USE_TOOLS+= pkg-config
12 12
13USE_PHP_EXT_PATCHES= yes 
14LIBTOOL_OVERRIDE= # empty 13LIBTOOL_OVERRIDE= # empty
15 14
16.include "../../mk/bsd.prefs.mk" 15.include "../../mk/bsd.prefs.mk"
17 16
18FPM_USER?= fpm 17FPM_USER?= fpm
19FPM_GROUP?= www 18FPM_GROUP?= www
20 19
21BUILD_DEFS+= VARBASE FPM_USER FPM_GROUP 20BUILD_DEFS+= VARBASE FPM_USER FPM_GROUP
22 21
23PKG_USERS_VARS= FPM_USER 22PKG_USERS_VARS= FPM_USER
24PKG_GROUPS_VARS= FPM_GROUP 23PKG_GROUPS_VARS= FPM_GROUP
25PKG_GROUPS= ${FPM_GROUP} 24PKG_GROUPS= ${FPM_GROUP}
26PKG_USERS= ${FPM_USER}:${FPM_GROUP} 25PKG_USERS= ${FPM_USER}:${FPM_GROUP}
27 26
28PKG_GECOS.${FPM_USER}= PHP FPM daemon user 27PKG_GECOS.${FPM_USER}= PHP FPM daemon user
29PKG_SHELL.${FPM_USER}= ${NOLOGIN} 28PKG_SHELL.${FPM_USER}= ${NOLOGIN}
30 29
31EGDIR= ${PREFIX}/share/examples/php 30EGDIR= ${PREFIX}/share/examples/php
32CONF_FILES= ${EGDIR}/php-fpm.conf ${PKG_SYSCONFDIR}/php-fpm.conf 31CONF_FILES= ${EGDIR}/php-fpm.conf ${PKG_SYSCONFDIR}/php-fpm.conf
33AUTO_MKDIRS= yes 32AUTO_MKDIRS= yes
34 33
35.include "../../lang/php/phpversion.mk" 34.include "../../lang/php/phpversion.mk"
36 35
37PLIST_VARS+= fpmdotd 36PLIST_VARS+= fpmdotd
38 37
39.if ${PKG_PHP_VERSION} >= 70 38.if ${PKG_PHP_VERSION} >= 70
40CONF_FILES+= ${EGDIR}/php-fpm.d/www.conf ${PKG_SYSCONFDIR}/php-fpm.d/www.conf 39CONF_FILES+= ${EGDIR}/php-fpm.d/www.conf ${PKG_SYSCONFDIR}/php-fpm.d/www.conf
41OWN_DIRS+= ${PKG_SYSCONFDIR}/php-fpm.d 40OWN_DIRS+= ${PKG_SYSCONFDIR}/php-fpm.d
42INSTALLATION_DIRS+= ${EGDIR}/php-fpm.d 41INSTALLATION_DIRS+= ${EGDIR}/php-fpm.d
43PLIST.fpmdotd= yes 42PLIST.fpmdotd= yes
44.endif 43.endif
45 44
46CONFIGURE_ARGS+= --enable-fpm 45CONFIGURE_ARGS+= --enable-fpm
47CONFIGURE_ARGS+= --with-fpm-user=${FPM_USER} 46CONFIGURE_ARGS+= --with-fpm-user=${FPM_USER}
48CONFIGURE_ARGS+= --with-fpm-group=${FPM_GROUP} 47CONFIGURE_ARGS+= --with-fpm-group=${FPM_GROUP}
49 48
50SMF_NAME= php-fpm 49SMF_NAME= php-fpm
51RCD_SCRIPTS= php_fpm 50RCD_SCRIPTS= php_fpm
52MESSAGE_SUBST+= CGIDIR=${CGIDIR} 51MESSAGE_SUBST+= CGIDIR=${CGIDIR}
53MESSAGE_SUBST+= VARBASE=${VARBASE} 52MESSAGE_SUBST+= VARBASE=${VARBASE}
54 53
55do-install: 54do-install:
56 ${INSTALL_PROGRAM} ${WRKSRC}/sapi/fpm/php-fpm ${DESTDIR}${PREFIX}/sbin/php-fpm 55 ${INSTALL_PROGRAM} ${WRKSRC}/sapi/fpm/php-fpm ${DESTDIR}${PREFIX}/sbin/php-fpm
57 ${INSTALL_MAN} ${WRKSRC}/sapi/fpm/php-fpm.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/ 56 ${INSTALL_MAN} ${WRKSRC}/sapi/fpm/php-fpm.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/
58 ${INSTALL_DATA} ${WRKSRC}/sapi/fpm/php-fpm.conf ${DESTDIR}${EGDIR} 57 ${INSTALL_DATA} ${WRKSRC}/sapi/fpm/php-fpm.conf ${DESTDIR}${EGDIR}
59.if ${PKG_PHP_VERSION} >= 70 58.if ${PKG_PHP_VERSION} >= 70
60 ${INSTALL_DATA} ${WRKSRC}/sapi/fpm/www.conf ${DESTDIR}${EGDIR}/php-fpm.d 59 ${INSTALL_DATA} ${WRKSRC}/sapi/fpm/www.conf ${DESTDIR}${EGDIR}/php-fpm.d
61.endif 60.endif
62 61
63.include "${PHPPKGSRCDIR}/Makefile.php" 62.include "${PHPPKGSRCDIR}/Makefile.php"
64.include "${PHPPKGSRCDIR}/buildlink3.mk" 63.include "${PHPPKGSRCDIR}/buildlink3.mk"
65.include "../../mk/bsd.pkg.mk" 64.include "../../mk/bsd.pkg.mk"