update to 2.04.00.035

change maintainers email address

PR:		ports/106931
Approved by:	maintainer

3 files changed, 310 insertions, 140 deletions

diff --git a/sysutils/3dm/Makefile b/sysutils/3dm/Makefile
index d513a57530f4..797c933926da 100644
--- a/sysutils/3dm/Makefile
+++ b/sysutils/3dm/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	3dm
-PORTVERSION=	2.04.00.018
+PORTVERSION=	2.04.00.035
 PORTEPOCH=	1
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.3ware.com/download/Escalade9500S-Series/9.3.0.4/
-DISTNAME=	3DM2-freebsd_5.4-9.3.0.4
+MASTER_SITES=	http://3ware.com/download/Escalade9650SE-Series/9.4.0.1/
+DISTNAME=	3DM2-freebsd-9.4.0.1
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	darren.pilgrim@bitfreak.org
+MAINTAINER=	ports.maintainer@evilphi.com
 COMMENT=	3ware RAID controller monitoring daemon and web server
 
 USE_RC_SUBR=	3dm2.sh
@@ -30,18 +30,24 @@ WRKSRC=		${WRKDIR}
 
 SHAREDIR=	${PREFIX}/share/3dm2/en
 
-post-configure:
-	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' \
-	< ${FILESDIR}/3dm2.conf.sample > ${WRKSRC}/3dm2.conf.sample
-
-pre-install:
+post-extract:
 	@cd ${WRKSRC}; ${TAR} zxf 3dm-bsd.tgz
 	@cd ${WRKSRC}; ${TAR} zxf 3dm-help.tgz
 	@cd ${WRKSRC}; ${TAR} zxf 3dm-msg.tgz
-	@${REINPLACE_CMD} -e 's|images/amcc-logo.gif|images/amcc-logo75.gif|g' ${WRKSRC}/en/*.html
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|AMCC-logo\.jpg|AMCC-logo-smaler\.jpg|g' ${WRKSRC}/en/*.html
+
+post-configure:
+	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' \
+	< ${FILESDIR}/3dm2.conf.sample > ${WRKSRC}/3dm2.conf.sample
 
 do-install:
 
+.if !exists(${SHAREDIR}/css)
+	@${MKDIR} ${SHAREDIR}/css
+.endif
+
 .if !exists(${SHAREDIR}/images)
 	@${MKDIR} ${SHAREDIR}/images
 .endif
@@ -51,8 +57,11 @@ do-install:
 .endif
 
 	${INSTALL_DATA} ${WRKSRC}/en/*.html ${SHAREDIR}
-	${INSTALL_DATA} ${WRKSRC}/en/*.css ${SHAREDIR}
+	${INSTALL_DATA} ${WRKSRC}/en/*.gif ${SHAREDIR}
+	${INSTALL_DATA} ${WRKSRC}/en/*.jpg ${SHAREDIR}
+	${INSTALL_DATA} ${WRKSRC}/en/css/* ${SHAREDIR}/css
 	${INSTALL_DATA} ${WRKSRC}/en/images/* ${SHAREDIR}/images
+	${INSTALL_DATA} ${WRKSRC}/en/scripts/* ${SHAREDIR}/scripts
 
 .if ${ARCH} == "amd64" || ${ARCH} == "ia64"
 	${INSTALL_PROGRAM} ${WRKSRC}/3dm2.x86_64 ${PREFIX}/sbin/3dm2
@@ -62,10 +71,6 @@ do-install:
 
 	@${CHMOD} 500 ${PREFIX}/sbin/3dm2
 
-.if !exists(/etc/3dm2)
-	@${MKDIR} /etc/3dm2
-.endif
-
 .if !exists(${PREFIX}/etc/3dm2)
 	@${MKDIR} ${PREFIX}/etc/3dm2
 .endif
@@ -96,8 +101,11 @@ post-install:
 		${PREFIX}/etc/3dm2/3dm2.conf
 	@${CHMOD} 600 ${PREFIX}/etc/3dm2/3dm2.conf.sample ${PREFIX}/etc/3dm2/3dm2.conf
 
-# 3ware lamely hardcode the locations of various things
+# 3ware uses a hardcoded config dir location that doesn't match hier(9)
 
+.if !exists(/etc/3dm2)
+	@${MKDIR} /etc/3dm2
+.endif
 	@${LN} -s ${PREFIX}/etc/3dm2/msg /etc/3dm2/msg
 	@${LN} -s ${PREFIX}/etc/3dm2/3dm2.conf /etc/3dm2/3dm2.conf
 	@${LN} -s ${PREFIX}/etc/3dm2/3dm2.pem /etc/3dm2/3dm2.pem
diff --git a/sysutils/3dm/distinfo b/sysutils/3dm/distinfo
index ef0fa68cbbf2..fda3a5ae2103 100644
--- a/sysutils/3dm/distinfo
+++ b/sysutils/3dm/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (3DM2-freebsd-9.4.0.1.tgz) = 09f86d38c03e8323506848c24d0233ec
+SHA256 (3DM2-freebsd-9.4.0.1.tgz) = 35e3bf50e1dff37ca8e6795ecd2d4b583fbd623f27d2e3bf20de913959cf691b
+SIZE (3DM2-freebsd-9.4.0.1.tgz) = 3770569
diff --git a/sysutils/3dm/pkg-plist b/sysutils/3dm/pkg-plist
index 8e7eb5d7438d..8a453b170bb5 100644
--- a/sysutils/3dm/pkg-plist
+++ b/sysutils/3dm/pkg-plist
@@ -5,145 +5,307 @@ etc/3dm2/3dm2.conf.sample
 etc/3dm2/msg/tdm_msg_en
 etc/3dm2/msg/tw_msg_en
 sbin/3dm2
+share/3dm2/en/3DM-Intro.4.10.html
+share/3dm2/en/3DM-Intro.4.11.html
+share/3dm2/en/3DM-Intro.4.12.html
+share/3dm2/en/3DM-Intro.4.13.html
+share/3dm2/en/3DM-Intro.4.14.html
+share/3dm2/en/3DM-Intro.4.15.html
+share/3dm2/en/3DM-Intro.4.16.html
+share/3dm2/en/3DM-Intro.4.17.html
+share/3dm2/en/3DM-Intro.4.18.html
+share/3dm2/en/3DM-Intro.4.2.html
+share/3dm2/en/3DM-Intro.4.3.html
+share/3dm2/en/3DM-Intro.4.4.html
+share/3dm2/en/3DM-Intro.4.5.html
+share/3dm2/en/3DM-Intro.4.6.html
+share/3dm2/en/3DM-Intro.4.7.html
+share/3dm2/en/3DM-Intro.4.8.html
+share/3dm2/en/3DM-Intro.4.9.html
 share/3dm2/en/3DM2_Settings.html
-share/3dm2/en/3DM_2_OLH-1-01.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
-share/3dm2/en/3DM_2_OLH-5-04.html
-share/3dm2/en/3DM_2_OLH-5-05.html
-share/3dm2/en/3DM_2_OLH-5-06.html
-share/3dm2/en/3DM_2_OLH-5-07.html
-share/3dm2/en/3DM_2_OLH-5-08.html
-share/3dm2/en/3DM_2_OLH-5-09.html
-share/3dm2/en/3DM_2_OLH-5-10.html
-share/3dm2/en/3DM_2_OLH-5-11.html
-share/3dm2/en/3DM_2_OLH-5-12.html
-share/3dm2/en/3DM_2_OLH-5-13.html
-share/3dm2/en/3DM_2_OLH-5-14.html
-share/3dm2/en/3DM_2_OLH-5-15.html
-share/3dm2/en/3DM_2_OLH-5-16.html
-share/3dm2/en/3DM_2_OLH-5-17.html
-share/3dm2/en/3DM_2_OLH-5-18.html
-share/3dm2/en/3DM_2_OLH-5-19.html
-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-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-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/3DM_Ref.9.1.html
+share/3dm2/en/3ware_GetStarted.3.1.html
+share/3dm2/en/3ware_Intro.2.1.html
+share/3dm2/en/3ware_Intro.2.2.html
+share/3dm2/en/3ware_Intro.2.3.html
+share/3dm2/en/3ware_Intro.2.4.html
+share/3dm2/en/3ware_Intro.2.5.html
+share/3dm2/en/3ware_Intro.2.6.html
+share/3dm2/en/3ware_Intro.2.7.html
+share/3dm2/en/3ware_Intro.2.8.html
+share/3dm2/en/AEN_0001.html
+share/3dm2/en/AEN_0002.html
+share/3dm2/en/AEN_0003.html
+share/3dm2/en/AEN_0004.html
+share/3dm2/en/AEN_0005.html
+share/3dm2/en/AEN_0006.html
+share/3dm2/en/AEN_0007.html
+share/3dm2/en/AEN_0008.html
+share/3dm2/en/AEN_0009.html
+share/3dm2/en/AEN_000A.html
+share/3dm2/en/AEN_000B.html
+share/3dm2/en/AEN_000C.html
+share/3dm2/en/AEN_000D.html
+share/3dm2/en/AEN_000E.html
+share/3dm2/en/AEN_000F.html
+share/3dm2/en/AEN_0019.html
+share/3dm2/en/AEN_001A.html
+share/3dm2/en/AEN_001E.html
+share/3dm2/en/AEN_001F.html
+share/3dm2/en/AEN_0021.html
+share/3dm2/en/AEN_0022.html
+share/3dm2/en/AEN_0023.html
+share/3dm2/en/AEN_0024.html
+share/3dm2/en/AEN_0025.html
+share/3dm2/en/AEN_0026.html
+share/3dm2/en/AEN_0027.html
+share/3dm2/en/AEN_0028.html
+share/3dm2/en/AEN_0029.html
+share/3dm2/en/AEN_002A.html
+share/3dm2/en/AEN_002B.html
+share/3dm2/en/AEN_002C.html
+share/3dm2/en/AEN_002D.html
+share/3dm2/en/AEN_002E.html
+share/3dm2/en/AEN_002F.html
+share/3dm2/en/AEN_0030.html
+share/3dm2/en/AEN_0032.html
+share/3dm2/en/AEN_0033.html
+share/3dm2/en/AEN_0034.html
+share/3dm2/en/AEN_0035.html
+share/3dm2/en/AEN_0036.html
+share/3dm2/en/AEN_0037.html
+share/3dm2/en/AEN_0038.html
+share/3dm2/en/AEN_0039.html
+share/3dm2/en/AEN_003A.html
+share/3dm2/en/AEN_003B.html
+share/3dm2/en/AEN_003C.html
+share/3dm2/en/AEN_003D.html
+share/3dm2/en/AEN_003E.html
+share/3dm2/en/AEN_003F.html
+share/3dm2/en/AEN_0040.html
+share/3dm2/en/AEN_0041.html
+share/3dm2/en/AEN_0042.html
+share/3dm2/en/AEN_0043.html
+share/3dm2/en/AEN_0044.html
+share/3dm2/en/AEN_0045.html
+share/3dm2/en/AEN_0046.html
+share/3dm2/en/AEN_0047.html
+share/3dm2/en/AEN_0048.html
+share/3dm2/en/AEN_0049.html
+share/3dm2/en/AEN_004A.html
+share/3dm2/en/AEN_004B.html
+share/3dm2/en/AEN_004C.html
+share/3dm2/en/AEN_004D.html
+share/3dm2/en/AEN_004E.html
+share/3dm2/en/AEN_004F.html
+share/3dm2/en/AEN_0050.html
+share/3dm2/en/AEN_0051.html
+share/3dm2/en/AEN_0052.html
+share/3dm2/en/AEN_0053.html
+share/3dm2/en/AEN_0055.html
+share/3dm2/en/AEN_0056.html
+share/3dm2/en/AEN_0057.html
+share/3dm2/en/AEN_0058.html
+share/3dm2/en/AEN_0059.html
+share/3dm2/en/AEN_005A.html
+share/3dm2/en/AEN_005B.html
+share/3dm2/en/AEN_005C.html
+share/3dm2/en/AEN_005D.html
+share/3dm2/en/AEN_005E.html
+share/3dm2/en/AEN_005F.html
+share/3dm2/en/AMCC-logo-larger.jpg
+share/3dm2/en/AMCC-logo-smaller.jpg
+share/3dm2/en/AMCC-logo.jpg
 share/3dm2/en/Alarms.html
+share/3dm2/en/App_Glossary.11.1.html
 share/3dm2/en/Battery_Backup.html
+share/3dm2/en/Config_Controller.5.1.html
+share/3dm2/en/Config_Controller.5.2.html
+share/3dm2/en/Config_Controller.5.3.html
+share/3dm2/en/Config_Controller.5.4.html
+share/3dm2/en/Config_Controller.5.5.html
+share/3dm2/en/Config_Controller.5.6.html
+share/3dm2/en/Config_Controller.5.7.html
+share/3dm2/en/Config_Controller.5.8.html
+share/3dm2/en/Config_Controller.5.9.html
+share/3dm2/en/Config_Units.6.1.html
+share/3dm2/en/Config_Units.6.10.html
+share/3dm2/en/Config_Units.6.11.html
+share/3dm2/en/Config_Units.6.12.html
+share/3dm2/en/Config_Units.6.13.html
+share/3dm2/en/Config_Units.6.14.html
+share/3dm2/en/Config_Units.6.15.html
+share/3dm2/en/Config_Units.6.16.html
+share/3dm2/en/Config_Units.6.17.html
+share/3dm2/en/Config_Units.6.18.html
+share/3dm2/en/Config_Units.6.19.html
+share/3dm2/en/Config_Units.6.2.html
+share/3dm2/en/Config_Units.6.20.html
+share/3dm2/en/Config_Units.6.21.html
+share/3dm2/en/Config_Units.6.22.html
+share/3dm2/en/Config_Units.6.23.html
+share/3dm2/en/Config_Units.6.24.html
+share/3dm2/en/Config_Units.6.25.html
+share/3dm2/en/Config_Units.6.26.html
+share/3dm2/en/Config_Units.6.27.html
+share/3dm2/en/Config_Units.6.3.html
+share/3dm2/en/Config_Units.6.4.html
+share/3dm2/en/Config_Units.6.5.html
+share/3dm2/en/Config_Units.6.6.html
+share/3dm2/en/Config_Units.6.7.html
+share/3dm2/en/Config_Units.6.8.html
+share/3dm2/en/Config_Units.6.9.html
 share/3dm2/en/Controller_Details.html
 share/3dm2/en/Controller_Settings.html
 share/3dm2/en/Controller_Summary.html
+share/3dm2/en/Copyright.12.1.html
 share/3dm2/en/Drive_Details.html
 share/3dm2/en/Drive_Information.html
+share/3dm2/en/Enclosure_Details.html
+share/3dm2/en/Enclosure_Information.html
+share/3dm2/en/Exclamation.gif
 share/3dm2/en/First.html
-share/3dm2/en/IX.html
+share/3dm2/en/Lightening.gif
+share/3dm2/en/MaintainController.8.1.html
+share/3dm2/en/MaintainController.8.10.html
+share/3dm2/en/MaintainController.8.11.html
+share/3dm2/en/MaintainController.8.12.html
+share/3dm2/en/MaintainController.8.2.html
+share/3dm2/en/MaintainController.8.3.html
+share/3dm2/en/MaintainController.8.4.html
+share/3dm2/en/MaintainController.8.5.html
+share/3dm2/en/MaintainController.8.6.html
+share/3dm2/en/MaintainController.8.7.html
+share/3dm2/en/MaintainController.8.8.html
+share/3dm2/en/MaintainController.8.9.html
+share/3dm2/en/Maintain_Units.7.1.html
+share/3dm2/en/Maintain_Units.7.10.html
+share/3dm2/en/Maintain_Units.7.11.html
+share/3dm2/en/Maintain_Units.7.12.html
+share/3dm2/en/Maintain_Units.7.13.html
+share/3dm2/en/Maintain_Units.7.14.html
+share/3dm2/en/Maintain_Units.7.15.html
+share/3dm2/en/Maintain_Units.7.16.html
+share/3dm2/en/Maintain_Units.7.17.html
+share/3dm2/en/Maintain_Units.7.18.html
+share/3dm2/en/Maintain_Units.7.19.html
+share/3dm2/en/Maintain_Units.7.2.html
+share/3dm2/en/Maintain_Units.7.20.html
+share/3dm2/en/Maintain_Units.7.21.html
+share/3dm2/en/Maintain_Units.7.22.html
+share/3dm2/en/Maintain_Units.7.23.html
+share/3dm2/en/Maintain_Units.7.24.html
+share/3dm2/en/Maintain_Units.7.25.html
+share/3dm2/en/Maintain_Units.7.26.html
+share/3dm2/en/Maintain_Units.7.27.html
+share/3dm2/en/Maintain_Units.7.3.html
+share/3dm2/en/Maintain_Units.7.4.html
+share/3dm2/en/Maintain_Units.7.5.html
+share/3dm2/en/Maintain_Units.7.6.html
+share/3dm2/en/Maintain_Units.7.7.html
+share/3dm2/en/Maintain_Units.7.8.html
+share/3dm2/en/Maintain_Units.7.9.html
 share/3dm2/en/Maintenance.html
+share/3dm2/en/Note.gif
+share/3dm2/en/OLH_3DM_2_First.html
 share/3dm2/en/Scheduling.html
-share/3dm2/en/TOC.html
+share/3dm2/en/Trbleshoot.10.1.html
+share/3dm2/en/Trbleshoot.10.2.html
+share/3dm2/en/Trbleshoot.10.3.html
+share/3dm2/en/Trbleshoot.10.4.html
+share/3dm2/en/Trbleshoot.10.5.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-3-05-3.gif
-share/3dm2/en/images/3DM_2_OLH-3-05-4.gif
+share/3dm2/en/error_messages.html
+share/3dm2/en/ix.html
+share/3dm2/en/scripts/expand.js
+share/3dm2/en/scripts/seealso.js
+share/3dm2/en/sqbullet.gif
+share/3dm2/en/toc.html
+share/3dm2/en/css/3DM-Intro.css
+share/3dm2/en/css/3DM_Ref.css
+share/3dm2/en/css/3ware_GetStarted.css
+share/3dm2/en/css/3ware_Intro.css
+share/3dm2/en/css/AboutThisHelp.css
+share/3dm2/en/css/App_Glossary.css
+share/3dm2/en/css/Config_Controller.css
+share/3dm2/en/css/Config_Units.css
+share/3dm2/en/css/Copyright.css
+share/3dm2/en/css/MaintainController.css
+share/3dm2/en/css/Maintain_Units.css
+share/3dm2/en/css/Trbleshoot.css
+share/3dm2/en/css/webworks.css
+share/3dm2/en/images/3DM-Intro.4.4.1.jpg
+share/3dm2/en/images/3DM-Intro.4.8.1.jpg
+share/3dm2/en/images/3DM-Settings_mac.JPG
+share/3dm2/en/images/3DM_Ref.9.10.4.jpg
+share/3dm2/en/images/3dm-Alarms-mac.jpg
+share/3dm2/en/images/3dm-Controller_Details-mac.jpg
+share/3dm2/en/images/3dm-Controller_Settings-mac.jpg
+share/3dm2/en/images/3dm-Controller_Summary-mac-full.jpg
+share/3dm2/en/images/3dm-Controller_Summary-mac.jpg
+share/3dm2/en/images/3dm-Create-unit-1-mac.gif
+share/3dm2/en/images/3dm-Drive_Information-mac.jpg
+share/3dm2/en/images/3dm-Enclosure_Detail_Page.jpg
+share/3dm2/en/images/3dm-Enclosure_Summary_Page-mac.jpg
+share/3dm2/en/images/3dm-Schedule-drop-down-options-mac.gif
+share/3dm2/en/images/3dm-Unit_Information-mac.jpg
+share/3dm2/en/images/3dm-Unit_Information_Details-mac.jpg
+share/3dm2/en/images/3dm-background-task-rate.jpg
+share/3dm2/en/images/3dm-controller-drop-down.jpg
+share/3dm2/en/images/3dm-create_unit_3.5mac.gif
+share/3dm2/en/images/3dm-deletedrivesuc-mac.gif
+share/3dm2/en/images/3dm-deletedunits-mac.gif
+share/3dm2/en/images/3dm-drill-downs-pc.jpg
+share/3dm2/en/images/3dm-drive-details-mac.JPG
+share/3dm2/en/images/3dm-maint-page-mac-with-callouts-2-buttons.jpg
+share/3dm2/en/images/3dm-maint-page-mac-with-callouts.jpg
+share/3dm2/en/images/3dm-maintenance-PC-with-multiple-statuses.gif
+share/3dm2/en/images/3dm-menu-mac.jpg
+share/3dm2/en/images/3dm-scheduduling-mac.JPG
+share/3dm2/en/images/3dm-schedule-select-type.gif
 share/3dm2/en/images/3dm-selected-drives-to-create.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
-share/3dm2/en/images/Migrate-2.gif
-share/3dm2/en/images/Migrate0-5.gif
+share/3dm2/en/images/3wUpdate-GetInfo.jpg
+share/3dm2/en/images/3wUpdate-NoFrm1.jpg
+share/3dm2/en/images/3wUpdate-Reboot.jpg
+share/3dm2/en/images/3ware-update-final-new.JPG
+share/3dm2/en/images/Config_Units.6.15.1.jpg
+share/3dm2/en/images/Mac-OS-warning-before-parition.png
+share/3dm2/en/images/MaintainController.8.12.2.jpg
+share/3dm2/en/images/MaintainController.8.4.2.jpg
+share/3dm2/en/images/MaintainController.8.4.3.jpg
+share/3dm2/en/images/MaintainController.8.4.4.jpg
+share/3dm2/en/images/MaintainController.8.4.5.jpg
+share/3dm2/en/images/MaintainController.8.4.7.jpg
+share/3dm2/en/images/MaintainController.8.5.1.jpg
+share/3dm2/en/images/Maintain_Units.7.24.1.jpg
+share/3dm2/en/images/Maintain_Units.7.25.1.jpg
 share/3dm2/en/images/RAID-0.gif
 share/3dm2/en/images/RAID-1.gif
+share/3dm2/en/images/RAID-10.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-unitkm.gif
+share/3dm2/en/images/RAID50Config.gif
+share/3dm2/en/images/RAID5Config_Mac.gif
+share/3dm2/en/images/RAID6Config.gif
+share/3dm2/en/images/WinAVAlarm_config.gif
+share/3dm2/en/images/WinAVAlarm_tray.gif
+share/3dm2/en/images/XP-53.jpg
+share/3dm2/en/images/XP-Update01.jpg
+share/3dm2/en/images/XP-Update02.jpg
+share/3dm2/en/images/XP-Update03.jpg
+share/3dm2/en/images/XP-Update04.jpg
+share/3dm2/en/images/XP-Update05.jpg
+share/3dm2/en/images/XP-Update07.jpg
+share/3dm2/en/images/XP-Update10.jpg
+share/3dm2/en/images/XP-Update12.jpg
 share/3dm2/en/images/alarms-sample-3dm.gif
-share/3dm2/en/images/amcc-logo.gif
-share/3dm2/en/images/amcc-logo.jpg
-share/3dm2/en/images/amcc-logo75.gif
-share/3dm2/en/images/amcc.png
+share/3dm2/en/images/bbu.gif
 share/3dm2/en/images/collapse.gif
+share/3dm2/en/images/controller-settings.gif
 share/3dm2/en/images/enable-write-cache.gif
 share/3dm2/en/images/expanded.gif
 share/3dm2/en/images/index.gif
 share/3dm2/en/images/indexx.gif
-share/3dm2/en/images/info-drill-downs.gif
-share/3dm2/en/images/logo.gif
-share/3dm2/en/images/menu-select.gif
 share/3dm2/en/images/next.gif
 share/3dm2/en/images/nextx.gif
 share/3dm2/en/images/on-off-schedule-buttons.gif
@@ -156,16 +318,16 @@ share/3dm2/en/images/seertlow.gif
 share/3dm2/en/images/seertup.gif
 share/3dm2/en/images/select-drive-during-rebuild-3dm.gif
 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
 @unexec unlink /etc/3dm2/3dm2.conf
 @unexec unlink /etc/3dm2/3dm2.pem
 @unexec unlink /etc/3dm2/msg
-@dirrmtry share/3dm2/en/scripts
-@dirrmtry share/3dm2/en/images
-@dirrmtry share/3dm2/en
-@dirrmtry share/3dm2
+@dirrm share/3dm2/en/css
+@dirrm share/3dm2/en/images
+@dirrm share/3dm2/en/scripts
+@dirrm share/3dm2/en
+@dirrm share/3dm2
 @unexec rmdir /etc/3dm2 2>/dev/null || true
 @dirrmtry etc/3dm2/msg
 @dirrmtry etc/3dm2