gunnar: server Makefile,1.31,1.32 install-kolab.sh,1.5,1.6

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv507

Modified Files:
	Makefile install-kolab.sh 
Log Message:
Fixed all the PHP requirements for a complete Horde installation.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- Makefile	2 Aug 2007 08:25:18 -0000	1.31
+++ Makefile	5 Aug 2007 05:42:21 -0000	1.32
@@ -10,7 +10,7 @@
 endif
 
 ifeq "x$(KOLABPKGURI)" "x"
-  export KOLABPKGURI = http://ftp.belnet.be/packages/kolab/server/development-2.1/openpkg-orig-srpms/
+  export KOLABPKGURI = http://ftp.belnet.be/packages/kolab/server/development-2.2/20070612-full/sources
 endif
 ifeq "x$(RPM)" "x"
   export RPM = $(HOME)/bin/openpkg rpm
@@ -26,6 +26,8 @@
 endif
 
 BASE_PACKAGES=openldap                \
+              apache2-php             \
+              php                     \
               php-smarty
 
 KOLAB_PACKAGES=perl-kolab              \

Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- install-kolab.sh	3 Aug 2007 11:51:59 -0000	1.5
+++ install-kolab.sh	5 Aug 2007 05:42:21 -0000	1.6
@@ -10,6 +10,7 @@
 INSTALL=""
 
 PACKAGES="openpkg-tools kolabd kolab-webadmin kolab-resource-handlers"
+DEFINE=""
 
 #Flags
 FLAG_BASE=""
@@ -108,6 +109,7 @@
 fi
 
 if [ -n "$FLAG_HORDE" ]; then
+        DEFINE="$DEFINE -D kolabd::with_horde"
 	PACKAGES="$PACKAGES horde-kolab-client"
 fi
 
@@ -281,6 +283,7 @@
 	[ -z "$PLATTAG" ] && PLATTAG=`"$PREFIX/lib/openpkg/shtool" platform --type=binary`-$TAG
 	if [ -n "$KOLAB_VERSION" ]; then
 		DEFINE="
+                $DEFINE
 		-Dkolabd::kolab_version=$KOLAB_VERSION
 		-Dkolab-webadmin::kolab_version=$KOLAB_VERSION
 		"