1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-20 20:09:11 +00:00

- Update to 2.3.9.7

- Trim Makefile header

PR:		ports/174808 (based on)
Submitted by:	Andrea Venturoli <ml@netfence.it> (maintainer)
This commit is contained in:
TAKATSU Tomonari 2012-12-30 13:21:06 +00:00
parent b16d554638
commit 09a043183d
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=309667
6 changed files with 79 additions and 11 deletions

View File

@ -1,12 +1,8 @@
# New ports collection makefile for: C++ Sockets
# Date created: Sat Jan 15 16:17:20 UTC 2005
# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
#
# Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
# $FreeBSD$
#
PORTNAME= Sockets
PORTVERSION= 2.3.9.2
PORTVERSION= 2.3.9.7
CATEGORIES= net
MASTER_SITES= http://www.alhem.net/Sockets/ \
http://www.netfence.it/Sockets/

View File

@ -1,2 +1,2 @@
SHA256 (Sockets-2.3.9.2.tar.gz) = 810ab9b6a7316bfa7994c0d5e9bd8c556e9edcb8da35a1778ea11bd16471fba8
SIZE (Sockets-2.3.9.2.tar.gz) = 191131
SHA256 (Sockets-2.3.9.7.tar.gz) = dc6411eb53933c0aba639b3ace98b34b674a97aad6b8613f02e5e0aa2af92b24
SIZE (Sockets-2.3.9.7.tar.gz) = 203023

View File

@ -0,0 +1,11 @@
--- HttpRequest.cpp.orig 2011-07-17 10:06:09.000000000 +0200
+++ HttpRequest.cpp 2012-12-29 14:17:14.000000000 +0100
@@ -44,6 +44,8 @@
namespace SOCKETS_NAMESPACE {
#endif
+extern char**environ;
+
#ifdef _DEBUG
#define DEB(x) x; fflush(stderr);
#else

View File

@ -21,8 +21,8 @@
install_shared: install shared
@mkdir -p $(DESTDIR)/$(PREFIX)/lib/pkgconfig
- cp $(SHAREDLIBNAME) $(DESTDIR)/$(PREFIX)/lib
- cp -a pkgconfig/*pc $(DESTDIR)/$(PREFIX)/lib/pkgconfig
- install -m 0644 $(SHAREDLIBNAME) $(DESTDIR)/$(PREFIX)/lib
- install -m 0644 pkgconfig/*pc $(DESTDIR)/$(PREFIX)/lib/pkgconfig
+ @${BSD_INSTALL_DATA} $(SHAREDLIBNAME) $(DESTDIR)/$(PREFIX)/lib
+ @${BSD_INSTALL_DATA} pkgconfig/*pc $(DESTDIR)/$(PREFIX)/libdata/pkgconfig
rm -f $(DESTDIR)/$(PREFIX)/lib/lib$(NAME).so

View File

@ -0,0 +1,58 @@
--- Sockets-config.cpp.orig 2012-12-29 14:24:51.000000000 +0100
+++ Sockets-config.cpp 2012-12-29 14:25:16.000000000 +0100
@@ -29,7 +29,7 @@
// ------------------------------------------------------------------
static bool any_set = false;
-static std::map<std::string, std::string> mmap;
+static std::map<std::string, std::string> sockets_mmap;
// ------------------------------------------------------------------
void show_info()
@@ -110,24 +110,24 @@
*/
void setup_configuration()
{
- mmap["openssl"] = "HAVE_OPENSSL";
- mmap["ipv6"] = "ENABLE_IPV6";
- mmap["sctp"] = "USE_SCTP";
- mmap["no_addrinfo"] = "NO_GETADDRINFO";
- mmap["pool"] = "ENABLE_POOL";
- mmap["socks4"] = "ENABLE_SOCKS4";
- mmap["resolver"] = "ENABLE_RESOLVER";
- mmap["reconnect"] = "ENABLE_RECONNECT";
- mmap["detach"] = "ENABLE_DETACH";
- mmap["exceptions"] = "ENABLE_EXCEPTIONS";
- mmap["xml2"] = "ENABLE_XML";
+ sockets_mmap["openssl"] = "HAVE_OPENSSL";
+ sockets_mmap["ipv6"] = "ENABLE_IPV6";
+ sockets_mmap["sctp"] = "USE_SCTP";
+ sockets_mmap["no_addrinfo"] = "NO_GETADDRINFO";
+ sockets_mmap["pool"] = "ENABLE_POOL";
+ sockets_mmap["socks4"] = "ENABLE_SOCKS4";
+ sockets_mmap["resolver"] = "ENABLE_RESOLVER";
+ sockets_mmap["reconnect"] = "ENABLE_RECONNECT";
+ sockets_mmap["detach"] = "ENABLE_DETACH";
+ sockets_mmap["exceptions"] = "ENABLE_EXCEPTIONS";
+ sockets_mmap["xml2"] = "ENABLE_XML";
}
// ------------------------------------------------------------------
void set(const char *param, bool enable)
{
- std::map<std::string, std::string>::iterator it = mmap.find(param);
- if (it == mmap.end())
+ std::map<std::string, std::string>::iterator it = sockets_mmap.find(param);
+ if (it == sockets_mmap.end())
{
fprintf(stderr, "Option '%s' not found, aborting\n", param);
exit(-1);
@@ -195,7 +195,7 @@
{
int i = (*slask == '#') ? 8 : 10;
std::string def(&slask[i]);
- for (std::map<std::string, std::string>::iterator it = mmap.begin(); it != mmap.end(); it++)
+ for (std::map<std::string, std::string>::iterator it = sockets_mmap.begin(); it != sockets_mmap.end(); it++)
{
if (def == it -> second)
{

View File

@ -28,11 +28,13 @@ include/Sockets/IEventOwner.h
include/Sockets/IFile.h
include/Sockets/IFileUpload.h
include/Sockets/IHttpServer.h
include/Sockets/IModel.h
include/Sockets/IMutex.h
include/Sockets/ISocketHandler.h
include/Sockets/IStream.h
include/Sockets/Ipv4Address.h
include/Sockets/Ipv6Address.h
include/Sockets/Json.h
include/Sockets/ListenSocket.h
include/Sockets/Lock.h
include/Sockets/MemFile.h
@ -48,6 +50,7 @@ include/Sockets/Socket.h
include/Sockets/SocketAddress.h
include/Sockets/SocketHandler.h
include/Sockets/SocketHandlerEp.h
include/Sockets/SocketHandlerThread.h
include/Sockets/SocketStream.h
include/Sockets/StdLog.h
include/Sockets/StdoutLog.h
@ -68,6 +71,6 @@ libdata/pkgconfig/libsockets2.pc
lib/libSockets.a
lib/libSockets.so
lib/libSockets.so.2
lib/libSockets.so.2.3.9.2
lib/libSockets.so.2.3.9.7
@dirrm include/Sockets
@dirrmtry lib/pkgconfig