Attachment 143859 Details for Bug 191115 – Add patch file

Add patch file

3dm-2.11.00.021.patch (text/x-c), 3.88 KB, created by takefu on 2014-06-17 03:22:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: takefu

Created: 2014-06-17 03:22:45 UTC

Size: 3.88 KB

patch

obsolete

>ï»¿diff -ruN /usr/ports/sysutils/3dm/Makefile ./Makefile
>--- /usr/ports/sysutils/3dm/Makefile	2014-06-05 18:41:33.000000000 +0900
>+++ ./Makefile	2014-06-17 12:08:57.000000000 +0900
>@@ -2,45 +2,38 @@
> # $FreeBSD: head/sysutils/3dm/Makefile 356623 2014-06-05 09:41:33Z cs $
> 
> 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
>+RESTRICTED=	Source recipient must acknowledge license. Reproduction or redistribution prohibited. See http://www.lsi.com/Pages/user/eula.aspx
>+
>+FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES}
> 
>+USE_RC_SUBR=	3dm2
> SUB_FILES=	pkg-message
>+SUB_LIST=	HOSTNAME=`hostname`
> 
>-OPTIONS_DEFINE=	SSLFIX
>-SSLFIX_DESC=	Install KB16625-patched binaries
>-OPTIONS_DEFAULT=	SSLFIX
>-
>-.include <bsd.port.options.mk>
>-
>-.if !empty(PORT_OPTIONS:MSSLFIX)
>-DISTFILES+=	kb16625_${PORTVERSION}.tar.gz
>-BINPREFIX=	${WRKSRC}/kb16625
>-.else
>-BINPREFIX=	${WRKSRC}
>-.endif
>+.include <bsd.port.pre.mk>
> 
> 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
> 
> post-extract:
>+	@${TAR} zxf ${WRKSRC}/tdmCliBSD.tgz -C ${WRKSRC}
> 	@${TAR} zxf ${WRKSRC}/tdm2Help.tgz -C ${WRKSRC}
> 	@${TAR} zxf ${WRKSRC}/tdm2Msg.tgz -C ${WRKSRC}
> 
>@@ -51,8 +44,8 @@
> 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
>+	${MKDIR} ${STAGEDIR}${i}
>+	# XXX rene not sure why ${STAGEDIR} is ommitted from ${i} here
> .endfor
> 	${INSTALL_DATA} ${HELPSRC}/*.html ${STAGEDIR}${HELPDIR}
> 	${INSTALL_DATA} ${HELPSRC}/*.gif ${STAGEDIR}${HELPDIR}
>diff -ruN /usr/ports/sysutils/3dm/distinfo ./distinfo
>--- /usr/ports/sysutils/3dm/distinfo	2014-01-23 00:30:13.000000000 +0900
>+++ ./distinfo	2014-03-21 16:29:07.000000000 +0900
>@@ -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 -ruN /usr/ports/sysutils/3dm/files/pkg-message.in ./files/pkg-message.in
>--- /usr/ports/sysutils/3dm/files/pkg-message.in	2014-04-06 22:26:24.000000000 +0900
>+++ ./files/pkg-message.in	2014-04-07 08:12:25.000000000 +0900
>@@ -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 -ruN /usr/ports/sysutils/3dm/pkg-install ./pkg-install
>--- /usr/ports/sysutils/3dm/pkg-install	2014-01-23 00:52:06.000000000 +0900
>+++ ./pkg-install	2014-04-07 08:54:16.000000000 +0900
>@@ -5,9 +5,11 @@
> 
> 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
>+	if [ ! -d /etc/3dm2 ] ; then
>+		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
>+	fi
> 	;;
> *)
> 	;;

Actions: View

Attachments on bug 191115: 143859 | 145138