diff options
| author | jlam <jlam> | 2008-04-12 22:42:57 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2008-04-12 22:42:57 +0000 |
| commit | 9ff693053b2b42cd6a29b886e071ad01acdeefe2 (patch) | |
| tree | fdd67c81079412bf94013749a954125434a9baca /sysutils/grub | |
| parent | 4a580ef74536ed1f7c6a7ecd5a26e46a93aec9b3 (diff) | |
| download | pkgsrc-9ff693053b2b42cd6a29b886e071ad01acdeefe2.tar.gz | |
Convert to use PLIST_VARS instead of manually passing "@comment "
through PLIST_SUBST to the plist module.
Diffstat (limited to 'sysutils/grub')
| -rw-r--r-- | sysutils/grub/Makefile | 7 | ||||
| -rw-r--r-- | sysutils/grub/PLIST | 10 |
2 files changed, 8 insertions, 9 deletions
diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile index 7722f97f224..7496f8386cb 100644 --- a/sysutils/grub/Makefile +++ b/sysutils/grub/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2007/10/07 18:00:55 xtraeme Exp $ +# $NetBSD: Makefile,v 1.49 2008/04/12 22:43:12 jlam Exp $ DISTNAME= grub-0.97 PKGREVISION= 8 @@ -25,9 +25,10 @@ BUILD_DEFS+= GRUB_SCAN_ARGS .include "../../mk/curses.buildlink3.mk" +PLIST_VARS+= netboot .if defined(GRUB_NETWORK_CARDS) CONFIGURE_ARGS+= --enable-diskless -PLIST_SUBST+= NETBOOT= +PLIST.netboot= yes .for nic in ${GRUB_NETWORK_CARDS} CONFIGURE_ARGS+= --enable-${nic} @@ -38,8 +39,6 @@ grub-netboot-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/grub ${INSTALL_DATA} ${WRKSRC}/netboot/README.netboot \ ${PREFIX}/share/doc/grub -.else -PLIST_SUBST+= NETBOOT="@comment " .endif .if defined(GRUB_PRESET_COMMAND) && !empty(GRUB_PRESET_COMMAND) diff --git a/sysutils/grub/PLIST b/sysutils/grub/PLIST index da0ceb4056a..3e5e8bf77b8 100644 --- a/sysutils/grub/PLIST +++ b/sysutils/grub/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2006/04/07 19:54:17 jlam Exp $ +@comment $NetBSD: PLIST,v 1.14 2008/04/12 22:43:12 jlam Exp $ bin/mbchk info/grub.info info/multiboot.info @@ -13,8 +13,8 @@ lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/ffs_stage1_5 lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/iso9660_stage1_5 lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/jfs_stage1_5 lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/minix_stage1_5 -${NETBOOT}lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/nbgrub -${NETBOOT}lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/pxegrub +${PLIST.netboot}lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/nbgrub +${PLIST.netboot}lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/pxegrub lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/reiserfs_stage1_5 lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/stage1 lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/stage2 @@ -27,7 +27,7 @@ sbin/grub-install sbin/grub-md5-crypt sbin/grub-set-default sbin/grub-terminfo -${NETBOOT}share/doc/grub/README.netboot +${PLIST.netboot}share/doc/grub/README.netboot @dirrm lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR} @dirrm lib/grub -${NETBOOT}@dirrm share/doc/grub +${PLIST.netboot}@dirrm share/doc/grub |