Pull in the latest CVS snapshot to allow meanwhile-gaim to build with

Gaim 0.79.  This also allows meanwhile to read server buddy lists, but it
is known to be broken with certain versions of Sametime.

8 files changed, 20 insertions, 38 deletions

diff --git a/net-im/meanwhile/Makefile b/net-im/meanwhile/Makefile
index d00da0b..29f91b3 100644
--- a/net-im/meanwhile/Makefile
+++ b/net-im/meanwhile/Makefile
@@ -7,10 +7,16 @@
 
 PORTNAME=	meanwhile
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
+PATCH_SITES=	${MASTER_SITE_LOCAL} \
+		http://people.FreeBSD.org/~marcus/
+PATCH_SITE_SUBDIR=marcus
+PATCHFILES=	patch-net_meanwhile-cvs
+
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	Open Source implementation of the Lotus Sametime protocol
 
diff --git a/net-im/meanwhile/distinfo b/net-im/meanwhile/distinfo
index 3023b89..938aafe 100644
--- a/net-im/meanwhile/distinfo
+++ b/net-im/meanwhile/distinfo
@@ -1,2 +1,4 @@
 MD5 (meanwhile-0.2.tar.gz) = 36105dc1101060679dccd8d87c0df442
 SIZE (meanwhile-0.2.tar.gz) = 329678
+MD5 (patch-net_meanwhile-cvs) = 1314bdecb88a3bda49a5acd8dc47c1d8
+SIZE (patch-net_meanwhile-cvs) = 165534
diff --git a/net-im/meanwhile/files/patch-src_srvc_im.c b/net-im/meanwhile/files/patch-src_srvc_im.c
deleted file mode 100644
index 47d7026..0000000
--- a/net-im/meanwhile/files/patch-src_srvc_im.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/srvc_im.c.orig	Thu Jun 24 20:53:09 2004
-+++ src/srvc_im.c	Thu Jun 24 20:53:33 2004
-@@ -160,12 +160,14 @@
-   struct mwSession *s;
-   struct mwChannelSet *cs;
-   unsigned int a, b;
-+  char *buf;
-+  gsize n;
-   
-   s = chan->session;
-   cs = s->channels;
- 
--  char *buf = msg->addtl.data;
--  gsize n = msg->addtl.len;
-+  buf = msg->addtl.data;
-+  n = msg->addtl.len;
- 
-   if( (msg->service != Service_IM) ||
-       (msg->proto_type != Protocol_IM) ||
diff --git a/net-im/meanwhile/pkg-plist b/net-im/meanwhile/pkg-plist
index e4c3cb9..16f371d 100644
--- a/net-im/meanwhile/pkg-plist
+++ b/net-im/meanwhile/pkg-plist
@@ -9,6 +9,8 @@ include/meanwhile/session.h
 include/meanwhile/srvc_aware.h
 include/meanwhile/srvc_conf.h
 include/meanwhile/srvc_im.h
+include/meanwhile/srvc_store.h
+include/meanwhile/st_list.h
 lib/libmeanwhile.a
 lib/libmeanwhile.so
 lib/libmeanwhile.so.0
diff --git a/net/meanwhile/Makefile b/net/meanwhile/Makefile
index d00da0b..29f91b3 100644
--- a/net/meanwhile/Makefile
+++ b/net/meanwhile/Makefile
@@ -7,10 +7,16 @@
 
 PORTNAME=	meanwhile
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
+PATCH_SITES=	${MASTER_SITE_LOCAL} \
+		http://people.FreeBSD.org/~marcus/
+PATCH_SITE_SUBDIR=marcus
+PATCHFILES=	patch-net_meanwhile-cvs
+
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	Open Source implementation of the Lotus Sametime protocol
 
diff --git a/net/meanwhile/distinfo b/net/meanwhile/distinfo
index 3023b89..938aafe 100644
--- a/net/meanwhile/distinfo
+++ b/net/meanwhile/distinfo
@@ -1,2 +1,4 @@
 MD5 (meanwhile-0.2.tar.gz) = 36105dc1101060679dccd8d87c0df442
 SIZE (meanwhile-0.2.tar.gz) = 329678
+MD5 (patch-net_meanwhile-cvs) = 1314bdecb88a3bda49a5acd8dc47c1d8
+SIZE (patch-net_meanwhile-cvs) = 165534
diff --git a/net/meanwhile/files/patch-src_srvc_im.c b/net/meanwhile/files/patch-src_srvc_im.c
deleted file mode 100644
index 47d7026..0000000
--- a/net/meanwhile/files/patch-src_srvc_im.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/srvc_im.c.orig	Thu Jun 24 20:53:09 2004
-+++ src/srvc_im.c	Thu Jun 24 20:53:33 2004
-@@ -160,12 +160,14 @@
-   struct mwSession *s;
-   struct mwChannelSet *cs;
-   unsigned int a, b;
-+  char *buf;
-+  gsize n;
-   
-   s = chan->session;
-   cs = s->channels;
- 
--  char *buf = msg->addtl.data;
--  gsize n = msg->addtl.len;
-+  buf = msg->addtl.data;
-+  n = msg->addtl.len;
- 
-   if( (msg->service != Service_IM) ||
-       (msg->proto_type != Protocol_IM) ||
diff --git a/net/meanwhile/pkg-plist b/net/meanwhile/pkg-plist
index e4c3cb9..16f371d 100644
--- a/net/meanwhile/pkg-plist
+++ b/net/meanwhile/pkg-plist
@@ -9,6 +9,8 @@ include/meanwhile/session.h
 include/meanwhile/srvc_aware.h
 include/meanwhile/srvc_conf.h
 include/meanwhile/srvc_im.h
+include/meanwhile/srvc_store.h
+include/meanwhile/st_list.h
 lib/libmeanwhile.a
 lib/libmeanwhile.so
 lib/libmeanwhile.so.0