Update to 0.6.4.

version 0.6.4
Features:
This version adds UCS-2 phonebook transfer mode (default with GSM
fallback). (thanks to Alexander Kochetkov)
Fixes:
The range for phonebook CS and RD again and are requested correctly
again. Only 5 entries at once to prevent timeouts with slow
phones/SIM-cards. (thanks to Alexander Kochetkov)
There are also other small fixes.

Relieve kleink of his MAINTAINER duties, on his request.

4 files changed, 20 insertions, 29 deletions

diff --git a/comms/scmxx/Makefile b/comms/scmxx/Makefile
index bba9d888af1..c639fc1e2f4 100644
--- a/comms/scmxx/Makefile
+++ b/comms/scmxx/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.23 2003/07/18 13:12:19 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2003/09/08 14:17:19 wiz Exp $
 #
 
-DISTNAME=		scmxx-0.6.3.8
+DISTNAME=		scmxx-0.6.4
 CATEGORIES=		comms
-MASTER_SITES=		http://ma2geo.mathematik.uni-karlsruhe.de/~hendrik/scmxx/download/
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=scmxx/}
 EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=		kleink@NetBSD.org
+MAINTAINER=		wiz@NetBSD.org
 HOMEPAGE=		http://www.hendrik-sattler.de/scmxx/
 COMMENT=		Data exchange utility for Siemens mobile phones
 
@@ -23,7 +23,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/docs/gsmcharset.txt			\
 	    ${PREFIX}/share/doc/scmxx
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/scmxx
-	${INSTALL_DATA} ${WRKSRC}/examples/phonebook			\
+	${INSTALL_DATA} ${WRKSRC}/examples/debian_with_scmxx.bmp	\
 	    ${PREFIX}/share/examples/scmxx
 	${INSTALL_DATA} ${WRKSRC}/examples/sms.txt			\
 	    ${PREFIX}/share/examples/scmxx
diff --git a/comms/scmxx/PLIST b/comms/scmxx/PLIST
index c97e24a2e9e..e0ad3c949d3 100644
--- a/comms/scmxx/PLIST
+++ b/comms/scmxx/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.6 2003/07/18 13:12:20 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2003/09/08 14:17:19 wiz Exp $
 bin/scmxx
 man/man1/scmxx.1
 man/ru/man1/scmxx.1
 share/doc/scmxx/doc_sources.txt
 share/doc/scmxx/gsmcharset.txt
-share/examples/scmxx/phonebook
+share/examples/scmxx/debian_with_scmxx.bmp
 share/examples/scmxx/sms.txt
 share/examples/scmxx/vCalendar.vcs
 share/examples/scmxx/vCard.vcf
diff --git a/comms/scmxx/distinfo b/comms/scmxx/distinfo
index 53d28e09ae7..d534ddf61a6 100644
--- a/comms/scmxx/distinfo
+++ b/comms/scmxx/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.18 2003/07/18 13:12:20 wiz Exp $
+$NetBSD: distinfo,v 1.19 2003/09/08 14:17:19 wiz Exp $
 
-SHA1 (scmxx-0.6.3.8.tar.bz2) = eb91728d4bd0e67b2312b43e79de04180fe457b7
-Size (scmxx-0.6.3.8.tar.bz2) = 82214 bytes
-SHA1 (patch-aa) = ee944e84895dc5e44b34d32470e536f9e09158cf
+SHA1 (scmxx-0.6.4.tar.bz2) = 35eae644fbc92f97de3e275b4b8a41013686e5b7
+Size (scmxx-0.6.4.tar.bz2) = 82955 bytes
+SHA1 (patch-aa) = 3902b85797d2062509da1e36db1c891e54f61b3f
 SHA1 (patch-ab) = 3b9692a592acb3f0b696c1fd42b075c3c638bc21
diff --git a/comms/scmxx/patches/patch-aa b/comms/scmxx/patches/patch-aa
index 33156c45076..1c2290565ea 100644
--- a/comms/scmxx/patches/patch-aa
+++ b/comms/scmxx/patches/patch-aa
@@ -1,22 +1,13 @@
-$NetBSD: patch-aa,v 1.5 2003/04/18 16:18:32 wiz Exp $
+$NetBSD: patch-aa,v 1.6 2003/09/08 14:17:20 wiz Exp $
 
---- src/s35_pbook.c.orig	Sun Mar  9 13:24:24 2003
+--- src/s35_pbook.c.orig	Mon Sep  8 15:56:36 2003
 +++ src/s35_pbook.c
-@@ -222,7 +222,7 @@ void send_pb_s35 (char* file, char* phon
-       if (token[strlen(token)-1]=='"') {
+@@ -229,7 +229,7 @@ void send_pb_s35 (char* file, char* phon
  	token[strlen(token)-1]=0;
        }
--      wide_str=convert_to_internal(nl_langinfo(CODESET),token,strlen(token));
-+      wide_str=convert_to_internal("char",token,strlen(token));
-       token=convert_to_gsm(wide_str);
-       mem_realloc(wide_str,0);
-       if (strlen(token)>text_length+2) {
-@@ -352,7 +352,7 @@ void get_pb_s35 (char* file, char* phone
-     token=(char *)strtok(NULL,"");
-     //character conversion on token 4
-     wide_str=convert_from_gsm(token);
--    token=convert_from_internal(nl_langinfo(CODESET),wide_str,2);
-+    token=convert_from_internal("char",wide_str,2);
-     mem_realloc(wide_str,0);
-     //write converted token 4, also write a newline to make the file readable
-     if (strlen(file)) {
+       entry_len=strlen(token);
+-      wide_str=convert_to_internal(nl_langinfo(CODESET),token,entry_len);
++      wide_str=convert_to_internal("char",token,entry_len);
+       if (unicode) {
+         token=convert_to_ucs2(wide_str); 
+ 	}