diff options
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/pkg_install/create/pkg_create.1 | 11 | ||||
| -rw-r--r-- | usr.sbin/pkg_install/info/show.c | 10 | ||||
| -rw-r--r-- | usr.sbin/pkg_install/lib/lib.h | 3 | ||||
| -rw-r--r-- | usr.sbin/pkg_install/lib/plist.c | 5 |
4 files changed, 6 insertions, 23 deletions
diff --git a/usr.sbin/pkg_install/create/pkg_create.1 b/usr.sbin/pkg_install/create/pkg_create.1 index ab07303ec09..d4458e5d77a 100644 --- a/usr.sbin/pkg_install/create/pkg_create.1 +++ b/usr.sbin/pkg_install/create/pkg_create.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pkg_create.1,v 1.21 2001/09/06 15:04:34 mpech Exp $ +.\" $OpenBSD: pkg_create.1,v 1.22 2001/11/07 20:57:23 espie Exp $ .\" .\" FreeBSD install - a package for the installation and maintainance .\" of non-core utilities. @@ -345,15 +345,6 @@ may trip someone up later. .It Cm @ignore Used internally to tell extraction to ignore the next file (don't copy it anywhere), as it's used for some special purpose. -.It Cm @ignore_inst -Similar to -.Cm @ignore , -but the ignoring of the next file is delayed one evaluation cycle. -This makes it possible to use this directive in the -.Ar packinglist -file, so you can pack a -specialized datafile in with a distribution for your install script (or -something) yet have the installer ignore it. .It Cm @name Ar name Set the name of the package. This is mandatory and is usually put at the top. diff --git a/usr.sbin/pkg_install/info/show.c b/usr.sbin/pkg_install/info/show.c index 7c988cd419b..457f4a11c5a 100644 --- a/usr.sbin/pkg_install/info/show.c +++ b/usr.sbin/pkg_install/info/show.c @@ -1,7 +1,7 @@ -/* $OpenBSD: show.c,v 1.9 2001/04/08 16:45:47 espie Exp $ */ +/* $OpenBSD: show.c,v 1.10 2001/11/07 20:57:23 espie Exp $ */ #ifndef lint -static const char *rcsid = "$OpenBSD: show.c,v 1.9 2001/04/08 16:45:47 espie Exp $"; +static const char *rcsid = "$OpenBSD: show.c,v 1.10 2001/11/07 20:57:23 espie Exp $"; #endif /* @@ -53,8 +53,6 @@ static show_t showv[] = { { PLIST_PKGDEP, "@pkgdep %s", "\tPackage depends on: %s" }, { PLIST_MTREE, "@mtree %s", "\tPackage mtree file: %s" }, { PLIST_DIR_RM, "@dirrm %s", "\tDeinstall directory remove: %s" }, - { PLIST_IGNORE_INST, "@ignore_inst ??? doesn't belong here", - "\tIgnore next file installation directive (doesn't belong)" }, { PLIST_OPTION, "@option %s", "\tPackage has option: %s" }, { PLIST_PKGCFL, "@pkgcfl %s", "\tPackage conflicts with: %s" }, { -1, NULL, NULL } @@ -140,10 +138,6 @@ show_plist(char *title, package_t *plist, pl_ent_t type) case PLIST_IGNORE: ign = TRUE; break; - case PLIST_IGNORE_INST: - printf(Quiet ? showv[p->type].sh_quiet : showv[p->type].sh_verbose, p->name); - ign = TRUE; - break; case PLIST_CWD: case PLIST_CMD: case PLIST_SRC: diff --git a/usr.sbin/pkg_install/lib/lib.h b/usr.sbin/pkg_install/lib/lib.h index e62e1602121..075ded9c77c 100644 --- a/usr.sbin/pkg_install/lib/lib.h +++ b/usr.sbin/pkg_install/lib/lib.h @@ -1,4 +1,4 @@ -/* $OpenBSD: lib.h,v 1.10 2001/11/07 20:51:08 espie Exp $ */ +/* $OpenBSD: lib.h,v 1.11 2001/11/07 20:57:24 espie Exp $ */ /* * FreeBSD install - a package for the installation and maintainance @@ -101,7 +101,6 @@ typedef enum pl_ent_t { PLIST_PKGDEP, PLIST_MTREE, PLIST_DIR_RM, - PLIST_IGNORE_INST, PLIST_OPTION, PLIST_PKGCFL, PLIST_NEWDEP, diff --git a/usr.sbin/pkg_install/lib/plist.c b/usr.sbin/pkg_install/lib/plist.c index d379a561e5b..49ace232160 100644 --- a/usr.sbin/pkg_install/lib/plist.c +++ b/usr.sbin/pkg_install/lib/plist.c @@ -1,6 +1,6 @@ -/* $OpenBSD: plist.c,v 1.12 2001/11/07 20:51:08 espie Exp $ */ +/* $OpenBSD: plist.c,v 1.13 2001/11/07 20:57:24 espie Exp $ */ #ifndef lint -static const char *rcsid = "$OpenBSD: plist.c,v 1.12 2001/11/07 20:51:08 espie Exp $"; +static const char *rcsid = "$OpenBSD: plist.c,v 1.13 2001/11/07 20:57:24 espie Exp $"; #endif /* @@ -46,7 +46,6 @@ static cmd_t cmdv[] = { { "group", PLIST_CHGRP, 1 }, { "comment", PLIST_COMMENT, 1 }, { "ignore", PLIST_IGNORE, 0 }, - { "ignore_inst", PLIST_IGNORE_INST, 0 }, { "name", PLIST_NAME, 1 }, { "display", PLIST_DISPLAY, 1 }, { "pkgdep", PLIST_PKGDEP, 1 }, |