Attachment 114033 Details for Bug 155664 – dmidecode.diff.txt

dmidecode.diff.txt

dmidecode.diff.txt (text/plain; charset=US-ASCII), 5.71 KB, created by b. f. on 2011-05-05 06:34:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: b. f.

Created: 2011-05-05 06:34:47 UTC

Size: 5.71 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/pcvs/ports/sysutils/dmidecode/Makefile,v
>retrieving revision 1.13
>diff -u -r1.13 Makefile
>--- Makefile	9 Feb 2010 03:52:46 -0000	1.13
>+++ Makefile	18 Mar 2011 16:52:10 -0000
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	dmidecode
>-PORTVERSION=	2.10
>+PORTVERSION=	2.11
> CATEGORIES=	sysutils
> MASTER_SITES=	${MASTER_SITE_SAVANNAH} \
> 		ftp://ftp.nuug.no/pub/anders/distfiles/
>@@ -18,21 +18,15 @@
> ONLY_FOR_ARCHS=	i386 amd64 ia64
> 
> USE_BZIP2=	yes
>-MAKE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" DOCSDIR="${DOCSDIR}"
>+MAKE_ENV+=	DOCSDIR="${DOCSDIR}" LDFLAGS="${LDFLAGS}"
>+LICENSE=	GPLv2
> 
>-PORTDOCS=	AUTHORS CHANGELOG README
>-
>-post-patch:
> .if defined(NOPORTDOCS)
>+post-patch:
> 	@${REINPLACE_CMD} -e '/^install.*:/s,install-doc,,' ${WRKSRC}/Makefile
>-.endif
> 
>-post-install:
>-.if !defined(NOPORTDOCS)
>-	${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}
>-.for f in ${PORTDOCS}
>-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
>-.endfor
>+.else
>+PORTDOCS=	AUTHORS CHANGELOG README
> .endif
> 
> .include <bsd.port.pre.mk>
>Index: distinfo
>===================================================================
>RCS file: /home/pcvs/ports/sysutils/dmidecode/distinfo,v
>retrieving revision 1.10
>diff -u -r1.10 distinfo
>--- distinfo	19 Mar 2011 12:32:12 -0000	1.10
>+++ distinfo	20 Mar 2011 15:32:05 -0000
>@@ -1,2 +1,2 @@
>-SHA256 (dmidecode-2.10.tar.bz2) = 4d74a3e93353320317a424816f9a045df06d9ed4b5b80881e16fdfcc74c9e2c0
>-SIZE (dmidecode-2.10.tar.bz2) = 51904
>+SHA256 (dmidecode-2.11.tar.bz2) = 6da5643479b3b591b71a91122a25b89b77920b66e1ad0a5162d3c75b50423b51
>+SIZE (dmidecode-2.11.tar.bz2) = 54537
>Index: files/patch-Makefile
>===================================================================
>RCS file: /home/pcvs/ports/sysutils/dmidecode/files/patch-Makefile,v
>retrieving revision 1.3
>diff -u -r1.3 patch-Makefile
>--- files/patch-Makefile	7 Feb 2006 08:51:09 -0000	1.3
>+++ files/patch-Makefile	18 Mar 2011 16:57:03 -0000
>@@ -1,7 +1,7 @@
>---- Makefile.orig	Tue Feb  7 09:45:21 2006
>-+++ Makefile	Tue Feb  7 09:47:11 2006
>-@@ -8,25 +8,25 @@
>- #	Licensed under the GNU Public License.
>+--- Makefile.orig	2010-10-11 10:08:16.000000000 -0400
>++++ Makefile	2011-03-18 12:55:54.000000000 -0400
>+@@ -12,30 +12,30 @@
>+ #   (at your option) any later version.
>  #
>  
> -CC      = gcc
>@@ -20,7 +20,7 @@
>  
>  # Pass linker flags here
> -LDFLAGS =
>-+LDFLAGS+=
>++LDFLAGS+= $(CFLAGS)
>  
>  DESTDIR =
> -prefix  = /usr/local
>@@ -33,4 +33,11 @@
> +docdir  = $(DOCSDIR)
>  
>  INSTALL         := install
>- INSTALL_DATA    := $(INSTALL) -m 644
>+-INSTALL_DATA    := $(INSTALL) -m 644
>++INSTALL_DATA    := $(BSD_INSTALL_DATA)
>+ INSTALL_DIR     := $(INSTALL) -m 755 -d
>+-INSTALL_PROGRAM := $(INSTALL) -m 755
>++INSTALL_PROGRAM := $(BSD_INSTALL_PROGRAM)
>+ RM              := rm -f
>+ 
>+ # BSD make provides $MACHINE, but GNU make doesn't
>Index: files/patch-dmidecode.c
>===================================================================
>RCS file: files/patch-dmidecode.c
>diff -N files/patch-dmidecode.c
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-dmidecode.c	5 May 2011 04:39:16 -0000
>@@ -0,0 +1,100 @@
>+diff -u dmidecode.c dmidecode.c
>+--- dmidecode.c	2011/01/25 16:19:42	1.167
>++++ dmidecode.c	2011/04/20 14:37:03	1.168
>+@@ -707,6 +707,8 @@
>+ 		{ 0x3A, "Athlon II Dual-Core M" },
>+ 		{ 0x3B, "Opteron 6100" },
>+ 		{ 0x3C, "Opteron 4100" },
>++		{ 0x3D, "Opteron 6200" },
>++		{ 0x3E, "Opteron 4200" },
>+ 
>+ 		{ 0x40, "MIPS" },
>+ 		{ 0x41, "MIPS R4000" },
>+@@ -714,6 +716,10 @@
>+ 		{ 0x43, "MIPS R4400" },
>+ 		{ 0x44, "MIPS R4600" },
>+ 		{ 0x45, "MIPS R10000" },
>++		{ 0x46, "C-Series" },
>++		{ 0x47, "E-Series" },
>++		{ 0x48, "S-Series" },
>++		{ 0x49, "G-Series" },
>+ 
>+ 		{ 0x50, "SPARC" },
>+ 		{ 0x51, "SuperSPARC" },
>+@@ -997,7 +1003,8 @@
>+ 		sig = 1;
>+ 	else if ((type >= 0x18 && type <= 0x1D) /* AMD */
>+ 	      || type == 0x1F /* AMD */
>+-	      || (type >= 0x38 && type <= 0x3C) /* AMD */
>++	      || (type >= 0x38 && type <= 0x3E) /* AMD */
>++	      || (type >= 0x46 && type <= 0x49) /* AMD */
>+ 	      || (type >= 0x83 && type <= 0x8F) /* AMD */
>+ 	      || (type >= 0xB6 && type <= 0xB7) /* AMD */
>+ 	      || (type >= 0xE6 && type <= 0xEF)) /* AMD */
>+@@ -1143,10 +1150,20 @@
>+ 		"Socket LGA1156",
>+ 		"Socket LGA1567",
>+ 		"Socket PGA988A",
>+-		"Socket BGA1288" /* 0x20 */
>++		"Socket BGA1288",
>++		"Socket rPGA988B",
>++		"Socket BGA1023",
>++		"Socket BGA1024",
>++		"Socket BGA1155",
>++		"Socket LGA1356",
>++		"Socket LGA2011",
>++		"Socket FS1",
>++		"Socket FS2",
>++		"Socket FM1",
>++		"Socket FM2" /* 0x2A */
>+ 	};
>+ 
>+-	if (code >= 0x01 && code <= 0x20)
>++	if (code >= 0x01 && code <= 0x2A)
>+ 		return upgrade[code - 0x01];
>+ 	return out_of_spec;
>+ }
>+@@ -1493,10 +1510,11 @@
>+ 		"24-way Set-associative",
>+ 		"32-way Set-associative",
>+ 		"48-way Set-associative",
>+-		"64-way Set-associative" /* 0x0D */
>++		"64-way Set-associative",
>++		"20-way Set-associative" /* 0x0E */
>+ 	};
>+ 
>+-	if (code >= 0x01 && code <= 0x0D)
>++	if (code >= 0x01 && code <= 0x0E)
>+ 		return type[code - 0x01];
>+ 	return out_of_spec;
>+ }
>+@@ -1660,12 +1678,18 @@
>+ 		"PCI Express 2 x2",
>+ 		"PCI Express 2 x4",
>+ 		"PCI Express 2 x8",
>+-		"PCI Express 2 x16", /* 0xB0 */
>++		"PCI Express 2 x16",
>++		"PCI Express 3",
>++		"PCI Express 3 x1",
>++		"PCI Express 3 x2",
>++		"PCI Express 3 x4",
>++		"PCI Express 3 x8",
>++		"PCI Express 3 x16" /* 0xB6 */
>+ 	};
>+ 
>+ 	if (code >= 0x01 && code <= 0x13)
>+ 		return type[code - 0x01];
>+-	if (code >= 0xA0 && code <= 0xB0)
>++	if (code >= 0xA0 && code <= 0xB6)
>+ 		return type_0xA0[code - 0xA0];
>+ 	return out_of_spec;
>+ }
>+@@ -2100,7 +2124,7 @@
>+ 
>+ 	if (code >= 0x01 && code <= 0x0A)
>+ 		return location[code - 0x01];
>+-	if (code >= 0xA0 && code <= 0xA4)
>++	if (code >= 0xA0 && code <= 0xA3)
>+ 		return location_0xA0[code - 0xA0];
>+ 	return out_of_spec;
>+ }

Actions: View

Attachments on bug 155664: 114032 | 114033 | 114034