[136648] trunk/dports

[cal at macports.org]

Revision: 136648
          https://trac.macports.org/changeset/136648
Author:   cal at macports.org
Date:     2015-05-23 10:17:21 -0700 (Sat, 23 May 2015)
Log Message:
-----------
capnproto: update to 0.5.2, revump textmate2 to rebuild against new library

Modified Paths:
--------------
    trunk/dports/devel/capnproto/Portfile
    trunk/dports/editors/textmate2/Portfile

Added Paths:
-----------
    trunk/dports/devel/capnproto/files/
    trunk/dports/devel/capnproto/files/0001-Avoid-incorrect-library-version-with-BSD-sed.patch

Modified: trunk/dports/devel/capnproto/Portfile
===================================================================
--- trunk/dports/devel/capnproto/Portfile	2015-05-23 17:15:56 UTC (rev 136647)
+++ trunk/dports/devel/capnproto/Portfile	2015-05-23 17:17:21 UTC (rev 136648)
@@ -5,9 +5,9 @@
 PortGroup               compiler_blacklist_versions 1.0
 
 name                    capnproto
-version                 0.5.1
-checksums               rmd160  f288a0d9bf95bcf5e3bf311626d9be407335bb36 \
-                        sha256  6f47ea606d64452a2242010da9b0fdb79cdeb497dfec42b47fb7df397be732f2
+version                 0.5.2
+checksums               rmd160  e16d911f5383d0c422d8d3711032a5dc0caab8cc \
+                        sha256  23145a0127c2b1629c4b72e6000e04991640e551947fa39fd06710d64bd942a8
 
 maintainers             cal openmaintainer
 platforms               darwin
@@ -24,6 +24,9 @@
 master_sites            ${homepage}
 distname                ${name}-c++-${version}
 
+patch.pre_args          -p2
+patchfiles              0001-Avoid-incorrect-library-version-with-BSD-sed.patch
+
 use_autoreconf          yes
 
 # clang 3.2 - clang-3.5 and all clangs from Xcode < 5 crash while compiling this.

Added: trunk/dports/devel/capnproto/files/0001-Avoid-incorrect-library-version-with-BSD-sed.patch
===================================================================
--- trunk/dports/devel/capnproto/files/0001-Avoid-incorrect-library-version-with-BSD-sed.patch	                        (rev 0)
+++ trunk/dports/devel/capnproto/files/0001-Avoid-incorrect-library-version-with-BSD-sed.patch	2015-05-23 17:17:21 UTC (rev 136648)
@@ -0,0 +1,63 @@
+From 2cc62644f24947e50a6ce17a6c685e4a3af49af3 Mon Sep 17 00:00:00 2001
+Upstream-Status: Pending [https://github.com/sandstorm-io/capnproto/pull/210]
+From: Clemens Lang <neverpanic at gmail.com>
+Date: Sat, 23 May 2015 19:02:32 +0200
+Subject: [PATCH] Avoid incorrect library version with BSD sed
+
+BSD sed does not support GNU sed's -r switch, but uses -E instead for
+the same functionality. Because -r was used in Makefile.am to set the
+SO_VERSION and failed there on platforms with BSD sed (e.g. OS X and
+possibly some BSDs, too) SO_VERSION was empty, causing libtool to use
+the next given parameter as version number, which was -no-undefined.
+
+Fix this by testing for the regex flag in configure.ac (note that some
+implementations of sed support -E but do not document it).
+
+Signed-off-by: Clemens Lang <neverpanic at gmail.com>
+---
+ c++/Makefile.am  |  2 +-
+ c++/configure.ac | 15 +++++++++++++++
+ 2 files changed, 16 insertions(+), 1 deletion(-)
+
+diff --git a/c++/Makefile.am b/c++/Makefile.am
+index 8e0d9dd..b149b78 100644
+--- a/c++/Makefile.am
++++ b/c++/Makefile.am
+@@ -189,7 +189,7 @@ endif
+ 
+ # Don't include security release in soname -- we want to replace old binaries
+ # in this case.
+-SO_VERSION = $(shell echo $(VERSION) | sed -re 's/^([0-9]+[.][0-9]+[.][0-9]+)([.][0-9]+)?(-.*)?$$/\1\3/g')
++SO_VERSION = $(shell echo $(VERSION) | $(ESED) -e 's/^([0-9]+[.][0-9]+[.][0-9]+)([.][0-9]+)?(-.*)?$$/\1\3/g')
+ 
+ libkj_la_LIBADD = $(PTHREAD_LIBS)
+ libkj_la_LDFLAGS = -release $(SO_VERSION) -no-undefined
+diff --git a/c++/configure.ac b/c++/configure.ac
+index 26d9dcf..fe579c8 100644
+--- a/c++/configure.ac
++++ b/c++/configure.ac
+@@ -52,6 +52,21 @@ AC_PROG_CXX
+ AC_LANG([C++])
+ AX_CXX_COMPILE_STDCXX_11
+ 
++AC_MSG_CHECKING([how to run sed with extended regex support])
++AS_IF(
++    [test "$(echo test | sed -E 's/([st]+)$/xx\1/' 2>/dev/null)" = "texxst"], [
++        AC_MSG_RESULT([sed -E])
++        ESED="sed -E"
++    ],
++    [test "$(echo test | sed -r 's/([st]+)$/xx\1/' 2>/dev/null)" = "texxst"], [
++        AC_MSG_RESULT([sed -r])
++        ESED="sed -r"
++    ],
++    [AC_MSG_ERROR([cannot find sed with extended regex support (neither -r nor -E work)])]
++)
++AC_SUBST([ESED])
++
++
+ AS_CASE("${host_os}", *mingw*, [
+     # We don't use pthreads on MinGW.
+     PTHREAD_CFLAGS="-mthreads"
+-- 
+2.4.1
+

Modified: trunk/dports/editors/textmate2/Portfile
===================================================================
--- trunk/dports/editors/textmate2/Portfile	2015-05-23 17:15:56 UTC (rev 136647)
+++ trunk/dports/editors/textmate2/Portfile	2015-05-23 17:17:21 UTC (rev 136648)
@@ -6,6 +6,7 @@
 PortGroup               xcodeversion 1.0
 
 github.setup            textmate textmate 2.0-beta.6.8 v
+revision                1
 epoch                   4
 
 maintainers             cal openmaintainer
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150523/b9d72763/attachment.html>