summaryrefslogtreecommitdiff
path: root/sysutils/grub/Makefile
diff options
context:
space:
mode:
authorxtraeme <xtraeme@pkgsrc.org>2004-06-20 20:57:17 +0000
committerxtraeme <xtraeme@pkgsrc.org>2004-06-20 20:57:17 +0000
commit360c467eeb006e58a36cbad557089bc7907b47b1 (patch)
treee8e31e08ac6f96b1ba5b41cc537b15e2e7cea288 /sysutils/grub/Makefile
parentfa4888b7a4e1d78e2a8dabc33d8cb6e596093c1d (diff)
downloadpkgsrc-360c467eeb006e58a36cbad557089bc7907b47b1.tar.gz
Update sysutils/grub to 0.95, and remove obsoleted options
GRUB_USE_UFS2/GRUB_USE_ISO9660, they are not longer needed. New in 0.95 - 2004-06-13: * Add support for ReiserFS 3. * Fix support for FreeBSD 5. * Support ATARAID for Linux in the grub shell and grub-install. * Add CDROM support for El Torito with no emulation mode. You can use (cd) as a CDROM drive in the config file. * Option --no-mem-option is implied for Linux 2.4.18 and newer. * Add support for UFS2.
Diffstat (limited to 'sysutils/grub/Makefile')
-rw-r--r--sysutils/grub/Makefile43
1 files changed, 2 insertions, 41 deletions
diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile
index 6c29aaa510f..c3eae012585 100644
--- a/sysutils/grub/Makefile
+++ b/sysutils/grub/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2004/05/02 20:04:36 xtraeme Exp $
+# $NetBSD: Makefile,v 1.26 2004/06/20 20:57:17 xtraeme Exp $
#
-DISTNAME= grub-0.94
-PKGREVISION= 1
+DISTNAME= grub-0.95
CATEGORIES= sysutils
MASTER_SITES= ftp://alpha.gnu.org/gnu/grub/
@@ -25,8 +24,6 @@ BUILDLINK_TRANSFORM+= S:-fno-builtin:-ffreestanding:
BUILD_DEFS+= GRUB_NETWORK_CARDS
BUILD_DEFS+= GRUB_PRESET_COMMAND
BUILD_DEFS+= GRUB_SCAN_ARGS
-BUILD_DEFS+= GRUB_USE_ISO9660
-BUILD_DEFS+= GRUB_USE_UFS2
.if defined(GRUB_NETWORK_CARDS)
CONFIGURE_ARGS+= --enable-diskless
@@ -55,42 +52,6 @@ post-extract:
CONFIGURE_ARGS+= ${GRUB_SCAN_ARGS}
.endif
-.if !empty(GRUB_USE_ISO9660:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+= --enable-iso9660
-PATCHFILES+= grub-0.94-iso9660.diff
-SITES_grub-0.94-iso9660.diff=ftp://ftp.netbsd.org/pub/NetBSD/misc/xtraeme/
-
-PLIST_SUBST+= ISO9660=
-.else
-PLIST_SUBST+= ISO9660="@comment "
-.endif
-
-.if !empty(GRUB_USE_UFS2:M[Yy][Ee][Ss])
-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 (!empty(GRUB_USE_ISO9660:M[Yy][Ee][Ss]) || \
- !empty(GRUB_USE_UFS2:M[Yy][Ee][Ss]))
-pre-configure:
- cd ${WRKSRC}; \
- ${ACLOCAL}; \
- ${AUTOHEADER}; \
- ${AUTOMAKE} -a --foreign -i; \
- ${AUTOCONF}
-.include "../../mk/automake.mk"
-.endif
-
-.if (!empty(GRUB_USE_ISO9660:M[Yy][Ee][Ss]) && \
- !empty(GRUB_USE_UFS2:M[Yy][Ee][Ss]))
-PKG_FAIL_REASON+= "Please use GRUB_USE_ISO9660 or GRUB_USE_UFS2, but not both."
-.endif
-
.include "../../devel/binutils/buildlink3.mk"
.include "../../devel/ncurses/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"