ports/60988: PATCH: fix build of grub-0.92

[Nate Lawson]

>Number:         60988
>Category:       ports
>Synopsis:       PATCH: fix build of grub-0.92
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jan 06 11:30:15 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Nate Lawson
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
FreeBSD
>Environment:
System:

>Description:
	grub-0.92 port is broken on 5-CURRENT.  Attached patches below
	fix the build.  I don't have reiserfs so someone should test it
	but I believe the patch to it is simple.

>How-To-Repeat:
>Fix:
###	Apply this patch to the port Makefile:

--- Makefile.orig	Mon Dec 22 22:12:18 2003
+++ Makefile	Tue Jan  6 11:13:07 2004
@@ -37,12 +37,8 @@

 .include <bsd.port.pre.mk>

-.if ${OSVERSION} >= 500113
-BROKEN=		"Does not compile on FreeBSD ${OSVERSION}"
-.endif
-
 pre-build:
-	@${RM} ${WRKSRC}/docs/grub.info*
+	@${RM} -f ${WRKSRC}/docs/grub.info

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

###	Add this patch as grub-0.92/files/patch-stage2_fsys_reiserfs.c:

--- stage2/fsys_reiserfs.c.orig	Tue Jan  6 11:05:27 2004
+++ stage2/fsys_reiserfs.c	Tue Jan  6 11:05:59 2004
@@ -112,7 +112,7 @@
   /* offset in the log of where to start replay after a crash */
   __u32 j_first_unflushed_offset;
   /* mount id to detect very old transactions */
-  __u32 long j_mount_id;
+  __u64 j_mount_id;
 };

 /* magic string to find desc blocks in the journal */

>Release-Note:
>Audit-Trail:
>Unformatted: