Page MenuHomeFreeBSD

D5539.id14041.diff
No OneTemporary

D5539.id14041.diff

Index: security/libressl-devel/Makefile
===================================================================
--- security/libressl-devel/Makefile
+++ security/libressl-devel/Makefile
@@ -20,8 +20,9 @@
MAN3_DESC= Install API manpages (section 3)
NC_DESC= Build nc libtls demo application
-CONFLICTS?= openssl-[0-9]* \
- libressl-[0-9]*
+CONFLICTS?= libressl-[0-9]* \
+ openssl-[0-9]* \
+ openssl-devel-[0-9]*
GNU_CONFIGURE= yes
USES= cpe libtool pathfix pkgconfig
Index: security/libressl/Makefile
===================================================================
--- security/libressl/Makefile
+++ security/libressl/Makefile
@@ -18,8 +18,9 @@
OPTIONS_DEFAULT= MAN3
MAN3_DESC= Install API manpages (section 3)
-CONFLICTS?= openssl-[0-9]* \
- libressl-devel-[0-9]*
+CONFLICTS?= libressl-devel-[0-9]* \
+ openssl-[0-9]* \
+ openssl-devel-[0-9]*
GNU_CONFIGURE= yes
USES= cpe libtool pathfix pkgconfig
Index: security/openssl/Makefile
===================================================================
--- security/openssl/Makefile
+++ security/openssl/Makefile
@@ -18,7 +18,9 @@
.error You have `USE_OPENSSL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
.endif
-CONFLICTS?= libressl-*
+CONFLICTS?= libressl-[0-9]* \
+ libressl-devel-[0-9]* \
+ openssl-devel-[0-9]*
LICENSE= OpenSSL
LICENSE_FILE= ${WRKSRC}/LICENSE
Index: security/openssl/pkg-plist
===================================================================
--- security/openssl/pkg-plist
+++ security/openssl/pkg-plist
@@ -1650,6 +1650,33 @@
man/man3/ui.3.gz
man/man3/ui_compat.3.gz
man/man3/x509.3.gz
+man/man3/DTLS_client_method.3.gz
+man/man3/DTLS_method.3.gz
+man/man3/DTLS_server_method.3.gz
+man/man3/DTLSv1_2_client_method.3.gz
+man/man3/DTLSv1_2_method.3.gz
+man/man3/DTLSv1_2_server_method.3.gz
+man/man3/DTLSv1_client_method.3.gz
+man/man3/DTLSv1_method.3.gz
+man/man3/DTLSv1_server_method.3.gz
+man/man3/SSLv23_client_method.3.gz
+man/man3/SSLv23_method.3.gz
+man/man3/SSLv23_server_method.3.gz
+man/man3/SSLv2_client_method.3.gz
+man/man3/SSLv2_method.3.gz
+man/man3/SSLv2_server_method.3.gz
+man/man3/SSLv3_client_method.3.gz
+man/man3/SSLv3_method.3.gz
+man/man3/SSLv3_server_method.3.gz
+man/man3/TLSv1_1_client_method.3.gz
+man/man3/TLSv1_1_method.3.gz
+man/man3/TLSv1_1_server_method.3.gz
+man/man3/TLSv1_2_client_method.3.gz
+man/man3/TLSv1_2_method.3.gz
+man/man3/TLSv1_2_server_method.3.gz
+man/man3/TLSv1_client_method.3.gz
+man/man3/TLSv1_method.3.gz
+man/man3/TLSv1_server_method.3.gz
man/man5/config.5.gz
man/man5/x509v3_config.5.gz
man/man7/des_modes.7.gz

File Metadata

Mime Type
text/plain
Expires
Fri, Oct 16, 12:22 PM (16 h, 52 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
40871527
Default Alt Text
D5539.id14041.diff (2 KB)

Event Timeline