Mostly deorbit mtree support:

- pkg_create bails out with -m
- pkg_add ignores mtree specs in packages and prints a warning.
  It does not remove the file like before.
- remove now obsolete documentation.

pkg_info still prints the information and pkg_admin ignores the files.
Make the dependency on the tools a runtime dependency.
Take maintainership of pkg_install and bump version to 20070725.

16 files changed, 47 insertions, 175 deletions

diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile
index 21133757b70..1a26fae8aa7 100644
--- a/pkgtools/pkg_install/Makefile
+++ b/pkgtools/pkg_install/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.133 2007/07/16 13:23:02 joerg Exp $
+# $NetBSD: Makefile,v 1.134 2007/07/25 15:01:45 joerg Exp $
 
 # Notes to package maintainers:
 #
@@ -13,7 +13,7 @@ CATEGORIES=		pkgtools
 MASTER_SITES=		# empty
 DISTFILES=		# empty
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
+MAINTAINER=		joerg@NetBSD.org
 HOMEPAGE=		http://www.pkgsrc.org/
 COMMENT=		Package management and administration tools for pkgsrc
 
@@ -24,10 +24,9 @@ CONFLICTS+=		audit-packages-[0-9]*
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-pkgdbdir=${PKG_DBDIR:Q}
 CONFIGURE_ARGS+=	--with-ftp="\"${FETCH_CMD}"\"
-CONFIGURE_ARGS+=	--with-mtree="\"${MTREE}"\"
 CONFIGURE_ARGS+=	--with-pax="\"${PAX}"\"
 CONFIGURE_ARGS+=	--with-tar="\"${TAR}"\"
-USE_TOOLS+=		mtree pax tar gzcat
+USE_TOOLS+=		pax:run tar:run gzcat:run
 
 # The following tools are needed by pkg_view and linkfarm.
 USE_TOOLS+=		chmod cmp cp env find grep ln mkdir rm rmdir	\
diff --git a/pkgtools/pkg_install/files/add/Makefile.in b/pkgtools/pkg_install/files/add/Makefile.in
index 36ff759fcbc..6fa13a552cc 100644
--- a/pkgtools/pkg_install/files/add/Makefile.in
+++ b/pkgtools/pkg_install/files/add/Makefile.in
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.14 2007/07/16 09:57:56 joerg Exp $
+# $NetBSD: Makefile.in,v 1.15 2007/07/25 15:01:46 joerg Exp $
 
 srcdir=		@srcdir@
 
@@ -14,7 +14,7 @@ CC=		@CC@
 CCLD=		$(CC)
 LIBS=		-linstall @LIBS@
 CPPFLAGS=	@CPPFLAGS@ -I. -I$(srcdir) -I../lib
-DEFS=		@DEFS@ -DOPSYS_NAME=\"$(OPSYS)\" -DMACHINE_ARCH=\"$(MACHINE_ARCH)\" -DBINDIR=\"$(sbindir)\" -DMTREE_CMD=\"@mtree@\" -DTAR_CMD=\"@tar@\" -DPAX_CMD=\"@pax@\"
+DEFS=		@DEFS@ -DOPSYS_NAME=\"$(OPSYS)\" -DMACHINE_ARCH=\"$(MACHINE_ARCH)\" -DBINDIR=\"$(sbindir)\" -DTAR_CMD=\"@tar@\" -DPAX_CMD=\"@pax@\"
 CFLAGS=		@CFLAGS@
 LDFLAGS=	@LDFLAGS@ -L../lib
 
diff --git a/pkgtools/pkg_install/files/add/perform.c b/pkgtools/pkg_install/files/add/perform.c
index cf1afcb2988..e75f5d9f6a1 100644
--- a/pkgtools/pkg_install/files/add/perform.c
+++ b/pkgtools/pkg_install/files/add/perform.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: perform.c,v 1.48 2007/07/20 22:22:52 joerg Exp $	*/
+/*	$NetBSD: perform.c,v 1.49 2007/07/25 15:01:46 joerg Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -14,7 +14,7 @@
 #if 0
 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.44 1997/10/13 15:03:46 jkh Exp";
 #else
-__RCSID("$NetBSD: perform.c,v 1.48 2007/07/20 22:22:52 joerg Exp $");
+__RCSID("$NetBSD: perform.c,v 1.49 2007/07/25 15:01:46 joerg Exp $");
 #endif
 #endif
 
@@ -865,17 +865,7 @@ ignore_replace_depends_check:
 	}
 
 	if (!Fake && fexists(MTREE_FNAME)) {
-		if (Verbose)
-			printf("Running mtree for %s.\n", PkgName);
-		p = find_plist(&Plist, PLIST_CWD);
-		if (Verbose)
-			printf("mtree -U -f %s -d -e -p %s\n", MTREE_FNAME, p ? p->name : "/");
-		if (!Fake) {
-			if (fexec(MTREE_CMD, "-U", "-f", MTREE_FNAME, "-d", "-e", "-p",
-				  p ? p->name : "/", NULL))
-				warnx("mtree returned a non-zero status - continuing");
-		}
-		unlink(MTREE_FNAME); /* remove this line to tar up pkg later  - HF */
+		warnx("Mtree file ignored for package %s", PkgName);
 	}
 
 	/* Run the installation script one last time? */
diff --git a/pkgtools/pkg_install/files/add/pkg_add.1 b/pkgtools/pkg_install/files/add/pkg_add.1
index 2be1c8d405c..31c57d49f56 100644
--- a/pkgtools/pkg_install/files/add/pkg_add.1
+++ b/pkgtools/pkg_install/files/add/pkg_add.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_add.1,v 1.19 2007/07/16 09:57:56 joerg Exp $
+.\" $NetBSD: pkg_add.1,v 1.20 2007/07/25 15:01:46 joerg Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintenance
 .\" of non-core utilities.
@@ -446,31 +446,6 @@ is not present in the packing list,
 then it is used as a guide for moving (or copying, as necessary) files from
 the staging area into their final locations.
 .It
-If the package contains an
-.Ar mtreefile
-file (see
-.Xr pkg_create 1 ) ,
-then mtree is invoked as:
-.Bd -filled -offset indent -compact
-.Cm mtree
-.Fl u
-.Fl f
-.Ar mtreefile
-.Fl d
-.Fl e
-.Fl p
-.Pa prefix
-.Ed
-where
-.Pa prefix
-is either the prefix specified with the
-.Fl p
-flag or, if no
-.Fl p
-flag was specified, the name of the first directory named by a
-.Cm @cwd
-directive within this package.
-.It
 If an
 .Ar install
 script exists for the package, it is executed with the following arguments:
@@ -636,8 +611,7 @@ package and running it after every
 .Xr pkg_info 1 ,
 .Xr mktemp 3 ,
 .Xr sysconf 3 ,
-.Xr pkgsrc 7 ,
-.Xr mtree 8
+.Xr pkgsrc 7
 .Sh AUTHORS
 .Bl -tag -width indent -compact
 .It "Jordan Hubbard"
diff --git a/pkgtools/pkg_install/files/add/pkg_add.cat1 b/pkgtools/pkg_install/files/add/pkg_add.cat1
index 26d4dd410f6..7aa47cd7020 100644
--- a/pkgtools/pkg_install/files/add/pkg_add.cat1
+++ b/pkgtools/pkg_install/files/add/pkg_add.cat1
@@ -256,14 +256,7 @@ TTEECCHHNNIICCAALL DDEETTAAIILLSS
                 necessary) files from the staging area into their final loca-
                 tions.
 
-           11.  If the package contains an _m_t_r_e_e_f_i_l_e file (see pkg_create(1)),
-                then mtree is invoked as:
-                      mmttrreeee --uu --ff _m_t_r_e_e_f_i_l_e --dd --ee --pp _p_r_e_f_i_x
-                where _p_r_e_f_i_x is either the prefix specified with the --pp flag
-                or, if no --pp flag was specified, the name of the first direc-
-                tory named by a @@ccwwdd directive within this package.
-
-           12.  If an _i_n_s_t_a_l_l script exists for the package, it is executed
+           11.  If an _i_n_s_t_a_l_l script exists for the package, it is executed
                 with the following arguments:
 
                 _p_k_g___n_a_m_e      The name of the package being installed.
@@ -272,7 +265,7 @@ TTEECCHHNNIICCAALL DDEETTAAIILLSS
                               any actions needed after the package has been
                               installed.
 
-           13.  After installation is complete, a copy of the packing list,
+           12.  After installation is complete, a copy of the packing list,
                 _d_e_i_n_s_t_a_l_l script, description, and display files are copied
                 into _/_v_a_r_/_d_b_/_p_k_g_/_<_p_k_g_-_n_a_m_e_> for subsequent possible use by
                 pkg_delete(1).  Any package dependencies are recorded in the
@@ -280,12 +273,12 @@ TTEECCHHNNIICCAALL DDEETTAAIILLSS
                 an alternate package database directory is specified, then it
                 overrides the _/_v_a_r_/_d_b_/_p_k_g path shown above).
 
-           14.  If the package is a depoted package, then add it to the
+           13.  If the package is a depoted package, then add it to the
                 default view.
 
-           15.  The staging area is deleted and the program terminates.
+           14.  The staging area is deleted and the program terminates.
 
-           16.  Finally, if we were upgrading a package, any _+_R_E_Q_U_I_R_E_D___B_Y file
+           15.  Finally, if we were upgrading a package, any _+_R_E_Q_U_I_R_E_D___B_Y file
                 that was moved aside before upgrading was started is now moved
                 back into place.
 
@@ -363,7 +356,7 @@ EEXXAAMMPPLLEESS
 
 SSEEEE AALLSSOO
      pkg_admin(1), pkg_create(1), pkg_delete(1), pkg_info(1), mktemp(3),
-     sysconf(3), pkgsrc(7), mtree(8)
+     sysconf(3), pkgsrc(7)
 
 AAUUTTHHOORRSS
      Jordan Hubbard
diff --git a/pkgtools/pkg_install/files/configure b/pkgtools/pkg_install/files/configure
index 78409c0ade8..38d79e6df37 100755
--- a/pkgtools/pkg_install/files/configure
+++ b/pkgtools/pkg_install/files/configure
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for pkg_install 20070416.
+# Generated by GNU Autoconf 2.61 for pkg_install 20070725.
 #
-# Report bugs to <grant@NetBSD.org>.
+# Report bugs to <joerg@NetBSD.org>.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -574,9 +574,9 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='pkg_install'
 PACKAGE_TARNAME='pkg_install'
-PACKAGE_VERSION='20070416'
-PACKAGE_STRING='pkg_install 20070416'
-PACKAGE_BUGREPORT='grant@NetBSD.org'
+PACKAGE_VERSION='20070725'
+PACKAGE_STRING='pkg_install 20070725'
+PACKAGE_BUGREPORT='joerg@NetBSD.org'
 
 ac_unique_file="lib/plist.c"
 # Factoring default headers for most tests.
@@ -695,7 +695,6 @@ pkgdbdir
 ftp
 tar
 pax
-mtree
 CPP
 EGREP
 LIBOBJS
@@ -1212,7 +1211,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures pkg_install 20070416 to adapt to many kinds of systems.
+\`configure' configures pkg_install 20070725 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1277,7 +1276,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of pkg_install 20070416:";;
+     short | recursive ) echo "Configuration of pkg_install 20070725:";;
    esac
   cat <<\_ACEOF
 
@@ -1288,7 +1287,6 @@ Optional Packages:
   --with-ftp=path         Path to tnftp (PREFIX/bin/ftp)
   --with-tar=path         Path to pax-as-tar (PREFIX/bin/tar)
   --with-pax=path         Path to pax (PREFIX/bin/pax)
-  --with-mtree=path       Path to mtree (PREFIX/sbin/mtree)
 
 Some influential environment variables:
   CC          C compiler command
@@ -1303,7 +1301,7 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to <grant@NetBSD.org>.
+Report bugs to <joerg@NetBSD.org>.
 _ACEOF
 ac_status=$?
 fi
@@ -1364,7 +1362,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-pkg_install configure 20070416
+pkg_install configure 20070725
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1378,7 +1376,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by pkg_install $as_me 20070416, which was
+It was created by pkg_install $as_me 20070725, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -3595,16 +3593,6 @@ fi
 
 
 
-# Check whether --with-mtree was given.
-if test "${with_mtree+set}" = set; then
-  withval=$with_mtree;  mtree="$with_mtree"
-else
-   mtree='$(sbindir)/mtree'
-fi
-
-
-
-
 { echo "$as_me:$LINENO: checking for __db185_open in -ldb" >&5
 echo $ECHO_N "checking for __db185_open in -ldb... $ECHO_C" >&6; }
 if test "${ac_cv_lib_db___db185_open+set}" = set; then
@@ -4623,7 +4611,7 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ------------------------------- ##
-## Report this to grant@NetBSD.org ##
+## Report this to joerg@NetBSD.org ##
 ## ------------------------------- ##
 _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
@@ -4770,7 +4758,7 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ------------------------------- ##
-## Report this to grant@NetBSD.org ##
+## Report this to joerg@NetBSD.org ##
 ## ------------------------------- ##
 _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
@@ -4933,7 +4921,7 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ------------------------------- ##
-## Report this to grant@NetBSD.org ##
+## Report this to joerg@NetBSD.org ##
 ## ------------------------------- ##
 _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
@@ -7191,7 +7179,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by pkg_install $as_me 20070416, which was
+This file was extended by pkg_install $as_me 20070725, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7240,7 +7228,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-pkg_install config.status 20070416
+pkg_install config.status 20070725
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -7510,14 +7498,13 @@ pkgdbdir!$pkgdbdir$ac_delim
 ftp!$ftp$ac_delim
 tar!$tar$ac_delim
 pax!$pax$ac_delim
-mtree!$mtree$ac_delim
 CPP!$CPP$ac_delim
 EGREP!$EGREP$ac_delim
 LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 85; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 84; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/pkgtools/pkg_install/files/configure.ac b/pkgtools/pkg_install/files/configure.ac
index dbbe278e34b..609bebb0027 100644
--- a/pkgtools/pkg_install/files/configure.ac
+++ b/pkgtools/pkg_install/files/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
-AC_INIT([pkg_install], [20070416], [grant@NetBSD.org])
+AC_INIT([pkg_install], [20070725], [joerg@NetBSD.org])
 AC_CONFIG_SRCDIR([lib/plist.c])
 AC_CONFIG_HEADER(lib/config.h)
 
@@ -61,12 +61,6 @@ AC_ARG_WITH(pax,
 [ pax='$(prefix)/bin/pax' ])
 AC_SUBST(pax)
 
-AC_ARG_WITH(mtree,
-[  --with-mtree=path       Path to mtree (PREFIX/sbin/mtree)],
-[ mtree="$with_mtree" ],
-[ mtree='$(sbindir)/mtree' ])
-AC_SUBST(mtree)
-
 dnl Checks for libraries.
 AC_CHECK_LIB(db, __db185_open, , AC_SEARCH_LIBS(dbopen, [db db1]))
 AC_SEARCH_LIBS(tgetent, [termcap termlib curses ncurses])
diff --git a/pkgtools/pkg_install/files/create/create.h b/pkgtools/pkg_install/files/create/create.h
index 12fdde5ef10..3c791d640c7 100644
--- a/pkgtools/pkg_install/files/create/create.h
+++ b/pkgtools/pkg_install/files/create/create.h
@@ -1,4 +1,4 @@
-/* $NetBSD: create.h,v 1.5 2007/03/11 22:05:03 joerg Exp $ */
+/* $NetBSD: create.h,v 1.6 2007/07/25 15:01:46 joerg Exp $ */
 
 /* from FreeBSD Id: create.h,v 1.13 1997/10/08 07:46:19 charnier Exp */
 
@@ -32,7 +32,6 @@ extern char *Display;
 extern char *Install;
 extern char *DeInstall;
 extern char *Contents;
-extern char *Mtree;
 extern char *Pkgdeps;
 extern char *BuildPkgdeps;
 extern char *Pkgcfl;
diff --git a/pkgtools/pkg_install/files/create/main.c b/pkgtools/pkg_install/files/create/main.c
index 96f2580c34c..84156429022 100644
--- a/pkgtools/pkg_install/files/create/main.c
+++ b/pkgtools/pkg_install/files/create/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.8 2007/03/11 22:05:03 joerg Exp $	*/
+/*	$NetBSD: main.c,v 1.9 2007/07/25 15:01:46 joerg Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -11,7 +11,7 @@
 #if 0
 static const char *rcsid = "from FreeBSD Id: main.c,v 1.17 1997/10/08 07:46:23 charnier Exp";
 #else
-__RCSID("$NetBSD: main.c,v 1.8 2007/03/11 22:05:03 joerg Exp $");
+__RCSID("$NetBSD: main.c,v 1.9 2007/07/25 15:01:46 joerg Exp $");
 #endif
 #endif
 
@@ -32,7 +32,7 @@ __RCSID("$NetBSD: main.c,v 1.8 2007/03/11 22:05:03 joerg Exp $");
 #include "lib.h"
 #include "create.h"
 
-static const char Options[] = "B:C:D:EFI:K:L:OP:RS:T:UVb:c:d:f:i:k:lm:n:p:r:s:t:v";
+static const char Options[] = "B:C:D:EFI:K:L:OP:RS:T:UVb:c:d:f:i:k:ln:p:r:s:t:v";
 
 char   *Prefix = NULL;
 char   *Comment = NULL;
@@ -41,7 +41,6 @@ char   *Display = NULL;
 char   *Install = NULL;
 char   *DeInstall = NULL;
 char   *Contents = NULL;
-char   *Mtree = NULL;
 char   *Pkgdeps = NULL;
 char   *BuildPkgdeps = NULL;
 char   *Pkgcfl = NULL;
@@ -67,7 +66,7 @@ usage(void)
 	fprintf(stderr,
 	    "usage: pkg_create [-ElORUVv] [-B build-info-file] [-b build-version-file]\n"
             "                  [-C cpkgs] [-D displayfile] [-I realprefix] [-i iscript]\n"
-            "                  [-K pkg_dbdir] [-k dscript] [-L SrcDir] [-m mtreefile]\n"
+            "                  [-K pkg_dbdir] [-k dscript] [-L SrcDir]\n"
             "                  [-n preserve-file] [-P dpkgs] [-p prefix] [-r rscript]\n"
             "                  [-S size-all-file] [-s size-pkg-file] [-t template]\n"
             "                  [-T buildpkgs] -c comment -d description -f packlist\n"
@@ -161,10 +160,6 @@ main(int argc, char **argv)
 			Display = optarg;
 			break;
 
-		case 'm':
-			Mtree = optarg;
-			break;
-
 		case 'n':
 			Preserve = optarg;
 			break;
diff --git a/pkgtools/pkg_install/files/create/perform.c b/pkgtools/pkg_install/files/create/perform.c
index b45af4a666c..e5f9abcb216 100644
--- a/pkgtools/pkg_install/files/create/perform.c
+++ b/pkgtools/pkg_install/files/create/perform.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: perform.c,v 1.12 2007/04/16 12:55:35 joerg Exp $	*/
+/*	$NetBSD: perform.c,v 1.13 2007/07/25 15:01:46 joerg Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -11,7 +11,7 @@
 #if 0
 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.38 1997/10/13 15:03:51 jkh Exp";
 #else
-__RCSID("$NetBSD: perform.c,v 1.12 2007/04/16 12:55:35 joerg Exp $");
+__RCSID("$NetBSD: perform.c,v 1.13 2007/07/25 15:01:46 joerg Exp $");
 #endif
 #endif
 
@@ -103,9 +103,6 @@ make_dist(const char *home, const char *pkg, const char *suffix, const package_t
 	if (Display) {
 		fprintf(totar, "%s\n", DISPLAY_FNAME);
 	}
-	if (Mtree) {
-		fprintf(totar, "%s\n", MTREE_FNAME);
-	}
 	if (BuildVersion) {
 		(void) fprintf(totar, "%s\n", BUILD_VERSION_FNAME);
 	}
@@ -365,12 +362,6 @@ pkg_perform(lpkg_head_t *pkgs)
 		add_plist(&plist, PLIST_FILE, DISPLAY_FNAME);
 		add_plist(&plist, PLIST_DISPLAY, DISPLAY_FNAME);
 	}
-	if (Mtree) {
-		copy_file(Home, Mtree, MTREE_FNAME);
-		add_plist(&plist, PLIST_IGNORE, NULL);
-		add_plist(&plist, PLIST_FILE, MTREE_FNAME);
-		add_plist(&plist, PLIST_MTREE, MTREE_FNAME);
-	}
 	if (BuildVersion) {
 		copy_file(Home, BuildVersion, BUILD_VERSION_FNAME);
 		add_plist(&plist, PLIST_IGNORE, NULL);
diff --git a/pkgtools/pkg_install/files/create/pkg_create.1 b/pkgtools/pkg_install/files/create/pkg_create.1
index abc1eff8e57..c9a6516f63e 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.9 2007/05/19 14:42:10 wiz Exp $
+.\" $NetBSD: pkg_create.1,v 1.10 2007/07/25 15:01:46 joerg Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintenance
 .\" of non-core utilities.
@@ -61,9 +61,6 @@
 .Op Fl L Ar SrcDir
 .Ek
 .Bk -words
-.Op Fl m Ar mtreefile
-.Ek
-.Bk -words
 .Op Fl n Ar preserve-file
 .Ek
 .Bk -words
@@ -206,24 +203,6 @@ and
 .Xr symlink 2
 to remove and re-link
 any symbolic links which are targeted at full path names.
-.It Fl m Ar mtreefile
-Run
-.Xr mtree 8
-with input from mtreefile before the package is installed.
-Mtree is invoked as
-.Cm mtree
-.Fl u
-.Fl f
-.Ar mtreefile
-.Fl d
-.Fl e
-.Fl p
-.Pa prefix ,
-where
-.Pa prefix
-is the name of the first directory named by a
-.Cm @cwd
-directive.
 .It Fl n Ar preserve-file
 The file is used to denote that the package should not be deleted.
 This is intended for use where the deletion of packages may present
@@ -469,17 +448,6 @@ directives are used, the directories are removed in the order specified.
 The
 .Pa name
 directory will not be removed unless it is empty.
-.It Cm @mtree Ar name
-Declare
-.Pa name
-as an
-.Xr mtree 8
-input file to be used at install time (see
-.Fl m
-above).
-Only the first
-.Cm @mtree
-directive is honored.
 .It Cm @display Ar name
 Declare
 .Pa name
diff --git a/pkgtools/pkg_install/files/create/pkg_create.cat1 b/pkgtools/pkg_install/files/create/pkg_create.cat1
index a2dae709a34..1bc5e4a31d2 100644
--- a/pkgtools/pkg_install/files/create/pkg_create.cat1
+++ b/pkgtools/pkg_install/files/create/pkg_create.cat1
@@ -95,12 +95,6 @@ OOPPTTIIOONNSS
              unlink(2) and symlink(2) to remove and re-link any symbolic links
              which are targeted at full path names.
 
-     --mm _m_t_r_e_e_f_i_l_e
-             Run mtree(8) with input from mtreefile before the package is
-             installed.  Mtree is invoked as mmttrreeee --uu --ff _m_t_r_e_e_f_i_l_e --dd --ee --pp
-             _p_r_e_f_i_x, where _p_r_e_f_i_x is the name of the first directory named by
-             a @@ccwwdd directive.
-
      --nn _p_r_e_s_e_r_v_e_-_f_i_l_e
              The file is used to denote that the package should not be
              deleted.  This is intended for use where the deletion of packages
@@ -257,9 +251,6 @@ PPAACCKKIINNGG LLIISSTT DDEETTAAIILLSS
              at the end of the package list.  If more than one @@ddiirrrrmm direc-
              tives are used, the directories are removed in the order speci-
              fied.  The _n_a_m_e directory will not be removed unless it is empty.
-     @@mmttrreeee _n_a_m_e
-             Declare _n_a_m_e as an mtree(8) input file to be used at install time
-             (see --mm above).  Only the first @@mmttrreeee directive is honored.
      @@ddiissppllaayy _n_a_m_e
              Declare _n_a_m_e as the file to be displayed at install time (see --DD
              above).
diff --git a/pkgtools/pkg_install/files/delete/pkg_delete.1 b/pkgtools/pkg_install/files/delete/pkg_delete.1
index d2d7db974fa..09834da1575 100644
--- a/pkgtools/pkg_install/files/delete/pkg_delete.1
+++ b/pkgtools/pkg_install/files/delete/pkg_delete.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_delete.1,v 1.13 2007/07/16 09:57:58 joerg Exp $
+.\" $NetBSD: pkg_delete.1,v 1.14 2007/07/25 15:01:47 joerg Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintenance
 .\" of non-core utilities.
@@ -296,8 +296,7 @@ appended to the path, e.g.
 .Xr pkg_create 1 ,
 .Xr pkg_info 1 ,
 .Xr mktemp 3 ,
-.Xr pkgsrc 7 ,
-.Xr mtree 8
+.Xr pkgsrc 7
 .Sh AUTHORS
 .Bl -tag -width indent -compact
 .It "Jordan Hubbard"
diff --git a/pkgtools/pkg_install/files/delete/pkg_delete.cat1 b/pkgtools/pkg_install/files/delete/pkg_delete.cat1
index 27c15fb5139..dccc7bdeab8 100644
--- a/pkgtools/pkg_install/files/delete/pkg_delete.cat1
+++ b/pkgtools/pkg_install/files/delete/pkg_delete.cat1
@@ -157,7 +157,7 @@ EENNVVIIRROONNMMEENNTT
 
 SSEEEE AALLSSOO
      pkg_add(1), pkg_admin(1), pkg_create(1), pkg_info(1), mktemp(3),
-     pkgsrc(7), mtree(8)
+     pkgsrc(7)
 
 AAUUTTHHOORRSS
      Jordan Hubbard
diff --git a/pkgtools/pkg_install/files/lib/lib.h b/pkgtools/pkg_install/files/lib/lib.h
index 9fa87c4dc1d..a749c237085 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.26 2007/07/20 22:22:53 joerg Exp $ */
+/* $NetBSD: lib.h,v 1.27 2007/07/25 15:01:47 joerg Exp $ */
 
 /* from FreeBSD Id: lib.h,v 1.25 1997/10/08 07:48:03 charnier Exp */
 
@@ -128,14 +128,6 @@
 #define CHGRP_CMD "chgrp"
 #endif
 
-#ifndef MTREE_CMD
-# ifdef BINDIR
-#  define MTREE_CMD BINDIR "/mtree"
-# else
-#  define MTREE_CMD "mtree"
-# endif
-#endif
-
 /* some operating systems don't have this */
 #ifndef MAXPATHLEN
 #define MAXPATHLEN	1024
diff --git a/pkgtools/pkg_install/files/lib/version.h b/pkgtools/pkg_install/files/lib/version.h
index 1ad20452506..540a7e902da 100644
--- a/pkgtools/pkg_install/files/lib/version.h
+++ b/pkgtools/pkg_install/files/lib/version.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: version.h,v 1.68 2007/07/20 22:22:53 joerg Exp $	*/
+/*	$NetBSD: version.h,v 1.69 2007/07/25 15:01:47 joerg Exp $	*/
 
 /*
  * Copyright (c) 2001 Thomas Klausner.  All rights reserved.
@@ -33,6 +33,6 @@
 #ifndef _INST_LIB_VERSION_H_
 #define _INST_LIB_VERSION_H_
 
-#define PKGTOOLS_VERSION "20070720"
+#define PKGTOOLS_VERSION "20070725"
 
 #endif /* _INST_LIB_VERSION_H_ */