[patchteam] - updates nocatsplash to a functional version

[openwrt/svn-archive/archive.git] / net / nocatsplash / Makefile

diff --git a/net/nocatsplash/Makefile b/net/nocatsplash/Makefile
index 051132dd9084b61fbea9114c65df29213d1d28d4..8ce8c6ace57c5aa9585e8599b948e2fc368077af 100644 (file)
--- a/net/nocatsplash/Makefile
+++ b/net/nocatsplash/Makefile
@@ -1,42 +1,44 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nocatsplash
-PKG_VERSION:=0.92
-PKG_RELEASE:=1
+PKG_VERSION:=0.93pre2
+PKG_RELEASE:=2
 
 PKG_SOURCE:=NoCatSplash-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://wifi.rulez.org/~josephus/
-PKG_MD5SUM:=e0fcc0effe52e63bc31070d16d0b4a81
-PKG_CAT:=zcat
+PKG_MD5SUM:=b0aa5cc33a3bbdd8e65726ff3cfe3cd1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/NoCatSplash-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/nocatsplash
+  SUBMENU:=Captive Portals
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+glib1
+  DEPENDS:=+glib1 +iptables-mod-ipopt +iptables-mod-nat-extra
   TITLE:=Open public network gateway daemon
-  DESCRIPTION:=\
-       NoCatSplash is an Open Public Network Gateway Daemon.\\\
-       It performs as a [captive/open/active] portal. When run on a gateway/router \\\
-       on a network, all web requests are redirected until the client either logs \\\
-       in or clicks "I Accept" to an AUP. The gateway daemon then changes the \\\
-       firewall rules on the gateway to pass traffic for that client (based on IP \\\
-       address and MAC address).
   URL:=http://nocat.net
 endef
 
+define Package/nocatsplash/description
+       NoCatSplash is an Open Public Network Gateway Daemon.
+       It performs as a [captive/open/active] portal. When run on a gateway/router 
+       on a network, all web requests are redirected until the client either logs 
+       in or clicks "I Accept" to an AUP. The gateway daemon then changes the 
+       firewall rules on the gateway to pass traffic for that client (based on IP 
+       address and MAC address).
+endef
+
 define Package/nocatsplash/conffiles
 /etc/nocat.conf
 endef
@@ -48,16 +50,9 @@ define Build/Configure
        )
 endef
 
-define Build/Compile   
-       mkdir -p $(PKG_INSTALL_DIR)
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
-define Package/nocatsplash/install     
-       install -d -m0755 $(1)
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/ 
+define Package/nocatsplash/install
+       $(INSTALL_DIR) $(1)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
 endef
 
 $(eval $(call BuildPackage,nocatsplash))