4 files changed, 169 insertions, 264 deletions

diff --git a/sysutils/devcpu-data/Makefile b/sysutils/devcpu-data/Makefile
index fffad8d5528e..80e0a518f3c9 100644
--- a/sysutils/devcpu-data/Makefile
+++ b/sysutils/devcpu-data/Makefile
@@ -2,18 +2,18 @@
 # $FreeBSD$
 
 PORTNAME=	data
-PORTVERSION=	0.6
-PORTREVISION=	1
+PORTVERSION=	1.0
 CATEGORIES=	sysutils
-MASTER_SITES=	ftp://ftp.SpringDaemons.com/soft/
+MASTER_SITES=	http://downloadmirror.intel.com/22508/eng/:intel \
+		http://pkgs.fedoraproject.org/repo/pkgs/microcode_ctl/amd-ucode-2012-09-10.tar/559bc355d3799538584add80df2996f0/:amd \
+# Defunct:	http://www.amd64.org/index.php?id=50&file=amd-ucode-2012-09-10.tar
 PKGNAMEPREFIX=	devcpu-
-DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
+DISTFILES=	microcode-20130222.tgz:intel amd-ucode-2012-09-10.tar:amd
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	clarkjc@runbox.com
 COMMENT=	Intel and AMD CPUs microcode updates
 
-USES=		tar:bzip2
-NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
 
 ONLY_FOR_ARCHS=	i386 amd64
 
@@ -21,9 +21,12 @@ DATADIR=	${PREFIX}/share/cpucontrol
 
 USE_RC_SUBR=	microcode_update
 
+post-extract:
+	${CP} -p ${FILESDIR}/Makefile ${FILESDIR}/ucode-tool.c ${WRKSRC}
+
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}/
 	${INSTALL_DATA} ${WRKSRC}/mcodes/* ${STAGEDIR}${DATADIR}/
-	@${TOUCH} ${STAGEDIR}${DATADIR}/.do_not_delete
+
 
 .include <bsd.port.mk>
diff --git a/sysutils/devcpu-data/distinfo b/sysutils/devcpu-data/distinfo
index 5dffb3fb9a25..b0b3dda9f350 100644
--- a/sysutils/devcpu-data/distinfo
+++ b/sysutils/devcpu-data/distinfo
@@ -1,2 +1,4 @@
-SHA256 (devcpu-data-0.6.tar.bz2) = 5153af0de3ce4f30edec7ee95596bfc2ead734d70b6ae0353d51890b527f875f
-SIZE (devcpu-data-0.6.tar.bz2) = 636188
+SHA256 (microcode-20130222.tgz) = fd25bd9777fc3c3b11f01e9090a2d24f7650023c9ec74bbf9f43bffe1d9d01cc
+SIZE (microcode-20130222.tgz) = 602449
+SHA256 (amd-ucode-2012-09-10.tar) = 21845c6cafa99704cdf4862b55e899ca88ed432d57f4d09ad6a5c3d2e186b718
+SIZE (amd-ucode-2012-09-10.tar) = 71680
diff --git a/sysutils/devcpu-data/pkg-descr b/sysutils/devcpu-data/pkg-descr
index 0576081c1043..2f4bf5362506 100644
--- a/sysutils/devcpu-data/pkg-descr
+++ b/sysutils/devcpu-data/pkg-descr
@@ -1,5 +1,3 @@
 This port supplies microcode updates for use with cpuctl(4) microcode
 update facility.  These could be used to keep your processor's firmware
 up-to-date.
-
-Author:	Stanislav Sedov <stas@FreeBSD.org>
diff --git a/sysutils/devcpu-data/pkg-plist b/sysutils/devcpu-data/pkg-plist
index 1bff5a808409..e5fbcf4787b9 100644
--- a/sysutils/devcpu-data/pkg-plist
+++ b/sysutils/devcpu-data/pkg-plist
@@ -1,252 +1,154 @@
-share/cpucontrol/.do_not_delete
-share/cpucontrol/1068-m01f122d.fw
-share/cpucontrol/1069-m04f122e.fw
-share/cpucontrol/1070-m02f122f.fw
-share/cpucontrol/1072-m04f1305.fw
-share/cpucontrol/1105-m08f2420.fw
-share/cpucontrol/1142-m02f2205.fw
-share/cpucontrol/1143-m02f110a.fw
-share/cpucontrol/1319-m206d820.fw
-share/cpucontrol/1381-m9df4112.fw
-share/cpucontrol/1382-m20f4111.fw
-share/cpucontrol/146-MU16502e.fw
-share/cpucontrol/147-MU16502f.fw
-share/cpucontrol/153-d2_619.fw
-share/cpucontrol/1584-m02f480b.fw
-share/cpucontrol/1854-m86d821.fw
-share/cpucontrol/2071-m16f6c6.fw
-share/cpucontrol/2074-m106f766.fw
-share/cpucontrol/2077-m16f256.fw
-share/cpucontrol/2096-m806fa92.fw
-share/cpucontrol/2098-m806fda1.fw
-share/cpucontrol/2099-m16fda1.fw
-share/cpucontrol/2101-m016fbB3.fw
-share/cpucontrol/2102-m086fbB3.fw
-share/cpucontrol/2103-m106fbB3.fw
-share/cpucontrol/2106-m046fbB4.fw
-share/cpucontrol/2107-m406fbB4.fw
-share/cpucontrol/2109-m021066131.fw
-share/cpucontrol/2110-m011066132.fw
-share/cpucontrol/2111-m801066133.fw
-share/cpucontrol/2127-m206f6c7.fw
-share/cpucontrol/2129-m206f257.fw
-share/cpucontrol/2149-m46f6c9.fw
-share/cpucontrol/2151-m406f767.fw
-share/cpucontrol/2174-m041066136.fw
-share/cpucontrol/2185-m04f650b.fw
-share/cpucontrol/2334-m016fbB6.fw
-share/cpucontrol/2335-m086fbB6.fw
-share/cpucontrol/2336-m106fbB6.fw
-share/cpucontrol/2337-m806fbB6.fw
-share/cpucontrol/2339-m046fbB7.fw
-share/cpucontrol/2340-m406fbB7.fw
-share/cpucontrol/2346-m16fda3.fw
-share/cpucontrol/2347-m206fda3.fw
-share/cpucontrol/2348-m806fda3.fw
-share/cpucontrol/2360-m011066138.fw
-share/cpucontrol/2374-m16f6cb.fw
-share/cpucontrol/2375-m206f6cc.fw
-share/cpucontrol/2376-m46f6cd.fw
-share/cpucontrol/2380-m106f768.fw
-share/cpucontrol/2381-m406f769.fw
-share/cpucontrol/2385-m806fa94.fw
-share/cpucontrol/2389-m16f25a.fw
-share/cpucontrol/2457-M01106C1109.fw
-share/cpucontrol/2494-m041067660B.fw
-share/cpucontrol/2495-m101067660B.fw
-share/cpucontrol/2496-m401067660B.fw
-share/cpucontrol/2497-m041067660C.fw
-share/cpucontrol/2498-m101067660C.fw
-share/cpucontrol/2499-m401067660C.fw
-share/cpucontrol/2500-m1010677703.fw
-share/cpucontrol/2501-m801067660C.fw
-share/cpucontrol/2502-m011067660B.fw
-share/cpucontrol/2524-m08106d110.fw
-share/cpucontrol/2598-M01106C2207.fw
-share/cpucontrol/2617-m111067AA07.fw
-share/cpucontrol/2618-m441067AA07.fw
-share/cpucontrol/2619-mA01067AA07.fw
-share/cpucontrol/2623-m011067660C.fw
-share/cpucontrol/2626-m1010677705.fw
-share/cpucontrol/2660-m08106d121.fw
-share/cpucontrol/2779-M04106C2212.fw
-share/cpucontrol/2780-M01106C2211.fw
-share/cpucontrol/2828-M08106C2213.fw
-share/cpucontrol/2934-m03106a4_00000010.fw
-share/cpucontrol/2935-m03106a5_0000000f.fw
-share/cpucontrol/2986-m086fbB8.fw
-share/cpucontrol/2990-m046fbB9.fw
-share/cpucontrol/2991-m406fbB9.fw
-share/cpucontrol/2f0708.fw
-share/cpucontrol/3014-m13106e5_00000003.fw
-share/cpucontrol/3025-m08106d126.fw
-share/cpucontrol/308-MU163336.fw
-share/cpucontrol/309-MU163437.fw
-share/cpucontrol/3180-m1220652_00000009.fw
-share/cpucontrol/3194-m04206e6_00000002.fw
-share/cpucontrol/3271-m03106a5_00000015.fw
-share/cpucontrol/3301-m04206e6_00000007.fw
-share/cpucontrol/3341-m03206c2_0000000f.fw
-share/cpucontrol/3440-m03206c2_00000013.fw
-share/cpucontrol/368-bu27_fb.fw
-share/cpucontrol/410-MU16522d.fw
-share/cpucontrol/427-MU16800c.fw
-share/cpucontrol/428-MU16800d.fw
-share/cpucontrol/43-B_c6_617.fw
-share/cpucontrol/435-MU165141.fw
-share/cpucontrol/436-MU165142.fw
-share/cpucontrol/51-B_c6_616.fw
-share/cpucontrol/530-mu16730e.fw
-share/cpucontrol/539-mu167210.fw
-share/cpucontrol/620-MU26a401.fw
-share/cpucontrol/621-mu169601.fw
-share/cpucontrol/678-2f0708.fw
-share/cpucontrol/727-MU168313.fw
-share/cpucontrol/728-MU168314.fw
-share/cpucontrol/729-MU268310.fw
-share/cpucontrol/94-MU265019.fw
-share/cpucontrol/99-B_c6_612.fw
-share/cpucontrol/M01106C2217.fw
-share/cpucontrol/M01106CA107.fw
-share/cpucontrol/M0120661104.fw
-share/cpucontrol/M0230661106.fw
-share/cpucontrol/M04106C2218.fw
-share/cpucontrol/M04106CA107.fw
-share/cpucontrol/M0430661106.fw
-share/cpucontrol/M08106C2219.fw
-share/cpucontrol/M08106CA107.fw
-share/cpucontrol/M0830661106.fw
-share/cpucontrol/M10106CA107.fw
-share/cpucontrol/MU163202.fw
-share/cpucontrol/MU165040.fw
-share/cpucontrol/MU165041.fw
-share/cpucontrol/MU165045.fw
-share/cpucontrol/MU165140.fw
-share/cpucontrol/MU16522a.fw
-share/cpucontrol/MU16522c.fw
-share/cpucontrol/MU16530c.fw
-share/cpucontrol/MU16530d.fw
-share/cpucontrol/MU165310.fw
-share/cpucontrol/MU16600a.fw
-share/cpucontrol/MU166503.fw
-share/cpucontrol/MU166a0b.fw
-share/cpucontrol/MU166a0c.fw
-share/cpucontrol/MU166a0d.fw
-share/cpucontrol/MU166d05.fw
-share/cpucontrol/MU166d06.fw
-share/cpucontrol/MU166d07.fw
-share/cpucontrol/MU16810d.fw
-share/cpucontrol/MU16810e.fw
-share/cpucontrol/MU16810f.fw
-share/cpucontrol/MU168111.fw
-share/cpucontrol/MU168307.fw
-share/cpucontrol/MU168308.fw
-share/cpucontrol/MU168607.fw
-share/cpucontrol/MU168608.fw
-share/cpucontrol/MU16860a.fw
-share/cpucontrol/MU16860c.fw
-share/cpucontrol/MU168a01.fw
-share/cpucontrol/MU168a04.fw
-share/cpucontrol/MU168a05.fw
-share/cpucontrol/MU16b11c.fw
-share/cpucontrol/MU16b11d.fw
-share/cpucontrol/MU16b401.fw
-share/cpucontrol/MU16b402.fw
-share/cpucontrol/MU26522b.fw
-share/cpucontrol/MU26530b.fw
-share/cpucontrol/MU268110.fw
-share/cpucontrol/MU268602.fw
-share/cpucontrol/amd4.fw
-share/cpucontrol/k8_ucode_0f48.fw
-share/cpucontrol/k8_ucode_0f4a.fw
-share/cpucontrol/k8_ucode_0f50.fw
-share/cpucontrol/m011066143.fw
-share/cpucontrol/m011067660F.fw
-share/cpucontrol/m016fbBA.fw
-share/cpucontrol/m01f0712.fw
-share/cpucontrol/m01f0a13.fw
-share/cpucontrol/m01f2529.fw
-share/cpucontrol/m01f480c.fw
-share/cpucontrol/m01f6402.fw
-share/cpucontrol/m01f6508.fw
-share/cpucontrol/m021066142.fw
-share/cpucontrol/m02f0a15.fw
-share/cpucontrol/m02f241f.fw
-share/cpucontrol/m02f252a.fw
-share/cpucontrol/m02f2610.fw
-share/cpucontrol/m02f2738.fw
-share/cpucontrol/m02f292d.fw
-share/cpucontrol/m02f4116.fw
-share/cpucontrol/m02f480e.fw
-share/cpucontrol/m03106a4_00000011.fw
-share/cpucontrol/m03106a5_00000011.fw
-share/cpucontrol/m041067660F.fw
-share/cpucontrol/m046fbBC.fw
-share/cpucontrol/m04f0a14.fw
-share/cpucontrol/m04f122e.fw
-share/cpucontrol/m04f241e.fw
-share/cpucontrol/m04f252b.fw
-share/cpucontrol/m04f2737.fw
-share/cpucontrol/m04f292e.fw
-share/cpucontrol/m04f620f.fw
-share/cpucontrol/m05206f2_00000032.fw
-share/cpucontrol/m08106d129.fw
-share/cpucontrol/m086fbBB.fw
-share/cpucontrol/m08f2739.fw
-share/cpucontrol/m08f292f.fw
-share/cpucontrol/m09106e4_00000002.fw
-share/cpucontrol/m0df320a.fw
-share/cpucontrol/m0df330c.fw
-share/cpucontrol/m101067660F.fw
-share/cpucontrol/m101067770A.fw
-share/cpucontrol/m1069507.fw
-share/cpucontrol/m106f76a.fw
-share/cpucontrol/m106fbBA.fw
-share/cpucontrol/m10f2421.fw
-share/cpucontrol/m10f252c.fw
-share/cpucontrol/m111067AA0B.fw
-share/cpucontrol/m1220652_0000000c.fw
-share/cpucontrol/m12206a7_0000001b.fw
-share/cpucontrol/m13106e5_00000004.fw
-share/cpucontrol/m16f25d.fw
-share/cpucontrol/m16f6d0.fw
-share/cpucontrol/m16fda4.fw
-share/cpucontrol/m1df3417.fw
-share/cpucontrol/m2069507.fw
-share/cpucontrol/m206d618.fw
-share/cpucontrol/m206e839.fw
-share/cpucontrol/m206ec54.fw
-share/cpucontrol/m206f25c.fw
-share/cpucontrol/m206f6d1.fw
-share/cpucontrol/m206fbBA.fw
-share/cpucontrol/m206fda4.fw
-share/cpucontrol/m22f6809.fw
-share/cpucontrol/m34f6404.fw
-share/cpucontrol/m401067660F.fw
-share/cpucontrol/m406f76b.fw
-share/cpucontrol/m406fbBC.fw
-share/cpucontrol/m441067AA0B.fw
-share/cpucontrol/m46f6d2.fw
-share/cpucontrol/m5cf4a04.fw
-share/cpucontrol/m5df4a02.fw
-share/cpucontrol/m5ff4807.fw
-share/cpucontrol/m801066144.fw
-share/cpucontrol/m801067660F.fw
-share/cpucontrol/m8069547.fw
-share/cpucontrol/m806ec59.fw
-share/cpucontrol/m806fa95.fw
-share/cpucontrol/m806fbBA.fw
-share/cpucontrol/m806fda4.fw
-share/cpucontrol/m9220655_00000002.fw
-share/cpucontrol/m9df4305.fw
-share/cpucontrol/m9df4406.fw
-share/cpucontrol/m9df4703.fw
-share/cpucontrol/mA01067AA0B.fw
-share/cpucontrol/mbdf4117.fw
-share/cpucontrol/mbdf4903.fw
-share/cpucontrol/mu267114.fw
-share/cpucontrol/mu267238.fw
-share/cpucontrol/mu26732e.fw
-share/cpucontrol/mu26a003.fw
-share/cpucontrol/mu26a101.fw
-@dirrmtry share/cpucontrol
+%%DATADIR%%/2f0708.fw
+%%DATADIR%%/AMD-00001020-01000084.fw
+%%DATADIR%%/AMD-00001022-01000083.fw
+%%DATADIR%%/AMD-00001041-010000db.fw
+%%DATADIR%%/AMD-00001043-010000c8.fw
+%%DATADIR%%/AMD-00001062-010000c7.fw
+%%DATADIR%%/AMD-00001080-010000da.fw
+%%DATADIR%%/AMD-00001081-010000d9.fw
+%%DATADIR%%/AMD-000010a0-010000dc.fw
+%%DATADIR%%/AMD-00003010-03000027.fw
+%%DATADIR%%/AMD-00005010-05000028.fw
+%%DATADIR%%/AMD-00005020-0500010d.fw
+%%DATADIR%%/AMD-00006012-06000629.fw
+%%DATADIR%%/AMD-00006101-06001119.fw
+%%DATADIR%%/M01106C2217.fw
+%%DATADIR%%/M01106CA107.fw
+%%DATADIR%%/M0120661104.fw
+%%DATADIR%%/M0220661105_CV.fw
+%%DATADIR%%/M04106C2218.fw
+%%DATADIR%%/M04106CA107.fw
+%%DATADIR%%/M08106C2219.fw
+%%DATADIR%%/M08106CA107.fw
+%%DATADIR%%/M10106CA107.fw
+%%DATADIR%%/MU163202.fw
+%%DATADIR%%/MU165040.fw
+%%DATADIR%%/MU165041.fw
+%%DATADIR%%/MU165045.fw
+%%DATADIR%%/MU165140.fw
+%%DATADIR%%/MU16522a.fw
+%%DATADIR%%/MU16522c.fw
+%%DATADIR%%/MU16530c.fw
+%%DATADIR%%/MU16530d.fw
+%%DATADIR%%/MU165310.fw
+%%DATADIR%%/MU16600a.fw
+%%DATADIR%%/MU166503.fw
+%%DATADIR%%/MU166a0b.fw
+%%DATADIR%%/MU166a0c.fw
+%%DATADIR%%/MU166a0d.fw
+%%DATADIR%%/MU166d05.fw
+%%DATADIR%%/MU166d06.fw
+%%DATADIR%%/MU166d07.fw
+%%DATADIR%%/MU16810d.fw
+%%DATADIR%%/MU16810e.fw
+%%DATADIR%%/MU16810f.fw
+%%DATADIR%%/MU168111.fw
+%%DATADIR%%/MU168307.fw
+%%DATADIR%%/MU168308.fw
+%%DATADIR%%/MU168607.fw
+%%DATADIR%%/MU168608.fw
+%%DATADIR%%/MU16860a.fw
+%%DATADIR%%/MU16860c.fw
+%%DATADIR%%/MU168a01.fw
+%%DATADIR%%/MU168a04.fw
+%%DATADIR%%/MU168a05.fw
+%%DATADIR%%/MU16b11c.fw
+%%DATADIR%%/MU16b11d.fw
+%%DATADIR%%/MU16b401.fw
+%%DATADIR%%/MU16b402.fw
+%%DATADIR%%/MU26522b.fw
+%%DATADIR%%/MU26530b.fw
+%%DATADIR%%/MU268110.fw
+%%DATADIR%%/MU268602.fw
+%%DATADIR%%/m011066143.fw
+%%DATADIR%%/m011067660F.fw
+%%DATADIR%%/m016fbBA.fw
+%%DATADIR%%/m01f0712.fw
+%%DATADIR%%/m01f0a13.fw
+%%DATADIR%%/m01f2529.fw
+%%DATADIR%%/m01f480c.fw
+%%DATADIR%%/m01f6402.fw
+%%DATADIR%%/m01f6508.fw
+%%DATADIR%%/m021066142.fw
+%%DATADIR%%/m02f0a15.fw
+%%DATADIR%%/m02f241f.fw
+%%DATADIR%%/m02f252a.fw
+%%DATADIR%%/m02f2610.fw
+%%DATADIR%%/m02f2738.fw
+%%DATADIR%%/m02f292d.fw
+%%DATADIR%%/m02f4116.fw
+%%DATADIR%%/m02f480e.fw
+%%DATADIR%%/m03106a4_00000011.fw
+%%DATADIR%%/m041067660F.fw
+%%DATADIR%%/m046fbBC.fw
+%%DATADIR%%/m04f0a14.fw
+%%DATADIR%%/m04f122e.fw
+%%DATADIR%%/m04f241e.fw
+%%DATADIR%%/m04f252b.fw
+%%DATADIR%%/m04f2737.fw
+%%DATADIR%%/m04f292e.fw
+%%DATADIR%%/m04f620f.fw
+%%DATADIR%%/m05206f2_00000036.fw
+%%DATADIR%%/m08106d129.fw
+%%DATADIR%%/m086fbBB.fw
+%%DATADIR%%/m08f2739.fw
+%%DATADIR%%/m08f292f.fw
+%%DATADIR%%/m09106e4_00000002.fw
+%%DATADIR%%/m0df320a.fw
+%%DATADIR%%/m0df330c.fw
+%%DATADIR%%/m101067660F.fw
+%%DATADIR%%/m101067770A.fw
+%%DATADIR%%/m1069507.fw
+%%DATADIR%%/m106f76a.fw
+%%DATADIR%%/m106fbBA.fw
+%%DATADIR%%/m10f2421.fw
+%%DATADIR%%/m10f252c.fw
+%%DATADIR%%/m111067AA0B.fw
+%%DATADIR%%/m1220652_0000000d.fw
+%%DATADIR%%/m12206a7_00000028.fw
+%%DATADIR%%/m12306a9_00000017.fw
+%%DATADIR%%/m13106e5_00000005.fw
+%%DATADIR%%/m16f25d.fw
+%%DATADIR%%/m16f6d0.fw
+%%DATADIR%%/m16fda4.fw
+%%DATADIR%%/m1df3417.fw
+%%DATADIR%%/m2069507.fw
+%%DATADIR%%/m206d618.fw
+%%DATADIR%%/m206e839.fw
+%%DATADIR%%/m206ec54.fw
+%%DATADIR%%/m206f25c.fw
+%%DATADIR%%/m206f6d1.fw
+%%DATADIR%%/m206fbBA.fw
+%%DATADIR%%/m206fda4.fw
+%%DATADIR%%/m22f6809.fw
+%%DATADIR%%/m34f6404.fw
+%%DATADIR%%/m401067660F.fw
+%%DATADIR%%/m406f76b.fw
+%%DATADIR%%/m406fbBC.fw
+%%DATADIR%%/m441067AA0B.fw
+%%DATADIR%%/m46f6d2.fw
+%%DATADIR%%/m5cf4a04.fw
+%%DATADIR%%/m5df4a02.fw
+%%DATADIR%%/m5ff4807.fw
+%%DATADIR%%/m6d206d6_00000619.fw
+%%DATADIR%%/m6d206d7_0000070d.fw
+%%DATADIR%%/m801066144.fw
+%%DATADIR%%/m801067660F.fw
+%%DATADIR%%/m8069547.fw
+%%DATADIR%%/m806ec59.fw
+%%DATADIR%%/m806fa95.fw
+%%DATADIR%%/m806fbBA.fw
+%%DATADIR%%/m806fda4.fw
+%%DATADIR%%/m9220655_00000003.fw
+%%DATADIR%%/m9df4305.fw
+%%DATADIR%%/m9df4406.fw
+%%DATADIR%%/m9df4703.fw
+%%DATADIR%%/mA01067AA0B.fw
+%%DATADIR%%/mbdf4117.fw
+%%DATADIR%%/mbdf4903.fw
+%%DATADIR%%/mu267114.fw
+%%DATADIR%%/mu267238.fw
+%%DATADIR%%/mu26732e.fw
+%%DATADIR%%/mu26a003.fw
+%%DATADIR%%/mu26a101.fw
+@dirrmtry %%DATADIR%%