Ticket #26039: php5-fpm-variant.diff

(a) Portfile vs. (b) (clipboard)

@@ -105 +105 @@
         --with-ldap=/usr
 }
 
-variant no_web conflicts apache apache2 fastcgi description {Don't include any web server support} {}
+variant no_web conflicts apache apache2 fastcgi fpm  description {Don't include any web server support} {}
 
 # Build an Apache 1 module. On Mac OS X, it uses Apple's provided Apache 1 server.
 # On other platforms, the MacPorts apache port is used. Keep the options here
@@ -152 +152 @@
     }
 }
 
+# FPM options
+variant fpm conflicts no_web description {Add FPM (Fast Process Management) web server binary} {
+    depends_lib-append      port:libevent
+
+    set fpm_pidfile         ${prefix}/var/run/${my_name}-fpm.pid
+    set fpm_conf_installed  0
+
+    startupitem.create      yes
+    startupitem.executable  ${prefix}/sbin/php-fpm
+    startupitem.pidfile     auto ${fpm_pidfile}
+
+    if { ![variant_isset apache] && ![variant_isset apache2] } {
+        configure.args-delete \
+            --disable-fpm
+        configure.args-append \
+            --enable-fpm
+    }
+}
+
 foreach {old_variant new_port} {
     gmp             gmp
     imap            imap
@@ -187 +206 @@
         --enable-sysvmsg
 }
 
-if {![variant_isset apache] && ![variant_isset apache2] && ![variant_isset fastcgi] && ![variant_isset no_web]} {
+if {![variant_isset apache] && ![variant_isset apache2] && ![variant_isset fastcgi] && ![variant_isset fpm] && ![variant_isset no_web]} {
     default_variants +apache2
 }
 
@@ -290 +309 @@
         # conflict with the cli version.
         xinstall -m 755 ${worksrcpath}/sapi/cgi/php-cgi ${destroot}${prefix}/bin
     }
+
+    if { [variant_isset fpm] } {
+        # Copy the FPM binary to the bin dir under a new name so it doesn't
+        # conflict with the cli version.
+        xinstall -m 755 ${worksrcpath}/sapi/fpm/php-fpm ${destroot}${prefix}/sbin
+    }
     
     #file rename ${destroot}${prefix}/etc/pear.conf ${destroot}${prefix}/etc/pear.conf.sample
     
@@ -299 +324 @@
         php.ini-development \
         php.ini-production \
         ${destroot}${phpinidir}
+
+    if { [variant_isset fpm] } {
+      if {![file exists ${phpinidir}/php-fpm.conf]} {
+          # Only install php-fpm.conf if doesn't exist so we don't overwrite user's file by mistake
+          xinstall -m 644 ${worksrcpath}/sapi/fpm/php-fpm.conf ${destroot}${phpinidir}
+      }
+    }
     
     # Copy mysqlnd headers.
     xinstall -d ${destroot}${prefix}/include/php/ext/mysqlnd
@@ -330 +362 @@
         ui_msg "${phpinidir}/php.ini-production (if this is a production server)."
     }
     
+    if { [variant_isset fpm] } {
+      ui_msg ""
+      ui_msg "FPM configuration file installed to ${phpinidir}/php-fpm.conf."
+    }
+
     if {![variant_isset no_web]} {
         ui_msg ""
         ui_msg "If this is your first install, you need to activate PHP in your web server."