Remove support and documentation for @ignore_inst.

6 files changed, 13 insertions, 32 deletions

diff --git a/pkgtools/pkg_install/files/admin/check.c b/pkgtools/pkg_install/files/admin/check.c
index e71f67e1575..e8a445e6352 100644
--- a/pkgtools/pkg_install/files/admin/check.c
+++ b/pkgtools/pkg_install/files/admin/check.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: check.c,v 1.6 2009/02/02 12:35:00 joerg Exp $	*/
+/*	$NetBSD: check.c,v 1.7 2009/04/23 19:34:04 joerg Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -7,7 +7,7 @@
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: check.c,v 1.6 2009/02/02 12:35:00 joerg Exp $");
+__RCSID("$NetBSD: check.c,v 1.7 2009/04/23 19:34:04 joerg Exp $");
 
 /*-
  * Copyright (c) 1999-2008 The NetBSD Foundation, Inc.
@@ -171,7 +171,6 @@ check1pkg(const char *pkgdir, int *filecnt, int *pkgcnt)
 		case PLIST_PKGDEP:
 		case PLIST_MTREE:
 		case PLIST_DIR_RM:
-		case PLIST_IGNORE_INST:
 		case PLIST_OPTION:
 		case PLIST_PKGCFL:
 		case PLIST_BLDDEP:
diff --git a/pkgtools/pkg_install/files/admin/main.c b/pkgtools/pkg_install/files/admin/main.c
index f1b1938d692..816aea1cccb 100644
--- a/pkgtools/pkg_install/files/admin/main.c
+++ b/pkgtools/pkg_install/files/admin/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.48 2009/03/08 14:50:36 joerg Exp $	*/
+/*	$NetBSD: main.c,v 1.49 2009/04/23 19:34:04 joerg Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -7,7 +7,7 @@
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: main.c,v 1.48 2009/03/08 14:50:36 joerg Exp $");
+__RCSID("$NetBSD: main.c,v 1.49 2009/04/23 19:34:04 joerg Exp $");
 
 /*-
  * Copyright (c) 1999-2008 The NetBSD Foundation, Inc.
@@ -199,7 +199,6 @@ add_pkg(const char *pkgdir, void *vp)
 		case PLIST_PKGDEP:
 		case PLIST_MTREE:
 		case PLIST_DIR_RM:
-		case PLIST_IGNORE_INST:
 		case PLIST_OPTION:
 		case PLIST_PKGCFL:
 		case PLIST_BLDDEP:
diff --git a/pkgtools/pkg_install/files/create/pkg_create.1 b/pkgtools/pkg_install/files/create/pkg_create.1
index c8a780d717a..a8d6d258b2b 100644
--- a/pkgtools/pkg_install/files/create/pkg_create.1
+++ b/pkgtools/pkg_install/files/create/pkg_create.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_create.1,v 1.17 2009/02/08 23:12:10 wiz Exp $
+.\" $NetBSD: pkg_create.1,v 1.18 2009/04/23 19:34:04 joerg Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintenance
 .\" of non-core utilities.
@@ -425,15 +425,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/pkgtools/pkg_install/files/info/show.c b/pkgtools/pkg_install/files/info/show.c
index b6371065866..ef35eb80d66 100644
--- a/pkgtools/pkg_install/files/info/show.c
+++ b/pkgtools/pkg_install/files/info/show.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: show.c,v 1.25 2009/03/02 17:13:49 joerg Exp $	*/
+/*	$NetBSD: show.c,v 1.26 2009/04/23 19:34:04 joerg Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -7,7 +7,7 @@
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: show.c,v 1.25 2009/03/02 17:13:49 joerg Exp $");
+__RCSID("$NetBSD: show.c,v 1.26 2009/04/23 19:34:04 joerg Exp $");
 
 /*
  * FreeBSD install - a package for the installation and maintainance
@@ -92,8 +92,6 @@ static const 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"},
 	{PLIST_BLDDEP, "@blddep %s", "\tPackage depends exactly on: %s"},
@@ -183,10 +181,6 @@ show_plist(const char *title, package_t *plist, pl_ent_t type)
 				printf(Quiet ? showv[p->type].sh_quiet : showv[p->type].sh_verbose);
 				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/pkgtools/pkg_install/files/lib/lib.h b/pkgtools/pkg_install/files/lib/lib.h
index 5a454c58655..89f396db2d7 100644
--- a/pkgtools/pkg_install/files/lib/lib.h
+++ b/pkgtools/pkg_install/files/lib/lib.h
@@ -1,4 +1,4 @@
-/* $NetBSD: lib.h,v 1.50 2009/03/08 14:50:37 joerg Exp $ */
+/* $NetBSD: lib.h,v 1.51 2009/04/23 19:34:04 joerg Exp $ */
 
 /* from FreeBSD Id: lib.h,v 1.25 1997/10/08 07:48:03 charnier Exp */
 
@@ -167,10 +167,9 @@ typedef enum pl_ent_t {
 	PLIST_PKGDEP,		/* 12 */
 	PLIST_MTREE,		/* 13 */
 	PLIST_DIR_RM,		/* 14 */
-	PLIST_IGNORE_INST,	/* 15 */
-	PLIST_OPTION,		/* 16 */
-	PLIST_PKGCFL,		/* 17 */
-	PLIST_BLDDEP		/* 18 */
+	PLIST_OPTION,		/* 15 */
+	PLIST_PKGCFL,		/* 16 */
+	PLIST_BLDDEP		/* 17 */
 }       pl_ent_t;
 
 /* Enumerated constants for build info */
diff --git a/pkgtools/pkg_install/files/lib/plist.c b/pkgtools/pkg_install/files/lib/plist.c
index 8d236149460..a644ee8de0d 100644
--- a/pkgtools/pkg_install/files/lib/plist.c
+++ b/pkgtools/pkg_install/files/lib/plist.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: plist.c,v 1.23 2009/02/13 01:31:42 joerg Exp $	*/
+/*	$NetBSD: plist.c,v 1.24 2009/04/23 19:34:04 joerg Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -7,7 +7,7 @@
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: plist.c,v 1.23 2009/02/13 01:31:42 joerg Exp $");
+__RCSID("$NetBSD: plist.c,v 1.24 2009/04/23 19:34:04 joerg Exp $");
 
 /*
  * FreeBSD install - a package for the installation and maintainance
@@ -91,7 +91,6 @@ static const cmd_t cmdv[] = {
 	{"group", PLIST_CHGRP, 1, 0},
 	{"comment", PLIST_COMMENT, 1, 0},
 	{"ignore", PLIST_IGNORE, 0, 0},
-	{"ignore_inst", PLIST_IGNORE_INST, 0, 0},
 	{"name", PLIST_NAME, 1, 0},
 	{"display", PLIST_DISPLAY, 1, 0},
 	{"pkgdep", PLIST_PKGDEP, 1, 0},