CVS: moonbase/compilers/php BUILD, 1.6, 1.7 DEPENDS, 1.12, 1.13 POST_INSTALL, 1.2, 1.3

[sofar at lunar-linux.org]

Update of /var/cvs/lunar/moonbase/compilers/php
In directory dbguin.lunar-linux.org:/tmp/cvs-serv13940

Modified Files:
	BUILD DEPENDS POST_INSTALL 
Log Message:
Cleanup, not touching UPDATED. Adding db/dbx features since they are builtin and not dependent on other code, movind stuff around to proper places, cleaning up patches.


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/compilers/php/BUILD,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- BUILD	8 May 2003 06:34:23 -0000	1.6
+++ BUILD	22 Sep 2003 21:32:44 -0000	1.7
@@ -1,68 +1,31 @@
-[ -s /etc/httpsd/httpd.conf ] && 
-   cp /etc/httpsd/httpd.conf /etc/httpsd/httpd.conf.`date +%Y%m%d`
-
-[ -s /etc/httpd/httpd.conf ] && 
-   cp /etc/httpd/httpd.conf /etc/httpd/httpd.conf.`date +%Y%m%d`
-
 (
-  if [ "$IMAP" == "y" ]; then
-     cd $SOURCE_DIRECTORY
-     tar zxf $SOURCE_CACHE/$SOURCE2
-     cd imap-${IMAP_VERSION}
-     make slx SPECIALS="SSLDIR=/etc/ssl SSLINCLUDE=/usr/include SSLLIB=/usr/lib"
-     cd ..
-     OPTS="$OPTS --with-imap=imap-${IMAP_VERSION}"
+
+  if [ -s /etc/httpsd/httpd.conf ] ; then
+    cp /etc/httpsd/httpd.conf /etc/httpsd/httpd.conf.`date +%Y%m%d`
   fi
 
-  if module_installed apache2 ; then
-     OPTS="$OPTS --with-apxs2=/usr/sbin/apxs"
-     patch -p0 <<EOF
---- sapi/apache2filter/php_functions.c	2002-07-12 12:56:43.000000000 +0200
-+++ sapi/apache2filter/php_functions.c	2002-07-12 12:58:42.000000000 +0200
-@@ -93 +93 @@
--#if !MODULE_MAGIC_AT_LEAST(20020506,0)
-+#if !AP_MODULE_MAGIC_AT_LEAST(20020506,0)
---- sapi/apache2filter/sapi_apache2.c	2002-08-26 19:56:53.000000000 +0200
-+++ sapi/apache2filter/sapi_apache2.c	2002-08-26 19:58:43.000000000 +0200
-@@ -534,2 +534,2 @@
--	ap_register_output_filter("PHP", php_output_filter, AP_FTYPE_RESOURCE);
--	ap_register_input_filter("PHP", php_input_filter, AP_FTYPE_RESOURCE);
-+	ap_register_output_filter("PHP", php_output_filter, NULL, AP_FTYPE_RESOURCE);
-+	ap_register_input_filter("PHP", php_input_filter, NULL, AP_FTYPE_RESOURCE);
-EOF
+  if [ -s /etc/httpd/httpd.conf ] ; then
+    cp /etc/httpd/httpd.conf /etc/httpd/httpd.conf.`date +%Y%m%d`
   fi
 
-( cd ext/mysql/libmysql &&
-  cp mysys_err.h mysys_err.tmp &&
-  echo "#include <errno.h>" > mysys_err.h &&
-  cat mysys_err.tmp >> mysys_err.h &&
-  rm mysys_err.tmp ) &&
+  if [ "$IMAP" == "y" ]; then
+    unpack $SOURCE2
+    make -C imap-${IMAP_VERSION} slx SPECIALS="SSLDIR=/etc/ssl SSLINCLUDE=/usr/include SSLLIB=/usr/lib"
+    OPTS="$OPTS --with-imap=imap-${IMAP_VERSION}"
+  fi
 
-set -x  
+  sedit "s:^:#include <errno.h>\n:" ext/mysql/libmysql/mysys_err.h	&&
 
+  verbose_msg "OPTS=$OPTS" &&
   ./configure  --prefix=/usr                 \
                --sysconfdir=/etc             \
                --with-config-file-path=/etc  \
+	       --enable-dbase		     \
+	       --enable-dbx		     \
+	       --enable-dio		     \
                $OPTS                         && 
-set +x &&               
   make                                       &&
   prepare_install                            &&
   make    install 
 
-
-
-) > $C_FIFO 2>&1 &&
-
-(
-
-  [  -e /etc/php.ini  ] ||  cp  php.ini-dist  /etc/php.ini
-
-  case  $REGGLOBALS  in
-    y|Y)
-      sedit  "s/register_globals = Off/register_globals = On/"  /etc/php.ini
-      ;;
-      *) true
-      ;;
-  esac
-
-)
+) > $C_FIFO 2>&1

Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/moonbase/compilers/php/DEPENDS,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- DEPENDS	14 Jun 2003 19:52:06 -0000	1.12
+++ DEPENDS	22 Sep 2003 21:32:44 -0000	1.13
@@ -95,4 +95,4 @@
 optional_depends "expat"                        \
                  "--with-expat-dir=/usr"        \
                  ""                             \
-                 "for expat xml support"
+                 "for expat xml support" 

Index: POST_INSTALL
===================================================================
RCS file: /var/cvs/lunar/moonbase/compilers/php/POST_INSTALL,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- POST_INSTALL	26 Aug 2002 17:59:01 -0000	1.2
+++ POST_INSTALL	22 Sep 2003 21:32:44 -0000	1.3
@@ -1,8 +1,8 @@
-[ -s /var/run/httpd/httpd.pid  ] && /usr/sbin/apachectl  graceful
-[ -s /var/run/httpsd/httpd.pid ] && /etc/init.d/apache_modssl restart
-if [ -f /etc/httpd/httpd.conf ] ; then
-  if ! grep -q "x-httpd-php" /etc/httpd/httpd.conf ; then
-    cat >> /etc/httpd/httpd.conf << EOF
+
+# prototype AddType definition for apache2
+if [ -f /etc/httpd/conf/httpd.conf ] ; then
+  if ! grep -q "x-httpd-php" /etc/httpd/conf/httpd.conf ; then
+    cat >> /etc/httpd/conf/httpd.conf << EOF
 
 # AddType required for php to work:
 AddType  application/x-httpd-php         .php .php4 .php3 .phtml
@@ -11,4 +11,16 @@
 EOF
   fi
 fi
-true
+
+if [ ! -e /etc/php.ini ] ; then
+  cp php.ini-dist /etc/php.ini
+fi
+
+case  $REGGLOBALS  in
+  y|Y)
+    sedit "s/register_globals = Off/register_globals = On/" /etc/php.ini
+    ;;
+    *) true
+    ;;
+esac
+