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/monit/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/monit/Makefile')
| -rw-r--r-- | package/monit/Makefile | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/package/monit/Makefile b/package/monit/Makefile index 7a6f2dfd9..68ef0e683 100644 --- a/package/monit/Makefile +++ b/package/monit/Makefile @@ -6,19 +6,24 @@ include ${TOPDIR}/rules.mk PKG_NAME:= monit -PKG_VERSION:= 4.10.1 +PKG_VERSION:= 5.0.3 PKG_RELEASE:= 1 -PKG_MD5SUM:= d3143b0bbd79b53f1b019d2fc1dae656 -MASTER_SITES:= http://www.tildeslash.com/monit/dist/ +PKG_MD5SUM:= dae7859ec10551fc941daeae60dee9d3 +PKG_DESCR:= An utility for system services monitoring +PKG_SECTION:= admin +PKG_DEPENDS:= libpthread +PKG_URL:= http://mmonit.com/monit +PKG_SITES:= http://www.tildeslash.com/monit/dist/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,MONIT,monit,${PKG_VERSION}-${PKG_RELEASE})) +ifeq ($(ADK_COMPILE_MONIT_WITH_SSL),y) +PKG_DEPENDS+= libopenssl +endif -PKG_DEPENDS:= libpthread, +$(eval $(call PKG_template,MONIT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) ifeq ($(ADK_COMPILE_MONIT_WITH_SSL),y) -PKG_DEPENDS+= libopenssl CONFIGURE_ARGS+= --with-ssl --with-ssl-dir="${STAGING_DIR}/usr" else CONFIGURE_ARGS+= --without-ssl @@ -31,10 +36,7 @@ INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_MONIT}/etc install -m0600 ${WRKBUILD}/monitrc ${IDIR_MONIT}/etc/ - ${INSTALL_DIR} ${IDIR_MONIT}/etc/init.d - ${INSTALL_BIN} ./files/monit.init ${IDIR_MONIT}/etc/init.d/monit ${INSTALL_DIR} ${IDIR_MONIT}/usr/sbin ${INSTALL_BIN} ${WRKBUILD}/monit ${IDIR_MONIT}/usr/sbin/monit - echo 'Depends: ${PKG_DEPENDS}' >>${IDIR_MONIT}/CONTROL/control include ${TOPDIR}/mk/pkg-bottom.mk |