<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[120428] trunk/dports/devel/pcrexx</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/120428">120428</a></dd>
<dt>Author</dt> <dd>jmr@macports.org</dd>
<dt>Date</dt> <dd>2014-05-27 19:15:51 -0700 (Tue, 27 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>pcrexx: fix build failures on Mavericks and with universal variant (#43726, #43783, maintainer timeout)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelpcrexxPortfile">trunk/dports/devel/pcrexx/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdevelpcrexxfilespatchMakefileamdiff">trunk/dports/devel/pcrexx/files/patch-Makefile.am.diff</a></li>
<li><a href="#trunkdportsdevelpcrexxfilespatchpcrexxhdiff">trunk/dports/devel/pcrexx/files/patch-pcrexx.h.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsdevelpcrexxfilespatchdoc_Makefileindiff">trunk/dports/devel/pcrexx/files/patch-doc_Makefile.in.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelpcrexxPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/pcrexx/Portfile (120427 => 120428)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/pcrexx/Portfile 2014-05-28 02:09:43 UTC (rev 120427)
+++ trunk/dports/devel/pcrexx/Portfile 2014-05-28 02:15:51 UTC (rev 120428)
</span><span class="lines">@@ -28,8 +28,10 @@
</span><span class="cx">
</span><span class="cx"> depends_lib port:pcre
</span><span class="cx">
</span><del>-patchfiles patch-doc_Makefile.in.diff
</del><ins>+patchfiles patch-Makefile.am.diff patch-pcrexx.h.diff
</ins><span class="cx">
</span><ins>+use_autoreconf yes
+
</ins><span class="cx"> configure.args --mandir=${prefix}/share/man \
</span><span class="cx"> --with-pcre-include=${prefix}/include \
</span><span class="cx"> --with-pcre-lib=${prefix}/lib
</span></span></pre></div>
<a id="trunkdportsdevelpcrexxfilespatchMakefileamdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/pcrexx/files/patch-Makefile.am.diff (0 => 120428)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/pcrexx/files/patch-Makefile.am.diff (rev 0)
+++ trunk/dports/devel/pcrexx/files/patch-Makefile.am.diff 2014-05-28 02:15:51 UTC (rev 120428)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+--- doc/Makefile.am.orig 2003-02-24 03:37:03.000000000 +1100
++++ doc/Makefile.am 2014-05-23 09:33:20.000000000 +1000
+@@ -4,5 +4,5 @@
+ DOC_FILES = html/* ../README ../COPYING ../AUTHORS ../INSTALL ../ChangeLog ../config.log
+
+ install-data-local:
+- $(INSTALL) -m 755 -d $(prefix)/doc/libpcre++-$(VERSION)
+- $(INSTALL) -m 644 $(DOC_FILES) $(prefix)/doc/libpcre++-$(VERSION)/
+\ No newline at end of file
++ $(INSTALL) -m 755 -d $(DESTDIR)$(datarootdir)/doc/libpcre++-$(VERSION)
++ $(INSTALL) -m 644 $(DOC_FILES) $(DESTDIR)$(datarootdir)/doc/libpcre++-$(VERSION)/
+--- examples/Makefile.am.orig 2003-06-27 07:04:35.000000000 +1000
++++ examples/Makefile.am 2014-05-23 08:53:40.000000000 +1000
+@@ -10,4 +10,4 @@
+ search_demo_SOURCES = search_demo.cc
+ search_demo_LDADD = $(pcre_linklib)
+
+-CXXFLAGS = -Wall -Wstrict-prototypes -O -g
+\ No newline at end of file
++AM_CXXFLAGS = -Wall -Wstrict-prototypes -O -g
+--- libpcre++/Makefile.am.orig 2003-06-25 07:58:52.000000000 +1000
++++ libpcre++/Makefile.am 2014-05-23 08:55:55.000000000 +1000
+@@ -5,4 +5,4 @@
+
+
+
+-CXXFLAGS = -Wall -Wstrict-prototypes -O -g
+\ No newline at end of file
++AM_CXXFLAGS = -Wall -Wstrict-prototypes -O -g
+--- test/Makefile.am.orig 2003-06-27 23:33:48.000000000 +1000
++++ test/Makefile.am 2014-05-23 08:54:39.000000000 +1000
+@@ -4,4 +4,4 @@
+ test_SOURCES = test.cc
+ test_LDADD = $(pcre_linklib)
+
+-CXXFLAGS = -Wall -Wstrict-prototypes -O -g
++AM_CXXFLAGS = -Wall -Wstrict-prototypes -O -g
</ins></span></pre></div>
<a id="trunkdportsdevelpcrexxfilespatchdoc_Makefileindiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/pcrexx/files/patch-doc_Makefile.in.diff (120427 => 120428)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/pcrexx/files/patch-doc_Makefile.in.diff 2014-05-28 02:09:43 UTC (rev 120427)
+++ trunk/dports/devel/pcrexx/files/patch-doc_Makefile.in.diff 2014-05-28 02:15:51 UTC (rev 120428)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>---- doc/Makefile.in.orig 2004-08-24 17:38:04.000000000 -0600
-+++ doc/Makefile.in 2009-07-16 01:44:37.000000000 -0600
-@@ -232,8 +232,8 @@
-
-
- install-data-local:
-- $(INSTALL) -m 755 -d $(prefix)/doc/libpcre++-$(VERSION)
-- $(INSTALL) -m 644 $(DOC_FILES) $(prefix)/doc/libpcre++-$(VERSION)/
-+ $(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/share/doc/libpcre++-$(VERSION)
-+ $(INSTALL) -m 644 $(DOC_FILES) $(DESTDIR)$(prefix)/share/doc/libpcre++-$(VERSION)/
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
</del></span></pre></div>
<a id="trunkdportsdevelpcrexxfilespatchpcrexxhdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/pcrexx/files/patch-pcrexx.h.diff (0 => 120428)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/pcrexx/files/patch-pcrexx.h.diff (rev 0)
+++ trunk/dports/devel/pcrexx/files/patch-pcrexx.h.diff 2014-05-28 02:15:51 UTC (rev 120428)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+--- libpcre++/pcre++.h.orig 2004-08-25 09:37:55.000000000 +1000
++++ libpcre++/pcre++.h 2014-05-23 09:48:05.000000000 +1000
+@@ -47,11 +47,11 @@
+ #include <map>
+ #include <stdexcept>
+ #include <iostream>
++#include <clocale>
+
+
+ extern "C" {
+ #include <pcre.h>
+- #include <locale.h>
+ }
+
+ namespace pcrepp {
</ins></span></pre>
</div>
</div>
</body>
</html>