pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Update pkgtools/pkg_install to 20040114. Changes from...
details: https://anonhg.NetBSD.org/pkgsrc/rev/ae5301510afa
branches: trunk
changeset: 466283:ae5301510afa
user: jlam <jlam%pkgsrc.org@localhost>
date: Wed Jan 14 23:55:29 2004 +0000
description:
Update pkgtools/pkg_install to 20040114. Changes from version 20040106
include:
* use ${MACHINE_ARCH} instead of what uname() puts into utsname.machine.
the former represents the CPU architecture, which is what is recorded
in binary packages; also allow the OS name to be overridden, as pkgsrc
doesn't always use the value of utsname.sysname.
* allow adding depoted packages if another package with the same
${PKGBASE} is already installed as this is explicitly allowed for in
pkgviews.
diffstat:
doc/CHANGES | 3 +-
pkgtools/pkg_install/files/add/perform.c | 38 ++---
pkgtools/pkg_install/files/bpm/bpm.1 | 117 ++++++++++++++++
pkgtools/pkg_install/files/bpm/bpm.cat1 | 61 ++++++++
pkgtools/pkg_install/files/bpm/bpm.sh | 222 +++++++++++++++++++++++++++++++
pkgtools/pkg_install/files/delete/main.c | 7 +-
pkgtools/pkg_install/files/lib/file.c | 6 +-
pkgtools/pkg_install/files/lib/lib.h | 6 +-
pkgtools/pkg_install/files/lib/version.h | 4 +-
9 files changed, 430 insertions(+), 34 deletions(-)
diffs (truncated from 603 to 300 lines):
diff -r 5be7bd564e89 -r ae5301510afa doc/CHANGES
--- a/doc/CHANGES Wed Jan 14 23:18:46 2004 +0000
+++ b/doc/CHANGES Wed Jan 14 23:55:29 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.4464 2004/01/14 21:43:43 jmmv Exp $
+$NetBSD: CHANGES,v 1.4465 2004/01/14 23:55:30 jlam Exp $
Changes to the packages collection and infrastructure in 2004:
@@ -225,3 +225,4 @@
Removed kapm [wiz 2004-01-14]
Updated silc-client to 1.0.1 [salo 2004-01-14]
Updated amule to 1.2.4 [jmmv 2004-01-14]
+ Updated pkg_install to 20040114 [jlam 2004-01-14]
diff -r 5be7bd564e89 -r ae5301510afa pkgtools/pkg_install/files/add/perform.c
--- a/pkgtools/pkg_install/files/add/perform.c Wed Jan 14 23:18:46 2004 +0000
+++ b/pkgtools/pkg_install/files/add/perform.c Wed Jan 14 23:55:29 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: perform.c,v 1.14 2004/01/04 01:49:38 hubertf Exp $ */
+/* $NetBSD: perform.c,v 1.15 2004/01/14 23:55:29 jlam 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.44 1997/10/13 15:03:46 jkh Exp";
#else
-__RCSID("$NetBSD: perform.c,v 1.14 2004/01/04 01:49:38 hubertf Exp $");
+__RCSID("$NetBSD: perform.c,v 1.15 2004/01/14 23:55:29 jlam Exp $");
#endif
#endif
@@ -288,23 +288,23 @@
goto bomb;
}
- if (uname(&host_uname) == 0) {
+ if (uname(&host_uname) < 0) {
+ warnx("uname() failed.");
+ if (!Force) {
+ warnx("aborting.");
+ goto bomb;
+ }
+ } else {
int osbad = 0;
- /* handle Darwin's uname(3) on powerpc writing
- * "Power Macintosh" in struct uname.machine.
- */
- if (strcmp(host_uname.machine, "Power Macintosh") == 0)
- strcpy(host_uname.machine, "powerpc"); /* it fits */
-
/* If either the OS or arch are different, bomb */
- if (strcmp(host_uname.sysname, buildinfo[BI_OPSYS]) != 0 ||
- strcmp(host_uname.machine, buildinfo[BI_MACHINE_ARCH]) != 0)
+ if (strcmp(OPSYS_NAME, buildinfo[BI_OPSYS]) != 0 ||
+ strcmp(MACHINE_ARCH, buildinfo[BI_MACHINE_ARCH]) != 0)
osbad = 2;
/* If OS and arch are the same, warn if version differs */
- if (strcmp(host_uname.sysname, buildinfo[BI_OPSYS]) == 0 &&
- strcmp(host_uname.machine, buildinfo[BI_MACHINE_ARCH]) == 0) {
+ if (strcmp(OPSYS_NAME, buildinfo[BI_OPSYS]) == 0 &&
+ strcmp(MACHINE_ARCH, buildinfo[BI_MACHINE_ARCH]) == 0) {
if (strcmp(host_uname.release, buildinfo[BI_OS_VERSION]) != 0)
osbad = 1;
} else
@@ -316,20 +316,14 @@
buildinfo[BI_OPSYS],
buildinfo[BI_MACHINE_ARCH],
buildinfo[BI_OS_VERSION],
- host_uname.sysname,
- host_uname.machine,
+ OPSYS_NAME,
+ MACHINE_ARCH,
host_uname.release);
}
if (!Force && (osbad >= 2)) {
warnx("aborting.");
goto bomb;
}
- } else {
- warnx("uname() failed.");
- if (!Force) {
- warnx("aborting.");
- goto bomb;
- }
}
/*
@@ -516,7 +510,7 @@
installed);
}
fexec(BINDIR "/pkg_delete", "-K", dbdir, installed, NULL);
- } else {
+ } else if (!is_depoted_pkg) {
warnx("other version '%s' already installed", installed);
errc = 1;
diff -r 5be7bd564e89 -r ae5301510afa pkgtools/pkg_install/files/bpm/bpm.1
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pkgtools/pkg_install/files/bpm/bpm.1 Wed Jan 14 23:55:29 2004 +0000
@@ -0,0 +1,117 @@
+.\" $NetBSD: bpm.1,v 1.1 2004/01/14 23:55:29 jlam Exp $ */
+.\"
+.\"
+.\" Copyright (c) 2003 Alistair G. Crooks. All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\" notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\" notice, this list of conditions and the following disclaimer in the
+.\" documentation and/or other materials provided with the distribution.
+.\" 3. All advertising materials mentioning features or use of this software
+.\" must display the following acknowledgement:
+.\" This product includes software developed by Alistair G. Crooks.
+.\" 4. The name of the author may not be used to endorse or promote
+.\" products derived from this software without specific prior written
+.\" permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+.\" OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+.\" DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+.\" GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+.\" WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+.\" NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+.\" SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.Dd December 21, 2003
+.Dt BPM 1
+.Os
+.Sh NAME
+.Nm bpm
+.Nd menu-based binary package manager
+.Sh SYNOPSIS
+.Nm
+.Op Fl hnVv
+.Op Fl b Ar baseURL
+.Op Fl m Ar machine
+.Op Fl r Ar release
+.Op Fl w Ar seconds
+.Sh DESCRIPTION
+The
+.Nm
+command is used to locate and install binary packages from any
+reachable URL.
+.Pp
+The following command-line options are supported:
+.Bl -tag -width indent
+.It Fl b Ar baseURL
+Specify a base URL from which to download binary packages.
+The default URL is
+.Pa ftp://ftp.netbsd.org/pub/NetBSD/packages .
+.It Fl h
+Print a help message and then exit.
+.It Fl m Ar machine
+Use
+.Ar machine
+as the machine architecture to be used, instead of that returned by
+.Xr uname 1 .
+.It Fl n
+Don't actually execute the commands to add the package.
+.It Fl r Ar release
+Use
+.Ar release
+as the operating system release to be used, instead of that returned by
+.Xr uname 1 .
+.It Fl V
+Print version number and exit.
+.It Fl v
+Turn on verbose output.
+.It Fl w Ar seconds
+The number of
+.Ar seconds
+to wait after displaying an error message and returning to
+normal menu operations.
+.El
+.Pp
+.Nm
+provides a menu-based binary package manager for
+.Nx .
+.Nm
+first connects to the URL using
+.Xr ftp 1 ,
+and displays a list of categories for which binary packages exist.
+If no categories are displayed, it could
+be that the machine architecture or operating system release string
+have been wrongly interpreted, and that it will be necessary to override
+this values by means of the command line options.
+Within a category, a list of packages will be displayed, and by selecting
+one using the number assigned to it, the package will be downloaded
+automatically, and installed, using the
+.Xr pkg_add 1
+utility.
+It is also possible to change the category currently being examined,
+and to quit from the utility, simply by selecting the appropriate choices
+on the menu.
+.Sh ENVIRONMENT
+The environment variables which govern the behaviour of
+.Xr ftp 1
+and
+.Xr pkg_add 1
+are valid for
+.Nm .
+.Sh SEE ALSO
+.Xr ftp 1 ,
+.Xr pkg_add 1 ,
+.Xr uname 1
+.Sh AUTHORS
+The
+.Nm
+utility was written by
+.An Alistair Crooks Aq agc%NetBSD.org@localhost .
diff -r 5be7bd564e89 -r ae5301510afa pkgtools/pkg_install/files/bpm/bpm.cat1
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pkgtools/pkg_install/files/bpm/bpm.cat1 Wed Jan 14 23:55:29 2004 +0000
@@ -0,0 +1,61 @@
+BPM(1) NetBSD Reference Manual BPM(1)
+
+NNAAMMEE
+ bbppmm - menu-based binary package manager
+
+SSYYNNOOPPSSIISS
+ bbppmm [--hhnnVVvv] [--bb _b_a_s_e_U_R_L] [--mm _m_a_c_h_i_n_e] [--rr _r_e_l_e_a_s_e] [--ww _s_e_c_o_n_d_s]
+
+DDEESSCCRRIIPPTTIIOONN
+ The bbppmm command is used to locate and install binary packages from any
+ reachable URL.
+
+ The following command-line options are supported:
+
+ --bb _b_a_s_e_U_R_L
+ Specify a base URL from which to download binary packages. The
+ default URL is _f_t_p_:_/_/_f_t_p_._n_e_t_b_s_d_._o_r_g_/_p_u_b_/_N_e_t_B_S_D_/_p_a_c_k_a_g_e_s.
+
+ --hh Print a help message and then exit.
+
+ --mm _m_a_c_h_i_n_e
+ Use _m_a_c_h_i_n_e as the machine architecture to be used, instead of
+ that returned by uname(1).
+
+ --nn Don't actually execute the commands to add the package.
+
+ --rr _r_e_l_e_a_s_e
+ Use _r_e_l_e_a_s_e as the operating system release to be used, instead
+ of that returned by uname(1).
+
+ --VV Print version number and exit.
+
+ --vv Turn on verbose output.
+
+ --ww _s_e_c_o_n_d_s
+ The number of _s_e_c_o_n_d_s to wait after displaying an error message
+ and returning to normal menu operations.
+
+ bbppmm provides a menu-based binary package manager for NetBSD. bbppmm first
+ connects to the URL using ftp(1), and displays a list of categories for
+ which binary packages exist. If no categories are displayed, it could be
+ that the machine architecture or operating system release string have
+ been wrongly interpreted, and that it will be necessary to override this
+ values by means of the command line options. Within a category, a list
+ of packages will be displayed, and by selecting one using the number as-
+ signed to it, the package will be downloaded automatically, and in-
+ stalled, using the pkg_add(1) utility. It is also possible to change the
+ category currently being examined, and to quit from the utility, simply
+ by selecting the appropriate choices on the menu.
+
+EENNVVIIRROONNMMEENNTT
+ The environment variables which govern the behaviour of ftp(1) and
+ pkg_add(1) are valid for bbppmm.
+
+SSEEEE AALLSSOO
+ ftp(1), pkg_add(1), uname(1)
+
+AAUUTTHHOORRSS
+ The bbppmm utility was written by Alistair Crooks <agc%NetBSD.org@localhost>.
+
+NetBSD 1.6.1 December 21, 2003 1
diff -r 5be7bd564e89 -r ae5301510afa pkgtools/pkg_install/files/bpm/bpm.sh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pkgtools/pkg_install/files/bpm/bpm.sh Wed Jan 14 23:55:29 2004 +0000
@@ -0,0 +1,222 @@
+#! /bin/sh
+#
+# $NetBSD: bpm.sh,v 1.1 2004/01/14 23:55:29 jlam Exp $
+#
+# Copyright (c) 2003 Alistair G. Crooks. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
Home |
Main Index |
Thread Index |
Old Index