Attachment 122969 Details for Bug 166233 – 3dm2.patch

[patch] 3dm2.patch

3dm2.patch (text/plain), 7.96 KB, created by ports.maintainer on 2012-03-20 10:36:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ports.maintainer

Created: 2012-03-20 10:36:24 UTC

Size: 7.96 KB

patch

obsolete

>--- Makefile.orig	2010-07-01 04:47:55.000000000 -0700
>+++ Makefile	2012-03-20 03:04:49.000000000 -0700
>@@ -6,17 +6,28 @@
> #
> 
> PORTNAME=	3dm
>-PORTREVISION=	1
>+PORTVERSION=	2.11.00.019
> PORTEPOCH=	1
> CATEGORIES=	sysutils
>-MASTER_SITES=	http://www.lsi.com/DistributionSystem/AssetDocument/ \
>-		http://vivi.cat.pdx.edu/3dm2/
>+MASTER_SITES=	http://shibboleet.com/3dm2/ \
>+		http://b.aranea.brtsvcs.net/3dm2/
>+DISTFILES=	tdmCliBSD_${PORTVERSION}.tar.gz
> 
> MAINTAINER=	ports.maintainer@evilphi.com
> COMMENT=	3ware RAID controller monitoring daemon and web server
> 
> USE_RC_SUBR=	3dm2.sh
>-USE_ZIP=	yes
>+
>+OPTIONS=	SSLFIX "Install KB16625-patched binaries" On
>+
>+.include <bsd.port.options.mk>
>+
>+.if defined(WITH_SSLFIX)
>+DISTFILES+=	kb16625_${PORTVERSION}.tar.gz
>+BINPREFIX=	${WRKSRC}/kb16625
>+.else
>+BINPREFIX=	${WRKSRC}
>+.endif
> 
> .include <bsd.port.pre.mk>
> 
>@@ -25,14 +36,10 @@
> 
> NO_WRKSUBDIR=	yes
> 
>-.if ${OSVERSION} < 800000
>-PORTVERSION=	2.11.00.009
>-DISTFILES=	3DM2_CLI-FreeBSD-10.1.zip
>-BINSRC=		${WRKSRC}
>+.if ${OSVERSION} > 700000
>+BINSRC=		${BINPREFIX}/7x
> .else
>-PORTVERSION=	2.09.01.004
>-DISTFILES=	3DM2_CLI-Linux-non-java-installer-9.5.3.zip
>-BINSRC=		${WRKSRC}/7x
>+BINSRC=		${BINPREFIX}/6x
> .endif
> 
> .if ${ARCH} == "i386"
>@@ -48,7 +55,6 @@
> 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}
> 
>@@ -85,9 +91,9 @@
> 	@${ECHO} ""
> 	@${ECHO} ""
> 	@${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
>-	@${ECHO} "        Don't forget to edit '${PREFIX}/etc/3dm2/3dm2.conf'		"
>+	@${ECHO} "        Don't forget to edit '${PREFIX}/etc/3dm2/3dm2.conf'"
> 	@${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
>-	@${ECHO} "             Visit https://`hostname`:888/		"
>+	@${ECHO} "             Visit https://`hostname`:888/"
> 	@${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
> 	@${ECHO} ""
> 	@${ECHO} ""
>--- distinfo.orig	2012-03-13 15:15:45.000000000 -0700
>+++ distinfo	2012-03-20 03:05:19.000000000 -0700
>@@ -1,4 +1,4 @@
>-SHA256 (3DM2_CLI-Linux-non-java-installer-9.5.3.zip) = 8b912cb4ece56c65b148d8c467376aa8c13443e2d718b3a8afed86fa9eccabab
>-SIZE (3DM2_CLI-Linux-non-java-installer-9.5.3.zip) = 7626223
>-SHA256 (3DM2_CLI-FreeBSD-10.1.zip) = 5c0b2376ed61a0039c7567e0314d2c9d295fbb2641b5c87f9c46be7790d4d1aa
>-SIZE (3DM2_CLI-FreeBSD-10.1.zip) = 5592890
>+SHA256 (tdmCliBSD_2.11.00.019.tar.gz) = 70b8ccd1b8b8f3e89fd19d5666e27c7cc86a3b78a240dbb58e3189cb920dde95
>+SIZE (tdmCliBSD_2.11.00.019.tar.gz) = 9987174
>+SHA256 (kb16625_2.11.00.019.tar.gz) = 204732cd91279a1ab37d423f283431ef6287840f324352586e514b6932e32f83
>+SIZE (kb16625_2.11.00.019.tar.gz) = 4120297
>--- pkg-plist.orig	2010-06-24 00:58:39.000000000 -0700
>+++ pkg-plist	2012-03-20 02:29:51.000000000 -0700
>@@ -16,6 +16,7 @@
> share/3dm2/help/en/3DM-Intro.4.18.html
> share/3dm2/help/en/3DM-Intro.4.19.html
> share/3dm2/help/en/3DM-Intro.4.2.html
>+share/3dm2/help/en/3DM-Intro.4.20.html
> share/3dm2/help/en/3DM-Intro.4.3.html
> share/3dm2/help/en/3DM-Intro.4.4.html
> share/3dm2/help/en/3DM-Intro.4.5.html
>@@ -25,6 +26,9 @@
> share/3dm2/help/en/3DM-Intro.4.9.html
> share/3dm2/help/en/3DM2_Settings.html
> share/3dm2/help/en/3DM_Ref.10.1.html
>+share/3dm2/help/en/3ware_GetStarted.3.2.html
>+share/3dm2/help/en/3ware_GetStarted.3.3.html
>+share/3dm2/help/en/3ware_GetStarted.3.4.html
> share/3dm2/help/en/3ware_Intro.2.1.html
> share/3dm2/help/en/3ware_Intro.2.10.html
> share/3dm2/help/en/3ware_Intro.2.11.html
>@@ -185,7 +189,6 @@
> share/3dm2/help/en/Config_Units.6.24.html
> share/3dm2/help/en/Config_Units.6.25.html
> share/3dm2/help/en/Config_Units.6.26.html
>-share/3dm2/help/en/Config_Units.6.27.html
> share/3dm2/help/en/Config_Units.6.3.html
> share/3dm2/help/en/Config_Units.6.4.html
> share/3dm2/help/en/Config_Units.6.5.html
>@@ -221,8 +224,6 @@
> share/3dm2/help/en/LSI-logo.jpg
> share/3dm2/help/en/Lightening.gif
> share/3dm2/help/en/MaintainController.8.1.html
>-share/3dm2/help/en/MaintainController.8.10.html
>-share/3dm2/help/en/MaintainController.8.11.html
> share/3dm2/help/en/MaintainController.8.2.html
> share/3dm2/help/en/MaintainController.8.3.html
> share/3dm2/help/en/MaintainController.8.4.html
>@@ -230,7 +231,6 @@
> share/3dm2/help/en/MaintainController.8.6.html
> share/3dm2/help/en/MaintainController.8.7.html
> share/3dm2/help/en/MaintainController.8.8.html
>-share/3dm2/help/en/MaintainController.8.9.html
> share/3dm2/help/en/Maintain_Units.7.1.html
> share/3dm2/help/en/Maintain_Units.7.10.html
> share/3dm2/help/en/Maintain_Units.7.11.html
>@@ -294,7 +294,7 @@
> share/3dm2/help/en/error_messages.html
> share/3dm2/help/en/images/3DM-Intro.4.4.1.jpg
> share/3dm2/help/en/images/3DM-Intro.4.8.1.jpg
>-share/3dm2/help/en/images/3bm_enclosure_screen_with_alarm_activated.jpg
>+share/3dm2/help/en/images/3dm-certificate_message.jpg
> share/3dm2/help/en/images/3dm-maint-page-mac-with-callouts-2-buttons.jpg
> share/3dm2/help/en/images/3dm-maint-page-mac-with-callouts.jpg
> share/3dm2/help/en/images/3dm-menu-mac.jpg
>@@ -306,26 +306,35 @@
> share/3dm2/help/en/images/3dm_controller_settings_page_with_BTAP-with-callout.png
> share/3dm2/help/en/images/3dm_controller_settings_page_with_BTAP_warning-boxes.png
> share/3dm2/help/en/images/3dm_controller_settings_with_read_cache_options-callout.png
>+share/3dm2/help/en/images/3dm_enclosure_screen_with_alarm_activated.JPG
> share/3dm2/help/en/images/3dm_enclosure_support_with_alarm_activated.jpg
> share/3dm2/help/en/images/951_CreateUnit_3DM.jpg
>-share/3dm2/help/en/images/9690_Alarms.png
>-share/3dm2/help/en/images/9690_ContollerPhySummary.png
>-share/3dm2/help/en/images/9690_ControllerDetails.png
>-share/3dm2/help/en/images/9690_ControllerSummary.png
> share/3dm2/help/en/images/9690_DriveInformation.png
> share/3dm2/help/en/images/9690_EnclosureDetails_Full.jpg
> share/3dm2/help/en/images/9690_ExtraDriveInfo.png
> share/3dm2/help/en/images/9690_MIgrate.png
> share/3dm2/help/en/images/9690_Scheduling_9.5.png
> share/3dm2/help/en/images/9750_ContollerPhySummary.png
>-share/3dm2/help/en/images/9750_DriveInformationLIst.png
>+share/3dm2/help/en/images/9750_Controller Details.PNG
>+share/3dm2/help/en/images/9750_ControllerSummary.png
>+share/3dm2/help/en/images/9750_DeletedUnit-result.png
>+share/3dm2/help/en/images/9750_DeletingUnit.png
>+share/3dm2/help/en/images/9750_Drive InformationLIst.png
> share/3dm2/help/en/images/9750_Enclosure_Summary_Page.jpg
> share/3dm2/help/en/images/9750_Maintenance.png
>+share/3dm2/help/en/images/9750_RemovingDrive.png
> share/3dm2/help/en/images/9750_UnitInformaiton.png
> share/3dm2/help/en/images/9750_UnitInformaiton2.png
>+share/3dm2/help/en/images/Alarms.JPG
> share/3dm2/help/en/images/Config_Units.6.17.1.jpg
>+share/3dm2/help/en/images/Mac-OS-define-partition-1.jpg
>+share/3dm2/help/en/images/Mac-OS-selecting-partition-scheme.jpg
>+share/3dm2/help/en/images/Mac-OS-warning-before-parition.jpg
>+share/3dm2/help/en/images/MacOS-msg-initialize.jpg
>+share/3dm2/help/en/images/Mac_disk_utility_Partition_tab.jpg
> share/3dm2/help/en/images/Maintain_Units.7.31.1.jpg
> share/3dm2/help/en/images/Maintain_Units.7.32.1.jpg
>+share/3dm2/help/en/images/Partitioning-in-progress.JPG
> share/3dm2/help/en/images/RAID-0.gif
> share/3dm2/help/en/images/RAID-1.gif
> share/3dm2/help/en/images/RAID-10.gif
>@@ -338,16 +347,14 @@
> share/3dm2/help/en/images/SAS_3DMScheduling.png
> share/3dm2/help/en/images/SAS_3dm-drill-downs-pc.jpg
> share/3dm2/help/en/images/SAS_BBU-after-test.gif
>-share/3dm2/help/en/images/SAS_DeletedUnit.gif
> share/3dm2/help/en/images/SAS_WinAVAlarm.jpg
> share/3dm2/help/en/images/SAS_bbu.gif
> share/3dm2/help/en/images/WinAVAlarm_tray.gif
>-share/3dm2/help/en/images/Windows_DriverInstall-Done.JPG
>-share/3dm2/help/en/images/Windows_DriverInstall-Start.JPG
> share/3dm2/help/en/images/alarms-sample-3dm.gif
> share/3dm2/help/en/images/collapse.gif
> share/3dm2/help/en/images/enable-write-cache.gif
> share/3dm2/help/en/images/expanded.gif
>+share/3dm2/help/en/images/hdutility.png
> share/3dm2/help/en/images/index.gif
> share/3dm2/help/en/images/indexx.gif
> share/3dm2/help/en/images/next.gif

Actions: View | Diff

Attachments on bug 166233: 122968 | 122969 | 122970