Convert monit to new packaging style

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@901 3c298f89-4303-0410-b956-a3cf2f4a3e73

openwrt/package/monit/Makefile

@@ -9,59 +9,57 @@ PKG_MD5SUM:=0f054ac39822b4be71789d49e4813754
 
 PKG_SOURCE_URL:=http://www.tildeslash.com/monit/dist/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_CAT:=zcat
-PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg
 
-$(DL_DIR)/$(PKG_SOURCE):
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-	 $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-$(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE)
+include $(TOPDIR)/package/rules.mk
-	$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	touch $(PKG_BUILD_DIR)/.unpacked
 
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.unpacked
+$(eval $(call PKG_template,MONIT,monit,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-	(cd $(PKG_BUILD_DIR); rm -rf config.cache; \
+
+$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		./configure \
-		--target=$(GNU_TARGET_NAME) \
+		  --target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
+		  --host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
+		  --build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
+		  --program-prefix="" \
-		--exec-prefix=/usr \
+		  --program-suffix="" \
-		--bindir=/usr/bin \
+		  --prefix=/usr \
-		--sbindir=/usr/sbin \
+		  --exec-prefix=/usr \
-		--libexecdir=/usr/lib \
+		  --bindir=/usr/sbin \
-		--sysconfdir=/etc \
+		  --datadir=/usr/share \
-		--datadir=/usr/share \
+		  --includedir=/usr/include \
-		--localstatedir=/var \
+		  --infodir=/usr/share/info \
-		--mandir=/usr/man \
+		  --libdir=/usr/lib \
-		--infodir=/usr/info \
+		  --libexecdir=/usr/lib \
-		--without-ssl \
+		  --localstatedir=/var \
+		  --mandir=/usr/share/man \
+		  --sbindir=/usr/sbin \
+		  --sysconfdir=/etc \
+		  $(DISABLE_LARGEFILE) \
+		  $(DISABLE_NLS) \
+		  --without-ssl \
 	);
 	touch $(PKG_BUILD_DIR)/.configured
 
-$(PKG_BUILD_DIR)/monit: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:
 	$(MAKE) -C $(PKG_BUILD_DIR)
+	mkdir -p $(PKG_INSTALL_DIR)
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		install
+	touch $(PKG_BUILD_DIR)/.built
 
-$(PKG_IPK): $(PKG_BUILD_DIR)/monit
+$(IPKG_MONIT):
-	$(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
+	install -d -m0755 $(IDIR_MONIT)/etc
-	mkdir -p $(PKG_IPK_DIR)/usr/sbin
+	install -m0600 $(PKG_BUILD_DIR)/monitrc $(IDIR_MONIT)/etc/
-	cp $(PKG_BUILD_DIR)/monit $(PKG_IPK_DIR)/usr/sbin/
+	install -d -m0755 $(IDIR_MONIT)/etc/init.d
-	$(STRIP) $(PKG_IPK_DIR)/usr/sbin/*
+	install -m0755 ./files/monit.init $(IDIR_MONIT)/etc/init.d/monit
-	mkdir -p $(PACKAGE_DIR)
+	install -d -m0755 $(IDIR_MONIT)/usr/sbin
-	$(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
+	cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/monit $(IDIR_MONIT)/usr/sbin/
-
+	$(RSTRIP) $(IDIR_MONIT)
-$(IPKG_STATE_DIR)/info/monit.list: $(PKG_IPK)
+	$(IPKG_BUILD) $(IDIR_MONIT) $(PACKAGE_DIR)
-	$(IPKG) install $(PKG_IPK)
-
-source: $(DL_DIR)/$(PKG_SOURCE)
-prepare: $(PKG_BUILD_DIR)/.unpacked
-compile: $(PKG_IPK)
-install: $(IPKG_STATE_DIR)/info/monit.list
-
-clean:
-	rm -rf $(PKG_BUILD_DIR)
-	rm -f $(PKG_IPK)

openwrt/package/monit/files/monit.init

@@ -0,0 +1,21 @@
+#!/bin/sh
+
+BIN=monit
+DEFAULT=/etc/default/$BIN
+RUN_D=/var/run
+PID_F=$RUN_D/$BIN.pid
+[ -f $DEFAULT ] && . $DEFAULT
+
+case $1 in
+ start)
+  mkdir -p $RUN_D
+  $BIN $OPTIONS
+  ;;
+ stop)
+  [ -f $PID_F ] && kill $(cat $PID_F)
+  ;;
+ *)
+  echo "usage: $0 (start|stop)"
+  exit 1
+esac
+exit $?

openwrt/package/monit/ipkg/monit.conffiles

@@ -0,0 +1 @@
+/etc/monitrc

openwrt/package/monit/ipkg/monit.control

@@ -1,7 +1,7 @@
 Package: monit
 Priority: optional
-Section: net
+Section: admin
 Maintainer: Waldemar Brodkorb <wbx@dass-it.de>
-Depends: libpthread
 Source: buildroot internal
-Description: utility for monitoring services on a Unix system
+Description: an utility for system services monitoring
+Depends: libpthread