>Number:         25434
>Category:       pkg
>Synopsis:       sysutils/grub add UFS2 support from FreeBSD ports
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun May 02 15:54:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     FUKAUMI Naoki
>Release:        NetBSD 2.0E
>Organization:
	FUKAUMI Naoki
>Environment:
System: NetBSD ea65.naobsd.org 2.0E NetBSD 2.0E (EA65-MP) #0: Sun May 2 15:51:39 JST 2004 root@ea65.naobsd.org:/usr/obj/i386/sys/arch/i386/compile/EA65-MP i386
Architecture: i386
Machine: i386
>Description:
	Add UFS2 support from FreeBSD ports.

	XXX Can't use both GRUB_UFS2 and GRUB_ISO9660 at the same time.
>How-To-Repeat:
>Fix:
Index: Makefile
===================================================================
RCS file: /home/fun/cvsroot/NetBSD/pkgsrc/sysutils/grub/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- Makefile	26 Apr 2004 15:42:44 -0000	1.23
+++ Makefile	2 May 2004 14:46:29 -0000
@@ -2,6 +2,7 @@
 #
 
 DISTNAME=	grub-0.94
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://alpha.gnu.org/gnu/grub/
 
@@ -25,6 +26,7 @@
 BUILD_DEFS+=		GRUB_PRESET_COMMAND
 BUILD_DEFS+=		GRUB_SCAN_ARGS
 BUILD_DEFS+=		GRUB_ISO9660
+BUILD_DEFS+=		GRUB_UFS2
 
 .if defined(GRUB_NETWORK_CARDS)
 CONFIGURE_ARGS+=	--enable-diskless
@@ -57,10 +59,25 @@
 .if defined(GRUB_ISO9660)
 CONFIGURE_ARGS+=	--enable-iso9660
 PATCHFILES+=		grub-0.94-iso9660.diff
-PATCH_SITES+=		ftp://ftp.netbsd.org/pub/NetBSD/misc/xtraeme/	
+SITES_grub-0.94-iso9660.diff=ftp://ftp.netbsd.org/pub/NetBSD/misc/xtraeme/
 
 PLIST_SUBST+=		ISO9660=
+.else
+PLIST_SUBST+=		ISO9660="@comment "
+.endif
 
+# UFS2 support for GRUB
+.if defined(GRUB_UFS2)
+CONFIGURE_ARGS+=	--enable-ufs2
+PATCHFILES+=		patch-ufs2
+SITES_patch-ufs2=http://sources.freebsd.org/HEAD/ports/sysutils/grub/files/
+
+PLIST_SUBST+=		UFS2=
+.else
+PLIST_SUBST+=		UFS2="@comment "
+.endif
+
+.if defined(GRUB_ISO9660) || defined(GRUB_UFS2)
 pre-configure:
 	cd ${WRKSRC};                                           \
 	${ACLOCAL};                                             \
@@ -68,8 +85,6 @@
 	${AUTOMAKE} -a --foreign -i;                            \
 	${AUTOCONF}
 .include "../../mk/automake.mk"
-.else
-PLIST_SUBST+=		ISO9660="@comment "
 .endif
 
 .include "../../devel/binutils/buildlink3.mk"
Index: PLIST
===================================================================
RCS file: /home/fun/cvsroot/NetBSD/pkgsrc/sysutils/grub/PLIST,v
retrieving revision 1.8
diff -u -r1.8 PLIST
--- PLIST	26 Apr 2004 15:42:44 -0000	1.8
+++ PLIST	2 May 2004 14:57:04 -0000
@@ -22,6 +22,7 @@
 share/grub/${MACHINE_ARCH}-/stage1
 share/grub/${MACHINE_ARCH}-/stage2
 ${ISO9660}share/grub/${MACHINE_ARCH}-/stage2_eltorito
+${UFS2}share/grub/${MACHINE_ARCH}-/ufs2_stage1_5
 share/grub/${MACHINE_ARCH}-/vstafs_stage1_5
 share/grub/${MACHINE_ARCH}-/xfs_stage1_5
 @dirrm share/grub/${MACHINE_ARCH}-
Index: distinfo
===================================================================
RCS file: /home/fun/cvsroot/NetBSD/pkgsrc/sysutils/grub/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo	26 Apr 2004 15:42:44 -0000	1.9
+++ distinfo	2 May 2004 14:47:13 -0000
@@ -4,6 +4,8 @@
 Size (grub-0.94.tar.gz) = 923518 bytes
 SHA1 (grub-0.94-iso9660.diff) = dcfb9c5701d3ace112d91f2c498263e9c6cba97a
 Size (grub-0.94-iso9660.diff) = 51623 bytes
+SHA1 (patch-ufs2) = bc54fff740e3b6ff3d177903c0ca61d8654752da
+Size (patch-ufs2) = 256937 bytes
 SHA1 (patch-aa) = f2b6a1c0ec11c1c01f39bf6241291fc0c3879e34
 SHA1 (patch-ab) = 274f05f518de51b708102ec853641e237fd40990
 SHA1 (patch-ai) = 61d81c9b4f1bbec6e9bd1f922f1a88cd7a02a8ba
>Release-Note:
>Audit-Trail:
>Unformatted: