3 files changed, 30 insertions, 17 deletions

diff --git a/sysutils/3dm/Makefile b/sysutils/3dm/Makefile
index 13972f278ebf..ab8f6b6477ab 100644
--- a/sysutils/3dm/Makefile
+++ b/sysutils/3dm/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	3dm
-PORTVERSION=	2.02.00.015
+PORTVERSION=	2.03.00.028
 PORTEPOCH=	1
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.3ware.com/download/Escalade9000Series/9.1.5.2/
-DISTNAME=	3dm-x86-bsd
+MASTER_SITES=	http://www.3ware.com/download/Escalade9000Series/9.2.1.1/
+DISTNAME=	3dm2-freebsd-x86-9.2.1.1
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
@@ -27,7 +27,7 @@ IGNORE=		"3ware 3ware ATA RAID (twe) is not supported in versions earlier than 4
 
 ONLY_FOR_ARCHS=	i386
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/x86
+WRKSRC=		${WRKDIR}
 
 SHAREDIR=	${PREFIX}/share/3dm2/en
 
@@ -36,12 +36,13 @@ SED_SCRIPT=	-e 's,%%NAME%%,3dm2,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} ${SED_SCRIPT} ${FILESDIR}/3dm2.sh > ${WRKSRC}/3dm2.sh
+	@${SED} ${SED_SCRIPT} ${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
 
 do-install:
 
@@ -53,10 +54,10 @@ do-install:
 	${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
+	${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
 
diff --git a/sysutils/3dm/distinfo b/sysutils/3dm/distinfo
index 426e60f5d9a8..d919ba7ce891 100644
--- a/sysutils/3dm/distinfo
+++ b/sysutils/3dm/distinfo
@@ -1,2 +1,2 @@
-MD5 (3dm-x86-bsd.tgz) = 9a245e74d48848aedbdc0b5a02f8f1c8
-SIZE (3dm-x86-bsd.tgz) = 781056
+MD5 (3dm2-freebsd-x86-9.2.1.1.tgz) = 9b3899a885070a6598bae44046b5cd5f
+SIZE (3dm2-freebsd-x86-9.2.1.1.tgz) = 1299479
diff --git a/sysutils/3dm/pkg-plist b/sysutils/3dm/pkg-plist
index cc47153fc74a..38d53714000a 100644
--- a/sysutils/3dm/pkg-plist
+++ b/sysutils/3dm/pkg-plist
@@ -37,6 +37,7 @@ 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-3-01.html
 share/3dm2/en/3DM_2_OLH-3-02.html
 share/3dm2/en/3DM_2_OLH-3-03.html
@@ -51,6 +52,12 @@ share/3dm2/en/3DM_2_OLH-3-11.html
 share/3dm2/en/3DM_2_OLH-3-12.html
 share/3dm2/en/3DM_2_OLH-3-13.html
 share/3dm2/en/3DM_2_OLH-3-14.html
+share/3dm2/en/3DM_2_OLH-3-15.html
+share/3dm2/en/3DM_2_OLH-3-16.html
+share/3dm2/en/3DM_2_OLH-3-17.html
+share/3dm2/en/3DM_2_OLH-3-18.html
+share/3dm2/en/3DM_2_OLH-3-19.html
+share/3dm2/en/3DM_2_OLH-3-20.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
@@ -73,6 +80,8 @@ 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-4-22.html
+share/3dm2/en/3DM_2_OLH-4-23.html
+share/3dm2/en/3DM_2_OLH-4-24.html
 share/3dm2/en/3DM_2_OLH-5-1.html
 share/3dm2/en/3DM_2_OLH-5-2.html
 share/3dm2/en/3DM_2_OLH-5-3.html
@@ -83,18 +92,21 @@ share/3dm2/en/IX.html
 share/3dm2/en/TOC.html
 share/3dm2/en/catalog.css
 share/3dm2/en/document.css
-share/3dm2/en/images/3DM_2_OLH-3-08-2.gif
-share/3dm2/en/images/3DM_2_OLH-3-09-3.gif
-share/3dm2/en/images/3DM_2_OLH-3-10-4.gif
-share/3dm2/en/images/3DM_2_OLH-3-12-5.gif
-share/3dm2/en/images/3DM_2_OLH-3-13-6.gif
 share/3dm2/en/images/3dm-selected-drives-to-create.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/3DM_2_OLH-3-10-3.gif
+share/3dm2/en/images/3DM_2_OLH-3-13-4.gif
+share/3dm2/en/images/3DM_2_OLH-3-14-5.gif
+share/3dm2/en/images/3DM_2_OLH-3-15-6.gif
+share/3dm2/en/images/3DM_2_OLH-3-17-7.gif
+share/3dm2/en/images/3DM_2_OLH-3-18-8.gif
 share/3dm2/en/images/AMCC-logo.GIF
 share/3dm2/en/images/AMCC-logo.jpg
 share/3dm2/en/images/AMCC.png
+share/3dm2/en/images/Migrate-2.gif
+share/3dm2/en/images/Migrate0-5.gif
 share/3dm2/en/images/RAID-50-12-drives-select-drives-per-unit.gif
 share/3dm2/en/images/amcc-logo75.gif
 share/3dm2/en/images/collapse.gif