Attachment #39265 for bug #61938

View | Details | Raw Unified | Return to bug 61938
Collapse All | Expand All




#

PORTNAME=	grub
PORTVERSION=	0.94
CATEGORIES=	sysutils
MASTER_SITES=	ftp://alpha.gnu.org/gnu/grub/

MAINTAINER=	jedgar@FreeBSD.org
COMMENT=	GRand Unified Bootloader

GNU_CONFIGURE=	yes
USE_GMAKE=	yes
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-freebsd-freebsd${OSREL}
ONLY_FOR_ARCHS=	i386

MAN1=		mbchk.1
MAN8=		grub.8 grub-install.8 grub-md5-crypt.8
INFO=		grub multiboot

#.if defined(WITH_SPLASHIMAGE)
#PATCH_SITES=	http://people.redhat.com/~katzj/grub/patches/

#	@sleep 2
#.endif

.include <bsd.port.pre.mk>

pre-build:
	@${RM} -f ${WRKSRC}/docs/grub.info

post-install:
	@${CAT} ${PKGMESSAGE}

.include <bsd.port.mk>

Line 1 Link Here

(-)/usr/ports/sysutils/grub/distinfo (-1 / +1 lines)
1	MD5 (grub-0.92.tar.gz) = 50f2786e7bf96b1115ee82b9c101a816	1	MD5 (grub-0.94.tar.gz) = 299672a99cf59656e653d8ffd7851b56

Line 0 Link Here

(-)/usr/ports/sysutils/grub/files/patch-docs_Makefile.in (+11 lines)
	1	--- docs/Makefile.in.orig Sun Oct 19 21:28:23 2003
	2	+++ docs/Makefile.in Mon Jan 26 15:23:34 2004
	3	@@ -79,7 +79,7 @@
	4	MAINT = @MAINT@
	5	MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
	6	MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
	7	-MAKEINFO = @MAKEINFO@
	8	+MAKEINFO = @MAKEINFO@ --no-split
	9	NETBOOT_DRIVERS = @NETBOOT_DRIVERS@
	10	NETBOOT_SUPPORT_FALSE = @NETBOOT_SUPPORT_FALSE@
	11	NETBOOT_SUPPORT_TRUE = @NETBOOT_SUPPORT_TRUE@

Lines 1-11 Link Here

(-)/usr/ports/sysutils/grub/files/patch-dosc_Makefile.in (-11 lines)
1	--- docs/Makefile.in.orig Thu Jul 5 07:29:56 2001
2	+++ docs/Makefile.in Wed Oct 24 09:09:39 2001
3	@@ -248,7 +248,7 @@
4	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
5	$(TEXI2DVI) $<
6
7	-MAKEINFO = @MAKEINFO@
8	+MAKEINFO = @MAKEINFO@ --no-split
9	TEXI2DVI = texi2dvi
10	DVIPS = dvips
11	.dvi.ps:

Line 0 Link Here

(-)/usr/ports/sysutils/grub/files/patch-grub_asmstub.c (+11 lines)
	1	--- grub/asmstub.c.orig Sat Jan 24 01:52:56 2004
	2	+++ grub/asmstub.c Sat Jan 24 19:11:23 2004
	3	@@ -779,7 +779,7 @@
	4
	5	if (disks[drive].flags == -1)
	6	{
	7	- if (read_only \|\| errno == EACCES \|\| errno == EROFS)
	8	+ if (read_only \|\| errno == EACCES \|\| errno == EROFS \|\| errno == EPERM)
	9	{
	10	disks[drive].flags = open (devname, O_RDONLY);
	11	if (disks[drive].flags == -1)




--- lib/device.c.orig	Sat Jan 24 01:52:56 2004
+++ lib/device.c	Sun Jan 25 00:07:02 2004
@@ -78,6 +78,12 @@
 # include <sys/ioctl.h>		/* ioctl */
 # include <sys/disklabel.h>
 # include <sys/cdio.h>		/* CDIOCCLRDEBUG */
+#if defined(__FreeBSD__)
+#include <sys/param.h>
+#if __FreeBSD_version >= 500040
+#include <sys/disk.h>
+#endif
+#endif
 #endif /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ */
 
 #ifdef HAVE_OPENDISK
@@ -123,6 +129,7 @@
   /* FreeBSD, NetBSD or OpenBSD */
   {
     struct disklabel hdg;
+#if __FreeBSD_version < 500040
     if (ioctl (fd, DIOCGDINFO, &hdg))
       goto fail;
     
@@ -131,6 +138,38 @@
     geom->sectors = hdg.d_nsectors;
     geom->total_sectors = hdg.d_secperunit;
 
+#else
+    u_int    u, secsize;
+    off_t    mediasize;
+
+    if(ioctl(fd, DIOCGSECTORSIZE, &secsize) != 0)
+	secsize = 512;
+
+    if (ioctl(fd, DIOCGMEDIASIZE, &mediasize) != 0)
+	goto fail;
+
+    hdg.d_secperunit = mediasize / secsize;
+
+    if (ioctl(fd, DIOCGFWSECTORS, &u) == 0)
+	    hdg.d_nsectors = u;
+    else
+	    hdg.d_nsectors = 63;
+    if (ioctl(fd, DIOCGFWHEADS, &u) == 0)
+	    hdg.d_ntracks = u;
+    else if (hdg.d_secperunit <= 63*1*1024)
+	    hdg.d_ntracks = 1;
+    else if (hdg.d_secperunit <= 63*16*1024)
+	    hdg.d_ntracks = 16;
+    else
+	    hdg.d_ntracks = 255;
+    hdg.d_secpercyl = hdg.d_ntracks * hdg.d_nsectors;
+    hdg.d_ncylinders = hdg.d_secperunit / hdg.d_secpercyl;
+
+    geom->cylinders = hdg.d_ncylinders;
+    geom->heads = hdg.d_ntracks;
+    geom->sectors = hdg.d_nsectors;
+    geom->total_sectors = hdg.d_secperunit;
+#endif
     close (fd);
     return;
   }
@@ -233,7 +272,7 @@
 #elif defined(__FreeBSD__)
   /* FreeBSD */
 # if __FreeBSD__ >= 4

 # else /* __FreeBSD__ <= 3 */
   sprintf (name, "/dev/rwd%d", unit);
 # endif /* __FreeBSD__ <= 3 */
@@ -274,7 +313,11 @@
   sprintf (name, "/dev/sd%d", unit);
 #elif defined(__FreeBSD__)
   /* FreeBSD */
+# if __FreeBSD__ >= 4
+  sprintf (name, "/dev/da%d", unit);
+# else /* __FreeBSD__ <= 3 */
   sprintf (name, "/dev/rda%d", unit);
+# endif /* __FreeBSD__ <= 3 */
 #elif defined(__NetBSD__) && defined(HAVE_OPENDISK)
   /* NetBSD */
   char shortname[16];

Lines 1-11 Link Here

(-)/usr/ports/sysutils/grub/files/patch-stage2_fsys_reiserfs.c (-11 lines)
1	--- stage2/fsys_reiserfs.c.orig Tue Jan 6 11:05:27 2004
2	+++ stage2/fsys_reiserfs.c Tue Jan 6 11:05:59 2004
3	@@ -112,7 +112,7 @@
4	/* offset in the log of where to start replay after a crash */
5	__u32 j_first_unflushed_offset;
6	/* mount id to detect very old transactions */
7	- __u32 long j_mount_id;
8	+ __u32 j_mount_id;
9	};
10
11	/* magic string to find desc blocks in the journal */




--- stage2/xfs.h.orig	Sat Oct 27 12:04:25 2001
+++ stage2/xfs.h	Tue Jul  9 16:03:40 2002
@@ -33,7 +33,9 @@
  *  http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#ifndef _BITS_TYPES_H
+#include <sys/types.h>
+
+#if 0
 typedef signed char	__int8_t;
 typedef unsigned char	__uint8_t;
 typedef short		__int16_t;




bin/mbchk
@unexec install-info --delete %D/info/grub.info %D/info/dir
@unexec install-info --delete %D/info/multiboot.info %D/info/dir
info/grub.info
info/multiboot.info
@exec install-info %D/info/multiboot.info %D/info/dir
@exec install-info %D/info/grub.info %D/info/dir
sbin/grub
sbin/grub-install
sbin/grub-md5-crypt
sbin/grub-terminfo
share/grub/i386-freebsd/e2fs_stage1_5
share/grub/i386-freebsd/fat_stage1_5
share/grub/i386-freebsd/ffs_stage1_5

Return to bug 61938

Lines 6-25 Link Here

(-)/usr/ports/sysutils/grub/Makefile (-9 / +5 lines)
6	#	6	#
7		7
8	PORTNAME= grub	8	PORTNAME= grub
9	PORTVERSION= 0.92	9	PORTVERSION= 0.94
10	CATEGORIES= sysutils	10	CATEGORIES= sysutils
11	MASTER_SITES= http://www.gnu.org/software/grub/	11	MASTER_SITES= ftp://alpha.gnu.org/gnu/grub/
12		12
13	MAINTAINER= jedgar@FreeBSD.org	13	MAINTAINER= jedgar@FreeBSD.org
14	COMMENT= GRand Unified Bootloader	14	COMMENT= GRand Unified Bootloader
15		15
16	GNU_CONFIGURE= yes	16	GNU_CONFIGURE= yes
17	USE_GMAKE= yes	17	USE_GMAKE= yes
18	CONFIGURE_TARGET= ${MACHINE_ARCH}-freebsd-freebsd${OSREL}	18	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-freebsd-freebsd${OSREL}
19	ONLY_FOR_ARCHS= i386	19	ONLY_FOR_ARCHS= i386
20		20
21	MAN1= mbchk.1	21	MAN1= mbchk.1
22	MAN8= grub.8 grub-install.8 grub-md5-crypt.8	22	MAN8= grub.8 grub-install.8 grub-md5-crypt.8
		23	INFO= grub multiboot
23		24
24	#.if defined(WITH_SPLASHIMAGE)	25	#.if defined(WITH_SPLASHIMAGE)
25	#PATCH_SITES= http://people.redhat.com/~katzj/grub/patches/	26	#PATCH_SITES= http://people.redhat.com/~katzj/grub/patches/
Lines 35-46 Link Here
35	# @sleep 2	36	# @sleep 2
36	#.endif	37	#.endif
37		38
38	.include <bsd.port.pre.mk>
39
40	pre-build:
41	@${RM} -f ${WRKSRC}/docs/grub.info
42
43	post-install:	39	post-install:
44	@${CAT} ${PKGMESSAGE}	40	@${CAT} ${PKGMESSAGE}
45		41
46	.include <bsd.port.post.mk>	42	.include <bsd.port.mk>

Lines 1-6 Link Here

(-)/usr/ports/sysutils/grub/files/patch-lib_device.c (-5 / +68 lines)
1	--- lib/device.c.orig Sat Oct 13 00:20:05 2001	1	--- lib/device.c.orig Sat Jan 24 01:52:56 2004
2	+++ lib/device.c Sun Mar 24 10:31:41 2002	2	+++ lib/device.c Sun Jan 25 00:07:02 2004
3	@@ -209,7 +209,7 @@	3	@@ -78,6 +78,12 @@
		4	# include <sys/ioctl.h> /* ioctl */
		5	# include <sys/disklabel.h>
		6	# include <sys/cdio.h> /* CDIOCCLRDEBUG */
		7	+#if defined(__FreeBSD__)
		8	+#include <sys/param.h>
		9	+#if __FreeBSD_version >= 500040
		10	+#include <sys/disk.h>
		11	+#endif
		12	+#endif
		13	#endif /* __FreeBSD__ \|\| __NetBSD__ \|\| __OpenBSD__ */
		14
		15	#ifdef HAVE_OPENDISK
		16	@@ -123,6 +129,7 @@
		17	/* FreeBSD, NetBSD or OpenBSD */
		18	{
		19	struct disklabel hdg;
		20	+#if __FreeBSD_version < 500040
		21	if (ioctl (fd, DIOCGDINFO, &hdg))
		22	goto fail;
		23
		24	@@ -131,6 +138,38 @@
		25	geom->sectors = hdg.d_nsectors;
		26	geom->total_sectors = hdg.d_secperunit;
		27
		28	+#else
		29	+ u_int u, secsize;
		30	+ off_t mediasize;
		31	+
		32	+ if(ioctl(fd, DIOCGSECTORSIZE, &secsize) != 0)
		33	+ secsize = 512;
		34	+
		35	+ if (ioctl(fd, DIOCGMEDIASIZE, &mediasize) != 0)
		36	+ goto fail;
		37	+
		38	+ hdg.d_secperunit = mediasize / secsize;
		39	+
		40	+ if (ioctl(fd, DIOCGFWSECTORS, &u) == 0)
		41	+ hdg.d_nsectors = u;
		42	+ else
		43	+ hdg.d_nsectors = 63;
		44	+ if (ioctl(fd, DIOCGFWHEADS, &u) == 0)
		45	+ hdg.d_ntracks = u;
		46	+ else if (hdg.d_secperunit <= 6311024)
		47	+ hdg.d_ntracks = 1;
		48	+ else if (hdg.d_secperunit <= 63161024)
		49	+ hdg.d_ntracks = 16;
		50	+ else
		51	+ hdg.d_ntracks = 255;
		52	+ hdg.d_secpercyl = hdg.d_ntracks * hdg.d_nsectors;
		53	+ hdg.d_ncylinders = hdg.d_secperunit / hdg.d_secpercyl;
		54	+
		55	+ geom->cylinders = hdg.d_ncylinders;
		56	+ geom->heads = hdg.d_ntracks;
		57	+ geom->sectors = hdg.d_nsectors;
		58	+ geom->total_sectors = hdg.d_secperunit;
		59	+#endif
		60	close (fd);
		61	return;
		62	}
		63	@@ -233,7 +272,7 @@
4	#elif defined(__FreeBSD__)	64	#elif defined(__FreeBSD__)
5	/* FreeBSD */	65	/* FreeBSD */
6	# if __FreeBSD__ >= 4	66	# if __FreeBSD__ >= 4
Lines 9-20 Link Here
9	# else /* __FreeBSD__ <= 3 */	69	# else /* __FreeBSD__ <= 3 */
10	sprintf (name, "/dev/rwd%d", unit);	70	sprintf (name, "/dev/rwd%d", unit);
11	# endif /* __FreeBSD__ <= 3 */	71	# endif /* __FreeBSD__ <= 3 */
12	@@ -245,7 +245,7 @@	72	@@ -274,7 +313,11 @@
13	sprintf (name, "/dev/sd%d", unit);	73	sprintf (name, "/dev/sd%d", unit);
14	#elif defined(__FreeBSD__)	74	#elif defined(__FreeBSD__)
15	/* FreeBSD */	75	/* FreeBSD */
16	- sprintf (name, "/dev/rda%d", unit);	76	+# if __FreeBSD__ >= 4
17	+ sprintf (name, "/dev/da%d", unit);	77	+ sprintf (name, "/dev/da%d", unit);
		78	+# else /* __FreeBSD__ <= 3 */
		79	sprintf (name, "/dev/rda%d", unit);
		80	+# endif /* __FreeBSD__ <= 3 */
18	#elif defined(__NetBSD__) && defined(HAVE_OPENDISK)	81	#elif defined(__NetBSD__) && defined(HAVE_OPENDISK)
19	/* NetBSD */	82	/* NetBSD */
20	char shortname[16];	83	char shortname[16];

Lines 1-13 Link Here

(-)/usr/ports/sysutils/grub/files/patch-stage2_xfs.h (-13 lines)
1	--- stage2/xfs.h.orig Sat Oct 27 12:04:25 2001
2	+++ stage2/xfs.h Tue Jul 9 16:03:40 2002
3	@@ -33,7 +33,9 @@
4	* http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
5	*/
6
7	-#ifndef _BITS_TYPES_H
8	+#include <sys/types.h>
9	+
10	+#if 0
11	typedef signed char __int8_t;
12	typedef unsigned char __uint8_t;
13	typedef short __int16_t;

Lines 1-13 Link Here

(-)/usr/ports/sysutils/grub/pkg-plist (-6 / +1 lines)
1	bin/mbchk	1	bin/mbchk
2	@unexec install-info --delete %D/info/grub.info %D/info/dir
3	@unexec install-info --delete %D/info/multiboot.info %D/info/dir
4	info/grub.info
5	info/multiboot.info
6	@exec install-info %D/info/multiboot.info %D/info/dir
7	@exec install-info %D/info/grub.info %D/info/dir
8	sbin/grub	2	sbin/grub
9	sbin/grub-install	3	sbin/grub-install
10	sbin/grub-md5-crypt	4	sbin/grub-md5-crypt
		5	sbin/grub-terminfo
11	share/grub/i386-freebsd/e2fs_stage1_5	6	share/grub/i386-freebsd/e2fs_stage1_5
12	share/grub/i386-freebsd/fat_stage1_5	7	share/grub/i386-freebsd/fat_stage1_5
13	share/grub/i386-freebsd/ffs_stage1_5	8	share/grub/i386-freebsd/ffs_stage1_5