X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fxampp;h=8d625867fe4cb4d28e6f0edc6993cd947c77e940;hp=99a152fe4b3c049d409426b54924ab7b78b0b1cf;hb=78331e301975a38f952ad9311a7ff3201e5a5e2e;hpb=bf021abd3bafb517b2e0eefb92cb57576924d7ec

diff --git a/lfs/xampp b/lfs/xampp
index 99a152fe4b..8d625867fe 100644
--- a/lfs/xampp
+++ b/lfs/xampp
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: ntp,v 1.6.2.3 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -32,12 +26,12 @@
 
 include Config
 
-VER        = 1.5.1
+VER        = 1.5.3
 
 THISAPP    = xampp-linux-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = http://ovh.dl.sourceforge.net/sourceforge/xampp
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = /opt/lampp
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 ###############################################################################
@@ -45,13 +39,19 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 ###############################################################################
 
 objects = $(DL_FILE) \
-	xampp-linux-devel-1.5.1.tar.gz
+	xampp-linux-devel-$(VER).tar.gz \
+	PostGreSQL-AddOn-1.0-pgsql8.1.tar.gz \
+	Python-AddOn-1.3.tar.gz
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-xampp-linux-devel-$(VER).tar.gz 	= http://switch.dl.sourceforge.net/sourceforge/xampp/xampp-linux-devel-$(VER).tar.gz
+xampp-linux-devel-$(VER).tar.gz 	= $(URL_IPFIRE)/xampp-linux-devel-$(VER).tar.gz
+PostGreSQL-AddOn-1.0-pgsql8.1.tar.gz = $(URL_IPFIRE)/PostGreSQL-AddOn-1.0-pgsql8.1.tar.gz
+Python-AddOn-1.3.tar.gz = $(URL_IPFIRE)/Python-AddOn-1.3.tar.gz
 
-$(DL_FILE)_MD5 = baefcf7ac3629a641c7b75c547564a3f
-xampp-linux-devel-$(VER).tar.gz_MD5 = e4ab1c867551a831ae6af38fa3c4dfd9
+$(DL_FILE)_MD5 = 649c1fdc76435e3d5315e1ad86f9bace
+xampp-linux-devel-$(VER).tar.gz_MD5 = fbdc87b3c1d6ee123173d08310baca7a
+PostGreSQL-AddOn-1.0-pgsql8.1.tar.gz_MD5 = 63171afe553fd557032407e1ba6af477
+Python-AddOn-1.3.tar.gz_MD5 = 5a962ea63c3e502227c8cca30e0ce786
 
 install : $(TARGET)
 
@@ -61,6 +61,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
+dist:
+	make-packages.sh xampp $(THISAPP)-ipfire-beta-1
+
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
@@ -80,7 +83,27 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) -C /opt && tar zxf $(DIR_DL)/xampp-linux-devel-$(VER).tar.gz -C /opt
+	@rm -rf $(DIR_APP) 
+	cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) -C /opt 
+	cd $(DIR_SRC) && tar zxf $(DIR_DL)/xampp-linux-devel-$(VER).tar.gz -C /opt
+	cd $(DIR_SRC) && tar zxf $(DIR_DL)/Python-AddOn-1.3.tar.gz -C /tmp
+	cd $(DIR_SRC) && tar zxf $(DIR_DL)/PostGreSQL-AddOn-1.0-pgsql8.1.tar.gz -C /tmp
+	cd /tmp/PostGreSQL-AddOn-1.0-pgsql8.1 && ./INSTALL
+	rm -rf /tmp/PostGreSQL-AddOn-1.0-pgsql8.1
+	cd /tmp/Python-AddOn-1.3 && cp -frv lampp/bin /opt/lampp
+	cd /tmp/Python-AddOn-1.3 && cp -frv lampp/cgi-bin /opt/lampp
+	cd /tmp/Python-AddOn-1.3 && cp -frv lampp/etc /opt/lampp
+	cd /tmp/Python-AddOn-1.3 && cp -frv lampp/htdocs /opt/lampp
+	cd /tmp/Python-AddOn-1.3 && cp -frv lampp/include /opt/lampp
+	cd /tmp/Python-AddOn-1.3 && cp -frv lampp/lib /opt/lampp
+	# cd /tmp/Python-AddOn-1.3 && cp -frv lampp/licenses /opt/lampp
+	# cd /tmp/Python-AddOn-1.3 && cp -frv lampp/man /opt/lampp
+	cd /tmp/Python-AddOn-1.3 && cp -frv lampp/modules /opt/lampp
+	# cd /tmp/Python-AddOn-1.3 && cp -frv lampp/share /opt/lampp
+	rm -rf /tmp/Python-AddOn-1.3
+	grep etc/python.conf /opt/lampp/etc/httpd.conf || echo -e "Include etc/python.conf" /opt/lampp/etc/httpd.conf
 	chown -R nobody.nobody /opt/lampp/htdocs
-	@rm -rf $(DIR_APP)
+	ln -fs /opt/lampp/lib/mysql/libmysqlclient.* /usr/lib
+	ln -fs /opt/lampp/lib/libpq.* /usr/lib
+	ldconfig
 	@$(POSTBUILD)