update to 0.4.1

PR:		55858
Submitted by:	W. M. Shandruk <walt@erudition.net>

5 files changed, 19 insertions, 23 deletions

diff --git a/sysutils/monitord/Makefile b/sysutils/monitord/Makefile
index 6ca068778a01..05399cf9b24d 100644
--- a/sysutils/monitord/Makefile
+++ b/sysutils/monitord/Makefile
@@ -6,16 +6,16 @@
 #
 
 PORTNAME=	monitord
-PORTVERSION=	0.2.0
+PORTVERSION=	0.4.1
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.erudition.net/pub/monitord/
 
 MAINTAINER=	walt@erudition.net
-COMMENT=	Service that restarts other standalone services if they terminate
+COMMENT=	Service that restarts other standalone services
 
 MAN8=		monitord.8
 
 post-install:
-	@${CP} ${WRKSRC}/monitord.conf ${PREFIX}/etc/monitord.conf.dist
+	@${CP} ${WRKSRC}/monitord.conf.sample ${PREFIX}/etc/monitord.conf.sample
 
 .include <bsd.port.mk>
diff --git a/sysutils/monitord/distinfo b/sysutils/monitord/distinfo
index 6bb472d7034c..07b22b4ca116 100644
--- a/sysutils/monitord/distinfo
+++ b/sysutils/monitord/distinfo
@@ -1 +1 @@
-MD5 (monitord-0.2.0.tar.gz) = 97267722e2d5d25f8fc0120787175dd9
+MD5 (monitord-0.4.1.tar.gz) = 3cc368f2f000f445df0ccfe051ac2564
diff --git a/sysutils/monitord/files/patch-aa b/sysutils/monitord/files/patch-aa
index 1c02b24e178a..8f2e0b8e1407 100644
--- a/sysutils/monitord/files/patch-aa
+++ b/sysutils/monitord/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig	Thu Jun 15 11:17:14 2000
-+++ Makefile	Sun Jun 17 14:56:30 2001
+--- Makefile.orig	Fri Aug 22 06:36:42 2003
++++ Makefile	Fri Aug 22 15:07:34 2003
 @@ -6,7 +6,7 @@
  
  TARGET =	monitord
@@ -13,9 +13,9 @@
  	$(CC) $(OBJECTS) -o $(TARGET)
  
  install:
--	$(INSTALL) -cs $(TARGET) /usr/local/bin
--	$(INSTALL) -c $(TARGET).conf /usr/local/etc
+-	$(INSTALL) -cs $(TARGET) /usr/local/sbin
+-	$(INSTALL) -c $(TARGET).conf.sample /usr/local/etc
 -	$(INSTALL) -c $(TARGET).8 $(MANDIR)/man8
-+	$(BSD_INSTALL_PROGRAM) $(TARGET) $(PREFIX)/bin
-+	if [ ! -e $(PREFIX)/etc/$(TARGET).conf ] ; then $(BSD_INSTALL_DATA) $(TARGET).conf $(PREFIX)/etc; fi
++	$(BSD_INSTALL_PROGRAM) $(TARGET) $(PREFIX)/sbin
++	if [ ! -e $(PREFIX)/etc/$(TARGET).conf.sample ] ; then $(BSD_INSTALL_DATA) $(TARGET).conf.sample $(PREFIX)/etc; fi
 +	$(BSD_INSTALL_MAN) -c $(TARGET).8 $(MANDIR)/man8
diff --git a/sysutils/monitord/pkg-descr b/sysutils/monitord/pkg-descr
index 7c66c11bb809..be0cc3c7552a 100644
--- a/sysutils/monitord/pkg-descr
+++ b/sysutils/monitord/pkg-descr
@@ -1,15 +1,12 @@
 This port allows one to monitor other standalone services and
 automatically restart them if they are accidentally and unwittingly
-terminated, or crash either because of instability or a DoS attack. It
-simplifies a corresponding task capable of being performed by cron(8) by
-not requiring scripts to be run from a cron tab that in turn checks for
-the *.pid files of services to determine whether they are running, but
-instead uses procfs to determine if they are running or not. The
-configuration file is simple and easily setup.
+terminated, or crash either because of instability or a DoS attack.
+It simplifies a task capable of being performed by cron(8) by not
+requiring custom scripts to be written for each service being
+monitored. The configuration file is simple and easily setup.
 
-Note: version 0.2.0 and up have a slightly different configuration file
-format and any previous configuration file from version 0.1.0 should
-be updated accordingly.
+Note: version 0.4.1 has a different configuration file format and
+any previous configuration file should be updated accordingly.
 
 - Walt
 walt@erudition.net
diff --git a/sysutils/monitord/pkg-plist b/sysutils/monitord/pkg-plist
index 00506631c1af..b614b1d21359 100644
--- a/sysutils/monitord/pkg-plist
+++ b/sysutils/monitord/pkg-plist
@@ -1,4 +1,3 @@
-@unexec if cmp -s %D/etc/monitord.conf %D/etc/monitord.conf.dist; then rm -f %D/etc/monitord.conf; fi
-etc/monitord.conf.dist
-@exec [ -f %B/monitord.conf ] || cp %B/%f %B/monitord.conf
-bin/monitord
+@unexec if cmp -s %D/etc/monitord.conf %D/etc/monitord.conf.sample; then rm -f %D/etc/monitord.conf; fi
+etc/monitord.conf.sample
+sbin/monitord