diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/httping/Makefile | |
parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/httping/Makefile')
-rw-r--r-- | package/httping/Makefile | 24 |
1 files changed, 10 insertions, 14 deletions
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 |