From nobody@FreeBSD.org  Sun Jan 25 23:59:54 2009
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 623BA1065672
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 25 Jan 2009 23:59:54 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 45E198FC18
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 25 Jan 2009 23:59:54 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n0PNxsu5073311
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 25 Jan 2009 23:59:54 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id n0PNxsuf073310;
	Sun, 25 Jan 2009 23:59:54 GMT
	(envelope-from nobody)
Message-Id: <200901252359.n0PNxsuf073310@www.freebsd.org>
Date: Sun, 25 Jan 2009 23:59:54 GMT
From: Till Klampaeckel <till@php.net>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Add php-fpm to lang/php5
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         130995
>Category:       ports
>Synopsis:       Add php-fpm to lang/php5
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ale
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 26 00:00:02 UTC 2009
>Closed-Date:    Tue Aug 31 14:17:35 UTC 2010
>Last-Modified:  Tue Aug 31 14:17:35 UTC 2010
>Originator:     Till Klampaeckel
>Release:        6.3, 7.x
>Organization:
n/a
>Environment:
>Description:
For an idea of what php-fpm provides, please follow this link:
http://translate.google.com/translate?prev=hp&hl=en&u=http%3A%2F%2Fphp-fpm.anight.org%2Fcurrent_php_fastcgi_problems.html&sl=ru&tl=en

Or, if you speak Russian:
http://php-fpm.anight.org/current_php_fastcgi_problems.html

So anyway, I'd like lang/php5 to offer php-fpm support, unfortunately, I haven't been very successful with a patch (beyond Makefile and distinfo). I can get the port to download the patches, but it fails applying them.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

--- Makefile    2009-01-25 18:49:29.000000000 -0500
+++ Makefile.orig       2009-01-25 18:44:10.000000000 -0500
@@ -48,8 +48,7 @@ OPTIONS=      CLI "Build CLI version" on \
                REDIRECT "Enable force-cgi-redirect support (CGI only)" off \
                DISCARD "Enable discard-path support (CGI only)" off \
                FASTCGI "Enable fastcgi support (CGI only)" on \
-               PATHINFO "Enable path-info-check support (CGI only)" on \
-               PHPFPM "Enable php-fpm patch (experimental, CGI only)" off
+               PATHINFO "Enable path-info-check support (CGI only)" on

 CONFLICTS=     php4-4*

@@ -97,10 +96,6 @@ CONFIGURE_ARGS+=--enable-fastcgi
 .if defined(WITHOUT_PATHINFO)
 CONFIGURE_ARGS+=--disable-path-info-check
 .endif
-.if defined(WITH_PHPFPM)
-PATCHFILES+=   php-${PORTVERSION}-fpm-0.5.10.diff.gz:phpfpm
-PATCH_SITES+=  http://php-fpm.anight.org/downloads/head/:phpfpm
-.endif
 .else
 PLIST_SUB+=    CGI="@comment "
 CONFIGURE_ARGS+=--disable-cgi
web03# diff -up Makefile.orig Makefile
--- Makefile.orig       2009-01-25 18:44:10.000000000 -0500
+++ Makefile    2009-01-25 18:49:29.000000000 -0500
@@ -48,7 +48,8 @@ OPTIONS=      CLI "Build CLI version" on \
                REDIRECT "Enable force-cgi-redirect support (CGI only)" off \
                DISCARD "Enable discard-path support (CGI only)" off \
                FASTCGI "Enable fastcgi support (CGI only)" on \
-               PATHINFO "Enable path-info-check support (CGI only)" on
+               PATHINFO "Enable path-info-check support (CGI only)" on \
+               PHPFPM "Enable php-fpm patch (experimental, CGI only)" off

 CONFLICTS=     php4-4*

@@ -96,6 +97,10 @@ CONFIGURE_ARGS+=--enable-fastcgi
 .if defined(WITHOUT_PATHINFO)
 CONFIGURE_ARGS+=--disable-path-info-check
 .endif
+.if defined(WITH_PHPFPM)
+PATCHFILES+=   php-${PORTVERSION}-fpm-0.5.10.diff.gz:phpfpm
+PATCH_SITES+=  http://php-fpm.anight.org/downloads/head/:phpfpm
+.endif
 .else
 PLIST_SUB+=    CGI="@comment "
 CONFIGURE_ARGS+=--disable-cgi
--- distinfo.orig       2009-01-25 18:51:09.000000000 -0500
+++ distinfo    2009-01-25 18:52:55.000000000 -0500
@@ -7,3 +7,6 @@ SIZE (suhosin-patch-5.2.7-0.9.6.3.patch.
 MD5 (php-5.2.8-mail-header.patch) = 74bf3a2a123c284f908c4f5483ebe886
 SHA256 (php-5.2.8-mail-header.patch) = 9bd306145153a371f619d89996cb329bdc36791b22a50daf4afe7cc69c46dccb
 SIZE (php-5.2.8-mail-header.patch) = 3381
+MD5 (php-5.2.8-fpm-0.5.10.diff.gz) = 7104c76e2891612af636104e0f6d60d4
+SHA256 (php-5.2.8-fpm-0.5.10.diff.gz) = 682fb8b9b45e0c0c3f0c5fbf1065215baddbd4a73b3eb6e2468a68062ee16491
+SIZE (php-5.2.8-fpm-0.5.10.diff.gz) = 204248

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->ale 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Jan 26 00:00:24 UTC 2009 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=130995 

From: till <till@php.net>
To: FreeBSD-gnats-submit@freebsd.org, freebsd-ports-bugs@freebsd.org
Cc:  
Subject: Re: ports/130995: Add php-fpm to lang/php5
Date: Mon, 26 Jan 2009 01:26:29 +0100

 The author of php-fpm just send me this:
 http://php-fpm.anight.org/downloads/freebsd-port/
 
 Maybe it helps integrating.
 
 Till

From: till <till@php.net>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/130995: Add php-fpm to lang/php5
Date: Mon, 26 Jan 2009 01:42:03 +0100

 Here is the FreeBSD port of the author of php-fpm:
 http://php-fpm.anight.org/downloads/freebsd-port/

From: Martin Matuska <mm@FreeBSD.org>
To: bug-followup@FreeBSD.org, till@php.net
Cc:  
Subject: Re: ports/130995: Add php-fpm to lang/php5
Date: Wed, 16 Jun 2010 10:46:18 +0200

 FYI:
 FPM has been integrated into PHP 5.3 and will be released with 5.3.3
 For PHP 5.2, see ports/147688
State-Changed-From-To: open->closed 
State-Changed-By: ale 
State-Changed-When: Tue Aug 31 14:17:09 UTC 2010 
State-Changed-Why:  
fpm is now part of php5. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=130995 
>Unformatted:
