[Devil-linux-commit] build/scripts cyrus-imapd,1.19,1.20 php,1.2,1.3

[<smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv5750/scripts

Modified Files:
	cyrus-imapd php 
Log Message:
more changes to get PHP finally working


Index: cyrus-imapd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/cyrus-imapd,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- cyrus-imapd	13 Oct 2003 17:36:08 -0000	1.19
+++ cyrus-imapd	17 Oct 2003 13:43:39 -0000	1.20
@@ -37,6 +37,9 @@
 			# parallel build fails, do not use $PMAKE
 			make all DESTDIR=$WORKDIR/tmp || exit 1
 			strip_debug
+
+			#install it, we need it later
+			make install || exit 1
 		fi
 		;;
 
@@ -44,7 +47,7 @@
 		if [ "$CONFIG_CYRUS_IMAPD" = "y" ]; then
 			rm -rf $WORKDIR/tmp || exit 1
 			mkdir -p $WORKDIR/tmp || exit 1
-			
+
 			# we need this hack to install the perl stuff
 			pushd perl/imap
 			perl Makefile.PL PREFIX=$WORKDIR/tmp/usr
@@ -55,7 +58,7 @@
 			pushd perl/sieve/managesieve
 			perl Makefile.PL PREFIX=$WORKDIR/tmp/usr
 			popd
-			
+
 			make install DESTDIR=$WORKDIR/tmp || exit 1
 
 			rm -rf $WORKDIR/tmp/usr/include || exit 1

Index: php
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- php	16 Oct 2003 02:28:36 -0000	1.2
+++ php	17 Oct 2003 13:43:40 -0000	1.3
@@ -33,6 +33,7 @@
 				--with-jpeg-dir=/usr --enable-dba --with-gdbm --with-db4 --with-inifile --with-flatfile --with-dom --with-dom-xslt \
 				--with-config-file-path=/etc --with-dom-exslt --enable-ftp --with-gd --with-gmp --with-kerberos \
 				--enable-gd-native-ttf --with-ldap --with-mcrypt --with-mhash --with-msession--with-pgsql --with-snmp   \
+				--with-cyrus \
 				--sysconfdir=/etc --with-config-file-path=/etc  --prefix=/usr || exit 1
 			# not working --with-imap  --with-imap-ssl --enable-xslt
 			make $PMAKE all || exit 1
@@ -46,22 +47,16 @@
 			mkdir -p $WORKDIR/tmp/etc
 			cp -dpR $ETCDIR/etc/apache2 $WORKDIR/tmp/etc
 			make install INSTALL_ROOT=$WORKDIR/tmp
-			exit 1
-			rm -rf $WORKDIR/tmp/etc/apache2/build || exit 1
-			rm -rf $WORKDIR/tmp/usr/lib/*a || exit 1
+			replace_str $WORKDIR/tmp/etc/apache2/httpd.conf ${WORKDIR#*/}/tmp/usr /usr
+			rm $WORKDIR/tmp/etc/apache2/httpd.conf.bak
+			rm $WORKDIR/tmp/etc/apache2/httpd.conf.old
+			cp -dp $WORKDIR/tmp/etc/apache2/httpd.conf $ETCDIR/etc/apache2/
 			rm -rf $WORKDIR/tmp/usr/include || exit 1
 			cp -dpR $WORKDIR/tmp/etc/* $ETCDIR/etc/ || exit 1
-			rm -rf  $WORKDIR/tmp/etc
 			copy_docs $WORKDIR/tmp/
-			cp -dpR $WORKDIR/tmp/* $CDDIR || exit 1
+			cp -dpR $WORKDIR/tmp/usr/* $CDDIR/usr/ || exit 1
 			rm -rf $WORKDIR/tmp || exit 1
 
-			cp $MYDIR/scripts/httpd $ETCDIR/etc/init.d || exit 1
-
-			echo "# Start $MYNAME?" >> $CONFIGFILE
-			echo "START_$MYNAME=no" >> $CONFIGFILE
-			echo >> $CONFIGFILE
-			echo "HELP_$MYNAME=\"this is the well know Apache Web server\"" >> $SOFTWAREHELP
 		fi
 		;;