syslinux: updated to 6.03, fixed deps and cleaned up

4 files changed, 171 insertions, 70 deletions

diff --git a/syslinux/.footprint b/syslinux/.footprint
index 8fa8aa819..87b87b957 100644
--- a/syslinux/.footprint
+++ b/syslinux/.footprint
@@ -18,7 +18,9 @@ drwxr-xr-x	root/root	usr/man/
 drwxr-xr-x	root/root	usr/man/man1/
 -rw-r--r--	root/root	usr/man/man1/extlinux.1.gz
 -rw-r--r--	root/root	usr/man/man1/gethostip.1.gz
+-rw-r--r--	root/root	usr/man/man1/isohybrid.1.gz
 -rw-r--r--	root/root	usr/man/man1/lss16toppm.1.gz
+-rw-r--r--	root/root	usr/man/man1/memdiskfind.1.gz
 -rw-r--r--	root/root	usr/man/man1/ppmtolss16.1.gz
 -rw-r--r--	root/root	usr/man/man1/syslinux.1.gz
 -rw-r--r--	root/root	usr/man/man1/syslinux2ansi.1.gz
@@ -30,6 +32,7 @@ drwxr-xr-x	root/root	usr/share/syslinux/
 -rw-r--r--	root/root	usr/share/syslinux/cat.c32
 -rw-r--r--	root/root	usr/share/syslinux/chain.c32
 -rw-r--r--	root/root	usr/share/syslinux/cmd.c32
+-rw-r--r--	root/root	usr/share/syslinux/cmenu.c32
 drwxr-xr-x	root/root	usr/share/syslinux/com32/
 -rw-r--r--	root/root	usr/share/syslinux/com32/com32.ld
 drwxr-xr-x	root/root	usr/share/syslinux/com32/include/
@@ -41,6 +44,18 @@ drwxr-xr-x	root/root	usr/share/syslinux/com32/include/bitsize/
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/bitsize/stdint.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/bitsize/stdintconst.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/bitsize/stdintlimits.h
+drwxr-xr-x	root/root	usr/share/syslinux/com32/include/bitsize32/
+-rw-r--r--	root/root	usr/share/syslinux/com32/include/bitsize32/limits.h
+-rw-r--r--	root/root	usr/share/syslinux/com32/include/bitsize32/stddef.h
+-rw-r--r--	root/root	usr/share/syslinux/com32/include/bitsize32/stdint.h
+-rw-r--r--	root/root	usr/share/syslinux/com32/include/bitsize32/stdintconst.h
+-rw-r--r--	root/root	usr/share/syslinux/com32/include/bitsize32/stdintlimits.h
+drwxr-xr-x	root/root	usr/share/syslinux/com32/include/bitsize64/
+-rw-r--r--	root/root	usr/share/syslinux/com32/include/bitsize64/limits.h
+-rw-r--r--	root/root	usr/share/syslinux/com32/include/bitsize64/stddef.h
+-rw-r--r--	root/root	usr/share/syslinux/com32/include/bitsize64/stdint.h
+-rw-r--r--	root/root	usr/share/syslinux/com32/include/bitsize64/stdintconst.h
+-rw-r--r--	root/root	usr/share/syslinux/com32/include/bitsize64/stdintlimits.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/bufprintf.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/byteswap.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/cli.h
@@ -58,56 +73,6 @@ drwxr-xr-x	root/root	usr/share/syslinux/com32/include/bitsize/
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/errno.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/fcntl.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/getopt.h
-drwxr-xr-x	root/root	usr/share/syslinux/com32/include/gplinclude/
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/README
-drwxr-xr-x	root/root	usr/share/syslinux/com32/include/gplinclude/acpi/
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/acpi/acpi.h
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/acpi/boot.h
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/acpi/dsdt.h
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/acpi/ecdt.h
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/acpi/facs.h
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/acpi/fadt.h
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/acpi/hpet.h
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/acpi/madt.h
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/acpi/mcfg.h
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/acpi/rsdp.h
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/acpi/rsdt.h
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/acpi/sbst.h
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/acpi/slic.h
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/acpi/ssdt.h
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/acpi/structs.h
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/acpi/tcpa.h
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/acpi/xsdt.h
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/cpuid.h
-drwxr-xr-x	root/root	usr/share/syslinux/com32/include/gplinclude/disk/
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/disk/bootloaders.h
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/disk/common.h
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/disk/errno_disk.h
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/disk/error.h
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/disk/geom.h
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/disk/mbrs.h
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/disk/msdos.h
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/disk/partition.h
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/disk/read.h
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/disk/swsusp.h
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/disk/util.h
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/disk/write.h
-drwxr-xr-x	root/root	usr/share/syslinux/com32/include/gplinclude/dmi/
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/dmi/dmi.h
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/dmi/dmi_base_board.h
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/dmi/dmi_battery.h
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/dmi/dmi_bios.h
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/dmi/dmi_cache.h
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/dmi/dmi_chassis.h
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/dmi/dmi_ipmi.h
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/dmi/dmi_memory.h
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/dmi/dmi_processor.h
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/dmi/dmi_system.h
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/memory.h
-drwxr-xr-x	root/root	usr/share/syslinux/com32/include/gplinclude/vpd/
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/vpd/vpd.h
-drwxr-xr-x	root/root	usr/share/syslinux/com32/include/gplinclude/zzjson/
--rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/zzjson/zzjson.h
 drwxr-xr-x	root/root	usr/share/syslinux/com32/include/hw/
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/hw/vga.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/ilog2.h
@@ -118,7 +83,11 @@ drwxr-xr-x	root/root	usr/share/syslinux/com32/include/klibc/
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/klibc/diverr.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/klibc/endian.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/klibc/extern.h
+drwxr-xr-x	root/root	usr/share/syslinux/com32/include/klibc/i386/
+-rw-r--r--	root/root	usr/share/syslinux/com32/include/klibc/i386/archsetjmp.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/klibc/sysconfig.h
+drwxr-xr-x	root/root	usr/share/syslinux/com32/include/klibc/x86_64/
+-rw-r--r--	root/root	usr/share/syslinux/com32/include/klibc/x86_64/archsetjmp.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/libansi.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/limits.h
 drwxr-xr-x	root/root	usr/share/syslinux/com32/include/linux/
@@ -151,6 +120,10 @@ drwxr-xr-x	root/root	usr/share/syslinux/com32/include/sys/
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/sys/exec.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/sys/fpu.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/sys/gpxe.h
+drwxr-xr-x	root/root	usr/share/syslinux/com32/include/sys/i386/
+-rw-r--r--	root/root	usr/share/syslinux/com32/include/sys/i386/bitops.h
+-rw-r--r--	root/root	usr/share/syslinux/com32/include/sys/i386/cpu.h
+-rw-r--r--	root/root	usr/share/syslinux/com32/include/sys/i386/module.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/sys/io.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/sys/module.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/sys/pci.h
@@ -158,6 +131,10 @@ drwxr-xr-x	root/root	usr/share/syslinux/com32/include/sys/
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/sys/time.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/sys/times.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/sys/types.h
+drwxr-xr-x	root/root	usr/share/syslinux/com32/include/sys/x86_64/
+-rw-r--r--	root/root	usr/share/syslinux/com32/include/sys/x86_64/bitops.h
+-rw-r--r--	root/root	usr/share/syslinux/com32/include/sys/x86_64/cpu.h
+-rw-r--r--	root/root	usr/share/syslinux/com32/include/sys/x86_64/module.h
 drwxr-xr-x	root/root	usr/share/syslinux/com32/include/syslinux/
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/syslinux/adv.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/syslinux/advconst.h
@@ -166,7 +143,9 @@ drwxr-xr-x	root/root	usr/share/syslinux/com32/include/syslinux/
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/syslinux/bootpm.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/syslinux/bootrm.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/syslinux/config.h
+-rw-r--r--	root/root	usr/share/syslinux/com32/include/syslinux/debug.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/syslinux/disk.h
+-rw-r--r--	root/root	usr/share/syslinux/com32/include/syslinux/firmware.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/syslinux/idle.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/syslinux/io.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/syslinux/keyboard.h
@@ -180,6 +159,7 @@ drwxr-xr-x	root/root	usr/share/syslinux/com32/include/syslinux/
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/syslinux/reboot.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/syslinux/resolve.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/syslinux/sysappend.h
+-rw-r--r--	root/root	usr/share/syslinux/com32/include/syslinux/version.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/syslinux/vesacon.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/syslinux/video.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/syslinux/zio.h
@@ -193,18 +173,79 @@ drwxr-xr-x	root/root	usr/share/syslinux/com32/include/syslinux/
 -rw-r--r--	root/root	usr/share/syslinux/com32/libutil_lnx.a
 -rw-r--r--	root/root	usr/share/syslinux/config.c32
 -rw-r--r--	root/root	usr/share/syslinux/cptime.c32
+-rw-r--r--	root/root	usr/share/syslinux/cpu.c32
 -rw-r--r--	root/root	usr/share/syslinux/cpuid.c32
 -rw-r--r--	root/root	usr/share/syslinux/cpuidtest.c32
+-rw-r--r--	root/root	usr/share/syslinux/debug.c32
+-rw-r--r--	root/root	usr/share/syslinux/dhcp.c32
 drwxr-xr-x	root/root	usr/share/syslinux/diag/
 -rw-r--r--	root/root	usr/share/syslinux/diag/geodsp1s.img.xz
 -rw-r--r--	root/root	usr/share/syslinux/diag/geodspms.img.xz
 -rw-r--r--	root/root	usr/share/syslinux/diag/handoff.bin
 -rw-r--r--	root/root	usr/share/syslinux/disk.c32
+-rw-r--r--	root/root	usr/share/syslinux/dmi.c32
 -rw-r--r--	root/root	usr/share/syslinux/dmitest.c32
-drwxr-xr-x	root/root	usr/share/syslinux/dosutil/
--rw-r--r--	root/root	usr/share/syslinux/dosutil/copybs.com
--rw-r--r--	root/root	usr/share/syslinux/dosutil/eltorito.sys
--rw-r--r--	root/root	usr/share/syslinux/dosutil/mdiskchk.com
+drwxr-xr-x	root/root	usr/share/syslinux/efi64/
+-rw-r--r--	root/root	usr/share/syslinux/efi64/cat.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/chain.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/cmd.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/cmenu.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/config.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/cptime.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/cpu.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/cpuid.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/cpuidtest.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/debug.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/dhcp.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/disk.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/dmi.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/dmitest.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/elf.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/ethersel.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/gfxboot.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/gpxecmd.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/hdt.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/hexdump.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/host.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/ifcpu.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/ifcpu64.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/ifmemdsk.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/ifplop.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/kbdmap.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/kontron_wdt.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/ldlinux.e64
+-rw-r--r--	root/root	usr/share/syslinux/efi64/lfs.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/libcom32.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/libgpl.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/liblua.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/libmenu.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/libutil.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/linux.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/ls.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/lua.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/mboot.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/meminfo.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/menu.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/pci.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/pcitest.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/pmload.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/poweroff.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/prdhcp.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/pwd.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/pxechn.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/reboot.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/rosh.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/sanboot.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/sdi.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/sysdump.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/syslinux.c32
+-rwxr-xr-x	root/root	usr/share/syslinux/efi64/syslinux.efi
+-rw-r--r--	root/root	usr/share/syslinux/efi64/vesa.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/vesainfo.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/vesamenu.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/vpdtest.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/whichsys.c32
+-rw-r--r--	root/root	usr/share/syslinux/efi64/zzjson.c32
 -rw-r--r--	root/root	usr/share/syslinux/elf.c32
 -rw-r--r--	root/root	usr/share/syslinux/ethersel.c32
 -rw-r--r--	root/root	usr/share/syslinux/gfxboot.c32
@@ -232,6 +273,7 @@ drwxr-xr-x	root/root	usr/share/syslinux/dosutil/
 -rw-r--r--	root/root	usr/share/syslinux/kbdmap.c32
 -rw-r--r--	root/root	usr/share/syslinux/kontron_wdt.c32
 -rw-r--r--	root/root	usr/share/syslinux/ldlinux.c32
+-rw-r--r--	root/root	usr/share/syslinux/lfs.c32
 -rw-r--r--	root/root	usr/share/syslinux/libcom32.c32
 -rw-r--r--	root/root	usr/share/syslinux/libgpl.c32
 -rw-r--r--	root/root	usr/share/syslinux/liblua.c32
@@ -246,9 +288,9 @@ drwxr-xr-x	root/root	usr/share/syslinux/dosutil/
 -rw-r--r--	root/root	usr/share/syslinux/mbr_c.bin
 -rw-r--r--	root/root	usr/share/syslinux/mbr_f.bin
 -rw-r--r--	root/root	usr/share/syslinux/memdisk
--rw-r--r--	root/root	usr/share/syslinux/memdump.com
 -rw-r--r--	root/root	usr/share/syslinux/meminfo.c32
 -rw-r--r--	root/root	usr/share/syslinux/menu.c32
+-rw-r--r--	root/root	usr/share/syslinux/pci.c32
 -rw-r--r--	root/root	usr/share/syslinux/pcitest.c32
 -rw-r--r--	root/root	usr/share/syslinux/pmload.c32
 -rw-r--r--	root/root	usr/share/syslinux/poweroff.c32
@@ -261,9 +303,8 @@ drwxr-xr-x	root/root	usr/share/syslinux/dosutil/
 -rw-r--r--	root/root	usr/share/syslinux/sanboot.c32
 -rw-r--r--	root/root	usr/share/syslinux/sdi.c32
 -rw-r--r--	root/root	usr/share/syslinux/sysdump.c32
--rw-r--r--	root/root	usr/share/syslinux/syslinux.com
--rw-r--r--	root/root	usr/share/syslinux/syslinux.exe
--rw-r--r--	root/root	usr/share/syslinux/syslinux64.exe
+-rw-r--r--	root/root	usr/share/syslinux/syslinux.c32
+-rw-r--r--	root/root	usr/share/syslinux/vesa.c32
 -rw-r--r--	root/root	usr/share/syslinux/vesainfo.c32
 -rw-r--r--	root/root	usr/share/syslinux/vesamenu.c32
 -rw-r--r--	root/root	usr/share/syslinux/vpdtest.c32
diff --git a/syslinux/.md5sum b/syslinux/.md5sum
index 0e73e880e..cc1463a74 100644
--- a/syslinux/.md5sum
+++ b/syslinux/.md5sum
@@ -1 +1,2 @@
-67c8a85ca275d13b4f7f6139dd47d999  syslinux-5.10.tar.xz
+92a253df9211e9c20172796ecf388f13  syslinux-6.03.tar.xz
+3f848b0256e495425f4c5d4fcc391327  syslinux-Makefile.patch
diff --git a/syslinux/Pkgfile b/syslinux/Pkgfile
index ebac95a07..dce26ef8c 100644
--- a/syslinux/Pkgfile
+++ b/syslinux/Pkgfile
@@ -2,25 +2,20 @@
 # URL: http://syslinux.zytor.com/
 # Maintainer: Jose V Beneyto, sepen at crux dot nu
 # Packager: Jose V Beneyto, sepen at crux dot nu
-# Depends on: mtools perl
+# Depends on: mtools perl python
 
 name=syslinux
-version=5.10
+version=6.03
 release=1
-source=(http://www.kernel.org/pub/linux/utils/boot/$name/$name-$version.tar.xz)
+source=(http://www.kernel.org/pub/linux/utils/boot/$name/$name-$version.tar.xz \
+        $name-Makefile.patch)
 
 build() {
   cd $name-$version
 
-  # fix to install extlinux in /usr/bin
-  sed -i Makefile -e 's|SBINDIR|BINDIR|g'
+  patch -p0 -i $SRC/$name-Makefile.patch
 
-  make clean
   make OPTFLAGS="$CFLAGS" installer
-  make OPTFLAGS="$CFLAGS" -C utils
-  make OPTFLAGS="$CFLAGS" -C com32
-  make OPTFLAGS="$CFLAGS" INSTALLROOT=$PKG install
+  make OPTFLAGS="$CFLAGS" INSTALLROOT="$PKG" install
 
-  # fix perms when building with fakeroot
-  find $PKG/usr/share/$name/com32 -type d -perm -g+s -exec chmod -v g-s {} \;
 }
diff --git a/syslinux/syslinux-Makefile.patch b/syslinux/syslinux-Makefile.patch
new file mode 100644
index 000000000..0f7d13d48
--- /dev/null
+++ b/syslinux/syslinux-Makefile.patch
@@ -0,0 +1,64 @@
+--- Makefile.orig	2014-12-05 09:11:40.322312104 +0000
++++ Makefile	2014-12-05 11:47:22.202207109 +0000
+@@ -15,7 +15,7 @@
+ # Main Makefile for SYSLINUX
+ #
+ 
+-all_firmware := bios efi32 efi64
++all_firmware := bios efi64
+ 
+ #
+ # topdir is only set when we are doing a recursive make. Do a bunch of
+@@ -163,8 +163,6 @@ BOBJECTS = $(BTARGET) \
+ 	core/pxelinux.0 core/lpxelinux.0 \
+ 	core/isolinux.bin core/isolinux-debug.bin \
+ 	gpxe/gpxelinux.0 dos/syslinux.com \
+-	win32/syslinux.exe win64/syslinux64.exe \
+-	dosutil/*.com dosutil/*.sys \
+ 	$(MODULES)
+ 
+ # BSUBDIRs build the on-target binary components.
+@@ -186,7 +184,7 @@ NETINSTALLABLE = efi/syslinux.efi $(INST
+ else
+ 
+ BSUBDIRS = codepage com32 lzo core memdisk mbr gpxe sample \
+-	   diag libinstaller dos win32 win64 dosutil txt
++	   libinstaller txt
+ 
+ ITARGET  =
+ IOBJECTS = $(ITARGET) \
+@@ -195,20 +193,20 @@ IOBJECTS = $(ITARGET) \
+ ISUBDIRS = libinstaller mtools linux extlinux utils
+ 
+ # Things to install in /usr/bin
+-INSTALL_BIN   =	mtools/syslinux
++INSTALL_BIN   =	mtools/syslinux extlinux/extlinux
+ # Things to install in /sbin
+-INSTALL_SBIN  = extlinux/extlinux
++INSTALL_SBIN  = 
+ # Things to install in /usr/lib/syslinux
+ INSTALL_AUX   =	core/pxelinux.0 gpxe/gpxelinux.0 gpxe/gpxelinuxk.0 \
+ 		core/isolinux.bin core/isolinux-debug.bin \
+-		dos/syslinux.com core/lpxelinux.0 \
++		core/lpxelinux.0 \
+ 		mbr/*.bin $(INSTALLABLE_MODULES)
+-INSTALL_AUX_OPT = win32/syslinux.exe win64/syslinux64.exe
++INSTALL_AUX_OPT = 
+ INSTALL_DIAG  =	diag/mbr/handoff.bin \
+ 		diag/geodsp/geodsp1s.img.xz diag/geodsp/geodspms.img.xz
+ 
+ # These directories manage their own installables
+-INSTALLSUBDIRS = com32 utils dosutil
++INSTALLSUBDIRS = com32 utils
+ 
+ # Things to install in /boot/extlinux
+ EXTBOOTINSTALL = $(INSTALLABLE_MODULES)
+@@ -329,8 +327,6 @@ version.h: $(topdir)/version $(topdir)/v
+ local-install: installer
+ 	mkdir -m 755 -p $(INSTALLROOT)$(BINDIR)
+ 	install -m 755 -c $(INSTALL_BIN) $(INSTALLROOT)$(BINDIR)
+-	mkdir -m 755 -p $(INSTALLROOT)$(SBINDIR)
+-	install -m 755 -c $(INSTALL_SBIN) $(INSTALLROOT)$(SBINDIR)
+ 	mkdir -m 755 -p $(INSTALLROOT)$(AUXDIR)
+ 	install -m 644 -c $(INSTALL_AUX) $(INSTALLROOT)$(AUXDIR)
+ 	-install -m 644 -c $(INSTALL_AUX_OPT) $(INSTALLROOT)$(AUXDIR)