X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=admin%2Fmonit%2FMakefile;h=d8618bdb0d0df63789c39281b72a825ed05b5163;hp=cfb723074845bb23bfda32d96cfe15dde5239ddf;hb=23c11105f000fb6409910c6c8b2b5cc2403ca904;hpb=c26ab96263f981f4316f6d458c58fa56deedde62

diff --git a/admin/monit/Makefile b/admin/monit/Makefile
index cfb7230748..d8618bdb0d 100644
--- a/admin/monit/Makefile
+++ b/admin/monit/Makefile
@@ -9,78 +9,98 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=monit
-PKG_VERSION:=4.6
+PKG_VERSION:=4.9
 PKG_RELEASE:=1
-PKG_MD5SUM:=4e53aa44e4ca264e61c7c401cee4e697
 
-PKG_SOURCE_URL:=http://www.tildeslash.com/monit/dist/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_URL:=http://www.tildeslash.com/monit/dist/
+PKG_MD5SUM:=bcbaab776a54d1e34e3a057c925de9ca
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/monit
+define Package/monit/Default
   SECTION:=admin
   CATEGORY:=Administration
-  DEPENDS:=+libpthread +libopenssl
-  TITLE:=System services monitoring utility, with SSL support
-  DESCRIPTION:=An utility for monitoring services on a Unix system\\\
-This package is built with SSL support.\\\
+  DEPENDS:= +libpthread
+  TITLE:=System services monitoring utility
   URL:=http://www.tildeslash.com/monit
 endef
 
-define Package/monit/conffiles
-/etc/monitrc
+define Package/monit/Default/description
+	An utility for monitoring services on a Unix system
+endef
+
+define Package/monit
+$(call Package/monit/Default)
+  DEPENDS+= +libopenssl
+  TITLE+= (with SSL support)
+endef
+
+define Package/monit/description
+$(call Package/monit/Default/description)
+	This package is built with SSL support.
 endef
 
 define Package/monit-nossl
-  SECTION:=admin
-  CATEGORY:=Administration
-  TITLE:=System services monitoring utility, without SSL support
-  DESCRIPTION:=An utility for monitoring services on a Unix system.\\\
-This package is built without SSL support.\\\
-  URL:=http://www.tildeslash.com/monit
+$(call Package/monit/Default)
+  TITLE+= (without SSL support)
 endef
 
-define Package/monit/conffiles
-/etc/monitrc
+define Package/monit-nossl/description
+$(call Package/monit/Default/description)
+	This package is built without SSL support.
 endef
 
-define Build/Configure
-$(call Build/Configure/Default,--with-ssl \
-	--with-ssl-dir="$(STAGING_DIR)/usr" \
-)
+define Build/Template
+
+$(STAMP_BUILT)-$(2): $(STAMP_PREPARED)
+	-$(MAKE) -C $(PKG_BUILD_DIR) clean
+	$(call Build/Configure/Default,$(3))
 	$(MAKE) -C $(PKG_BUILD_DIR)
-	mv $(PKG_BUILD_DIR)/monit $(PKG_BUILD_DIR)/monit-ssl
-	$(MAKE) -C $(PKG_BUILD_DIR) clean
-$(call Build/Configure/Default,--without-ssl)
+	( cd $(PKG_BUILD_DIR); mv -f monit monit-$(2) )
+	touch $$@
+
+$(STAMP_BUILT): $(STAMP_BUILT)-$(2)
+
+define Package/$(1)/conffiles
+/etc/monitrc
 endef
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		clean all
-	mv $(PKG_BUILD_DIR)/monit $(PKG_BUILD_DIR)/monit-nossl
+define Package/$(1)/install
+	$(INSTALL_DIR) $$(1)/etc
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/monitrc $$(1)/etc/
+	$(INSTALL_DIR) $$(1)/etc/init.d
+	$(INSTALL_BIN) ./files/monit.init $$(1)/etc/init.d/monit
+	$(INSTALL_DIR) $$(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/monit-$(2) $$(1)/usr/sbin/monit
 endef
 
-define Package/monit/install	
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/monitrc $(1)/etc/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/monit.init $(1)/etc/init.d/monit
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/monit-ssl $(1)/usr/sbin/monit
 endef
 
-define Package/monit-nossl/install
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/monitrc $(1)/etc/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/monit.init $(1)/etc/init.d/monit
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/monit-nossl $(1)/usr/sbin/monit
+define Build/Configure
+endef
+
+define Build/Compile
 endef
 
+ifneq ($(SDK)$(CONFIG_PACKAGE_monit),)
+  define Build/with-ssl
+    $(call Build/Template,monit,with-ssl, \
+	--with-ssl \
+	--with-ssl-dir="$(STAGING_DIR)/usr" \
+    )
+  endef
+endif
+$(eval $(Build/with-ssl))
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_monit-nossl),)
+  define Build/without-ssl
+    $(call Build/Template,monit-nossl,without-ssl, \
+	--without-ssl \
+    )  
+  endef
+endif
+$(eval $(Build/without-ssl))
+
 $(eval $(call BuildPackage,monit))
 $(eval $(call BuildPackage,monit-nossl))