From: Nicolas Thill <nico@openwrt.org>
Date: Sat, 28 Oct 2006 13:36:27 +0000 (+0000)
Subject: rename patch and use EXTRA_ flags instead of intrusive the STAGING_DIR variable,... 
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=060ac262ebfb22d50f372d542e6c75bc59ae3e95

rename patch and use EXTRA_ flags instead of intrusive the STAGING_DIR variable, remove unrelated (and unneeded?) io.c hunk, Makefile cleanup


SVN-Revision: 5320
---

diff --git a/net/httping/Makefile b/net/httping/Makefile
index a77f2e33a0..f536ab2d0c 100644
--- a/net/httping/Makefile
+++ b/net/httping/Makefile
@@ -10,10 +10,10 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=httping
 PKG_VERSION:=1.0.10
 PKG_RELEASE:=1
-PKG_MD5SUM:=998b00b8babeb3196d28c20ad87d9c15
 
-PKG_SOURCE_URL:=http://www.vanheusden.com/httping/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
+PKG_SOURCE_URL:=http://www.vanheusden.com/httping/
+PKG_MD5SUM:=998b00b8babeb3196d28c20ad87d9c15
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@@ -25,20 +25,20 @@ define Package/httping
   CATEGORY:=Network
   DEPENDS:=+libopenssl
   TITLE:=Httping is like 'ping' but for http-requests
-  DESCRIPTION:=Httping is like 'ping' but for http-requests.\\\
-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!\\\
+  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!
   URL:=http://www.vanheusden.com/httping/
 endef
 
 define Build/Compile
-  $(call Build/Compile/Default,-f $(PKG_BUILD_DIR)/Makefile$(SSL_ENABLE) STAGING_DIR=$(STAGING_DIR))
+	$(call Build/Compile/Default)
 endef
 
 define Package/httping/install	
-	mkdir -p $(1)/usr/sbin
-	$(CP) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/
+	install -d -m0755 $(1)/usr/sbin
+	install -m0755 $(PKG_BUILD_DIR)/httping $(1)/usr/sbin/
 endef
 
 $(eval $(call BuildPackage,httping))
diff --git a/net/httping/patches/01-extra_flags.patch b/net/httping/patches/01-extra_flags.patch
new file mode 100644
index 0000000000..2c9038b9ac
--- /dev/null
+++ b/net/httping/patches/01-extra_flags.patch
@@ -0,0 +1,14 @@
+diff -urN httping-1.0.10.orig/Makefile httping-1.0.10/Makefile
+--- httping-1.0.10.orig/Makefile	2006-01-02 17:07:29.000000000 +0100
++++ httping-1.0.10/Makefile	2006-02-13 13:44:45.066590304 +0100
+@@ -15,8 +15,8 @@
+ VERSION=1.0.10
+ 
+ DEBUG=-g
+-LDFLAGS+=-lssl -lcrypto $(DEBUG)
+-CFLAGS+=-O2 -Wall -DVERSION=\"$(VERSION)\" $(DEBUG)
++LDFLAGS+=$(EXTRA_LDFLAGS) -lssl -lcrypto $(DEBUG)
++CFLAGS+=$(EXTRA_CFLAGS) -Wall -DVERSION=\"$(VERSION)\" $(DEBUG)
+ 
+ OBJS=http.o io.o str.o error.o utils.o main.o tcp.o mssl.o res.o
+ 
diff --git a/net/httping/patches/01-honor_includes_lib-paths.patch b/net/httping/patches/01-honor_includes_lib-paths.patch
deleted file mode 100644
index 92817c7b3a..0000000000
--- a/net/httping/patches/01-honor_includes_lib-paths.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -urN httping-1.0.10.orig/io.c httping-1.0.10/io.c
---- httping-1.0.10.orig/io.c	2006-02-13 13:48:37.645232976 +0100
-+++ httping-1.0.10/io.c	2006-02-13 13:48:24.083294704 +0100
-@@ -37,7 +37,7 @@
- 		struct timeval to;
- 		fd_set rfds;
- 
--		FD_ZERO(&rfds);
-+		//FD_ZERO(&rfds);
- 		FD_SET(fd, &rfds);
- 
- 		to.tv_sec  = timeout / 1000;
-diff -urN httping-1.0.10.orig/Makefile httping-1.0.10/Makefile
---- httping-1.0.10.orig/Makefile	2006-01-02 17:07:29.000000000 +0100
-+++ httping-1.0.10/Makefile	2006-02-13 13:44:45.066590304 +0100
-@@ -15,8 +15,8 @@
- VERSION=1.0.10
- 
- DEBUG=-g
--LDFLAGS+=-lssl -lcrypto $(DEBUG)
--CFLAGS+=-O2 -Wall -DVERSION=\"$(VERSION)\" $(DEBUG)
-+LDFLAGS+=-lssl -lcrypto $(DEBUG) -L$(STAGING_DIR)/usr/lib
-+CFLAGS+=-O2 -Wall -DVERSION=\"$(VERSION)\" $(DEBUG) -I$(STAGING_DIR)/usr/include
- 
- OBJS=http.o io.o str.o error.o utils.o main.o tcp.o mssl.o res.o
-