Wed Jul 25 10:16:12 2012 UTC ()
FPM doesn't require/use libevent anymore.
Use LIBTOOL_OVERRIDE to workaround a DTrace build problem.
Bump PKGREVISION.


(fhajny)
diff -r1.2 -r1.3 pkgsrc/www/php-fpm/Makefile
cvs diff -r1.2 -r1.3 pkgsrc/www/php-fpm/Makefile (expand / switch to unified diff)

--- pkgsrc/www/php-fpm/Makefile 2012/06/16 03:06:57 1.2
+++ pkgsrc/www/php-fpm/Makefile 2012/07/25 10:16:12 1.3
@@ -1,41 +1,41 @@ @@ -1,41 +1,41 @@
1# $NetBSD: Makefile,v 1.2 2012/06/16 03:06:57 taca Exp $ 1# $NetBSD: Makefile,v 1.3 2012/07/25 10:16:12 fhajny Exp $
2 2
3PKGNAME= ${PHP_PKG_PREFIX}-fpm-${PHP_BASE_VERS} 3PKGNAME= ${PHP_PKG_PREFIX}-fpm-${PHP_BASE_VERS}
 4PKGREVISION= 1
4CATEGORIES= www 5CATEGORIES= www
5 6
6HOMEPAGE= http://php-fpm.org/ 7HOMEPAGE= http://php-fpm.org/
7MAINTAINER= filip@joyent.com 8MAINTAINER= filip@joyent.com
8COMMENT= FPM interface for ${PKG_PHP} 9COMMENT= FPM interface for ${PKG_PHP}
9LICENSE= 2-clause-bsd 10LICENSE= 2-clause-bsd
10 11
11PHP_VERSIONS_ACCEPTED= 53 54 12PHP_VERSIONS_ACCEPTED= 53 54
12 13
13PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
14 15
15USE_PHP_EXT_PATCHES= yes 16USE_PHP_EXT_PATCHES= yes
 17LIBTOOL_OVERRIDE= # empty
16 18
17BUILD_DEFS+= VARBASE APACHE_USER APACHE_GROUP 19BUILD_DEFS+= VARBASE APACHE_USER APACHE_GROUP
18 20
19EGDIR= ${PREFIX}/share/examples/php 21EGDIR= ${PREFIX}/share/examples/php
20CONF_FILES= ${EGDIR}/php-fpm.conf ${PKG_SYSCONFDIR}/php-fpm.conf 22CONF_FILES= ${EGDIR}/php-fpm.conf ${PKG_SYSCONFDIR}/php-fpm.conf
21AUTO_MKDIRS= yes 23AUTO_MKDIRS= yes
22 24
23CONFIGURE_ARGS+= --enable-fpm 25CONFIGURE_ARGS+= --enable-fpm
24CONFIGURE_ARGS+= --with-libevent-dir=${BUILDLINK_PREFIX.libevent} 
25CONFIGURE_ARGS+= --with-fpm-user=${APACHE_USER} 26CONFIGURE_ARGS+= --with-fpm-user=${APACHE_USER}
26CONFIGURE_ARGS+= --with-fpm-group=${APACHE_GROUP} 27CONFIGURE_ARGS+= --with-fpm-group=${APACHE_GROUP}
27 28
28RCD_SCRIPTS= php_fpm 29RCD_SCRIPTS= php_fpm
29MESSAGE_SUBST+= CGIDIR=${CGIDIR:Q} 30MESSAGE_SUBST+= CGIDIR=${CGIDIR:Q}
30MESSAGE_SUBST+= VARBASE=${VARBASE:Q} 31MESSAGE_SUBST+= VARBASE=${VARBASE:Q}
31 32
32do-install: 33do-install:
33 ${INSTALL_PROGRAM} ${WRKSRC}/sapi/fpm/php-fpm ${DESTDIR}${PREFIX}/sbin/php-fpm 34 ${INSTALL_PROGRAM} ${WRKSRC}/sapi/fpm/php-fpm ${DESTDIR}${PREFIX}/sbin/php-fpm
34 ${INSTALL_MAN} ${WRKSRC}/sapi/fpm/php-fpm.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/ 35 ${INSTALL_MAN} ${WRKSRC}/sapi/fpm/php-fpm.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/
35 ${INSTALL_DATA} ${WRKSRC}/sapi/fpm/php-fpm.conf ${DESTDIR}${EGDIR} 36 ${INSTALL_DATA} ${WRKSRC}/sapi/fpm/php-fpm.conf ${DESTDIR}${EGDIR}
36 37
37.include "../../devel/libevent/buildlink3.mk" 
38.include "../../lang/php/phpversion.mk" 38.include "../../lang/php/phpversion.mk"
39.include "${PHPPKGSRCDIR}/Makefile.php" 39.include "${PHPPKGSRCDIR}/Makefile.php"
40.include "${PHPPKGSRCDIR}/buildlink3.mk" 40.include "${PHPPKGSRCDIR}/buildlink3.mk"
41.include "../../mk/bsd.pkg.mk" 41.include "../../mk/bsd.pkg.mk"