sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

sysutils/syslinux: update 6.02 -> 6.03

Browse source 
PR:		194642
Submitted by:	Uffe Jakobsen <uffe@uffe.org>
This commit is contained in:
Bartek Rutkowski 2014-11-24 19:21:43 +00:00
parent 1706b015b7
commit 6485bcdfea
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=373362
5 changed files with 33 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sysutils/syslinux/Makefile
View file

@ -2,8 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= syslinux PORTNAME= syslinux
PORTVERSION= 6.02 PORTVERSION= 6.03
PORTREVISION= 1
CATEGORIES= sysutils CATEGORIES= sysutils
MASTER_SITES= KERNEL_ORG/linux/utils/boot/syslinux MASTER_SITES= KERNEL_ORG/linux/utils/boot/syslinux
@ -35,11 +34,11 @@ post-patch:
's|^UMAKEDEPS|#UMAKEDEPS|' ${WRKSRC}/mk/syslinux.mk 's|^UMAKEDEPS|#UMAKEDEPS|' ${WRKSRC}/mk/syslinux.mk
do-install: do-install:
@${INSTALL_PROGRAM} ${WRKSRC}/bios/mtools/syslinux ${STAGEDIR}${PREFIX}/bin ${STRIP_CMD} ${WRKSRC}/bios/mtools/syslinux
@${INSTALL_MAN} ${WRKSRC}/man/syslinux.1 ${STAGEDIR}${MANPREFIX}/man/man1 ${INSTALL_PROGRAM} ${WRKSRC}/bios/mtools/syslinux ${STAGEDIR}${PREFIX}/bin
@${FIND} -d ${WRKSRC} -type d -empty -delete ${INSTALL_MAN} ${WRKSRC}/man/syslinux.1 ${STAGEDIR}${MANPREFIX}/man/man1
@${MKDIR} ${STAGEDIR}${DATADIR} ${FIND} -d ${WRKSRC} -type d -empty -delete
@(cd ${WRKSRC} && ${COPYTREE_SHARE} "bios efi32 efi64" ${STAGEDIR}${DATADIR}) ${MKDIR} ${STAGEDIR}${DATADIR}
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/share/syslinux/bios/mtools/syslinux (cd ${WRKSRC} && ${COPYTREE_SHARE} "bios efi32 efi64" ${STAGEDIR}${DATADIR})
.include <bsd.port.mk> .include <bsd.port.mk>

4
sysutils/syslinux/distinfo
View file

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

13
sysutils/syslinux/files/patch-Makefile
View file

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

20
sysutils/syslinux/files/patch-libinstaller-syslinux.h
View file

@ -1,13 +1,15 @@
--- libinstaller/syslinux.h.orig 2013-10-13 19:59:03.000000000 +0200 --- libinstaller/syslinux.h.orig 2014-10-06 18:27:44.000000000 +0200
+++ libinstaller/syslinux.h 2014-09-29 05:30:55.000000000 +0200 +++ libinstaller/syslinux.h 2014-10-21 23:58:17.000000000 +0200
@@ -13,20 +13,21 @@ @@ -13,6 +13,7 @@
#ifndef SYSLINUX_H #ifndef SYSLINUX_H
#define SYSLINUX_H #define SYSLINUX_H
+#include <sys/types.h> +#include <unistd.h>
#include <inttypes.h> #include <inttypes.h>
#include "advconst.h" #include "advconst.h"
#include "setadv.h" #include "setadv.h"
@@ -26,15 +27,15 @@
#endif
/* The standard boot sector and ldlinux image */ /* The standard boot sector and ldlinux image */
-extern unsigned char syslinux_bootsect[]; -extern unsigned char syslinux_bootsect[];
@ -15,18 +17,18 @@
extern const unsigned int syslinux_bootsect_len; extern const unsigned int syslinux_bootsect_len;
extern const int syslinux_bootsect_mtime; extern const int syslinux_bootsect_mtime;
-extern unsigned char syslinux_ldlinux[]; -extern unsigned char _slimg syslinux_ldlinux[];
-extern const unsigned int syslinux_ldlinux_len; -extern const unsigned int syslinux_ldlinux_len;
+extern unsigned char *syslinux_ldlinux; +extern unsigned char* _slimg syslinux_ldlinux;
+extern unsigned int syslinux_ldlinux_len; +extern unsigned int syslinux_ldlinux_len;
extern const int syslinux_ldlinux_mtime; extern const int syslinux_ldlinux_mtime;
-extern unsigned char syslinux_ldlinuxc32[]; -extern unsigned char _slimg syslinux_ldlinuxc32[];
+extern unsigned char *syslinux_ldlinuxc32; +extern unsigned char* _slimg syslinux_ldlinuxc32;
extern const unsigned int syslinux_ldlinuxc32_len; extern const unsigned int syslinux_ldlinuxc32_len;
#define boot_sector syslinux_bootsect #define boot_sector syslinux_bootsect
@@ -34,7 +35,7 @@ @@ -42,7 +43,7 @@
#define boot_image syslinux_ldlinux #define boot_image syslinux_ldlinux
#define boot_image_len syslinux_ldlinux_len #define boot_image_len syslinux_ldlinux_len

6
sysutils/syslinux/files/patch-libinstaller-syslxopt.c
View file

@ -1,5 +1,5 @@
--- libinstaller/syslxopt.c.orig 2010-10-20 21:25:38.000000000 +0200 --- libinstaller/syslxopt.c.orig 2014-10-06 18:27:44.000000000 +0200
+++ libinstaller/syslxopt.c 2010-11-16 15:09:16.897550744 +0100 +++ libinstaller/syslxopt.c 2014-10-21 23:25:13.000000000 +0200
@@ -45,6 +45,8 @@ @@ -45,6 +45,8 @@
.activate_partition = 0, .activate_partition = 0,
.force = 0, .force = 0,
@ -24,7 +24,7 @@
{"device", 1, NULL, OPT_DEVICE}, {"device", 1, NULL, OPT_DEVICE},
+ {"verbose", 0, NULL, 'v' }, + {"verbose", 0, NULL, 'v' },
+ {"bimage", 1, NULL, 'b' }, + {"bimage", 1, NULL, 'b' },
{0, 0, 0, 0} {NULL, 0, NULL, 0}
}; };
-const char short_options[] = "t:fid:UuzsS:H:rvho:OM:ma"; -const char short_options[] = "t:fid:UuzsS:H:rvho:OM:ma";