CVS commit: pkgsrc/pkgtools/pkg_install/files/admin

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Tue Oct  8 21:33:35 UTC 2019

Modified Files:
        pkgsrc/pkgtools/pkg_install/files/admin: pkg_admin.1 pkg_admin.cat

Log Message:
pkg_admin(1): sort commands


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 \
    pkgsrc/pkgtools/pkg_install/files/admin/pkg_admin.1
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/pkgtools/pkg_install/files/admin/pkg_admin.cat

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/pkg_install/files/admin/pkg_admin.1
diff -u pkgsrc/pkgtools/pkg_install/files/admin/pkg_admin.1:1.36 pkgsrc/pkgtools/pkg_install/files/admin/pkg_admin.1:1.37
--- pkgsrc/pkgtools/pkg_install/files/admin/pkg_admin.1:1.36    Wed Aug 22 20:48:38 2018
+++ pkgsrc/pkgtools/pkg_install/files/admin/pkg_admin.1 Tue Oct  8 21:33:35 2019
@@ -1,4 +1,4 @@
-.\"    $NetBSD: pkg_admin.1,v 1.36 2018/08/22 20:48:38 maya Exp $
+.\"    $NetBSD: pkg_admin.1,v 1.37 2019/10/08 21:33:35 joerg Exp $
 .\"
 .\" Copyright (c) 1999-2010 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -204,6 +204,11 @@ for packages matching
 Print the URL of the best matching package to stdout for each pattern.
 If a pattern is not matched, it is skipped and the command will return
 a failure.
+.It Cm gpg-sign-package pkg spkg
+Sign the binary package
+.Ar pkg
+using GPG and write the result to
+.Ar spkg .
 .It Cm lsall Ar /dir/pkgpattern
 .It Cm lsbest Ar /dir/pkgpattern
 List all/best package matching pattern in the given directory
@@ -268,11 +273,6 @@ to remove a variable.
 Packages that are not installed directly by the user but pulled in as
 dependencies are marked by setting
 .Dq automatic=YES .
-.It Cm gpg-sign-package pkg spkg
-Sign the binary package
-.Ar pkg
-using GPG and write the result to
-.Ar spkg .
 .It Cm x509-sign-package pkg spkg key cert
 Sign the binary package
 .Ar pkg

Index: pkgsrc/pkgtools/pkg_install/files/admin/pkg_admin.cat
diff -u pkgsrc/pkgtools/pkg_install/files/admin/pkg_admin.cat:1.5 pkgsrc/pkgtools/pkg_install/files/admin/pkg_admin.cat:1.6
--- pkgsrc/pkgtools/pkg_install/files/admin/pkg_admin.cat:1.5   Tue Mar 27 22:38:04 2018
+++ pkgsrc/pkgtools/pkg_install/files/admin/pkg_admin.cat       Tue Oct  8 21:33:35 2019
@@ -123,6 +123,10 @@ OOPPTTIIOONNSS
              pattern.  If a pattern is not matched, it is skipped and the
              command will return a failure.
 
+     ggppgg--ssiiggnn--ppaacckkaaggee ppkkgg ssppkkgg
+             Sign the binary package _p_k_g using GPG and write the result to
+             _s_p_k_g.
+
      llssaallll _/_d_i_r_/_p_k_g_p_a_t_t_e_r_n
 
      llssbbeesstt _/_d_i_r_/_p_k_g_p_a_t_t_e_r_n
@@ -177,10 +181,6 @@ OOPPTTIIOONNSS
              Packages that are not installed directly by the user but pulled
              in as dependencies are marked by setting "automatic=YES".
 
-     ggppgg--ssiiggnn--ppaacckkaaggee ppkkgg ssppkkgg
-             Sign the binary package _p_k_g using GPG and write the result to
-             _s_p_k_g.
-
      xx550099--ssiiggnn--ppaacckkaaggee ppkkgg ssppkkgg kkeeyy cceerrtt
              Sign the binary package _p_k_g using the key _k_e_y and the certificate
              _c_e_r_t, using _s_p_k_g as output file.