libressl: use CA file from ca-certificates; get rid of -openssl subpkgs.

1- We don't know how uptodate is the cert.pem supplied by LibreSSL. So that
we've decided to use the one generated by `ca-certificates` instead.

2- There's no need to have an extra subpkg just for the openssl(1) utility
and its configuration files, move all files to the main pkg.

srcpkgs/libressl-openssl

@@ -1 +0,0 @@
-libressl

srcpkgs/libressl/template

@@ -1,7 +1,7 @@
 # Template file for 'libressl'
 pkgname=libressl
 version=2.2.4
-revision=1
+revision=2
 bootstrap=yes
 build_style=gnu-configure
 short_desc="Version of the TLS/crypto stack forked from OpenSSL"
@@ -11,8 +11,9 @@ homepage="http://www.libressl.org/"
 distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${pkgname}-${version}.tar.gz"
 checksum=6b409859be8654afc3862549494e097017e64c8d167f12584383586306ef9a7e
 
-# Compat pkg that depends on the real pkgs.
-depends="libcrypto35-${version}_${revision} libssl35-${version}_${revision} libtls6-${version}_${revision}"
+provides="openssl-${version}_${revision}"
+replaces="openssl>=0"
+conf_files="/etc/ssl/openssl.cnf /etc/ssl/x509v3.cnf"
 
 if [ "$XBPS_TARGET_MACHINE" = "i686-musl" ]; then
 	# XXX disable SSP
@@ -29,6 +30,10 @@ if [ "$CROSS_BUILD" ]; then
 fi
 
 post_install() {
+	# Use CA file from ca-certificates instead.
+	rm -f ${DESTDIR}/etc/ssl/cert.pem
+	ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
+
 	vlicense COPYING
 	find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
 }
@@ -63,14 +68,3 @@ libressl-devel_package() {
 		vmove usr/share/man/man3
 	}
 }
-libressl-openssl_package() {
-	short_desc+=" - utilities"
-	provides="openssl-${version}_${revision}"
-	replaces="openssl>=0"
-	conf_files="/etc/ssl/openssl.cnf /etc/ssl/cert.pem /etc/ssl/x509v3.cnf"
-	pkg_install() {
-		vmove etc
-		vmove usr/bin
-		vmove usr/share/man/man1
-	}
-}