[123019] trunk/dports/net/vantages
devans at macports.org
devans at macports.org
Sun Aug 3 14:04:11 PDT 2014
Revision: 123019
https://trac.macports.org/changeset/123019
Author: devans at macports.org
Date: 2014-08-03 14:04:11 -0700 (Sun, 03 Aug 2014)
Log Message:
-----------
vantages: fix clang build, curl headers.
Modified Paths:
--------------
trunk/dports/net/vantages/Portfile
trunk/dports/net/vantages/files/patch-bad_paths.diff
trunk/dports/net/vantages/files/patch-makefile_fixes.diff
Added Paths:
-----------
trunk/dports/net/vantages/files/patch-curl-headers.diff
Modified: trunk/dports/net/vantages/Portfile
===================================================================
--- 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)
@@ -36,7 +36,8 @@
extract.suffix .tgz
patchfiles patch-makefile_fixes.diff \
- patch-bad_paths.diff
+ patch-bad_paths.diff \
+ patch-curl-headers.diff
# /usr/bin/ranlib: library member: libshttpd.a(compat_unix.c) is not an object file (not allowed in a library with multiple architectures)
universal_variant no
Modified: trunk/dports/net/vantages/files/patch-bad_paths.diff
===================================================================
--- 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)
@@ -54,10 +54,10 @@
LDFLAGS="$old_LDFLAGS -L$try"
unset ac_cv_lib_openssl_EVP_PKEY_new
AC_CHECK_LIB(ssl, EVP_PKEY_new,
---- dns/Makefile.in.orig 2010-04-02 01:21:08.000000000 -0500
-+++ dns/Makefile.in 2010-08-29 01:23:25.000000000 -0500
+--- dns/Makefile.in.orig 2014-08-03 13:18:21.000000000 -0700
++++ dns/Makefile.in 2014-08-03 13:18:22.000000000 -0700
@@ -43,7 +43,7 @@
- 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@
@@ -65,10 +65,10 @@
DNS_OBJS = dns_a.o dns_compression.o dns_header.o dns_name.o \
dns_packet.o dns_rr_fact.o dns_dnskey.o dns_rr.o \
---- 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
+--- 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
@@ -33,8 +33,8 @@
- 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@
Added: trunk/dports/net/vantages/files/patch-curl-headers.diff
===================================================================
--- 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)
@@ -0,0 +1,35 @@
+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"
Modified: trunk/dports/net/vantages/files/patch-makefile_fixes.diff
===================================================================
--- 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)
@@ -41,3 +41,25 @@
+ @echo "Setting up database..."
$(bindir)/vant-setup -d $(DESTDIR)$(datarootdir)/vantages/sql
+--- 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@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140803/8469b1f0/attachment.html>
More information about the macports-changes
mailing list