Mailx und Newt Fixes.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@339 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 4c7252ba7b76c2008e05f3388ab952c79caa6ce5..5b33f23a5b9d33e01ba30dce8c41463482494c41 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -1,4 +1,4 @@
-== List of softwares used to build IPFire Version: 2.1b ==
+== List of softwares used to build IPFire Version: 2.0b ==
 * 3c5x9setup-1.00
 * Archive-Tar-1.29
 * Archive-Zip-1.16
@@ -46,7 +46,7 @@
 * ccache-2.4
 * cdrtools-2.01
 * cftp-0.12
-* clamav-0.88.4
+* clamav-0.88.5
 * coreutils-5.96
 * cups-1.2.2
 * cyrus-imapd-2.2.12

diff --git a/lfs/mailx b/lfs/mailx
index 6660b70fbae4c4ea3138abd6b3f74e61774b5f6a..ebc3565f818b8298a9cfc86f0fa201990af6ebce 100644 (file)
--- a/lfs/mailx
+++ b/lfs/mailx
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mailx
-PAK_VER    = ipfire-beta1
+PAK_VER    = 1
 
 ###############################################################################
 # Top-level Rules
@@ -77,7 +77,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && make $(MAKETUNING) SENDMAIL=/usr/sbin/sendmail
+       cd $(DIR_APP) && make SENDMAIL=/usr/sbin/sendmail
        cd $(DIR_APP) && make PREFIX=/usr UCBINSTALL=/usr/bin/install install
        cd $(DIR_APP) && ln -v -sf mailx /usr/bin/mail
        cd $(DIR_APP) && ln -v -sf mailx /usr/bin/nail

diff --git a/lfs/newt b/lfs/newt
index fa6e6a1a6a054e96eee7760b11354f150871c170..659a1bad7d1172661a2bb1e04e7a425f872cfaf6 100644 (file)
--- a/lfs/newt
+++ b/lfs/newt
@@ -85,8 +85,8 @@ ifeq "$(LFS_PASS)" "install"
        cd $(DIR_APP) && ./configure --without-gpm-support --host $(MACHINE)-uclibc
        cd $(DIR_APP) && sed -i 's%^CFLAGS.*$$%CFLAGS = -Os -fomit-frame-pointer -Wall -D_GNU_SOURCE -DUTF8 -I/install/include/slang%' Makefile
        cd $(DIR_APP) && make libnewt.a
+       -mkdir -p /install/$(MACHINE)-uClibc/{include,lib}
        cd $(DIR_APP) && install -m 0644 libnewt.a /install/$(MACHINE)-uClibc/lib
-       -mkdir -p /install/$(MACHINE)-uClibc/include
        cd $(DIR_APP) && install -m 0644 newt.h /install/$(MACHINE)-uClibc/include/newt.h
 else
        cd $(DIR_APP) && RPM_OPT_FLAGS="$(CFLAGS) -DUTF8" ./configure --without-gpm-support