summaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2023-05-10 02:23:56 +0000
committerchristos <christos@NetBSD.org>2023-05-10 02:23:56 +0000
commitc003556540a3b87aa5a512fb8ec7d86bc3dcf5f6 (patch)
tree8758b404bcc6f88e0fec6ac76253e7b2fc32e0e1 /crypto
parent9aae0317318e7408421bf098efa0032290e434c9 (diff)
avoid dup openssl
Diffstat (limited to 'crypto')
-rw-r--r--crypto/external/bsd/openssl/lib/libcrypto/man.inc10
-rw-r--r--crypto/external/bsd/openssl/lib/libcrypto/man/Makefile7
-rw-r--r--crypto/external/bsd/openssl/lib/libcrypto/man/openssl-format-options.1 (renamed from crypto/external/bsd/openssl/lib/libcrypto/man/openssl_openssl-format-options.1)2
-rw-r--r--crypto/external/bsd/openssl/lib/libcrypto/man/openssl-namedisplay-options.1 (renamed from crypto/external/bsd/openssl/lib/libcrypto/man/openssl_openssl-namedisplay-options.1)2
-rw-r--r--crypto/external/bsd/openssl/lib/libcrypto/man/openssl-passphrase-options.1 (renamed from crypto/external/bsd/openssl/lib/libcrypto/man/openssl_openssl-passphrase-options.1)2
-rw-r--r--crypto/external/bsd/openssl/lib/libcrypto/man/openssl-verification-options.1 (renamed from crypto/external/bsd/openssl/lib/libcrypto/man/openssl_openssl-verification-options.1)2
6 files changed, 14 insertions, 11 deletions
diff --git a/crypto/external/bsd/openssl/lib/libcrypto/man.inc b/crypto/external/bsd/openssl/lib/libcrypto/man.inc
index cb5005174f7..9d7fabb6675 100644
--- a/crypto/external/bsd/openssl/lib/libcrypto/man.inc
+++ b/crypto/external/bsd/openssl/lib/libcrypto/man.inc
@@ -1,4 +1,4 @@
-# $NetBSD: man.inc,v 1.15 2023/05/07 20:06:17 christos Exp $
+# $NetBSD: man.inc,v 1.16 2023/05/10 02:23:56 christos Exp $
.PATH: ${.CURDIR}/man
@@ -721,8 +721,12 @@ openssl-core.h.7 \
openssl-core_dispatch.h.7 \
openssl-core_names.h.7 \
openssl-env.7 \
+openssl-format-options.1 \
openssl-glossary.7 \
+openssl-namedisplay-options.1 \
+openssl-passphrase-options.1 \
openssl-threads.7 \
+openssl-verification-options.1 \
openssl.1 \
openssl.cnf.5 \
openssl_CA.pl.1 \
@@ -752,10 +756,6 @@ openssl_genrsa.1 \
openssl_list.1 \
openssl_nseq.1 \
openssl_ocsp.1 \
-openssl_openssl-format-options.1 \
-openssl_openssl-namedisplay-options.1 \
-openssl_openssl-passphrase-options.1 \
-openssl_openssl-verification-options.1 \
openssl_passwd.1 \
openssl_pkcs12.1 \
openssl_pkcs7.1 \
diff --git a/crypto/external/bsd/openssl/lib/libcrypto/man/Makefile b/crypto/external/bsd/openssl/lib/libcrypto/man/Makefile
index 6871e8f4426..825fd4b5a67 100644
--- a/crypto/external/bsd/openssl/lib/libcrypto/man/Makefile
+++ b/crypto/external/bsd/openssl/lib/libcrypto/man/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2023/05/07 20:06:19 christos Exp $
+# $NetBSD: Makefile,v 1.8 2023/05/10 02:23:56 christos Exp $
# the makefile is not, and should not be visited during normal build process.
# try to use latest pod2man, which comes with the latest perl.
@@ -20,7 +20,10 @@ make-manpages:
1) if [ "$$fn" = "openssl" ]; then \
dst=$$fn.$$sec; \
else \
- dst=openssl_$$fn.$$sec; \
+ case $$fn \
+ openssl*) dst=$$fn.$$sec;; \
+ *) dst=openssl_$$fn.$$sec;; \
+ eaac; \\
fi;; \
*) dst=$$fn.$$sec;; \
esac; \
diff --git a/crypto/external/bsd/openssl/lib/libcrypto/man/openssl_openssl-format-options.1 b/crypto/external/bsd/openssl/lib/libcrypto/man/openssl-format-options.1
index 8ea5284351b..19fe1127210 100644
--- a/crypto/external/bsd/openssl/lib/libcrypto/man/openssl_openssl-format-options.1
+++ b/crypto/external/bsd/openssl/lib/libcrypto/man/openssl-format-options.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: openssl_openssl-format-options.1,v 1.1 2023/05/07 20:06:22 christos Exp $
+.\" $NetBSD: openssl-format-options.1,v 1.1 2023/05/10 02:23:56 christos Exp $
.\"
.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.43)
.\"
diff --git a/crypto/external/bsd/openssl/lib/libcrypto/man/openssl_openssl-namedisplay-options.1 b/crypto/external/bsd/openssl/lib/libcrypto/man/openssl-namedisplay-options.1
index 6371e85b421..c3ce8ebd162 100644
--- a/crypto/external/bsd/openssl/lib/libcrypto/man/openssl_openssl-namedisplay-options.1
+++ b/crypto/external/bsd/openssl/lib/libcrypto/man/openssl-namedisplay-options.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: openssl_openssl-namedisplay-options.1,v 1.1 2023/05/07 20:06:22 christos Exp $
+.\" $NetBSD: openssl-namedisplay-options.1,v 1.1 2023/05/10 02:23:56 christos Exp $
.\"
.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.43)
.\"
diff --git a/crypto/external/bsd/openssl/lib/libcrypto/man/openssl_openssl-passphrase-options.1 b/crypto/external/bsd/openssl/lib/libcrypto/man/openssl-passphrase-options.1
index ccd35e868aa..9feb219a47e 100644
--- a/crypto/external/bsd/openssl/lib/libcrypto/man/openssl_openssl-passphrase-options.1
+++ b/crypto/external/bsd/openssl/lib/libcrypto/man/openssl-passphrase-options.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: openssl_openssl-passphrase-options.1,v 1.1 2023/05/07 20:06:22 christos Exp $
+.\" $NetBSD: openssl-passphrase-options.1,v 1.1 2023/05/10 02:23:56 christos Exp $
.\"
.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.43)
.\"
diff --git a/crypto/external/bsd/openssl/lib/libcrypto/man/openssl_openssl-verification-options.1 b/crypto/external/bsd/openssl/lib/libcrypto/man/openssl-verification-options.1
index 7ea6a88fe4b..d22551dae64 100644
--- a/crypto/external/bsd/openssl/lib/libcrypto/man/openssl_openssl-verification-options.1
+++ b/crypto/external/bsd/openssl/lib/libcrypto/man/openssl-verification-options.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: openssl_openssl-verification-options.1,v 1.1 2023/05/07 20:06:22 christos Exp $
+.\" $NetBSD: openssl-verification-options.1,v 1.1 2023/05/10 02:23:56 christos Exp $
.\"
.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.43)
.\"