Tue Oct 28 07:07:59 2008 UTC ()
Fix buildling ap-php with APACHE_MPM=worker


(adam)
diff -r1.52 -r1.53 pkgsrc/lang/php5/distinfo
diff -r1.5 -r1.6 pkgsrc/lang/php5/patches/patch-an
cvs diff -r1.52 -r1.53 pkgsrc/lang/php5/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/php5/Attic/distinfo 2008/05/04 16:50:44 1.52
+++ pkgsrc/lang/php5/Attic/distinfo 2008/10/28 07:07:58 1.53
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: distinfo,v 1.52 2008/05/04 16:50:44 adrianp Exp $ 1$NetBSD: distinfo,v 1.53 2008/10/28 07:07:58 adam Exp $
2 2
3SHA1 (php-5.2.6/php-5.2.6.tar.bz2) = 2a2b1afa657a7739a23784c869d57c3e0a7ad6b4 3SHA1 (php-5.2.6/php-5.2.6.tar.bz2) = 2a2b1afa657a7739a23784c869d57c3e0a7ad6b4
4RMD160 (php-5.2.6/php-5.2.6.tar.bz2) = 27f730d4b1ceb1c42ff03618dbfa0dc87a00990b 4RMD160 (php-5.2.6/php-5.2.6.tar.bz2) = 27f730d4b1ceb1c42ff03618dbfa0dc87a00990b
5Size (php-5.2.6/php-5.2.6.tar.bz2) = 9571312 bytes 5Size (php-5.2.6/php-5.2.6.tar.bz2) = 9571312 bytes
6SHA1 (patch-aa) = 20bc3831e435182d014b11ae9f1f6c537a21af20 6SHA1 (patch-aa) = 20bc3831e435182d014b11ae9f1f6c537a21af20
7SHA1 (patch-ad) = b324c33b1e70adee5b89dcecdd7690dcadcc18ec 7SHA1 (patch-ad) = b324c33b1e70adee5b89dcecdd7690dcadcc18ec
8SHA1 (patch-ag) = 4ccb67ba6f5370b1d16b087e3e714de3e5ae604e 8SHA1 (patch-ag) = 4ccb67ba6f5370b1d16b087e3e714de3e5ae604e
9SHA1 (patch-ah) = c7cbd4b9ea0796ea3b7491c2cffb6ddddc518587 9SHA1 (patch-ah) = c7cbd4b9ea0796ea3b7491c2cffb6ddddc518587
10SHA1 (patch-aj) = 54812097499c81e5cb0196ab949cc86a4f24a9cc 10SHA1 (patch-aj) = 54812097499c81e5cb0196ab949cc86a4f24a9cc
11SHA1 (patch-ak) = e3c654de196dc4b693b2d95e3ee131fa147125bc 11SHA1 (patch-ak) = e3c654de196dc4b693b2d95e3ee131fa147125bc
12SHA1 (patch-al) = 0ee37782cc0d3bf5ede1a583de0589c2c1316b50 12SHA1 (patch-al) = 0ee37782cc0d3bf5ede1a583de0589c2c1316b50
13SHA1 (patch-an) = f07a08f8ee1a18f6371af9bd6c482d936e9220e4 13SHA1 (patch-an) = d0578fa2d00932d6b5d97dfff525f4c0f9586bd5
14SHA1 (patch-ap) = 5eb0e0e4244a993da93e36f8fcb5553454207fce 14SHA1 (patch-ap) = 5eb0e0e4244a993da93e36f8fcb5553454207fce
15SHA1 (patch-aq) = 0c9d48547da2fa80aa8357d23ad8505d1c0330df 15SHA1 (patch-aq) = 0c9d48547da2fa80aa8357d23ad8505d1c0330df
cvs diff -r1.5 -r1.6 pkgsrc/lang/php5/patches/Attic/patch-an (expand / switch to unified diff)

--- pkgsrc/lang/php5/patches/Attic/patch-an 2007/09/02 21:12:42 1.5
+++ pkgsrc/lang/php5/patches/Attic/patch-an 2008/10/28 07:07:59 1.6
@@ -1,13 +1,27 @@ @@ -1,13 +1,27 @@
1$NetBSD: patch-an,v 1.5 2007/09/02 21:12:42 jdolecek Exp $ 1$NetBSD: patch-an,v 1.6 2008/10/28 07:07:59 adam Exp $
2 2
3--- configure.orig 2007-09-02 19:32:56.000000000 +0200 3--- configure.orig 2008-04-30 20:37:32.000000000 +0200
4+++ configure 4+++ configure
5@@ -12437,7 +12437,7 @@ EOF 5@@ -12437,7 +12437,7 @@ EOF
6  6
7 echo "$ac_t""$PHP_PATH_INFO_CHECK" 1>&6 7 echo "$ac_t""$PHP_PATH_INFO_CHECK" 1>&6
8  8
9- INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)" 9- INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
10+ INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)@CGIDIR@/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)@CGIDIR@/php" 10+ INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)@CGIDIR@/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)@CGIDIR@/php"
11  11
12 PHP_SAPI=cgi 12 PHP_SAPI=cgi
13  13
 14@@ -107515,12 +107515,7 @@ old_CC=$CC
 15 if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then
 16 CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags"
 17 INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags"
 18- cat >meta_ccld<<EOF
 19-#! /bin/sh
 20-exec $CC $ac_cv_pthreads_cflags \$@
 21-EOF
 22- CC="$abs_builddir/meta_ccld"
 23- chmod +x meta_ccld
 24+ CPPFLAGS="$CPPFLAGS $ac_cv_pthreads_cflags"
 25 fi
 26
 27 if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then