[packages_10.03.1] collectd: backport r29404

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

diff --git a/net/srelay/Makefile b/net/srelay/Makefile
index 595f37817d953faeac9204c8f7d094b9caf6faac..7a8cb4233b80713180b0820cff9c364c7026c1c5 100644 (file)
--- a/net/srelay/Makefile
+++ b/net/srelay/Makefile
@@ -1,33 +1,28 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2010 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:=srelay
-PKG_VERSION:=0.4.6
+PKG_VERSION:=0.4.8b3
 PKG_RELEASE:=1
-PKG_MD5SUM:=4a9f3298b38d8588f0ffde31b946a47f
 
-PKG_SOURCE_URL:=@SF/socks-relay
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-PKG_INIT_LEVEL:=60
+PKG_SOURCE_URL:=@SF/socks-relay
+PKG_MD5SUM:=a6d9521594172710ffa308d6b5dbece4
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/srelay
   SECTION:=net
   CATEGORY:=Network
+  DEPENDS:=+libwrap
+  SUBMENU:=Web Servers/Proxies
   TITLE:=A socks 4/5 proxy server
-  DESCRIPTION:=A socks 4/5 protocol proxy server
   URL:=http://www.c-wind.com/srelay/
 endef
 
@@ -35,17 +30,20 @@ define Package/srelay/conffiles
 /etc/srelay.conf
 endef
 
-define Build/Configure
-$(call Build/Configure/Default,--disable-thread)
-endef
+CONFIGURE_ARGS += \
+       --disable-thread \
+       --with-libwrap="$(STAGING_DIR)/usr" \
+
+CONFIGURE_VARS += \
+       CPPFLAGS="-DLINUX $$$$CPPFLAGS" \
 
 define Package/srelay/install  
-       install -m0755 -d $(1)/usr/bin
-       install -m0755 -d $(1)/etc/init.d
-       $(CP) $(PKG_BUILD_DIR)/srelay $(1)/usr/bin/
-       $(CP) files/srelay.init $(1)/etc/init.d/S$(PKG_INIT_LEVEL)srelay
-       $(CP) files/srelay.conf $(1)/etc
-       chmod 755 $(1)/etc/init.d/S$(PKG_INIT_LEVEL)srelay
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/bin/
+       $(INSTALL_DIR) $(1)/etc
+       $(INSTALL_DATA) files/$(PKG_NAME).conf $(1)/etc/
+       $(INSTALL_DIR) $(1)/etc/init.d
+       $(INSTALL_BIN) files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME)
 endef
 
 $(eval $(call BuildPackage,srelay))