diff options
author | joerg <joerg@pkgsrc.org> | 2009-04-23 19:35:52 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2009-04-23 19:35:52 +0000 |
commit | 3ec1f781b4b266125b2ea5c4799b7f391c291dbc (patch) | |
tree | 864d427f9c8d315fc328eff2afa573a3a7a29746 | |
parent | 122c5a6f17bacfaf7dcde4b494adaf9929e10cec (diff) | |
download | pkgsrc-3ec1f781b4b266125b2ea5c4799b7f391c291dbc.tar.gz |
Remove remaining parts of @mtree support.
-rw-r--r-- | pkgtools/pkg_install/files/admin/check.c | 5 | ||||
-rw-r--r-- | pkgtools/pkg_install/files/admin/main.c | 5 | ||||
-rw-r--r-- | pkgtools/pkg_install/files/info/show.c | 6 | ||||
-rw-r--r-- | pkgtools/pkg_install/files/lib/lib.h | 11 | ||||
-rw-r--r-- | pkgtools/pkg_install/files/lib/plist.c | 5 |
5 files changed, 13 insertions, 19 deletions
diff --git a/pkgtools/pkg_install/files/admin/check.c b/pkgtools/pkg_install/files/admin/check.c index e8a445e6352..fd9f2fcac8c 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.7 2009/04/23 19:34:04 joerg Exp $ */ +/* $NetBSD: check.c,v 1.8 2009/04/23 19:35:52 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.7 2009/04/23 19:34:04 joerg Exp $"); +__RCSID("$NetBSD: check.c,v 1.8 2009/04/23 19:35:52 joerg Exp $"); /*- * Copyright (c) 1999-2008 The NetBSD Foundation, Inc. @@ -169,7 +169,6 @@ check1pkg(const char *pkgdir, int *filecnt, int *pkgcnt) case PLIST_UNEXEC: case PLIST_DISPLAY: case PLIST_PKGDEP: - case PLIST_MTREE: case PLIST_DIR_RM: case PLIST_OPTION: case PLIST_PKGCFL: diff --git a/pkgtools/pkg_install/files/admin/main.c b/pkgtools/pkg_install/files/admin/main.c index 816aea1cccb..40d85318d46 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.49 2009/04/23 19:34:04 joerg Exp $ */ +/* $NetBSD: main.c,v 1.50 2009/04/23 19:35:52 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.49 2009/04/23 19:34:04 joerg Exp $"); +__RCSID("$NetBSD: main.c,v 1.50 2009/04/23 19:35:52 joerg Exp $"); /*- * Copyright (c) 1999-2008 The NetBSD Foundation, Inc. @@ -197,7 +197,6 @@ add_pkg(const char *pkgdir, void *vp) case PLIST_UNEXEC: case PLIST_DISPLAY: case PLIST_PKGDEP: - case PLIST_MTREE: case PLIST_DIR_RM: case PLIST_OPTION: case PLIST_PKGCFL: diff --git a/pkgtools/pkg_install/files/info/show.c b/pkgtools/pkg_install/files/info/show.c index ef35eb80d66..f59a4043df0 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.26 2009/04/23 19:34:04 joerg Exp $ */ +/* $NetBSD: show.c,v 1.27 2009/04/23 19:35:52 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.26 2009/04/23 19:34:04 joerg Exp $"); +__RCSID("$NetBSD: show.c,v 1.27 2009/04/23 19:35:52 joerg Exp $"); /* * FreeBSD install - a package for the installation and maintainance @@ -90,7 +90,6 @@ static const show_t showv[] = { {PLIST_SRC, "@src: %s", "\tSRC to: %s"}, {PLIST_DISPLAY, "@display %s", "\tInstall message file: %s"}, {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_OPTION, "@option %s", "\tPackage has option: %s"}, {PLIST_PKGCFL, "@pkgcfl %s", "\tPackage conflicts with: %s"}, @@ -189,7 +188,6 @@ show_plist(const char *title, package_t *plist, pl_ent_t type) case PLIST_NAME: case PLIST_DISPLAY: case PLIST_PKGDEP: - case PLIST_MTREE: case PLIST_DIR_RM: case PLIST_OPTION: case PLIST_PKGCFL: diff --git a/pkgtools/pkg_install/files/lib/lib.h b/pkgtools/pkg_install/files/lib/lib.h index 89f396db2d7..d41f8887aa3 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.51 2009/04/23 19:34:04 joerg Exp $ */ +/* $NetBSD: lib.h,v 1.52 2009/04/23 19:35:52 joerg Exp $ */ /* from FreeBSD Id: lib.h,v 1.25 1997/10/08 07:48:03 charnier Exp */ @@ -165,11 +165,10 @@ typedef enum pl_ent_t { PLIST_SRC, /* 10 */ PLIST_DISPLAY, /* 11 */ PLIST_PKGDEP, /* 12 */ - PLIST_MTREE, /* 13 */ - PLIST_DIR_RM, /* 14 */ - PLIST_OPTION, /* 15 */ - PLIST_PKGCFL, /* 16 */ - PLIST_BLDDEP /* 17 */ + PLIST_DIR_RM, /* 13 */ + PLIST_OPTION, /* 14 */ + PLIST_PKGCFL, /* 15 */ + PLIST_BLDDEP /* 16 */ } 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 a644ee8de0d..58d9f102c55 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.24 2009/04/23 19:34:04 joerg Exp $ */ +/* $NetBSD: plist.c,v 1.25 2009/04/23 19:35:52 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.24 2009/04/23 19:34:04 joerg Exp $"); +__RCSID("$NetBSD: plist.c,v 1.25 2009/04/23 19:35:52 joerg Exp $"); /* * FreeBSD install - a package for the installation and maintainance @@ -95,7 +95,6 @@ static const cmd_t cmdv[] = { {"display", PLIST_DISPLAY, 1, 0}, {"pkgdep", PLIST_PKGDEP, 1, 0}, {"pkgcfl", PLIST_PKGCFL, 1, 0}, - {"mtree", PLIST_MTREE, 1, 0}, {"dirrm", PLIST_DIR_RM, 1, 0}, {"option", PLIST_OPTION, 1, 0}, {"blddep", PLIST_BLDDEP, 1, 0}, |