X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fpopt;h=25fcc69cbb2a3605335e812b4335504cb3fa9988;hb=3a1179be19f5f9dccb2493b65c971633c04eae63;hp=7ef4fe10a96f70c290cfded8594205fd21b2ae7d;hpb=cd1a2927226c734d96478e12bb768256fb64a06a;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/lfs/popt b/lfs/popt
index 7ef4fe10a..25fcc69cb 100644
--- a/lfs/popt
+++ b/lfs/popt
@@ -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: popt,v 1.3.2.2 2005/02/05 15:38:15 gespinasse Exp $
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -32,13 +24,17 @@
 
 include Config
 
-VER        = 1.7
+VER        = 1.10.4
 
 THISAPP    = popt-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
+ifeq "$(LFS_PASS)" "install"
+	TARGET = $(DIR_INFO)/$(THISAPP)-install
+else
+	TARGET = $(DIR_INFO)/$(THISAPP)
+endif
 
 ###############################################################################
 # Top-level Rules
@@ -48,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 5988e7aeb0ae4dac8d83561265984cc9
+$(DL_FILE)_MD5 = dd22a6873b43d00f75e1c1b7dcfd1ff7
 
 install : $(TARGET)
 
@@ -78,8 +74,16 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ifeq "$(LFS_PASS)" "install"
+	cd $(DIR_APP) && ./configure --prefix=/ --disable-nls
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make DESTDIR=/opt/$(MACHINE)-uClibc install
+else
+	cd $(DIR_APP) && sed -i -e "/*origOptString ==/c 0)" popt.c
+	cd $(DIR_APP) && autoreconf -f -i
 	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
-	cd $(DIR_APP) && make
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
+endif
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)