From 5547382e16a785b3d9d07b29663b804d97c9391a Mon Sep 17 00:00:00 2001 From: Rodrigo Osorio Date: Sun, 13 Sep 2015 22:03:46 +0000 Subject: [PATCH] Update port --- devel/libassa/Makefile | 3 ++- devel/libassa/distinfo | 4 ++-- devel/libassa/files/patch-assa:Address.h | 10 --------- .../libassa/files/patch-assa:Logger_Impl.cpp | 10 --------- devel/libassa/files/patch-assa:Logger_Impl.h | 11 ---------- devel/libassa/files/patch-assa_Makefile.am | 12 +++++++++++ devel/libassa/files/patch-assa_Makefile.in | 21 +++++++++++++++++++ devel/libassa/files/patch-configure.ac | 19 +++++++++++++++++ ...-examples:logserver:server:MonitorConn.cpp | 11 ---------- .../files/patch-tests:semaphore_test.cpp | 10 --------- devel/libassa/files/patch-tests:ttcp_assa.cpp | 20 ------------------ .../files/patch-tests_charinbuffer_test.cpp | 11 ---------- devel/libassa/pkg-plist | 3 +-- 13 files changed, 57 insertions(+), 88 deletions(-) delete mode 100644 devel/libassa/files/patch-assa:Address.h delete mode 100644 devel/libassa/files/patch-assa:Logger_Impl.cpp delete mode 100644 devel/libassa/files/patch-assa:Logger_Impl.h create mode 100644 devel/libassa/files/patch-assa_Makefile.am create mode 100644 devel/libassa/files/patch-assa_Makefile.in create mode 100644 devel/libassa/files/patch-configure.ac delete mode 100644 devel/libassa/files/patch-examples:logserver:server:MonitorConn.cpp delete mode 100644 devel/libassa/files/patch-tests:semaphore_test.cpp delete mode 100644 devel/libassa/files/patch-tests:ttcp_assa.cpp delete mode 100644 devel/libassa/files/patch-tests_charinbuffer_test.cpp diff --git a/devel/libassa/Makefile b/devel/libassa/Makefile index 33e3b89eec82..30319e6288f5 100644 --- a/devel/libassa/Makefile +++ b/devel/libassa/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libassa -DISTVERSION= 3.5.0 +DISTVERSION= 3.5.1 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION:C/\.[0-9]*$//} @@ -11,6 +11,7 @@ COMMENT= C++ networking library and application framework GNU_CONFIGURE= yes USES= libtool pathfix pkgconfig +USE_AUTOTOOLS= autoconf USE_LDCONFIG= yes PLIST_SUB= ASSA_VERSION=${PORTVERSION:R:R} diff --git a/devel/libassa/distinfo b/devel/libassa/distinfo index 20e9186c986b..d716b2f879aa 100644 --- a/devel/libassa/distinfo +++ b/devel/libassa/distinfo @@ -1,2 +1,2 @@ -SHA256 (libassa-3.5.0.tar.gz) = 72a627c74e82ff679cb16ebe3a625b9032d8d1feed4c1da63ebb5106a80b1314 -SIZE (libassa-3.5.0.tar.gz) = 586237 +SHA256 (libassa-3.5.1.tar.gz) = c1245a98373f37c0e286b327e2d750fd20278c71f47f2018053b4d799d33172c +SIZE (libassa-3.5.1.tar.gz) = 641255 diff --git a/devel/libassa/files/patch-assa:Address.h b/devel/libassa/files/patch-assa:Address.h deleted file mode 100644 index 814c06ce1a1b..000000000000 --- a/devel/libassa/files/patch-assa:Address.h +++ /dev/null @@ -1,10 +0,0 @@ ---- assa/Address.h.orig Wed Sep 6 16:13:45 2006 -+++ assa/Address.h Wed Sep 6 16:13:57 2006 -@@ -13,7 +13,6 @@ - #define ADDRESS_H - - #if !defined (WIN32) --# include - # include - # include - # include diff --git a/devel/libassa/files/patch-assa:Logger_Impl.cpp b/devel/libassa/files/patch-assa:Logger_Impl.cpp deleted file mode 100644 index fdd6da34d6c1..000000000000 --- a/devel/libassa/files/patch-assa:Logger_Impl.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- assa/Logger_Impl.cpp.orig Thu Jul 20 06:30:54 2006 -+++ assa/Logger_Impl.cpp Wed Sep 6 16:20:05 2006 -@@ -14,6 +14,7 @@ - - #include - #include -+#include - #include // strerror(3) - - #include "assa/TimeVal.h" diff --git a/devel/libassa/files/patch-assa:Logger_Impl.h b/devel/libassa/files/patch-assa:Logger_Impl.h deleted file mode 100644 index 8fa82d5a1364..000000000000 --- a/devel/libassa/files/patch-assa:Logger_Impl.h +++ /dev/null @@ -1,11 +0,0 @@ ---- assa/Logger_Impl.h.orig Mon Oct 13 11:30:18 2003 -+++ assa/Logger_Impl.h Thu Jan 29 00:28:19 2004 -@@ -16,6 +16,8 @@ - - #include - #include -+#include -+#include - - using std::string; - using std::ostream; diff --git a/devel/libassa/files/patch-assa_Makefile.am b/devel/libassa/files/patch-assa_Makefile.am new file mode 100644 index 000000000000..46acb12eff4d --- /dev/null +++ b/devel/libassa/files/patch-assa_Makefile.am @@ -0,0 +1,12 @@ +--- assa/Makefile.am.orig 2012-05-18 02:26:21 UTC ++++ assa/Makefile.am +@@ -100,8 +100,7 @@ library_includedir = $(includedir)/ + library_include_HEADERS = $(h_sources) + + INCLUDES = \ +- -I$(top_srcdir) \ +- @TIRPC_CFLAGS@ ++ -I$(top_srcdir) + + lib_LTLIBRARIES = libassa-3.5.la + diff --git a/devel/libassa/files/patch-assa_Makefile.in b/devel/libassa/files/patch-assa_Makefile.in new file mode 100644 index 000000000000..17bbbce068e2 --- /dev/null +++ b/devel/libassa/files/patch-assa_Makefile.in @@ -0,0 +1,21 @@ +--- assa/Makefile.in.orig 2015-09-13 20:12:38 UTC ++++ assa/Makefile.in +@@ -198,8 +198,6 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TIRPC_CFLAGS = @TIRPC_CFLAGS@ +-TIRPC_LIBS = @TIRPC_LIBS@ + VERSION = @VERSION@ + WIN32_EXTRA_LDFLAGS = @WIN32_EXTRA_LDFLAGS@ + WIN32_EXTRA_LIBADD = @WIN32_EXTRA_LIBADD@ +@@ -356,8 +354,7 @@ cpp_sources = \ + library_includedir = $(includedir)/assa-@ASSA_RELEASE@/assa + library_include_HEADERS = $(h_sources) + INCLUDES = \ +- -I$(top_srcdir) \ +- @TIRPC_CFLAGS@ ++ -I$(top_srcdir) + + lib_LTLIBRARIES = libassa-3.5.la + libassa_3_5_la_SOURCES = $(h_sources) $(cpp_sources) diff --git a/devel/libassa/files/patch-configure.ac b/devel/libassa/files/patch-configure.ac new file mode 100644 index 000000000000..c5a7363636ca --- /dev/null +++ b/devel/libassa/files/patch-configure.ac @@ -0,0 +1,19 @@ +--- configure.ac.orig 2012-05-23 02:52:25 UTC ++++ configure.ac +@@ -133,16 +133,6 @@ AM_SANITY_CHECK + AC_LANG_CPLUSPLUS + + dnl ---------------------------------------------------------------------------- +-dnl Fetch LIBTIRPC library flags. +-dnl Sometimes around late 2011/early 2012, glibc 2.14.x discontinued +-dnl support for built-in RPC support. We only use XDR part of it. +-dnl ---------------------------------------------------------------------------- +- +-PKG_CHECK_MODULES(TIRPC, libtirpc >= 0.2.2) +-AC_SUBST(TIRPC_CFLAGS) +-AC_SUBST(TIRPC_LIBS) +- +-dnl ---------------------------------------------------------------------------- + dnl Check if we are building for Win32 + dnl ---------------------------------------------------------------------------- + WIN32_EXTRA_LIBADD= diff --git a/devel/libassa/files/patch-examples:logserver:server:MonitorConn.cpp b/devel/libassa/files/patch-examples:logserver:server:MonitorConn.cpp deleted file mode 100644 index 6bfc2a1c9763..000000000000 --- a/devel/libassa/files/patch-examples:logserver:server:MonitorConn.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- examples/logserver/server/MonitorConn.cpp.orig Thu Jul 20 10:30:55 2006 -+++ examples/logserver/server/MonitorConn.cpp Thu Sep 7 16:18:01 2006 -@@ -20,6 +20,8 @@ - #include "LogServer-main.h" - #include "LogServer.h" - -+#include -+ - /** Convert user input to upper case - */ - template diff --git a/devel/libassa/files/patch-tests:semaphore_test.cpp b/devel/libassa/files/patch-tests:semaphore_test.cpp deleted file mode 100644 index 1e703fa9103d..000000000000 --- a/devel/libassa/files/patch-tests:semaphore_test.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- tests/semaphore_test.cpp.orig Thu Jul 20 06:30:56 2006 -+++ tests/semaphore_test.cpp Wed Sep 6 16:30:11 2006 -@@ -16,6 +16,7 @@ - using namespace std; - - #include -+#include - - #if !defined (WIN32) - # include // ftok(2) diff --git a/devel/libassa/files/patch-tests:ttcp_assa.cpp b/devel/libassa/files/patch-tests:ttcp_assa.cpp deleted file mode 100644 index 3191be803040..000000000000 --- a/devel/libassa/files/patch-tests:ttcp_assa.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- tests/ttcp_assa.cpp.orig Fri Jan 7 10:46:12 2005 -+++ tests/ttcp_assa.cpp Tue Mar 22 16:32:30 2005 -@@ -91,7 +91,7 @@ - IPv4Socket* sock = 0; // Communication socket - - struct sockaddr_in peer; --int peerlen; -+socklen_t peerlen; - - int domain, fromlen; - int fd; /* fd of network socket */ -@@ -775,7 +775,7 @@ - Nread( int fd_, void* buf_, int count ) - { - struct sockaddr_in from; -- int len = sizeof(from); -+ socklen_t len = sizeof(from); - register int cnt; - - if( udp ) diff --git a/devel/libassa/files/patch-tests_charinbuffer_test.cpp b/devel/libassa/files/patch-tests_charinbuffer_test.cpp deleted file mode 100644 index cad5bf51c248..000000000000 --- a/devel/libassa/files/patch-tests_charinbuffer_test.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- tests/charinbuffer_test.cpp.orig Sat Aug 12 23:02:38 2006 -+++ tests/charinbuffer_test.cpp Sat Aug 12 23:03:00 2006 -@@ -596,7 +596,7 @@ - IPv4Socket& s = *this; - - if (state () == Task2::start) { -- Assure_exit (s.write (&REQUEST [m_idx], 1) == 1); -+ Assure_exit (s.write (&((REQUEST.c_str())[m_idx]), 1) == 1); - s << flush; - DL((APP,"<== Sent \"%c\" to Loopback\n", REQUEST [m_idx] )); - diff --git a/devel/libassa/pkg-plist b/devel/libassa/pkg-plist index ecdef1a4839e..7c30cafb2e15 100644 --- a/devel/libassa/pkg-plist +++ b/devel/libassa/pkg-plist @@ -59,7 +59,6 @@ include/assa-3.5/assa/XDRHack.h include/assa-3.5/assa/xdrIOBuffer.h lib/libassa-3.5.a lib/libassa-3.5.so -lib/libassa-3.5.so.5 -lib/libassa-3.5.so.5.0.0 +lib/libassa-3.5.so.5.0.1 libdata/pkgconfig/assa-3.5.pc man/man1/assa-genesis.1.gz