packages/openvpn: fix pid-file arg passed in service command-line

[packages.git] / net / httping / Makefile

diff --git a/net/httping/Makefile b/net/httping/Makefile
index 715346f..a2c6118 100644 (file)
--- a/net/httping/Makefile
+++ b/net/httping/Makefile
@@ -1,48 +1,76 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 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:=httping
-PKG_VERSION:=1.2.2
+PKG_VERSION:=1.5.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
-PKG_SOURCE_URL:=http://www.vanheusden.com/httping/
-PKG_MD5SUM:=cde335c0110fb1b156afdf80ff5ade1d
+PKG_SOURCE_URL:=http://www.vanheusden.com/httping
+PKG_MD5SUM:=49f72b124afb8a60f152ec674a162ad6
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/httping
+define Package/httping/Default
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libopenssl
   TITLE:=Httping is like 'ping' but for http-requests
   URL:=http://www.vanheusden.com/httping/
 endef
 
-define Package/httping/description
-       Give it an url, and it'll show you how long it takes to connect, send a 
-       request and retrieve the reply (only the headers). Be aware that the 
+define Package/httping/Default/description
+       Give it an url, and it'll show you how long it takes to connect, send a
+       request and retrieve the reply (only the headers). Be aware that the
        transmission across the network also takes time!
 endef
 
-define Build/Compile
-       $(call Build/Compile/Default, \
-               CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-       )
+define Package/httping
+  $(call Package/httping/Default)
+  DEPENDS+= +libopenssl
+  TITLE+= (with SSL support)
+  VARIANT:=ssl
 endef
 
-define Package/httping/install 
-       $(INSTALL_DIR) $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/httping $(1)/usr/sbin/
+define Package/httping/description
+       $(call Package/httping/Default/description)
+       This package is built with SSL support.
 endef
 
+define Package/httping-nossl
+  $(call Package/httping/Default)
+  TITLE+= (without SSL support)
+  VARIANT:=nossl
+endef
+
+define Package/httping-nossl/description
+       $(call Package/httping/Default/description)
+       This package is built without SSL support.
+endef
+
+MAKE_FLAGS += \
+       CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)"
+
+ifeq ($(BUILD_VARIANT),nossl)
+       MAKE_FLAGS += \
+               SSL="no" \
+               CFLAGS+="-DNO_SSL"
+endif
+
+define Package/httping/install
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/httping $(1)/usr/bin/
+endef
+
+Package/httping-nossl/install = $(Package/httping/install)
+
 $(eval $(call BuildPackage,httping))
+$(eval $(call BuildPackage,httping-nossl))