diff options
| author | krion <krion@FreeBSD.org> | 2006-04-17 11:15:29 +0000 |
|---|---|---|
| committer | krion <krion@FreeBSD.org> | 2006-04-17 11:15:29 +0000 |
| commit | b8197b1571825a13b79fb1c6653ce66ea6434d0b (patch) | |
| tree | c29c847d1d41bbd9126e2a78fe5f38109f5ebc28 | |
| parent | d309c87c8a20a2a67a2245cafe053ddfec959c6d (diff) | |
| download | FreeBSD-src-b8197b1571825a13b79fb1c6653ce66ea6434d0b.zip FreeBSD-src-b8197b1571825a13b79fb1c6653ce66ea6434d0b.tar.gz | |
Add INDEX-7 and remove trailing spaces.
MFC after: 5 days
| -rw-r--r-- | usr.sbin/pkg_install/lib/lib.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/usr.sbin/pkg_install/lib/lib.h b/usr.sbin/pkg_install/lib/lib.h index 2227f85..ad87024 100644 --- a/usr.sbin/pkg_install/lib/lib.h +++ b/usr.sbin/pkg_install/lib/lib.h @@ -77,7 +77,9 @@ #define DISPLAY_FNAME "+DISPLAY" #define MTREE_FNAME "+MTREE_DIRS" -#if defined(__FreeBSD_version) && __FreeBSD_version >= 600000 +#if defined(__FreeBSD_version) && __FreeBSD_version >= 700000 +#define INDEX_FNAME "INDEX-7" +#elif defined(__FreeBSD_version) && __FreeBSD_version >= 600000 #define INDEX_FNAME "INDEX-6" #elif defined(__FreeBSD_version) && __FreeBSD_version >= 500036 #define INDEX_FNAME "INDEX-5" @@ -107,7 +109,7 @@ enum _plist_t { PLIST_FILE, PLIST_CWD, PLIST_CMD, PLIST_CHMOD, PLIST_CHOWN, PLIST_CHGRP, PLIST_COMMENT, PLIST_IGNORE, PLIST_NAME, PLIST_UNEXEC, PLIST_SRC, PLIST_DISPLAY, - PLIST_PKGDEP, PLIST_CONFLICTS, PLIST_MTREE, PLIST_DIR_RM, + PLIST_PKGDEP, PLIST_CONFLICTS, PLIST_MTREE, PLIST_DIR_RM, PLIST_IGNORE_INST, PLIST_OPTION, PLIST_ORIGIN, PLIST_DEPORIGIN, PLIST_NOINST }; @@ -142,7 +144,7 @@ struct reqr_by_entry { char pkgname[PATH_MAX]; }; STAILQ_HEAD(reqr_by_head, reqr_by_entry); - + /* Prototypes */ /* Misc */ int vsystem(const char *, ...); |
