6 files changed, 75 insertions, 57 deletions

diff --git a/sysutils/3dm/Makefile b/sysutils/3dm/Makefile
index 95f286c79cce..8d6f0683272b 100644
--- a/sysutils/3dm/Makefile
+++ b/sysutils/3dm/Makefile
@@ -6,23 +6,23 @@
 #
 
 PORTNAME=	3dm
-PORTVERSION=	2.03.00.028
+PORTVERSION=	2.04.00.011
 PORTEPOCH=	1
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.3ware.com/download/Escalade9000Series/9.2.1.1/
-DISTNAME=	3dm2-freebsd-x86-9.2.1.1
+MASTER_SITES=	http://www.3ware.com/download/Escalade9000Series/9.3.0.1/
+DISTNAME=	3DM2-freebsd_5.4-9.3.0.1
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	3ware RAID controller monitoring daemon and web server
 
-USE_RC_SUBR=	yes
+USE_RC_SUBR=	3dm2.sh
 USE_REINPLACE=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 502010
-IGNORE=		is not supported in versions earlier than 5.2.1-RELEASE
+.if ${OSVERSION} < 504000
+IGNORE=		is not supported in versions earlier than 5.4-RELEASE
 .endif
 
 ONLY_FOR_ARCHS=	i386 amd64
@@ -31,45 +31,59 @@ WRKSRC=		${WRKDIR}
 
 SHAREDIR=	${PREFIX}/share/3dm2/en
 
-SED_SCRIPT=	-e 's,%%NAME%%,3dm2,g' \
-		-e 's:%%PREFIX%%:${PREFIX}:g' \
-		-e 's,%%RC_SUBR%%,${RC_SUBR},g'
-
 post-configure:
-	@${SED} ${SED_SCRIPT} ${FILESDIR}/3dm2.sh > ${WRKSRC}/3dm2.sh
-	@${SED} ${SED_SCRIPT} ${FILESDIR}/3dm2.conf.sample > ${WRKSRC}/3dm2.conf.sample
+	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' \
+	< ${FILESDIR}/3dm2.conf.sample > ${WRKSRC}/3dm2.conf.sample
 
 pre-install:
 	@cd ${WRKSRC}; ${TAR} zxf 3dm-bsd.tgz
 	@cd ${WRKSRC}; ${TAR} zxf 3dm-help.tgz
-	@${REINPLACE_CMD} -e 's|images/amcc-logo.gif|images/amcc-logo75.gif|g' ${WRKSRC}/*.html
+	@cd ${WRKSRC}; ${TAR} zxf 3dm-msg.tgz
+	@${REINPLACE_CMD} -e 's|images/amcc-logo.gif|images/amcc-logo75.gif|g' ${WRKSRC}/en/*.html
 
 do-install:
 
 .if !exists(${SHAREDIR}/images)
-	${MKDIR} ${SHAREDIR}/images
+	@${MKDIR} ${SHAREDIR}/images
 .endif
 
 .if !exists(${SHAREDIR}/scripts)
-	${MKDIR} ${SHAREDIR}/scripts
+	@${MKDIR} ${SHAREDIR}/scripts
+.endif
+
+	${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
+.else
+	${INSTALL_PROGRAM} ${WRKSRC}/3dm2.x86 ${PREFIX}/sbin/3dm2
 .endif
 
-	${INSTALL_DATA} ${WRKSRC}/*.html ${SHAREDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.css ${SHAREDIR}
-	${INSTALL_DATA} ${WRKSRC}/images/* ${SHAREDIR}/images
-	${INSTALL_DATA} ${WRKSRC}/scripts/*.js ${SHAREDIR}/scripts
-	${INSTALL_PROGRAM} ${WRKSRC}/3dm2 ${PREFIX}/sbin
-	${CHMOD} 500 ${PREFIX}/sbin/3dm2
+	@${CHMOD} 500 ${PREFIX}/sbin/3dm2
 
 .if !exists(/etc/3dm2)
-	${MKDIR} /etc/3dm2
+	@${MKDIR} /etc/3dm2
+.endif
+
+.if !exists(${PREFIX}/etc/3dm2)
+	@${MKDIR} ${PREFIX}/etc/3dm2
 .endif
 
-.if !exists(${PREFIX}/etc/3dm2.conf)
+.if !exists(${PREFIX}/etc/3dm2/msg)
+	@${MKDIR} ${PREFIX}/etc/3dm2/msg
+.endif
+
+	${INSTALL_DATA} ${WRKSRC}/tdm_msg_en ${PREFIX}/etc/3dm2/msg
+	${INSTALL_DATA} ${WRKSRC}/tw_msg_en ${PREFIX}/etc/3dm2/msg
+
+.if !exists(${PREFIX}/etc/3dm2/3dm2.conf)
 	@${ECHO} ""
 	@${ECHO} ""
 	@${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	@${ECHO} "           Don't forget to edit '${PREFIX}/etc/3dm2.conf'		"
+	@${ECHO} "        Don't forget to edit '${PREFIX}/etc/3dm2/3dm2.conf'		"
 	@${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 	@${ECHO} "             Visit https://`hostname`:888/		"
 	@${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
@@ -78,19 +92,17 @@ do-install:
 .endif
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/3dm2.conf.sample ${PREFIX}/etc/
-	[ -f ${PREFIX}/etc/3dm2.conf ] || \
-		${CP} ${PREFIX}/etc/3dm2.conf.sample \
-		${PREFIX}/etc/3dm2.conf
-	${INSTALL_SCRIPT} ${WRKSRC}/3dm2.sh ${PREFIX}/etc/rc.d/
-	${CHMOD} 600 ${PREFIX}/etc/3dm2.conf.sample ${PREFIX}/etc/3dm2.conf
-
-# The binary, "3dm2" looks for the config file in /etc/3dm2, which is lame.  The file
-# is placed in ${PREFIX}/etc/ (usually /usr/local/etc) and symlinked in /etc/3dm2
-# so that the binary can find it.
-
-	${LN} -s ${PREFIX}/etc/3dm2.conf /etc/3dm2/3dm2.conf
-	${LN} -s ${PREFIX}/etc/3dm2.pem /etc/3dm2/3dm2.pem
+	${INSTALL_DATA} ${WRKSRC}/3dm2.conf.sample ${PREFIX}/etc/3dm2/
+	[ -f ${PREFIX}/etc/3dm2/3dm2.conf ] || \
+		${CP} ${PREFIX}/etc/3dm2/3dm2.conf.sample \
+		${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
+
+	@${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
 
 	@${ECHO} ""
 	@${ECHO} "Add twdm2_enable=\"YES\" to /etc/rc.conf to run 3dm2 from startup."
diff --git a/sysutils/3dm/distinfo b/sysutils/3dm/distinfo
index d919ba7ce891..c54ca90b7fa1 100644
--- a/sysutils/3dm/distinfo
+++ b/sysutils/3dm/distinfo
@@ -1,2 +1,3 @@
-MD5 (3dm2-freebsd-x86-9.2.1.1.tgz) = 9b3899a885070a6598bae44046b5cd5f
-SIZE (3dm2-freebsd-x86-9.2.1.1.tgz) = 1299479
+MD5 (3DM2-freebsd_5.4-9.3.0.1.tgz) = c541ecb45e3eb01204f6e35109f5c82c
+SHA256 (3DM2-freebsd_5.4-9.3.0.1.tgz) = 0d44ce954e9f3b9f5174665e736321f5a1609ba3ed0e2900e79afa71432fcbc8
+SIZE (3DM2-freebsd_5.4-9.3.0.1.tgz) = 1458288
diff --git a/sysutils/3dm/files/3dm2.conf.sample b/sysutils/3dm/files/3dm2.conf.sample
index af6657eb6418..561c6027834a 100644
--- a/sysutils/3dm/files/3dm2.conf.sample
+++ b/sysutils/3dm/files/3dm2.conf.sample
@@ -11,5 +11,8 @@ Language 0
 Logger 0
 Refresh 5
 BGRate 3333333333333333
-MsgPath /var/log/3dm2.log
+MsgPath %%PREFIX%%/etc/3dm2/msg
 Help %%PREFIX%%/share/3dm2
+OEM 0
+AutoLogout 0
+CommandLog 0
diff --git a/sysutils/3dm/files/3dm2.sh b/sysutils/3dm/files/3dm2.sh.in
index 7f6f3eeae4e4..b0f9f0e72a2a 100644
--- a/sysutils/3dm/files/3dm2.sh
+++ b/sysutils/3dm/files/3dm2.sh.in
@@ -3,24 +3,24 @@
 # $FreeBSD$
 #
 
-# PROVIDE: %%NAME%%
+# PROVIDE: 3dm2
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
 # KEYWORD: FreeBSD shutdown
 
 #
-# Add the following lines to /etc/rc.conf to enable %%NAME%%:
+# Add the following lines to /etc/rc.conf to enable 3dm2:
 # twdm2_enable="YES"
 #
 
-. "%%RC_SUBR%%" 
+. %%RC_SUBR%%
 
 name=twdm2
 rcvar=`set_rcvar`
 
-start_precmd="twdm2_precmd"
+start_precmd=twdm2_precmd
 command="%%PREFIX%%/sbin/3dm2"
-required_files="%%PREFIX%%/etc/3dm2.conf"
+required_files=%%PREFIX%%/etc/3dm2/3dm2.conf
 
 twdm2_precmd()
 {
diff --git a/sysutils/3dm/pkg-install b/sysutils/3dm/pkg-install
index 394219c9560d..3cfdf38c2b69 100644
--- a/sysutils/3dm/pkg-install
+++ b/sysutils/3dm/pkg-install
@@ -4,12 +4,11 @@ if [ "$2" != "PRE-INSTALL" ]; then
 	exit 0
 fi
 
-#
-# "3dm2" looks for the config file in /etc/3dm2, which is lame.  The file is
-# placed in ${PREFIX}/etc/ (usually /usr/local/etc) and symlinked in /etc/3dm2
-# so that the binary can find it.
-#
+# 3ware lamely hardcode the locations of various things  
+
 	mkdir /etc/3dm2
-	ln -s ${PKG_PREFIX}/etc/3dm2.conf /etc/3dm2/3dm2.conf
-	ln -s ${PKG_PREFIX}/etc/3dm2.pem /etc/3dm2/3dm2.pem
+	mkdir -p ${PKG_PREFIX}/etc/3dm2/msg
+	ln -s ${PKG_PREFIX}/etc/3dm2/msg /etc/3dm2/msg
+	ln -s ${PKG_PREFIX}/etc/3dm2/3dm2.conf /etc/3dm2/3dm2.conf
+	ln -s ${PKG_PREFIX}/etc/3dm2/3dm2.pem /etc/3dm2/3dm2.pem
 exit 0
diff --git a/sysutils/3dm/pkg-plist b/sysutils/3dm/pkg-plist
index 38d53714000a..da1eec1f87fd 100644
--- a/sysutils/3dm/pkg-plist
+++ b/sysutils/3dm/pkg-plist
@@ -1,7 +1,9 @@
-etc/rc.d/3dm2.sh
-@unexec if cmp -s %D/etc/3dm2.conf.sample %D/etc/3dm2.conf; then rm -f %D/etc/3dm2.conf; fi
-etc/3dm2.conf.sample
-@exec [ -f %B/3dm2.conf ] || cp %B/%f %B/3dm2.conf
+@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
+etc/3dm2/msg/tdm_msg_en
+etc/3dm2/msg/tw_msg_en
 sbin/3dm2
 share/3dm2/en/3DM_2_OLH-1-01.html
 share/3dm2/en/3DM_2_OLH-1-02.html
@@ -136,4 +138,5 @@ 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 rmdir %D/share/3dm2/en/scripts %D/share/3dm2/en/images %D/share/3dm2/en %D/share/3dm2 /etc/3dm2 || true
+@unexec unlink /etc/3dm2/msg
+@unexec rmdir %D/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 2>/dev/null || true