* Update to 1.2.2

* Add tunable options to set the default Sametime server, port, and
  client identifier

6 files changed, 48 insertions, 46 deletions

diff --git a/net-im/meanwhile-gaim/Makefile b/net-im/meanwhile-gaim/Makefile
index 532f3944876f..5d433898bcaf 100644
--- a/net-im/meanwhile-gaim/Makefile
+++ b/net-im/meanwhile-gaim/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	meanwhile
-PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTVERSION=	1.2.2
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -28,4 +27,25 @@ USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+.if defined(WITH_MW_HOST)
+CONFIGURE_ARGS+=	--with-host=${WITH_MW_HOST}
+.endif
+
+.if defined(WITH_MW_PORT)
+CONFIGURE_ARGS+=	--with-port=${WITH_MW_PORT}
+.endif
+
+.if defined(WITH_MW_CLIENT)
+CONFIGURE_ARGS+=	--with-client=${WITH_MW_CLIENT}
+.endif
+
+pre-everything::
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "You may use the following build options:"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "	WITH_MW_HOST=host	Define the default Sametime community host server"
+	@${ECHO_MSG} "	WITH_MW_PORT=port	Define the default Sametime community port (default: 1533)"
+	@${ECHO_MSG} "	WITH_MW_CLIENT=client	Define the default SAmetime client identifier (default: mwLogin_MEANWHILE)"
+	@${ECHO_MSG} ""
+
 .include <bsd.port.mk>
diff --git a/net-im/meanwhile-gaim/distinfo b/net-im/meanwhile-gaim/distinfo
index 20a58e31074f..41968519e6da 100644
--- a/net-im/meanwhile-gaim/distinfo
+++ b/net-im/meanwhile-gaim/distinfo
@@ -1,2 +1,2 @@
-MD5 (gaim-meanwhile-1.2.0.tar.gz) = 55e416854293165708299d8f8fa73211
-SIZE (gaim-meanwhile-1.2.0.tar.gz) = 333946
+MD5 (gaim-meanwhile-1.2.2.tar.gz) = 106870047451b9fcaeac404b74ac1aa5
+SIZE (gaim-meanwhile-1.2.2.tar.gz) = 341952
diff --git a/net-im/meanwhile-gaim/files/patch-src_mwgaim.c b/net-im/meanwhile-gaim/files/patch-src_mwgaim.c
deleted file mode 100644
index 59de63728382..000000000000
--- a/net-im/meanwhile-gaim/files/patch-src_mwgaim.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/mwgaim.c.orig	Thu Mar 24 12:49:15 2005
-+++ src/mwgaim.c	Thu Mar 24 12:49:50 2005
-@@ -1651,6 +1651,7 @@ static void im_recv_mime(struct mwConver
- 	GString *atstr;
- 	gsize len = (end - start);
- 	char *tt;
-+	gsize mov;
- 
- 	atstr = g_string_new("");
- 	if(alt) g_string_append_printf(atstr, " alt=\"%s\"", alt);
-@@ -1661,7 +1662,7 @@ static void im_recv_mime(struct mwConver
- 	DEBUG_INFO("rewriting IMG\n{%s}\n", tt);
- 	g_free(tt);
- 
--	gsize mov = g_snprintf(start, len, "<img%s id=\"%i\"",
-+	mov = g_snprintf(start, len, "<img%s id=\"%i\"",
- 			       atstr->str, img);
- 	while(mov < len) start[mov++] = ' ';
- 
diff --git a/net/meanwhile-gaim/Makefile b/net/meanwhile-gaim/Makefile
index 532f3944876f..5d433898bcaf 100644
--- a/net/meanwhile-gaim/Makefile
+++ b/net/meanwhile-gaim/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	meanwhile
-PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTVERSION=	1.2.2
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -28,4 +27,25 @@ USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+.if defined(WITH_MW_HOST)
+CONFIGURE_ARGS+=	--with-host=${WITH_MW_HOST}
+.endif
+
+.if defined(WITH_MW_PORT)
+CONFIGURE_ARGS+=	--with-port=${WITH_MW_PORT}
+.endif
+
+.if defined(WITH_MW_CLIENT)
+CONFIGURE_ARGS+=	--with-client=${WITH_MW_CLIENT}
+.endif
+
+pre-everything::
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "You may use the following build options:"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "	WITH_MW_HOST=host	Define the default Sametime community host server"
+	@${ECHO_MSG} "	WITH_MW_PORT=port	Define the default Sametime community port (default: 1533)"
+	@${ECHO_MSG} "	WITH_MW_CLIENT=client	Define the default SAmetime client identifier (default: mwLogin_MEANWHILE)"
+	@${ECHO_MSG} ""
+
 .include <bsd.port.mk>
diff --git a/net/meanwhile-gaim/distinfo b/net/meanwhile-gaim/distinfo
index 20a58e31074f..41968519e6da 100644
--- a/net/meanwhile-gaim/distinfo
+++ b/net/meanwhile-gaim/distinfo
@@ -1,2 +1,2 @@
-MD5 (gaim-meanwhile-1.2.0.tar.gz) = 55e416854293165708299d8f8fa73211
-SIZE (gaim-meanwhile-1.2.0.tar.gz) = 333946
+MD5 (gaim-meanwhile-1.2.2.tar.gz) = 106870047451b9fcaeac404b74ac1aa5
+SIZE (gaim-meanwhile-1.2.2.tar.gz) = 341952
diff --git a/net/meanwhile-gaim/files/patch-src_mwgaim.c b/net/meanwhile-gaim/files/patch-src_mwgaim.c
deleted file mode 100644
index 59de63728382..000000000000
--- a/net/meanwhile-gaim/files/patch-src_mwgaim.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/mwgaim.c.orig	Thu Mar 24 12:49:15 2005
-+++ src/mwgaim.c	Thu Mar 24 12:49:50 2005
-@@ -1651,6 +1651,7 @@ static void im_recv_mime(struct mwConver
- 	GString *atstr;
- 	gsize len = (end - start);
- 	char *tt;
-+	gsize mov;
- 
- 	atstr = g_string_new("");
- 	if(alt) g_string_append_printf(atstr, " alt=\"%s\"", alt);
-@@ -1661,7 +1662,7 @@ static void im_recv_mime(struct mwConver
- 	DEBUG_INFO("rewriting IMG\n{%s}\n", tt);
- 	g_free(tt);
- 
--	gsize mov = g_snprintf(start, len, "<img%s id=\"%i\"",
-+	mov = g_snprintf(start, len, "<img%s id=\"%i\"",
- 			       atstr->str, img);
- 	while(mov < len) start[mov++] = ' ';
-