From 1b5cd7f8e0e3abda96baa5ea6c579eece79d360f Mon Sep 17 00:00:00 2001
From: "Tom G. Christensen" <tgc@jupiterrise.com>
Date: Wed, 11 Oct 2006 09:56:57 +0000
Subject: [PATCH] Update to 0.9.7l Update build.sh to newstyle Remove static
 libraries from main package Split out section 3 manpages in dman subpackage

---
 openssl/build.sh    | 59 +++++++--------------------------------------
 openssl/meta/pkgdef | 20 ++++++++++++---
 2 files changed, 25 insertions(+), 54 deletions(-)

diff --git a/openssl/build.sh b/openssl/build.sh
index 6b9da43..7a17271 100755
--- a/openssl/build.sh
+++ b/openssl/build.sh
@@ -3,12 +3,13 @@
 # This is a generic build.sh script
 # It can be used nearly unmodified with many packages
 # 
-# The concept of "method" registering and the logic that implements it was shamelessly
-# stolen from jhlj's Compile.sh script :)
+# build.sh helper functions
+. ${BUILDPKG_BASE}/scripts/build.sh.functions
 #
+###########################################################
 # Check the following 4 variables before running the script
 topdir=openssl
-version=0.9.7k
+version=0.9.7l
 pkgver=1
 source[0]=$topdir-$version.tar.gz
 # If there are no patches, simply comment this
@@ -20,16 +21,10 @@ patch[1]=openssl-0.9.7c-Configure.patch
 
 # shared library binary compatibility is not guaranteed
 # Play it safe and up the soversion with each release
-sover=11 # k = 11
+sover=12 # l = 12
 abbrev_ver=$(echo $version|$SED -e 's/\.//g')
 baseversion=$(echo $version|$SED -e 's/[a-zA-Z]//g')
 
-# Define script functions and register them
-METHODS=""
-reg() {
-    METHODS="$METHODS $1"
-}
-
 reg prep
 prep()
 {
@@ -86,10 +81,12 @@ install()
 	cd ..
     done
     # A few stupid manpages left that pkgproto can't deal with
-    setdir $stagedir$prefix/man/man7
+    #setdir $stagedir$prefix/man/man7
     #mv "Modes of DES.7ssl" "Modes_of_DES.7ssl"
     # Make .sos writable
     chmod 755 ${stagedir}${prefix}/${_libdir}/*.so.*
+    # Nuke static libraries - they just take up space
+    rm -f ${stagedir}${prefix}/${_libdir}/*.a
     rm -f ${stagedir}${prefix}/${_libdir}/fips_premain.c*
     custom_install=1
     generic_install
@@ -116,42 +113,4 @@ distclean()
 ###################################################
 # No need to look below here
 ###################################################
-
-reg all
-all()
-{
-    for METHOD in $METHODS 
-    do
-	case $METHOD in
-	     all*|*clean) ;;
-	     *) $METHOD
-		;;
-	esac
-    done
-
-}
-
-reg
-usage() {
-    echo Usage $0 "{"$(echo $METHODS | tr " " "|")"}"
-    exit 1
-}
-
-OK=0
-for METHOD in $*
-do
-    METHOD=" $METHOD *"
-    if [ "${METHODS%$METHOD}" == "$METHODS" ] ; then
-	usage
-    fi
-    OK=1
-done
-
-if [ $OK = 0 ] ; then
-    usage;
-fi
-
-for METHOD in $*
-do
-    ( $METHOD )
-done
+build_sh $*
diff --git a/openssl/meta/pkgdef b/openssl/meta/pkgdef
index ad90b8d..40eaa33 100644
--- a/openssl/meta/pkgdef
+++ b/openssl/meta/pkgdef
@@ -1,5 +1,5 @@
 [openssl]
-pkgname="$pkgprefix""ossl""$abbrev_ver"
+pkgname="${pkgprefix}ossl${abbrev_ver}"
 name="OpenSSL - Secure Socket Layer"
 pkgcat="application"
 pkgvendor="http://www.openssl.org"
@@ -7,16 +7,16 @@ pkgdesc="Toolkit implementing SSL v2/v3 and TLS v1"
 pkgver="$pkgver"
 files(-,root,bin)
 $_bindir
+$_mandir/man{1,5,7}
 $_includedir
 $_libdir/*.so
-$_libdir/*.a
 $_libdir/pkgconfig
-$_mandir
 ssl
 dir ${_libdir}
+dir ${_mandir}
 
 [openssl-lib]
-pkgname="$pkgprefix""ossl""$abbrev_ver""lib"
+pkgname="${pkgprefix}ossl${abbrev_ver}lib"
 name="OpenSSL - Secure Socket Layer"
 pkgcat="library"
 pkgvendor="http://www.openssl.org"
@@ -25,3 +25,15 @@ pkgver="$pkgver"
 files(-,root,bin)
 $_libdir/*.so.*
 dir $_libdir
+
+[openssl-dman]
+pkgname="${pkgprefix}ossl${abbrev_ver}"
+name="OpenSSL - Secure Socket Layer"
+pkgcat="application"
+pkgvendor="http://www.openssl.org"
+pkgdesc="Toolkit implementing SSL v2/v3 and TLS v1"
+pkgver="$pkgver"
+files(-,root,bin)
+$_mandir/man3
+dir ${_mandir}
+