4 files changed, 102 insertions, 97 deletions

diff --git a/sysutils/3dm/Makefile b/sysutils/3dm/Makefile
index a3709854ba07..d513a57530f4 100644
--- a/sysutils/3dm/Makefile
+++ b/sysutils/3dm/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	3dm
-PORTVERSION=	2.04.00.014
+PORTVERSION=	2.04.00.018
 PORTEPOCH=	1
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.3ware.com/download/Escalade9000Series/9.3.0.3/
-DISTNAME=	3DM2-freebsd_5.4-9.3.0.3
+MASTER_SITES=	http://www.3ware.com/download/Escalade9500S-Series/9.3.0.4/
+DISTNAME=	3DM2-freebsd_5.4-9.3.0.4
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	darren.pilgrim@bitfreak.org
 COMMENT=	3ware RAID controller monitoring daemon and web server
 
 USE_RC_SUBR=	3dm2.sh
@@ -53,7 +53,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/en/*.html ${SHAREDIR}
 	${INSTALL_DATA} ${WRKSRC}/en/*.css ${SHAREDIR}
 	${INSTALL_DATA} ${WRKSRC}/en/images/* ${SHAREDIR}/images
-	${INSTALL_DATA} ${WRKSRC}/en/scripts/*.js ${SHAREDIR}/scripts
 
 .if ${ARCH} == "amd64" || ${ARCH} == "ia64"
 	${INSTALL_PROGRAM} ${WRKSRC}/3dm2.x86_64 ${PREFIX}/sbin/3dm2
@@ -103,8 +102,6 @@ post-install:
 	@${LN} -s ${PREFIX}/etc/3dm2/3dm2.conf /etc/3dm2/3dm2.conf
 	@${LN} -s ${PREFIX}/etc/3dm2/3dm2.pem /etc/3dm2/3dm2.pem
 
-	@${ECHO} ""
-	@${ECHO} "Add twdm2_enable=\"YES\" to /etc/rc.conf to run 3dm2 from startup."
-	@${ECHO} ""
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/3dm/distinfo b/sysutils/3dm/distinfo
index 4890ae9a88f4..ef0fa68cbbf2 100644
--- a/sysutils/3dm/distinfo
+++ b/sysutils/3dm/distinfo
@@ -1,3 +1,3 @@
-MD5 (3DM2-freebsd_5.4-9.3.0.3.tgz) = e3511c6d55bb2eaf70143e7bf59a102e
-SHA256 (3DM2-freebsd_5.4-9.3.0.3.tgz) = d5e1ce8009a558f1919aaad95d41d77f20759bd6cfd892fbdcf0c2ce9962628a
-SIZE (3DM2-freebsd_5.4-9.3.0.3.tgz) = 1560864
+MD5 (3DM2-freebsd_5.4-9.3.0.4.tgz) = 0f67384eff154338a411b3f3085cda4f
+SHA256 (3DM2-freebsd_5.4-9.3.0.4.tgz) = 27ff2481bea541bbcfaaa2f32bb38800eed8b4a036b8bd565a41467e4a6f4cbe
+SIZE (3DM2-freebsd_5.4-9.3.0.4.tgz) = 1540837
diff --git a/sysutils/3dm/pkg-message b/sysutils/3dm/pkg-message
new file mode 100644
index 000000000000..1a3cd2de40ed
--- /dev/null
+++ b/sysutils/3dm/pkg-message
@@ -0,0 +1,3 @@
+
+To run 3DM2 at startup, add twdm2_enable="YES" to your /etc/rc.conf.
+
diff --git a/sysutils/3dm/pkg-plist b/sysutils/3dm/pkg-plist
index a6da1ff566ca..8e7eb5d7438d 100644
--- a/sysutils/3dm/pkg-plist
+++ b/sysutils/3dm/pkg-plist
@@ -1,77 +1,48 @@
 @unexec %D/etc/rc.d/3dm2.sh stop > /dev/null 2>&1 || true
 @unexec if cmp -s %D/etc/3dm2/3dm2.conf.sample %D/etc/3dm2/3dm2.conf; then rm -f %D/etc/3dm2/3dm2.conf; fi
 etc/3dm2/3dm2.conf.sample
-@exec [ -f %B/3dm2.conf ] || cp -p %B/%f %B/3dm2.conf
+@exec if [ -f %B/3dm2.conf ] ; then cp -p %D/%F %B/3dm2.conf; fi
 etc/3dm2/msg/tdm_msg_en
 etc/3dm2/msg/tw_msg_en
 sbin/3dm2
+share/3dm2/en/3DM2_Settings.html
 share/3dm2/en/3DM_2_OLH-1-01.html
-share/3dm2/en/3DM_2_OLH-1-02.html
-share/3dm2/en/3DM_2_OLH-1-03.html
-share/3dm2/en/3DM_2_OLH-1-04.html
-share/3dm2/en/3DM_2_OLH-1-05.html
-share/3dm2/en/3DM_2_OLH-1-06.html
-share/3dm2/en/3DM_2_OLH-1-07.html
-share/3dm2/en/3DM_2_OLH-1-08.html
-share/3dm2/en/3DM_2_OLH-1-09.html
-share/3dm2/en/3DM_2_OLH-1-10.html
-share/3dm2/en/3DM_2_OLH-1-11.html
-share/3dm2/en/3DM_2_OLH-1-12.html
-share/3dm2/en/3DM_2_OLH-1-13.html
-share/3dm2/en/3DM_2_OLH-1-14.html
-share/3dm2/en/3DM_2_OLH-1-15.html
-share/3dm2/en/3DM_2_OLH-1-16.html
-share/3dm2/en/3DM_2_OLH-1-17.html
-share/3dm2/en/3DM_2_OLH-1-18.html
-share/3dm2/en/3DM_2_OLH-1-19.html
-share/3dm2/en/3DM_2_OLH-1-20.html
-share/3dm2/en/3DM_2_OLH-1-21.html
-share/3dm2/en/3DM_2_OLH-1-22.html
-share/3dm2/en/3DM_2_OLH-1-23.html
-share/3dm2/en/3DM_2_OLH-1-24.html
-share/3dm2/en/3DM_2_OLH-1-25.html
-share/3dm2/en/3DM_2_OLH-1-26.html
-share/3dm2/en/3DM_2_OLH-1-27.html
-share/3dm2/en/3DM_2_OLH-1-28.html
-share/3dm2/en/3DM_2_OLH-1-29.html
-share/3dm2/en/3DM_2_OLH-1-30.html
-share/3dm2/en/3DM_2_OLH-1-31.html
-share/3dm2/en/3DM_2_OLH-2-1.html
-share/3dm2/en/3DM_2_OLH-2-2.html
-share/3dm2/en/3DM_2_OLH-2-3.html
-share/3dm2/en/3DM_2_OLH-2-4.html
-share/3dm2/en/3DM_2_OLH-2-5.html
-share/3dm2/en/3DM_2_OLH-2-6.html
-share/3dm2/en/3DM_2_OLH-2-7.html
-share/3dm2/en/3DM_2_OLH-2-8.html
-share/3dm2/en/3DM_2_OLH-2-9.html
-share/3dm2/en/3DM_2_OLH-3-1.html
-share/3dm2/en/3DM_2_OLH-3-2.html
-share/3dm2/en/3DM_2_OLH-3-3.html
-share/3dm2/en/3DM_2_OLH-3-4.html
-share/3dm2/en/3DM_2_OLH-3-5.html
-share/3dm2/en/3DM_2_OLH-3-6.html
-share/3dm2/en/3DM_2_OLH-4-01.html
-share/3dm2/en/3DM_2_OLH-4-02.html
-share/3dm2/en/3DM_2_OLH-4-03.html
-share/3dm2/en/3DM_2_OLH-4-04.html
-share/3dm2/en/3DM_2_OLH-4-05.html
-share/3dm2/en/3DM_2_OLH-4-06.html
-share/3dm2/en/3DM_2_OLH-4-07.html
-share/3dm2/en/3DM_2_OLH-4-08.html
-share/3dm2/en/3DM_2_OLH-4-09.html
-share/3dm2/en/3DM_2_OLH-4-10.html
-share/3dm2/en/3DM_2_OLH-4-11.html
-share/3dm2/en/3DM_2_OLH-4-12.html
-share/3dm2/en/3DM_2_OLH-4-13.html
-share/3dm2/en/3DM_2_OLH-4-14.html
-share/3dm2/en/3DM_2_OLH-4-15.html
-share/3dm2/en/3DM_2_OLH-4-16.html
-share/3dm2/en/3DM_2_OLH-4-17.html
-share/3dm2/en/3DM_2_OLH-4-18.html
-share/3dm2/en/3DM_2_OLH-4-19.html
-share/3dm2/en/3DM_2_OLH-4-20.html
-share/3dm2/en/3DM_2_OLH-4-21.html
+share/3dm2/en/3DM_2_OLH-2-02.html
+share/3dm2/en/3DM_2_OLH-2-03.html
+share/3dm2/en/3DM_2_OLH-2-04.html
+share/3dm2/en/3DM_2_OLH-2-05.html
+share/3dm2/en/3DM_2_OLH-2-06.html
+share/3dm2/en/3DM_2_OLH-2-07.html
+share/3dm2/en/3DM_2_OLH-2-08.html
+share/3dm2/en/3DM_2_OLH-2-09.html
+share/3dm2/en/3DM_2_OLH-2-10.html
+share/3dm2/en/3DM_2_OLH-2-11.html
+share/3dm2/en/3DM_2_OLH-2-12.html
+share/3dm2/en/3DM_2_OLH-2-13.html
+share/3dm2/en/3DM_2_OLH-2-14.html
+share/3dm2/en/3DM_2_OLH-2-15.html
+share/3dm2/en/3DM_2_OLH-2-16.html
+share/3dm2/en/3DM_2_OLH-2-17.html
+share/3dm2/en/3DM_2_OLH-2-18.html
+share/3dm2/en/3DM_2_OLH-2-19.html
+share/3dm2/en/3DM_2_OLH-3-01.html
+share/3dm2/en/3DM_2_OLH-3-02.html
+share/3dm2/en/3DM_2_OLH-3-03.html
+share/3dm2/en/3DM_2_OLH-3-04.html
+share/3dm2/en/3DM_2_OLH-3-05.html
+share/3dm2/en/3DM_2_OLH-3-06.html
+share/3dm2/en/3DM_2_OLH-3-07.html
+share/3dm2/en/3DM_2_OLH-3-08.html
+share/3dm2/en/3DM_2_OLH-3-09.html
+share/3dm2/en/3DM_2_OLH-3-10.html
+share/3dm2/en/3DM_2_OLH-3-11.html
+share/3dm2/en/3DM_2_OLH-4-1.html
+share/3dm2/en/3DM_2_OLH-4-2.html
+share/3dm2/en/3DM_2_OLH-4-3.html
+share/3dm2/en/3DM_2_OLH-4-4.html
+share/3dm2/en/3DM_2_OLH-4-5.html
+share/3dm2/en/3DM_2_OLH-4-6.html
+share/3dm2/en/3DM_2_OLH-4-7.html
 share/3dm2/en/3DM_2_OLH-5-01.html
 share/3dm2/en/3DM_2_OLH-5-02.html
 share/3dm2/en/3DM_2_OLH-5-03.html
@@ -95,32 +66,62 @@ share/3dm2/en/3DM_2_OLH-5-20.html
 share/3dm2/en/3DM_2_OLH-5-21.html
 share/3dm2/en/3DM_2_OLH-5-22.html
 share/3dm2/en/3DM_2_OLH-5-23.html
-share/3dm2/en/3DM_2_OLH-5-24.html
-share/3dm2/en/3DM_2_OLH-6-1.html
-share/3dm2/en/3DM_2_OLH-6-2.html
-share/3dm2/en/3DM_2_OLH-6-3.html
-share/3dm2/en/3DM_2_OLH-6-4.html
-share/3dm2/en/3DM_2_OLH-6-5.html
+share/3dm2/en/3DM_2_OLH-6-01.html
+share/3dm2/en/3DM_2_OLH-6-02.html
+share/3dm2/en/3DM_2_OLH-6-03.html
+share/3dm2/en/3DM_2_OLH-6-04.html
+share/3dm2/en/3DM_2_OLH-6-05.html
+share/3dm2/en/3DM_2_OLH-6-06.html
+share/3dm2/en/3DM_2_OLH-6-07.html
+share/3dm2/en/3DM_2_OLH-6-08.html
+share/3dm2/en/3DM_2_OLH-6-09.html
+share/3dm2/en/3DM_2_OLH-6-10.html
+share/3dm2/en/3DM_2_OLH-6-11.html
+share/3dm2/en/3DM_2_OLH-6-12.html
+share/3dm2/en/3DM_2_OLH-6-13.html
+share/3dm2/en/3DM_2_OLH-6-14.html
+share/3dm2/en/3DM_2_OLH-6-15.html
+share/3dm2/en/3DM_2_OLH-6-16.html
+share/3dm2/en/3DM_2_OLH-6-17.html
+share/3dm2/en/3DM_2_OLH-6-18.html
+share/3dm2/en/3DM_2_OLH-6-19.html
+share/3dm2/en/3DM_2_OLH-6-20.html
+share/3dm2/en/3DM_2_OLH-6-21.html
+share/3dm2/en/3DM_2_OLH-6-22.html
+share/3dm2/en/3DM_2_OLH-6-23.html
+share/3dm2/en/3DM_2_OLH-6-24.html
 share/3dm2/en/3DM_2_OLH-7-1.html
 share/3dm2/en/3DM_2_OLH-7-2.html
 share/3dm2/en/3DM_2_OLH-7-3.html
 share/3dm2/en/3DM_2_OLH-7-4.html
 share/3dm2/en/3DM_2_OLH-7-5.html
-share/3dm2/en/3DM_2_OLH-7-6.html
 share/3dm2/en/3DM_2_OLH-8-1.html
+share/3dm2/en/3DM_2_OLH-8-2.html
+share/3dm2/en/3DM_2_OLH-8-3.html
+share/3dm2/en/3DM_2_OLH-8-4.html
+share/3dm2/en/3DM_2_OLH-8-5.html
+share/3dm2/en/3DM_2_OLH-8-6.html
+share/3dm2/en/3DM_2_OLH-9-1.html
+share/3dm2/en/Alarms.html
+share/3dm2/en/Battery_Backup.html
+share/3dm2/en/Controller_Details.html
+share/3dm2/en/Controller_Settings.html
+share/3dm2/en/Controller_Summary.html
+share/3dm2/en/Drive_Details.html
+share/3dm2/en/Drive_Information.html
+share/3dm2/en/First.html
 share/3dm2/en/IX.html
+share/3dm2/en/Maintenance.html
+share/3dm2/en/Scheduling.html
 share/3dm2/en/TOC.html
+share/3dm2/en/Unit_Details.html
+share/3dm2/en/Unit_Information.html
 share/3dm2/en/catalog.css
 share/3dm2/en/document.css
-share/3dm2/en/images/3DM_2_OLH-2-3-3.gif
-share/3dm2/en/images/3DM_2_OLH-2-3-4.gif
-share/3dm2/en/images/3DM_2_OLH-4-13-5.gif
-share/3dm2/en/images/3DM_2_OLH-4-17-6.gif
-share/3dm2/en/images/3DM_2_OLH-4-18-7.gif
-share/3dm2/en/images/3DM_2_OLH-4-19-8.gif
-share/3dm2/en/images/3DM_2_OLH-4-20-9.gif
+share/3dm2/en/images/3DM_2_OLH-3-05-3.gif
+share/3dm2/en/images/3DM_2_OLH-3-05-4.gif
 share/3dm2/en/images/3dm-selected-drives-to-create.gif
-share/3dm2/en/images/3dm-selected-drives-to-createkm.gif
+share/3dm2/en/images/3dm-selected-drives-to-createkl.gif
 share/3dm2/en/images/3ware-logo.png
 share/3dm2/en/images/3wblu_small50.gif
 share/3dm2/en/images/3wblu_small75.gif
@@ -129,7 +130,7 @@ share/3dm2/en/images/Migrate0-5.gif
 share/3dm2/en/images/RAID-0.gif
 share/3dm2/en/images/RAID-1.gif
 share/3dm2/en/images/RAID-50-12-drives-select-drives-per-unit.gif
-share/3dm2/en/images/RAID-50-12-drives-select-drives-per-unitkn.gif
+share/3dm2/en/images/RAID-50-12-drives-select-drives-per-unitkm.gif
 share/3dm2/en/images/alarms-sample-3dm.gif
 share/3dm2/en/images/amcc-logo.gif
 share/3dm2/en/images/amcc-logo.jpg
@@ -158,9 +159,13 @@ share/3dm2/en/images/self-test-choices.gif
 share/3dm2/en/images/summary-screen-with-callouts.gif
 share/3dm2/en/images/toc.gif
 share/3dm2/en/images/tocx.gif
-share/3dm2/en/scripts/expand.js
-share/3dm2/en/scripts/seealso.js
 @unexec unlink /etc/3dm2/3dm2.conf
 @unexec unlink /etc/3dm2/3dm2.pem
 @unexec unlink /etc/3dm2/msg
-@dirrmtry share/3dm2/en/scripts %D/share/3dm2/en/images %D/share/3dm2/en %D/share/3dm2 /etc/3dm2 %D/etc/3dm2/msg %D/etc/3dm2
+@dirrmtry share/3dm2/en/scripts
+@dirrmtry share/3dm2/en/images
+@dirrmtry share/3dm2/en
+@dirrmtry share/3dm2
+@unexec rmdir /etc/3dm2 2>/dev/null || true
+@dirrmtry etc/3dm2/msg
+@dirrmtry etc/3dm2