X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=net%2Fchillispot%2FMakefile;h=f55253001b7c3d4ab8f4b5af7e99604cc305b812;hb=d770f2085456f2a8b3ec0ecf8d5606e36b2ad760;hp=ab4587f41b30e8e1e32075a0d227d276cdeaedb9;hpb=75da7f4ffc9b5ded1100887f26504d76869ae5eb;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/net/chillispot/Makefile b/net/chillispot/Makefile
index ab4587f41b..f55253001b 100644
--- a/net/chillispot/Makefile
+++ b/net/chillispot/Makefile
@@ -1,92 +1,57 @@
-# $Id$
+#
+# Copyright (C) 2006-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=chillispot
-PKG_VERSION:=1.0
-PKG_RELEASE:=1
-PKG_MD5SUM:=997827a9302a85920cfbc1334092ac0c
+PKG_VERSION:=1.1.0
+PKG_RELEASE:=3
 
-PKG_SOURCE_URL:=http://www.chillispot.org/download
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
+PKG_SOURCE_URL:=http://www.chillispot.info/download
+PKG_MD5SUM:=9d2597756af3fa14d7331b4a3651fc9b
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/chillispot
+  SUBMENU:=Captive Portals
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=@+PACKAGE_KMOD_TUN
+  DEPENDS:=+kmod-tun
   TITLE:=Wireless LAN HotSpot controller
-  DESCRIPTION:=Wireless LAN HotSpot controller\\\
-    ChilliSpot is an open source captive portal or wireless LAN \\\
-    access point controller. It is used for authenticating users \\\
-    of a wireless LAN. It supports web based login which is today's \\\
-    standard for public HotSpots and it supports Wireless Protected \\\
-    Access (WPA) which is the standard of the future. Authentication, \\\
-    authorization and accounting (AAA) is handled by your favorite \\\
-    radius server.
-  URL:=http://www.chillispot.org/
+  URL:=http://www.chillispot.info/
 endef
 
-define Package/chillispot/conffiles
-/etc/chilli.conf
+define Package/chillispot/description
+	ChilliSpot is an open source captive portal or wireless LAN 
+	access point controller. It is used for authenticating users 
+	of a wireless LAN. It supports web based login which is today's 
+	standard for public HotSpots and it supports Wireless Protected 
+	Access (WPA) which is the standard of the future. Authentication, 
+	authorization and accounting (AAA) is handled by your favorite 
+	radius server.
 endef
 
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-		ac_cv_func_malloc_0_nonnull=yes \
-		ac_cv_func_memcmp_working=yes \
-		ac_cv_func_setvbuf_reversed=no \
-		./configure \
-			--target=$(GNU_TARGET_NAME) \
-			--host=$(GNU_TARGET_NAME) \
-			--build=$(GNU_HOST_NAME) \
-			--program-prefix="" \
-			--program-suffix="" \
-			--prefix=/usr \
-			--exec-prefix=/usr \
-			--bindir=/usr/bin \
-			--datadir=/usr/share \
-			--includedir=/usr/include \
-			--infodir=/usr/share/info \
-			--libdir=/usr/lib \
-			--libexecdir=/usr/lib \
-			--localstatedir=/var \
-			--mandir=/usr/share/man \
-			--sbindir=/usr/sbin \
-			--sysconfdir=/etc \
-			$(DISABLE_LARGEFILE) \
-			$(DISABLE_NLS) \
-			--enable-shared \
-			--disable-static \
-			--with-gnu-ld \
-	);
+define Package/chillispot/conffiles
+/etc/chilli.conf
 endef
 
-define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
+# uses GNU configure
 
 define Package/chillispot/install
-	install -m0755 -d $(1)/etc/init.d
-	install -m0755 ./files/$(PKG_NAME).init $(1)/etc/init.d/chilli
-	install -m0755 -d $(1)/etc
-	install -m0644 $(PKG_BUILD_DIR)/doc/chilli.conf $(1)/etc/
-	install -m0755 -d $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/chilli $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/chilli
+	$(INSTALL_DIR) $(1)/etc
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/doc/chilli.conf $(1)/etc/
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/chilli $(1)/usr/sbin/
 endef
 
 $(eval $(call BuildPackage,chillispot))