Upgrade to 1.16, most patches merged into source code.

9 files changed, 4 insertions, 110 deletions

diff --git a/devel/mq4cpp/Makefile b/devel/mq4cpp/Makefile
index d9b80514afb..994e93debaf 100644
--- a/devel/mq4cpp/Makefile
+++ b/devel/mq4cpp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mq4cpp
-PORTVERSION=	1.15
+PORTVERSION=	1.16
 CATEGORIES=	devel
 MASTER_SITES=	http://www.sixtyfourbit.org/Download/
 
diff --git a/devel/mq4cpp/distinfo b/devel/mq4cpp/distinfo
index ba40c883257..37bdc711836 100644
--- a/devel/mq4cpp/distinfo
+++ b/devel/mq4cpp/distinfo
@@ -1,3 +1,3 @@
-MD5 (mq4cpp-1.15.tar.bz2) = 64f71109adfc0fdbbc44ca81752493fb
-SHA256 (mq4cpp-1.15.tar.bz2) = cba884139ba1c1aa0092e8d108b03c897d489766832e1a0cb8214bdf017ff8a7
-SIZE (mq4cpp-1.15.tar.bz2) = 1863842
+MD5 (mq4cpp-1.16.tar.bz2) = aa8bda85c0176e894a79eb1838e0b6e4
+SHA256 (mq4cpp-1.16.tar.bz2) = 3ef91a88e51d4d4092fa929b1b181190660d233d02be90ca8b5d432fbe22057b
+SIZE (mq4cpp-1.16.tar.bz2) = 1863709
diff --git a/devel/mq4cpp/files/patch-include_MessageProxy.h b/devel/mq4cpp/files/patch-include_MessageProxy.h
deleted file mode 100644
index c24c871b4a7..00000000000
--- a/devel/mq4cpp/files/patch-include_MessageProxy.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/MessageProxy.h.orig	Thu Jan  4 12:28:14 2007
-+++ include/MessageProxy.h	Thu Jan  4 12:28:19 2007
-@@ -32,7 +32,7 @@
- #include <windows.h>

- #else

- #include <pthread.h>

--#include <asm/errno.h>

-+#include <sys/errno.h>

- #endif

- 

- #include <vector>

diff --git a/devel/mq4cpp/files/patch-include_Socket.h b/devel/mq4cpp/files/patch-include_Socket.h
deleted file mode 100644
index 18a6939b4cf..00000000000
--- a/devel/mq4cpp/files/patch-include_Socket.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- include/Socket.h.orig	Mon Dec 18 02:57:52 2006
-+++ include/Socket.h	Thu Jan  4 12:26:33 2007
-@@ -29,6 +29,7 @@
- #include <WinSock2.h>

- #else

- #include <netinet/in.h>

-+#include <sys/socket.h>

- typedef int SOCKET;

- #endif

- 

diff --git a/devel/mq4cpp/files/patch-include_Thread.h b/devel/mq4cpp/files/patch-include_Thread.h
deleted file mode 100644
index 16d2890104a..00000000000
--- a/devel/mq4cpp/files/patch-include_Thread.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/Thread.h.orig	Mon Dec 18 02:57:52 2006
-+++ include/Thread.h	Thu Jan  4 12:26:18 2007
-@@ -27,7 +27,7 @@
- #include <windows.h>

- #else

- #include <pthread.h>

--#include <asm/errno.h>

-+#include <sys/errno.h>

- #endif

- 

- class ThreadException : public Exception

diff --git a/devel/mq4cpp/files/patch-include_rijndael.h b/devel/mq4cpp/files/patch-include_rijndael.h
deleted file mode 100644
index 6356ba19e8b..00000000000
--- a/devel/mq4cpp/files/patch-include_rijndael.h
+++ /dev/null
@@ -1,17 +0,0 @@
---- include/rijndael.h.orig	Thu Jan  4 12:26:53 2007
-+++ include/rijndael.h	Thu Jan  4 12:27:11 2007
-@@ -23,11 +23,11 @@
- typedef unsigned short word16;

- typedef unsigned char byte; 

- #else

--#include <asm/types.h>

-+#include <sys/types.h>

- #include <stdlib.h>

- #include <string.h>

--typedef __u32 word32;

--typedef __s32 sword32;

-+typedef uint32_t word32;

-+typedef int32_t sword32;

- typedef unsigned short word16;

- typedef unsigned char byte; 

- #endif

diff --git a/devel/mq4cpp/files/patch-src_FileSystem.cpp b/devel/mq4cpp/files/patch-src_FileSystem.cpp
deleted file mode 100644
index 6b02dcd575f..00000000000
--- a/devel/mq4cpp/files/patch-src_FileSystem.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/FileSystem.cpp.orig	Sat Mar 17 09:51:21 2007
-+++ src/FileSystem.cpp	Sat Jun 23 09:45:31 2007
-@@ -354,7 +354,11 @@
- 	Directory* ret=new Directory(path);

- 	ret->search();

- #else

-+#ifdef __FreeBSD__

-+	char* ptr=getcwd (NULL, PATH_MAX);

-+#else

- 	char* ptr=get_current_dir_name();

-+#endif

- 	TRACE("Current directory=" << ptr)

- 	Directory* ret=new Directory(ptr);

- 	ret->search();

diff --git a/devel/mq4cpp/files/patch-src_Socket.cpp b/devel/mq4cpp/files/patch-src_Socket.cpp
deleted file mode 100644
index cb0869686aa..00000000000
--- a/devel/mq4cpp/files/patch-src_Socket.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/Socket.cpp.orig	Sat Jun 23 09:55:17 2007
-+++ src/Socket.cpp	Sat Jun 23 09:58:16 2007
-@@ -156,7 +156,7 @@
-   } while  (IFRSIZE <= ifc.ifc_len);

- 

-   ifr = ifc.ifc_req;

--  for(; (ifr - ifc.ifc_req) * sizeof(ifreq) < static_cast<ulong>(ifc.ifc_len); ++ifr)

-+  for(; (ifr - ifc.ifc_req) * sizeof(ifreq) < static_cast<unsigned long>(ifc.ifc_len); ++ifr)

-   {

-     if (ifr->ifr_addr.sa_data == (ifr+1)->ifr_addr.sa_data) continue;  // duplicate, skip it

- 

-@@ -168,7 +168,7 @@
-     string ip = inet_ntoa(inaddrr(ifr_addr.sa_data));

- 

-     // ------ get HW_ADDRESS ------

--    if (ioctl(sockfd, SIOCGIFHWADDR, ifr) != 0) continue;  // failed to get mac, skip it

-+    if (ioctl(sockfd, SIOCGIFMAC, ifr) != 0) continue;  // failed to get mac, skip it

- 

- 	string mac=string((char*)ifr->ifr_addr.sa_data,MAC_ADDRESS_CHAR_LEN);

- 

diff --git a/devel/mq4cpp/files/patch-src_Thread.cpp b/devel/mq4cpp/files/patch-src_Thread.cpp
deleted file mode 100644
index 12d5a1bf266..00000000000
--- a/devel/mq4cpp/files/patch-src_Thread.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/Thread.cpp.orig	Sat Mar 17 10:20:15 2007
-+++ src/Thread.cpp	Sat Jun 23 09:54:56 2007
-@@ -78,7 +78,7 @@
- #ifdef WIN32

- 	return GetCurrentThreadId();

- #else

--	return pthread_self();

-+	return (unsigned long)pthread_self();

- #endif

- }

- 

-@@ -277,10 +277,10 @@
- 	if(SetThreadAffinityMask(m_hThread,mask)==0)

- 		throw ThreadException("Failed to set affinity");

- #else

-+#ifdef HAVE_PTHREAD_SETAFFINITY_NP 

- 	cpu_set_t cpuset;

- 	CPU_ZERO(&cpuset);

- 	CPU_SET(cpu, &cpuset);

--#ifdef HAVE_PTHREAD_SETAFFINITY_NP 

- #ifndef P2_PTHREAD_SETAFFINITY

- 	if(pthread_setaffinity_np(m_hThread, sizeof(cpuset), &cpuset)!=0)

- 		throw ThreadException("Failed to set affinity");