kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rename GRUB_ISO9660 and GRUB_UFS2 to GRUB_USE_ISO9660 and GRUB_USE_UFS2

Browse source 
respectively, and document them in bsd.pkg.defaults.mk.
This commit is contained in:
xtraeme 2004-05-02 20:04:36 +00:00
parent 68acc385a6
commit e1e5944f20
2 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
mk/bsd.pkg.defaults.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: bsd.pkg.defaults.mk,v 1.236 2004/05/02 19:15:18 xtraeme Exp $
# $NetBSD: bsd.pkg.defaults.mk,v 1.237 2004/05/02 20:04:36 xtraeme Exp $
#
# A file providing defaults for pkgsrc and the packages collection.
@ -961,6 +961,16 @@ GOLEM_WITH_SOUND?= NO
# card at I/O offset 0x300.
# Default: not defined
GRUB_USE_ISO9660?= NO
# This option will add support for the ISO9660 filesystem to GRUB.
# Possible: yes or no.
# Default: no.
GRUB_USE_UFS2?= NO
# This option will add support for the UFS2 filesystem to GRUB.
# Possible: yes or no.
# Default: no.
ICECAST_CHROOTDIR?= /var/chroot/icecast
# Used in icecast2 to specify the chroot directory in which icecast
# will be allowed to work.

20
sysutils/grub/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.24 2004/05/02 17:00:14 xtraeme Exp $
# $NetBSD: Makefile,v 1.25 2004/05/02 20:04:36 xtraeme Exp $
#
DISTNAME= grub-0.94
@ -25,8 +25,8 @@ BUILDLINK_TRANSFORM+= S:-fno-builtin:-ffreestanding:
BUILD_DEFS+= GRUB_NETWORK_CARDS
BUILD_DEFS+= GRUB_PRESET_COMMAND
BUILD_DEFS+= GRUB_SCAN_ARGS
BUILD_DEFS+= GRUB_ISO9660
BUILD_DEFS+= GRUB_UFS2
BUILD_DEFS+= GRUB_USE_ISO9660
BUILD_DEFS+= GRUB_USE_UFS2
.if defined(GRUB_NETWORK_CARDS)
CONFIGURE_ARGS+= --enable-diskless
@ -55,8 +55,7 @@ post-extract:
CONFIGURE_ARGS+= ${GRUB_SCAN_ARGS}
.endif
# eltorito support for GRUB
.if defined(GRUB_ISO9660)
.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/
@ -66,8 +65,7 @@ PLIST_SUBST+= ISO9660=
PLIST_SUBST+= ISO9660="@comment "
.endif
# UFS2 support for GRUB
.if defined(GRUB_UFS2)
.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/
@ -77,7 +75,8 @@ PLIST_SUBST+= UFS2=
PLIST_SUBST+= UFS2="@comment "
.endif
.if defined(GRUB_ISO9660) || defined(GRUB_UFS2)
.if (!empty(GRUB_USE_ISO9660:M[Yy][Ee][Ss]) || \
!empty(GRUB_USE_UFS2:M[Yy][Ee][Ss]))
pre-configure:
cd ${WRKSRC}; \
${ACLOCAL}; \
@ -87,8 +86,9 @@ pre-configure:
.include "../../mk/automake.mk"
.endif
.if defined(GRUB_ISO9660) && defined(GRUB_UFS2)
PKG_FAIL_REASON+= "Please use GRUB_ISO9660 or GRUB_UFS2, but not both."
.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"