[142007] trunk/dports/security/libressl

[jeremyhu at macports.org]

Revision: 142007
          https://trac.macports.org/changeset/142007
Author:   jeremyhu at macports.org
Date:     2015-11-01 15:15:22 -0800 (Sun, 01 Nov 2015)
Log Message:
-----------
libressl: Squash patches

Modified Paths:
--------------
    trunk/dports/security/libressl/Portfile
    trunk/dports/security/libressl/files/openssldir-cert.pem.patch

Removed Paths:
-------------
    trunk/dports/security/libressl/files/cppflags.patch

Modified: trunk/dports/security/libressl/Portfile
===================================================================
--- trunk/dports/security/libressl/Portfile	2015-11-01 22:52:46 UTC (rev 142006)
+++ trunk/dports/security/libressl/Portfile	2015-11-01 23:15:22 UTC (rev 142007)
@@ -28,8 +28,7 @@
                     sha256  6b409859be8654afc3862549494e097017e64c8d167f12584383586306ef9a7e
 
 patchfiles \
-    openssldir-cert.pem.patch \
-    cppflags.patch
+    openssldir-cert.pem.patch
 
 use_autoreconf  yes
 autoreconf.args -fvi

Deleted: trunk/dports/security/libressl/files/cppflags.patch
===================================================================
--- trunk/dports/security/libressl/files/cppflags.patch	2015-11-01 22:52:46 UTC (rev 142006)
+++ trunk/dports/security/libressl/files/cppflags.patch	2015-11-01 23:15:22 UTC (rev 142007)
@@ -1,14 +0,0 @@
-https://github.com/libressl-portable/portable/issues/154
-
-diff -Naurp libressl-2.2.4.orig/tls/Makefile.am libressl-2.2.4/tls/Makefile.am
---- tls/Makefile.am	2015-10-19 00:00:25.000000000 -0700
-+++ tls/Makefile.am	2015-10-19 00:01:14.000000000 -0700
-@@ -5,7 +5,7 @@ lib_LTLIBRARIES = libtls.la
- EXTRA_DIST = VERSION
- EXTRA_DIST += CMakeLists.txt
- 
--libtls_la_CPPFLAGS =
-+libtls_la_CPPFLAGS = $(AM_CPPFLAGS)
- 
- if OPENSSLDIR_DEFINED
- libtls_la_CPPFLAGS += -DOPENSSLDIR=\"@OPENSSLDIR@\"

Modified: trunk/dports/security/libressl/files/openssldir-cert.pem.patch
===================================================================
--- trunk/dports/security/libressl/files/openssldir-cert.pem.patch	2015-11-01 22:52:46 UTC (rev 142006)
+++ trunk/dports/security/libressl/files/openssldir-cert.pem.patch	2015-11-01 23:15:22 UTC (rev 142007)
@@ -15,7 +15,7 @@
  EXTRA_DIST = VERSION
  EXTRA_DIST += CMakeLists.txt
  
-+libtls_la_CPPFLAGS =
++libtls_la_CPPFLAGS = $(AM_CPPFLAGS)
 +
 +if OPENSSLDIR_DEFINED
 +libtls_la_CPPFLAGS += -DOPENSSLDIR=\"@OPENSSLDIR@\"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/61cedb72/attachment-0001.html>