This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Update sysutils/grub2-efi to the 2.02 prerelease version as well

  • Loading branch information...
kmoore134 committed Mar 5, 2014
1 parent 54456a1 commit 0a8a42dcf20e3c3719cd4768c05a77cb8abba6fd
Showing with 112 additions and 1,782 deletions.
  1. +0 −11 emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-VBoxClient-Makefile.kmk
  2. +0 −12 emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk
  3. +0 −11 emulators/virtualbox-ose/files/extrapatch-src-VBox-Devices-PC-ipxe-Makefile.kmk
  4. +0 −10 emulators/virtualbox-ose/files/extrapatch-src-recompiler-Makefile.kmk
  5. +0 −29 emulators/virtualbox-ose/files/patch-src-VBox-Devices-PC-DrvACPI.cpp
  6. +0 −11 emulators/virtualbox-ose/files/patch-src-VBox-Devices-Storage-DevAHCI.cpp
  7. +0 −36 emulators/virtualbox-ose/files/patch-src-VBox-Main-src-client-ConsoleImpl2.cpp
  8. +0 −47 emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-MachineImpl.cpp
  9. +0 −11 emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-VirtualBoxImpl.cpp
  10. +0 −14 emulators/virtualbox-ose/files/patch-src-VBox-Runtime-common-misc-uri.cpp
  11. +0 −11 emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-freebsd-fileaio-freebsd.cpp
  12. +0 −29 emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-freebsd-mp-freebsd.cpp
  13. +7 −4 sysutils/grub2-efi/Makefile
  14. +2 −2 sysutils/grub2-efi/distinfo
  15. +0 −254 sysutils/grub2-efi/files/patch-Makefile.util.am
  16. +0 −11 sysutils/grub2-efi/files/patch-Makefile.util.def
  17. +0 −130 sysutils/grub2-efi/files/patch-build-aux_test-driver
  18. +0 −35 sysutils/grub2-efi/files/patch-configure.ac
  19. +0 −893 sysutils/grub2-efi/files/patch-grub-2.00-zfs-feature-flag-support
  20. +0 −128 sysutils/grub2-efi/files/patch-grub-core-Makefile.core.am
  21. +0 −18 sysutils/grub2-efi/files/patch-grub-core-gnulib-Makefile.am
  22. +0 −14 sysutils/grub2-efi/files/patch-grub-core-gnulib-argp-fmtstream.c
  23. +0 −49 sysutils/grub2-efi/files/patch-grub-core-loader-i386-bsd.c
  24. +11 −0 sysutils/grub2-efi/files/patch-grub-core_lib_libgcrypt-grub_src_types.h
  25. +0 −12 sysutils/grub2-efi/files/patch-include-grub-util-libzfs.h
  26. +92 −0 sysutils/grub2-efi/pkg-plist
@@ -1,11 +0,0 @@
---- src/VBox/Additions/x11/VBoxClient/Makefile.kmk.orig 2013-11-29 14:20:43.000000000 -0500
-+++ src/VBox/Additions/x11/VBoxClient/Makefile.kmk 2013-12-16 14:03:08.000000000 -0500
-@@ -50,7 +50,7 @@
- # Xtst
- # These are static replacements for gcc-specific parts of libstdc++
- VBoxClient_LIBS += \
-- supc++ \
-+ cxxrt \
- gcc_eh
- ifdef VBOX_X11_SEAMLESS_GUEST
- VBoxClient_DEFS += SEAMLESS_GUEST DYNAMIC_RESIZE
@@ -1,12 +0,0 @@
---- src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig 2013-11-29 14:20:43.000000000 -0500
-+++ src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2013-12-16 13:47:34.000000000 -0500
-@@ -27,6 +27,9 @@
-
- vboxvideo_70_DEFS := \
- IN_MODULE XORG_7X RENDER=1 IN_RT_STATIC
-+ifeq ($(KBUILD_TARGET),freebsd) # don't use .freebsd or anything here.
-+ vboxvideo_70_DEFS += GCCUSESGAS
-+endif
- ifeq ($(KBUILD_TARGET),solaris) # don't use .solaris or anything here.
- vboxvideo_70_DEFS += __EXTENSIONS__ ## @todo Why this?
- endif
@@ -1,11 +0,0 @@
---- src/VBox/Devices/PC/ipxe/Makefile.kmk.orig 2013-11-29 14:23:32.000000000 -0500
-+++ src/VBox/Devices/PC/ipxe/Makefile.kmk 2013-12-13 15:06:45.000000000 -0500
-@@ -35,7 +35,7 @@
- iPxeBiosBin_CLEAN = \
- $(iPxeBiosBin_0_OUTDIR)/iPxeBiosBin.c \
-
--if1of ($(KBUILD_TARGET), darwin os2 solaris win)
-+if1of ($(KBUILD_TARGET), darwin freebsd os2 solaris win)
- $$(iPxeBiosBin_0_OUTDIR)/iPxeBiosBin.c: $(PATH_SUB_CURRENT)/iPxeBiosBin.rom $(VBOX_BIN2C) | $$(dir $$@)
- $(call MSG_TOOL,bin2c,iPxeBiosBin,$<,$@)
- $(QUIET)$(VBOX_BIN2C) -min 32 -max 56 -mask 0x1ff -export NetBiosBinary $< $@
@@ -1,10 +0,0 @@
---- src/recompiler/Makefile.kmk.orig 2013-11-29 14:25:09.000000000 -0500
-+++ src/recompiler/Makefile.kmk 2013-12-13 14:23:11.000000000 -0500
-@@ -41,6 +41,7 @@
- #
- ifneq ($(KBUILD_TARGET),win)
- VBoxRemPrimary_TEMPLATE = VBOXR3NP
-+ VBoxRemPrimary_TOOL.freebsd = VBoxGccFreeBSD
- # workaround the regparm bug in gcc <= 3.3
- VBoxRemPrimary_DEFS = $(if $(VBOX_GCC_BUGGY_REGPARM),GCC_WITH_BUGGY_REGPARM,)
- else
@@ -1,29 +0,0 @@
---- src/VBox/Devices/PC/DrvACPI.cpp.orig 2013-11-29 14:23:31.000000000 -0500
-+++ src/VBox/Devices/PC/DrvACPI.cpp 2013-12-13 17:36:50.000000000 -0500
-@@ -204,7 +204,7 @@
- int fAcLine = 0;
- size_t cbParameter = sizeof(fAcLine);
-
-- int rc = sysctlbyname("hw.acpi.acline", &fAcLine, &cbParameter, NULL, NULL);
-+ int rc = sysctlbyname("hw.acpi.acline", &fAcLine, &cbParameter, NULL, 0);
-
- if (!rc)
- {
-@@ -463,7 +463,7 @@
- int fBatteryState = 0;
- size_t cbParameter = sizeof(fBatteryState);
-
-- rc = sysctlbyname("hw.acpi.battery.state", &fBatteryState, &cbParameter, NULL, NULL);
-+ rc = sysctlbyname("hw.acpi.battery.state", &fBatteryState, &cbParameter, NULL, 0);
- if (!rc)
- {
- if ((fBatteryState & ACPI_BATT_STAT_NOT_PRESENT) == ACPI_BATT_STAT_NOT_PRESENT)
-@@ -485,7 +485,7 @@
- /* Get battery level. */
- int curCapacity = 0;
- cbParameter = sizeof(curCapacity);
-- rc = sysctlbyname("hw.acpi.battery.life", &curCapacity, &cbParameter, NULL, NULL);
-+ rc = sysctlbyname("hw.acpi.battery.life", &curCapacity, &cbParameter, NULL, 0);
- if (!rc && curCapacity >= 0)
- *penmRemainingCapacity = (PDMACPIBATCAPACITY)curCapacity;
-
@@ -1,11 +0,0 @@
---- src/VBox/Devices/Storage/DevAHCI.cpp.orig 2013-11-29 14:23:47.000000000 -0500
-+++ src/VBox/Devices/Storage/DevAHCI.cpp 2013-12-13 20:05:56.000000000 -0500
-@@ -3242,7 +3242,7 @@
- return 0;
-
- ataH2BE_U16(pbBuf, 0x0); /* feature 0: list of profiles supported */
-- pbBuf[2] = (0 << 2) | (1 << 1) | (1 || 0); /* version 0, persistent, current */
-+ pbBuf[2] = (0 << 2) | (1 << 1) | (1 << 0); /* version 0, persistent, current */
- pbBuf[3] = 8; /* additional bytes for profiles */
- /* The MMC-3 spec says that DVD-ROM read capability should be reported
- * before CD-ROM read capability. */
@@ -1,36 +0,0 @@
---- src/VBox/Main/src-client/ConsoleImpl2.cpp.orig 2013-09-06 08:30:10.000000000 -0400
-+++ src/VBox/Main/src-client/ConsoleImpl2.cpp 2013-09-12 13:03:34.000000000 -0400
-@@ -4031,12 +4031,13 @@
- }
- }
-
-- Assert((int)maTapFD[uInstance] >= 0);
-- if ((int)maTapFD[uInstance] >= 0)
-+ const int fd = (int)(uintptr_t)maTapFD[uInstance];
-+ Assert(fd >= 0);
-+ if (fd >= 0)
- {
- InsertConfigString(pLunL0, "Driver", "HostInterface");
- InsertConfigNode(pLunL0, "Config", &pCfg);
-- InsertConfigInteger(pCfg, "FileHandle", maTapFD[uInstance]);
-+ InsertConfigInteger(pCfg, "FileHandle", fd);
- }
-
- #elif defined(VBOX_WITH_NETFLT)
-@@ -4230,12 +4231,13 @@
- }
- }
-
-- Assert((int)maTapFD[uInstance] >= 0);
-- if ((int)maTapFD[uInstance] >= 0)
-+ const int fd = (int)(uintptr_t)maTapFD[uInstance];
-+ Assert(fd >= 0);
-+ if (fd >= 0)
- {
- InsertConfigString(pLunL0, "Driver", "HostInterface");
- InsertConfigNode(pLunL0, "Config", &pCfg);
-- InsertConfigInteger(pCfg, "FileHandle", maTapFD[uInstance]);
-+ InsertConfigInteger(pCfg, "FileHandle", fd);
- }
- break;
- }
@@ -1,47 +0,0 @@
---- src/VBox/Main/src-server/MachineImpl.cpp.orig 2013-12-18 11:10:25.000000000 -0500
-+++ src/VBox/Main/src-server/MachineImpl.cpp 2014-02-20 19:17:10.000000000 -0500
-@@ -2374,7 +2374,7 @@
- case 0x8:
- case 0x9:
- case 0xA:
-- AssertCompile(RT_ELEMENTS(mHWData->mCpuIdStdLeafs) == 0xB);
-+ // AssertCompile(RT_ELEMENTS(mHWData->mCpuIdStdLeafs) == 0xB);
- AssertRelease(aId < RT_ELEMENTS(mHWData->mCpuIdStdLeafs));
- setModified(IsModified_MachineData);
- mHWData.backup();
-@@ -2396,7 +2396,7 @@
- case 0x80000008:
- case 0x80000009:
- case 0x8000000A:
-- AssertCompile(RT_ELEMENTS(mHWData->mCpuIdExtLeafs) == 0xB);
-+ // AssertCompile(RT_ELEMENTS(mHWData->mCpuIdExtLeafs) == 0xB);
- AssertRelease(aId - 0x80000000 < RT_ELEMENTS(mHWData->mCpuIdExtLeafs));
- setModified(IsModified_MachineData);
- mHWData.backup();
-@@ -2436,7 +2436,7 @@
- case 0x8:
- case 0x9:
- case 0xA:
-- AssertCompile(RT_ELEMENTS(mHWData->mCpuIdStdLeafs) == 0xB);
-+ // AssertCompile(RT_ELEMENTS(mHWData->mCpuIdStdLeafs) == 0xB);
- AssertRelease(aId < RT_ELEMENTS(mHWData->mCpuIdStdLeafs));
- setModified(IsModified_MachineData);
- mHWData.backup();
-@@ -2455,7 +2455,7 @@
- case 0x80000008:
- case 0x80000009:
- case 0x8000000A:
-- AssertCompile(RT_ELEMENTS(mHWData->mCpuIdExtLeafs) == 0xB);
-+ // AssertCompile(RT_ELEMENTS(mHWData->mCpuIdExtLeafs) == 0xB);
- AssertRelease(aId - 0x80000000 < RT_ELEMENTS(mHWData->mCpuIdExtLeafs));
- setModified(IsModified_MachineData);
- mHWData.backup();
-@@ -9322,7 +9322,7 @@
- mHWData->mVideoCaptureEnabled = data.fVideoCaptureEnabled;
- for (unsigned i = 0; i < RT_ELEMENTS(mHWData->maVideoCaptureScreens); i++)
- mHWData->maVideoCaptureScreens[i] = ASMBitTest(&data.u64VideoCaptureScreens, i);
-- AssertCompile(RT_ELEMENTS(mHWData->maVideoCaptureScreens) == sizeof(data.u64VideoCaptureScreens) * 8);
-+ // AssertCompile(RT_ELEMENTS(mHWData->maVideoCaptureScreens) == sizeof(data.u64VideoCaptureScreens) * 8);
- mHWData->mVideoCaptureRate = data.ulVideoCaptureRate;
- mHWData->mVideoCaptureFPS = data.ulVideoCaptureFPS;
- if (!data.strVideoCaptureFile.isEmpty())
@@ -1,11 +0,0 @@
---- src/VBox/Main/src-server/VirtualBoxImpl.cpp.orig 2013-12-18 11:10:25.000000000 -0500
-+++ src/VBox/Main/src-server/VirtualBoxImpl.cpp 2014-02-20 19:51:23.000000000 -0500
-@@ -2355,7 +2355,7 @@
- if (aCiphertextSize < 32)
- return VERR_INVALID_PARAMETER;
-
-- AssertCompile(sizeof(m->SettingsCipherKey) >= 32);
-+ // AssertCompile(sizeof(m->SettingsCipherKey) >= 32);
-
- /* store the first 8 bytes of the cipherkey for verification */
- for (i = 0, j = 0; i < 8; i++, j++)
@@ -1,14 +0,0 @@
---- src/VBox/Runtime/common/misc/uri.cpp.orig 2013-12-18 11:10:34.000000000 -0500
-+++ src/VBox/Runtime/common/misc/uri.cpp 2013-12-19 20:57:32.000000000 -0500
-@@ -132,7 +132,10 @@
- /* % encoding means the percent sign and exactly 2 hexadecimal
- * digits describing the ASCII number of the character. */
- ++iIn;
-- char szNum[] = { pszString[iIn++], pszString[iIn++], '\0' };
-+ char szNum[3];
-+ szNum[0] = pszString[iIn++];
-+ szNum[1] = pszString[iIn++];
-+ szNum[2] = '\0';
- uint8_t u8;
- rc = RTStrToUInt8Ex(szNum, NULL, 16, &u8);
- if (RT_FAILURE(rc))
@@ -1,11 +0,0 @@
---- src/VBox/Runtime/r3/freebsd/fileaio-freebsd.cpp.orig 2013-11-29 14:24:23.000000000 -0500
-+++ src/VBox/Runtime/r3/freebsd/fileaio-freebsd.cpp 2013-12-13 17:32:50.000000000 -0500
-@@ -124,7 +124,7 @@
- &cReqsOutstandingMax, /* Where to store the old value. */
- &cbParameter, /* Size of the memory pointed to. */
- NULL, /* Where the new value is located. */
-- NULL); /* Where the size of the new value is stored. */
-+ 0); /* Where the size of the new value is stored. */
- if (rcBSD == -1)
- {
- /* ENOENT means the value is unknown thus the module is not loaded. */
@@ -1,29 +0,0 @@
---- src/VBox/Runtime/r3/freebsd/mp-freebsd.cpp.orig 2013-11-29 14:24:23.000000000 -0500
-+++ src/VBox/Runtime/r3/freebsd/mp-freebsd.cpp 2013-12-13 16:25:44.000000000 -0500
-@@ -93,7 +93,7 @@
- char szDriver[10];
- size_t cbDriver = sizeof(szDriver);
- RT_ZERO(szDriver); /* this shouldn't be necessary. */
-- int rcBsd = sysctlbyname(szName, szDriver, &cbDriver, NULL, NULL);
-+ int rcBsd = sysctlbyname(szName, szDriver, &cbDriver, NULL, 0);
- if (rcBsd == 0)
- return true;
-
-@@ -154,7 +154,7 @@
- return 0;
-
- /* CPU's have a common frequency. */
-- int rc = sysctlbyname("dev.cpu.0.freq", &uFreqCurr, &cbParameter, NULL, NULL);
-+ int rc = sysctlbyname("dev.cpu.0.freq", &uFreqCurr, &cbParameter, NULL, 0);
- if (rc)
- return 0;
-
-@@ -176,7 +176,7 @@
- * CPU 0 has the freq levels entry. ENOMEM is ok as we don't need all supported
- * levels but only the first one.
- */
-- int rc = sysctlbyname("dev.cpu.0.freq_levels", szFreqLevels, &cbFreqLevels, NULL, NULL);
-+ int rc = sysctlbyname("dev.cpu.0.freq_levels", szFreqLevels, &cbFreqLevels, NULL, 0);
- if ( (rc && (errno != ENOMEM))
- || (cbFreqLevels == 0))
- return 0;
@@ -1,11 +1,11 @@
# Created by: kmoore@FreeBSD.org
-# $FreeBSD$
+# $FreeBSD: head/sysutils/grub2-efi/Makefile 331644 2013-10-26 00:52:33Z gerald $
PORTNAME= grub2-efi
-PORTVERSION= 2.00
-PORTREVISION= 2
+PORTVERSION= 2.02
CATEGORIES= sysutils
-MASTER_SITES= GNU/grub
+MASTER_SITES= http://www.pcbsd.org/~kris/software/ \
+ ftp://ftp.pcbsd.org/pub/software/
DISTNAME= grub-${PORTVERSION}
MAINTAINER= kmoore@FreeBSD.org
@@ -39,6 +39,9 @@ post-patch:
@${LN} -s ${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSans.ttf ${WRKSRC}
@${TOUCH} -t 200001010000 ${WRKSRC}/Makefile.util.def
+pre-configure:
+ cd ${WRKSRC} && ./autogen.sh
+
post-configure:
@${LN} -sfh /usr/include/machine /usr/include/sys /usr/include/x86 ${WRKSRC}/grub-core
@@ -1,2 +1,2 @@
-SHA256 (grub-2.00.tar.xz) = 784ec38e7edc32239ad75b8e66df04dc8bfb26d88681bc9f627133a6eb85c458
-SIZE (grub-2.00.tar.xz) = 5136412
+SHA256 (grub-2.02.tar.xz) = af5eae25f0a7388d597aeba5f7c8f303b41091845ee502ceaf8784200a3fb344
+SIZE (grub-2.02.tar.xz) = 4463732
Oops, something went wrong.

0 comments on commit 0a8a42d

Please sign in to comment.