Update to 0.6.3.7, and include some iconv fixes from Dave Huang in PR 20017.

Changes in 0.6.3.7:
    fixed the GPRS info segfault issue
    some command errors are not really a reason to about - fixed that
    fixed gcc-3.2 warnings
    fixed Makefiles to actually use chosen compiler
    rewrote/reordered main()

4 files changed, 72 insertions, 5 deletions

diff --git a/comms/scmxx/Makefile b/comms/scmxx/Makefile
index 67fcf9f5b0d..89bc4709733 100644
--- a/comms/scmxx/Makefile
+++ b/comms/scmxx/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2003/03/16 10:21:03 kleink Exp $
+# $NetBSD: Makefile,v 1.20 2003/04/18 16:18:32 wiz Exp $
 #
 
-DISTNAME=		scmxx-0.6.3.6
+DISTNAME=		scmxx-0.6.3.7
 CATEGORIES=		comms
 MASTER_SITES=		http://ma2geo.mathematik.uni-karlsruhe.de/~hendrik/scmxx/download/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/comms/scmxx/distinfo b/comms/scmxx/distinfo
index ed4a39292ce..1760e89147c 100644
--- a/comms/scmxx/distinfo
+++ b/comms/scmxx/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.16 2003/03/16 10:21:03 kleink Exp $
+$NetBSD: distinfo,v 1.17 2003/04/18 16:18:32 wiz Exp $
 
-SHA1 (scmxx-0.6.3.6.tar.bz2) = f77a21629873d5a34e99d1bcbd3f06c29e835740
-Size (scmxx-0.6.3.6.tar.bz2) = 77096 bytes
+SHA1 (scmxx-0.6.3.7.tar.bz2) = c344cdda631c000ccb618917a4d674021f577e82
+Size (scmxx-0.6.3.7.tar.bz2) = 77520 bytes
+SHA1 (patch-aa) = ee944e84895dc5e44b34d32470e536f9e09158cf
+SHA1 (patch-ab) = 4632e5249ee95a84a17e95239b1be8cf59e72e86
diff --git a/comms/scmxx/patches/patch-aa b/comms/scmxx/patches/patch-aa
new file mode 100644
index 00000000000..33156c45076
--- /dev/null
+++ b/comms/scmxx/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.5 2003/04/18 16:18:32 wiz Exp $
+
+--- src/s35_pbook.c.orig	Sun Mar  9 13:24:24 2003
++++ src/s35_pbook.c
+@@ -222,7 +222,7 @@ void send_pb_s35 (char* file, char* phon
+       if (token[strlen(token)-1]=='"') {
+ 	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)) {
diff --git a/comms/scmxx/patches/patch-ab b/comms/scmxx/patches/patch-ab
new file mode 100644
index 00000000000..a9b8a24bff2
--- /dev/null
+++ b/comms/scmxx/patches/patch-ab
@@ -0,0 +1,43 @@
+$NetBSD: patch-ab,v 1.6 2003/04/18 16:18:33 wiz Exp $
+
+--- src/smspdu.c.orig	Sun Mar  9 13:24:24 2003
++++ src/smspdu.c
+@@ -88,7 +88,7 @@ void create_smssubmit_pdu(char *pdu, cha
+   //leave PID and vp_relative as is
+ 	
+   //process user data length and user data
+-  wide_str=convert_to_internal(nl_langinfo(CODESET),smstext,strlen(smstext));
++  wide_str=convert_to_internal("char",smstext,strlen(smstext));
+   ud=sms_data_7bit_encode(wide_str,&udl);
+   mem_realloc(wide_str,0);
+ 	
+@@ -212,7 +212,7 @@ void decode_smsdeliver_pdu(unsigned char
+ 	sprintf(&oa.number[strlen(oa.number)],"%c%c",pdu[i],pdu[i+1]);
+       }
+       wide_str=sms_data_7bit_decode(oa.number,(oa.length*4)/7);
+-      t=convert_from_internal(nl_langinfo(CODESET),wide_str,2);
++      t=convert_from_internal("char",wide_str,2);
+       mem_realloc(wide_str,0);
+       strcpy(oa.number,t);
+       mem_realloc(t,0);
+@@ -301,9 +301,9 @@ void decode_smsdeliver_pdu(unsigned char
+       //all encodings of uncompressed 7bit
+       wide_str=sms_data_7bit_decode(pdu+where,udl);
+       if ((pdutype>>6)&1){
+-	t=convert_from_internal(nl_langinfo(CODESET),&wide_str[1+((udh_length*8)+(udh_length*8)%7)/7],2);
++	t=convert_from_internal("char",&wide_str[1+((udh_length*8)+(udh_length*8)%7)/7],2);
+       } else {
+-	t=convert_from_internal(nl_langinfo(CODESET),wide_str,2);
++	t=convert_from_internal("char",wide_str,2);
+       }
+       mem_realloc(wide_str,0);
+       strcpy(ud,t);
+@@ -318,7 +318,7 @@ void decode_smsdeliver_pdu(unsigned char
+       } else {
+ 	wide_str=convert_from_ucs2(pdu+where);
+       }
+-      t=convert_from_internal(nl_langinfo(CODESET),wide_str,2);
++      t=convert_from_internal("char",wide_str,2);
+       mem_realloc(wide_str,0);
+       strcpy(ud,t);
+       mem_realloc(t,0);