Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv17620

Modified Files:
        php5.info php5.patch 
Log Message:
Updated to latest 5.2.x, fixed lots of errors for pear/pecl, changed improper 
uses of sed to perl, cli still won't load modules but the rest if working much 
better, added links for php, php-config and phpize so it doesn't use the system 
ones anymore, and fixed ming

Index: php5.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/php5.info,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- php5.info   18 Jan 2010 14:45:40 -0000      1.34
+++ php5.info   18 Jan 2010 23:50:07 -0000      1.35
@@ -1,6 +1,6 @@
 Package: php5
-Version: 5.2.6
-Revision: 6
+Version: 5.2.12
+Revision: 1
 ###
 BuildDepends: apache2-dev (>= 2.2.9-2), aspell-dev, libbind6-dev, bzip2-dev, 
cyrus-sasl2-dev, db47-aes | db47, expat1, fink (>= 0.24.12), freetype219, gd2, 
gdbm3, gmp, libapr.0-dev, libaprutil.0-dev, libc-client1-dev, libcurl4, 
libgettext3-dev, libiconv-dev, libjpeg, libmcrypt, libmhash2, libming1-dev, 
libncurses5, libpng3, libtidy-dev, libtool2, libxml2 (>= 2.6.1-1), libxslt, 
mysql-unified-dev, net-snmp-unified15-dev, openldap24-dev, pcre, 
postgresql84-dev, recode-dev, sqlite-dev, sqlite3-dev, system-openssl-dev, 
system-pkgconfig-openssl, t1lib5-nox, unixodbc2 (>= 2.2.11-1010) | 
unixodbc2-nox (>= 2.2.11-1010), x11-dev, fontconfig2-dev
 Depends: php5-common (>= %v-%r), libapache2-mod-php5 (= %v-%r) | php5-cgi (= 
%v-%r) | php5-cli (= %v-%r)
@@ -66,10 +66,10 @@
 <<
 ###
 Source: mirror:custom:distributions/php-%v.tar.bz2
-Source-MD5: 7380ffecebd95c6edb317ef861229ebd
+Source-MD5: 5b7077e366c7eeab34da31dd860a1923
 ###
 PatchFile: %n.patch
-PatchFile-MD5: 1fbd4e06676059d61a75dbe1439f2735
+PatchFile-MD5: da426343385bf3b3201b98d4abeaeced
 PatchScript: <<
   sed 's|@FINKPREFIX@|%p|g' < %{PatchFile} | patch -p1
 <<
@@ -113,7 +113,7 @@
   --with-openssl=%p/lib/system-openssl \
   --enable-soap \
   --enable-zip \
-  --without-ming \
+  --with-ming=%p \
   --with-mime-magic=%p/etc/apache2/magic \
   --with-exec-dir=%p/lib/php5/libexec
 <<
@@ -256,9 +256,9 @@
   cd %b/cgi-build && make && mv sapi/cgi/php-cgi sapi/cgi/cgi-bin.php5
   # Dirty hack to not rebuild everything twice
   cd %b/cgi-build/main && \
-    sed -i -e 's/FORCE_CGI_REDIRECT 1/FORCE_CGI_REDIRECT 0/' \
-           -e 's/DISCARD_PATH 0/DISCARD_PATH 1/' php_config.h && \
-    sed -i -e 's/--enable-force-cgi-redirect/--enable-discard-path/' 
build-defs.h && \
+    perl -pi -e 's/FORCE_CGI_REDIRECT 1/FORCE_CGI_REDIRECT 0/' php_config.h && 
\
+    perl -pi -e 's/DISCARD_PATH 0/DISCARD_PATH 1/' php_config.h && \
+    perl -pi -e 's/--enable-force-cgi-redirect/--enable-discard-path/' 
build-defs.h && \
     touch ../../ext/standard/info.c && \
     touch ../../sapi/cgi/cgi_main.c
   cd %b/cgi-build && make && mv sapi/cgi/php-cgi sapi/cgi/usr.bin.php5-cgi
@@ -270,13 +270,14 @@
   if [ -d %b/pear-build ]; then rm -rf %b/pear-build; fi
   mkdir -p %b/pear-build
   cd %b/cgi-build && make install-pear PHP_PEAR_PHP_BIN=%p/bin/php5 
PHP_PEAR_INSTALL_DIR=%p/share/php5 PHP_PEAR_SYSCONF_DIR=%p/etc/pear 
PHP_PEAR_SIG_BIN=%p/bin/gpg INSTALL_ROOT=%b/pear-build
-  sed -i -e 's/-d output_buffering=1 -d open_basedir="" -d safe_mode=0/-d 
output_buffering=1 -d open_basedir="" -d safe_mode=0 -d memory_limit="-1"/' \
+  perl -pi -e 's/-d output_buffering=1 -d open_basedir="" -d safe_mode=0/-d 
output_buffering=1 -d open_basedir="" -d safe_mode=0 -d memory_limit="-1"/' \
          %b/pear-build%p/bin/pear
-  sed -i -e 's/-d output_buffering=1 -d safe_mode=0/-d output_buffering=1 -d 
open_basedir="" -d safe_mode=0 -d memory_limit="-1"/' \
+  perl -pi -e 's/-d output_buffering=1 -d safe_mode=0/-d output_buffering=1 -d 
open_basedir="" -d safe_mode=0 -d memory_limit="-1"/' \
          %b/pear-build%p/bin/pecl
-  sed -i -e 's/-d memory_limit="-1"//' %b/pear-build%p/bin/peardev
-  sed -i -e 's/-d output_buffering=1 -d open_basedir="" -d safe_mode=0/-d 
output_buffering=1 -d open_basedir="" -d safe_mode=0 -d memory_limit="-1"/' \
+  perl -pi -e 's/-d memory_limit="-1"//' %b/pear-build%p/bin/peardev
+  perl -pi -e 's/-d output_buffering=1 -d open_basedir="" -d safe_mode=0/-d 
output_buffering=1 -d open_basedir="" -d safe_mode=0 -d memory_limit="-1"/' \
          %b/pear-build%p/bin/peardev
+  perl -pi -e "s/('PEAR_CONFIG_SYSCONFDIR', 
PHP_SYSCONFDIR)/'PEAR_CONFIG_SYSCONFDIR', 
PHP_SYSCONFDIR.DIRECTORY_SEPARATOR.'pear'/" 
%b/pear-build%p/share/php5/PEAR/Config.php
 <<
 # There are a few test failures so disable for now.
 #InfoTest: <<
@@ -333,8 +334,11 @@
   done
 
   # install PEAR
+  perl -pi -e 's/"phpize"/"phpize5"/' 
%b/pear-build%p/share/php5/PEAR/Builder.php
+  perl -pi -e 's/"php-config"/"php-config5"/' 
%b/pear-build%p/share/php5/PEAR/Builder.php
+  perl -pi -e 's/"phpize"/"phpize5"/' 
%b/pear-build%p/share/php5/PEAR/Builder.php-e
+  perl -pi -e 's/"php-config"/"php-config5"/' 
%b/pear-build%p/share/php5/PEAR/Builder.php-e
   cp -r %b/pear-build/* %d
-  sed -i -e 's/"phpize",/"phpize5",/' %i/share/php5/PEAR/Builder.php
 
   # install CGI
   mkdir -p %i/lib/cgi-bin
@@ -372,6 +376,9 @@
 
   ### Make needed links
   ln -s %p/lib/php5/20060613-zts %i/lib/php5/libexec
+  ln -s %p/bin/php5 %i/bin/php
+  ln -s %p/bin/php-config5 %i/bin/php-config
+  ln -s %p/bin/phpize5 %i/bin/phpize
 
   ### Remove un needed files
   rm -rf %i/lib/php5/20060613-zts/*.a
@@ -477,6 +484,7 @@
   Files: <<
     etc/php5/cli
     bin/php5
+    bin/php
     share/man/man1/php5.1
   <<
   DocFiles: LICENSE
@@ -502,6 +510,8 @@
   Files: <<
     bin/php-config5
     bin/phpize5
+    bin/php-config
+    bin/phpize
     include
     lib/php5/build
     share/man/man1/php-config5.1

Index: php5.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/php5.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- php5.patch  4 Sep 2008 17:58:04 -0000       1.6
+++ php5.patch  18 Jan 2010 23:50:08 -0000      1.7
@@ -28,25 +28,25 @@
 diff -ruN php-5.2.5.orig/configure php-5.2.5/configure
 --- php-5.2.5.orig/configure   2007-11-08 08:36:28.000000000 -0700
 +++ php-5.2.5/configure        2007-12-12 11:09:04.000000000 -0700
-@@ -21136,7 +21136,7 @@
+@@ -21893,7 +21893,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-lssl  $LIBS"
 +LIBS="-...@finkprefix@/lib/system-openssl/lib -lssl  $LIBS"
  cat > conftest.$ac_ext <<EOF
[...8448 lines suppressed...]
@@ -3071,8 +9861,8 @@
 diff -ruN php-5.2.5.orig/sapi/cli/php.1.in php-5.2.5/sapi/cli/php.1.in
 --- php-5.2.5.orig/sapi/cli/php.1.in   2007-04-23 14:54:22.000000000 -0600
 +++ php-5.2.5/sapi/cli/php.1.in        2007-12-10 21:51:51.000000000 -0700
-@@ -306,13 +306,14 @@
- .B name
+@@ -309,13 +309,14 @@
+ Show configuration file names
  .SH FILES
  .TP 15
 -.B php\-cli.ini
@@ -3090,7 +9880,7 @@
 +The configuration file for the version of PHP that apache2 uses.
  .SH EXAMPLES
  .TP 5
- \fIphp -r 'echo "Hello World\\n";'\fP
+ \fIphp \-r 'echo "Hello World\\n";'\fP
 diff -ruN php-5.2.5.orig/scripts/Makefile.frag php-5.2.5/scripts/Makefile.frag
 --- php-5.2.5.orig/scripts/Makefile.frag       2005-11-21 16:08:02.000000000 
-0700
 +++ php-5.2.5/scripts/Makefile.frag    2007-12-10 21:52:27.000000000 -0700


------------------------------------------------------------------------------
Throughout its 18-year history, RSA Conference consistently attracts the
world's best and brightest in the field, creating opportunities for Conference
attendees to learn about information security's most important issues through
interactions with peers, luminaries and emerging and established companies.
http://p.sf.net/sfu/rsaconf-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to