Update to scmxx-0.5.14; changes include:

0.5.9
    changed from strcmp to strcasecmp for "cme error: invalid index" check
	in pbook code
    Merged the variable baudrate patches from
	Klaus Klein <kleink@reziprozitaet.de> and
	Klaus Singvogel<klaus@lst.de> to make it work better with the ME45
    Merged Makefile patch from Klaus Klein to make it compile better on NetBSD
    Simplyfied serial setup a bit (use already present system functions)
    Changes Package description (.deb and .rpm) and added SL45 and S45 to
        supported phones in scmxx.c
    Moved --pipe in --help output
0.5.10
    fix sms '@' bug in sending
	(thanks to Nuno Miguel Fernandes Sucena Almeida <slug@aeminium.org>)
0.5.11
    complete GSM charset compliance (more input characters than the S35i
	provides!)
    change sms input definition: greek character must be masked with a
	prepended '\' which enables all greek characters instead of only
	the non-coliding ones
    renamed device.h to config.h
    change config.h to defines and declare variables in common.h and init them
	in scmxx.c:main by calling the set methods
    added docs/specialchars.txt and docs/greekchars.txt
0.5.12
    new parameter pair --greek and --nogreek (dependent on compile settings)
	see docs greekchars.txt for details
    clean-up of the functions in gsmcodes.c
0.5.13
    fix phonebook text field length check for the new casted characters
    we now use autoconf and autoheader to create the build files
	config.h and Makefile (thanks to Michael Banck <mbanck@gmx.net>)
    specfile updated (thanks to Kri¨tof Petr <petr@kristof.cz>)
0.5.14
    fix crash when build with optimizations
    fix include of present CFLAGS env
    decode some known sms user data header fields and display this information
    show 8bit and 16bit sms messages as hexstring (instead of nothing)

9 files changed, 10 insertions, 226 deletions

diff --git a/comms/scmxx/Makefile b/comms/scmxx/Makefile
index ee1185b46ed..b2a498c5386 100644
--- a/comms/scmxx/Makefile
+++ b/comms/scmxx/Makefile
@@ -1,38 +1,26 @@
-# $NetBSD: Makefile,v 1.3 2002/01/17 19:35:40 kleink Exp $
+# $NetBSD: Makefile,v 1.4 2002/03/10 08:09:56 kleink Exp $
 #
 
-DISTNAME=		scmxx-0.5.8
-PKGREVISION=		2
+DISTNAME=		scmxx-0.5.14
 CATEGORIES=		comms
-MASTER_SITES=		http://www.hendrik-sattler.de/scmxx/download/
+MASTER_SITES=		http://www.hendrik-sattler.de/scmxx/download/ \
+			http://ma2geo.mathematik.uni-karlsruhe.de/~hendik/scmxx/download/
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		kleink@netbsd.org
 HOMEPAGE=		http://www.hendrik-sattler.de/scmxx/
 COMMENT=		Data exchange utility for Siemens mobile phones
 
+GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/scmxx ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/docs/scmxx.1 ${PREFIX}/man/man1
+post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/scmxx
 	${INSTALL_DATA} ${WRKSRC}/docs/README				\
 	    ${PREFIX}/share/doc/scmxx
 	${INSTALL_DATA} ${WRKSRC}/docs/gsmcharset.txt			\
 	    ${PREFIX}/share/doc/scmxx
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/scmxx
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/scmxx/bitmaps
-	${INSTALL_DATA} ${WRKSRC}/examples/bitmaps/d1.bmp		\
-	    ${PREFIX}/share/examples/scmxx/bitmaps
-	${INSTALL_DATA} ${WRKSRC}/examples/bitmaps/d2.bmp		\
-	    ${PREFIX}/share/examples/scmxx/bitmaps
-	${INSTALL_DATA} ${WRKSRC}/examples/bitmaps/eplus.bmp		\
-	    ${PREFIX}/share/examples/scmxx/bitmaps
-	${INSTALL_DATA} ${WRKSRC}/examples/bitmaps/viag.bmp		\
-	    ${PREFIX}/share/examples/scmxx/bitmaps
-	${INSTALL_DATA} ${WRKSRC}/examples/midi				\
-	    ${PREFIX}/share/examples/scmxx
 	${INSTALL_DATA} ${WRKSRC}/examples/phonebook			\
 	    ${PREFIX}/share/examples/scmxx
 	${INSTALL_DATA} ${WRKSRC}/examples/sms				\
diff --git a/comms/scmxx/PLIST b/comms/scmxx/PLIST
index 205a559ec90..07149e563ac 100644
--- a/comms/scmxx/PLIST
+++ b/comms/scmxx/PLIST
@@ -1,16 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/01/13 20:17:33 kleink Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/03/10 08:09:56 kleink Exp $
 bin/scmxx
 man/man1/scmxx.1
 share/doc/scmxx/README
 share/doc/scmxx/gsmcharset.txt
-share/examples/scmxx/bitmaps/d1.bmp
-share/examples/scmxx/bitmaps/d2.bmp
-share/examples/scmxx/bitmaps/eplus.bmp
-share/examples/scmxx/bitmaps/viag.bmp
-share/examples/scmxx/midi
 share/examples/scmxx/phonebook
 share/examples/scmxx/sms
 share/examples/scmxx/vCalendar
 @dirrm share/doc/scmxx
-@dirrm share/examples/scmxx/bitmaps
 @dirrm share/examples/scmxx
diff --git a/comms/scmxx/distinfo b/comms/scmxx/distinfo
index 485659f299c..57326c6fc1a 100644
--- a/comms/scmxx/distinfo
+++ b/comms/scmxx/distinfo
@@ -1,10 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/01/17 19:35:40 kleink Exp $
+$NetBSD: distinfo,v 1.4 2002/03/10 08:09:57 kleink Exp $
 
-SHA1 (scmxx-0.5.8.tar.bz2) = ab874880b4ece30b5ea4b8a75e7f43797fd80d7e
-Size (scmxx-0.5.8.tar.bz2) = 55902 bytes
-SHA1 (patch-aa) = 6dcb7897f462ee8366d2c411b2326218f4decb1a
-SHA1 (patch-ab) = 762034cfb489894153cd6bab8aac83d16ec9d1d2
-SHA1 (patch-ac) = 117a52de2bd29ebc6f372869d0ad82596f8bd174
-SHA1 (patch-ad) = 6e31f2bbb969033c51d959466333e5e49c87bfa5
-SHA1 (patch-ae) = 0b08fe6312c04016b5ce68ef2eb4fa80832f4290
-SHA1 (patch-af) = 65d2a022113369d6c110904440df798f24929a99
+SHA1 (scmxx-0.5.14.tar.bz2) = 0d69dd1d2ede747f8142d484a85d982511d42452
+Size (scmxx-0.5.14.tar.bz2) = 44524 bytes
diff --git a/comms/scmxx/patches/patch-aa b/comms/scmxx/patches/patch-aa
deleted file mode 100644
index 5e9259c6344..00000000000
--- a/comms/scmxx/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/01/13 20:17:33 kleink Exp $
-
---- Makefile.orig	Fri Jan  4 21:43:54 2002
-+++ Makefile	Sun Jan 13 15:29:18 2002
-@@ -1,4 +1,4 @@
--SHELL=/bin/bash
-+SHELL=/bin/sh
- 
- CC=gcc
- INSTALL_DIR=$(DESTDIR)/usr/bin
-@@ -17,7 +17,7 @@
- else
- .PHONY: do-it-all
- do-it-all:      depend
--	@sleep 1s; make
-+	@sleep 1s; $(MAKE)
- endif
- 
- .PHONY: depend
diff --git a/comms/scmxx/patches/patch-ab b/comms/scmxx/patches/patch-ab
deleted file mode 100644
index 43245416924..00000000000
--- a/comms/scmxx/patches/patch-ab
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2002/01/17 19:35:41 kleink Exp $
-
---- scmxx.c.orig	Fri Jan  4 21:43:54 2002
-+++ scmxx.c	Thu Jan 17 20:06:43 2002
-@@ -35,7 +35,7 @@
- 	char *SMSSLOT_p=SMSSLOT;
- 	char *PIN_p=PIN;
- 	char *myPIPE_p=myPIPE;
--	int RUN_INFO=0,RUN_SETTIME=0,RUN_SETSMSC;
-+	int RUN_INFO=0,RUN_SETTIME=0,RUN_SETSMSC=0;
- 	struct option myoptions[]=
- 	{	{"remove",0,0,'r'},{"send",0,0,'s'},{"get",0,0,'g'},
- 		{"bitmap",2,0,'B'},{"midi",2,0,'M'},{"vcal",2,0,'C'},{"vcf",2,0,'F'},
-@@ -43,7 +43,7 @@
- 		{"sms",2,0,'S'},{"sms-text",1,0,'t'},{"sms-nr",1,0,'n'},{"direct",0,0,0},
- 		{"device",1,0,'d'},{"file",1,0,'f'},{"pipe",1,0,'p'},{"pin",1,0,0},
- 		{"info",0,0,'i'},{"set-time",0,0,0},{"set-smsc",0,0,0},{"help",0,0,'h'},
--		{"verbose",0,0,'v'},{"quiet",0,0,'q'},
-+		{"verbose",0,0,'v'},{"quiet",0,0,'q'},{"speed",1,0,0},
- 		{0,0,0,0}
- 	};
- 	
-@@ -61,6 +61,10 @@
- 	if (getenv("SCMXX_TTY")!=NULL){
- 		set_ttyport(getenv("SCMXX_TTY"));
- 	}	
-+	//using env. var. SCMXX_TTYSPEED
-+	if (getenv("SCMXX_TTYSPEED")!=NULL){
-+		set_ttyspeed(getenv("SCMXX_TTYSPEED"));
-+	}
- 	
- 	while((arg=getopt_long(argc,argv,"rsgB::M::C::F::P:S::t:n:d:f:p:ivqh",myoptions,&option_index)) != -1){
- 		switch (arg){
-@@ -134,6 +138,8 @@
- 								if ((ACTION_TYPE==2 || ACTION_TYPE==3) && FILE_TYPE==5){ACTION_TYPE += 10;}
- 							}else if(!strcmp(myoptions[option_index].name,"pin")){
- 								if(optarg && strlen(optarg)<sizeof(PIN)){strcpy(PIN_p,optarg);}
-+							}else if(!strcmp(myoptions[option_index].name,"speed")){
-+								if(optarg){set_ttyspeed(optarg);}
- 							}
- 							break;			
- 		}
-@@ -192,6 +198,7 @@
- 	printf("Syntax: %s [Options] [Operation [Slot[SMS-Options]]]\n",me);
- 	printf("Options:\n");
- 	printf("--device <device>\t  -d\tspecify another than the compiled in device\n");
-+	printf("--speed <speed>\t\t\tspecify the device's speed\n");
- 	printf("--file <file>\t\t  -f\tspecify a file to use (instead of stdin/stdout)\n");
- 	printf("--pipe <program>\t  -p\tspecify a pipe to use additionally to --file\n");
- 	printf("--pin <pin>\t\t\tuse this pin if one is needed\n");
diff --git a/comms/scmxx/patches/patch-ac b/comms/scmxx/patches/patch-ac
deleted file mode 100644
index d6804ae25ff..00000000000
--- a/comms/scmxx/patches/patch-ac
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2002/01/17 19:35:41 kleink Exp $
-
---- device.h.orig	Fri Jan  4 21:43:54 2002
-+++ device.h	Thu Jan 17 19:45:15 2002
-@@ -1,2 +1,3 @@
- //char myttyport[25]="/dev/ttyS0";
- char myttyport[25]="/dev/ircomm0";
-+speed_t myttyspeed=B19200;
diff --git a/comms/scmxx/patches/patch-ad b/comms/scmxx/patches/patch-ad
deleted file mode 100644
index 5856184e28e..00000000000
--- a/comms/scmxx/patches/patch-ad
+++ /dev/null
@@ -1,70 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2002/01/17 19:35:41 kleink Exp $
-
---- common.c.orig	Fri Jan  4 21:43:54 2002
-+++ common.c	Thu Jan 17 20:14:15 2002
-@@ -26,6 +26,42 @@
- 	else{errexit("Buffer overflow. Set a greater length in device.h and recompile.\n");}
- }
- 
-+void set_ttyspeed(char *newttyspeed){
-+	if (string_to_speed(newttyspeed, &myttyspeed) != 0){
-+		errexit("Cannot set device speed.\n");
-+	}
-+}
-+
-+int string_to_speed(const char *speedstring_p, speed_t *speed_p)
-+{
-+	int nspeed;
-+	speed_t bspeed;
-+
-+	nspeed = atoi(speedstring_p);
-+	switch(nspeed){
-+		case 19200:
-+			bspeed=B19200;
-+			break;
-+		case 38400:
-+			bspeed=B38400;
-+			break;
-+#ifdef B57600
-+		case 57600:
-+			bspeed=B57600;
-+			break;
-+#endif
-+#ifdef B115200
-+		case 115200:
-+			bspeed=B115200;
-+			break;
-+#endif
-+		default:
-+			return(-1);
-+	}
-+	*speed_p=bspeed;
-+	return(0);
-+}
-+	
- void new_at_command(char *at_command_p, char *addon_p){
- 		memset(at_command_p,0,sizeof(at_command_p));
- 		strcpy(&at_command_p[0],"AT");
-@@ -63,8 +99,8 @@
- 		fprintf(stderr,"Error in getting device attributes.\n");
- 		exit(1);
- 	}
--	cfsetispeed(&newtio, B19200); //input at baudrate
--	cfsetospeed(&newtio, B19200); //ouput at baudrate
-+	cfsetispeed(&newtio, myttyspeed); //input at baudrate
-+	cfsetospeed(&newtio, myttyspeed); //ouput at baudrate
- 	newtio.c_cflag &= ~(CSIZE|CSTOPB|PARENB|PARODD|CRTSCTS);
- 	newtio.c_cflag |= CS8 | CLOCAL | CREAD | HUPCL; //8bit, local mode, read data
- 	newtio.c_lflag &= ~(ECHO|ECHOE|ECHOPRT|ECHOK|ECHOKE|ECHONL|ECHOCTL|
-@@ -75,7 +111,10 @@
- 	newtio.c_iflag |= IGNPAR;
- 	newtio.c_oflag &= ~OPOST;
- 	tcflush(mytty, TCIOFLUSH); //clear serial tty
--	tcsetattr(mytty,TCSANOW,&newtio); //set now
-+	if (tcsetattr(mytty,TCSANOW,&newtio) != 0){ //set now
-+		perror("Error in setting device attributes");
-+		exit(1);
-+	}
- 	alarm(0);
- }
- 
diff --git a/comms/scmxx/patches/patch-ae b/comms/scmxx/patches/patch-ae
deleted file mode 100644
index d412590fd01..00000000000
--- a/comms/scmxx/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2002/01/17 19:35:41 kleink Exp $
-
---- common.h.orig	Fri Jan  4 21:43:54 2002
-+++ common.h	Thu Jan 17 19:52:24 2002
-@@ -53,6 +53,8 @@
- void myprintf(int verbose_level, char *output, ...);
- //from common.c
- void set_ttyport(char *newttyport);
-+void set_ttyspeed(char *newttyspeed);
-+int string_to_speed(const char *speedstring_p, speed_t *speed_p);
- void new_at_command(char *at_command_p, char *addon_p);
- void add_at_command(char *at_command_p, char *addon_p,...);
- void com_mytty(char *at_command_p, char *ack_p);
diff --git a/comms/scmxx/patches/patch-af b/comms/scmxx/patches/patch-af
deleted file mode 100644
index 83abc30b2a3..00000000000
--- a/comms/scmxx/patches/patch-af
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-af,v 1.1 2002/01/17 19:35:41 kleink Exp $
-
---- docs/scmxx.1.orig	Fri Jan  4 21:43:54 2002
-+++ docs/scmxx.1	Thu Jan 17 20:30:56 2002
-@@ -3,7 +3,7 @@
- scmxx \- exchange data with your Siemens mobile phone
- .SH SYNOPSIS
- scmxx \
--[--device \fIdevice\fP] [--file \fIfile\fP] \
-+[--device \fIdevice\fP] [--speed \fIspeed\fP] [--file \fIfile\fP] \
- [--pin \fIpin\fP] [--quiet] [--verbose] \
- [--remove | --send | --get] [--bitmap[=\fIslot#\fP] | \
- --midi[=\fIslot#\fP] | --vcal[=]\fIslot#\fP | \
-@@ -31,6 +31,10 @@
- specify another than the compiled in device
- .P
- .TP 20
-+.B --speed
-+specify the device's speed
-+.P
-+.TP 20
- .B --file (-f)
- specify a file to use (instead of stdin/stdout)
- .P
-@@ -127,5 +131,7 @@
- 
- .SH ENVIRONMENT
- SCMXX_TTY
-+.br
-+SCMXX_TTYSPEED
- .SH AUTHOR
- Hendrik Sattler <post@hendrik-sattler.de>