svn commit: r417677 - in head/sysutils/3dm: . files

[Kurt Jaeger]

Author: pi
Date: Mon Jun 27 19:29:07 2016
New Revision: 417677
URL: https://svnweb.freebsd.org/changeset/ports/417677

Log:
  sysutils/3dm: fix hostname in pkg-message, make package reproducible
  
  PR:		209864
  Reported by:	emaste
  Submitted by:	takefu at airport.fm (maintainer)

Modified:
  head/sysutils/3dm/Makefile
  head/sysutils/3dm/distinfo
  head/sysutils/3dm/files/pkg-message.in
  head/sysutils/3dm/pkg-descr

Modified: head/sysutils/3dm/Makefile
==============================================================================
--- head/sysutils/3dm/Makefile	Mon Jun 27 19:22:08 2016	(r417676)
+++ head/sysutils/3dm/Makefile	Mon Jun 27 19:29:07 2016	(r417677)
@@ -3,7 +3,7 @@
 
 PORTNAME=	3dm
 PORTVERSION=	2.11.00.021
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.avagotech.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/
@@ -15,37 +15,34 @@ COMMENT=	3ware RAID controller monitorin
 
 LICENSE=	3dm
 LICENSE_NAME=	AVAGO
-LICENSE_TEXT=	Source recipient must acknowledge license. Reproduction or redistribution prohibited. See http://www.avagotech.com/products/server-storage/raid-controllers/3ware-sas-9750-24i4e
+LICENSE_TEXT=	Source recipient must acknowledge license.\
+		Reproduction or redistribution prohibited.\
+		See http://www.avagotech.com/cs/Satellite?pagename=AVG2/Utilities/EulaMsg
 LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell auto-accept
 
 USES=		zip
 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=		${WRKSRC}/7x
-HELPSRC=	${WRKSRC}/en
-HELPDIR=	${DATADIR}2/help/en
 MSGDIR=		${ETCDIR}2/msg
 
 post-extract:
-	@${TAR} -xzf ${WRKSRC}/tdmCliBSD.tgz -C ${WRKSRC}
-	@${TAR} -xzf ${WRKSRC}/tdm2Help.tgz -C ${WRKSRC}
-	@${TAR} -xzf ${WRKSRC}/tdm2Msg.tgz -C ${WRKSRC}
+	@${TAR} xzf ${WRKSRC}/tdmCliBSD.tgz -C${WRKSRC}
+	@${TAR} xzf ${WRKSRC}/tdm2Help.tgz -C${WRKSRC}
+	@${TAR} xzf ${WRKSRC}/tdm2Msg.tgz -C${WRKSRC}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}2 ${STAGEDIR}${MSGDIR}
-	@cd ${HELPSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${HELPDIR}
-	${INSTALL_PROGRAM} ${BINSRC}/3dm2.${ARCH:S,i386,x86,:S,amd64,x86_64,} \
+	@(cd ${WRKSRC}/en && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}2/help/en)
+	${INSTALL_PROGRAM} ${WRKSRC}/7x/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} ${WRKDIR}/3dm2.conf.sample ${STAGEDIR}${ETCDIR}2
 
 # 3ware uses a hardcoded config dir location that doesn't match hier(9)
-
 	@${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)

Modified: head/sysutils/3dm/distinfo
==============================================================================
--- head/sysutils/3dm/distinfo	Mon Jun 27 19:22:08 2016	(r417676)
+++ head/sysutils/3dm/distinfo	Mon Jun 27 19:29:07 2016	(r417677)
@@ -1,2 +1,3 @@
+TIMESTAMP = 1465966966
 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

Modified: head/sysutils/3dm/files/pkg-message.in
==============================================================================
--- head/sysutils/3dm/files/pkg-message.in	Mon Jun 27 19:22:08 2016	(r417676)
+++ head/sysutils/3dm/files/pkg-message.in	Mon Jun 27 19:29:07 2016	(r417677)
@@ -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://localhost:888/

Modified: head/sysutils/3dm/pkg-descr
==============================================================================
--- head/sysutils/3dm/pkg-descr	Mon Jun 27 19:22:08 2016	(r417676)
+++ head/sysutils/3dm/pkg-descr	Mon Jun 27 19:29:07 2016	(r417677)
@@ -2,4 +2,4 @@
 your 3ware RAID arrays. In the event of a hardware failure, 3DM 2 can
 automatically notify you via email.
 
-WWW: http://www.3ware.com/support/
+WWW: http://www.avagotech.com/support/