Remove the last few obsolete patches to sysutils/grub2-pcbsd

and sysutils/grub2-efi

sysutils/grub2-efi/files/patch-include_grub_gpt_partition.h

@@ -1,17 +0,0 @@
---- include/grub/gpt_partition.h.orig	2014-12-02 14:32:40.000000000 +0800
-+++ include/grub/gpt_partition.h	2014-12-02 14:35:03.000000000 +0800
-@@ -43,6 +43,14 @@
-     { 0x74, 0x4e, 0x65, 0x65, 0x64, 0x45, 0x46, 0x49 } \
-   }
- 
-+#define GRUB_GPT_PARTITION_TYPE_FREEBSD_BOOT \
-+  { grub_cpu_to_le32_compile_time (0x83bd6b9d), \
-+      grub_cpu_to_le16_compile_time (0x7f41), \
-+      grub_cpu_to_le16_compile_time (0x11dc),	       \
-+    { 0xbe, 0x0b, 0x00, 0x15, 0x60, 0xb8, 0x4f, 0x0f } \
-+  }
-+
-+
- #define GRUB_GPT_PARTITION_TYPE_LDM \
-   { grub_cpu_to_le32_compile_time (0x5808C8AAU),\
-       grub_cpu_to_le16_compile_time (0x7E8F), \

sysutils/grub2-pcbsd/files/patch-grub-core_fs_zfs_zfs.c

@@ -1,11 +0,0 @@
---- grub-core/fs/zfs/zfs.c.orig	2014-08-06 10:04:26.129840841 -0400
-+++ grub-core/fs/zfs/zfs.c	2014-08-06 10:05:01.587771419 -0400
-@@ -281,7 +281,7 @@
-  */
- #define MAX_SUPPORTED_FEATURE_STRLEN 50
- static const char *spa_feature_names[] = {
--  "org.illumos:lz4_compress",NULL
-+  "org.illumos:lz4_compress","com.delphix:hole_birth","com.delphix:extensible_dataset","com.delphix:embedded_data",NULL
- };
- 
- static int

sysutils/grub2-pcbsd/files/patch-grub-core_lib_libgcrypt-grub_src_types.h

@@ -1,11 +0,0 @@
---- grub-core/lib/libgcrypt/src/types.h.o	2014-03-03 17:14:46.722210112 -0500
-+++ grub-core/lib/libgcrypt/src/types.h	2014-03-03 17:05:54.572824164 -0500
-@@ -113,6 +113,8 @@
- #endif
- #endif
- 
-+typedef uint64_t u64;
-+
- typedef union {
-     int a;
-     short b;

sysutils/grub2-pcbsd/files/patch-grub-core_osdep_unix-platform.c

@@ -1,100 +0,0 @@
---- grub-core/osdep/unix/platform.c.orig	2014-10-21 10:55:38.203922144 -0400
-+++ grub-core/osdep/unix/platform.c	2014-10-21 10:56:54.300915974 -0400
-@@ -81,52 +81,8 @@
- static void
- grub_install_remove_efi_entries_by_distributor (const char *efi_distributor)
- {
--  int fd;
--  pid_t pid = grub_util_exec_pipe ((const char * []){ "efibootmgr", NULL }, &fd);
--  char *line = NULL;
--  size_t len = 0;
--
--  if (!pid)
--    {
--      grub_util_warn (_("Unable to open stream from %s: %s"),
--		      "efibootmgr", strerror (errno));
--      return;
--    }
--
--  FILE *fp = fdopen (fd, "r");
--  if (!fp)
--    {
--      grub_util_warn (_("Unable to open stream from %s: %s"),
--		      "efibootmgr", strerror (errno));
--      return;
--    }
--
--  line = xmalloc (80);
--  len = 80;
--  while (1)
--    {
--      int ret;
--      char *bootnum;
--      ret = getline (&line, &len, fp);
--      if (ret == -1)
--	break;
--      if (grub_memcmp (line, "Boot", sizeof ("Boot") - 1) != 0
--	  || line[sizeof ("Boot") - 1] < '0'
--	  || line[sizeof ("Boot") - 1] > '9')
--	continue;
--      if (!strcasestr (line, efi_distributor))
--	continue;
--      bootnum = line + sizeof ("Boot") - 1;
--      bootnum[4] = '\0';
--      if (!verbosity)
--	grub_util_exec ((const char * []){ "efibootmgr", "-q",
--	      "-b", bootnum,  "-B", NULL });
--      else
--	grub_util_exec ((const char * []){ "efibootmgr",
--	      "-b", bootnum, "-B", NULL });
--    }
--
--  free (line);
-+  // We don't have efibootmgr on FreeBSD, have to set externally
-+  return;
- }
- 
- void
-@@ -134,40 +90,8 @@
- 			   const char *efifile_path,
- 			   const char *efi_distributor)
- {
--  const char * efidir_disk;
--  int efidir_part;
--  efidir_disk = grub_util_biosdisk_get_osdev (efidir_grub_dev->disk);
--  efidir_part = efidir_grub_dev->disk->partition ? efidir_grub_dev->disk->partition->number + 1 : 1;
--
--  if (grub_util_exec_redirect_null ((const char * []){ "efibootmgr", "--version", NULL }))
--    {
--      /* TRANSLATORS: This message is shown when required executable `%s'
--	 isn't found.  */
--      grub_util_error (_("%s: not found"), "efibootmgr");
--    }
--
--  /* On Linux, we need the efivars kernel modules.  */
--#ifdef __linux__
--  grub_util_exec ((const char * []){ "modprobe", "-q", "efivars", NULL });
--#endif
--  /* Delete old entries from the same distributor.  */
--  grub_install_remove_efi_entries_by_distributor (efi_distributor);
--
--  char *efidir_part_str = xasprintf ("%d", efidir_part);
--
--  if (!verbosity)
--    grub_util_exec ((const char * []){ "efibootmgr", "-q",
--	  "-c", "-d", efidir_disk,
--	  "-p", efidir_part_str, "-w",
--	  "-L", efi_distributor, "-l", 
--	  efifile_path, NULL });
--  else
--    grub_util_exec ((const char * []){ "efibootmgr",
--	  "-c", "-d", efidir_disk,
--	  "-p", efidir_part_str, "-w",
--	  "-L", efi_distributor, "-l", 
--	  efifile_path, NULL });
--  free (efidir_part_str);
-+  // We don't have efibootmgr on FreeBSD, have to set externally
-+  return;
- }
- 
- void