Attachment #148714 for bug #194642




# $FreeBSD$

PORTNAME=	syslinux
PORTVERSION=	6.03
PORTREVISION=	1
CATEGORIES=	sysutils
MASTER_SITES=	KERNEL_ORG/linux/utils/boot/syslinux


		's|^UMAKEDEPS|#UMAKEDEPS|' ${WRKSRC}/mk/syslinux.mk

do-install:
	${STRIP_CMD} ${WRKSRC}/bios/mtools/syslinux
	${INSTALL_PROGRAM} ${WRKSRC}/bios/mtools/syslinux ${STAGEDIR}${PREFIX}/bin
	${INSTALL_MAN} ${WRKSRC}/man/syslinux.1 ${STAGEDIR}${MANPREFIX}/man/man1
	${FIND} -d ${WRKSRC} -type d -empty -delete
	${MKDIR} ${STAGEDIR}${DATADIR}
	(cd ${WRKSRC} && ${COPYTREE_SHARE} "bios efi32 efi64" ${STAGEDIR}${DATADIR})

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (syslinux-6.02.tar.xz) = afa31b7cbf72e1c0c1752a0636ba724ce01c0e374366e46e61db6862b4685478	1	SHA256 (syslinux-6.03.tar.xz) = 26d3986d2bea109d5dc0e4f8c4822a459276cf021125e8c9f23c3cca5d8c850e
2	SIZE (syslinux-6.02.tar.xz) = 6471080	2	SIZE (syslinux-6.03.tar.xz) = 6855224




--- Makefile.orig	2014-10-06 18:27:44.000000000 +0200
+++ Makefile	2014-10-21 22:59:36.000000000 +0200
@@ -185,19 +185,20 @@
 
 else
 
-BSUBDIRS = codepage com32 lzo core memdisk mbr gpxe sample \
-	   diag libinstaller dos win32 win64 dosutil txt
+#BSUBDIRS = codepage com32 lzo core memdisk mbr gpxe sample \
+#	   diag libinstaller dos win32 win64 dosutil txt
 
 ITARGET  =

 	utils/gethostip utils/isohybrid utils/mkdiskimage \
 	mtools/syslinux linux/syslinux extlinux/extlinux
-ISUBDIRS = libinstaller mtools linux extlinux utils
+#ISUBDIRS = libinstaller mtools linux extlinux utils
+ISUBDIRS = libinstaller mtools
 
 # Things to install in /usr/bin
 INSTALL_BIN   =	mtools/syslinux




--- libinstaller/syslinux.h.orig	2014-10-06 18:27:44.000000000 +0200
+++ libinstaller/syslinux.h	2014-10-21 23:58:17.000000000 +0200
@@ -13,6 +13,7 @@
 #ifndef SYSLINUX_H
 #define SYSLINUX_H
 
+#include <unistd.h>
 #include <inttypes.h>
 #include "advconst.h"
 #include "setadv.h"
@@ -26,15 +27,15 @@
 #endif
 
 /* The standard boot sector and ldlinux image */
-extern unsigned char syslinux_bootsect[];
+extern unsigned char* syslinux_bootsect;
 extern const unsigned int syslinux_bootsect_len;
 extern const int syslinux_bootsect_mtime;
 
-extern unsigned char _slimg syslinux_ldlinux[];
-extern const unsigned int syslinux_ldlinux_len;
+extern unsigned char* _slimg syslinux_ldlinux;
+extern unsigned int syslinux_ldlinux_len;
 extern const int syslinux_ldlinux_mtime;
 
-extern unsigned char _slimg syslinux_ldlinuxc32[];
+extern unsigned char* _slimg syslinux_ldlinuxc32;
 extern const unsigned int syslinux_ldlinuxc32_len;
 
 #define boot_sector	syslinux_bootsect
@@ -42,7 +43,7 @@
 #define boot_image	syslinux_ldlinux
 #define boot_image_len	syslinux_ldlinux_len
 
-extern unsigned char syslinux_mbr[];
+extern unsigned char* syslinux_mbr;
 extern const unsigned int syslinux_mbr_len;
 extern const int syslinux_mbr_mtime;
 

Lines 1-5 Link Here

(-)files/patch-libinstaller-syslxopt.c (-3 / +3 lines)
1	--- libinstaller/syslxopt.c.orig 2010-10-20 21:25:38.000000000 +0200	1	--- libinstaller/syslxopt.c.orig 2014-10-06 18:27:44.000000000 +0200
2	+++ libinstaller/syslxopt.c 2010-11-16 15:09:16.897550744 +0100	2	+++ libinstaller/syslxopt.c 2014-10-21 23:25:13.000000000 +0200
3	@@ -45,6 +45,8 @@	3	@@ -45,6 +45,8 @@
4	.activate_partition = 0,	4	.activate_partition = 0,
5	.force = 0,	5	.force = 0,
Lines 24-30 Link Here
24	{"device", 1, NULL, OPT_DEVICE},	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	{NULL, 0, NULL, 0}
28	};	28	};
29		29
30	-const char short_options[] = "t:fid:UuzsS:H:rvho:OM:ma";	30	-const char short_options[] = "t:fid:UuzsS:H:rvho:OM:ma";

Return to bug 194642

Lines 2-9 Link Here

(-)Makefile (-8 / +7 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= syslinux	4	PORTNAME= syslinux
5	PORTVERSION= 6.02	5	PORTVERSION= 6.03
6	PORTREVISION= 1
7	CATEGORIES= sysutils	6	CATEGORIES= sysutils
8	MASTER_SITES= KERNEL_ORG/linux/utils/boot/syslinux	7	MASTER_SITES= KERNEL_ORG/linux/utils/boot/syslinux
9		8
Lines 35-45 Link Here
35	's\|^UMAKEDEPS\|#UMAKEDEPS\|' ${WRKSRC}/mk/syslinux.mk	34	's\|^UMAKEDEPS\|#UMAKEDEPS\|' ${WRKSRC}/mk/syslinux.mk
36		35
37	do-install:	36	do-install:
38	@${INSTALL_PROGRAM} ${WRKSRC}/bios/mtools/syslinux ${STAGEDIR}${PREFIX}/bin	37	${STRIP_CMD} ${WRKSRC}/bios/mtools/syslinux
39	@${INSTALL_MAN} ${WRKSRC}/man/syslinux.1 ${STAGEDIR}${MANPREFIX}/man/man1	38	${INSTALL_PROGRAM} ${WRKSRC}/bios/mtools/syslinux ${STAGEDIR}${PREFIX}/bin
40	@${FIND} -d ${WRKSRC} -type d -empty -delete	39	${INSTALL_MAN} ${WRKSRC}/man/syslinux.1 ${STAGEDIR}${MANPREFIX}/man/man1
41	@${MKDIR} ${STAGEDIR}${DATADIR}	40	${FIND} -d ${WRKSRC} -type d -empty -delete
42	@(cd ${WRKSRC} && ${COPYTREE_SHARE} "bios efi32 efi64" ${STAGEDIR}${DATADIR})	41	${MKDIR} ${STAGEDIR}${DATADIR}
43	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/share/syslinux/bios/mtools/syslinux	42	(cd ${WRKSRC} && ${COPYTREE_SHARE} "bios efi32 efi64" ${STAGEDIR}${DATADIR})
44		43
45	.include <bsd.port.mk>	44	.include <bsd.port.mk>

Lines 1-12 Link Here

(-)files/patch-Makefile (-6 / +7 lines)
1	--- Makefile.orig 2011-04-18 23:24:17.000000000 +0200	1	--- Makefile.orig 2014-10-06 18:27:44.000000000 +0200
2	+++ Makefile 2011-05-05 15:51:44.356358227 +0200	2	+++ Makefile 2014-10-21 22:59:36.000000000 +0200
3	@@ -170,19 +170,19 @@	3	@@ -185,19 +185,20 @@
4		4
5	else	5	else
6		6
7	-BSUBDIRS = codepage com32 lzo core memdisk mbr memdump gpxe sample \	7	-BSUBDIRS = codepage com32 lzo core memdisk mbr gpxe sample \
8	- diag libinstaller dos win32 win64 dosutil txt	8	- diag libinstaller dos win32 win64 dosutil txt
9	+#BSUBDIRS = codepage com32 lzo core memdisk mbr memdump gpxe sample \	9	+#BSUBDIRS = codepage com32 lzo core memdisk mbr gpxe sample \
10	+# diag libinstaller dos win32 win64 dosutil txt	10	+# diag libinstaller dos win32 win64 dosutil txt
11		11
12	ITARGET =	12	ITARGET =
Lines 14-20 Link Here
14	utils/gethostip utils/isohybrid utils/mkdiskimage \	14	utils/gethostip utils/isohybrid utils/mkdiskimage \
15	mtools/syslinux linux/syslinux extlinux/extlinux	15	mtools/syslinux linux/syslinux extlinux/extlinux
16	-ISUBDIRS = libinstaller mtools linux extlinux utils	16	-ISUBDIRS = libinstaller mtools linux extlinux utils
17	+ISUBDIRS = libinstaller mtools # linux extlinux utils	17	+#ISUBDIRS = libinstaller mtools linux extlinux utils
		18	+ISUBDIRS = libinstaller mtools
18		19
19	# Things to install in /usr/bin	20	# Things to install in /usr/bin
20	INSTALL_BIN = mtools/syslinux	21	INSTALL_BIN = mtools/syslinux

Lines 1-37 Link Here

(-)files/patch-libinstaller-syslinux.h (-12 / +14 lines)
1	--- libinstaller/syslinux.h.orig 2013-10-13 19:59:03.000000000 +0200	1	--- libinstaller/syslinux.h.orig 2014-10-06 18:27:44.000000000 +0200
2	+++ libinstaller/syslinux.h 2014-09-29 05:30:55.000000000 +0200	2	+++ libinstaller/syslinux.h 2014-10-21 23:58:17.000000000 +0200
3	@@ -13,20 +13,21 @@	3	@@ -13,6 +13,7 @@
4	#ifndef SYSLINUX_H	4	#ifndef SYSLINUX_H
5	#define SYSLINUX_H	5	#define SYSLINUX_H
6		6
7	+#include <sys/types.h>	7	+#include <unistd.h>
8	#include <inttypes.h>	8	#include <inttypes.h>
9	#include "advconst.h"	9	#include "advconst.h"
10	#include "setadv.h"	10	#include "setadv.h"
		11	@@ -26,15 +27,15 @@
		12	#endif
11		13
12	/* The standard boot sector and ldlinux image */	14	/* The standard boot sector and ldlinux image */
13	-extern unsigned char syslinux_bootsect[];	15	-extern unsigned char syslinux_bootsect[];
14	+extern unsigned char *syslinux_bootsect;	16	+extern unsigned char* syslinux_bootsect;
15	extern const unsigned int syslinux_bootsect_len;	17	extern const unsigned int syslinux_bootsect_len;
16	extern const int syslinux_bootsect_mtime;	18	extern const int syslinux_bootsect_mtime;
17		19
18	-extern unsigned char syslinux_ldlinux[];	20	-extern unsigned char _slimg syslinux_ldlinux[];
19	-extern const unsigned int syslinux_ldlinux_len;	21	-extern const unsigned int syslinux_ldlinux_len;
20	+extern unsigned char *syslinux_ldlinux;	22	+extern unsigned char* _slimg syslinux_ldlinux;
21	+extern unsigned int syslinux_ldlinux_len;	23	+extern unsigned int syslinux_ldlinux_len;
22	extern const int syslinux_ldlinux_mtime;	24	extern const int syslinux_ldlinux_mtime;
23		25
24	-extern unsigned char syslinux_ldlinuxc32[];	26	-extern unsigned char _slimg syslinux_ldlinuxc32[];
25	+extern unsigned char *syslinux_ldlinuxc32;	27	+extern unsigned char* _slimg syslinux_ldlinuxc32;
26	extern const unsigned int syslinux_ldlinuxc32_len;	28	extern const unsigned int syslinux_ldlinuxc32_len;
27		29
28	#define boot_sector syslinux_bootsect	30	#define boot_sector syslinux_bootsect
29	@@ -34,7 +35,7 @@	31	@@ -42,7 +43,7 @@
30	#define boot_image syslinux_ldlinux	32	#define boot_image syslinux_ldlinux
31	#define boot_image_len syslinux_ldlinux_len	33	#define boot_image_len syslinux_ldlinux_len
32		34
33	-extern unsigned char syslinux_mbr[];	35	-extern unsigned char syslinux_mbr[];
34	+extern unsigned char *syslinux_mbr;	36	+extern unsigned char* syslinux_mbr;
35	extern const unsigned int syslinux_mbr_len;	37	extern const unsigned int syslinux_mbr_len;
36	extern const int syslinux_mbr_mtime;	38	extern const int syslinux_mbr_mtime;
37		39