SF.net SVN: gar:[22965] csw/mgar/pkg/openssl1/trunk

[chninkel at users.sourceforge.net]

Revision: 22965
          http://sourceforge.net/p/gar/code/22965
Author:   chninkel
Date:     2014-02-07 20:17:05 +0000 (Fri, 07 Feb 2014)
Log Message:
-----------
openssl1/trunk: add the manpage and html doc in the packages

Modified Paths:
--------------
    csw/mgar/pkg/openssl1/trunk/Makefile
    csw/mgar/pkg/openssl1/trunk/files/changelog.CSW

Added Paths:
-----------
    csw/mgar/pkg/openssl1/trunk/files/0010-Move-manpages-and-html-doc-in-standard-locations.patch

Modified: csw/mgar/pkg/openssl1/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl1/trunk/Makefile	2014-02-07 15:45:18 UTC (rev 22964)
+++ csw/mgar/pkg/openssl1/trunk/Makefile	2014-02-07 20:17:05 UTC (rev 22965)
@@ -102,7 +102,11 @@
 
 # Update openssl.cnf path in man page to follow opencsw standard
 PATCHFILES += opencsw_paths.patch
-#
+
+# Make sure man pages and html docs are installed in proper locations
+# instead of /opt/csw/ssl/man and /opt/csw/ssl/html
+PATCHFILES += 0010-Move-manpages-and-html-doc-in-standard-locations.patch
+
 # Let's always block some compromised CA, whatever the CA configured
 # (patchs taken from Debian Package)
 PATCHFILES += block_bad_certificates.patch

Added: csw/mgar/pkg/openssl1/trunk/files/0010-Move-manpages-and-html-doc-in-standard-locations.patch
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/0010-Move-manpages-and-html-doc-in-standard-locations.patch	                        (rev 0)
+++ csw/mgar/pkg/openssl1/trunk/files/0010-Move-manpages-and-html-doc-in-standard-locations.patch	2014-02-07 20:17:05 UTC (rev 22965)
@@ -0,0 +1,31 @@
+From e23e288f52c13eb2bde51017107583fa2c8c3ed6 Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Fri, 7 Feb 2014 20:28:56 +0100
+Subject: [PATCH] Move manpages and html doc in standard locations
+
+---
+ Makefile.org | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.org b/Makefile.org
+index 41ed9bd..c52129a 100644
+--- a/Makefile.org
++++ b/Makefile.org
+@@ -160,12 +160,12 @@ TESTS = alltests
+ 
+ MAKEFILE= Makefile
+ 
+-MANDIR=$(OPENSSLDIR)/man
++MANDIR=$(INSTALLTOP)/share/man
+ MAN1=1
+ MAN3=3
+ MANSUFFIX=
+ HTMLSUFFIX=html
+-HTMLDIR=$(OPENSSLDIR)/html
++HTMLDIR=$(INSTALLTOP)/share/doc/html
+ SHELL=/bin/sh
+ 
+ TOP=    .
+-- 
+1.8.4.1
+

Modified: csw/mgar/pkg/openssl1/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/changelog.CSW	2014-02-07 15:45:18 UTC (rev 22964)
+++ csw/mgar/pkg/openssl1/trunk/files/changelog.CSW	2014-02-07 20:17:05 UTC (rev 22965)
@@ -1,3 +1,9 @@
+openssl (1.0.1f,rev=2014.02.07) unstable
+
+  * Manpages and html doc are back in the package !
+
+   -- yann rouillard <yann at opencsw.org>  Fri, 07 Feb 2014 20:48:46 +0100
+
 openssl (1.0.1f,rev=2014.01.19) unstable
 
   * Update pkcs11 engine patch from Oracle userland sources.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.