Re: pkg/28485 (ap-php broken)

[Ryo HAYASAKA <ryoh%jaist.ac.jp@localhost>]

The following reply was made to PR pkg/28485; it has been noted by GNATS.

From: Ryo HAYASAKA <ryoh%jaist.ac.jp@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc: 
Subject: Re: pkg/28485 (ap-php broken)
Date: Fri, 19 Sep 2008 22:32:10 +0900 (JST)

 If the problem is the same as the one of php4, which is fixed by
 patch-ad, the following patch from patch-ad of php4 fixes it.
 
 Index: distinfo
 ===================================================================
 RCS file: /usr/cvsup/pkgsrc/lang/php5/distinfo,v
 retrieving revision 1.52
 diff -d -p -u -r1.52 distinfo
 --- distinfo   4 May 2008 16:50:44 -0000       1.52
 +++ distinfo   18 Sep 2008 15:37:46 -0000
 @@ -10,6 +10,6 @@ SHA1 (patch-ah) = c7cbd4b9ea0796ea3b7491
  SHA1 (patch-aj) = 54812097499c81e5cb0196ab949cc86a4f24a9cc
  SHA1 (patch-ak) = e3c654de196dc4b693b2d95e3ee131fa147125bc
  SHA1 (patch-al) = 0ee37782cc0d3bf5ede1a583de0589c2c1316b50
 -SHA1 (patch-an) = f07a08f8ee1a18f6371af9bd6c482d936e9220e4
 +SHA1 (patch-an) = e5b1a45d5fb0933e473be6d346094e7abf375193
  SHA1 (patch-ap) = 5eb0e0e4244a993da93e36f8fcb5553454207fce
  SHA1 (patch-aq) = 0c9d48547da2fa80aa8357d23ad8505d1c0330df
 Index: patches/patch-an
 ===================================================================
 RCS file: /usr/cvsup/pkgsrc/lang/php5/patches/patch-an,v
 retrieving revision 1.5
 diff -d -p -u -r1.5 patch-an
 --- patches/patch-an   2 Sep 2007 21:12:42 -0000       1.5
 +++ patches/patch-an   18 Sep 2008 15:35:54 -0000
 @@ -1,6 +1,6 @@
 -$NetBSD: patch-an,v 1.5 2007/09/02 21:12:42 jdolecek Exp $
 +$NetBSD$
  
 ---- configure.orig    2007-09-02 19:32:56.000000000 +0200
 +--- configure.orig    2008-05-01 03:37:32.000000000 +0900
  +++ configure
  @@ -12437,7 +12437,7 @@ EOF
   
 @@ -11,3 +11,18 @@ $NetBSD: patch-an,v 1.5 2007/09/02 21:12
       
     PHP_SAPI=cgi
     
 +@@ -107514,13 +107514,8 @@ old_CC=$CC
 + 
 + if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; 
then
 +   CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags"
 ++  CFLAGS="$CFLAGS $ac_cv_pthreads_cflags"
 +   INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags"
 +-  cat >meta_ccld<<EOF
 +-#! /bin/sh
 +-exec $CC $ac_cv_pthreads_cflags \$@
 +-EOF
 +-  CC="$abs_builddir/meta_ccld"
 +-  chmod +x meta_ccld
 + fi
 + 
 + if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then
 
 --
 Ryo HAYASAKA <ryoh%jaist.ac.jp@localhost>
 Japan Advanced Institute of Science and Technology (JAIST)