X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fgawk;h=7bf70446cb7536309a89a1e4ffe84d050324b398;hp=de4ff82afc54ac53ab3b1f69bbd7c1f4071f4b04;hb=6b406afb9af68575463fdb165f6649594c2ac04e;hpb=cd1a2927226c734d96478e12bb768256fb64a06a

diff --git a/lfs/gawk b/lfs/gawk
index de4ff82afc..7bf70446cb 100644
--- a/lfs/gawk
+++ b/lfs/gawk
@@ -1,28 +1,20 @@
 ###############################################################################
-# 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>                        #
-#                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: gawk,v 1.3.2.5 2005/02/05 15:38:14 gespinasse Exp $
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -32,18 +24,18 @@
 
 include Config
 
-VER        = 3.1.3
+VER        = 3.1.5
 
 THISAPP    = gawk-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_GNU)/gawk
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 # Normal build or /tools build.
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  EXTRA_CONFIG = --prefix=/usr --libexecdir=/usr/bin --disable-nls
+  EXTRA_CONFIG = --prefix=/usr --libexecdir=/usr/lib --disable-nls
   EXTRA_MAKE =
   EXTRA_INSTALL =
 else
@@ -57,13 +49,11 @@ endif
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) $(THISAPP)-libexecdir-1.patch
+objects = $(DL_FILE)
 
-$(DL_FILE)                        = $(DL_FROM)/$(DL_FILE)
-$(THISAPP)-libexecdir-1.patch     = $(URL_LFS)/gawk/$(THISAPP)-libexecdir-1.patch
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5                    = b637b454005f9e72a9a8eecfacd07ca0
-$(THISAPP)-libexecdir-1.patch_MD5 = af3f30cc056f7959cbbfd0341e7b0146
+$(DL_FILE)_MD5 = 5703f72d0eea1d463f735aad8222655f
 
 install : $(TARGET)
 
@@ -92,13 +82,14 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 ifeq "$(ROOT)" ""
-	cd $(DIR_APP) && patch -Np1 < $(DIR_DL)/$(THISAPP)-libexecdir-1.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-segfault_fix-1.patch
 endif
 	cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
-	cd $(DIR_APP) && make $(EXTRA_MAKE)
-	cd $(DIR_APP) && make $(EXTRA_MAKE) check
+	cd $(DIR_APP) && echo "#define HAVE_LANGINFO_CODESET 1"	>> config.h
+	cd $(DIR_APP) && echo "#define HAVE_LC_MESSAGES 1"		>> config.h
+	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_APP) && make $(EXTRA_INSTALL) install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)