13 files changed, 5 insertions, 1169 deletions

diff --git a/security/openssl-beta/Makefile b/security/openssl-beta/Makefile
index d3bb98706aa5..de7c583d55e7 100644
--- a/security/openssl-beta/Makefile
+++ b/security/openssl-beta/Makefile
@@ -5,906 +5,15 @@
 # $FreeBSD$
 #
 
-PORTNAME=	openssl
-.ifdef OPENSSL_SNAPSHOT
-PORTREVISION!=	date -v-1d +%Y%m%d
-.else
-PORTVERSION=	0.9.7d
-.endif
 CATEGORIES=	security devel
-.ifdef OPENSSL_SNAPSHOT
-MASTER_SITES=	http://www.openssl.org/snapshot/ \
-		ftp://ftp.openssl.org/snapshot/ \
-		ftp://ftp.sunet.se/pub/security/tools/net/openssl/snapshot/ \
-		ftp://ftp.cert.dfn.de/pub/tools/net/openssl/snapshot/
-.else
-MASTER_SITES=	http://www.openssl.org/source/ \
-		ftp://ftp.openssl.org/source/ \
-		ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/ \
-		ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/
-.endif
-PKGNAMESUFFIX=	-beta
-.ifdef OPENSSL_SNAPSHOT
-DISTNAME=	${PORTNAME}-${PORTVERSION}-stable-SNAP-${PORTREVISION}
-.endif
 
 MAINTAINER=	dinoex@FreeBSD.org
-COMMENT=	SSL and crypto library
-
-.ifdef USE_OPENSSL
-.error You have `USE_OPENSSL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
-.endif
-
-CONFLICTS?=		openssl-0.*
-MAKE_ENV+=		MANPREFIX=${MANPREFIX}
-NOPRECIOUSMAKEVARS=	Too many _MLINKS for fetch
-NO_LATEST_LINK=		yes
-USE_PERL5_BUILD=	yes
-OPENSSL_SHLIBVER?=	4
-CFLAGS+=		-Wl,-rpath,${LOCALBASE}/lib
-
-MAN1=	CA.pl.1 asn1parse.1 ca.1 ciphers.1 crl.1 crl2pkcs7.1 dgst.1 dhparam.1 \
-	dsa.1 dsaparam.1 enc.1 gendsa.1 genrsa.1 nseq.1 ocsp.1 openssl.1 \
-	passwd.1 pkcs12.1 pkcs7.1 pkcs8.1 rand.1 req.1 rsa.1 rsautl.1 \
-	s_client.1 s_server.1 s_time.1 sess_id.1 smime.1 speed.1 spkac.1 verify.1 \
-	version.1 x509.1
 
-MAN3=	ASN1_OBJECT_new.3 ASN1_STRING_length.3 ASN1_STRING_new.3 \
-	ASN1_STRING_print_ex.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_new_bio_pair.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_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 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_add_all_algorithms.3 \
-	OPENSSL_config.3 OPENSSL_load_builtin_modules.3 PKCS12_create.3 \
-	PKCS12_parse.3 PKCS7_sign.3 PKCS7_verify.3 PKCS7_encrypt.3 \
-	PKCS7_decrypt.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 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_tmp_dh_callback.3 SSL_CTX_set_tmp_rsa_callback.3 \
-	SSL_CTX_set_timeout.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 SMIME_write_PKCS7.3 SMIME_read_PKCS7.3 \
-	X509_NAME_ENTRY_get_object.3 X509_NAME_add_entry_by_txt.3 \
-	X509_NAME_get_index_by_NID.3 X509_new.3 X509_NAME_print_ex.3 \
-	blowfish.3 bn.3 bn_internal.3 bio.3 buffer.3 crypto.3 \
-	d2i_ASN1_OBJECT.3 d2i_DHparams.3 d2i_DSAPublicKey.3 \
-	d2i_PKCS8PrivateKey.3 d2i_RSAPublicKey.3 d2i_X509_ALGOR.3 \
-	d2i_X509_CRL.3 d2i_X509.3 d2i_X509_NAME.3 d2i_X509_REQ.3 \
-	d2i_X509_SIG.3 d2i_SSL_SESSION.3 des.3 dh.3 dsa.3 engine.3 err.3 \
-	evp.3 hmac.3 lh_stats.3 lhash.3 md5.3 mdc2.3 pem.3 rand.3 rc4.3 \
-	ripemd.3 rsa.3 sha.3 ssl.3 threads.3 ui.3 ui_compat.3
-
-MAN5=	config.5
-
-MAN7=	des_modes.7
-
-MLINKS=	dgst.1 md4.1 \
-	dgst.1 sha.1 \
-	dgst.1 mdc2.1 \
-	dgst.1 ripemd160.1 \
-	dgst.1 md2.1 \
-	dgst.1 sha1.1 \
-	dgst.1 md5.1 \
-	ASN1_OBJECT_new.3 ASN1_OBJECT_free.3 \
-	ASN1_STRING_length.3 ASN1_STRING_cmp.3 \
-	ASN1_STRING_length.3 ASN1_STRING_data.3 \
-	ASN1_STRING_length.3 ASN1_STRING_dup.3 \
-	ASN1_STRING_length.3 ASN1_STRING_set.3 \
-	ASN1_STRING_length.3 ASN1_STRING_type.3 \
-	ASN1_STRING_length.3 ASN1_STRING_length_set.3 \
-	ASN1_STRING_new.3 ASN1_STRING_free.3 \
-	ASN1_STRING_new.3 ASN1_STRING_type_new.3 \
-	ASN1_STRING_print_ex.3 ASN1_STRING_print_ex_fp.3 \
-	BIO_ctrl.3 BIO_callback_ctrl.3 \
-	BIO_ctrl.3 BIO_ctrl_pending.3 \
-	BIO_ctrl.3 BIO_ctrl_wpending.3 \
-	BIO_ctrl.3 BIO_eof.3 \
-	BIO_ctrl.3 BIO_flush.3 \
-	BIO_ctrl.3 BIO_get_close.3 \
-	BIO_ctrl.3 BIO_get_info_callback.3 \
-	BIO_ctrl.3 BIO_int_ctrl.3 \
-	BIO_ctrl.3 BIO_pending.3 \
-	BIO_ctrl.3 BIO_ptr_ctrl.3 \
-	BIO_ctrl.3 BIO_reset.3 \
-	BIO_ctrl.3 BIO_seek.3 \
-	BIO_ctrl.3 BIO_set_callback_arg.3 \
-	BIO_ctrl.3 BIO_set_close.3 \
-	BIO_ctrl.3 BIO_set_info_callback.3 \
-	BIO_ctrl.3 BIO_tell.3 \
-	BIO_ctrl.3 BIO_wpending.3 \
-	BIO_f_cipher.3 BIO_get_cipher_ctx.3 \
-	BIO_f_cipher.3 BIO_get_cipher_status.3 \
-	BIO_f_cipher.3 BIO_set_cipher.3 \
-	BIO_f_md.3 BIO_get_md.3 \
-	BIO_f_md.3 BIO_get_md_ctx.3 \
-	BIO_f_md.3 BIO_set_md.3 \
-	BIO_f_ssl.3 BIO_get_num_renegotiates.3 \
-	BIO_f_ssl.3 BIO_get_ssl.3 \
-	BIO_f_ssl.3 BIO_new_buffer_ssl_connect.3 \
-	BIO_f_ssl.3 BIO_new_ssl.3 \
-	BIO_f_ssl.3 BIO_new_ssl_connect.3 \
-	BIO_f_ssl.3 BIO_set_ssl.3 \
-	BIO_f_ssl.3 BIO_set_ssl_mode.3 \
-	BIO_f_ssl.3 BIO_set_ssl_renegotiate_bytes.3 \
-	BIO_f_ssl.3 BIO_set_ssl_renegotiate_timeout.3 \
-	BIO_f_ssl.3 BIO_ssl_copy_session_id.3 \
-	BIO_f_ssl.3 BIO_ssl_shutdown.3 \
-	BIO_find_type.3 BIO_next.3 \
-	BIO_new.3 BIO_free.3 \
-	BIO_new.3 BIO_free_all.3 \
-	BIO_new.3 BIO_set.3 \
-	BIO_new.3 BIO_vfree.3 \
-	BIO_push.3 BIO_pop.3 \
-	BIO_read.3 BIO_gets.3 \
-	BIO_read.3 BIO_puts.3 \
-	BIO_read.3 BIO_write.3 \
-	BIO_s_accept.3 BIO_do_accept.3 \
-	BIO_s_accept.3 BIO_get_accept_port.3 \
-	BIO_s_accept.3 BIO_get_bind_mode.3 \
-	BIO_s_accept.3 BIO_set_accept_bios.3 \
-	BIO_s_accept.3 BIO_set_accept_port.3 \
-	BIO_s_accept.3 BIO_set_bind_mode.3 \
-	BIO_s_accept.3 BIO_set_nbio_accept.3 \
-	BIO_s_bio.3 BIO_ctrl_get_read_request.3 \
-	BIO_s_bio.3 BIO_ctrl_get_write_guarantee.3 \
-	BIO_s_bio.3 BIO_ctrl_reset_read_request.3 \
-	BIO_s_bio.3 BIO_destroy_bio_pair.3 \
-	BIO_s_bio.3 BIO_get_read_request.3 \
-	BIO_s_bio.3 BIO_get_write_buf_size.3 \
-	BIO_s_bio.3 BIO_get_write_guarantee.3 \
-	BIO_s_bio.3 BIO_make_bio_pair.3 \
-	BIO_s_bio.3 BIO_set_write_buf_size.3 \
-	BIO_s_bio.3 BIO_shutdown_wr.3 \
-	BIO_s_connect.3 BIO_do_connect.3 \
-	BIO_s_connect.3 BIO_get_conn_hostname.3 \
-	BIO_s_connect.3 BIO_get_conn_int_port.3 \
-	BIO_s_connect.3 BIO_get_conn_ip.3 \
-	BIO_s_connect.3 BIO_get_conn_port.3 \
-	BIO_s_connect.3 BIO_set_conn_hostname.3 \
-	BIO_s_connect.3 BIO_set_conn_int_port.3 \
-	BIO_s_connect.3 BIO_set_conn_ip.3 \
-	BIO_s_connect.3 BIO_set_conn_port.3 \
-	BIO_s_connect.3 BIO_set_nbio.3 \
-	BIO_s_fd.3 BIO_get_fd.3 \
-	BIO_s_fd.3 BIO_new_fd.3 \
-	BIO_s_fd.3 BIO_set_fd.3 \
-	BIO_s_file.3 BIO_append_filename.3 \
-	BIO_s_file.3 BIO_get_fp.3 \
-	BIO_s_file.3 BIO_new_file.3 \
-	BIO_s_file.3 BIO_new_fp.3 \
-	BIO_s_file.3 BIO_read_filename.3 \
-	BIO_s_file.3 BIO_rw_filename.3 \
-	BIO_s_file.3 BIO_set_fp.3 \
-	BIO_s_file.3 BIO_write_filename.3 \
-	BIO_s_mem.3 BIO_get_mem_data.3 \
-	BIO_s_mem.3 BIO_get_mem_ptr.3 \
-	BIO_s_mem.3 BIO_new_mem_buf.3 \
-	BIO_s_mem.3 BIO_set_mem_buf.3 \
-	BIO_s_mem.3 BIO_set_mem_eof_return.3 \
-	BIO_s_socket.3 BIO_new_socket.3 \
-	BIO_set_callback.3 BIO_debug_callback.3 \
-	BIO_set_callback.3 BIO_get_callback.3 \
-	BIO_set_callback.3 BIO_get_callback_arg.3 \
-	BIO_should_retry.3 BIO_get_retry_BIO.3 \
-	BIO_should_retry.3 BIO_get_retry_reason.3 \
-	BIO_should_retry.3 BIO_retry_type.3 \
-	BIO_should_retry.3 BIO_should_io_special.3 \
-	BIO_should_retry.3 BIO_should_read.3 \
-	BIO_should_retry.3 BIO_should_write.3 \
-	BN_CTX_new.3 BN_CTX_free.3 \
-	BN_CTX_new.3 BN_CTX_init.3 \
-	BN_CTX_start.3 BN_CTX_end.3 \
-	BN_CTX_start.3 BN_CTX_get.3 \
-	BN_add.3 BN_div.3 \
-	BN_add.3 BN_exp.3 \
-	BN_add.3 BN_gcd.3 \
-	BN_add.3 BN_mod.3 \
-	BN_add.3 BN_mod_add.3 \
-	BN_add.3 BN_mod_exp.3 \
-	BN_add.3 BN_mod_mul.3 \
-	BN_add.3 BN_mod_sqr.3 \
-	BN_add.3 BN_mod_sub.3 \
-	BN_add.3 BN_mul.3 \
-	BN_add.3 BN_nnmod.3 \
-	BN_add.3 BN_sqr.3 \
-	BN_add.3 BN_sub.3 \
-	BN_add_word.3 BN_div_word.3 \
-	BN_add_word.3 BN_mod_word.3 \
-	BN_add_word.3 BN_mul_word.3 \
-	BN_add_word.3 BN_sub_word.3 \
-	BN_bn2bin.3 BN_bin2bn.3 \
-	BN_bn2bin.3 BN_bn2dec.3 \
-	BN_bn2bin.3 BN_bn2hex.3 \
-	BN_bn2bin.3 BN_bn2mpi.3 \
-	BN_bn2bin.3 BN_dec2bn.3 \
-	BN_bn2bin.3 BN_hex2bn.3 \
-	BN_bn2bin.3 BN_mpi2bn.3 \
-	BN_bn2bin.3 BN_print.3 \
-	BN_bn2bin.3 BN_print_fp.3 \
-	BN_cmp.3 BN_is_odd.3 \
-	BN_cmp.3 BN_is_one.3 \
-	BN_cmp.3 BN_is_word.3 \
-	BN_cmp.3 BN_is_zero.3 \
-	BN_cmp.3 BN_ucmp.3 \
-	BN_copy.3 BN_dup.3 \
-	BN_generate_prime.3 BN_is_prime.3 \
-	BN_generate_prime.3 BN_is_prime_fasttest.3 \
-	BN_mod_mul_montgomery.3 BN_MONT_CTX_copy.3 \
-	BN_mod_mul_montgomery.3 BN_MONT_CTX_free.3 \
-	BN_mod_mul_montgomery.3 BN_MONT_CTX_init.3 \
-	BN_mod_mul_montgomery.3 BN_MONT_CTX_new.3 \
-	BN_mod_mul_montgomery.3 BN_MONT_CTX_set.3 \
-	BN_mod_mul_montgomery.3 BN_from_montgomery.3 \
-	BN_mod_mul_montgomery.3 BN_to_montgomery.3 \
-	BN_mod_mul_reciprocal.3 BN_RECP_CTX_free.3 \
-	BN_mod_mul_reciprocal.3 BN_RECP_CTX_init.3 \
-	BN_mod_mul_reciprocal.3 BN_RECP_CTX_new.3 \
-	BN_mod_mul_reciprocal.3 BN_RECP_CTX_set.3 \
-	BN_mod_mul_reciprocal.3 BN_div_recp.3 \
-	BN_new.3 BN_clear.3 \
-	BN_new.3 BN_clear_free.3 \
-	BN_new.3 BN_free.3 \
-	BN_new.3 BN_init.3 \
-	BN_num_bytes.3 BN_num_bits.3 \
-	BN_num_bytes.3 BN_num_bits_word.3 \
-	BN_rand.3 BN_pseudo_rand.3 \
-	BN_set_bit.3 BN_clear_bit.3 \
-	BN_set_bit.3 BN_is_bit_set.3 \
-	BN_set_bit.3 BN_lshift.3 \
-	BN_set_bit.3 BN_lshift1.3 \
-	BN_set_bit.3 BN_mask_bits.3 \
-	BN_set_bit.3 BN_rshift.3 \
-	BN_set_bit.3 BN_rshift1.3 \
-	BN_zero.3 BN_get_word.3 \
-	BN_zero.3 BN_one.3 \
-	BN_zero.3 BN_set_word.3 \
-	BN_zero.3 BN_value_one.3 \
-	CONF_modules_free.3 CONF_modules_unload.3 \
-	CONF_modules_load_file.3 CONF_modules_load.3 \
-	CRYPTO_set_ex_data.3 CRYPTO_get_ex_data.3 \
-	DH_generate_key.3 DH_compute_key.3 \
-	DH_generate_parameters.3 DH_check.3 \
-	DH_get_ex_new_index.3 DH_get_ex_data.3 \
-	DH_get_ex_new_index.3 DH_set_ex_data.3 \
-	DH_new.3 DH_free.3 \
-	DH_set_method.3 DH_OpenSSL.3 \
-	DH_set_method.3 DH_get_default_method.3 \
-	DH_set_method.3 DH_new_method.3 \
-	DH_set_method.3 DH_set_default_method.3 \
-	DSA_SIG_new.3 DSA_SIG_free.3 \
-	DSA_do_sign.3 DSA_do_verify.3 \
-	DSA_get_ex_new_index.3 DSA_get_ex_data.3 \
-	DSA_get_ex_new_index.3 DSA_set_ex_data.3 \
-	DSA_new.3 DSA_free.3 \
-	DSA_set_method.3 DSA_OpenSSL.3 \
-	DSA_set_method.3 DSA_get_default_method.3 \
-	DSA_set_method.3 DSA_new_method.3 \
-	DSA_set_method.3 DSA_set_default_method.3 \
-	DSA_sign.3 DSA_sign_setup.3 \
-	DSA_sign.3 DSA_verify.3 \
-	ERR_GET_LIB.3 ERR_GET_FUNC.3 \
-	ERR_GET_LIB.3 ERR_GET_REASON.3 \
-	ERR_error_string.3 ERR_error_string_n.3 \
-	ERR_error_string.3 ERR_func_error_string.3 \
-	ERR_error_string.3 ERR_lib_error_string.3 \
-	ERR_error_string.3 ERR_reason_error_string.3 \
-	ERR_get_error.3 ERR_get_error_line.3 \
-	ERR_get_error.3 ERR_get_error_line_data.3 \
-	ERR_get_error.3 ERR_peek_error.3 \
-	ERR_get_error.3 ERR_peek_error_line.3 \
-	ERR_get_error.3 ERR_peek_error_line_data.3 \
-	ERR_get_error.3 ERR_peek_last_error.3 \
-	ERR_get_error.3 ERR_peek_last_error_line.3 \
-	ERR_get_error.3 ERR_peek_last_error_line_data.3 \
-	ERR_load_crypto_strings.3 ERR_free_strings.3 \
-	ERR_load_crypto_strings.3 SSL_load_error_strings.3 \
-	ERR_load_strings.3 ERR_PACK.3 \
-	ERR_load_strings.3 ERR_get_next_error_library.3 \
-	ERR_print_errors.3 ERR_print_errors_fp.3 \
-	ERR_put_error.3 ERR_add_error_data.3 \
-	EVP_DigestInit.3 EVP_DigestFinal_ex.3 \
-	EVP_DigestInit.3 EVP_DigestInit_ex.3 \
-	EVP_DigestInit.3 EVP_DigestUpdate.3 \
-	EVP_DigestInit.3 EVP_MAX_MD_SIZE.3 \
-	EVP_DigestInit.3 EVP_MD_CTX_block_size.3 \
-	EVP_DigestInit.3 EVP_MD_CTX_cleanup.3 \
-	EVP_DigestInit.3 EVP_MD_CTX_copy.3 \
-	EVP_DigestInit.3 EVP_MD_CTX_copy_ex.3 \
-	EVP_DigestInit.3 EVP_MD_CTX_create.3 \
-	EVP_DigestInit.3 EVP_MD_CTX_destroy.3 \
-	EVP_DigestInit.3 EVP_MD_CTX_init.3 \
-	EVP_DigestInit.3 EVP_MD_CTX_md.3 \
-	EVP_DigestInit.3 EVP_MD_CTX_size.3 \
-	EVP_DigestInit.3 EVP_MD_CTX_type.3 \
-	EVP_DigestInit.3 EVP_MD_block_size.3 \
-	EVP_DigestInit.3 EVP_MD_pkey_type.3 \
-	EVP_DigestInit.3 EVP_MD_size.3 \
-	EVP_DigestInit.3 EVP_MD_type.3 \
-	EVP_DigestInit.3 EVP_dss.3 \
-	EVP_DigestInit.3 EVP_dss1.3 \
-	EVP_DigestInit.3 EVP_get_digestbyname.3 \
-	EVP_DigestInit.3 EVP_get_digestbynid.3 \
-	EVP_DigestInit.3 EVP_get_digestbyobj.3 \
-	EVP_DigestInit.3 EVP_md2.3 \
-	EVP_DigestInit.3 EVP_md5.3 \
-	EVP_DigestInit.3 EVP_md_null.3 \
-	EVP_DigestInit.3 EVP_mdc2.3 \
-	EVP_DigestInit.3 EVP_ripemd160.3 \
-	EVP_DigestInit.3 EVP_sha.3 \
-	EVP_DigestInit.3 EVP_sha1.3 \
-	EVP_EncryptInit.3 EVP_CIPHER_CTX_block_size.3 \
-	EVP_EncryptInit.3 EVP_CIPHER_CTX_cipher.3 \
-	EVP_EncryptInit.3 EVP_CIPHER_CTX_cleanup.3 \
-	EVP_EncryptInit.3 EVP_CIPHER_CTX_ctrl.3 \
-	EVP_EncryptInit.3 EVP_CIPHER_CTX_flags.3 \
-	EVP_EncryptInit.3 EVP_CIPHER_CTX_get_app_data.3 \
-	EVP_EncryptInit.3 EVP_CIPHER_CTX_init.3 \
-	EVP_EncryptInit.3 EVP_CIPHER_CTX_iv_length.3 \
-	EVP_EncryptInit.3 EVP_CIPHER_CTX_key_length.3 \
-	EVP_EncryptInit.3 EVP_CIPHER_CTX_mode.3 \
-	EVP_EncryptInit.3 EVP_CIPHER_CTX_nid.3 \
-	EVP_EncryptInit.3 EVP_CIPHER_CTX_set_app_data.3 \
-	EVP_EncryptInit.3 EVP_CIPHER_CTX_set_key_length.3 \
-	EVP_EncryptInit.3 EVP_CIPHER_CTX_set_padding.3 \
-	EVP_EncryptInit.3 EVP_CIPHER_CTX_type.3 \
-	EVP_EncryptInit.3 EVP_CIPHER_asn1_to_param.3 \
-	EVP_EncryptInit.3 EVP_CIPHER_block_size.3 \
-	EVP_EncryptInit.3 EVP_CIPHER_flags.3 \
-	EVP_EncryptInit.3 EVP_CIPHER_iv_length.3 \
-	EVP_EncryptInit.3 EVP_CIPHER_key_length.3 \
-	EVP_EncryptInit.3 EVP_CIPHER_mode.3 \
-	EVP_EncryptInit.3 EVP_CIPHER_nid.3 \
-	EVP_EncryptInit.3 EVP_CIPHER_param_to_asn1.3 \
-	EVP_EncryptInit.3 EVP_CIPHER_type.3 \
-	EVP_EncryptInit.3 EVP_CipherFinal.3 \
-	EVP_EncryptInit.3 EVP_CipherFinal_ex.3 \
-	EVP_EncryptInit.3 EVP_CipherInit.3 \
-	EVP_EncryptInit.3 EVP_CipherInit_ex.3 \
-	EVP_EncryptInit.3 EVP_CipherUpdate.3 \
-	EVP_EncryptInit.3 EVP_DecryptFinal.3 \
-	EVP_EncryptInit.3 EVP_DecryptFinal_ex.3 \
-	EVP_EncryptInit.3 EVP_DecryptInit.3 \
-	EVP_EncryptInit.3 EVP_DecryptInit_ex.3 \
-	EVP_EncryptInit.3 EVP_DecryptUpdate.3 \
-	EVP_EncryptInit.3 EVP_EncryptFinal.3 \
-	EVP_EncryptInit.3 EVP_EncryptInit_ex.3 \
-	EVP_EncryptInit.3 EVP_EncryptFinal_ex.3 \
-	EVP_EncryptInit.3 EVP_EncryptUpdate.3 \
-	EVP_EncryptInit.3 EVP_get_cipherbyname.3 \
-	EVP_EncryptInit.3 EVP_get_cipherbynid.3 \
-	EVP_EncryptInit.3 EVP_get_cipherbyobj.3 \
-	EVP_OpenInit.3 EVP_OpenFinal.3 \
-	EVP_OpenInit.3 EVP_OpenUpdate.3 \
-	EVP_PKEY_new.3 EVP_PKEY_free.3 \
-	EVP_PKEY_set1_RSA.3 EVP_PKEY_assign_DH.3 \
-	EVP_PKEY_set1_RSA.3 EVP_PKEY_assign_DSA.3 \
-	EVP_PKEY_set1_RSA.3 EVP_PKEY_assign_EC_KEY.3 \
-	EVP_PKEY_set1_RSA.3 EVP_PKEY_assign_RSA.3 \
-	EVP_PKEY_set1_RSA.3 EVP_PKEY_get1_DH.3 \
-	EVP_PKEY_set1_RSA.3 EVP_PKEY_get1_DSA.3 \
-	EVP_PKEY_set1_RSA.3 EVP_PKEY_get1_EC_KEY.3 \
-	EVP_PKEY_set1_RSA.3 EVP_PKEY_get1_RSA.3 \
-	EVP_PKEY_set1_RSA.3 EVP_PKEY_set1_DH.3 \
-	EVP_PKEY_set1_RSA.3 EVP_PKEY_set1_DSA.3 \
-	EVP_PKEY_set1_RSA.3 EVP_PKEY_set1_EC_KEY.3 \
-	EVP_PKEY_set1_RSA.3 EVP_PKEY_type.3 \
-	EVP_SealInit.3 EVP_SealFinal.3 \
-	EVP_SealInit.3 EVP_SealUpdate.3 \
-	EVP_SignInit.3 EVP_SignFinal.3 \
-	EVP_SignInit.3 EVP_SignUpdate.3 \
-	EVP_VerifyInit.3 EVP_VerifyFinal.3 \
-	EVP_VerifyInit.3 EVP_VerifyUpdate.3 \
-	OBJ_nid2obj.3 OBJ_cleanup.3 \
-	OBJ_nid2obj.3 OBJ_cmp.3 \
-	OBJ_nid2obj.3 OBJ_create.3 \
-	OBJ_nid2obj.3 OBJ_dup.3 \
-	OBJ_nid2obj.3 OBJ_ln2nid.3 \
-	OBJ_nid2obj.3 OBJ_nid2ln.3 \
-	OBJ_nid2obj.3 OBJ_nid2sn.3 \
-	OBJ_nid2obj.3 OBJ_obj2nid.3 \
-	OBJ_nid2obj.3 OBJ_obj2txt.3 \
-	OBJ_nid2obj.3 OBJ_sn2nid.3 \
-	OBJ_nid2obj.3 OBJ_txt2nid.3 \
-	OBJ_nid2obj.3 OBJ_txt2obj.3 \
-	OPENSSL_VERSION_NUMBER.3 SSLeay.3 \
-	OPENSSL_VERSION_NUMBER.3 SSLeay_version.3 \
-	OpenSSL_add_all_algorithms.3 OpenSSL_add_all_ciphers.3 \
-	OpenSSL_add_all_algorithms.3 OpenSSL_add_all_digests.3 \
-	OPENSSL_config.3 OPENSSL_no_config.3 \
-	RAND_add.3 RAND_event.3 \
-	RAND_add.3 RAND_screen.3 \
-	RAND_add.3 RAND_seed.3 \
-	RAND_add.3 RAND_status.3 \
-	RAND_bytes.3 RAND_pseudo_bytes.3 \
-	RAND_load_file.3 RAND_file_name.3 \
-	RAND_load_file.3 RAND_write_file.3 \
-	RAND_set_rand_method.3 RAND_SSLeay.3 \
-	RAND_set_rand_method.3 RAND_get_rand_method.3 \
-	RSA_blinding_on.3 RSA_blinding_off.3 \
-	RSA_get_ex_new_index.3 RSA_get_ex_data.3 \
-	RSA_get_ex_new_index.3 RSA_set_ex_data.3 \
-	RSA_new.3 RSA_free.3 \
-	RSA_padding_add_PKCS1_type_1.3 RSA_padding_add_PKCS1_OAEP.3 \
-	RSA_padding_add_PKCS1_type_1.3 RSA_padding_add_PKCS1_type_2.3 \
-	RSA_padding_add_PKCS1_type_1.3 RSA_padding_add_SSLv23.3 \
-	RSA_padding_add_PKCS1_type_1.3 RSA_padding_add_none.3 \
-	RSA_padding_add_PKCS1_type_1.3 RSA_padding_check_PKCS1_OAEP.3 \
-	RSA_padding_add_PKCS1_type_1.3 RSA_padding_check_PKCS1_type_1.3 \
-	RSA_padding_add_PKCS1_type_1.3 RSA_padding_check_PKCS1_type_2.3 \
-	RSA_padding_add_PKCS1_type_1.3 RSA_padding_check_SSLv23.3 \
-	RSA_padding_add_PKCS1_type_1.3 RSA_padding_check_none.3 \
-	RSA_print.3 DHparams_print.3 \
-	RSA_print.3 DHparams_print_fp.3 \
-	RSA_print.3 DSA_print.3 \
-	RSA_print.3 DSA_print_fp.3 \
-	RSA_print.3 DSAparams_print.3 \
-	RSA_print.3 DSAparams_print_fp.3 \
-	RSA_print.3 RSA_print_fp.3 \
-	RSA_private_encrypt.3 RSA_public_decrypt.3 \
-	RSA_public_encrypt.3 RSA_private_decrypt.3 \
-	RSA_set_method.3 RSA_PKCS1_SSLeay.3 \
-	RSA_set_method.3 RSA_flags.3 \
-	RSA_set_method.3 RSA_get_default_method.3 \
-	RSA_set_method.3 RSA_get_method.3 \
-	RSA_set_method.3 RSA_new_method.3 \
-	RSA_set_method.3 RSA_null_method.3 \
-	RSA_set_method.3 RSA_set_default_method.3 \
-	RSA_sign.3 RSA_verify.3 \
-	RSA_sign_ASN1_OCTET_STRING.3 RSA_verify_ASN1_OCTET_STRING.3 \
-	SSL_CIPHER_get_name.3 SSL_CIPHER_description.3 \
-	SSL_CIPHER_get_name.3 SSL_CIPHER_get_bits.3 \
-	SSL_CIPHER_get_name.3 SSL_CIPHER_get_version.3 \
-	SSL_CTX_add_session.3 SSL_CTX_remove_session.3 \
-	SSL_CTX_add_session.3 SSL_add_session.3 \
-	SSL_CTX_add_session.3 SSL_remove_session.3 \
-	SSL_CTX_ctrl.3 SSL_CTX_callback_ctrl.3 \
-	SSL_CTX_ctrl.3 SSL_callback_ctrl.3 \
-	SSL_CTX_ctrl.3 SSL_ctrl.3 \
-	SSL_CTX_flush_sessions.3 SSL_flush_sessions.3 \
-	SSL_CTX_get_ex_new_index.3 SSL_CTX_get_ex_data.3 \
-	SSL_CTX_get_ex_new_index.3 SSL_CTX_set_ex_data.3 \
-	SSL_CTX_get_verify_mode.3 SSL_CTX_get_verify_callback.3 \
-	SSL_CTX_get_verify_mode.3 SSL_CTX_get_verify_depth.3 \
-	SSL_CTX_get_verify_mode.3 SSL_get_verify_callback.3 \
-	SSL_CTX_get_verify_mode.3 SSL_get_verify_depth.3 \
-	SSL_CTX_get_verify_mode.3 SSL_get_verify_mode.3 \
-	SSL_CTX_sess_number.3 SSL_CTX_sess_accept.3 \
-	SSL_CTX_sess_number.3 SSL_CTX_sess_accept_good.3 \
-	SSL_CTX_sess_number.3 SSL_CTX_sess_accept_renegotiate.3 \
-	SSL_CTX_sess_number.3 SSL_CTX_sess_cache_full.3 \
-	SSL_CTX_sess_number.3 SSL_CTX_sess_cb_hits.3 \
-	SSL_CTX_sess_number.3 SSL_CTX_sess_connect.3 \
-	SSL_CTX_sess_number.3 SSL_CTX_sess_connect_good.3 \
-	SSL_CTX_sess_number.3 SSL_CTX_sess_connect_renegotiate.3 \
-	SSL_CTX_sess_number.3 SSL_CTX_sess_hits.3 \
-	SSL_CTX_sess_number.3 SSL_CTX_sess_misses.3 \
-	SSL_CTX_sess_number.3 SSL_CTX_sess_timeouts.3 \
-	SSL_CTX_sess_set_cache_size.3 SSL_CTX_sess_get_cache_size.3 \
-	SSL_CTX_sess_set_get_cb.3 SSL_CTX_sess_get_get_cb.3 \
-	SSL_CTX_sess_set_get_cb.3 SSL_CTX_sess_get_new_cb.3 \
-	SSL_CTX_sess_set_get_cb.3 SSL_CTX_sess_get_remove_cb.3 \
-	SSL_CTX_sess_set_get_cb.3 SSL_CTX_sess_set_new_cb.3 \
-	SSL_CTX_sess_set_get_cb.3 SSL_CTX_sess_set_remove_cb.3 \
-	SSL_CTX_set_cert_store.3 SSL_CTX_get_cert_store.3 \
-	SSL_CTX_set_cipher_list.3 SSL_set_cipher_list.3 \
-	SSL_CTX_set_client_CA_list.3 SSL_CTX_add_client_CA.3 \
-	SSL_CTX_set_client_CA_list.3 SSL_add_client_CA.3 \
-	SSL_CTX_set_client_CA_list.3 SSL_set_client_CA_list.3 \
-	SSL_CTX_set_client_cert_cb.3 SSL_CTX_get_client_cert_cb.3 \
-	SSL_CTX_set_default_passwd_cb.3 SSL_CTX_set_default_passwd_cb_userdata.3 \
-	SSL_CTX_set_generate_session_id.3 SSL_has_matching_session_id.3 \
-	SSL_CTX_set_generate_session_id.3 SSL_set_generate_session_id.3 \
-	SSL_CTX_set_info_callback.3 SSL_CTX_get_info_callback.3 \
-	SSL_CTX_set_info_callback.3 SSL_get_info_callback.3 \
-	SSL_CTX_set_info_callback.3 SSL_set_info_callback.3 \
-	SSL_CTX_set_max_cert_list.3 SSL_CTX_get_max_cert_list.3 \
-	SSL_CTX_set_max_cert_list.3 SSL_get_max_cert_list.3 \
-	SSL_CTX_set_max_cert_list.3 SSL_set_max_cert_list.3 \
-	SSL_CTX_set_mode.3 SSL_CTX_get_mode.3 \
-	SSL_CTX_set_mode.3 SSL_get_mode.3 \
-	SSL_CTX_set_mode.3 SSL_set_mode.3 \
-	SSL_CTX_set_msg_callback.3 SSL_CTX_set_msg_callback_arg.3 \
-	SSL_CTX_set_msg_callback.3 SSL_get_msg_callback_arg.3 \
-	SSL_CTX_set_msg_callback.3 SSL_set_msg_callback.3 \
-	SSL_CTX_set_options.3 SSL_CTX_get_options.3 \
-	SSL_CTX_set_options.3 SSL_get_options.3 \
-	SSL_CTX_set_options.3 SSL_set_options.3 \
-	SSL_CTX_set_quiet_shutdown.3 SSL_CTX_get_quiet_shutdown.3 \
-	SSL_CTX_set_quiet_shutdown.3 SSL_get_quiet_shutdown.3 \
-	SSL_CTX_set_quiet_shutdown.3 SSL_set_quiet_shutdown.3 \
-	SSL_CTX_set_session_cache_mode.3 SSL_CTX_get_session_cache_mode.3 \
-	SSL_CTX_set_session_id_context.3 SSL_set_session_id_context.3 \
-	SSL_CTX_set_ssl_version.3 SSL_get_ssl_method.3 \
-	SSL_CTX_set_ssl_version.3 SSL_set_ssl_method.3 \
-	SSL_CTX_set_timeout.3 SSL_CTX_get_timeout.3 \
-	SSL_CTX_set_tmp_dh_callback.3 SSL_CTX_set_tmp_dh.3 \
-	SSL_CTX_set_tmp_dh_callback.3 SSL_set_tmp_dh.3 \
-	SSL_CTX_set_tmp_dh_callback.3 SSL_set_tmp_dh_callback.3 \
-	SSL_CTX_set_tmp_rsa_callback.3 SSL_CTX_need_tmp_rsa.3 \
-	SSL_CTX_set_tmp_rsa_callback.3 SSL_CTX_set_tmp_rsa.3 \
-	SSL_CTX_set_tmp_rsa_callback.3 SSL_need_tmp_rsa.3 \
-	SSL_CTX_set_tmp_rsa_callback.3 SSL_set_tmp_rsa.3 \
-	SSL_CTX_set_tmp_rsa_callback.3 SSL_set_tmp_rsa_callback.3 \
-	SSL_CTX_set_verify.3 SSL_CTX_set_verify_depth.3 \
-	SSL_CTX_set_verify.3 SSL_set_verify.3 \
-	SSL_CTX_set_verify.3 SSL_set_verify_depth.3 \
-	SSL_CTX_use_certificate.3 SSL_CTX_check_private_key.3 \
-	SSL_CTX_use_certificate.3 SSL_CTX_use_PrivateKey.3 \
-	SSL_CTX_use_certificate.3 SSL_CTX_use_PrivateKey_ASN1.3 \
-	SSL_CTX_use_certificate.3 SSL_CTX_use_PrivateKey_file.3 \
-	SSL_CTX_use_certificate.3 SSL_CTX_use_RSAPrivateKey.3 \
-	SSL_CTX_use_certificate.3 SSL_CTX_use_RSAPrivateKey_ASN1.3 \
-	SSL_CTX_use_certificate.3 SSL_CTX_use_RSAPrivateKey_file.3 \
-	SSL_CTX_use_certificate.3 SSL_CTX_use_certificate_ASN1.3 \
-	SSL_CTX_use_certificate.3 SSL_CTX_use_certificate_file.3 \
-	SSL_CTX_use_certificate.3 SSL_CTX_use_certificate_chain_file.3 \
-	SSL_CTX_use_certificate.3 SSL_check_private_key.3 \
-	SSL_CTX_use_certificate.3 SSL_use_PrivateKey.3 \
-	SSL_CTX_use_certificate.3 SSL_use_PrivateKey_ASN1.3 \
-	SSL_CTX_use_certificate.3 SSL_use_PrivateKey_file.3 \
-	SSL_CTX_use_certificate.3 SSL_use_RSAPrivateKey.3 \
-	SSL_CTX_use_certificate.3 SSL_use_RSAPrivateKey_ASN1.3 \
-	SSL_CTX_use_certificate.3 SSL_use_RSAPrivateKey_file.3 \
-	SSL_CTX_use_certificate.3 SSL_use_certificate.3 \
-	SSL_CTX_use_certificate.3 SSL_use_certificate_ASN1.3 \
-	SSL_CTX_use_certificate.3 SSL_use_certificate_file.3 \
-	SSL_SESSION_get_ex_new_index.3 SSL_SESSION_get_ex_data.3 \
-	SSL_SESSION_get_ex_new_index.3 SSL_SESSION_set_ex_data.3 \
-	SSL_SESSION_get_time.3 SSL_SESSION_get_timeout.3 \
-	SSL_SESSION_get_time.3 SSL_SESSION_set_time.3 \
-	SSL_alert_type_string.3 SSL_alert_desc_string.3 \
-	SSL_alert_type_string.3 SSL_alert_desc_string_long.3 \
-	SSL_alert_type_string.3 SSL_alert_type_string_long.3 \
-	SSL_get_ciphers.3 SSL_get_cipher_list.3 \
-	SSL_get_client_CA_list.3 SSL_CTX_get_client_CA_list.3 \
-	SSL_get_current_cipher.3 SSL_get_cipher.3 \
-	SSL_get_current_cipher.3 SSL_get_cipher_bits.3 \
-	SSL_get_current_cipher.3 SSL_get_cipher_name.3 \
-	SSL_get_current_cipher.3 SSL_get_cipher_version.3 \
-	SSL_get_ex_new_index.3 SSL_get_ex_data.3 \
-	SSL_get_ex_new_index.3 SSL_set_ex_data.3 \
-	SSL_library_init.3 OpenSSL_add_ssl_algorithms.3 \
-	SSL_library_init.3 SSLeay_add_ssl_algorithms.3 \
-	SSL_rstate_string.3 SSL_rstate_string_long.3 \
-	SSL_set_connect_state.3 SSL_get_accept_state.3 \
-	SSL_set_shutdown.3 SSL_get_shutdown.3 \
-	SSL_state_string.3 SSL_state_string_long.3 \
-	SSL_want.3 SSL_want_nothing.3 \
-	SSL_want.3 SSL_want_read.3 \
-	SSL_want.3 SSL_want_write.3 \
-	SSL_want.3 SSL_want_x509_lookup.3 \
-	X509_NAME_ENTRY_get_object.3 X509_NAME_ENTRY_create_by_NID.3 \
-	X509_NAME_ENTRY_get_object.3 X509_NAME_ENTRY_create_by_OBJ.3 \
-	X509_NAME_ENTRY_get_object.3 X509_NAME_ENTRY_create_by_txt.3 \
-	X509_NAME_ENTRY_get_object.3 X509_NAME_ENTRY_get_data.3 \
-	X509_NAME_ENTRY_get_object.3 X509_NAME_ENTRY_set_data.3 \
-	X509_NAME_ENTRY_get_object.3 X509_NAME_ENTRY_set_object.3 \
-	X509_NAME_add_entry_by_txt.3 X509_NAME_add_entry.3 \
-	X509_NAME_add_entry_by_txt.3 X509_NAME_add_entry_by_NID.3 \
-	X509_NAME_add_entry_by_txt.3 X509_NAME_add_entry_by_OBJ.3 \
-	X509_NAME_add_entry_by_txt.3 X509_NAME_delete_entry.3 \
-	X509_NAME_get_index_by_NID.3 X509_NAME_entry_count.3 \
-	X509_NAME_get_index_by_NID.3 X509_NAME_get_entry.3 \
-	X509_NAME_get_index_by_NID.3 X509_NAME_get_index_by_OBJ.3 \
-	X509_NAME_get_index_by_NID.3 X509_NAME_get_text_by_NID.3 \
-	X509_NAME_get_index_by_NID.3 X509_NAME_get_text_by_OBJ.3 \
-	X509_NAME_print_ex.3 X509_NAME_oneline.3 \
-	X509_NAME_print_ex.3 X509_NAME_print.3 \
-	X509_NAME_print_ex.3 X509_NAME_print_ex_fp.3 \
-	X509_new.3 X509_free.3 \
-	blowfish.3 BF_cbc_encrypt.3 \
-	blowfish.3 BF_cfb64_encrypt.3 \
-	blowfish.3 BF_decrypt.3 \
-	blowfish.3 BF_ecb_encrypt.3 \
-	blowfish.3 BF_encrypt.3 \
-	blowfish.3 BF_ofb64_encrypt.3 \
-	blowfish.3 BF_options.3 \
-	blowfish.3 BF_set_key.3 \
-	bn_internal.3 bn_add_words.3 \
-	bn_internal.3 bn_check_top.3 \
-	bn_internal.3 bn_cmp_words.3 \
-	bn_internal.3 bn_div_words.3 \
-	bn_internal.3 bn_dump.3 \
-	bn_internal.3 bn_expand.3 \
-	bn_internal.3 bn_expand2.3 \
-	bn_internal.3 bn_fix_top.3 \
-	bn_internal.3 bn_mul_add_words.3 \
-	bn_internal.3 bn_mul_comba4.3 \
-	bn_internal.3 bn_mul_comba8.3 \
-	bn_internal.3 bn_mul_high.3 \
-	bn_internal.3 bn_mul_low_normal.3 \
-	bn_internal.3 bn_mul_low_recursive.3 \
-	bn_internal.3 bn_mul_normal.3 \
-	bn_internal.3 bn_mul_part_recursive.3 \
-	bn_internal.3 bn_mul_recursive.3 \
-	bn_internal.3 bn_mul_words.3 \
-	bn_internal.3 bn_print.3 \
-	bn_internal.3 bn_set_high.3 \
-	bn_internal.3 bn_set_low.3 \
-	bn_internal.3 bn_set_max.3 \
-	bn_internal.3 bn_sqr_comba4.3 \
-	bn_internal.3 bn_sqr_comba8.3 \
-	bn_internal.3 bn_sqr_normal.3 \
-	bn_internal.3 bn_sqr_recursive.3 \
-	bn_internal.3 bn_sqr_words.3 \
-	bn_internal.3 bn_sub_words.3 \
-	bn_internal.3 bn_wexpand.3 \
-	buffer.3 BUF_MEM_free.3 \
-	buffer.3 BUF_MEM_grow.3 \
-	buffer.3 BUF_MEM_new.3 \
-	buffer.3 BUF_strdup.3 \
-	d2i_ASN1_OBJECT.3 i2d_ASN1_OBJECT.3 \
-	d2i_DHparams.3 i2d_DHparams.3 \
-	d2i_DSAPublicKey.3 d2i_DSAPrivateKey.3 \
-	d2i_DSAPublicKey.3 d2i_DSA_PUBKEY.3 \
-	d2i_DSAPublicKey.3 d2i_DSA_SIG.3 \
-	d2i_DSAPublicKey.3 i2d_DSAPrivateKey.3 \
-	d2i_DSAPublicKey.3 i2d_DSAPublicKey.3 \
-	d2i_DSAPublicKey.3 i2d_DSA_PUBKEY.3 \
-	d2i_DSAPublicKey.3 i2d_DSA_SIG.3 \
-	d2i_PKCS8PrivateKey.3 d2i_PKCS8PrivateKey_bio.3 \
-	d2i_PKCS8PrivateKey.3 d2i_PKCS8PrivateKey_fp.3 \
-	d2i_PKCS8PrivateKey.3 i2d_PKCS8PrivateKey_bio.3 \
-	d2i_PKCS8PrivateKey.3 i2d_PKCS8PrivateKey_fp.3 \
-	d2i_PKCS8PrivateKey.3 i2d_PKCS8PrivateKey_nid_bio.3 \
-	d2i_PKCS8PrivateKey.3 i2d_PKCS8PrivateKey_nid_fp.3 \
-	d2i_RSAPublicKey.3 d2i_Netscape_RSA.3 \
-	d2i_RSAPublicKey.3 d2i_RSAPrivateKey.3 \
-	d2i_RSAPublicKey.3 d2i_RSA_PUBKEY.3 \
-	d2i_RSAPublicKey.3 i2d_Netscape_RSA.3 \
-	d2i_RSAPublicKey.3 i2d_RSAPrivateKey.3 \
-	d2i_RSAPublicKey.3 i2d_RSAPublicKey.3 \
-	d2i_RSAPublicKey.3 i2d_RSA_PUBKEY.3 \
-	d2i_SSL_SESSION.3 i2d_SSL_SESSION.3 \
-	d2i_X509.3 i2d_X509.3 \
-	d2i_X509.3 d2i_X509_REQ_bio.3 \
-	d2i_X509.3 d2i_X509_REQ_fp.3 \
-	d2i_X509.3 i2d_X509_bio.3 \
-	d2i_X509.3 i2d_X509_fp.3 \
-	d2i_X509_ALGOR.3 i2d_X509_ALGOR.3 \
-	d2i_X509_CRL.3 d2i_509_CRL_fp.3 \
-	d2i_X509_CRL.3 d2i_X509_bio.3 \
-	d2i_X509_CRL.3 i2d_X509_CRL.3 \
-	d2i_X509_CRL.3 i2d_X509_CRL_bio.3 \
-	d2i_X509_CRL.3 i2d_X509_CRL_fp.3 \
-	d2i_X509_NAME.3 i2d_X509_NAME.3 \
-	d2i_X509_REQ.3 i2d_X509_REQ.3 \
-	d2i_X509_REQ.3 i2d_X509_REQ_bio.3 \
-	d2i_X509_REQ.3 i2d_X509_REQ_fp.3 \
-	d2i_X509_SIG.3 i2d_X509_SIG.3 \
-	d2i_X509_REQ.3 d2i_X509_fp.3 \
-	d2i_X509_REQ.3 d2i_X509_CRL_bio.3 \
-	des.3 DES_cbc_cksum.3 \
-	des.3 DES_cfb64_encrypt.3 \
-	des.3 DES_cfb_encrypt.3 \
-	des.3 DES_crypt.3 \
-	des.3 DES_ecb2_encrypt.3 \
-	des.3 DES_ecb3_encrypt.3 \
-	des.3 DES_ecb_encrypt.3 \
-	des.3 DES_ede2_cbc_encrypt.3 \
-	des.3 DES_ede2_cfb64_encrypt.3 \
-	des.3 DES_ede2_ofb64_encrypt.3 \
-	des.3 DES_ede3_cbc_encrypt.3 \
-	des.3 DES_ede3_cbcm_encrypt.3 \
-	des.3 DES_ede3_cfb64_encrypt.3 \
-	des.3 DES_ede3_ofb64_encrypt.3 \
-	des.3 DES_enc_read.3 \
-	des.3 DES_enc_write.3 \
-	des.3 DES_fcrypt.3 \
-	des.3 DES_is_weak_key.3 \
-	des.3 DES_key_sched.3 \
-	des.3 DES_ncbc_encrypt.3 \
-	des.3 DES_ofb64_encrypt.3 \
-	des.3 DES_ofb_encrypt.3 \
-	des.3 DES_pcbc_encrypt.3 \
-	des.3 DES_quad_cksum.3 \
-	des.3 DES_random_key.3 \
-	des.3 DES_set_key.3 \
-	des.3 DES_set_key_checked.3 \
-	des.3 DES_set_key_unchecked.3 \
-	des.3 DES_set_odd_parity.3 \
-	des.3 DES_string_to_2keys.3 \
-	des.3 DES_string_to_key.3 \
-	des.3 DES_xcbc_encrypt.3 \
-	hmac.3 HMAC.3 \
-	hmac.3 HMAC_Final.3 \
-	hmac.3 HMAC_Init.3 \
-	hmac.3 HMAC_Update.3 \
-	hmac.3 HMAC_cleanup.3 \
-	lh_stats.3 lh_node_stats.3 \
-	lh_stats.3 lh_node_stats_bio.3 \
-	lh_stats.3 lh_node_usage_stats.3 \
-	lh_stats.3 lh_node_usage_stats_bio.3 \
-	lh_stats.3 lh_stats_bio.3 \
-	lhash.3 lh_delete.3 \
-	lhash.3 lh_doall.3 \
-	lhash.3 lh_doall_arg.3 \
-	lhash.3 lh_error.3 \
-	lhash.3 lh_free.3 \
-	lhash.3 lh_insert.3 \
-	lhash.3 lh_new.3 \
-	lhash.3 lh_retrieve.3 \
-	md5.3 MD2.3 \
-	md5.3 MD2_Final.3 \
-	md5.3 MD2_Init.3 \
-	md5.3 MD2_Update.3 \
-	md5.3 MD4.3 \
-	md5.3 MD4_Final.3 \
-	md5.3 MD4_Init.3 \
-	md5.3 MD4_Update.3 \
-	md5.3 MD5.3 \
-	md5.3 MD5_Final.3 \
-	md5.3 MD5_Init.3 \
-	md5.3 MD5_Update.3 \
-	mdc2.3 MDC2.3 \
-	mdc2.3 MDC2_Final.3 \
-	mdc2.3 MDC2_Init.3 \
-	mdc2.3 MDC2_Update.3 \
-	pem.3 PEM.3 \
-	rc4.3 RC4.3 \
-	rc4.3 RC4_set_key.3 \
-	ripemd.3 RIPEMD160.3 \
-	ripemd.3 RIPEMD160_Final.3 \
-	ripemd.3 RIPEMD160_Init.3 \
-	ripemd.3 RIPEMD160_Update.3 \
-	sha.3 SHA1.3 \
-	sha.3 SHA1_Final.3 \
-	sha.3 SHA1_Init.3 \
-	sha.3 SHA1_Update.3 \
-	ssl.3 SSL.3 \
-	threads.3 CRYPTO_destroy_dynlockid.3 \
-	threads.3 CRYPTO_get_new_dynlockid.3 \
-	threads.3 CRYPTO_lock.3 \
-	threads.3 CRYPTO_num_locks.3 \
-	threads.3 CRYPTO_set_dynlock_create_callback.3 \
-	threads.3 CRYPTO_set_dynlock_destroy_callback.3 \
-	threads.3 CRYPTO_set_dynlock_lock_callback.3 \
-	threads.3 CRYPTO_set_id_callback.3 \
-	threads.3 CRYPTO_set_locking_callback.3 \
-	ui.3 ERR_load_UI_strings.3 \
-	ui.3 UI_OpenSSL.3 \
-	ui.3 UI_add_error_string.3 \
-	ui.3 UI_add_info_string.3 \
-	ui.3 UI_add_input_boolean.3 \
-	ui.3 UI_add_input_string.3 \
-	ui.3 UI_add_user_data.3 \
-	ui.3 UI_add_verify_string.3 \
-	ui.3 UI_construct_prompt.3 \
-	ui.3 UI_ctrl.3 \
-	ui.3 UI_dup_error_string.3 \
-	ui.3 UI_dup_info_string.3 \
-	ui.3 UI_dup_input_boolean.3 \
-	ui.3 UI_dup_input_string.3 \
-	ui.3 UI_dup_verify_string.3 \
-	ui.3 UI_free.3 \
-	ui.3 UI_get0_result.3 \
-	ui.3 UI_get0_user_data.3 \
-	ui.3 UI_get_default_method.3 \
-	ui.3 UI_get_method.3 \
-	ui.3 UI_new.3 \
-	ui.3 UI_new_method.3 \
-	ui.3 UI_process.3 \
-	ui.3 UI_set_default_method.3 \
-	ui.3 UI_set_method.3 \
-	ui_compat.3 des_read_2passwords.3 \
-	ui_compat.3 des_read_password.3 \
-	ui_compat.3 des_read_pw.3 \
-	ui_compat.3 des_read_pw_string.3 \
-	des_modes.7 Modes_of_DES.7
-
-.include <bsd.port.pre.mk>
-
-.if ${PORTOBJFORMAT} == "aout"
-MAKE_ARGS+=	WHOLE_ARCHIVE_FLAG=-Bforcearchive
-.else
-MAKE_ARGS+=	WHOLE_ARCHIVE_FLAG=--whole-archive
-.endif
+MASTERDIR?=	${.CURDIR}/../openssl
+WITH_OPENSSL_BETA=	yes
 
-.if defined(NOSHARED)
-PLIST_SUB+=	SHARED="@comment "
-.else
-PLIST_SUB+=	SHARED=""
-ALL_TARGET=	freebsd-shared all
-MAKE_ENV+=	SHLIBVER=${OPENSSL_SHLIBVER}
-PLIST_SUB+=	SHLIBVER=${OPENSSL_SHLIBVER}
-INSTALLS_SHLIB=	yes
+.if exists(${.CURDIR}/Makefile.local)
+.include "${.CURDIR}/Makefile.local"
 .endif
 
-.if defined(OPENSSL_OVERWRITE_BASE)
-.if exists(/lib/libcrypto.so)
-pre-everything::
-	@${ECHO_CMD} "#"
-	@${ECHO_CMD} "# this ports does not support the dynamic root"
-	@${ECHO_CMD} "# please undefine OPENSSL_OVERWRITE_BASE"
-	@${ECHO_CMD} "# and use WITH_OPENSSL_PORT=yes instead."
-	@${ECHO_CMD} "#"
-	@${FALSE}
-
-.endif
-PKGNAMESUFFIX=	-beta-overwrite-base
-PREFIX=		/usr
-OPENSSLDIR=	/etc/ssl
-MANPREFIX=	${PREFIX}/openssl
-PLIST_SUB+=	MANDIR=""
-PLIST_SUB+=	NOBASE="@comment "
-.else
-OPENSSLDIR=	${PREFIX}/openssl
-MANPREFIX=	${PREFIX}
-PLIST_SUB+=	MANDIR="@comment "
-PLIST_SUB+=	NOBASE=""
-.endif
-
-.if defined(BATCH) || defined(OPENSSL_WITH_386)
-.if ${MACHINE_ARCH} == "i386"
-EXTRACONFIGURE=	386
-.endif
-.endif
-
-do-configure:
-	cd ${WRKSRC} \
-	&& ${SETENV} CC="${CC}" CFLAGS="${CFLAGS}" PERL="${PERL}" \
-	PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS} \
-	./config --prefix=${PREFIX} --openssldir=${OPENSSLDIR} \
-	-L${PREFIX}/lib ${EXTRACONFIGURE}
-
-post-install:
-.if !defined(NOSHARED)
-.for i in libcrypto libssl
-	@${INSTALL_DATA} ${WRKSRC}/$i.so.${OPENSSL_SHLIBVER} ${PREFIX}/lib
-	@${LN} -sf $i.so.${OPENSSL_SHLIBVER} ${PREFIX}/lib/$i.so
-.endfor
-.endif
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/openssl.txt ${DOCSDIR}/
-.endif
-	@${SED} -e 's#/usr/local#${PREFIX}#g' ${PKGMESSAGE}
-
-test:
-	cd ${WRKSRC} && ${MAKE} test
-
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/security/openssl-beta/distinfo b/security/openssl-beta/distinfo
deleted file mode 100644
index aeac780cbb33..000000000000
--- a/security/openssl-beta/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (openssl-0.9.7d.tar.gz) = 1b49e90fc8a75c3a507c0a624529aca5
-SIZE (openssl-0.9.7d.tar.gz) = 2798433
diff --git a/security/openssl-beta/files/patch-Configure b/security/openssl-beta/files/patch-Configure
deleted file mode 100644
index 473cba68d439..000000000000
--- a/security/openssl-beta/files/patch-Configure
+++ /dev/null
@@ -1,27 +0,0 @@
---- Configure.orig	Tue Feb 18 13:15:09 2003
-+++ Configure	Wed Feb 19 19:28:01 2003
-@@ -349,7 +349,7 @@
- #
- # This probably belongs in a different section.
- #
--"FreeBSD-alpha","gcc:-DTERMIOS -O -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"FreeBSD-alpha","$ENV{CC}:-DTERMIOS $ENV{CFLAGS}::$ENV{PTHREAD_LIBS} -D_REENTRANT $ENV{PTHREAD_CFLAGS}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- 
- #### Alpha Linux with GNU C and Compaq C setups
- # Special notes:
-@@ -394,10 +394,11 @@
- "NetBSD-sparc",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "NetBSD-m68",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "NetBSD-x86",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"FreeBSD-elf",  "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"FreeBSD-sparc64","gcc:-DB_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2 BF_PTR::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"FreeBSD-ia64","gcc:-DL_ENDIAN -DTERMIOS -O -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64-cpp.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"FreeBSD",      "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
-+"FreeBSD-elf",  "$ENV{CC}:-DTERMIOS -DL_ENDIAN $ENV{CFLAGS} -Wall::$ENV{PTHREAD_LIBS} -D_REENTRANT $ENV{PTHREAD_CFLAGS}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"FreeBSD-sparc64","$ENV{CC}:-DB_ENDIAN -DTERMIOS $ENV{CFLAGS}::$ENV{PTHREAD_LIBS} -D_REENTRANT $ENV{PTHREAD_CFLAGS}:::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2 BF_PTR::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"FreeBSD-ia64","$ENV{CC}:-DL_ENDIAN -DTERMIOS $ENV{CFLAGS}::$ENV{PTHREAD_LIBS} -D_REENTRANT $ENV{PTHREAD_CFLAGS}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64-cpp.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"FreeBSD-amd64","$ENV{CC}:-DL_ENDIAN -DTERMIOS $ENV{CFLAGS}::$ENV{PTHREAD_LIBS} -D_REENTRANT $ENV{PTHREAD_CFLAGS}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"FreeBSD",      "$ENV{CC}:-DTERMIOS -DL_ENDIAN $ENV{CFLAGS} -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
- "bsdi-gcc",     "gcc:-O3 -ffast-math -DL_ENDIAN -DPERL5 -m486::(unknown):::RSA_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_bsdi_asm}",
- "bsdi-elf-gcc",     "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "nextstep",	"cc:-O -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
diff --git a/security/openssl-beta/files/patch-Makefile.org b/security/openssl-beta/files/patch-Makefile.org
deleted file mode 100644
index 5dd4f462d2cc..000000000000
--- a/security/openssl-beta/files/patch-Makefile.org
+++ /dev/null
@@ -1,42 +0,0 @@
---- Makefile.org.orig	Tue Apr  8 13:54:32 2003
-+++ Makefile.org	Fri Apr 11 20:01:14 2003
-@@ -191,7 +191,7 @@
- MAKEFILE= Makefile.ssl
- MAKE=     make -f Makefile.ssl
- 
--MANDIR=$(OPENSSLDIR)/man
-+MANDIR=$(MANPREFIX)/man
- MAN1=1
- MAN3=3
- SHELL=/bin/sh
-@@ -274,6 +274,21 @@
- 
- build-shared: clean-shared do_$(SHLIB_TARGET) link-shared
- 
-+freebsd-shared:
-+	for i in ${SHLIBDIRS}; do \
-+	rm -f lib$$i.a lib$$i.so \
-+		lib$$i.so.${SHLIBVER}; \
-+	${MAKE} CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='-fPIC ${CFLAG}' SDIRS='${SDIRS}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' DIRS=$$i clean all || exit 1; \
-+	( set -x; ${CC}  -nodefaultlibs -shared -o lib$$i.so.${SHLIBVER} \
-+		-Wl,-S,-soname=lib$$i.so.${SHLIBVER} \
-+		-Wl,${WHOLE_ARCHIVE_FLAG} lib$$i.a ) || exit 1; \
-+	rm -f lib$$i.a; (cd $$i ; ${MAKE} clean) || exit 1 ;\
-+	done;
-+	@set -x; \
-+	for i in ${SHLIBDIRS}; do \
-+	ln -s lib$$i.so.${SHLIBVER} lib$$i.so; \
-+	done;
-+
- do_bsd-gcc-shared: do_gnu-shared
- do_linux-shared: do_gnu-shared
- do_gnu-shared:
-@@ -593,7 +608,7 @@
- 	@false
- 
- libclean:
--	rm -f *.map *.so *.so.* engines/*.so *.a */lib */*/lib
-+	rm -f *.map *.So *.So.* engines/*.so *.a */lib */*/lib
- 
- clean:	libclean
- 	rm -f shlib/*.o *.o core a.out fluff rehash.time testlog make.log cctest cctest.c
diff --git a/security/openssl-beta/files/patch-ad b/security/openssl-beta/files/patch-ad
deleted file mode 100644
index cd606a304160..000000000000
--- a/security/openssl-beta/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- crypto/md5/md5.c.orig	Thu Apr  9 07:59:29 1998
-+++ crypto/md5/md5.c	Sun Dec 27 18:44:33 1998
-@@ -94,7 +94,7 @@
- 				err++;
- 				continue;
- 				}
--			printf("MD5(%s)= ",argv[i]);
-+			printf("MD5 (%s) = ",argv[i]);
- 			do_fp(IN);
- 			fclose(IN);
- 			}
diff --git a/security/openssl-beta/files/patch-ak b/security/openssl-beta/files/patch-ak
deleted file mode 100644
index cdc35edc1a3a..000000000000
--- a/security/openssl-beta/files/patch-ak
+++ /dev/null
@@ -1,11 +0,0 @@
---- apps/Makefile.ssl.orig	Tue Dec 24 11:50:16 2002
-+++ apps/Makefile.ssl	Thu Jan  2 17:58:03 2003
-@@ -111,7 +111,7 @@
- 	 done
- 	@cp openssl.cnf $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \
- 	chmod 644 $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \
--	mv -f  $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf
-+	mv -f  $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.sample
- 
- tags:
- 	ctags $(SRC)
diff --git a/security/openssl-beta/files/patch-apps-dgst.c b/security/openssl-beta/files/patch-apps-dgst.c
deleted file mode 100644
index 25fbf96d2c7f..000000000000
--- a/security/openssl-beta/files/patch-apps-dgst.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- apps/dgst.c.orig	Sat Dec 27 15:40:56 2003
-+++ apps/dgst.c	Wed Mar 17 13:59:05 2004
-@@ -349,7 +349,7 @@
- 				{
- 				size_t len = strlen(name)+strlen(argv[i])+5;
- 				tmp=tofree=OPENSSL_malloc(len);
--				BIO_snprintf(tmp,len,"%s(%s)= ",name,argv[i]);
-+				BIO_snprintf(tmp,len,"%s(%s) = ",name,argv[i]);
- 				}
- 			else
- 				tmp="";
diff --git a/security/openssl-beta/files/patch-config b/security/openssl-beta/files/patch-config
deleted file mode 100644
index 973057062f62..000000000000
--- a/security/openssl-beta/files/patch-config
+++ /dev/null
@@ -1,28 +0,0 @@
---- config.orig	Thu Mar 20 12:44:31 2003
-+++ config	Sun Jul  6 04:39:01 2003
-@@ -392,7 +392,7 @@
- # we fallback to whatever cc does on the system
- GCCVER=`(gcc -dumpversion) 2>/dev/null`
- if [ "$GCCVER" != "" ]; then
--  CC=gcc
-+  CC=${CC:-gcc}
-   # then strip off whatever prefix egcs prepends the number with...
-   # Hopefully, this will work for any future prefixes as well.
-   GCCVER=`echo $GCCVER | sed 's/^[a-zA-Z]*\-//'`
-@@ -402,7 +402,7 @@
-   # peak single digit before and after first dot, e.g. 2.95.1 gives 29
-   GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'`
- else
--  CC=cc
-+  CC=${CC:-cc}
- fi
- GCCVER=${GCCVER:-0}
- if [ "$SYSTEM" = "HP-UX" ];then
-@@ -642,6 +642,7 @@
-   alpha*-*-freebsd*) OUT="FreeBSD-alpha" ;;
-   sparc64-*-freebsd*) OUT="FreeBSD-sparc64" ;;
-   ia64-*-freebsd*) OUT="FreeBSD-ia64" ;;
-+  amd64-*-freebsd*) OUT="FreeBSD-amd64" ;;
-   *-freebsd[3-9]*) OUT="FreeBSD-elf" ;;
-   *-freebsd[1-2]*) OUT="FreeBSD" ;;
-   *86*-*-netbsd) OUT="NetBSD-x86" ;;
diff --git a/security/openssl-beta/files/patch-doc-crypto-des_modes.pod b/security/openssl-beta/files/patch-doc-crypto-des_modes.pod
deleted file mode 100644
index 3584dda10a12..000000000000
--- a/security/openssl-beta/files/patch-doc-crypto-des_modes.pod
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/crypto/des_modes.pod.orig	Tue Mar  5 16:30:13 2002
-+++ doc/crypto/des_modes.pod	Tue Sep 30 18:58:27 2003
-@@ -2,7 +2,7 @@
- 
- =head1 NAME
- 
--Modes of DES - the variants of DES and other crypto algorithms of OpenSSL
-+Modes_of_DES - the variants of DES and other crypto algorithms of OpenSSL
- 
- =head1 DESCRIPTION
- 
diff --git a/security/openssl-beta/files/patch-hw_cryptodev.c b/security/openssl-beta/files/patch-hw_cryptodev.c
deleted file mode 100644
index 786fbfda315b..000000000000
--- a/security/openssl-beta/files/patch-hw_cryptodev.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- crypto/engine/hw_cryptodev.c.orig	Thu Jan 23 09:10:07 2003
-+++ crypto/engine/hw_cryptodev.c	Mon Aug  4 05:39:28 2003
-@@ -35,7 +35,7 @@
- 
- #if (defined(__unix__) || defined(unix)) && !defined(USG)
- #include <sys/param.h>
--# if (OpenBSD >= 200112) || ((__FreeBSD_version >= 470101 && __FreeBSD_version < 500000) || __FreeBSD_version >= 500041)
-+# if (OpenBSD >= 200112) || ((__FreeBSD_version > 470101 && __FreeBSD_version < 500000) || __FreeBSD_version >= 500041)
- # define HAVE_CRYPTODEV
- # endif
- # if (OpenBSD >= 200110)
diff --git a/security/openssl-beta/pkg-descr b/security/openssl-beta/pkg-descr
deleted file mode 100644
index eec6a81c8104..000000000000
--- a/security/openssl-beta/pkg-descr
+++ /dev/null
@@ -1,19 +0,0 @@
-The OpenSSL Project is a collaborative effort to develop a robust,
-commercial-grade, full-featured, and Open Source toolkit implementing
-the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security
-(TLS v1) protocols with full-strength cryptography world-wide. The
-project is managed by a worldwide community of volunteers that use
-the Internet to communicate, plan, and develop the OpenSSL tookit
-and its related documentation.
-
-OpenSSL is based on the excellent SSLeay library developed by Eric
-A. Young and Tim J. Hudson. The OpenSSL toolkit is licensed under
-an Apache-style licence, which basically means that you are free
-to get and use it for commercial and non-commercial purposes subject
-to some simple license conditions.
-
-OpenSSL homepage:
-
-	http://www.openssl.org/
-
-WWW: http://www.openssl.org/
diff --git a/security/openssl-beta/pkg-message b/security/openssl-beta/pkg-message
deleted file mode 100644
index ac397b19a14a..000000000000
--- a/security/openssl-beta/pkg-message
+++ /dev/null
@@ -1,4 +0,0 @@
-
-Copy /usr/local/openssl/openssl.cnf.sample to /usr/local/openssl/openssl.cnf
-and edit it to fit your needs.
-
diff --git a/security/openssl-beta/pkg-plist b/security/openssl-beta/pkg-plist
deleted file mode 100644
index 506d08f0650c..000000000000
--- a/security/openssl-beta/pkg-plist
+++ /dev/null
@@ -1,96 +0,0 @@
-bin/c_rehash
-bin/openssl
-include/openssl/aes.h
-include/openssl/asn1.h
-include/openssl/asn1_mac.h
-include/openssl/asn1t.h
-include/openssl/bio.h
-include/openssl/blowfish.h
-include/openssl/bn.h
-include/openssl/buffer.h
-include/openssl/cast.h
-include/openssl/comp.h
-include/openssl/conf.h
-include/openssl/conf_api.h
-include/openssl/crypto.h
-include/openssl/des.h
-include/openssl/des_old.h
-include/openssl/dh.h
-include/openssl/dsa.h
-include/openssl/dso.h
-include/openssl/e_os2.h
-include/openssl/ebcdic.h
-include/openssl/ec.h
-include/openssl/engine.h
-include/openssl/err.h
-include/openssl/evp.h
-include/openssl/hmac.h
-include/openssl/idea.h
-include/openssl/krb5_asn.h
-include/openssl/kssl.h
-include/openssl/lhash.h
-include/openssl/md2.h
-include/openssl/md4.h
-include/openssl/md5.h
-include/openssl/mdc2.h
-include/openssl/ocsp.h
-include/openssl/obj_mac.h
-include/openssl/objects.h
-include/openssl/opensslconf.h
-include/openssl/opensslv.h
-include/openssl/ossl_typ.h
-include/openssl/pem.h
-include/openssl/pem2.h
-include/openssl/pkcs12.h
-include/openssl/pkcs7.h
-include/openssl/rand.h
-include/openssl/rc2.h
-include/openssl/rc4.h
-include/openssl/rc5.h
-include/openssl/ripemd.h
-include/openssl/rsa.h
-include/openssl/safestack.h
-include/openssl/sha.h
-include/openssl/ssl.h
-include/openssl/ssl2.h
-include/openssl/ssl23.h
-include/openssl/ssl3.h
-include/openssl/stack.h
-include/openssl/symhacks.h
-include/openssl/tls1.h
-include/openssl/tmdiff.h
-include/openssl/txt_db.h
-include/openssl/ui.h
-include/openssl/ui_compat.h
-include/openssl/x509.h
-include/openssl/x509_vfy.h
-include/openssl/x509v3.h
-lib/libcrypto.a
-%%SHARED%%lib/libcrypto.so
-%%SHARED%%lib/libcrypto.so.%%SHLIBVER%%
-lib/libssl.a
-%%SHARED%%lib/libssl.so
-%%SHARED%%lib/libssl.so.%%SHLIBVER%%
-lib/pkgconfig/openssl.pc
-%%NOBASE%%openssl/misc/CA.pl
-%%NOBASE%%openssl/misc/CA.sh
-%%NOBASE%%openssl/misc/c_hash
-%%NOBASE%%openssl/misc/c_info
-%%NOBASE%%openssl/misc/c_issuer
-%%NOBASE%%openssl/misc/c_name
-%%NOBASE%%openssl/misc/der_chop
-%%NOBASE%%openssl/openssl.cnf.sample
-%%PORTDOCS%%%%DOCSDIR%%/openssl.txt
-@dirrm include/openssl
-@dirrm lib/pkgconfig
-%%NOBASE%%@dirrm openssl/certs
-%%NOBASE%%@dirrm openssl/lib
-%%MANDIR%%@dirrm openssl/man/man1
-%%MANDIR%%@dirrm openssl/man/man3
-%%MANDIR%%@dirrm openssl/man/man5
-%%MANDIR%%@dirrm openssl/man/man7
-%%MANDIR%%@dirrm openssl/man
-%%NOBASE%%@dirrm openssl/misc
-%%NOBASE%%@dirrm openssl/private
-%%NOBASE%%@dirrm openssl
-%%PORTDOCS%%@dirrm %%DOCSDIR%%