From 6c6a7ed115be2ecb6a135a9721578277f1c591a3 Mon Sep 17 00:00:00 2001
From: "Vanilla I. Shu" <vanilla@FreeBSD.org>
Date: Sun, 12 Aug 2007 01:06:32 +0000
Subject: [PATCH] Upgrade to 0.7.

---
 net/spserver/Makefile                    |  2 +-
 net/spserver/distinfo                    |  6 +++---
 net/spserver/files/patch-speventcb.cpp   | 25 ++++++++----------------
 net/spserver/files/patch-spiochannel.cpp | 11 +++++++++++
 net/spserver/files/patch-spioutils.cpp   | 10 ++++++++++
 net/spserver/pkg-plist                   |  2 ++
 6 files changed, 35 insertions(+), 21 deletions(-)
 create mode 100644 net/spserver/files/patch-spiochannel.cpp
 create mode 100644 net/spserver/files/patch-spioutils.cpp

diff --git a/net/spserver/Makefile b/net/spserver/Makefile
index 70ab507270f8..79a956705fab 100644
--- a/net/spserver/Makefile
+++ b/net/spserver/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	spserver
-PORTVERSION=	0.6
+PORTVERSION=	0.7
 CATEGORIES=	net
 MASTER_SITES=	http://spserver.googlecode.com/files/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
diff --git a/net/spserver/distinfo b/net/spserver/distinfo
index cf273677c989..b0c29c0fa023 100644
--- a/net/spserver/distinfo
+++ b/net/spserver/distinfo
@@ -1,3 +1,3 @@
-MD5 (spserver-0.6.src.tar.gz) = 3e48c85a01be17f7b6a0ffc5ac2306eb
-SHA256 (spserver-0.6.src.tar.gz) = 533bd04f351368b25df9d58419946a7d3fd341408dd66517fb6ac8635f428a0c
-SIZE (spserver-0.6.src.tar.gz) = 40380
+MD5 (spserver-0.7.src.tar.gz) = c857d63995c2f38fe2fed4848b554079
+SHA256 (spserver-0.7.src.tar.gz) = 44aa23a7a06d6c3e36c4e7062c9cf6887d9d03474df57a18b11088fafb1497b2
+SIZE (spserver-0.7.src.tar.gz) = 50477
diff --git a/net/spserver/files/patch-speventcb.cpp b/net/spserver/files/patch-speventcb.cpp
index 9bfeb039039d..25f984526958 100644
--- a/net/spserver/files/patch-speventcb.cpp
+++ b/net/spserver/files/patch-speventcb.cpp
@@ -1,24 +1,15 @@
---- speventcb.cpp.orig	Sun Jul  1 13:21:42 2007
-+++ speventcb.cpp	Mon Jul  2 21:20:16 2007
-@@ -15,6 +15,8 @@
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <netinet/tcp.h>
-+#include <sys/uio.h>
-+#include <unistd.h>
+--- speventcb.cpp.orig	Sat Aug 11 12:23:46 2007
++++ speventcb.cpp	Sat Aug 11 20:49:04 2007
+@@ -26,7 +26,7 @@
+ #include "spiochannel.hpp"
+ #include "spioutils.hpp"
  
- #include "speventcb.hpp"
- #include "spsession.hpp"
-@@ -27,7 +29,7 @@
- #include "sprequest.hpp"
- #include "spmsgblock.hpp"
- 
--#include "config.h"
-+//#include "config.h"
+-#include "config.h"   // from libevent, for event.h
++//#include "config.h"   // from libevent, for event.h
  #include "event_msgqueue.h"
  #include "event.h"
  
-@@ -476,7 +478,7 @@
+@@ -396,7 +396,7 @@
  		char buffer[ 16 ] = { 0 };
  		session->getInBuffer()->take( buffer, sizeof( buffer ) );
  		syslog( LOG_WARNING, "session(%d.%d) status is %d, ignore [%s...] (%dB)",
diff --git a/net/spserver/files/patch-spiochannel.cpp b/net/spserver/files/patch-spiochannel.cpp
new file mode 100644
index 000000000000..b4ca9f09ec6d
--- /dev/null
+++ b/net/spserver/files/patch-spiochannel.cpp
@@ -0,0 +1,11 @@
+--- spiochannel.cpp.orig	Sat Aug 11 20:50:32 2007
++++ spiochannel.cpp	Sat Aug 11 20:50:38 2007
+@@ -16,7 +16,7 @@
+ #include "spbuffer.hpp"
+ #include "spmsgblock.hpp"
+ 
+-#include "config.h"
++//#include "config.h"
+ #include "event.h"
+ 
+ //---------------------------------------------------------
diff --git a/net/spserver/files/patch-spioutils.cpp b/net/spserver/files/patch-spioutils.cpp
new file mode 100644
index 000000000000..ab897c6d66f5
--- /dev/null
+++ b/net/spserver/files/patch-spioutils.cpp
@@ -0,0 +1,10 @@
+--- spioutils.cpp.orig	Sat Aug 11 20:49:44 2007
++++ spioutils.cpp	Sat Aug 11 20:50:00 2007
+@@ -3,6 +3,7 @@
+  * For license terms, see the file COPYING along with this library.
+  */
+ 
++#include <sys/types.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <netinet/tcp.h>
diff --git a/net/spserver/pkg-plist b/net/spserver/pkg-plist
index 60b2e6997371..7bdc35134222 100644
--- a/net/spserver/pkg-plist
+++ b/net/spserver/pkg-plist
@@ -5,6 +5,8 @@ include/spserver/spexecutor.hpp
 include/spserver/sphandler.hpp
 include/spserver/sphttp.hpp
 include/spserver/sphttpmsg.hpp
+include/spserver/spiochannel.hpp
+include/spserver/spioutils.hpp
 include/spserver/splfserver.hpp
 include/spserver/spmsgblock.hpp
 include/spserver/spmsgdecoder.hpp