BWM-NG hinzugefuegt

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

diff --git a/config/rootfiles/common/bwm-ng b/config/rootfiles/common/bwm-ng
new file mode 100644 (file)
index 0000000..645f624
--- /dev/null
+++ b/config/rootfiles/common/bwm-ng
@@ -0,0 +1,2 @@
+usr/bin/bwm-ng
+#usr/share/man/man1/bwm-ng.1

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index aff6ac95b30767cdc2aa0fc09ba6eb5791fd76d1..155e9b8e5ff5a543201ac401b8b2503aaf9e098a 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -46,6 +46,7 @@
 * bootsplash-3.2
 * bridge-utils-1.1
 * busybox-1.2.2
+* bwm-ng-0.6
 * bzip2-1.0.3
 * capi4k-utils-2005-07-18
 * ccache-2.4

diff --git a/lfs/bwm-ng b/lfs/bwm-ng
new file mode 100644 (file)
index 0000000..e669057
--- /dev/null
+++ b/lfs/bwm-ng
@@ -0,0 +1,79 @@
+###############################################################################
+# This file is part of the IPCop Firewall.                                    #
+#                                                                             #
+# IPCop 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           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# IPCop 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>                        #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 0.6
+
+THISAPP    = bwm-ng-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = d3a02484fb7946371bfb4e10927cebfb
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && ./configure --prefix=/usr
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 849fb7de8968f7395ea98a9297fb804298771096..ec37518e1cfa062317376d67b62bca8a090ccab8 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -533,6 +533,7 @@ buildipfire() {
   ipfiremake ethereal
   ipfiremake tftp-hpa
   ipfiremake iptraf
+  ipfiremake bwm-ng
   ipfiremake nagios
 }
 
@@ -602,7 +603,7 @@ buildpackages() {
   beautify message DONE
 
   # Create images for install
-  if [ ! -e ipfire-$VERSION.i586-devel.iso ]; then
+  if [ ! -f ipfire-$VERSION.i586-devel.iso ]; then
                ipfiremake cdrom ED=devel
        fi
        ipfiremake cdrom ED=full