X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fapplejuice;h=12e58a681eb38cf1b68e492e60210d843b63eb9e;hb=689383f9c9505636c471f98dc0ad45d2c15bebfd;hp=bef5910f6ba2777ba9d7a305185d463242b4b21b;hpb=6ef0bff8d7b2255fd8d5cdc1818ba0967481759d;p=ipfire-2.x.git

diff --git a/lfs/applejuice b/lfs/applejuice
index bef5910f6b..12e58a681e 100644
--- a/lfs/applejuice
+++ b/lfs/applejuice
@@ -1,38 +1,41 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
+
 ###############################################################################
 # Definitions
 ###############################################################################
 
 include Config
 
-VER        = 0.30
+VER        = 0.31
 
 THISAPP    = applejuice-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = applejuice
+PAK_VER    = 2
+
+DEPS       = "java"
 
 ###############################################################################
 # Top-level Rules
@@ -42,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 3902240094208758888a622d1cac1c1c
+$(DL_FILE)_MD5 = dc4ac444ff9ec9e1e841e856564d0234
 
 install : $(TARGET)
 
@@ -53,7 +56,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 md5 : $(subst %,%_MD5,$(objects))
 
 dist: 
-	make-packages.sh applejuice $(THISAPP)-ipfire-beta-1
+	@$(PAK)
 
 ###############################################################################
 # Downloading, checking, md5sum
@@ -77,6 +80,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && mkdir -p /opt/applejuice && mv -fv ajcore.jar /opt/applejuice
 	cd $(DIR_APP) && mv -fv libajnetmask.so /opt/applejuice
-	cd $(DIR_APP) && mv -fv phpaj /opt/lampp/htdocs
+	ln -svf ../../opt/applejuice/libajnetmask.so /usr/lib
+	cd $(DIR_APP) && cp -afv phpaj /srv/web
+	chown nobody.nobody /srv/web/phpaj -Rv
+	-mkdir /var/ipfire/applejuice
+	echo "RAMSIZE=64M" > /var/ipfire/applejuice/settings
+	chown nobody.nobody /var/ipfire/applejuice -Rv
 	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
\ No newline at end of file
+	@$(POSTBUILD)