<!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>[123019] trunk/dports/net/vantages</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/123019">123019</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-08-03 14:04:11 -0700 (Sun, 03 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>vantages: fix clang build, curl headers.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsnetvantagesPortfile">trunk/dports/net/vantages/Portfile</a></li>
<li><a href="#trunkdportsnetvantagesfilespatchbad_pathsdiff">trunk/dports/net/vantages/files/patch-bad_paths.diff</a></li>
<li><a href="#trunkdportsnetvantagesfilespatchmakefile_fixesdiff">trunk/dports/net/vantages/files/patch-makefile_fixes.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsnetvantagesfilespatchcurlheadersdiff">trunk/dports/net/vantages/files/patch-curl-headers.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsnetvantagesPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/vantages/Portfile (123018 => 123019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/vantages/Portfile 2014-08-03 21:00:18 UTC (rev 123018)
+++ trunk/dports/net/vantages/Portfile 2014-08-03 21:04:11 UTC (rev 123019)
</span><span class="lines">@@ -36,7 +36,8 @@
</span><span class="cx"> extract.suffix .tgz
</span><span class="cx">
</span><span class="cx"> patchfiles patch-makefile_fixes.diff \
</span><del>- patch-bad_paths.diff
</del><ins>+ patch-bad_paths.diff \
+ patch-curl-headers.diff
</ins><span class="cx">
</span><span class="cx"> # /usr/bin/ranlib: library member: libshttpd.a(compat_unix.c) is not an object file (not allowed in a library with multiple architectures)
</span><span class="cx"> universal_variant no
</span></span></pre></div>
<a id="trunkdportsnetvantagesfilespatchbad_pathsdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/vantages/files/patch-bad_paths.diff (123018 => 123019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/vantages/files/patch-bad_paths.diff 2014-08-03 21:00:18 UTC (rev 123018)
+++ trunk/dports/net/vantages/files/patch-bad_paths.diff 2014-08-03 21:04:11 UTC (rev 123019)
</span><span class="lines">@@ -54,10 +54,10 @@
</span><span class="cx"> LDFLAGS="$old_LDFLAGS -L$try"
</span><span class="cx"> unset ac_cv_lib_openssl_EVP_PKEY_new
</span><span class="cx"> AC_CHECK_LIB(ssl, EVP_PKEY_new,
</span><del>---- dns/Makefile.in.orig 2010-04-02 01:21:08.000000000 -0500
-+++ dns/Makefile.in 2010-08-29 01:23:25.000000000 -0500
</del><ins>+--- dns/Makefile.in.orig 2014-08-03 13:18:21.000000000 -0700
++++ dns/Makefile.in 2014-08-03 13:18:22.000000000 -0700
</ins><span class="cx"> @@ -43,7 +43,7 @@
</span><del>- DEFINES = -g -Wall -Werror -D_LIBVDNS_VERSION=@LIBTOOL_VERSION_INFO@ @DEFS@ --no-strict-aliasing
</del><ins>+ DEFINES = -g -Wall -D_LIBVDNS_VERSION=@LIBTOOL_VERSION_INFO@ @DEFS@
</ins><span class="cx"> CFLAGS = @CFLAGS@ @CPPFLAGS@ $(DEFINES)
</span><span class="cx"> CXXFLAGS = @CXXFLAGS@ $(DEFINES)
</span><span class="cx"> -CPPFLAGS = -DDEBUG -D_POSIX_THREADS -D_REENTRANT -I/usr/local/include -I/opt/local/include @CPPFLAGS@
</span><span class="lines">@@ -65,10 +65,10 @@
</span><span class="cx">
</span><span class="cx"> DNS_OBJS = dns_a.o dns_compression.o dns_header.o dns_name.o \
</span><span class="cx"> dns_packet.o dns_rr_fact.o dns_dnskey.o dns_rr.o \
</span><del>---- src/Makefile-full.in.orig 2010-04-21 19:42:23.000000000 -0500
-+++ src/Makefile-full.in 2010-08-29 01:24:31.000000000 -0500
</del><ins>+--- src/Makefile-full.in.orig 2014-08-03 13:25:30.000000000 -0700
++++ src/Makefile-full.in 2014-08-03 13:25:30.000000000 -0700
</ins><span class="cx"> @@ -33,8 +33,8 @@
</span><del>- DEFINES = -g -Wall -Werror @DEFS@
</del><ins>+ DEFINES = -g -Wall @DEFS@
</ins><span class="cx"> CFLAGS = @CFLAGS@ @CPPFLAGS@ $(DEFINES)
</span><span class="cx"> CXXFLAGS = @CXXFLAGS@
</span><span class="cx"> -CPPFLAGS = -DDEBUG -D_POSIX_THREADS -D_REENTRANT -I../dns -I../shttpd-1.42/src -I/usr/local/include -I/opt/local/include -I/usr/local/include/gpgme @CPPFLAGS@
</span></span></pre></div>
<a id="trunkdportsnetvantagesfilespatchcurlheadersdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/net/vantages/files/patch-curl-headers.diff (0 => 123019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/vantages/files/patch-curl-headers.diff (rev 0)
+++ trunk/dports/net/vantages/files/patch-curl-headers.diff 2014-08-03 21:04:11 UTC (rev 123019)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+diff -ur src.orig/http_query.cc src/http_query.cc
+--- src.orig/http_query.cc 2014-08-03 13:33:49.000000000 -0700
++++ src/http_query.cc 2014-08-03 13:34:33.000000000 -0700
+@@ -33,8 +33,6 @@
+ #include <stdlib.h>
+
+ #include <curl/curl.h>
+-#include <curl/types.h>
+-#include <curl/easy.h>
+
+ #include "http_query.h"
+ #include "ps_config.h"
+diff -ur src.orig/http_query.h src/http_query.h
+--- src.orig/http_query.h 2014-08-03 13:33:49.000000000 -0700
++++ src/http_query.h 2014-08-03 13:35:07.000000000 -0700
+@@ -36,7 +36,6 @@
+ #include <iostream>
+
+ #include <curl/curl.h>
+-#include <curl/types.h>
+
+ class HttpQuery
+ {
+diff -ur src.orig/vantaged.cc src/vantaged.cc
+--- src.orig/vantaged.cc 2014-08-03 13:33:49.000000000 -0700
++++ src/vantaged.cc 2014-08-03 13:35:29.000000000 -0700
+@@ -52,8 +52,6 @@
+ #include <vector>
+
+ #include <curl/curl.h>
+-#include <curl/types.h>
+-#include <curl/easy.h>
+
+ #include "ps_poller.h"
+ #include "ps_defs.h"
</ins></span></pre></div>
<a id="trunkdportsnetvantagesfilespatchmakefile_fixesdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/vantages/files/patch-makefile_fixes.diff (123018 => 123019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/vantages/files/patch-makefile_fixes.diff 2014-08-03 21:00:18 UTC (rev 123018)
+++ trunk/dports/net/vantages/files/patch-makefile_fixes.diff 2014-08-03 21:04:11 UTC (rev 123019)
</span><span class="lines">@@ -41,3 +41,25 @@
</span><span class="cx"> + @echo "Setting up database..."
</span><span class="cx"> $(bindir)/vant-setup -d $(DESTDIR)$(datarootdir)/vantages/sql
</span><span class="cx">
</span><ins>+--- dns/Makefile.in.orig 2014-08-03 12:27:22.000000000 -0700
++++ dns/Makefile.in 2014-08-03 12:27:53.000000000 -0700
+@@ -40,7 +40,7 @@
+ # RUNTIME_PATH = @RUNTIME_PATH@
+ LIBS = @LIBS@
+
+-DEFINES = -g -Wall -Werror -D_LIBVDNS_VERSION=@LIBTOOL_VERSION_INFO@ @DEFS@ --no-strict-aliasing
++DEFINES = -g -Wall -D_LIBVDNS_VERSION=@LIBTOOL_VERSION_INFO@ @DEFS@
+ CFLAGS = @CFLAGS@ @CPPFLAGS@ $(DEFINES)
+ CXXFLAGS = @CXXFLAGS@ $(DEFINES)
+ CPPFLAGS = -DDEBUG -D_POSIX_THREADS -D_REENTRANT -I/usr/local/include -I/opt/local/include @CPPFLAGS@
+--- src/Makefile-full.in.orig 2014-08-03 13:23:56.000000000 -0700
++++ src/Makefile-full.in 2014-08-03 13:24:16.000000000 -0700
+@@ -30,7 +30,7 @@
+
+ CC = @CC@
+ CXX = @CXX@
+-DEFINES = -g -Wall -Werror @DEFS@
++DEFINES = -g -Wall @DEFS@
+ CFLAGS = @CFLAGS@ @CPPFLAGS@ $(DEFINES)
+ CXXFLAGS = @CXXFLAGS@
+ CPPFLAGS = -DDEBUG -D_POSIX_THREADS -D_REENTRANT -I../dns -I../shttpd-1.42/src -I/usr/local/include -I/opt/local/include -I/usr/local/include/gpgme @CPPFLAGS@
</ins></span></pre>
</div>
</div>
</body>
</html>