20 files changed, 123 insertions, 62 deletions

diff --git a/net/spserver/Makefile b/net/spserver/Makefile
index 79a956705fab..f31ff2db82b1 100644
--- a/net/spserver/Makefile
+++ b/net/spserver/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	spserver
-PORTVERSION=	0.7
+PORTVERSION=	0.8
 CATEGORIES=	net
 MASTER_SITES=	http://spserver.googlecode.com/files/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
@@ -19,14 +19,19 @@ LIB_DEPENDS=	event-1.3b.1:${PORTSDIR}/devel/libevent
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
+ALL_TARGET=	all ssl
 
 post-patch:
-	${SED} -i -E 's,%PREFIX%,${PREFIX},g' ${WRKSRC}/Makefile
+	${SED} -i -E 's,%PREFIX%,${PREFIX},g' ${WRKSRC}/spserver/Makefile
+	${SED} -i -E 's,%PREFIX%,${PREFIX},g' ${WRKSRC}/openssl/Makefile
 
 do-install:
 	@${MKDIR} ${PREFIX}/include/spserver
-	@${INSTALL} ${WRKSRC}/*.hpp ${PREFIX}/include/spserver
-	@${INSTALL} ${WRKSRC}/libspserver.so ${PREFIX}/lib/libspserver.so.1
+	@${INSTALL} ${WRKSRC}/spserver/*.hpp ${PREFIX}/include/spserver
+	@${INSTALL} ${WRKSRC}/spserver/libspserver.so ${PREFIX}/lib/libspserver.so.1
 	@${LN} -s ${PREFIX}/lib/libspserver.so.1 ${PREFIX}/lib/libspserver.so
+	@${INSTALL} ${WRKSRC}/openssl/spopenssl.hpp ${PREFIX}/include/spserver
+	@${INSTALL} ${WRKSRC}/openssl/libspopenssl.so ${PREFIX}/lib/libspopenssl.so.1
+	@${LN} -s ${PREFIX}/lib/libspopenssl.so.1 ${PREFIX}/lib/libspopenssl.so
 
 .include <bsd.port.mk>
diff --git a/net/spserver/distinfo b/net/spserver/distinfo
index b0c29c0fa023..f27235988f10 100644
--- a/net/spserver/distinfo
+++ b/net/spserver/distinfo
@@ -1,3 +1,3 @@
-MD5 (spserver-0.7.src.tar.gz) = c857d63995c2f38fe2fed4848b554079
-SHA256 (spserver-0.7.src.tar.gz) = 44aa23a7a06d6c3e36c4e7062c9cf6887d9d03474df57a18b11088fafb1497b2
-SIZE (spserver-0.7.src.tar.gz) = 50477
+MD5 (spserver-0.8.src.tar.gz) = 106988789218ebb47dd7945cf953d749
+SHA256 (spserver-0.8.src.tar.gz) = 2ea26845b2cf150d9760a027fe663969eb6c7fb94d64a6d6fa77853e265ab040
+SIZE (spserver-0.8.src.tar.gz) = 66043
diff --git a/net/spserver/files/patch-Makefile b/net/spserver/files/patch-Makefile
index 033e4358d717..3b6c36303c3d 100644
--- a/net/spserver/files/patch-Makefile
+++ b/net/spserver/files/patch-Makefile
@@ -1,17 +1,24 @@
---- Makefile.orig	Mon Jun 18 12:27:34 2007
-+++ Makefile	Mon Jun 18 12:28:01 2007
-@@ -15,11 +15,11 @@
- 	version = 0.4
- endif
+--- Makefile.orig	Fri Aug 24 15:38:46 2007
++++ Makefile	Fri Aug 24 15:39:05 2007
+@@ -8,10 +8,10 @@
+ #--------------------------------------------------------------------
  
--LIBEVENT_INCL = -I../libevent/
--LIBEVENT_LIB  = -L../libevent -levent
-+LIBEVENT_INCL = -I%PREFIX%/include
-+LIBEVENT_LIB  = -L%PREFIX%/lib -levent
+ all:
+-	@( cd spserver; make )
++	@( cd spserver; gmake )
  
- CFLAGS  += $(LIBEVENT_INCL)
--LDFLAGS += $(LIBEVENT_LIB) -lpthread -lresolv
-+LDFLAGS += $(LIBEVENT_LIB) -lpthread
+ ssl:
+-	@( cd openssl;  make )
++	@( cd openssl;  gmake )
  
- #--------------------------------------------------------------------
+ dist: clean spserver-$(version).src.tar.gz
+ 
+@@ -22,7 +22,7 @@
+ 	@(cd ..; rm spserver-$(version))
  
+ clean:
+-	@( cd spserver; make clean )
++	@( cd spserver; gmake clean )
+ 	@( cd openssl;  make clean )
+ 	@( cd matrixssl;  make clean )
+ 	@( cd sptunnel;  make clean )
diff --git a/net/spserver/files/patch-event_msgqueue.c b/net/spserver/files/patch-event_msgqueue.c
index a3e654738b01..713015e5e03f 100644
--- a/net/spserver/files/patch-event_msgqueue.c
+++ b/net/spserver/files/patch-event_msgqueue.c
@@ -1,5 +1,5 @@
---- event_msgqueue.c.orig	Mon Jun 18 12:30:00 2007
-+++ event_msgqueue.c	Mon Jun 18 12:30:06 2007
+--- spserver/event_msgqueue.c.orig	Wed Aug 22 22:04:05 2007
++++ spserver/event_msgqueue.c	Thu Aug 23 07:33:03 2007
 @@ -15,7 +15,7 @@
  #include <sys/types.h>
  #include <sys/socket.h>
diff --git a/net/spserver/files/patch-openssl_Makefile b/net/spserver/files/patch-openssl_Makefile
new file mode 100644
index 000000000000..318052698b9b
--- /dev/null
+++ b/net/spserver/files/patch-openssl_Makefile
@@ -0,0 +1,20 @@
+--- openssl/Makefile.orig	Wed Aug 22 22:03:27 2007
++++ openssl/Makefile	Fri Aug 24 15:46:20 2007
+@@ -5,7 +5,7 @@
+ AR = ar cru
+ CFLAGS = -Wall -D_REENTRANT -D_GNU_SOURCE -g -fPIC
+ SOFLAGS = -shared
+-LDFLAGS = -lstdc++ -lpthread -lresolv
++LDFLAGS = -lstdc++ -lpthread
+ 
+ LINKER = $(CC)
+ LINT = lint -c
+@@ -14,7 +14,7 @@
+ OPENSSL_INCL = -I/usr/include/openssl/
+ OPENSSL_LIB  = -L/usr/lib -lssl -lcrypto
+ 
+-LIBEVENT_LIB  = -L$(HOME)/libevent -levent
++LIBEVENT_LIB  = -L%PREFIX%/lib -levent
+ 
+ SPSERVER_INCL = -I../spserver
+ SPSERVER_LIB  = -L../spserver -lspserver
diff --git a/net/spserver/files/patch-spbuffer.cpp b/net/spserver/files/patch-spbuffer.cpp
index 4fe7815cdb93..8bf17cb569c4 100644
--- a/net/spserver/files/patch-spbuffer.cpp
+++ b/net/spserver/files/patch-spbuffer.cpp
@@ -1,5 +1,5 @@
---- spbuffer.cpp.orig	Mon Jun 18 12:39:28 2007
-+++ spbuffer.cpp	Mon Jun 18 12:39:34 2007
+--- spserver/spbuffer.cpp.orig	Wed Aug 22 22:04:05 2007
++++ spserver/spbuffer.cpp	Thu Aug 23 07:33:08 2007
 @@ -12,7 +12,7 @@
  
  #include "spbuffer.hpp"
diff --git a/net/spserver/files/patch-spdispatcher.cpp b/net/spserver/files/patch-spdispatcher.cpp
index d4c9ed7e9b55..8eb416c3dd0f 100644
--- a/net/spserver/files/patch-spdispatcher.cpp
+++ b/net/spserver/files/patch-spdispatcher.cpp
@@ -1,15 +1,15 @@
---- spdispatcher.cpp.orig	Sat Jun 23 20:21:18 2007
-+++ spdispatcher.cpp	Sat Jun 23 20:21:40 2007
-@@ -20,7 +20,7 @@
- #include "spsession.hpp"
- #include "spexecutor.hpp"
+--- spserver/spdispatcher.cpp.orig	Wed Aug 22 22:04:05 2007
++++ spserver/spdispatcher.cpp	Thu Aug 23 07:33:12 2007
+@@ -23,7 +23,7 @@
+ #include "spiochannel.hpp"
+ #include "spioutils.hpp"
  
 -#include "config.h"
 +//#include "config.h"
  #include "event_msgqueue.h"
  
  SP_Dispatcher :: SP_Dispatcher( SP_CompletionHandler * completionHandler, int maxThreads )
-@@ -110,7 +110,7 @@
+@@ -95,7 +95,7 @@
  	ret = pthread_create( &thread, &attr, reinterpret_cast<void*(*)(void*)>(eventLoop), this );
  	pthread_attr_destroy( &attr );
  	if( 0 == ret ) {
diff --git a/net/spserver/files/patch-speventcb.cpp b/net/spserver/files/patch-speventcb.cpp
index 25f984526958..e7d6612806b3 100644
--- a/net/spserver/files/patch-speventcb.cpp
+++ b/net/spserver/files/patch-speventcb.cpp
@@ -1,5 +1,5 @@
---- speventcb.cpp.orig	Sat Aug 11 12:23:46 2007
-+++ speventcb.cpp	Sat Aug 11 20:49:04 2007
+--- spserver/speventcb.cpp.orig	Wed Aug 22 22:04:05 2007
++++ spserver/speventcb.cpp	Thu Aug 23 07:33:14 2007
 @@ -26,7 +26,7 @@
  #include "spiochannel.hpp"
  #include "spioutils.hpp"
diff --git a/net/spserver/files/patch-spexecutor.cpp b/net/spserver/files/patch-spexecutor.cpp
index 660ffac95c58..cf993c1a1479 100644
--- a/net/spserver/files/patch-spexecutor.cpp
+++ b/net/spserver/files/patch-spexecutor.cpp
@@ -1,5 +1,5 @@
---- spexecutor.cpp.orig	Mon Jun 11 15:20:34 2007
-+++ spexecutor.cpp	Mon Jun 18 12:44:56 2007
+--- spserver/spexecutor.cpp.orig	Wed Aug 22 22:04:05 2007
++++ spserver/spexecutor.cpp	Thu Aug 23 07:33:20 2007
 @@ -14,7 +14,7 @@
  #include "spexecutor.hpp"
  #include "spthreadpool.hpp"
@@ -9,7 +9,7 @@
  #include "event_msgqueue.h"
  
  SP_Task :: ~SP_Task()
-@@ -83,7 +83,7 @@
+@@ -67,7 +67,7 @@
  	int ret = pthread_create( &thread, &attr, reinterpret_cast<void*(*)(void*)>(eventLoop), this );
  	pthread_attr_destroy( &attr );
  	if( 0 == ret ) {
diff --git a/net/spserver/files/patch-spiochannel.cpp b/net/spserver/files/patch-spiochannel.cpp
index b4ca9f09ec6d..31cf68e77ca6 100644
--- a/net/spserver/files/patch-spiochannel.cpp
+++ b/net/spserver/files/patch-spiochannel.cpp
@@ -1,5 +1,5 @@
---- spiochannel.cpp.orig	Sat Aug 11 20:50:32 2007
-+++ spiochannel.cpp	Sat Aug 11 20:50:38 2007
+--- spserver/spiochannel.cpp.orig	Wed Aug 22 22:04:05 2007
++++ spserver/spiochannel.cpp	Thu Aug 23 07:33:24 2007
 @@ -16,7 +16,7 @@
  #include "spbuffer.hpp"
  #include "spmsgblock.hpp"
diff --git a/net/spserver/files/patch-spioutils.cpp b/net/spserver/files/patch-spioutils.cpp
index ab897c6d66f5..b57fba3e6858 100644
--- a/net/spserver/files/patch-spioutils.cpp
+++ b/net/spserver/files/patch-spioutils.cpp
@@ -1,5 +1,5 @@
---- spioutils.cpp.orig	Sat Aug 11 20:49:44 2007
-+++ spioutils.cpp	Sat Aug 11 20:50:00 2007
+--- spserver/spioutils.cpp.orig	Wed Aug 22 22:04:05 2007
++++ spserver/spioutils.cpp	Thu Aug 23 07:33:27 2007
 @@ -3,6 +3,7 @@
   * For license terms, see the file COPYING along with this library.
   */
diff --git a/net/spserver/files/patch-splfserver.cpp b/net/spserver/files/patch-splfserver.cpp
index adf1809ad430..ab21c910b897 100644
--- a/net/spserver/files/patch-splfserver.cpp
+++ b/net/spserver/files/patch-splfserver.cpp
@@ -1,8 +1,8 @@
---- splfserver.cpp.orig	Mon Jul  2 21:20:29 2007
-+++ splfserver.cpp	Mon Jul  2 21:20:36 2007
-@@ -17,7 +17,7 @@
- #include "spexecutor.hpp"
+--- spserver/splfserver.cpp.orig	Wed Aug 22 22:04:05 2007
++++ spserver/splfserver.cpp	Thu Aug 23 07:33:35 2007
+@@ -18,7 +18,7 @@
  #include "sputils.hpp"
+ #include "spioutils.hpp"
  
 -#include "config.h"
 +//#include "config.h"
diff --git a/net/spserver/files/patch-spserver.cpp b/net/spserver/files/patch-spserver.cpp
index 6bf4e45eaf6b..51549fcab59d 100644
--- a/net/spserver/files/patch-spserver.cpp
+++ b/net/spserver/files/patch-spserver.cpp
@@ -1,15 +1,15 @@
---- spserver.cpp.orig	Mon Jun 18 12:42:58 2007
-+++ spserver.cpp	Mon Jun 18 12:43:52 2007
-@@ -19,7 +19,7 @@
- #include "spsession.hpp"
- #include "spexecutor.hpp"
+--- spserver/spserver.cpp.orig	Wed Aug 22 22:04:05 2007
++++ spserver/spserver.cpp	Thu Aug 23 07:33:42 2007
+@@ -22,7 +22,7 @@
+ #include "spiochannel.hpp"
+ #include "spioutils.hpp"
  
 -#include "config.h"
 +//#include "config.h"
  #include "event_msgqueue.h"
  
  SP_Server :: SP_Server( const char * bindIP, int port,
-@@ -94,7 +94,7 @@
+@@ -106,7 +106,7 @@
  	ret = pthread_create( &thread, &attr, reinterpret_cast<void*(*)(void*)>(eventLoop), this );
  	pthread_attr_destroy( &attr );
  	if( 0 == ret ) {
diff --git a/net/spserver/files/patch-spserver_Makefile b/net/spserver/files/patch-spserver_Makefile
new file mode 100644
index 000000000000..0e43df3ae86f
--- /dev/null
+++ b/net/spserver/files/patch-spserver_Makefile
@@ -0,0 +1,26 @@
+--- spserver/Makefile.orig	Wed Aug 22 22:04:05 2007
++++ spserver/Makefile	Fri Aug 24 15:37:38 2007
+@@ -3,19 +3,15 @@
+ 
+ CC = gcc
+ AR = ar cru
+-CFLAGS = -Wall -D_REENTRANT -D_GNU_SOURCE -g -fPIC
++LIBEVENT_INCL = -I%PREFIX%/include
++LIBEVENT_LIB  = -L%PREFIX%/lib -levent
++CFLAGS = -Wall -D_REENTRANT -D_GNU_SOURCE -g -fPIC $(LIBEVENT_INCL)
+ SOFLAGS = -shared
+-LDFLAGS = -lstdc++ -lpthread -lresolv
++LDFLAGS = -lstdc++ -lpthread $(LIBEVENT_LIB)
+ 
+ LINKER = $(CC)
+ LINT = lint -c
+ RM = /bin/rm -f
+-
+-LIBEVENT_INCL = -I$(HOME)/libevent/
+-LIBEVENT_LIB  = -L$(HOME)/libevent -levent
+-
+-CFLAGS  += $(LIBEVENT_INCL)
+-LDFLAGS += $(LIBEVENT_LIB)
+ 
+ #--------------------------------------------------------------------
+ 
diff --git a/net/spserver/files/patch-spsession.cpp b/net/spserver/files/patch-spsession.cpp
index 72519fdb61fa..c626e21d7947 100644
--- a/net/spserver/files/patch-spsession.cpp
+++ b/net/spserver/files/patch-spsession.cpp
@@ -1,8 +1,8 @@
---- spsession.cpp.orig	Mon Jun 18 12:40:32 2007
-+++ spsession.cpp	Mon Jun 18 12:40:40 2007
-@@ -15,7 +15,7 @@
- #include "sputils.hpp"
+--- spserver/spsession.cpp.orig	Wed Aug 22 22:04:05 2007
++++ spserver/spsession.cpp	Thu Aug 23 07:33:45 2007
+@@ -16,7 +16,7 @@
  #include "sprequest.hpp"
+ #include "spiochannel.hpp"
  
 -#include "config.h"
 +//#include "config.h"
diff --git a/net/spserver/files/patch-spthreadpool.cpp b/net/spserver/files/patch-spthreadpool.cpp
index c493a6441e8e..11bb30795cf0 100644
--- a/net/spserver/files/patch-spthreadpool.cpp
+++ b/net/spserver/files/patch-spthreadpool.cpp
@@ -1,6 +1,6 @@
---- spthreadpool.cpp.orig	Mon Jun 18 12:38:42 2007
-+++ spthreadpool.cpp	Mon Jun 18 12:39:00 2007
-@@ -119,7 +119,7 @@
+--- spserver/spthreadpool.cpp.orig	Wed Aug 22 22:04:05 2007
++++ spserver/spthreadpool.cpp	Thu Aug 23 07:33:50 2007
+@@ -120,7 +120,7 @@
  
  		if( 0 == pthread_create( &( thread->mId ), &attr, wrapperFunc, thread ) ) {
  			mTotal++;
diff --git a/net/spserver/files/patch-testhttpmsg.cpp b/net/spserver/files/patch-testhttpmsg.cpp
index 462e2a39a3b6..789046ec81c1 100644
--- a/net/spserver/files/patch-testhttpmsg.cpp
+++ b/net/spserver/files/patch-testhttpmsg.cpp
@@ -1,5 +1,5 @@
---- testhttpmsg.cpp.orig	Mon Jun 18 12:46:36 2007
-+++ testhttpmsg.cpp	Mon Jun 18 12:47:00 2007
+--- spserver/testhttpmsg.cpp.orig	Wed Aug 22 22:04:05 2007
++++ spserver/testhttpmsg.cpp	Thu Aug 23 07:33:58 2007
 @@ -76,7 +76,7 @@
  		//printf( "%d, %d\n", i, parsedLen );
  	}
diff --git a/net/spserver/files/patch-teststress.cpp b/net/spserver/files/patch-teststress.cpp
index ec0c8bf3e62e..a19345759570 100644
--- a/net/spserver/files/patch-teststress.cpp
+++ b/net/spserver/files/patch-teststress.cpp
@@ -1,5 +1,5 @@
---- teststress.cpp.orig	Mon Jun 18 12:45:59 2007
-+++ teststress.cpp	Mon Jun 18 12:46:06 2007
+--- spserver/teststress.cpp.orig	Wed Aug 22 22:04:05 2007
++++ spserver/teststress.cpp	Thu Aug 23 07:34:03 2007
 @@ -18,7 +18,7 @@
  /* For inet_ntoa. */
  #include <arpa/inet.h>
diff --git a/net/spserver/files/patch-testthreadpool.cpp b/net/spserver/files/patch-testthreadpool.cpp
index e00ab174ad2f..dad5b512f1f5 100644
--- a/net/spserver/files/patch-testthreadpool.cpp
+++ b/net/spserver/files/patch-testthreadpool.cpp
@@ -1,5 +1,5 @@
---- testthreadpool.cpp.orig	2007-08-09 17:14:03.000000000 +0800
-+++ testthreadpool.cpp	2007-08-09 17:15:20.000000000 +0800
+--- spserver/testthreadpool.cpp.orig	Wed Aug 22 22:04:05 2007
++++ spserver/testthreadpool.cpp	Thu Aug 23 07:34:14 2007
 @@ -16,10 +16,10 @@
  
  void threadFunc( void *arg )
diff --git a/net/spserver/pkg-plist b/net/spserver/pkg-plist
index 7bdc35134222..44cda0196f8d 100644
--- a/net/spserver/pkg-plist
+++ b/net/spserver/pkg-plist
@@ -10,12 +10,15 @@ include/spserver/spioutils.hpp
 include/spserver/splfserver.hpp
 include/spserver/spmsgblock.hpp
 include/spserver/spmsgdecoder.hpp
+include/spserver/spopenssl.hpp
 include/spserver/sprequest.hpp
 include/spserver/spresponse.hpp
 include/spserver/spserver.hpp
 include/spserver/spsession.hpp
 include/spserver/spthreadpool.hpp
 include/spserver/sputils.hpp
+lib/libspopenssl.so
+lib/libspopenssl.so.1
 lib/libspserver.so
 lib/libspserver.so.1
 @dirrm include/spserver