diff --git a/srcpkgs/php/files/php-fpm.service b/srcpkgs/php/files/php-fpm.service deleted file mode 100644 index 6e2faafd86..0000000000 --- a/srcpkgs/php/files/php-fpm.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=The PHP FastCGI Process Manager -After=syslog.target network.target - -[Service] -Type=notify -PIDFile=/run/php-fpm/php-fpm.pid -PrivateTmp=true -ExecStart=/usr/bin/php-fpm --nodaemonize --pid /run/php-fpm/php-fpm.pid -ExecReload=/bin/kill -USR2 $MAINPID - -[Install] -WantedBy=multi-user.target diff --git a/srcpkgs/php/files/php-fpm.tmpfiles b/srcpkgs/php/files/php-fpm.tmpfiles deleted file mode 100644 index 801e74f1e6..0000000000 --- a/srcpkgs/php/files/php-fpm.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /run/php-fpm 755 root root diff --git a/srcpkgs/php/template b/srcpkgs/php/template index dca32f2eb2..d1e2a0f8ad 100644 --- a/srcpkgs/php/template +++ b/srcpkgs/php/template @@ -1,7 +1,7 @@ # Template build file for 'php' pkgname=php version=5.6.9 -revision=1 +revision=2 short_desc="An HTML-embedded scripting language" license="PHP" homepage="http://www.php.net" @@ -12,13 +12,12 @@ makedepends="postgresql-libs-devel libldap-devel libvpx-devel sqlite-devel libltdl-devel libpng-devel libjpeg-turbo-devel icu-devel libcurl-devel libxslt-devel libressl-devel bzip2-devel zlib-devel db-devel gmp-devel gdbm-devel freetype-devel apache-devel tidy-devel - readline-devel libmysqlclient-devel $(vopt_if systemd systemd-devel)" + readline-devel libmysqlclient-devel" conf_files="/etc/php/php.ini" distfiles="http://www.php.net/distributions/php-${version}.tar.gz" checksum=49527ba66357fe65bcd463dfb8dcff1b8879419f88b3c334f50696a2aceacb87 # Package build options -build_options="systemd" nocross=yes lib32disabled=yes @@ -89,7 +88,6 @@ do_build() { --with-xsl=shared \ --with-tidy=shared \ --with-zlib \ - $(vopt_with systemd fpm-systemd) \ ${configure_args} \ " @@ -209,10 +207,6 @@ php-fpm_package() { vbin ${wrksrc}/build-fpm/sapi/fpm/php-fpm vman ${wrksrc}/build-fpm/sapi/fpm/php-fpm.8 vinstall ${wrksrc}/build-fpm/sapi/fpm/php-fpm.conf 644 etc/php - if [ "$build_option_systemd" ]; then - vinstall ${FILESDIR}/php-fpm.tmpfiles 644 usr/lib/tmpfiles.d php-fpm.conf - vinstall ${FILESDIR}/php-fpm.service 644 usr/lib/systemd/system - fi vsv php-fpm } }