diff options
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/syslinux/Makefile | 35 | ||||
| -rw-r--r-- | sysutils/syslinux/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/syslinux/files/patch-Makefile | 6 | ||||
| -rw-r--r-- | sysutils/syslinux/files/patch-libinstaller-syslxopt.c | 16 | ||||
| -rw-r--r-- | sysutils/syslinux/pkg-descr | 3 | ||||
| -rw-r--r-- | sysutils/syslinux/pkg-plist | 22 |
6 files changed, 45 insertions, 41 deletions
diff --git a/sysutils/syslinux/Makefile b/sysutils/syslinux/Makefile index 4f8e3f7bacbd..f778afd22ddc 100644 --- a/sysutils/syslinux/Makefile +++ b/sysutils/syslinux/Makefile @@ -1,31 +1,26 @@ -# New ports collection makefile for: syslinux -# Date created: Nov.15, 2008 -# Whom: luigi@FreeBSD.org -# -# Maintainers: Luigi Rizzo <luigi@FreeBSD.org> +# Created by: luigi@FreeBSD.org # $FreeBSD$ -# PORTNAME= syslinux -PORTVERSION= 4.05 +PORTVERSION= 5.00 CATEGORIES= sysutils -MASTER_SITES= ${MASTER_SITE_KERNEL_ORG} -MASTER_SITE_SUBDIR= linux/utils/boot/syslinux +MASTER_SITES= KERNEL_ORG/linux/utils/boot/syslinux MAINTAINER= ports@FreeBSD.org -COMMENT= Syslinux for FreeBSD +COMMENT= Boot loader for the Linux operating system BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm RUN_DEPENDS= mtools:${PORTSDIR}/emulators/mtools LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING -MAN1= syslinux.1 - -USE_BZIP2= yes -USE_GMAKE= yes +USE_XZ= yes USE_PERL5_BUILD= yes +USE_GMAKE= yes +MAKE_ARGS= CC="${CC}" +MAKE_JOBS_SAFE= yes + +MAN1= syslinux.1 .include <bsd.port.pre.mk> @@ -41,11 +36,15 @@ pre-patch: ${FIND} . -type f -exec ${GREP} -le 'elf_i386' \{\} \; | \ ${XARGS} ${REINPLACE_CMD} -e 's/elf_i386/elf_i386_fbsd/g;' ) +post-patch: + @${REINPLACE_CMD} -e \ + 's|^UMAKEDEPS|#UMAKEDEPS|' ${WRKSRC}/mk/syslinux.mk + build_pkg-plist: - @( ${ECHO} "bin/syslinux" ; \ + @( ${ECHO_CMD} "bin/syslinux" ; \ cd ${WRKSRC}; for i in ${_A} ; do \ - ${ECHO} share/syslinux/`basename $$i` ; done ; \ - ${ECHO} "@dirrm share/syslinux" ) + ${ECHO_CMD} share/syslinux/`basename $$i` ; done ; \ + ${ECHO_CMD} "@dirrm share/syslinux" ) do-install: ${MKDIR} ${DATADIR} diff --git a/sysutils/syslinux/distinfo b/sysutils/syslinux/distinfo index 75105d7eeb68..45f4f6ad7446 100644 --- a/sysutils/syslinux/distinfo +++ b/sysutils/syslinux/distinfo @@ -1,2 +1,2 @@ -SHA256 (syslinux-4.05.tar.bz2) = 9093f246038a3671a323bd9dd7eb685338578f67f3da949123c6462e0903c0b8 -SIZE (syslinux-4.05.tar.bz2) = 5486307 +SHA256 (syslinux-5.00.tar.xz) = c0cfdb6a52c233cfd0d23906d60b208f8a06bd29d516cb9fced989a61eac2fe3 +SIZE (syslinux-5.00.tar.xz) = 5097336 diff --git a/sysutils/syslinux/files/patch-Makefile b/sysutils/syslinux/files/patch-Makefile index 0493a6c1035d..283b42bd58b4 100644 --- a/sysutils/syslinux/files/patch-Makefile +++ b/sysutils/syslinux/files/patch-Makefile @@ -1,11 +1,11 @@ --- Makefile.orig 2011-04-18 23:24:17.000000000 +0200 +++ Makefile 2011-05-05 15:51:44.356358227 +0200 -@@ -52,18 +52,18 @@ +@@ -57,18 +57,18 @@ # Note: libinstaller is both a BSUBDIR and an ISUBDIR. It contains # files that depend only on the B phase, but may have to be regenerated # for "make installer". --BSUBDIRS = codepage com32 lzo core memdisk modules mbr memdump gpxe sample \ -+BSUBDIRS_ = codepage com32 lzo core memdisk modules mbr memdump gpxe sample \ +-BSUBDIRS = codepage com32 lzo core memdisk mbr memdump gpxe sample \ ++BSUBDIRS_ = codepage com32 lzo core memdisk mbr memdump gpxe sample \ diag libinstaller dos win32 win64 dosutil ITARGET = IOBJECTS = $(ITARGET) \ diff --git a/sysutils/syslinux/files/patch-libinstaller-syslxopt.c b/sysutils/syslinux/files/patch-libinstaller-syslxopt.c index c23156d4fc68..c551ff9b4aa6 100644 --- a/sysutils/syslinux/files/patch-libinstaller-syslxopt.c +++ b/sysutils/syslinux/files/patch-libinstaller-syslxopt.c @@ -1,6 +1,6 @@ --- libinstaller/syslxopt.c.orig 2010-10-20 21:25:38.000000000 +0200 +++ libinstaller/syslxopt.c 2010-11-16 15:09:16.897550744 +0100 -@@ -44,6 +44,8 @@ +@@ -45,6 +45,8 @@ .activate_partition = 0, .force = 0, .bootsecfile = NULL, @@ -9,7 +9,7 @@ }; const struct option long_options[] = { -@@ -57,7 +59,7 @@ +@@ -58,7 +60,7 @@ {"stupid", 0, NULL, 's'}, {"heads", 1, NULL, 'H'}, {"raid-mode", 0, NULL, 'r'}, @@ -18,10 +18,10 @@ {"help", 0, NULL, 'h'}, {"once", 1, NULL, OPT_ONCE}, {"clear-once", 0, NULL, 'O'}, -@@ -65,10 +67,12 @@ - {"menu-save", 1, NULL, 'M'}, +@@ -67,10 +69,12 @@ {"mbr", 0, NULL, 'm'}, /* DOS/Win32 only */ {"active", 0, NULL, 'a'}, /* DOS/Win32 only */ + {"device", 1, NULL, OPT_DEVICE}, + {"verbose", 0, NULL, 'v' }, + {"bimage", 1, NULL, 'b' }, {0, 0, 0, 0} @@ -32,7 +32,7 @@ void __attribute__ ((noreturn)) usage(int rv, enum syslinux_mode mode) { -@@ -109,7 +113,9 @@ +@@ -112,7 +116,9 @@ " --raid -r Fall back to the next device on boot failure\n" " --once=... %s Execute a command once upon boot\n" " --clear-once -O Clear the boot-once command\n" @@ -43,9 +43,9 @@ mode == MODE_SYSLINUX ? " " : "-o"); /* * Have to chop this roughly in half for the DOS installer due -@@ -209,11 +215,17 @@ - case 'a': - opt.activate_partition = 1; +@@ -217,11 +223,17 @@ + usage(EX_USAGE, mode); + opt.device = optarg; break; - case 'v': + case 'V': diff --git a/sysutils/syslinux/pkg-descr b/sysutils/syslinux/pkg-descr index 86edb0755525..a333797b1000 100644 --- a/sysutils/syslinux/pkg-descr +++ b/sysutils/syslinux/pkg-descr @@ -1,7 +1,8 @@ The syslinux program installs a linux bootloader on a FAT-formatted filesystem or disk image. + This FreeBSD port can additionally operate on plain files containing a FAT image, thus requiring no special privilege. The program relies on mtools to perform the manipulation of the FAT filesystem. -WWW: http://syslinux.zytor.com/ +WWW: http://www.syslinux.org/ diff --git a/sysutils/syslinux/pkg-plist b/sysutils/syslinux/pkg-plist index bc7b31b7fd02..a65fea09b03e 100644 --- a/sysutils/syslinux/pkg-plist +++ b/sysutils/syslinux/pkg-plist @@ -1,14 +1,5 @@ bin/syslinux -%%DATADIR%%/mbr.bin -%%DATADIR%%/gptmbr.bin -%%DATADIR%%/pxelinux.0 -%%DATADIR%%/isolinux.bin -%%DATADIR%%/gpxelinux.0 -%%DATADIR%%/memdisk -%%DATADIR%%/menu.c32 -%%DATADIR%%/vesamenu.c32 %%DATADIR%%/cat.c32 -%%DATADIR%%/chain.c32 %%DATADIR%%/cmd.c32 %%DATADIR%%/config.c32 %%DATADIR%%/cpuid.c32 @@ -17,22 +8,35 @@ bin/syslinux %%DATADIR%%/dmitest.c32 %%DATADIR%%/elf.c32 %%DATADIR%%/ethersel.c32 +%%DATADIR%%/gptmbr.bin %%DATADIR%%/gpxecmd.c32 +%%DATADIR%%/gpxelinux.0 +%%DATADIR%%/hexdump.c32 %%DATADIR%%/host.c32 %%DATADIR%%/ifcpu.c32 %%DATADIR%%/ifcpu64.c32 +%%DATADIR%%/ifmemdsk.c32 %%DATADIR%%/ifplop.c32 +%%DATADIR%%/isolinux.bin %%DATADIR%%/kbdmap.c32 +%%DATADIR%%/kontron_wdt.c32 %%DATADIR%%/linux.c32 %%DATADIR%%/ls.c32 +%%DATADIR%%/mbr.bin +%%DATADIR%%/memdisk %%DATADIR%%/meminfo.c32 +%%DATADIR%%/menu.c32 %%DATADIR%%/pcitest.c32 %%DATADIR%%/pmload.c32 +%%DATADIR%%/prdhcp.c32 %%DATADIR%%/pwd.c32 +%%DATADIR%%/pxechn.c32 +%%DATADIR%%/pxelinux.0 %%DATADIR%%/reboot.c32 %%DATADIR%%/sanboot.c32 %%DATADIR%%/sdi.c32 %%DATADIR%%/vesainfo.c32 +%%DATADIR%%/vesamenu.c32 %%DATADIR%%/vpdtest.c32 %%DATADIR%%/whichsys.c32 %%DATADIR%%/zzjson.c32 |