From 44055a0cf11ad7e46eef13532de2a42334571901 Mon Sep 17 00:00:00 2001
From: sasano <sasano@openbsd.org>
Date: Sat, 5 Jan 2013 06:18:06 +0000
Subject: [PATCH] update to gpsbabel 1.4.4

- add patch to open serial port with non-blocking mode
  (useful for USB-GPS dongle)
---
 geo/gpsbabel/Makefile                    |  6 ++----
 geo/gpsbabel/distinfo                    |  7 ++-----
 geo/gpsbabel/patches/patch-configure_in  |  9 ++++-----
 geo/gpsbabel/patches/patch-gbser_posix_c | 11 +++++++++++
 geo/gpsbabel/pkg/PLIST-main              |  4 +++-
 5 files changed, 22 insertions(+), 15 deletions(-)
 create mode 100644 geo/gpsbabel/patches/patch-gbser_posix_c

diff --git a/geo/gpsbabel/Makefile b/geo/gpsbabel/Makefile
index 22b3b5d49c6..f5e6728b50a 100644
--- a/geo/gpsbabel/Makefile
+++ b/geo/gpsbabel/Makefile
@@ -1,16 +1,14 @@
-# $OpenBSD: Makefile,v 1.23 2012/09/27 17:26:05 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.24 2013/01/05 06:18:06 sasano Exp $
 
 COMMENT-main=		GPS waypoint, track, and route conversion tool
 COMMENT-tk=		Tk front-end to gpsbabel
 COMMENT-qt=		Qt front-end to gpsbabel
 
-VERSION=		1.4.3
+VERSION=		1.4.4
 DISTNAME=		gpsbabel-${VERSION}
 PKGNAME-main=		gpsbabel-${VERSION}
-REVISION-main=		0
 PKGNAME-tk=		gpsbabel-tk-${VERSION}
 PKGNAME-qt=		gpsbabel-qt-${VERSION}
-REVISION-qt=		0
 CATEGORIES=		geo
 
 HOMEPAGE=		http://www.gpsbabel.org/
diff --git a/geo/gpsbabel/distinfo b/geo/gpsbabel/distinfo
index 1ad2c9e21f5..236877dbd6f 100644
--- a/geo/gpsbabel/distinfo
+++ b/geo/gpsbabel/distinfo
@@ -1,5 +1,2 @@
-MD5 (gpsbabel-1.4.3.tar.gz) = kW9+Ek9t+RGiTh6jI+nFKQ==
-RMD160 (gpsbabel-1.4.3.tar.gz) = n/L+4X6Xj+ckjRwNRf8cf/43ddE=
-SHA1 (gpsbabel-1.4.3.tar.gz) = vWJm7u84dV1J5twXMwtYxo5aMtc=
-SHA256 (gpsbabel-1.4.3.tar.gz) = ybgeu9ZaNOf+dBwYmFwerWUSP9CfoOy/iCvEeofE9dg=
-SIZE (gpsbabel-1.4.3.tar.gz) = 5616398
+SHA256 (gpsbabel-1.4.4.tar.gz) = ndKgboh8sobJoHFkqPLt4RrtEUfmQZAHNwxShBIyGUQ=
+SIZE (gpsbabel-1.4.4.tar.gz) = 7811264
diff --git a/geo/gpsbabel/patches/patch-configure_in b/geo/gpsbabel/patches/patch-configure_in
index fdf5cf42f7d..b88f890fc74 100644
--- a/geo/gpsbabel/patches/patch-configure_in
+++ b/geo/gpsbabel/patches/patch-configure_in
@@ -1,7 +1,6 @@
-$OpenBSD: patch-configure_in,v 1.5 2012/02/18 22:04:07 sthen Exp $
---- configure.in.orig	Sun Jan 29 01:59:29 2012
-+++ configure.in	Thu Feb  2 13:03:10 2012
-@@ -63,15 +63,20 @@ if test "$cet" = "default"; then
+--- configure.in.orig	Tue Sep  4 07:09:52 2012
++++ configure.in	Tue Dec 25 21:50:38 2012
+@@ -62,15 +62,20 @@ if test "$cet" = "default"; then
  fi
  
  AC_MSG_CHECKING(whether to support shapefiles)
@@ -29,7 +28,7 @@ $OpenBSD: patch-configure_in,v 1.5 2012/02/18 22:04:07 sthen Exp $
  
  AC_MSG_CHECKING(whether to support Palm/OS pdb formats)
  AC_ARG_ENABLE(pdb,
-@@ -224,32 +229,8 @@ AC_SUBST(USB_LIBS)
+@@ -223,32 +228,8 @@ AC_SUBST(USB_LIBS)
  AC_SUBST(USB_CFLAGS)
  AC_SUBST(OSJEEPS)
  AC_SUBST(GBSER)
diff --git a/geo/gpsbabel/patches/patch-gbser_posix_c b/geo/gpsbabel/patches/patch-gbser_posix_c
new file mode 100644
index 00000000000..afba5375f00
--- /dev/null
+++ b/geo/gpsbabel/patches/patch-gbser_posix_c
@@ -0,0 +1,11 @@
+--- gbser_posix.c.orig	Tue Jul 26 10:56:33 2011
++++ gbser_posix.c	Tue Dec 25 21:52:11 2012
+@@ -142,7 +142,7 @@ void* gbser_init(const char* port_name)
+   if (0 == strcmp(port_name, "-")) {
+     h->fd = 0;
+     return h;
+-  } else if (h->fd = open(port_name, O_RDWR | O_NOCTTY), h->fd == -1) {
++  } else if (h->fd = open(port_name, O_RDWR | O_NOCTTY | O_NDELAY), h->fd == -1) {
+     warning("Failed to open port (%s)\n", strerror(errno));
+     goto failed;
+   }
diff --git a/geo/gpsbabel/pkg/PLIST-main b/geo/gpsbabel/pkg/PLIST-main
index b1308cdc936..2fde365173a 100644
--- a/geo/gpsbabel/pkg/PLIST-main
+++ b/geo/gpsbabel/pkg/PLIST-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.4 2012/04/15 20:03:16 kirby Exp $
+@comment $OpenBSD: PLIST-main,v 1.5 2013/01/05 06:18:06 sasano Exp $
 @pkgpath geo/gpsbabel
 @bin bin/gpsbabel
 @comment share/applications/
@@ -133,6 +133,7 @@ share/doc/gpsbabel/fmt_kwf2.html
 share/doc/gpsbabel/fmt_land_air_sea.html
 share/doc/gpsbabel/fmt_lmx.html
 share/doc/gpsbabel/fmt_lowranceusr.html
+share/doc/gpsbabel/fmt_lowranceusr4.html
 share/doc/gpsbabel/fmt_m241-bin.html
 share/doc/gpsbabel/fmt_m241.html
 share/doc/gpsbabel/fmt_mag_pdb.html
@@ -147,6 +148,7 @@ share/doc/gpsbabel/fmt_mapsend.html
 share/doc/gpsbabel/fmt_mapsource.html
 share/doc/gpsbabel/fmt_miniHomer.html
 share/doc/gpsbabel/fmt_mmo.html
+share/doc/gpsbabel/fmt_motoactv.html
 share/doc/gpsbabel/fmt_msroute.html
 share/doc/gpsbabel/fmt_msroute1.html
 share/doc/gpsbabel/fmt_mtk-bin.html