6 files changed, 25 insertions, 71 deletions

diff --git a/sysutils/3dm/Makefile b/sysutils/3dm/Makefile
index bf5b0d5b48e8..97d10dba5c04 100644
--- a/sysutils/3dm/Makefile
+++ b/sysutils/3dm/Makefile
@@ -2,75 +2,48 @@
 # $FreeBSD$
 
 PORTNAME=	3dm
-PORTVERSION=	2.11.00.019
+PORTVERSION=	2.11.00.021
 PORTEPOCH=	1
 CATEGORIES=	sysutils
-MASTER_SITES=	http://a.aranea.brtsvcs.net/3dm2/ \
-		http://b.aranea.brtsvcs.net/3dm2/
-DISTFILES=	tdmCliBSD_${PORTVERSION}.tar.gz
+MASTER_SITES=	http://www.lsi.com/downloads/Public/SATA/SATA%20Common%20Files/3DM2_CLI-freebsd_10.2.2.1_9.5.5.1.zip?source=1/
+DISTFILES=	3DM2_CLI-freebsd_10.2.2.1_9.5.5.1.zip
 DIST_SUBDIR=	3dm2
 
 MAINTAINER=	takefu@airport.fm
 COMMENT=	3ware RAID controller monitoring daemon and web server
 
-USE_RC_SUBR=	3dm2
-
-SUB_FILES=	pkg-message
-
-OPTIONS_DEFINE=	SSLFIX
-SSLFIX_DESC=	Install KB16625-patched binaries
-OPTIONS_DEFAULT=	SSLFIX
+RESTRICTED=	Source recipient must acknowledge license. Reproduction or redistribution prohibited. See http://www.lsi.com/Pages/user/eula.aspx
 
-.include <bsd.port.options.mk>
-
-.if !empty(PORT_OPTIONS:MSSLFIX)
-DISTFILES+=	kb16625_${PORTVERSION}.tar.gz
-BINPREFIX=	${WRKSRC}/kb16625
-.else
-BINPREFIX=	${WRKSRC}
-.endif
+FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES}
 
+USE_RC_SUBR=	3dm2
+SUB_FILES=	pkg-message 3dm2.conf.sample
+SUB_LIST=	HOSTNAME=`hostname`
 ONLY_FOR_ARCHS=	i386 amd64
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
-
-BINSRC=		${BINPREFIX}/7x
+BINSRC=		${WRKSRC}/7x
 HELPSRC=	${WRKSRC}/en
-HELPDIR=	${PREFIX}/share/3dm2/help/en
-ETCDIR=		${PREFIX}/etc/3dm2
-MSGDIR=		${ETCDIR}/msg
+HELPDIR=	${DATADIR}2/help/en
+MSGDIR=		${ETCDIR}2/msg
 
 post-extract:
-	@${TAR} zxf ${WRKSRC}/tdm2Help.tgz -C ${WRKSRC}
-	@${TAR} zxf ${WRKSRC}/tdm2Msg.tgz -C ${WRKSRC}
-
-post-configure:
-	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' \
-	< ${FILESDIR}/3dm2.conf.sample > ${WRKSRC}/3dm2.conf.sample
+	@${TAR} -xzf ${WRKSRC}/tdmCliBSD.tgz -C ${WRKSRC}
+	@${TAR} -xzf ${WRKSRC}/tdm2Help.tgz -C ${WRKSRC}
+	@${TAR} -xzf ${WRKSRC}/tdm2Msg.tgz -C ${WRKSRC}
 
 do-install:
-.for i in ${ETCDIR} ${MSGDIR} ${HELPDIR} \
-    ${HELPDIR}/css ${HELPDIR}/images ${HELPDIR}/scripts
-	${MKDIR} ${STAGEDIR}${PREFIX}${i}
-	# XXX rene not sure why ${PREFIX} is ommitted from ${i} here
-.endfor
-	${INSTALL_DATA} ${HELPSRC}/*.html ${STAGEDIR}${HELPDIR}
-	${INSTALL_DATA} ${HELPSRC}/*.gif ${STAGEDIR}${HELPDIR}
-	${INSTALL_DATA} ${HELPSRC}/*.jpg ${STAGEDIR}${HELPDIR}
-	${INSTALL_DATA} ${HELPSRC}/css/* ${STAGEDIR}${HELPDIR}/css
-	${INSTALL_DATA} ${HELPSRC}/images/* ${STAGEDIR}${HELPDIR}/images
-	${INSTALL_DATA} ${HELPSRC}/scripts/* ${STAGEDIR}${HELPDIR}/scripts
-
-	${INSTALL_PROGRAM} ${BINSRC}/3dm2.${ARCH:S,i386,x86,:S,amd64,x86_64,}\
+	@${MKDIR} ${STAGEDIR}${ETCDIR}2 ${STAGEDIR}${MSGDIR}
+	@cd ${HELPSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${HELPDIR}
+	${INSTALL_PROGRAM} ${BINSRC}/3dm2.${ARCH:S,i386,x86,:S,amd64,x86_64,} \
 		${STAGEDIR}${PREFIX}/sbin/3dm2
-
 	${INSTALL_DATA} ${WRKSRC}/tdm_msg_en ${STAGEDIR}${MSGDIR}
 	${INSTALL_DATA} ${WRKSRC}/tw_msg_en ${STAGEDIR}${MSGDIR}
-	${INSTALL_DATA} ${WRKSRC}/3dm2.conf.sample ${STAGEDIR}${ETCDIR}
+	${INSTALL_DATA} ${WRKSRC}/3dm2.conf.sample ${STAGEDIR}${ETCDIR}2
 
 # 3ware uses a hardcoded config dir location that doesn't match hier(9)
 
-	${MKDIR} ${STAGEDIR}/etc/3dm2
+	@${MKDIR} ${STAGEDIR}/etc/3dm2
 	(cd ${STAGEDIR} && ${LN} -s ${PREFIX}/etc/3dm2/3dm2.conf etc/3dm2/3dm2.conf)
 	(cd ${STAGEDIR} && ${LN} -s ${PREFIX}/etc/3dm2/3dm2.pem etc/3dm2/3dm2.pem)
 
diff --git a/sysutils/3dm/distinfo b/sysutils/3dm/distinfo
index 934308a91575..9d156981270a 100644
--- a/sysutils/3dm/distinfo
+++ b/sysutils/3dm/distinfo
@@ -1,4 +1,2 @@
-SHA256 (3dm2/tdmCliBSD_2.11.00.019.tar.gz) = 70b8ccd1b8b8f3e89fd19d5666e27c7cc86a3b78a240dbb58e3189cb920dde95
-SIZE (3dm2/tdmCliBSD_2.11.00.019.tar.gz) = 9987174
-SHA256 (3dm2/kb16625_2.11.00.019.tar.gz) = ce61fe3cf1a3a83572c7d008408f55e77e02d21aa908d6e2dad50e4aaf1e4c60
-SIZE (3dm2/kb16625_2.11.00.019.tar.gz) = 4120297
+SHA256 (3dm2/3DM2_CLI-freebsd_10.2.2.1_9.5.5.1.zip) = 0f9445288949973f454c6f7bd7aaace32469ecce80854a4318b7c01117e468d0
+SIZE (3dm2/3DM2_CLI-freebsd_10.2.2.1_9.5.5.1.zip) = 12159916
diff --git a/sysutils/3dm/files/3dm2.conf.sample b/sysutils/3dm/files/3dm2.conf.sample.in
index 1497fc8de941..1497fc8de941 100644
--- a/sysutils/3dm/files/3dm2.conf.sample
+++ b/sysutils/3dm/files/3dm2.conf.sample.in
diff --git a/sysutils/3dm/files/pkg-message.in b/sysutils/3dm/files/pkg-message.in
index d7389b935fca..7fdf21667e90 100644
--- a/sysutils/3dm/files/pkg-message.in
+++ b/sysutils/3dm/files/pkg-message.in
@@ -2,4 +2,4 @@
 To run 3DM2 at startup, add twdm2_enable="YES" to your /etc/rc.conf.
 
         Do not forget to edit '%%PREFIX%%/etc/3dm2/3dm2.conf'
-        Visit https://`hostname`:888/
+        Visit https://%%HOSTNAME%%:888/
diff --git a/sysutils/3dm/pkg-install b/sysutils/3dm/pkg-install
deleted file mode 100644
index 9fa7acf24246..000000000000
--- a/sysutils/3dm/pkg-install
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-# 3ware hardcoded /etc/3dm2 into the binary, so we need to fake it
-# in order to meet hier(9).
-
-case $2 in
-POST-INSTALL)
-	mkdir /etc/3dm2
-	ln -s ${PKG_PREFIX}/etc/3dm2/3dm2.conf /etc/3dm2/3dm2.conf
-	ln -s ${PKG_PREFIX}/etc/3dm2/3dm2.pem /etc/3dm2/3dm2.pem
-	;;
-*)
-	;;
-esac
-exit 0
diff --git a/sysutils/3dm/pkg-plist b/sysutils/3dm/pkg-plist
index c056399d5280..1d082e9bb26f 100644
--- a/sysutils/3dm/pkg-plist
+++ b/sysutils/3dm/pkg-plist
@@ -1,9 +1,7 @@
 @stopdaemon 3dm2
-@unexec if cmp -s %D/etc/3dm2/3dm2.conf.sample %D/etc/3dm2/3dm2.conf; then rm -f %D/etc/3dm2/3dm2.conf; fi
-@mode 0400
-etc/3dm2/3dm2.conf.sample
+@mode u+r
+@sample etc/3dm2/3dm2.conf.sample
 @mode
-@exec if [ ! -f %B/3dm2.conf ] ; then cp -p %D/%F %B/3dm2.conf && chmod 0600 %B/3dm2.conf; fi
 etc/3dm2/msg/tdm_msg_en
 etc/3dm2/msg/tw_msg_en
 sbin/3dm2
@@ -383,8 +381,8 @@ share/3dm2/help/en/toc.html
 @cwd /
 etc/3dm2/3dm2.conf
 etc/3dm2/3dm2.pem
+@dirrm etc/3dm2
 @cwd
-@unexec rmdir /etc/3dm2 2>/dev/null || true
 @dirrmtry etc/3dm2/msg
 @dirrmtry etc/3dm2
 @dirrmtry share/3dm2/help/en/css