From ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 30 May 2009 20:39:07 +0200
Subject: optimize ipkg package management

- generate ipkg control file from PKG_* variables
- automatically install init scripts from ./files/*.init
  set #PKG pkgname to set the binary package
- rename FWINIT -> INIT
- move postinst and conffiles meta data to ./files
- update the packages to the latest upstream version
- remove some unready or unused package (strongswan,..)

more cleanups needed after allmodconfig
---
 package/httping/Config.in            | 10 ----------
 package/httping/Makefile             | 24 ++++++++++--------------
 package/httping/ipkg/httping.control |  4 ----
 3 files changed, 10 insertions(+), 28 deletions(-)
 delete mode 100644 package/httping/ipkg/httping.control

(limited to 'package/httping')

diff --git a/package/httping/Config.in b/package/httping/Config.in
index 10c77aea7..f7166e253 100644
--- a/package/httping/Config.in
+++ b/package/httping/Config.in
@@ -1,5 +1,3 @@
-#menu "httping........................... Httping is like 'ping' but for http-requests."
-
 config ADK_PACKAGE_HTTPING
 	prompt "httping........................... Httping is like 'ping' but for http-requests."
 	tristate
@@ -11,11 +9,3 @@ config ADK_PACKAGE_HTTPING
 		transmission across the network also takes time!
 
 		http://www.vanheusden.com/httping/
-
-config ADK_PACKAGE_HTTPING_WITH_SSL
-	prompt "  Enable SSL support"
-	bool
-	default y
-	depends ADK_PACKAGE_HTTPING
-
-#endmenu
diff --git a/package/httping/Makefile b/package/httping/Makefile
index eadc97d79..64ebd15f6 100644
--- a/package/httping/Makefile
+++ b/package/httping/Makefile
@@ -6,29 +6,25 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		httping
-PKG_VERSION:=		1.2.3
+PKG_VERSION:=		1.3.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		b257586da8acec18185c134ed86d2fdd
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tgz
-MASTER_SITES:=		http://www.vanheusden.com/httping/
+PKG_MD5SUM:=		41c912a9ecc904e51d7260053fc2195c
+PKG_DESCR:=		Httping is like 'ping' but for http-requests
+PKG_SECTION:=		net
+PKG_DEPENDS:=		libopenssl
+PKG_SITES:=		http://www.vanheusden.com/httping/
 
-PKG_DEPEND=libopenssl
-ifneq (${ADK_PACKAGE_HTTPING_WITH_SSL},y)
-SSL_ENABLE:=".nossl"
-PKG_DEPEND:=""
-endif
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tgz
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,HTTPING,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,HTTPING,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-do-build:
-	${MAKE} -C ${WRKBUILD} -f ${WRKBUILD}/Makefile${SSL_ENABLE} \
-		CC="${TARGET_CC}" STAGING_DIR=${STAGING_DIR}
+MAKE_FLAGS+=		STAGING_DIR=${STAGING_DIR}
+BUILD_STYLE:=		auto
 
 do-install:
 	${INSTALL_DIR} ${IDIR_HTTPING}/usr/sbin
-	echo "Depends: ${PKG_DEPEND}" >> ${IDIR_HTTPING}/CONTROL/control
 	${CP} ${WRKBUILD}/${PKG_NAME} ${IDIR_HTTPING}/usr/sbin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/httping/ipkg/httping.control b/package/httping/ipkg/httping.control
deleted file mode 100644
index 5ab31d962..000000000
--- a/package/httping/ipkg/httping.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: httping
-Section: net
-Priority: optional
-Description: Httping is like 'ping' but for http-requests.
-- 
cgit v1.2.3