11 files changed, 39 insertions, 187 deletions
diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index 4128d1dd9481..7c3a331a23e8 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for dev-libs/openssl
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.3 2002/03/21 14:47:57 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.4 2002/04/03 09:52:00 woodchip Exp $
+
+*openssl-0.9.6c-r1 (3 Apr 2002)
+
+  3 Apr 2002; Donny Davies <woodchip@gentoo.org> openssl-0.9.6c-r1.ebuild,
+  openssl-0.9.6c-gcc3.patch, openssl-0.9.6c-Makefile.org-gentoo.diff:
+
+  Stop overwriting the passwd.1 and rand.3 manpages!  Remove the
+  patch from src_unpack; it was redundant.  Remove the manpage sed stuff
+  and pass MANDIR to make install instead.  Fix a longstanding annoyance
+  with the support scripts getting installed into /usr/ssl and install
+  them in the proper place: /usr/lib/ssl.  Add a patch for compiling with
+  gcc-3.  Fix a glitch with the html docs getting installed into a redundant
+  'doc' subdirectory.  Remove all old patches, digests and ebuilds.
 
   21 Mar 2002; Daniel Robbins <drobbins@gentoo.org> : Fixed 0.9.6c ebuild so
   that it doesn't do 'sed -e "foo" | cat > Makefile', which breaks often.  Now
diff --git a/dev-libs/openssl/files/digest-openssl-0.9.6b b/dev-libs/openssl/files/digest-openssl-0.9.6b
deleted file mode 100644
index 5c2fc2984118..000000000000
--- a/dev-libs/openssl/files/digest-openssl-0.9.6b
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bd8c4d8c5bafc7a4d55d152989fdb327 openssl-0.9.6b.tar.gz 2132220
diff --git a/dev-libs/openssl/files/digest-openssl-0.9.6b-r1 b/dev-libs/openssl/files/digest-openssl-0.9.6b-r1
deleted file mode 100644
index 5c2fc2984118..000000000000
--- a/dev-libs/openssl/files/digest-openssl-0.9.6b-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bd8c4d8c5bafc7a4d55d152989fdb327 openssl-0.9.6b.tar.gz 2132220
diff --git a/dev-libs/openssl/files/digest-openssl-0.9.6c b/dev-libs/openssl/files/digest-openssl-0.9.6c-r1
index 5765b8e0956a..5765b8e0956a 100644
--- a/dev-libs/openssl/files/digest-openssl-0.9.6c
+++ b/dev-libs/openssl/files/digest-openssl-0.9.6c-r1
diff --git a/dev-libs/openssl/files/openssl-0.9.6a-Makefile.org-gentoo.diff b/dev-libs/openssl/files/openssl-0.9.6a-Makefile.org-gentoo.diff
deleted file mode 100644
index 102d9d985e50..000000000000
--- a/dev-libs/openssl/files/openssl-0.9.6a-Makefile.org-gentoo.diff
+++ /dev/null
@@ -1,37 +0,0 @@
---- Makefile.org.orig	Thu Apr 26 15:39:41 2001
-+++ Makefile.org	Thu Apr 26 15:42:30 2001
-@@ -19,10 +19,12 @@
- # for, say, /usr/ and yet have everything installed to /tmp/somedir/usr/.
- # Normally it is left empty.
- INSTALL_PREFIX=
--INSTALLTOP=/usr/local/ssl
-+#INSTALLTOP=/usr/local/ssl
-+INSTALLTOP=/usr/ssl
- 
- # Do not edit this manually. Use Configure --openssldir=DIR do change this!
--OPENSSLDIR=/usr/local/ssl
-+#OPENSSLDIR=/usr/local/ssl
-+OPENSSLDIR=/usr/ssl
- 
- # RSAref  - Define if we are to link with RSAref.
- # NO_IDEA - Define to build without the IDEA algorithm
-@@ -55,7 +57,8 @@
- 
- CC= gcc
- #CFLAG= -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
--CFLAG= -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
-+#CFLAG= -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
-+CFLAG=$(CFLAGS) -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -Wall -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
- DEPFLAG= 
- PEX_LIBS= 
- EX_LIBS= 
-@@ -169,7 +172,8 @@
- MAKEFILE= Makefile.ssl
- MAKE=     make -f Makefile.ssl
- 
--MANDIR=$(OPENSSLDIR)/man
-+#MANDIR=$(OPENSSLDIR)/man
-+MANDIR=$(OPENSSLDIR)/../share/man
- MAN1=1
- MAN3=3
- SHELL=/bin/sh
diff --git a/dev-libs/openssl/files/openssl-0.9.6b-Makefile.org-gentoo.diff b/dev-libs/openssl/files/openssl-0.9.6b-Makefile.org-gentoo.diff
deleted file mode 100644
index db56f706ade8..000000000000
--- a/dev-libs/openssl/files/openssl-0.9.6b-Makefile.org-gentoo.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.org.orig	Fri Jul 13 21:15:54 2001
-+++ Makefile.org	Fri Jul 13 21:17:08 2001
-@@ -55,7 +55,7 @@
- 
- CC= gcc
- #CFLAG= -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
--CFLAG= -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
-+CFLAG=$(CFLAGS) -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -Wall -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
- DEPFLAG= 
- PEX_LIBS= 
- EX_LIBS= 
-@@ -169,7 +169,7 @@
- MAKEFILE= Makefile.ssl
- MAKE=     make -f Makefile.ssl
- 
--MANDIR=$(OPENSSLDIR)/man
-+MANDIR=$(OPENSSLDIR)/../share/man
- MAN1=1
- MAN3=3
- SHELL=/bin/sh
diff --git a/dev-libs/openssl/files/openssl-0.9.6c-Makefile.org-gentoo.diff b/dev-libs/openssl/files/openssl-0.9.6c-Makefile.org-gentoo.diff
deleted file mode 100644
index db56f706ade8..000000000000
--- a/dev-libs/openssl/files/openssl-0.9.6c-Makefile.org-gentoo.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.org.orig	Fri Jul 13 21:15:54 2001
-+++ Makefile.org	Fri Jul 13 21:17:08 2001
-@@ -55,7 +55,7 @@
- 
- CC= gcc
- #CFLAG= -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
--CFLAG= -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
-+CFLAG=$(CFLAGS) -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -Wall -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
- DEPFLAG= 
- PEX_LIBS= 
- EX_LIBS= 
-@@ -169,7 +169,7 @@
- MAKEFILE= Makefile.ssl
- MAKE=     make -f Makefile.ssl
- 
--MANDIR=$(OPENSSLDIR)/man
-+MANDIR=$(OPENSSLDIR)/../share/man
- MAN1=1
- MAN3=3
- SHELL=/bin/sh
diff --git a/dev-libs/openssl/files/openssl-0.9.6c-gcc3.patch b/dev-libs/openssl/files/openssl-0.9.6c-gcc3.patch
new file mode 100644
index 000000000000..72ac22933b16
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-0.9.6c-gcc3.patch
@@ -0,0 +1,11 @@
+--- crypto/des/des.h.mdk	Thu Mar 29 02:44:50 2001
++++ crypto/des/des.h	Mon Jan 21 16:16:00 2002
+@@ -189,7 +189,7 @@
+ 		  des_cblock *iv);
+ char *des_fcrypt(const char *buf,const char *salt, char *ret);
+ char *des_crypt(const char *buf,const char *salt);
+-#if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT)
++#if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT) && !defined (_XOPEN_SOURCE)
+ char *crypt(const char *buf,const char *salt);
+ #endif
+ void des_ofb_encrypt(const unsigned char *in,unsigned char *out,int numbits,
diff --git a/dev-libs/openssl/openssl-0.9.6b-r1.ebuild b/dev-libs/openssl/openssl-0.9.6b-r1.ebuild
deleted file mode 100644
index 0d37b71ea591..000000000000
--- a/dev-libs/openssl/openssl-0.9.6b-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.6b-r1.ebuild,v 1.1 2001/12/27 20:02:27 woodchip Exp $
-
-DESCRIPTION="Toolkit for SSL v2/v3 and TLS v1"
-HOMEPAGE="http://www.opensl.org/"
-SRC_URI="http://www.openssl.org/source/${P}.tar.gz"
-S=${WORKDIR}/${P}
-
-RDEPEND="virtual/glibc"
-DEPEND="${RDEPEND} >=sys-devel/perl-5"
-
-src_unpack() {
-
-	unpack ${A} ; cd ${S}
-
-	patch -p0 < ${FILESDIR}/${P}-Makefile.org-gentoo.diff || die
-
-	cp Configure Configure.orig
-	sed -e "s/-O3/$CFLAGS/" -e "s/-m486//" Configure.orig > Configure
-}
-
-src_compile() {
-
-	./config --prefix=/usr --openssldir=/usr/ssl shared threads || die
-
-	make all || die "compile problem"
-}
-
-src_install() {
-
-	dodir /usr/ssl
-	make INSTALL_PREFIX=${D} install || die
-
-	dodoc CHANGES* FAQ LICENSE NEWS README doc/*.txt
-	docinto html ; dodoc doc/*.gif doc/*.html
-	insinto /usr/share/emacs/site-lisp
-	doins doc/c-indentation.el
-
-	# eeek! lets not overwrite the passwd.1 manpage shall we..
-	cd ${D}/usr/share/man/man1
-	mv passwd.1 openssl-passwd.1
-}
diff --git a/dev-libs/openssl/openssl-0.9.6b.ebuild b/dev-libs/openssl/openssl-0.9.6b.ebuild
deleted file mode 100644
index f2d862f584e9..000000000000
--- a/dev-libs/openssl/openssl-0.9.6b.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.6b.ebuild,v 1.7 2001/11/10 12:05:20 hallski Exp $
-
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Toolkit for SSL v2/v3 and TLS v1"
-SRC_URI="http://www.openssl.org/source/${P}.tar.gz"
-HOMEPAGE="http://www.opensl.org/"
-
-RDEPEND="virtual/glibc"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/perl-5"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	try patch -p0 < ${FILESDIR}/${P}-Makefile.org-gentoo.diff
-	cp Configure Configure.orig
-	sed -e "s/-O3/$CFLAGS/" -e "s/-m486//" 				\
-    	    Configure.orig > Configure
-
-	# Makefile borkage. The MANDIR is set to ${OPENSSLDIR}/man 
-	# which is lame
-	sed -e 's:MANDIR=$(OPENSSLDIR)/man:MANDIR=/usr/share/man:g' 	\
-	    Makefile | cat > Makefile
-}
-src_compile() {
-	./config --prefix=/usr						\
-		 --openssldir=/usr/ssl					\
-		 shared threads || die
-
-	make all || die
-}
-
-src_install() {
-	dodir /usr/ssl
-	make INSTALL_PREFIX=${D} install || die
-
-	dodoc CHANGES* FAQ LICENSE NEWS README
-	dodoc doc/*.txt
-	docinto html
-	dodoc doc/*.gif doc/*.html
-	insinto /usr/share/emacs/site-lisp
-	doins doc/c-indentation.el
-}
-
-
-
diff --git a/dev-libs/openssl/openssl-0.9.6c.ebuild b/dev-libs/openssl/openssl-0.9.6c-r1.ebuild
index 3dd05293437a..1bf71525b020 100644
--- a/dev-libs/openssl/openssl-0.9.6c.ebuild
+++ b/dev-libs/openssl/openssl-0.9.6c-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.6c.ebuild,v 1.3 2002/03/21 14:47:57 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.6c-r1.ebuild,v 1.1 2002/04/03 09:52:08 woodchip Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Toolkit for SSL v2/v3 and TLS v1"
@@ -11,28 +11,30 @@ RDEPEND="virtual/glibc"
 DEPEND="${RDEPEND} >=sys-devel/perl-5"
 
 src_unpack() {
-	unpack ${A}
-	cd ${S}
-	patch -p0 < ${FILESDIR}/${P}-Makefile.org-gentoo.diff || die
+	unpack ${A} ; cd ${S}
 	cp Configure Configure.orig
 	sed -e "s/-O3/$CFLAGS/" -e "s/-m486//" Configure.orig > Configure
-	# Makefile borkage. The MANDIR is set to ${OPENSSLDIR}/man 
-	# which is lame
-	cp Makefile Makefile.orig
-	sed -e 's:MANDIR=$(OPENSSLDIR)/man:MANDIR=/usr/share/man:g' Makefile.orig > Makefile
 }
 
 src_compile() {
-	./config --prefix=/usr --openssldir=/usr/ssl shared threads || die
+	./config --prefix=/usr --openssldir=/usr/lib/ssl shared threads || die
 	emake all || die
 }
 
 src_install() {
-	dodir /usr/ssl
-	make INSTALL_PREFIX=${D} install || die
+	make INSTALL_PREFIX=${D} MANDIR=/usr/share/man install || die
 	dodoc CHANGES* FAQ LICENSE NEWS README
 	dodoc doc/*.txt
-	dohtml -r doc
+	dohtml doc/*
 	insinto /usr/share/emacs/site-lisp
 	doins doc/c-indentation.el
+
+	# The man pages rand.3 and passwd.1 conflict with other packages
+	# Rename them to ssl-* and also make a symlink from openssl-* to ssl-*
+	cd ${D}/usr/share/man/man1
+	mv passwd.1 ssl-passwd.1
+	ln -sf ssl-passwd.1 openssl-passwd.1
+	cd ${D}/usr/share/man/man3
+	mv rand.3 ssl-rand.3
+	ln -sf ssl-rand.3 openssl-rand.3
 }