switch to installing source manuals (base part)

discussed with lots of people, tested by naddy@,
"move fast" deraadt@

4 files changed, 275 insertions, 273 deletions

diff --git a/lib/libcurses/Makefile b/lib/libcurses/Makefile
index ebdb3744cd3..f63e461d4f3 100644
--- a/lib/libcurses/Makefile
+++ b/lib/libcurses/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.60 2010/09/06 17:26:17 nicm Exp $
+#	$OpenBSD: Makefile,v 1.61 2011/06/23 22:46:12 schwarze Exp $
 
 # Uncomment this to enable tracing in libcurses
 #CURSESTRACE=-DTRACE
@@ -66,17 +66,17 @@ HOSTLDFLAGS?=	${LDFLAGS}
 HOSTCFLAGS+=	-I. -I${.CURDIR} ${CURSESTRACE}
 CFLAGS+=	-I. -I${.CURDIR} ${CURSESTRACE}
 
-MAN=	curs_addch.3tbl curs_addchstr.3 curs_addstr.3 curs_attr.3tbl \
+MAN=	curs_addch.3 curs_addchstr.3 curs_addstr.3 curs_attr.3 \
 	curs_beep.3 curs_bkgd.3 curs_bkgrnd.3 curs_border.3 curs_border_set.3 \
 	curs_clear.3 curs_color.3 \
 	curs_delch.3 curs_deleteln.3 \
 	curs_extend.3 \
-	curs_getch.3tbl curs_getstr.3 curs_getyx.3 \
-	curs_inch.3tbl curs_inchstr.3 curs_initscr.3 curs_inopts.3 \
+	curs_getch.3 curs_getstr.3 curs_getyx.3 \
+	curs_inch.3 curs_inchstr.3 curs_initscr.3 curs_inopts.3 \
 	curs_insch.3 curs_insstr.3 curs_instr.3 \
 	curs_kernel.3 \
 	curs_legacy.3 \
-	curs_mouse.3tbl curs_move.3 \
+	curs_mouse.3 curs_move.3 \
 	curs_opaque.3 curs_outopts.3 curs_overlay.3 \
 	curs_pad.3 curs_print.3 curs_printw.3 \
 	curs_refresh.3 \
@@ -89,9 +89,9 @@ MAN=	curs_addch.3tbl curs_addchstr.3 curs_addstr.3 curs_attr.3tbl \
 	curs_ins_wstr.3 curs_inwstr.3 \
 	default_colors.3 define_key.3 \
 	key_defined.3 keybound.3 keyok.3 \
-	curses.3tbl \
+	curses.3 \
 	resizeterm.3 \
-	term.5tbl term.7 termcap.3 terminfo.3 terminfo.5tbl \
+	term.5 term.7 termcap.3 terminfo.3 terminfo.5 \
 	wresize.3
 
 MLINKS+= curses.3 ncurses.3
@@ -270,7 +270,8 @@ MLINKS+= curs_inwstr.3 inwstr.3 curs_inwstr.3 innwstr.3 \
 
 GENERATED= init_keytry.h codes.c comp_captab.c expanded.c fallback.c \
 	keys.list lib_gen.c lib_keyname.c names.c unctrl.c make_hash make_keys
-CLEANFILES+= ${GENERATED} stamp_namebuild
+CLEANFILES+= ${GENERATED} stamp_namebuild term.5 terminfo.5 curses.3 \
+	curs_addch.3 curs_attr.3 curs_getch.3 curs_inch.3 curs_mouse.3
 
 .if make(install)
 SUBDIR+= doc
@@ -358,3 +359,12 @@ afterinstall:
 
 init_keytry.o init_keytry.so init_keytry.po init_keytry.ln: init_keytry.h
 lib_options.o lib_options.so lib_options.po lib_options.ln: init_keytry.h
+
+# must be at the end because bsd.lib.mk clears it
+.SUFFIXES: .3 .3tbl .5 .5tbl
+
+.3tbl.3:
+	cp ${.IMPSRC} ${.TARGET}
+
+.5tbl.5:
+	cp ${.IMPSRC} ${.TARGET}
diff --git a/lib/libform/Makefile b/lib/libform/Makefile
index aff6219ef33..40ef29860b0 100644
--- a/lib/libform/Makefile
+++ b/lib/libform/Makefile
@@ -10,7 +10,7 @@ SRCS=	fld_arg.c fld_attr.c fld_current.c fld_def.c fld_dup.c fld_ftchoice.c \
 	f_trace.c
 HDRS=	form.h
 CFLAGS+=-I${.CURDIR}/../libmenu -I${.CURDIR}/../libcurses
-MAN=	form.3tbl form_cursor.3 form_data.3 form_driver.3 form_field.3 \
+MAN=	form.3 form_cursor.3 form_data.3 form_driver.3 form_field.3 \
 	form_field_attributes.3 form_field_buffer.3 form_field_info.3 \
 	form_field_just.3 form_field_new.3 form_field_opts.3 \
 	form_field_userptr.3 form_field_validation.3 form_fieldtype.3 \
@@ -50,6 +50,7 @@ MLINKS+=form_cursor.3 pos_form_cursor.3 form_data.3 data_ahead.3 \
 	form_request_name.3 form_requestname.3 form_request_by_name.3 \
 	form_userptr.3 set_form_userptr.3 form_win.3 set_form_win.3 form_win.3 \
 	set_form_sub.3 form_win.3 form_sub.3 form_win.3 scale_form.3
+CLEANFILES+= form.3
 
 includes:
 	@cd ${.CURDIR}; for i in ${HDRS}; do \
@@ -57,6 +58,9 @@ includes:
 	  ${INSTALL} ${INSTALL_COPY} -m 444 -o $(BINOWN) -g $(BINGRP) $$i \
 	  ${DESTDIR}/usr/include; done
 
+form.3: form.3tbl
+	cp ${.ALLSRC} ${.TARGET}
+
 .include <bsd.own.mk>
 
 afterinstall:
diff --git a/lib/libmenu/Makefile b/lib/libmenu/Makefile
index 38b53d5463d..22deff91f5a 100644
--- a/lib/libmenu/Makefile
+++ b/lib/libmenu/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2010/09/06 17:26:17 nicm Exp $
+# $OpenBSD: Makefile,v 1.14 2011/06/23 22:46:12 schwarze Exp $
 
 LIB=	menu
 WANTLINT=
@@ -9,7 +9,7 @@ SRCS=	m_attribs.c m_cursor.c m_driver.c m_format.c \
 	m_req_name.c m_scale.c m_spacing.c m_sub.c m_trace.c m_userptr.c m_win.c
 HDRS=	menu.h eti.h
 CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../libcurses -DHAVE_CONFIG_H
-MAN=	menu.3tbl menu_attributes.3 menu_cursor.3 menu_driver.3 menu_format.3 \
+MAN=	menu.3 menu_attributes.3 menu_cursor.3 menu_driver.3 menu_format.3 \
 	menu_hook.3 menu_items.3 menu_mark.3 menu_new.3 menu_opts.3 \
 	menu_pattern.3 menu_post.3 menu_requestname.3 menu_spacing.3 \
 	menu_userptr.3 menu_win.3 mitem_current.3 mitem_name.3 mitem_new.3 \
@@ -41,6 +41,7 @@ MLINKS=	menu_attributes.3 set_menu_fore.3 menu_attributes.3 menu_fore.3 \
         mitem_opts.3 item_opts.3 mitem_userptr.3 set_item_userptr.3 \
         mitem_userptr.3 item_userptr.3 mitem_value.3 set_item_value.3 \
         mitem_value.3 item_value.3 mitem_visible.3 item_visible.3
+CLEANFILES+= menu.3
 
 includes:
 	@cd ${.CURDIR}; for i in ${HDRS}; do \
@@ -48,6 +49,9 @@ includes:
 	  ${INSTALL} ${INSTALL_COPY} -m 444 -o $(BINOWN) -g $(BINGRP) $$i \
 	  ${DESTDIR}/usr/include; done
 
+menu.3: menu.3tbl
+	cp ${.ALLSRC} ${.TARGET}
+
 .include <bsd.own.mk>
 
 afterinstall:
diff --git a/lib/libssl/man/Makefile b/lib/libssl/man/Makefile
index 0f2831594e0..006d16d6b39 100644
--- a/lib/libssl/man/Makefile
+++ b/lib/libssl/man/Makefile
@@ -1,249 +1,249 @@
-# $OpenBSD: Makefile,v 1.17 2010/09/09 22:50:47 schwarze Exp $
+# $OpenBSD: Makefile,v 1.18 2011/06/23 22:46:12 schwarze Exp $
 
 .include <bsd.own.mk>		# for NOMAN
 
 POD2MAN=pod2man --official --release="OpenBSD ${OSREV}" --center=OpenSSL
 
 .ifndef NOMAN
-MANALL=	\
-	ASN1_OBJECT_new.cat3 \
-	ASN1_STRING_length.cat3 \
-	ASN1_STRING_new.cat3 \
-	ASN1_STRING_print_ex.cat3 \
-	ASN1_generate_nconf.cat3 \
-	BIO_ctrl.cat3 \
-	BIO_f_base64.cat3 \
-	BIO_f_buffer.cat3 \
-	BIO_f_cipher.cat3 \
-	BIO_f_md.cat3 \
-	BIO_f_null.cat3 \
-	BIO_f_ssl.cat3 \
-	BIO_find_type.cat3 \
-	BIO_new.cat3 \
-	BIO_push.cat3 \
-	BIO_read.cat3 \
-	BIO_s_accept.cat3 \
-	BIO_s_bio.cat3 \
-	BIO_s_connect.cat3 \
-	BIO_s_fd.cat3 \
-	BIO_s_file.cat3 \
-	BIO_s_mem.cat3 \
-	BIO_s_null.cat3 \
-	BIO_s_socket.cat3 \
-	BIO_set_callback.cat3 \
-	BIO_should_retry.cat3 \
-	BN_BLINDING_new.cat3 \
-	BN_CTX_new.cat3 \
-	BN_CTX_start.cat3 \
-	BN_add.cat3 \
-	BN_add_word.cat3 \
-	BN_bn2bin.cat3 \
-	BN_cmp.cat3 \
-	BN_copy.cat3 \
-	BN_generate_prime.cat3 \
-	BN_mod_inverse.cat3 \
-	BN_mod_mul_montgomery.cat3 \
-	BN_mod_mul_reciprocal.cat3 \
-	BN_new.cat3 \
-	BN_num_bytes.cat3 \
-	BN_rand.cat3 \
-	BN_set_bit.cat3 \
-	BN_swap.cat3 \
-	BN_zero.cat3 \
-	CONF_modules_free.cat3 \
-	CONF_modules_load_file.cat3 \
-	CRYPTO_set_ex_data.cat3 \
-	DH_generate_key.cat3 \
-	DH_generate_parameters.cat3 \
-	DH_get_ex_new_index.cat3 \
-	DH_new.cat3 \
-	DH_set_method.cat3 \
-	DH_size.cat3 \
-	DSA_SIG_new.cat3 \
-	DSA_do_sign.cat3 \
-	DSA_dup_DH.cat3 \
-	DSA_generate_key.cat3 \
-	DSA_generate_parameters.cat3 \
-	DSA_get_ex_new_index.cat3 \
-	DSA_new.cat3 \
-	DSA_set_method.cat3 \
-	DSA_sign.cat3 \
-	DSA_size.cat3 \
-	ERR_GET_LIB.cat3 \
-	ERR_clear_error.cat3 \
-	ERR_error_string.cat3 \
-	ERR_get_error.cat3 \
-	ERR_load_crypto_strings.cat3 \
-	ERR_load_strings.cat3 \
-	ERR_print_errors.cat3 \
-	ERR_put_error.cat3 \
-	ERR_remove_state.cat3 \
-	ERR_set_mark.cat3 \
-	EVP_BytesToKey.cat3 \
-	EVP_DigestInit.cat3 \
-	EVP_EncryptInit.cat3 \
-	EVP_OpenInit.cat3 \
-	EVP_PKEY_new.cat3 \
-	EVP_PKEY_set1_RSA.cat3 \
-	EVP_SealInit.cat3 \
-	EVP_SignInit.cat3 \
-	EVP_VerifyInit.cat3 \
-	OBJ_nid2obj.cat3 \
-	OPENSSL_VERSION_NUMBER.cat3 \
-	OPENSSL_config.cat3 \
-	OPENSSL_load_builtin_modules.cat3 \
-	OpenSSL_add_all_algorithms.cat3 \
-	PKCS12_create.cat3 \
-	PKCS12_parse.cat3 \
-	PKCS7_decrypt.cat3 \
-	PKCS7_encrypt.cat3 \
-	PKCS7_sign.cat3 \
-	PKCS7_verify.cat3 \
-	RAND_add.cat3 \
-	RAND_bytes.cat3 \
-	RAND_cleanup.cat3 \
-	RAND_egd.cat3 \
-	RAND_load_file.cat3 \
-	RAND_set_rand_method.cat3 \
-	RSA_blinding_on.cat3 \
-	RSA_check_key.cat3 \
-	RSA_generate_key.cat3 \
-	RSA_get_ex_new_index.cat3 \
-	RSA_new.cat3 \
-	RSA_padding_add_PKCS1_type_1.cat3 \
-	RSA_print.cat3 \
-	RSA_private_encrypt.cat3 \
-	RSA_public_encrypt.cat3 \
-	RSA_set_method.cat3 \
-	RSA_sign.cat3 \
-	RSA_sign_ASN1_OCTET_STRING.cat3 \
-	RSA_size.cat3 \
-	SMIME_read_PKCS7.cat3 \
-	SMIME_write_PKCS7.cat3 \
-	SSL_CIPHER_get_name.cat3 \
-	SSL_COMP_add_compression_method.cat3 \
-	SSL_CTX_add_extra_chain_cert.cat3 \
-	SSL_CTX_add_session.cat3 \
-	SSL_CTX_ctrl.cat3 \
-	SSL_CTX_flush_sessions.cat3 \
-	SSL_CTX_free.cat3 \
-	SSL_CTX_get_ex_new_index.cat3 \
-	SSL_CTX_get_verify_mode.cat3 \
-	SSL_CTX_load_verify_locations.cat3 \
-	SSL_CTX_new.cat3 \
-	SSL_CTX_sess_number.cat3 \
-	SSL_CTX_sess_set_cache_size.cat3 \
-	SSL_CTX_sess_set_get_cb.cat3 \
-	SSL_CTX_sessions.cat3 \
-	SSL_CTX_set_cert_store.cat3 \
-	SSL_CTX_set_cert_verify_callback.cat3 \
-	SSL_CTX_set_cipher_list.cat3 \
-	SSL_CTX_set_client_CA_list.cat3 \
-	SSL_CTX_set_client_cert_cb.cat3 \
-	SSL_CTX_set_default_passwd_cb.cat3 \
-	SSL_CTX_set_generate_session_id.cat3 \
-	SSL_CTX_set_info_callback.cat3 \
-	SSL_CTX_set_max_cert_list.cat3 \
-	SSL_CTX_set_mode.cat3 \
-	SSL_CTX_set_msg_callback.cat3 \
-	SSL_CTX_set_options.cat3 \
-	SSL_CTX_set_quiet_shutdown.cat3 \
-	SSL_CTX_set_session_cache_mode.cat3 \
-	SSL_CTX_set_session_id_context.cat3 \
-	SSL_CTX_set_ssl_version.cat3 \
-	SSL_CTX_set_timeout.cat3 \
-	SSL_CTX_set_tmp_dh_callback.cat3 \
-	SSL_CTX_set_tmp_rsa_callback.cat3 \
-	SSL_CTX_set_verify.cat3 \
-	SSL_CTX_use_certificate.cat3 \
-	SSL_SESSION_free.cat3 \
-	SSL_SESSION_get_ex_new_index.cat3 \
-	SSL_SESSION_get_time.cat3 \
-	SSL_accept.cat3 \
-	SSL_alert_type_string.cat3 \
-	SSL_clear.cat3 \
-	SSL_connect.cat3 \
-	SSL_do_handshake.cat3 \
-	SSL_free.cat3 \
-	SSL_get_SSL_CTX.cat3 \
-	SSL_get_ciphers.cat3 \
-	SSL_get_client_CA_list.cat3 \
-	SSL_get_current_cipher.cat3 \
-	SSL_get_default_timeout.cat3 \
-	SSL_get_error.cat3 \
-	SSL_get_ex_data_X509_STORE_CTX_idx.cat3 \
-	SSL_get_ex_new_index.cat3 \
-	SSL_get_fd.cat3 \
-	SSL_get_peer_cert_chain.cat3 \
-	SSL_get_peer_certificate.cat3 \
-	SSL_get_rbio.cat3 \
-	SSL_get_session.cat3 \
-	SSL_get_verify_result.cat3 \
-	SSL_get_version.cat3 \
-	SSL_library_init.cat3 \
-	SSL_load_client_CA_file.cat3 \
-	SSL_new.cat3 \
-	SSL_pending.cat3 \
-	SSL_read.cat3 \
-	SSL_rstate_string.cat3 \
-	SSL_session_reused.cat3 \
-	SSL_set_bio.cat3 \
-	SSL_set_connect_state.cat3 \
-	SSL_set_fd.cat3 \
-	SSL_set_session.cat3 \
-	SSL_set_shutdown.cat3 \
-	SSL_set_verify_result.cat3 \
-	SSL_shutdown.cat3 \
-	SSL_state_string.cat3 \
-	SSL_want.cat3 \
-	SSL_write.cat3 \
-	X509_NAME_ENTRY_get_object.cat3 \
-	X509_NAME_add_entry_by_txt.cat3 \
-	X509_NAME_get_index_by_NID.cat3 \
-	X509_NAME_print_ex.cat3 \
-	X509_new.cat3 \
-	bn.cat3 \
-	bn_internal.cat3 \
-	crypto.cat3 \
-	d2i_ASN1_OBJECT.cat3 \
-	d2i_DHparams.cat3 \
-	d2i_DSAPublicKey.cat3 \
-	d2i_PKCS8PrivateKey.cat3 \
-	d2i_RSAPublicKey.cat3 \
-	d2i_SSL_SESSION.cat3 \
-	d2i_X509.cat3 \
-	d2i_X509_ALGOR.cat3 \
-	d2i_X509_CRL.cat3 \
-	d2i_X509_NAME.cat3 \
-	d2i_X509_REQ.cat3 \
-	d2i_X509_SIG.cat3 \
-	dh.cat3 \
-	dsa.cat3 \
-	ecdsa.cat3 \
-	engine.cat3 \
-	evp.cat3 \
-	lh_stats.cat3 \
-	lhash.cat3 \
-	pem.cat3 \
-	rsa.cat3 \
-	ssl.cat3 \
-	ui.cat3 \
-	ui_compat.cat3 \
-	x509.cat3 \
-	BF_set_key.cat3 \
-	BIO.cat3 \
-	BUF_MEM_new.cat3 \
-	CRYPTO_set_locking_callback.cat3 \
-	DES_set_key.cat3 \
-	ERR.cat3 \
-	HMAC.cat3 \
-	MD5.cat3 \
-	PEM_read_bio_PrivateKey.cat3 \
-	RAND.cat3 \
-	RC4.cat3 \
-	RIPEMD160.cat3 \
-	SHA1.cat3 \
-	acss.cat3
+MAN=	\
+	ASN1_OBJECT_new.3 \
+	ASN1_STRING_length.3 \
+	ASN1_STRING_new.3 \
+	ASN1_STRING_print_ex.3 \
+	ASN1_generate_nconf.3 \
+	BIO_ctrl.3 \
+	BIO_f_base64.3 \
+	BIO_f_buffer.3 \
+	BIO_f_cipher.3 \
+	BIO_f_md.3 \
+	BIO_f_null.3 \
+	BIO_f_ssl.3 \
+	BIO_find_type.3 \
+	BIO_new.3 \
+	BIO_push.3 \
+	BIO_read.3 \
+	BIO_s_accept.3 \
+	BIO_s_bio.3 \
+	BIO_s_connect.3 \
+	BIO_s_fd.3 \
+	BIO_s_file.3 \
+	BIO_s_mem.3 \
+	BIO_s_null.3 \
+	BIO_s_socket.3 \
+	BIO_set_callback.3 \
+	BIO_should_retry.3 \
+	BN_BLINDING_new.3 \
+	BN_CTX_new.3 \
+	BN_CTX_start.3 \
+	BN_add.3 \
+	BN_add_word.3 \
+	BN_bn2bin.3 \
+	BN_cmp.3 \
+	BN_copy.3 \
+	BN_generate_prime.3 \
+	BN_mod_inverse.3 \
+	BN_mod_mul_montgomery.3 \
+	BN_mod_mul_reciprocal.3 \
+	BN_new.3 \
+	BN_num_bytes.3 \
+	BN_rand.3 \
+	BN_set_bit.3 \
+	BN_swap.3 \
+	BN_zero.3 \
+	CONF_modules_free.3 \
+	CONF_modules_load_file.3 \
+	CRYPTO_set_ex_data.3 \
+	DH_generate_key.3 \
+	DH_generate_parameters.3 \
+	DH_get_ex_new_index.3 \
+	DH_new.3 \
+	DH_set_method.3 \
+	DH_size.3 \
+	DSA_SIG_new.3 \
+	DSA_do_sign.3 \
+	DSA_dup_DH.3 \
+	DSA_generate_key.3 \
+	DSA_generate_parameters.3 \
+	DSA_get_ex_new_index.3 \
+	DSA_new.3 \
+	DSA_set_method.3 \
+	DSA_sign.3 \
+	DSA_size.3 \
+	ERR_GET_LIB.3 \
+	ERR_clear_error.3 \
+	ERR_error_string.3 \
+	ERR_get_error.3 \
+	ERR_load_crypto_strings.3 \
+	ERR_load_strings.3 \
+	ERR_print_errors.3 \
+	ERR_put_error.3 \
+	ERR_remove_state.3 \
+	ERR_set_mark.3 \
+	EVP_BytesToKey.3 \
+	EVP_DigestInit.3 \
+	EVP_EncryptInit.3 \
+	EVP_OpenInit.3 \
+	EVP_PKEY_new.3 \
+	EVP_PKEY_set1_RSA.3 \
+	EVP_SealInit.3 \
+	EVP_SignInit.3 \
+	EVP_VerifyInit.3 \
+	OBJ_nid2obj.3 \
+	OPENSSL_VERSION_NUMBER.3 \
+	OPENSSL_config.3 \
+	OPENSSL_load_builtin_modules.3 \
+	OpenSSL_add_all_algorithms.3 \
+	PKCS12_create.3 \
+	PKCS12_parse.3 \
+	PKCS7_decrypt.3 \
+	PKCS7_encrypt.3 \
+	PKCS7_sign.3 \
+	PKCS7_verify.3 \
+	RAND_add.3 \
+	RAND_bytes.3 \
+	RAND_cleanup.3 \
+	RAND_egd.3 \
+	RAND_load_file.3 \
+	RAND_set_rand_method.3 \
+	RSA_blinding_on.3 \
+	RSA_check_key.3 \
+	RSA_generate_key.3 \
+	RSA_get_ex_new_index.3 \
+	RSA_new.3 \
+	RSA_padding_add_PKCS1_type_1.3 \
+	RSA_print.3 \
+	RSA_private_encrypt.3 \
+	RSA_public_encrypt.3 \
+	RSA_set_method.3 \
+	RSA_sign.3 \
+	RSA_sign_ASN1_OCTET_STRING.3 \
+	RSA_size.3 \
+	SMIME_read_PKCS7.3 \
+	SMIME_write_PKCS7.3 \
+	SSL_CIPHER_get_name.3 \
+	SSL_COMP_add_compression_method.3 \
+	SSL_CTX_add_extra_chain_cert.3 \
+	SSL_CTX_add_session.3 \
+	SSL_CTX_ctrl.3 \
+	SSL_CTX_flush_sessions.3 \
+	SSL_CTX_free.3 \
+	SSL_CTX_get_ex_new_index.3 \
+	SSL_CTX_get_verify_mode.3 \
+	SSL_CTX_load_verify_locations.3 \
+	SSL_CTX_new.3 \
+	SSL_CTX_sess_number.3 \
+	SSL_CTX_sess_set_cache_size.3 \
+	SSL_CTX_sess_set_get_cb.3 \
+	SSL_CTX_sessions.3 \
+	SSL_CTX_set_cert_store.3 \
+	SSL_CTX_set_cert_verify_callback.3 \
+	SSL_CTX_set_cipher_list.3 \
+	SSL_CTX_set_client_CA_list.3 \
+	SSL_CTX_set_client_cert_cb.3 \
+	SSL_CTX_set_default_passwd_cb.3 \
+	SSL_CTX_set_generate_session_id.3 \
+	SSL_CTX_set_info_callback.3 \
+	SSL_CTX_set_max_cert_list.3 \
+	SSL_CTX_set_mode.3 \
+	SSL_CTX_set_msg_callback.3 \
+	SSL_CTX_set_options.3 \
+	SSL_CTX_set_quiet_shutdown.3 \
+	SSL_CTX_set_session_cache_mode.3 \
+	SSL_CTX_set_session_id_context.3 \
+	SSL_CTX_set_ssl_version.3 \
+	SSL_CTX_set_timeout.3 \
+	SSL_CTX_set_tmp_dh_callback.3 \
+	SSL_CTX_set_tmp_rsa_callback.3 \
+	SSL_CTX_set_verify.3 \
+	SSL_CTX_use_certificate.3 \
+	SSL_SESSION_free.3 \
+	SSL_SESSION_get_ex_new_index.3 \
+	SSL_SESSION_get_time.3 \
+	SSL_accept.3 \
+	SSL_alert_type_string.3 \
+	SSL_clear.3 \
+	SSL_connect.3 \
+	SSL_do_handshake.3 \
+	SSL_free.3 \
+	SSL_get_SSL_CTX.3 \
+	SSL_get_ciphers.3 \
+	SSL_get_client_CA_list.3 \
+	SSL_get_current_cipher.3 \
+	SSL_get_default_timeout.3 \
+	SSL_get_error.3 \
+	SSL_get_ex_data_X509_STORE_CTX_idx.3 \
+	SSL_get_ex_new_index.3 \
+	SSL_get_fd.3 \
+	SSL_get_peer_cert_chain.3 \
+	SSL_get_peer_certificate.3 \
+	SSL_get_rbio.3 \
+	SSL_get_session.3 \
+	SSL_get_verify_result.3 \
+	SSL_get_version.3 \
+	SSL_library_init.3 \
+	SSL_load_client_CA_file.3 \
+	SSL_new.3 \
+	SSL_pending.3 \
+	SSL_read.3 \
+	SSL_rstate_string.3 \
+	SSL_session_reused.3 \
+	SSL_set_bio.3 \
+	SSL_set_connect_state.3 \
+	SSL_set_fd.3 \
+	SSL_set_session.3 \
+	SSL_set_shutdown.3 \
+	SSL_set_verify_result.3 \
+	SSL_shutdown.3 \
+	SSL_state_string.3 \
+	SSL_want.3 \
+	SSL_write.3 \
+	X509_NAME_ENTRY_get_object.3 \
+	X509_NAME_add_entry_by_txt.3 \
+	X509_NAME_get_index_by_NID.3 \
+	X509_NAME_print_ex.3 \
+	X509_new.3 \
+	bn.3 \
+	bn_internal.3 \
+	crypto.3 \
+	d2i_ASN1_OBJECT.3 \
+	d2i_DHparams.3 \
+	d2i_DSAPublicKey.3 \
+	d2i_PKCS8PrivateKey.3 \
+	d2i_RSAPublicKey.3 \
+	d2i_SSL_SESSION.3 \
+	d2i_X509.3 \
+	d2i_X509_ALGOR.3 \
+	d2i_X509_CRL.3 \
+	d2i_X509_NAME.3 \
+	d2i_X509_REQ.3 \
+	d2i_X509_SIG.3 \
+	dh.3 \
+	dsa.3 \
+	ecdsa.3 \
+	engine.3 \
+	evp.3 \
+	lh_stats.3 \
+	lhash.3 \
+	pem.3 \
+	rsa.3 \
+	ssl.3 \
+	ui.3 \
+	ui_compat.3 \
+	x509.3 \
+	BF_set_key.3 \
+	BIO.3 \
+	BUF_MEM_new.3 \
+	CRYPTO_set_locking_callback.3 \
+	DES_set_key.3 \
+	ERR.3 \
+	HMAC.3 \
+	MD5.3 \
+	PEM_read_bio_PrivateKey.3 \
+	RAND.3 \
+	RC4.3 \
+	RIPEMD160.3 \
+	SHA1.3 \
+	acss.3
 
 # These pages removed/renamed
 #	OPENSSL_ia32cap.cat3 \	# i386-only, internal API
@@ -262,10 +262,6 @@ MANALL=	\
 #	sha.cat3 \		# conflict; see below
 
 
-.if MANPS
-PSALL=	${MANALL:S/.cat1/.ps1/g:S/.cat2/.ps2/g:S/.cat3/.ps3/g:S/.cat4/.ps4/g:S/.cat5/.ps5/g:S/.cat6/.ps6/g:S/.cat7/.ps7/g:S/.cat8/.ps8/g:S/.cat9/.ps9/g}
-.endif
-
 # these are a real problem, since they re-document functions described in
 # other pages.
 
@@ -284,14 +280,8 @@ PSALL=	${MANALL:S/.cat1/.ps1/g:S/.cat2/.ps2/g:S/.cat3/.ps3/g:S/.cat4/.ps4/g:S/.c
 	RIPEMD160 ripemd \
 	SHA1 sha
 
-${page}.cat3: ${src}.pod
-	${POD2MAN} --section=3 --name=${page:U} ${.ALLSRC} | \
-	    ${MANDOC} > ${.TARGET}
-.  if MANPS
-${page}.ps3: ${src}.pod
-	${POD2MAN} --section=3 --name=${page:U} ${.ALLSRC} | \
-	    ${MANDOC} -Tps > ${.TARGET}
-.  endif
+${page}.3: ${src}.pod
+	${POD2MAN} --section=3 --name=${page:U} ${.ALLSRC} > ${.TARGET}
 .endfor
 
 MLINKS+=\
@@ -1083,20 +1073,14 @@ maninstall:
 
 # XXX .PATH order is critical because of non-unique filenames
 .PATH: ${.CURDIR}/../src/doc/crypto ${.CURDIR}/../src/doc/ssl ${.CURDIR}/../src/doc/apps
-.SUFFIXES: .pod
+.SUFFIXES: .pod .1 .3 .7
 .for sect in 1 3 7
-
-.pod.cat${sect}:
-	${POD2MAN} --section=${sect} --name=${*:U} ${.ALLSRC} | \
-	    ${MANDOC} > ${.TARGET}
-
-.pod.ps${sect}:
-	${POD2MAN} --section=${sect} --name=${*:U} ${.ALLSRC} | \
-	    ${MANDOC} -Tps > ${.TARGET}
+.pod.${sect}:
+	${POD2MAN} --section=${sect} --name=${*:U} ${.IMPSRC} > ${.TARGET}
 .endfor
 
 .include <bsd.obj.mk>
 .include <bsd.subdir.mk>
 
 clean cleandir:
-	rm -f ${CLEANFILES}
+	rm -f ${MAN}