summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchim Gottinger <achim@gentoo.org>2001-07-13 19:23:45 +0000
committerAchim Gottinger <achim@gentoo.org>2001-07-13 19:23:45 +0000
commit066099af9536942a611bd022ce05a757651f1a82 (patch)
treec3de36cf9ced5f540e4979aa614464c799a4163d
parentRemoved unneccesarry gzip of man page (diff)
downloadgentoo-2-066099af9536942a611bd022ce05a757651f1a82.tar.gz
gentoo-2-066099af9536942a611bd022ce05a757651f1a82.tar.bz2
gentoo-2-066099af9536942a611bd022ce05a757651f1a82.zip
Added missing patch
-rw-r--r--dev-libs/openssl/files/openssl-0.9.6b-Makefile.org-gentoo.diff20
-rw-r--r--dev-libs/openssl/openssl-0.9.6b.ebuild5
2 files changed, 21 insertions, 4 deletions
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
new file mode 100644
index 000000000000..db56f706ade8
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-0.9.6b-Makefile.org-gentoo.diff
@@ -0,0 +1,20 @@
+--- 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/openssl-0.9.6b.ebuild b/dev-libs/openssl/openssl-0.9.6b.ebuild
index 201dd455dcd0..e70ba9c7fb0e 100644
--- a/dev-libs/openssl/openssl-0.9.6b.ebuild
+++ b/dev-libs/openssl/openssl-0.9.6b.ebuild
@@ -17,10 +17,7 @@ src_unpack() {
unpack ${A}
cd ${S}
- patch -p0 < ${FILESDIR}/${P}-Makefile.org-gentoo.diff
- cp Configure Configure.orig
- sed -e "s/-O3/$CFLAGS/" -e "s/-m486//" \
- Configure.orig > Configure
+ try patch -p0 < ${FILESDIR}/${P}-Makefile.org-gentoo.diff
}