From ad2695a838fe7b12d45b5f6ca89503c974f4f19e Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 2 Nov 2010 08:30:51 +0100
Subject: [PATCH] openssl: split libs into libssl subpkg, bumprev.

---
 srcpkgs/libssl                           |  1 +
 srcpkgs/openssl/libssl.template          | 18 ++++++++++++++++++
 srcpkgs/openssl/openssl-devel.template   |  6 +++---
 srcpkgs/openssl/template                 |  8 ++++----
 xbps-src/common/mapping_shlib_binpkg.txt |  4 ++--
 5 files changed, 28 insertions(+), 9 deletions(-)
 create mode 120000 srcpkgs/libssl
 create mode 100644 srcpkgs/openssl/libssl.template

diff --git a/srcpkgs/libssl b/srcpkgs/libssl
new file mode 120000
index 0000000000..fc538edfef
--- /dev/null
+++ b/srcpkgs/libssl
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl/libssl.template b/srcpkgs/openssl/libssl.template
new file mode 100644
index 0000000000..5e791f448b
--- /dev/null
+++ b/srcpkgs/openssl/libssl.template
@@ -0,0 +1,18 @@
+# Template file for 'libssl'.
+#
+short_desc="Secure Sockets Layer and Cryptographic library"
+long_desc="
+ ${long_desc}
+
+ This package includes the OpenSSL libssl and libcrypto shared libraries."
+
+replaces="openssl<1.0.0a_2"
+
+Add_dependency run glibc
+Add_dependency run zlib
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/lib*.so* ${DESTDIR}/usr/lib
+}
diff --git a/srcpkgs/openssl/openssl-devel.template b/srcpkgs/openssl/openssl-devel.template
index 8bb76c8f59..1e8ae94ec0 100644
--- a/srcpkgs/openssl/openssl-devel.template
+++ b/srcpkgs/openssl/openssl-devel.template
@@ -1,14 +1,14 @@
 # Template file for 'openssl-devel'.
 #
-short_desc="${short_desc} - development files"
+short_desc="Secure Socket Layer and cryptographic library - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=1
+revision=2
 
 Add_dependency run zlib-devel
-Add_dependency run openssl
+Add_dependency run libssl
 
 do_install()
 {
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
index 6436d2f52d..f9d0d2262b 100644
--- a/srcpkgs/openssl/template
+++ b/srcpkgs/openssl/template
@@ -2,7 +2,7 @@
 pkgname=openssl
 _openssl_version=1.0.0
 version=${_openssl_version}a
-revision=1
+revision=2
 distfiles="http://www.openssl.org/source/$pkgname-$version.tar.gz"
 build_style=configure
 configure_script="./config"
@@ -10,7 +10,7 @@ configure_args="--prefix=/usr --openssldir=/etc/ssl --libdir=lib
 zlib shared threads -Wa,--noexecstack"
 make_install_target="INSTALL_PREFIX=$XBPS_DESTDIR/$pkgname-$version
 MANDIR=/usr/share/man install"
-short_desc="Secure Socket Layer and cryptographic library"
+short_desc="Secure Socket Layer and cryptographic library - runtime utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=18a9bd1fc02b8ef90dded34fafaa9089baaafef278a19fc4e89c2ab0dcf70f63
 long_desc="
@@ -22,10 +22,10 @@ long_desc="
 # Does not build with -j.
 disable_parallel_build=yes
 conf_files="/etc/ssl/openssl.cnf"
-subpackages="openssl-devel"
+subpackages="libssl openssl-devel"
 
 Add_dependency run glibc
-Add_dependency run zlib
+Add_dependency run libssl
 Add_dependency full perl	">=0"
 Add_dependency build zlib-devel
 
diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt
index dd29219fab..35ca139b34 100644
--- a/xbps-src/common/mapping_shlib_binpkg.txt
+++ b/xbps-src/common/mapping_shlib_binpkg.txt
@@ -118,8 +118,8 @@ libxslt.so			libxslt			libxslt-devel
 libstartup-notification-1.so	startup-notification	startup-notification-devel
 libwnck-1.so.22			libwnck			libwnck-devel
 libnl.so			libnl			libnl-devel
-libssl.so			openssl			openssl-devel
-libcrypto.so			openssl			openssl-devel
+libssl.so			libssl			openssl-devel
+libcrypto.so			libssl			openssl-devel
 libreadline.so			readline		readline-devel
 libxfcegui4.so			libxfcegui4		libxfcegui4-devel
 libxfce4kbd-private.so		libxfcegui4		libxfcegui4-devel