diff options
| author | jlam <jlam@pkgsrc.org> | 2008-04-12 22:42:57 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2008-04-12 22:42:57 +0000 |
| commit | 841dfa0e7aaa6a0f0cce2901291d1d938dd0fc0a (patch) | |
| tree | fdd67c81079412bf94013749a954125434a9baca /sysutils/e2fsprogs | |
| parent | 6874584eae20f517f70816571f6d4ac696db16b3 (diff) | |
| download | pkgsrc-841dfa0e7aaa6a0f0cce2901291d1d938dd0fc0a.tar.gz | |
Convert to use PLIST_VARS instead of manually passing "@comment "
through PLIST_SUBST to the plist module.
Diffstat (limited to 'sysutils/e2fsprogs')
| -rw-r--r-- | sysutils/e2fsprogs/Makefile | 15 | ||||
| -rw-r--r-- | sysutils/e2fsprogs/PLIST | 6 |
2 files changed, 9 insertions, 12 deletions
diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile index 12c04436b93..41c213938ff 100644 --- a/sysutils/e2fsprogs/Makefile +++ b/sysutils/e2fsprogs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2008/03/07 22:40:29 tron Exp $ +# $NetBSD: Makefile,v 1.17 2008/04/12 22:43:12 jlam Exp $ DISTNAME= e2fsprogs-1.40.7 CATEGORIES= sysutils @@ -16,16 +16,13 @@ INFO_FILES= # PLIST .include "../../mk/bsd.prefs.mk" +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} + # Only build fsck(8) on platforms that need it. -.if (${OPSYS} != "Linux") -FSCK= "@comment " +PLIST_VARS+= fsck +.if ${OPSYS} == "Linux" +PLIST.fsck= yes .else -FSCK= # empty -.endif -PLIST_SUBST+= FSCK=${FSCK} - -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} -.if !empty(FSCK) CONFIGURE_ARGS+= --disable-fsck .endif diff --git a/sysutils/e2fsprogs/PLIST b/sysutils/e2fsprogs/PLIST index 904fcb200fc..b5687b93e13 100644 --- a/sysutils/e2fsprogs/PLIST +++ b/sysutils/e2fsprogs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2008/03/07 22:40:29 tron Exp $ +@comment $NetBSD: PLIST,v 1.5 2008/04/12 22:43:12 jlam Exp $ bin/chattr bin/lsattr bin/uuidgen @@ -18,7 +18,7 @@ man/man8/e2image.8 man/man8/e2label.8 man/man8/filefrag.8 man/man8/findfs.8 -${FSCK}man/man8/fsck.8 +${PLIST.fsck}man/man8/fsck.8 man/man8/fsck.ext2.8 man/man8/fsck.ext3.8 man/man8/logsave.8 @@ -38,7 +38,7 @@ sbin/e2image sbin/e2label sbin/filefrag sbin/findfs -${FSCK}sbin/fsck +${PLIST.fsck}sbin/fsck sbin/fsck.ext2 sbin/fsck.ext3 sbin/logsave |