summaryrefslogtreecommitdiff
path: root/package/monit
diff options
context:
space:
mode:
Diffstat (limited to 'package/monit')
-rw-r--r--package/monit/Config.in17
-rw-r--r--package/monit/Makefile13
-rw-r--r--package/monit/files/monit.init2
3 files changed, 5 insertions, 27 deletions
diff --git a/package/monit/Config.in b/package/monit/Config.in
deleted file mode 100644
index b8d1eec59..000000000
--- a/package/monit/Config.in
+++ /dev/null
@@ -1,17 +0,0 @@
-config ADK_PACKAGE_MONIT
- prompt "monit............................. System services monitoring utility"
- tristate
- select ADK_PACKAGE_LIBPTHREAD
- default n
- help
- An utility for monitoring services on a Unix system
- http://www.tildeslash.com/monit/
-
-config ADK_COMPILE_MONIT_WITH_SSL
- prompt "Compile with SSL support"
- tristate
- select ADK_PACKAGE_LIBOPENSSL
- depends on ADK_PACKAGE_MONIT
- default n
- help
- Enable SSL
diff --git a/package/monit/Makefile b/package/monit/Makefile
index 99bc8e68e..f5d334734 100644
--- a/package/monit/Makefile
+++ b/package/monit/Makefile
@@ -10,15 +10,15 @@ PKG_MD5SUM:= dae7859ec10551fc941daeae60dee9d3
PKG_DESCR:= An utility for system services monitoring
PKG_SECTION:= admin
PKG_DEPENDS:= libpthread
+ifeq ($(ADK_COMPILE_MONIT_WITH_SSL),y)
+PKG_DEPENDS:= libopenssl
+PKG_BUILDDEP+= openssl
+endif
PKG_URL:= http://mmonit.com/monit
PKG_SITES:= http://www.tildeslash.com/monit/dist/
include ${TOPDIR}/mk/package.mk
-ifeq ($(ADK_COMPILE_MONIT_WITH_SSL),y)
-PKG_DEPENDS+= libopenssl
-endif
-
$(eval $(call PKG_template,MONIT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
ifeq ($(ADK_COMPILE_MONIT_WITH_SSL),y)
@@ -27,11 +27,6 @@ else
CONFIGURE_ARGS+= --without-ssl
endif
-CONFIGURE_STYLE:= gnu
-CONFIGURE_ENV+= ac_cv_lib_nsl_inet_addr=no
-BUILD_STYLE:= auto
-INSTALL_STYLE:= auto
-
post-install:
${INSTALL_DIR} ${IDIR_MONIT}/etc
install -m0600 ${WRKBUILD}/monitrc ${IDIR_MONIT}/etc/
diff --git a/package/monit/files/monit.init b/package/monit/files/monit.init
index 712e7899b..d4d914f95 100644
--- a/package/monit/files/monit.init
+++ b/package/monit/files/monit.init
@@ -14,7 +14,7 @@ start)
monit $monit_flags
;;
stop)
- killall monit
+ pkill monit
;;
restart)
sh $0 stop