Skip to content

Commit

Permalink
pkg_install: Update version to 20200701.
Browse files Browse the repository at this point in the history
Includes fixes to +REQUIRED_BY generation, performance improvements,
build fixes against newer libnetpgpverify, and better error messages.

When combined with newer pkgin releases, this should now eliminate the
various "pkg_add: Can't open +CONTENTS of depending package ..." errors
that users had frequently observed during upgrades (TritonDataCenter#158,
TritonDataCenter#190, TritonDataCenter#256, and many IRC logs).
  • Loading branch information
jperkin committed Jul 1, 2020
1 parent 6cf32bf commit fddcd89
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 15 deletions.
3 changes: 1 addition & 2 deletions pkgtools/pkg_install/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.229 2020/05/05 09:02:43 jperkin Exp $
# $NetBSD: Makefile,v 1.230 2020/07/01 10:15:19 jperkin Exp $

# Notes to package maintainers:
#
Expand All @@ -7,7 +7,6 @@
# change in the pkg_* tools that pkgsrc relies on for proper operation.

PKGNAME= pkg_install-${VERSION}
PKGREVISION= 1
CATEGORIES= pkgtools

MAINTAINER= [email protected]
Expand Down
18 changes: 9 additions & 9 deletions pkgtools/pkg_install/files/configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for pkg_install 20090911.
# Generated by GNU Autoconf 2.69 for pkg_install 20200701.
#
# Report bugs to <[email protected]>.
#
Expand Down Expand Up @@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='pkg_install'
PACKAGE_TARNAME='pkg_install'
PACKAGE_VERSION='20090911'
PACKAGE_STRING='pkg_install 20090911'
PACKAGE_VERSION='20200701'
PACKAGE_STRING='pkg_install 20200701'
PACKAGE_BUGREPORT='[email protected]'
PACKAGE_URL=''

Expand Down Expand Up @@ -1265,7 +1265,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 20090911 to adapt to many kinds of systems.
\`configure' configures pkg_install 20200701 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1330,7 +1330,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of pkg_install 20090911:";;
short | recursive ) echo "Configuration of pkg_install 20200701:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1423,7 +1423,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
pkg_install configure 20090911
pkg_install configure 20200701
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -1983,7 +1983,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 20090911, which was
It was created by pkg_install $as_me 20200701, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -5789,7 +5789,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=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 20090911, which was
This file was extended by pkg_install $as_me 20200701, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -5851,7 +5851,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
pkg_install config.status 20090911
pkg_install config.status 20200701
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Expand Down
4 changes: 2 additions & 2 deletions pkgtools/pkg_install/files/configure.ac
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dnl $NetBSD: configure.ac,v 1.42 2016/06/30 17:42:04 wiz Exp $
dnl $NetBSD: configure.ac,v 1.43 2020/07/01 10:15:20 jperkin Exp $
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.52)
AC_INIT([pkg_install], [20090911], [[email protected]])
AC_INIT([pkg_install], [20200701], [[email protected]])
AC_CONFIG_SRCDIR([lib/plist.c])
AC_CONFIG_HEADER(lib/config.h)

Expand Down
4 changes: 2 additions & 2 deletions pkgtools/pkg_install/files/lib/version.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* $NetBSD: version.h,v 1.178 2019/10/11 11:57:41 joerg Exp $ */
/* $NetBSD: version.h,v 1.179 2020/07/01 10:15:20 jperkin Exp $ */

/*
* Copyright (c) 2001 Thomas Klausner. All rights reserved.
Expand Down Expand Up @@ -27,6 +27,6 @@
#ifndef _INST_LIB_VERSION_H_
#define _INST_LIB_VERSION_H_

#define PKGTOOLS_VERSION 20191008
#define PKGTOOLS_VERSION 20200701

#endif /* _INST_LIB_VERSION_H_ */

0 comments on commit fddcd89

Please sign in to comment.