pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install Mostly deorbit mtree support:
details: https://anonhg.NetBSD.org/pkgsrc/rev/402dd9d45369
branches: trunk
changeset: 531212:402dd9d45369
user: joerg <joerg%pkgsrc.org@localhost>
date: Wed Jul 25 15:01:45 2007 +0000
description:
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.
diffstat:
pkgtools/pkg_install/Makefile | 7 +--
pkgtools/pkg_install/files/add/Makefile.in | 4 +-
pkgtools/pkg_install/files/add/perform.c | 16 +------
pkgtools/pkg_install/files/add/pkg_add.1 | 30 +--------------
pkgtools/pkg_install/files/add/pkg_add.cat1 | 19 +++------
pkgtools/pkg_install/files/configure | 45 ++++++++--------------
pkgtools/pkg_install/files/configure.ac | 8 +---
pkgtools/pkg_install/files/create/create.h | 3 +-
pkgtools/pkg_install/files/create/main.c | 13 ++----
pkgtools/pkg_install/files/create/perform.c | 13 +-----
pkgtools/pkg_install/files/create/pkg_create.1 | 34 +----------------
pkgtools/pkg_install/files/create/pkg_create.cat1 | 9 ----
pkgtools/pkg_install/files/delete/pkg_delete.1 | 5 +-
pkgtools/pkg_install/files/delete/pkg_delete.cat1 | 2 +-
pkgtools/pkg_install/files/lib/lib.h | 10 +----
pkgtools/pkg_install/files/lib/version.h | 4 +-
16 files changed, 47 insertions(+), 175 deletions(-)
diffs (truncated from 652 to 300 lines):
diff -r 4a74ba7afc46 -r 402dd9d45369 pkgtools/pkg_install/Makefile
--- a/pkgtools/pkg_install/Makefile Wed Jul 25 13:13:09 2007 +0000
+++ b/pkgtools/pkg_install/Makefile Wed Jul 25 15:01:45 2007 +0000
@@ -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 @@
MASTER_SITES= # empty
DISTFILES= # empty
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+MAINTAINER= joerg%NetBSD.org@localhost
HOMEPAGE= http://www.pkgsrc.org/
COMMENT= Package management and administration tools for pkgsrc
@@ -24,10 +24,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 -r 4a74ba7afc46 -r 402dd9d45369 pkgtools/pkg_install/files/add/Makefile.in
--- a/pkgtools/pkg_install/files/add/Makefile.in Wed Jul 25 13:13:09 2007 +0000
+++ b/pkgtools/pkg_install/files/add/Makefile.in Wed Jul 25 15:01:45 2007 +0000
@@ -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 @@
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 -r 4a74ba7afc46 -r 402dd9d45369 pkgtools/pkg_install/files/add/perform.c
--- a/pkgtools/pkg_install/files/add/perform.c Wed Jul 25 13:13:09 2007 +0000
+++ b/pkgtools/pkg_install/files/add/perform.c Wed Jul 25 15:01:45 2007 +0000
@@ -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 @@
}
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 -r 4a74ba7afc46 -r 402dd9d45369 pkgtools/pkg_install/files/add/pkg_add.1
--- a/pkgtools/pkg_install/files/add/pkg_add.1 Wed Jul 25 13:13:09 2007 +0000
+++ b/pkgtools/pkg_install/files/add/pkg_add.1 Wed Jul 25 15:01:45 2007 +0000
@@ -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 @@
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 @@
.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 -r 4a74ba7afc46 -r 402dd9d45369 pkgtools/pkg_install/files/add/pkg_add.cat1
--- a/pkgtools/pkg_install/files/add/pkg_add.cat1 Wed Jul 25 13:13:09 2007 +0000
+++ b/pkgtools/pkg_install/files/add/pkg_add.cat1 Wed Jul 25 15:01:45 2007 +0000
@@ -256,14 +256,7 @@
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 @@
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 @@
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 @@
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 -r 4a74ba7afc46 -r 402dd9d45369 pkgtools/pkg_install/files/configure
--- a/pkgtools/pkg_install/files/configure Wed Jul 25 13:13:09 2007 +0000
+++ b/pkgtools/pkg_install/files/configure Wed Jul 25 15:01:45 2007 +0000
@@ -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@localhost>.
+# Report bugs to <joerg%NetBSD.org@localhost>.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -574,9 +574,9 @@
# 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@localhost'
+PACKAGE_VERSION='20070725'
+PACKAGE_STRING='pkg_install 20070725'
+PACKAGE_BUGREPORT='joerg%NetBSD.org@localhost'
ac_unique_file="lib/plist.c"
# Factoring default headers for most tests.
@@ -695,7 +695,6 @@
ftp
tar
pax
-mtree
CPP
EGREP
LIBOBJS
@@ -1212,7 +1211,7 @@
# 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 @@
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 @@
--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 @@
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@localhost>.
+Report bugs to <joerg%NetBSD.org@localhost>.
_ACEOF
ac_status=$?
fi
@@ -1364,7 +1362,7 @@
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 @@
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 @@
-# 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: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX
## ------------------------------- ##
-## Report this to grant%NetBSD.org@localhost ##
+## Report this to joerg%NetBSD.org@localhost ##
Home |
Main Index |
Thread Index |
Old Index