Remove support for pkg.conf in light of the consolidation towards

a single configuration file for the OpenBSD repository location.

The pkg_* tools now use installurl(5) to find the package repository.

NOTE:
/etc/installurl only contains a single URL pointing to a mirror.
Use the PKG_PATH environment variable to specify more than one
package repository.

prodded by and OK deraadt@ aja@

11 files changed, 20 insertions, 191 deletions

diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 6778b4cc816..63debd0c70d 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -74,7 +74,6 @@
 ./etc/examples/ospf6d.conf
 ./etc/examples/ospfd.conf
 ./etc/examples/pf.conf
-./etc/examples/pkg.conf
 ./etc/examples/printcap
 ./etc/examples/radiusd.conf
 ./etc/examples/rbootd.conf
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index e02f466cf0e..4dcd1d30b2e 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -1978,7 +1978,6 @@
 ./usr/share/man/man5/passwd.5
 ./usr/share/man/man5/pf.conf.5
 ./usr/share/man/man5/pf.os.5
-./usr/share/man/man5/pkg.conf.5
 ./usr/share/man/man5/port-modules.5
 ./usr/share/man/man5/printcap.5
 ./usr/share/man/man5/protocols.5
diff --git a/etc/Makefile b/etc/Makefile
index 127d850eee4..ad3b7caae8b 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.451 2017/02/26 16:51:18 matthieu Exp $
+#	$OpenBSD: Makefile,v 1.452 2017/02/27 21:53:11 rpe Exp $
 
 .include <bsd.own.mk>
 
@@ -40,7 +40,7 @@ MUTABLE=acme-client.conf changelist daily etc.${MACHINE}/disktab \
 # -rw-r--r--
 EXAMPLES=chio.conf dhclient.conf dhcpd.conf exports \
 	httpd.conf ifstated.conf inetd.conf man.conf mixerctl.conf \
-	mrouted.conf ntpd.conf pkg.conf printcap rbootd.conf \
+	mrouted.conf ntpd.conf printcap rbootd.conf \
 	remote sensorsd.conf wsconsctl.conf
 
 # -rw-------
diff --git a/etc/changelist b/etc/changelist
index 7486d4bcbe2..af8f5e32d6d 100644
--- a/etc/changelist
+++ b/etc/changelist
@@ -1,4 +1,4 @@
-#	$OpenBSD: changelist,v 1.115 2017/01/24 03:13:13 ajacoutot Exp $
+#	$OpenBSD: changelist,v 1.116 2017/02/27 21:53:11 rpe Exp $
 #
 # List of files which the security script backs up and checks
 # for modifications.
@@ -90,7 +90,6 @@
 /etc/passwd
 /etc/pf.conf
 /etc/pf.os
-/etc/pkg.conf
 /etc/printcap
 /etc/profile
 /etc/protocols
diff --git a/etc/examples/pkg.conf b/etc/examples/pkg.conf
deleted file mode 100644
index f7eac050c6e..00000000000
--- a/etc/examples/pkg.conf
+++ /dev/null
@@ -1,146 +0,0 @@
-# $OpenBSD: pkg.conf,v 1.25 2017/02/23 12:48:08 sthen Exp $
-#
-# Mirrors update at differing schedules. If using snapshots, sticking
-# with one host will reduce risk of fetching out-of-sync packages.
-
-# Anycast CDN
-#installpath = mirrors.evowise.com
-
-# Australia
-#installpath = mirror.internode.on.net
-#installpath = mirror.aarnet.edu.au
-
-# Austria
-#installpath = http://ftp5.eu.openbsd.org/ftp/pub/OpenBSD/%c/packages/%a/
-#installpath = ftp2.eu.openbsd.org
-
-# Brazil
-#installpath = openbsd.c3sl.ufpr.br
-#installpath = mirrors.unb.br
-
-# Bulgaria
-#installpath = openbsd.ipacct.com
-
-# Canada
-#installpath = ftp.OpenBSD.org
-#installpath = openbsd.cs.toronto.edu
-#installpath = openbsd.delfic.org
-#installpath = openbsd.mirror.netelligent.ca
-
-# Costa Rica
-#installpath = http://mirrors.ucr.ac.cr/OpenBSD/%c/packages/%a/
-
-# Denmark
-#installpath = mirrors.dotsrc.org
-#installpath = mirror.one.com
-
-# Estonia
-#installpath = ftp.aso.ee
-
-# France
-#installpath = ftp.fr.openbsd.org
-#installpath = ftp2.fr.openbsd.org
-#installpath = mirrors.ircam.fr
-
-# Germany
-#installpath = ftp.spline.de
-#installpath = mirror.hs-esslingen.de
-#installpath = ftp.bytemine.net
-#installpath = http://ftp.halifax.rwth-aachen.de/openbsd/%c/packages/%a/
-#installpath = http://artfiles.org/openbsd/%c/packages/%a/
-#installpath = ftp.hostserver.de
-
-# Greece
-#installpath = ftp.cc.uoc.gr
-
-# Hong Kong
-#installpath = openbsd.hk
-
-# Hungary
-#installpath = ftp.fsn.hu
-
-# Indonesia
-#installpath = kartolo.sby.datautama.net.id
-
-# Ireland
-#installpath = ftp.heanet.ie
-
-# Italy
-#installpath = openbsd.mirror.garr.it
-
-# Japan
-#installpath = ftp.jaist.ac.jp
-#installpath = www.ftp.ne.jp
-
-# Lithuania
-#installpath = mirror.litnet.lt
-
-# The Netherlands
-#installpath = mirror.meerval.net
-#installpath = ftp.nluug.nl
-#installpath = ftp.bit.nl
-#installpath = mirrors.dalenys.com
-
-# Phillipines
-#installpath = mirror.rise.ph
-
-# Poland
-#installpath = piotrkosoft.net
-#installpath = ftp.icm.edu.pl
-
-# Romania
-#installpath = mirrors.pidginhost.com
-
-# Russia
-#installpath = mirror.yandex.ru
-
-# Slovenia
-#installpath = www.obsd.si
-
-# Sweden
-#installpath = ftp.eu.openbsd.org
-
-# Switzerland
-#installpath = http://mirror.switch.ch/ftp/pub/OpenBSD/%c/packages/%a/
-
-# Taiwan
-#installpath = ftp.yzu.edu.tw
-
-# Ukraine
-#installpath = mirror.eject.name
-
-# United Kingdom
-#installpath = www.mirrorservice.org
-#installpath = anorien.csc.warwick.ac.uk
-#installpath = mirror.bytemark.co.uk
-#installpath = mirror.ox.ac.uk
-#installpath = mirror.exonetric.net
-
-# CA, USA
-#installpath = mirrors.sonic.net
-
-# CO, USA
-#installpath = ftp3.usa.openbsd.org
-
-# ID, USA
-#installpath = mirrors.syringanetworks.net
-
-# IL, USA
-#installpath = mirrors.gigenet.com
-
-# MA, USA
-#installpath = mirrors.mit.edu
-
-# NY, USA
-#installpath = ftp4.usa.openbsd.org
-#installpath = ftp5.usa.openbsd.org
-
-# PA, USA
-#installpath = http://openbsd.mirrors.hoobly.com/%c/packages/%a/
-#installpath = http://openbsd.mirrors.pair.com/%c/packages/%a/
-
-# TX, USA
-#installpath = mirror.esc7.net
-
-# VA, USA
-#installpath = mirror.jmu.edu
diff --git a/usr.sbin/pkg_add/Makefile b/usr.sbin/pkg_add/Makefile
index ed764159b41..882aa5f72fa 100644
--- a/usr.sbin/pkg_add/Makefile
+++ b/usr.sbin/pkg_add/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.86 2016/10/04 14:27:25 espie Exp $
+# $OpenBSD: Makefile,v 1.87 2017/02/27 21:53:11 rpe Exp $
 
 .include <bsd.own.mk>
 
 MAN1=fw_update.1 pkg_add.1 pkg_info.1 pkg_create.1 pkg_delete.1 \
 	pkg_mklocatedb.1 pkg_sign.1
-MAN5=package.5 pkg.conf.5
+MAN5=package.5
 MAN8=pkg_check.8
 MAN=${MAN1} ${MAN5} ${MAN8}
 NOPROG= 
diff --git a/usr.sbin/pkg_add/OpenBSD/State.pm b/usr.sbin/pkg_add/OpenBSD/State.pm
index b54d34a7b6e..149e4bc6025 100644
--- a/usr.sbin/pkg_add/OpenBSD/State.pm
+++ b/usr.sbin/pkg_add/OpenBSD/State.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: State.pm,v 1.42 2017/02/06 15:13:23 espie Exp $
+# $OpenBSD: State.pm,v 1.43 2017/02/27 21:53:11 rpe Exp $
 #
 # Copyright (c) 2007-2014 Marc Espie <espie@openbsd.org>
 #
@@ -26,7 +26,6 @@ sub new
 	my $self = bless {}, $class;
 	require OpenBSD::Paths;
 	$self->add_installurl(OpenBSD::Paths->installurl, $state);
-	$self->read_file(OpenBSD::Paths->pkgconf, $state);
 	return $self;
 }
 
diff --git a/usr.sbin/pkg_add/pkg_add.1 b/usr.sbin/pkg_add/pkg_add.1
index 4ea01daf2c5..d259538d0dc 100644
--- a/usr.sbin/pkg_add/pkg_add.1
+++ b/usr.sbin/pkg_add/pkg_add.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pkg_add.1,v 1.141 2017/02/15 13:19:08 jmc Exp $
+.\"	$OpenBSD: pkg_add.1,v 1.142 2017/02/27 21:53:11 rpe Exp $
 .\"
 .\" Documentation and design originally from FreeBSD. All the code has
 .\" been rewritten since. We keep the documentation's notice:
@@ -15,7 +15,7 @@
 .\" Jordan K. Hubbard
 .\"
 .\"
-.Dd $Mdocdate: February 15 2017 $
+.Dd $Mdocdate: February 27 2017 $
 .Dt PKG_ADD 1
 .Os
 .Sh NAME
@@ -79,11 +79,7 @@ Details of packing-list internals are documented in
 .Nm
 will
 .Xr syslog 3
-installations and updates by default
-.Po
-but see
-.Xr pkg.conf 5
-.Pc .
+installations and updates by default.
 .Pp
 .Nm
 relies on the file system information being consistent.
@@ -159,10 +155,8 @@ nor
 .Ev PKG_PATH
 are defined,
 .Nm
-will use the path named by
-.Ar installpath
-within
-.Xr pkg.conf 5 .
+will use the path in
+.Xr installurl 5 .
 Specifying
 .Ql -
 as a package name causes
@@ -231,11 +225,7 @@ All paths recognize special sequences
 .Sq %a ,
 .Sq %c ,
 .Sq %m ,
-.Sq %v
-.Po
-from
-.Xr pkg.conf 5
-.Pc .
+.Sq %v .
 .Pp
 The following examples are valid:
 .Bd -literal -offset indent
@@ -792,10 +782,7 @@ Special sequences
 .Sq %c ,
 .Sq %m ,
 .Sq %v
-will be expanded with the same semantics as
-.Ar installpath
-in
-.Xr pkg.conf 5 .
+will be expanded.
 .It Ev PKG_TMPDIR
 Temporary area where package information files will be extracted, instead of
 .Pa /var/tmp .
@@ -814,7 +801,6 @@ and waves any kind of signature checking.
 .Xr OpenBSD::Intro 3p ,
 .Xr bsd.port.mk 5 ,
 .Xr package 5 ,
-.Xr pkg.conf 5 ,
 .Xr pkg_check 8
 .Sh AUTHORS
 .Bl -tag -width indent -compact
diff --git a/usr.sbin/pkg_add/pkg_create.1 b/usr.sbin/pkg_add/pkg_create.1
index d74706cfad7..55c3a942aa3 100644
--- a/usr.sbin/pkg_add/pkg_create.1
+++ b/usr.sbin/pkg_add/pkg_create.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pkg_create.1,v 1.103 2016/09/06 10:41:51 espie Exp $
+.\"	$OpenBSD: pkg_create.1,v 1.104 2017/02/27 21:53:11 rpe Exp $
 .\"
 .\" Documentation and design originally from FreeBSD. All the code has
 .\" been rewritten since. We keep the documentation's notice:
@@ -21,7 +21,7 @@
 .\" [jkh] Took John's changes back and made some additional extensions for
 .\" better integration with FreeBSD's new ports collection.
 .\"
-.Dd $Mdocdate: September 6 2016 $
+.Dd $Mdocdate: February 27 2017 $
 .Dt PKG_CREATE 1
 .Os
 .Sh NAME
@@ -850,7 +850,6 @@ option is specified.
 .Xr tar 1 ,
 .Xr bsd.port.mk 5 ,
 .Xr package 5 ,
-.Xr pkg.conf 5 ,
 .Xr packages-specs 7 ,
 .Xr pkgpath 7 ,
 .Xr ports 7
diff --git a/usr.sbin/pkg_add/pkg_delete.1 b/usr.sbin/pkg_add/pkg_delete.1
index c8790af066d..e7ce7544db8 100644
--- a/usr.sbin/pkg_add/pkg_delete.1
+++ b/usr.sbin/pkg_add/pkg_delete.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pkg_delete.1,v 1.53 2017/02/15 13:19:08 jmc Exp $
+.\"	$OpenBSD: pkg_delete.1,v 1.54 2017/02/27 21:53:11 rpe Exp $
 .\"
 .\" Documentation and design originally from FreeBSD. All the code has
 .\" been rewritten since. We keep the documentation's notice:
@@ -15,7 +15,7 @@
 .\" Jordan K. Hubbard
 .\"
 .\"
-.Dd $Mdocdate: February 15 2017 $
+.Dd $Mdocdate: February 27 2017 $
 .Dt PKG_DELETE 1
 .Os
 .Sh NAME
@@ -65,11 +65,7 @@ branch.
 .Nm
 will
 .Xr syslog 3
-deletions by default
-.Po
-but see
-.Xr pkg.conf 5
-.Pc .
+deletions by default.
 .Pp
 .Nm
 relies on the file system information being consistent.
@@ -202,7 +198,6 @@ option is specified.
 .Xr pkg_add 1 ,
 .Xr pkg_create 1 ,
 .Xr pkg_info 1 ,
-.Xr pkg.conf 5 ,
 .Xr packages-specs 7 ,
 .Xr pkg_check 8
 .Sh AUTHORS
diff --git a/usr.sbin/pkg_add/pkg_info.1 b/usr.sbin/pkg_add/pkg_info.1
index 6bb31a53cb1..73c14246525 100644
--- a/usr.sbin/pkg_add/pkg_info.1
+++ b/usr.sbin/pkg_add/pkg_info.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pkg_info.1,v 1.55 2016/07/28 09:21:01 jmc Exp $
+.\"	$OpenBSD: pkg_info.1,v 1.56 2017/02/27 21:53:11 rpe Exp $
 .\"
 .\" Documentation and design originally from FreeBSD. All the code has
 .\" been rewritten since. We keep the documentation's notice:
@@ -15,7 +15,7 @@
 .\" Jordan K. Hubbard
 .\"
 .\"
-.Dd $Mdocdate: July 28 2016 $
+.Dd $Mdocdate: February 27 2017 $
 .Dt PKG_INFO 1
 .Os
 .Sh NAME
@@ -229,7 +229,6 @@ in
 .Xr pkg_delete 1 ,
 .Xr bsd.port.mk 5 ,
 .Xr package 5 ,
-.Xr pkg.conf 5 ,
 .Xr packages-specs 7 ,
 .Xr pkgpath 7
 .Sh AUTHORS