5 files changed, 19 insertions, 9 deletions

diff --git a/sysutils/daedalus/Makefile b/sysutils/daedalus/Makefile
index 164bf9ba3279..2e70018203e7 100644
--- a/sysutils/daedalus/Makefile
+++ b/sysutils/daedalus/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	daedalus
-PORTVERSION=	1.1
+PORTVERSION=	2.0
 CATEGORIES=	sysutils
-MASTER_SITES=	ftp://ftp.verbotenplanet.net/daedalus/
+MASTER_SITES=	ftp://ftp.insidesystems.net/daedalus/
 
 MAINTAINER=	kelley@insidesystems.net
 COMMENT=	Flexible process monitor/restart daemon written in ruby
@@ -30,7 +30,9 @@ pre-install:
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/daedalus.rb ${PREFIX}/bin/daedalus.rb
-	${INSTALL_DATA} ${WRKSRC}/examples/daedalus.conf ${PREFIX}/etc/daedalus.conf.sample
+	${MKDIR} ${PREFIX}/etc/daedalus
+	${INSTALL_DATA} ${WRKSRC}/examples/daedalus.xml ${PREFIX}/etc/daedalus/daedalus.xml.sample
+	${INSTALL_DATA} ${WRKSRC}/examples/templates.xml ${PREFIX}/etc/daedalus/templates.xml.sample
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${PREFIX}/etc/rc.d/${PORTNAME}.sh
 
 post-install:
diff --git a/sysutils/daedalus/distinfo b/sysutils/daedalus/distinfo
index 5d2873d9cefd..f93e1e5fdda6 100644
--- a/sysutils/daedalus/distinfo
+++ b/sysutils/daedalus/distinfo
@@ -1,2 +1,2 @@
-MD5 (daedalus-1.1.tar.gz) = 5b103455802177ca8a6a2cb126630167
-SIZE (daedalus-1.1.tar.gz) = 33898
+MD5 (daedalus-2.0.tar.gz) = 2e343ef365f19c98b9530bfb033efade
+SIZE (daedalus-2.0.tar.gz) = 26192
diff --git a/sysutils/daedalus/files/daedalus.sh b/sysutils/daedalus/files/daedalus.sh
index 4b916599eaf1..96f02feea43e 100644
--- a/sysutils/daedalus/files/daedalus.sh
+++ b/sysutils/daedalus/files/daedalus.sh
@@ -7,7 +7,7 @@
 # Add the following line to /etc/rc.conf to enable daedalus:
 # daedalus_enable (bool):      Set to "NO" by default.
 #                             Set it to "YES" to enable daedalus
-# daedalus_flags (str):        Set to "-C -c %%PREFIX%%/etc/daedalus.conf" by default.
+# daedalus_flags (str):        Set to "-c %%PREFIX%%/etc/daedalus/daedalus.xml -t %%PREFIX%%/etc/daedalus/templates.xml" by default.
 #                             Extra flags passed to start command
 #
 . %%RC_SUBR%%
@@ -18,10 +18,10 @@ rcvar=`set_rcvar`
 command="%%PREFIX%%/bin/daedalus.rb"
 pidfile="/var/run/daedalus.pid"
 command_interpreter="%%RUBY_WITHOUT_SUFFIX%%"
-required_files=%%PREFIX%%/etc/daedalus.conf
+required_files=%%PREFIX%%/etc/daedalus/daedalus.xml
 
 [ -z "$daedalus_enable" ]       && daedalus_enable="NO"
-[ -z "$daedalus_flags" ]        && daedalus_flags="-C -c %%PREFIX%%/etc/daedalus.conf"
+[ -z "$daedalus_flags" ]        && daedalus_flags="-c %%PREFIX%%/etc/daedalus/daedalus.xml -t %%PREFIX%%/etc/daedalus/templates.xml"
 
 load_rc_config $name
 
diff --git a/sysutils/daedalus/pkg-message b/sysutils/daedalus/pkg-message
index fa5c09bf5323..122a152ccbd6 100644
--- a/sysutils/daedalus/pkg-message
+++ b/sysutils/daedalus/pkg-message
@@ -2,6 +2,12 @@
 IMPORTANT NOTE:
 ===============
 
+If you are upgrading from a version previous to 2.0, the 
+location and layout of the configuration files has changed.
+They are now in XML and a templates.xml file can be referenced
+that allows updating of templates from machine to
+machine without disrupting the actual checks being performed.
+
 To use daedalus, be sure to include
 
 daedalus_enable="YES"
diff --git a/sysutils/daedalus/pkg-plist b/sysutils/daedalus/pkg-plist
index 0198c34434d8..7c4960cf2a6f 100644
--- a/sysutils/daedalus/pkg-plist
+++ b/sysutils/daedalus/pkg-plist
@@ -1,3 +1,5 @@
 bin/daedalus.rb
 etc/rc.d/daedalus.sh
-etc/daedalus.conf.sample
+etc/daedalus/daedalus.xml.sample
+etc/daedalus/templates.xml.sample
+@dirrm etc/daedalus