From 6daa792eab1488d013fefc5eb7e4d01f40f38687 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 7 Feb 2010 20:03:20 +0100 Subject: change defaults for CONFIG/BUILD/INSTALL styles All packages need an update, so here is a very huge commit. Most of the 460 source packages use automatic style for configuration, building and installing. Make these styles default to "auto". If you have a package, which does not conform to this, just use manual style and add a do-$task make target. I added a new style named AUTOTOOL style, which is needed for some broken packages, which needs to be updated via autoconf or automake. I renamed CONFIGURE_STYLE to CONFIG_STYLE. Updates for some packages, which have newer upstream versions. Renaming of all package/*/extra directories. Use the directory src/ to provide overwrites of source files or to add the code, when no upstream package is available or used. src directory will be automatically used. --- package/httping/Makefile | 15 +++++++-------- package/httping/patches/patch-Makefile | 14 -------------- package/httping/patches/patch-io_c | 12 ------------ package/httping/patches/patch-str_c | 16 ---------------- package/httping/patches/patch-str_h | 12 ------------ 5 files changed, 7 insertions(+), 62 deletions(-) delete mode 100644 package/httping/patches/patch-Makefile delete mode 100644 package/httping/patches/patch-io_c delete mode 100644 package/httping/patches/patch-str_c delete mode 100644 package/httping/patches/patch-str_h (limited to 'package/httping') diff --git a/package/httping/Makefile b/package/httping/Makefile index 7d4e0b754..7f0d6add6 100644 --- a/package/httping/Makefile +++ b/package/httping/Makefile @@ -4,13 +4,13 @@ include ${TOPDIR}/rules.mk PKG_NAME:= httping -PKG_VERSION:= 1.3.0 +PKG_VERSION:= 1.4.1 PKG_RELEASE:= 1 -PKG_BUILDDEP+= openssl -PKG_MD5SUM:= 41c912a9ecc904e51d7260053fc2195c +PKG_MD5SUM:= bde1ff3c01343d2371d8f34fbf8a1d9a PKG_DESCR:= Httping is like 'ping' but for http-requests PKG_SECTION:= net PKG_DEPENDS:= libopenssl +PKG_BUILDDEP+= openssl PKG_SITES:= http://www.vanheusden.com/httping/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz @@ -19,11 +19,10 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,HTTPING,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -MAKE_FLAGS+= STAGING_DIR=${STAGING_DIR} -BUILD_STYLE:= auto +CONFIG_STYLE:= manual -do-install: - ${INSTALL_DIR} ${IDIR_HTTPING}/usr/sbin - ${CP} ${WRKBUILD}/${PKG_NAME} ${IDIR_HTTPING}/usr/sbin/ +post-install: + ${INSTALL_DIR} ${IDIR_HTTPING}/usr/bin + ${CP} ${WRKINST}/usr/bin/httping ${IDIR_HTTPING}/usr/bin/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/httping/patches/patch-Makefile b/package/httping/patches/patch-Makefile deleted file mode 100644 index 89099b868..000000000 --- a/package/httping/patches/patch-Makefile +++ /dev/null @@ -1,14 +0,0 @@ -$Id$ ---- httping-1.2.3.orig/Makefile 2007-05-01 14:05:43.000000000 +0000 -+++ httping-1.2.3/Makefile 2007-06-20 14:19:59.000000000 +0000 -@@ -15,8 +15,8 @@ - include version - - DEBUG=-g # -D_DEBUG --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=mem.o http.o io.o str.o error.o utils.o main.o tcp.o mssl.o res.o - diff --git a/package/httping/patches/patch-io_c b/package/httping/patches/patch-io_c deleted file mode 100644 index b1ac1166b..000000000 --- a/package/httping/patches/patch-io_c +++ /dev/null @@ -1,12 +0,0 @@ -$Id$ ---- httping-1.2.3.orig/io.c 2007-05-01 14:05:43.000000000 +0000 -+++ httping-1.2.3/io.c 2007-06-20 14:19:11.000000000 +0000 -@@ -37,7 +37,7 @@ ssize_t myread(int fd, char *whereto, si - struct timeval to; - fd_set rfds; - -- FD_ZERO(&rfds); -+ //FD_ZERO(&rfds); - FD_SET(fd, &rfds); - - to.tv_sec = timeout / 1000; diff --git a/package/httping/patches/patch-str_c b/package/httping/patches/patch-str_c deleted file mode 100644 index 8778ef40b..000000000 --- a/package/httping/patches/patch-str_c +++ /dev/null @@ -1,16 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- httping-1.3.0.orig/str.c 2009-02-18 16:32:43.000000000 +0100 -+++ httping-1.3.0/str.c 2009-06-01 21:31:19.000000000 +0200 -@@ -18,6 +18,7 @@ - #include "mem.h" - #include "utils.h" - -+/* - #ifndef strndup - char *strndup(char *in, int size) - { -@@ -29,3 +30,4 @@ char *strndup(char *in, int size) - return out; - } - #endif -+*/ diff --git a/package/httping/patches/patch-str_h b/package/httping/patches/patch-str_h deleted file mode 100644 index c7b81ed65..000000000 --- a/package/httping/patches/patch-str_h +++ /dev/null @@ -1,12 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- httping-1.3.0.orig/str.h 2009-02-18 16:32:43.000000000 +0100 -+++ httping-1.3.0/str.h 2009-06-01 21:30:39.000000000 +0200 -@@ -15,6 +15,8 @@ - - #include - -+/* - #ifndef strndup - char *strndup(char *in, int size); - #endif -+*/ -- cgit v1.2.3