[pkgsrc/trunk]: pkgsrc/sysutils/grub Add support for UFS2 from FreeBSD. Patch...

[xtraeme <xtraeme%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d36343501c0d
branches:  trunk
changeset: 474579:d36343501c0d
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Sun May 02 17:00:14 2004 +0000

description:
Add support for UFS2 from FreeBSD. Patch provided by FUKAUMI Naoki
in PR pkg/25434.

diffstat:

 sysutils/grub/Makefile |  35 +++++++++++++++++++++++++++--------
 sysutils/grub/PLIST    |   3 ++-
 sysutils/grub/distinfo |   4 +++-
 3 files changed, 32 insertions(+), 10 deletions(-)

diffs (98 lines):

diff -r eec985aad468 -r d36343501c0d sysutils/grub/Makefile
--- a/sysutils/grub/Makefile    Sun May 02 16:53:28 2004 +0000
+++ b/sysutils/grub/Makefile    Sun May 02 17:00:14 2004 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2004/04/26 15:42:44 xtraeme Exp $
+# $NetBSD: Makefile,v 1.24 2004/05/02 17:00:14 xtraeme Exp $
 #
 
 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,19 +59,36 @@
 .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};                                             \
-       ${AUTOHEADER};                                          \
-       ${AUTOMAKE} -a --foreign -i;                            \
+       cd ${WRKSRC};                                           \
+       ${ACLOCAL};                                             \
+       ${AUTOHEADER};                                          \
+       ${AUTOMAKE} -a --foreign -i;                            \
        ${AUTOCONF}
 .include "../../mk/automake.mk"
-.else
-PLIST_SUBST+=          ISO9660="@comment "
+.endif
+
+.if defined(GRUB_ISO9660) && defined(GRUB_UFS2)
+PKG_FAIL_REASON+=      "Please use GRUB_ISO9660 or GRUB_UFS2, but not both."
 .endif
 
 .include "../../devel/binutils/buildlink3.mk"
diff -r eec985aad468 -r d36343501c0d sysutils/grub/PLIST
--- a/sysutils/grub/PLIST       Sun May 02 16:53:28 2004 +0000
+++ b/sysutils/grub/PLIST       Sun May 02 17:00:14 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2004/04/26 15:42:44 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.9 2004/05/02 17:00:14 xtraeme Exp $
 bin/mbchk
 man/man1/mbchk.1
 man/man8/grub-install.8
@@ -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}-
diff -r eec985aad468 -r d36343501c0d sysutils/grub/distinfo
--- a/sysutils/grub/distinfo    Sun May 02 16:53:28 2004 +0000
+++ b/sysutils/grub/distinfo    Sun May 02 17:00:14 2004 +0000
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.9 2004/04/26 15:42:44 xtraeme Exp $
+$NetBSD: distinfo,v 1.10 2004/05/02 17:00:14 xtraeme Exp $
 
 SHA1 (grub-0.94.tar.gz) = 12e0a2b7b6ee998232b057a8182ae54c33a6e0c5
 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