Author: justin
Date: 2005-11-27 22:08:52 -0700 (Sun, 27 Nov 2005)
New Revision: 1172
Modified:
branches/6.1.1-newmake/packages/openssl/Makefile
branches/6.1.1-newmake/packages/pkgconfig/Makefile
Log:
Merged r1171 from trunk to 6.1.1-newmake.
Modified: branches/6.1.1-newmake/packages/openssl/Makefile
===================================================================
--- branches/6.1.1-newmake/packages/openssl/Makefile 2005-11-27 05:52:45 UTC
(rev 1171)
+++ branches/6.1.1-newmake/packages/openssl/Makefile 2005-11-28 05:08:52 UTC
(rev 1172)
@@ -1,12 +1,12 @@
# OpenSSL Makefile
NM= openssl
-VRS= 0.9.7h
+VRS= 0.9.7i
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
URL-$(FILE)= $(HTTPBLFS)/$(NM)/$(FILE)
-SHA-$(FILE)= 97f947f60b8da7076109344cfddaad77804708dd
+SHA-$(FILE)= e5237c09aa46359e811f82002c8cead49b44b2ed
PATCH1= $(DIR)-fix_manpages-1.patch
URL-$(PATCH1)= $(HTTPBLFS)/$(NM)/$(PATCH1)
@@ -26,8 +26,6 @@
compile-stage2:
patch -Np1 -i ../$(PATCH1)
./config --openssldir=/etc/ssl --prefix=/usr shared
- sed -i 's/mcpu=pentium/mtune=i486/' Configure
- sed -i 's/mcpu=pentium/mtune=i486/' Makefile
make $(PM) MANDIR=/usr/share/man
make MANDIR=/usr/share/man install
cp -r certs /etc/ssl
Modified: branches/6.1.1-newmake/packages/pkgconfig/Makefile
===================================================================
--- branches/6.1.1-newmake/packages/pkgconfig/Makefile 2005-11-27 05:52:45 UTC
(rev 1171)
+++ branches/6.1.1-newmake/packages/pkgconfig/Makefile 2005-11-28 05:08:52 UTC
(rev 1172)
@@ -1,12 +1,12 @@
# Pkgconfig Makefile
NM= pkg-config
-VRS= 0.19
+VRS= 0.20
DIR= $(NM)-$(VRS)
-FILE= $(DIR).tar.gz
-URL-$(FILE)= http://pkgconfig.freedesktop.org/releases/$(FILE)
-SHA-$(FILE)= b09fa43dcc44fe0db8df1c4994a8ff9eab371666
+FILE= $(DIR).tar.bz2
+URL-$(FILE)= $(HTTPBLFS)/$(NM)/$(FILE)
+SHA-$(FILE)= 1e1368a2e00e81012aafa22d06cf15a520db81cd
# Targets
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
