[132610] trunk/dports
larryv at macports.org
larryv at macports.org
Thu Feb 5 13:50:38 PST 2015
Revision: 132610
https://trac.macports.org/changeset/132610
Author: larryv at macports.org
Date: 2015-02-05 13:50:37 -0800 (Thu, 05 Feb 2015)
Log Message:
-----------
openssl: Update to 1.0.2 (#46657); revbump dependents
- The configure script reads `CC` from the environment now, so we don't
have to patch it in.
- It also passes -isysroot and -Wl to the compiler and linker as
appropriate, so we don't have to patch in SDK support either.
- Without any reinplace-ing going on, there's no point in patching out
that copyright character.
Modified Paths:
--------------
trunk/dports/devel/openssl/Portfile
trunk/dports/devel/openssl/files/patch-Makefile.org-parallel.diff
trunk/dports/security/tor/Portfile
trunk/dports/sysutils/freeradius/Portfile
Removed Paths:
-------------
trunk/dports/devel/openssl/files/patch-Configure.diff
trunk/dports/devel/openssl/files/patch-Makefile.org.diff
Modified: trunk/dports/devel/openssl/Portfile
===================================================================
--- trunk/dports/devel/openssl/Portfile 2015-02-05 21:50:33 UTC (rev 132609)
+++ trunk/dports/devel/openssl/Portfile 2015-02-05 21:50:37 UTC (rev 132610)
@@ -6,7 +6,7 @@
name openssl
epoch 1
-version 1.0.1k
+version 1.0.2
# At least the following ports statically link OpenSSL and need to be revbumped
# for every update of OpenSSL:
@@ -35,24 +35,14 @@
depends_lib port:zlib
master_sites http://www.openssl.org/source/
-checksums md5 d4f002bd22a56881340105028842ae1f \
- sha1 19d818e202558c212a9583fcdaf876995a633ddf \
- rmd160 e22c085189c6ce640378f0cc67faa512b4b873f2 \
- sha256 8f9faeaebad088e772f4ef5e38252d472be4d878c6b3a2718c10a4fcebe7a41c
+checksums md5 38373013fc85c790aabf8837969c5eba \
+ sha1 2f264f7f6bb973af444cd9fc6ee65c8588f610cc \
+ rmd160 a5452cd1fd380dcbc1dd53d8e50da6ec632ebd6e \
+ sha256 8c48baf3babe0d505d16cfc0cf272589c66d3624264098213db0fb00034728e9
patchfiles patch-bn_internal.pod.diff \
- patch-Configure.diff \
patch-crypto-Makefile.diff \
- patch-Makefile.org-parallel.diff \
- patch-Makefile.org.diff
-post-patch {
- # Ensure that the correct compiler is used
- reinplace "s|cc:|${configure.cc}:|" ${worksrcpath}/Configure
- # use SDK if necessary
- if {${configure.sdkroot} ne ""} {
- reinplace "s|\\(-arch \[_a-zA-Z0-9\]*\\)|\\1 -isysroot ${configure.sdkroot}|" ${worksrcpath}/Configure
- }
-}
+ patch-Makefile.org-parallel.diff
configure.ccache no
configure.perl /usr/bin/perl
@@ -62,6 +52,11 @@
--openssldir=${prefix}/etc/openssl \
shared \
zlib
+# Use SDK if necessary.
+if {${configure.sdkroot} ne ""} {
+ configure.args-append '-isysroot ${configure.sdkroot}' \
+ -Wl,-syslibroot,${configure.sdkroot}
+}
platform darwin 8 i386 {
configure.args-append no-asm
}
Deleted: trunk/dports/devel/openssl/files/patch-Configure.diff
===================================================================
--- trunk/dports/devel/openssl/files/patch-Configure.diff 2015-02-05 21:50:33 UTC (rev 132609)
+++ trunk/dports/devel/openssl/files/patch-Configure.diff 2015-02-05 21:50:37 UTC (rev 132610)
@@ -1,11 +0,0 @@
---- Configure.orig 2012-02-11 18:32:16.000000000 -0800
-+++ Configure 2012-02-11 18:34:10.000000000 -0800
-@@ -1869,7 +1869,7 @@ BEGIN
- VALUE "ProductVersion", "$version\\0"
- // Optional:
- //VALUE "Comments", "\\0"
-- VALUE "LegalCopyright", "Copyright \xA9 1998-2005 The OpenSSL Project. Copyright \xA9 1995-1998 Eric A. Young, Tim J. Hudson. All rights reserved.\\0"
-+ VALUE "LegalCopyright", "Copyright (c) 1998-2005 The OpenSSL Project. Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson. All rights reserved.\\0"
- //VALUE "LegalTrademarks", "\\0"
- //VALUE "PrivateBuild", "\\0"
- //VALUE "SpecialBuild", "\\0"
Modified: trunk/dports/devel/openssl/files/patch-Makefile.org-parallel.diff
===================================================================
--- trunk/dports/devel/openssl/files/patch-Makefile.org-parallel.diff 2015-02-05 21:50:33 UTC (rev 132609)
+++ trunk/dports/devel/openssl/files/patch-Makefile.org-parallel.diff 2015-02-05 21:50:37 UTC (rev 132610)
@@ -1,6 +1,8 @@
---- Makefile.org.orig 2014-11-02 13:11:04.000000000 -0800
-+++ Makefile.org 2014-11-02 13:35:46.000000000 -0800
-@@ -274,15 +274,15 @@ build_libs: build_crypto build_ssl build
+Index: Makefile.org
+===================================================================
+--- Makefile.org.orig
++++ Makefile.org
+@@ -275,15 +275,15 @@ build_libs: build_crypto build_ssl build
build_crypto:
@dir=crypto; target=all; $(BUILD_ONE_CMD)
@@ -21,7 +23,7 @@
@dir=tools; target=all; $(BUILD_ONE_CMD)
all_testapps: build_libs build_testapps
-@@ -538,9 +538,9 @@ dist:
+@@ -536,9 +536,9 @@ dist:
dist_pem_h:
(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
@@ -33,7 +35,7 @@
@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
-@@ -634,7 +634,7 @@ install_html_docs:
+@@ -636,7 +636,7 @@ install_html_docs:
done; \
done
Deleted: trunk/dports/devel/openssl/files/patch-Makefile.org.diff
===================================================================
--- trunk/dports/devel/openssl/files/patch-Makefile.org.diff 2015-02-05 21:50:33 UTC (rev 132609)
+++ trunk/dports/devel/openssl/files/patch-Makefile.org.diff 2015-02-05 21:50:37 UTC (rev 132610)
@@ -1,14 +0,0 @@
---- Makefile.org 2005-03-15 01:46:13.000000000 -0800
-+++ Makefile.org 2005-05-02 00:37:16.000000000 -0700
-@@ -596,10 +596,7 @@
- $(INSTALL_PREFIX)$(MANDIR)/man7
- @pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \
- here="`pwd`"; \
-- filecase=; \
-- if [ "$(PLATFORM)" = "DJGPP" -o "$(PLATFORM)" = "Cygwin" -o "$(PLATFORM)" = "mingw" ]; then \
-- filecase=-i; \
-- fi; \
-+ filecase=-i; \
- set -e; for i in doc/apps/*.pod; do \
- fn=`basename $$i .pod`; \
- sec=`$(PERL) util/extract-section.pl 1 < $$i`; \
Modified: trunk/dports/security/tor/Portfile
===================================================================
--- trunk/dports/security/tor/Portfile 2015-02-05 21:50:33 UTC (rev 132609)
+++ trunk/dports/security/tor/Portfile 2015-02-05 21:50:37 UTC (rev 132610)
@@ -6,6 +6,7 @@
name tor
conflicts tor-devel
version 0.2.5.10
+revision 1
categories security
platforms darwin
maintainers nomaintainer
Modified: trunk/dports/sysutils/freeradius/Portfile
===================================================================
--- trunk/dports/sysutils/freeradius/Portfile 2015-02-05 21:50:33 UTC (rev 132609)
+++ trunk/dports/sysutils/freeradius/Portfile 2015-02-05 21:50:37 UTC (rev 132610)
@@ -5,7 +5,7 @@
name freeradius
version 2.2.4
-revision 2
+revision 3
categories sysutils
maintainers nomaintainer
homepage http://www.freeradius.org/
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150205/bdca6ddf/attachment-0001.html>
More information about the macports-changes
mailing list