X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=net%2Fnocatsplash%2FMakefile;h=c12eff9b70acd97a1ec5352668f36c657d62b6b1;hb=70c656cc08944f612d869cd87e9f9274af69f772;hp=2dd588425709d7d81d988501047068e88f499b83;hpb=4eb1797a22389158ec780e655ea0ba90d2f6a6ac;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/net/nocatsplash/Makefile b/net/nocatsplash/Makefile
index 2dd5884257..c12eff9b70 100644
--- a/net/nocatsplash/Makefile
+++ b/net/nocatsplash/Makefile
@@ -1,60 +1,58 @@
 #
-# 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_MD5SUM:=e0fcc0effe52e63bc31070d16d0b4a81
+PKG_VERSION:=0.93pre2
+PKG_RELEASE:=2
 
-PKG_SOURCE_URL:=http://wifi.rulez.org/~josephus/
 PKG_SOURCE:=NoCatSplash-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
+PKG_SOURCE_URL:=http://nocat.net/downloads/NoCatSplash/
+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:=+glib
+  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
 
 define Build/Configure
-$(call Build/Configure/Default,	--with-firewall=iptables \
-		  --with-glib-prefix="$(STAGING_DIR)/usr")
-endef
-
-define Build/Compile	
-	mkdir -p $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
+	$(call Build/Configure/Default,	\
+		--with-firewall=iptables \
+		--with-glib-prefix="$(STAGING_DIR)/usr" \
+	)
 endef
 
-define Package/nocatsplash/install	
-	mkdir -p $(1)
-	$(CP) $(PKG_INSTALL_DIR)/* $(1)/ 
+define Package/nocatsplash/install
+	$(INSTALL_DIR) $(1)
+	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
 endef
 
 $(eval $(call BuildPackage,nocatsplash))