-Pcdrom is nonsensical now, so error out properly on it.

Prompted and okay danj@

3 files changed, 7 insertions, 19 deletions

diff --git a/usr.sbin/pkg_add/OpenBSD/Add.pm b/usr.sbin/pkg_add/OpenBSD/Add.pm
index 1ff26b855a5..eb93531e725 100644
--- a/usr.sbin/pkg_add/OpenBSD/Add.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Add.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: Add.pm,v 1.182 2019/07/10 11:15:15 espie Exp $
+# $OpenBSD: Add.pm,v 1.183 2019/08/19 12:25:40 espie Exp $
 #
 # Copyright (c) 2003-2014 Marc Espie <espie@openbsd.org>
 #
@@ -311,10 +311,6 @@ sub prepare_for_addition
 {
 	my ($self, $state, $pkgname) = @_;
 
-	if ($state->{cdrom_only} && $self->{cdrom} ne 'yes') {
-	    $state->errsay("Package #1 is not for cdrom", $pkgname);
-	    $state->{problems}++;
-	}
 	if ($state->{ftp_only} && $self->{ftp} ne 'yes') {
 	    $state->errsay("Package #1 is not for ftp", $pkgname);
 	    $state->{problems}++;
diff --git a/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm b/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm
index 759c8f1e923..7a0e78db4c0 100644
--- a/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm
@@ -1,7 +1,7 @@
 #! /usr/bin/perl
 
 # ex:ts=8 sw=4:
-# $OpenBSD: PkgAdd.pm,v 1.114 2019/07/24 18:05:26 espie Exp $
+# $OpenBSD: PkgAdd.pm,v 1.115 2019/08/19 12:25:40 espie Exp $
 #
 # Copyright (c) 2003-2014 Marc Espie <espie@openbsd.org>
 #
@@ -119,10 +119,7 @@ sub handle_options
 	$state->{arch} = $state->opt('A');
 
 	if ($state->opt('P')) {
-		if ($state->opt('P') eq 'cdrom') {
-			$state->{cdrom_only} = 1;
-		}
-		elsif ($state->opt('P') eq 'ftp') {
+		if ($state->opt('P') eq 'ftp') {
 			$state->{ftp_only} = 1;
 		}
 		else {
diff --git a/usr.sbin/pkg_add/pkg_add.1 b/usr.sbin/pkg_add/pkg_add.1
index 6b2d1a16ebb..b1f597fdcb8 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.159 2019/07/04 15:25:16 tb Exp $
+.\"	$OpenBSD: pkg_add.1,v 1.160 2019/08/19 12:25:40 espie 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 4 2019 $
+.Dd $Mdocdate: August 19 2019 $
 .Dt PKG_ADD 1
 .Os
 .Sh NAME
@@ -408,13 +408,8 @@ would be taken if it was.
 Will still copy packages to
 .Ev PKG_CACHE
 if applicable.
-.It Fl P Ar type
-Check permissions for distribution, where
-.Ar type
-can be
-.Sq cdrom
-or
-.Sq ftp .
+.It Fl P Ar ftp
+Check that package can be distributed on ftp.
 .It Fl qq
 Do not bother with checksums for configuration files.
 .It Fl r