From 7abb4fb5cd58ca293f2fa8197fbc95db9229622c Mon Sep 17 00:00:00 2001 From: Pav Lucistnik <pav@FreeBSD.org> Date: Tue, 6 Jan 2004 22:36:03 +0000 Subject: [PATCH] - Fix build on -CURRENT PR: ports/60988 Submitted by: nate --- sysutils/grub/Makefile | 6 +----- sysutils/grub/files/patch-stage2_fsys_reiserfs.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 sysutils/grub/files/patch-stage2_fsys_reiserfs.c diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile index 775341c8cd4e..6c7f041ae7c9 100644 --- a/sysutils/grub/Makefile +++ b/sysutils/grub/Makefile @@ -37,12 +37,8 @@ MAN8= grub.8 grub-install.8 grub-md5-crypt.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} diff --git a/sysutils/grub/files/patch-stage2_fsys_reiserfs.c b/sysutils/grub/files/patch-stage2_fsys_reiserfs.c new file mode 100644 index 000000000000..becc81d01f95 --- /dev/null +++ b/sysutils/grub/files/patch-stage2_fsys_reiserfs.c @@ -0,0 +1,11 @@ +--- 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 */