Attachment #130273 for bug #174180




# Created by: luigi@FreeBSD.org
# Date created:		Nov.15, 2008
# Whom:			luigi@FreeBSD.org
#
# Maintainers:		Luigi Rizzo <luigi@FreeBSD.org>
# $FreeBSD: head/sysutils/syslinux/Makefile 302619 2012-08-16 08:14:16Z mm $
#

PORTNAME=	syslinux
PORTVERSION=	5.00
CATEGORIES=	sysutils
MASTER_SITES=	KERNEL_ORG/linux/utils/boot/syslinux
MASTER_SITE_SUBDIR=	linux/utils/boot/syslinux

MAINTAINER=	ports@FreeBSD.org
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

USE_XZ=		yes

USE_BZIP2=	yes
USE_GMAKE=	yes
USE_PERL5_BUILD=	yes
USE_GMAKE=	yes
MAKE_ARGS=	CC="${CC}"
MAKE_JOBS_SAFE=	yes

MAN1=		syslinux.1

.include <bsd.port.pre.mk>


	${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_CMD} "bin/syslinux"	;		\
	  cd ${WRKSRC}; for i in ${_A} ; do	\
		${ECHO_CMD} share/syslinux/`basename $$i` ; done ; \
	  ${ECHO_CMD} "@dirrm share/syslinux" )

do-install:
	${MKDIR} ${DATADIR}

Lines 1-2 Link Here

(-)sysutils/syslinux/distinfo (-2 / +2 lines)
1	SHA256 (syslinux-4.05.tar.bz2) = 9093f246038a3671a323bd9dd7eb685338578f67f3da949123c6462e0903c0b8	1	SHA256 (syslinux-5.00.tar.xz) = c0cfdb6a52c233cfd0d23906d60b208f8a06bd29d516cb9fced989a61eac2fe3
2	SIZE (syslinux-4.05.tar.bz2) = 5486307	2	SIZE (syslinux-5.00.tar.xz) = 5097336

Lines 1-11 Link Here

(-)sysutils/syslinux/files/patch-Makefile (-3 / +3 lines)
1	--- Makefile.orig 2011-04-18 23:24:17.000000000 +0200	1	--- Makefile.orig 2011-04-18 23:24:17.000000000 +0200
2	+++ Makefile 2011-05-05 15:51:44.356358227 +0200	2	+++ Makefile 2011-05-05 15:51:44.356358227 +0200
3	@@ -52,18 +52,18 @@	3	@@ -57,18 +57,18 @@
4	# Note: libinstaller is both a BSUBDIR and an ISUBDIR. It contains	4	# Note: libinstaller is both a BSUBDIR and an ISUBDIR. It contains
5	# files that depend only on the B phase, but may have to be regenerated	5	# files that depend only on the B phase, but may have to be regenerated
6	# for "make installer".	6	# for "make installer".
7	-BSUBDIRS = codepage com32 lzo core memdisk modules mbr memdump gpxe sample \	7	-BSUBDIRS = codepage com32 lzo core memdisk mbr memdump gpxe sample \
8	+BSUBDIRS_ = codepage com32 lzo core memdisk modules mbr memdump gpxe sample \	8	+BSUBDIRS_ = codepage com32 lzo core memdisk mbr memdump gpxe sample \
9	diag libinstaller dos win32 win64 dosutil	9	diag libinstaller dos win32 win64 dosutil
10	ITARGET =	10	ITARGET =
11	IOBJECTS = $(ITARGET) \	11	IOBJECTS = $(ITARGET) \




--- libinstaller/syslxopt.c.orig	2010-10-20 21:25:38.000000000 +0200
+++ libinstaller/syslxopt.c	2010-11-16 15:09:16.897550744 +0100
@@ -45,6 +45,8 @@
     .activate_partition = 0,
     .force = 0,
     .bootsecfile = NULL,

 };
 
 const struct option long_options[] = {
@@ -58,7 +60,7 @@
     {"stupid", 0, NULL, 's'},
     {"heads", 1, NULL, 'H'},
     {"raid-mode", 0, NULL, 'r'},

     {"help", 0, NULL, 'h'},
     {"once", 1, NULL, OPT_ONCE},
     {"clear-once", 0, NULL, 'O'},
@@ -67,10 +69,12 @@
     {"menu-save", 1, NULL, 'M'},
     {"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}

 
 void __attribute__ ((noreturn)) usage(int rv, enum syslinux_mode mode)
 {
@@ -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"

 	    mode == MODE_SYSLINUX  ? "  " : "-o");
     /*
      * Have to chop this roughly in half for the DOS installer due
@@ -217,11 +223,17 @@
 		usage(EX_USAGE, mode);
 	    opt.device = optarg;
 	    break;
-	case 'v':
+	case 'V':

Lines 1-7 Link Here

(-)sysutils/syslinux/pkg-descr (-1 / +2 lines)
1	The syslinux program installs a linux bootloader on a FAT-formatted	1	The syslinux program installs a linux bootloader on a FAT-formatted
2	filesystem or disk image.	2	filesystem or disk image.
		3
3	This FreeBSD port can additionally operate on plain files containing	4	This FreeBSD port can additionally operate on plain files containing
4	a FAT image, thus requiring no special privilege. The program relies	5	a FAT image, thus requiring no special privilege. The program relies
5	on mtools to perform the manipulation of the FAT filesystem.	6	on mtools to perform the manipulation of the FAT filesystem.
6		7
7	WWW: http://syslinux.zytor.com/	8	WWW: http://www.syslinux.org/




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

%%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

Return to bug 174180

Lines 1-31 Link Here

(-)sysutils/syslinux/Makefile (-18 / +17 lines)
1	# New ports collection makefile for: syslinux	1	# Created by: luigi@FreeBSD.org
2	# Date created: Nov.15, 2008
3	# Whom: luigi@FreeBSD.org
4	#
5	# Maintainers: Luigi Rizzo <luigi@FreeBSD.org>
6	# $FreeBSD: head/sysutils/syslinux/Makefile 302619 2012-08-16 08:14:16Z mm $	2	# $FreeBSD: head/sysutils/syslinux/Makefile 302619 2012-08-16 08:14:16Z mm $
7	#
8		3
9	PORTNAME= syslinux	4	PORTNAME= syslinux
10	PORTVERSION= 4.05	5	PORTVERSION= 5.00
11	CATEGORIES= sysutils	6	CATEGORIES= sysutils
12	MASTER_SITES= ${MASTER_SITE_KERNEL_ORG}	7	MASTER_SITES= KERNEL_ORG/linux/utils/boot/syslinux
13	MASTER_SITE_SUBDIR= linux/utils/boot/syslinux
14		8
15	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= ports@FreeBSD.org
16	COMMENT= Syslinux for FreeBSD	10	COMMENT= Boot loader for the Linux operating system
17		11
18	BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm	12	BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
19	RUN_DEPENDS= mtools:${PORTSDIR}/emulators/mtools	13	RUN_DEPENDS= mtools:${PORTSDIR}/emulators/mtools
20		14
21	LICENSE= GPLv2	15	LICENSE= GPLv2
22	LICENSE_FILE= ${WRKSRC}/COPYING
23		16
24	MAN1= syslinux.1	17	USE_XZ= yes
25
26	USE_BZIP2= yes
27	USE_GMAKE= yes
28	USE_PERL5_BUILD= yes	18	USE_PERL5_BUILD= yes
		19	USE_GMAKE= yes
		20	MAKE_ARGS= CC="${CC}"
		21	MAKE_JOBS_SAFE= yes
		22
		23	MAN1= syslinux.1
29		24
30	.include <bsd.port.pre.mk>	25	.include <bsd.port.pre.mk>
31		26
Lines 41-51 Link Here
41	${FIND} . -type f -exec ${GREP} -le 'elf_i386' \{\} \; \| \	36	${FIND} . -type f -exec ${GREP} -le 'elf_i386' \{\} \; \| \
42	${XARGS} ${REINPLACE_CMD} -e 's/elf_i386/elf_i386_fbsd/g;' )	37	${XARGS} ${REINPLACE_CMD} -e 's/elf_i386/elf_i386_fbsd/g;' )
43		38
		39	post-patch:
		40	@${REINPLACE_CMD} -e \
		41	's\|^UMAKEDEPS\|#UMAKEDEPS\|' ${WRKSRC}/mk/syslinux.mk
		42
44	build_pkg-plist:	43	build_pkg-plist:
45	@( ${ECHO} "bin/syslinux" ; \	44	@( ${ECHO_CMD} "bin/syslinux" ; \
46	cd ${WRKSRC}; for i in ${_A} ; do \	45	cd ${WRKSRC}; for i in ${_A} ; do \
47	${ECHO} share/syslinux/`basename $$i` ; done ; \	46	${ECHO_CMD} share/syslinux/`basename $$i` ; done ; \
48	${ECHO} "@dirrm share/syslinux" )	47	${ECHO_CMD} "@dirrm share/syslinux" )
49		48
50	do-install:	49	do-install:
51	${MKDIR} ${DATADIR}	50	${MKDIR} ${DATADIR}

Lines 1-6 Link Here

(-)sysutils/syslinux/files/patch-libinstaller-syslxopt.c (-8 / +8 lines)
1	--- libinstaller/syslxopt.c.orig 2010-10-20 21:25:38.000000000 +0200	1	--- libinstaller/syslxopt.c.orig 2010-10-20 21:25:38.000000000 +0200
2	+++ libinstaller/syslxopt.c 2010-11-16 15:09:16.897550744 +0100	2	+++ libinstaller/syslxopt.c 2010-11-16 15:09:16.897550744 +0100
3	@@ -44,6 +44,8 @@	3	@@ -45,6 +45,8 @@
4	.activate_partition = 0,	4	.activate_partition = 0,
5	.force = 0,	5	.force = 0,
6	.bootsecfile = NULL,	6	.bootsecfile = NULL,
Lines 9-15 Link Here
9	};	9	};
10		10
11	const struct option long_options[] = {	11	const struct option long_options[] = {
12	@@ -57,7 +59,7 @@	12	@@ -58,7 +60,7 @@
13	{"stupid", 0, NULL, 's'},	13	{"stupid", 0, NULL, 's'},
14	{"heads", 1, NULL, 'H'},	14	{"heads", 1, NULL, 'H'},
15	{"raid-mode", 0, NULL, 'r'},	15	{"raid-mode", 0, NULL, 'r'},
Lines 18-27 Link Here
18	{"help", 0, NULL, 'h'},	18	{"help", 0, NULL, 'h'},
19	{"once", 1, NULL, OPT_ONCE},	19	{"once", 1, NULL, OPT_ONCE},
20	{"clear-once", 0, NULL, 'O'},	20	{"clear-once", 0, NULL, 'O'},
21	@@ -65,10 +67,12 @@	21	@@ -67,10 +69,12 @@
22	{"menu-save", 1, NULL, 'M'},
23	{"mbr", 0, NULL, 'm'}, /* DOS/Win32 only */	22	{"mbr", 0, NULL, 'm'}, /* DOS/Win32 only */
24	{"active", 0, NULL, 'a'}, /* DOS/Win32 only */	23	{"active", 0, NULL, 'a'}, /* DOS/Win32 only */
		24	{"device", 1, NULL, OPT_DEVICE},
25	+ {"verbose", 0, NULL, 'v' },	25	+ {"verbose", 0, NULL, 'v' },
26	+ {"bimage", 1, NULL, 'b' },	26	+ {"bimage", 1, NULL, 'b' },
27	{0, 0, 0, 0}	27	{0, 0, 0, 0}
Lines 32-38 Link Here
32		32
33	void __attribute__ ((noreturn)) usage(int rv, enum syslinux_mode mode)	33	void __attribute__ ((noreturn)) usage(int rv, enum syslinux_mode mode)
34	{	34	{
35	@@ -109,7 +113,9 @@	35	@@ -112,7 +116,9 @@
36	" --raid -r Fall back to the next device on boot failure\n"	36	" --raid -r Fall back to the next device on boot failure\n"
37	" --once=... %s Execute a command once upon boot\n"	37	" --once=... %s Execute a command once upon boot\n"
38	" --clear-once -O Clear the boot-once command\n"	38	" --clear-once -O Clear the boot-once command\n"
Lines 43-51 Link Here
43	mode == MODE_SYSLINUX ? " " : "-o");	43	mode == MODE_SYSLINUX ? " " : "-o");
44	/*	44	/*
45	* Have to chop this roughly in half for the DOS installer due	45	* Have to chop this roughly in half for the DOS installer due
46	@@ -209,11 +215,17 @@	46	@@ -217,11 +223,17 @@
47	case 'a':	47	usage(EX_USAGE, mode);
48	opt.activate_partition = 1;	48	opt.device = optarg;
49	break;	49	break;
50	- case 'v':	50	- case 'v':
51	+ case 'V':	51	+ case 'V':

Lines 1-14 Link Here

(-)sysutils/syslinux/pkg-plist (-9 / +13 lines)
1	bin/syslinux	1	bin/syslinux
2	%%DATADIR%%/mbr.bin
3	%%DATADIR%%/gptmbr.bin
4	%%DATADIR%%/pxelinux.0
5	%%DATADIR%%/isolinux.bin
6	%%DATADIR%%/gpxelinux.0
7	%%DATADIR%%/memdisk
8	%%DATADIR%%/menu.c32
9	%%DATADIR%%/vesamenu.c32
10	%%DATADIR%%/cat.c32	2	%%DATADIR%%/cat.c32
11	%%DATADIR%%/chain.c32
12	%%DATADIR%%/cmd.c32	3	%%DATADIR%%/cmd.c32
13	%%DATADIR%%/config.c32	4	%%DATADIR%%/config.c32
14	%%DATADIR%%/cpuid.c32	5	%%DATADIR%%/cpuid.c32
Lines 17-38 Link Here
17	%%DATADIR%%/dmitest.c32	8	%%DATADIR%%/dmitest.c32
18	%%DATADIR%%/elf.c32	9	%%DATADIR%%/elf.c32
19	%%DATADIR%%/ethersel.c32	10	%%DATADIR%%/ethersel.c32
		11	%%DATADIR%%/gptmbr.bin
20	%%DATADIR%%/gpxecmd.c32	12	%%DATADIR%%/gpxecmd.c32
		13	%%DATADIR%%/gpxelinux.0
		14	%%DATADIR%%/hexdump.c32
21	%%DATADIR%%/host.c32	15	%%DATADIR%%/host.c32
22	%%DATADIR%%/ifcpu.c32	16	%%DATADIR%%/ifcpu.c32
23	%%DATADIR%%/ifcpu64.c32	17	%%DATADIR%%/ifcpu64.c32
		18	%%DATADIR%%/ifmemdsk.c32
24	%%DATADIR%%/ifplop.c32	19	%%DATADIR%%/ifplop.c32
		20	%%DATADIR%%/isolinux.bin
25	%%DATADIR%%/kbdmap.c32	21	%%DATADIR%%/kbdmap.c32
		22	%%DATADIR%%/kontron_wdt.c32
26	%%DATADIR%%/linux.c32	23	%%DATADIR%%/linux.c32
27	%%DATADIR%%/ls.c32	24	%%DATADIR%%/ls.c32
		25	%%DATADIR%%/mbr.bin
		26	%%DATADIR%%/memdisk
28	%%DATADIR%%/meminfo.c32	27	%%DATADIR%%/meminfo.c32
		28	%%DATADIR%%/menu.c32
29	%%DATADIR%%/pcitest.c32	29	%%DATADIR%%/pcitest.c32
30	%%DATADIR%%/pmload.c32	30	%%DATADIR%%/pmload.c32
		31	%%DATADIR%%/prdhcp.c32
31	%%DATADIR%%/pwd.c32	32	%%DATADIR%%/pwd.c32
		33	%%DATADIR%%/pxechn.c32
		34	%%DATADIR%%/pxelinux.0
32	%%DATADIR%%/reboot.c32	35	%%DATADIR%%/reboot.c32
33	%%DATADIR%%/sanboot.c32	36	%%DATADIR%%/sanboot.c32
34	%%DATADIR%%/sdi.c32	37	%%DATADIR%%/sdi.c32
35	%%DATADIR%%/vesainfo.c32	38	%%DATADIR%%/vesainfo.c32
		39	%%DATADIR%%/vesamenu.c32
36	%%DATADIR%%/vpdtest.c32	40	%%DATADIR%%/vpdtest.c32
37	%%DATADIR%%/whichsys.c32	41	%%DATADIR%%/whichsys.c32
38	%%DATADIR%%/zzjson.c32	42	%%DATADIR%%/zzjson.c32