Update to gsmlib-1.10:

     - reactivated code in gsm_at to retry sending PDU after
       unsolicited result code
     - added description of unicode handling to FAQ
     - compilation fixes for gcc-3.0.4
     - added quick exit for ATZ in UnixSerialPort constructor
       if phone gives ERROR
     - added fix for phones that return +CLIP: "Number not available."
       instead of giving caller ID
     - added get/setCLIRPresentation() functions to MeTa (contribution by
       ivan)
     - added "NO CARRIER" event to the event mechanism (contribution by
       clock)
     - added Win32 port of gsmsmsd (thanks to Konstantin Forostyan)
     - further extented Win32 port of gsmsmsd to handle outgoing messages
     - fixed problem with Ericsson T39m SMS sending (zero bytes in handshake)
     - added capability to send concatenated SMSs in gsmsmsd and gsmsendsms
     - fixed unsigned/signed char problems in Unix/Win32 serial port
       implementations
     - added capability to send multiple SMSs to gsmsendsms/gsmsmsd

4 files changed, 21 insertions, 25 deletions

diff --git a/comms/gsmlib/Makefile b/comms/gsmlib/Makefile
index 5d0dc896957..15236d1540d 100644
--- a/comms/gsmlib/Makefile
+++ b/comms/gsmlib/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2004/01/22 07:51:12 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/03/17 07:07:43 soren Exp $
 #
 
-DISTNAME=	gsmlib-1.9
-PKGREVISION=	3
+DISTNAME=	gsmlib-1.10
 CATEGORIES=	comms devel
 MASTER_SITES=	http://www.pxh.de/fs/gsmlib/download/
 
@@ -12,8 +11,6 @@ COMMENT=	Library to access GSM mobile phones through GSM modems or IrDA devices
 
 BUILD_USES_MSGFMT=	yes
 
-ONLY_FOR_PLATFORM=	NetBSD-1.[6-9]*
-
 USE_GNU_TOOLS+=		make
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
@@ -21,6 +18,6 @@ GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--without-included-gettext
 PTHREAD_OPTS+=		require
 
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/gsmlib/PLIST b/comms/gsmlib/PLIST
index d871f0c1610..b2091280df6 100644
--- a/comms/gsmlib/PLIST
+++ b/comms/gsmlib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/17 11:29:58 grant Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/03/17 07:07:43 soren Exp $
 bin/gsmctl
 bin/gsmpb
 bin/gsmsendsms
@@ -26,10 +26,10 @@ include/gsmlib/gsm_unix_serial.h
 include/gsmlib/gsm_util.h
 lib/libgsmext.a
 lib/libgsmext.la
-lib/libgsmext.so.1.3
+lib/libgsmext.so.1.4
 lib/libgsmme.a
 lib/libgsmme.la
-lib/libgsmme.so.1.3
+lib/libgsmme.so.1.4
 man/man1/gsmctl.1
 man/man1/gsmpb.1
 man/man1/gsmsendsms.1
diff --git a/comms/gsmlib/distinfo b/comms/gsmlib/distinfo
index bedf441d103..6105fbd968d 100644
--- a/comms/gsmlib/distinfo
+++ b/comms/gsmlib/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/06/17 11:29:58 grant Exp $
+$NetBSD: distinfo,v 1.2 2004/03/17 07:07:43 soren Exp $
 
-SHA1 (gsmlib-1.9.tar.gz) = 6432e94a8829bf8a58872de9eced9e1a27f47dfe
-Size (gsmlib-1.9.tar.gz) = 335658 bytes
-SHA1 (patch-aa) = 5eef6faf04fcb1c12a507299ca1b4fd0e784cdfc
+SHA1 (gsmlib-1.10.tar.gz) = 0f329f6185c0dd5221f85ee0af7d95dea23bed8f
+Size (gsmlib-1.10.tar.gz) = 474591 bytes
+SHA1 (patch-aa) = 047ba92b7ade1f75173d155798d6a539e05f9c2a
diff --git a/comms/gsmlib/patches/patch-aa b/comms/gsmlib/patches/patch-aa
index 9d533556855..21b7ac4c919 100644
--- a/comms/gsmlib/patches/patch-aa
+++ b/comms/gsmlib/patches/patch-aa
@@ -1,13 +1,12 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/06/17 11:29:58 grant Exp $
+$NetBSD: patch-aa,v 1.2 2004/03/17 07:07:43 soren Exp $
 
---- gsmlib/gsm_unix_serial.cc.orig	Tue Jan  9 02:57:20 2001
-+++ gsmlib/gsm_unix_serial.cc	Tue Jul  3 22:35:08 2001
-@@ -37,6 +37,8 @@
- // timer indepently of each other
+--- work/gsmlib-1.10/gsmlib/gsm_unix_serial.cc.orig	2004-03-17 07:51:52.000000000 +0100
++++ work/gsmlib-1.10/gsmlib/gsm_unix_serial.cc	2004-03-17 07:51:57.000000000 +0100
+@@ -26,6 +26,7 @@
+ #include <sys/ioctl.h>
+ #include <signal.h>
+ #include <pthread.h>
++#include <assert.h>
  
- static pthread_mutex_t timerMtx = PTHREAD_MUTEX_INITIALIZER;
-+#define pthread_mutex_lock(x) 
-+#define pthread_mutex_unlock(x) 
- 
- // for non-GNU systems, define alarm()
- #ifndef HAVE_ALARM
+ using namespace std;
+ using namespace gsmlib;