update to gpsbabel 1.4.3 from Kyrill Bychkov, maintainer timeout ~1month

- support new file formats
- adds new Qt gui
- don't hardcode dependency on Tcl/Tk 8.4 for the Tk gui

geo/gpsbabel/Makefile

@@ -1,29 +1,27 @@
-# $OpenBSD: Makefile,v 1.20 2011/11/13 13:54:04 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.21 2012/02/18 22:04:07 sthen Exp $
 
 COMMENT-main=		GPS waypoint, track, and route conversion tool
-COMMENT-gui=		Tk front-end to gpsbabel
+COMMENT-tk=		Tk front-end to gpsbabel
+COMMENT-qt=		Qt front-end to gpsbabel
 
-VERSION=		1.3.6
+VERSION=		1.4.3
 DISTNAME=		gpsbabel-${VERSION}
 PKGNAME-main=		gpsbabel-${VERSION}
-PKGNAME-gui=		gpsbabel-gui-${VERSION}
+PKGNAME-tk=		gpsbabel-tk-${VERSION}
-REVISION-main =		0
+PKGNAME-qt=		gpsbabel-qt-${VERSION}
-REVISION-gui =		0
 CATEGORIES=		geo
 
 HOMEPAGE=		http://www.gpsbabel.org/
 
 MAINTAINER=		Chris Kuethe <ckuethe@openbsd.org>
 
-# GPL
+# GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-#MASTER_SITES=		${HOMEPAGE}
+MASTER_SITES=		http://www.linklevel.net/distfiles/
-MASTER_SITES=		http://comstyle.com/source/ \
-			ftp://quatramaran.ens.fr/pub/espie/
 
 AUTOCONF_VERSION=	2.61
 CONFIGURE_STYLE=	autoconf
@@ -37,11 +35,9 @@ CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib" \
 			WEB=${WRKSRC}
 
-USE_GMAKE=		Yes
+MULTI_PACKAGES=		-main -tk -qt
-MULTI_PACKAGES=		-main -gui
 
-MODULES=		x11/tk
+MODULES=		x11/tk x11/qt4
-MODTK_VERSION=		8.4
 
 BUILD_DEPENDS=		textproc/libxslt \
 			textproc/docbook \
@@ -49,18 +45,31 @@ BUILD_DEPENDS=		textproc/libxslt \
 LIB_DEPENDS-main=	devel/libusb-compat \
 			devel/shapelib
 
-WANTLIB-main=		expat m c z usb shp>=1 pthread
+cWANTLIB = 		c m pthread
+WANTLIB-main += expat shp>=1 usb z ${cWANTLIB}
+WANTLIB-tk = 
+WANTLIB-qt += ICE QtCore QtGui QtNetwork QtWebKit QtXml SM X11 Xext Xi
+WANTLIB-qt += Xinerama Xrender fontconfig freetype stdc++ ${cWANTLIB}
 
-LIB_DEPENDS-gui=
+LIB_DEPENDS-tk=
-PKG_ARCH-gui=	*
+PKG_ARCH-tk=	*
-RUN_DEPENDS-gui=	geo/gpsbabel \
+RUN_DEPENDS-tk=		geo/gpsbabel \
 			${MODTK_RUN_DEPENDS}
+RUN_DEPENDS-qt=		geo/gpsbabel
 
+pre-configure:
+	${SUBST_CMD} ${WRKSRC}/guibabel
+post-configure:
+	cd ${WRKSRC}/gui && ${SETENV} ${CONFIGURE_ENV} qmake4 \
+		app.pro
 post-build:
-	gmake -C ${WRKSRC} doc
+	cd ${WRKSRC} && make doc
+	cd ${WRKSRC}/gui && make
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gpsbabel ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/gui/objects/gpsbabelfe-bin \
+		${PREFIX}/bin/guibabel-qt
 	${INSTALL_SCRIPT} ${WRKSRC}/guibabel ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gpsbabel
 	${INSTALL_DATA} ${WRKSRC}/babelweb/htmldoc-*/*.html \

geo/gpsbabel/distinfo

@@ -1,5 +1,5 @@
-MD5 (gpsbabel-1.3.6.tar.gz) = FXGzH48G9yKZVEnb/wHKSQ==
+MD5 (gpsbabel-1.4.3.tar.gz) = kW9+Ek9t+RGiTh6jI+nFKQ==
-RMD160 (gpsbabel-1.3.6.tar.gz) = 20BeAg+0NA2n9ArPJm4nqJMwrZQ=
+RMD160 (gpsbabel-1.4.3.tar.gz) = n/L+4X6Xj+ckjRwNRf8cf/43ddE=
-SHA1 (gpsbabel-1.3.6.tar.gz) = j/huNWU5ykk7M1J7kQMq2ztFKng=
+SHA1 (gpsbabel-1.4.3.tar.gz) = vWJm7u84dV1J5twXMwtYxo5aMtc=
-SHA256 (gpsbabel-1.3.6.tar.gz) = CL1dBPyT/hjMxYDyI8xVG94dWBcj/Z+S+RtI3dilqbY=
+SHA256 (gpsbabel-1.4.3.tar.gz) = ybgeu9ZaNOf+dBwYmFwerWUSP9CfoOy/iCvEeofE9dg=
-SIZE (gpsbabel-1.3.6.tar.gz) = 6637505
+SIZE (gpsbabel-1.4.3.tar.gz) = 5616398

geo/gpsbabel/patches/patch-Makefile_in

@@ -1,7 +1,7 @@
-$OpenBSD: patch-Makefile_in,v 1.5 2009/08/31 22:48:17 ckuethe Exp $
+$OpenBSD: patch-Makefile_in,v 1.6 2012/02/18 22:04:07 sthen Exp $
---- Makefile.in.orig	Tue Nov  4 16:23:11 2008
+--- Makefile.in.orig	Sun Jan  8 01:11:51 2012
-+++ Makefile.in	Tue Aug  4 20:24:40 2009
++++ Makefile.in	Sun Jan  8 01:15:47 2012
-@@ -94,7 +94,7 @@ LIBOBJS = queue.o route.o waypt.o filter_vecs.o util.o
+@@ -98,7 +98,7 @@ LIBOBJS = queue.o route.o waypt.o filter_vecs.o util.o
            uuid.o formspec.o xmltag.o cet.o cet_util.o fatal.o rgbcolors.o \
  	  inifile.o garmin_fs.o gbsleep.o units.o @GBSER@ gbser.o \
  	  gbfile.o parse.o avltree.o session.o \
@@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.5 2009/08/31 22:48:17 ckuethe Exp $
  OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@
  
  .c.o:
-@@ -188,7 +188,6 @@ dep:
+@@ -193,7 +193,6 @@ dep:
  $(WEB)/htmldoc-$(DOCVERSION)/index.html: FORCE
  	mkdir -p $(WEB)/htmldoc-$(DOCVERSION)
  	perl xmldoc/makedoc
@@ -18,7 +18,7 @@ $OpenBSD: patch-Makefile_in,v 1.5 2009/08/31 22:48:17 ckuethe Exp $
  	xmllint --noout --valid xmldoc/readme.xml    	#validate
  	xsltproc \
  	 --stringparam base.dir "$(WEB)/htmldoc-$(DOCVERSION)/" \
-@@ -241,7 +240,7 @@ changes.html: FORCE
+@@ -246,7 +245,7 @@ changes.html: FORCE
  	wget -O $(WEB)/changes.html http://www.gpsbabel.org/changes.html || exit 1
  	rm -f $(WEB)/changes.html.1 > /dev/null
  

geo/gpsbabel/patches/patch-configure_in

@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure_in,v 1.4 2008/08/21 05:20:53 ckuethe Exp $
+$OpenBSD: patch-configure_in,v 1.5 2012/02/18 22:04:07 sthen Exp $
---- configure.in.orig	Sun May  4 15:26:37 2008
+--- configure.in.orig	Sun Jan 29 01:59:29 2012
-+++ configure.in	Wed Jul  2 22:03:36 2008
++++ configure.in	Thu Feb  2 13:03:10 2012
-@@ -57,16 +57,22 @@ if test "$cet" = "default"; then
+@@ -63,15 +63,20 @@ if test "$cet" = "default"; then
  fi
  
  AC_MSG_CHECKING(whether to support shapefiles)
@@ -10,33 +10,56 @@ $OpenBSD: patch-configure_in,v 1.4 2008/08/21 05:20:53 ckuethe Exp $
 -  [ enable_shapefile="$enableval"],[enable_shapefile="yes"])
 -    if test "$enable_shapefile" != "no" ; then
 +AC_ARG_WITH(shapefile, [  --enable-shapefile=[(included)|system|no]])
-+  case $with_shapefile in 
++  case $with_shapefile in
-+    "system") 
++    "system")
 +	AC_CHECK_LIB([shp], [SHPOpen])
          AC_DEFINE(SHAPELIB_ENABLED, 1, [1 to enable shapefile support])
 -	AC_MSG_RESULT(yes)
 -    else
--	AC_MSG_RESULT(no)
++	;;
++    "no")
+ 	AC_MSG_RESULT(no)
 -    fi
 +	;;
-+    "no") 
++    *)         SHAPE="\$(SHAPE)"
-+	AC_MSG_RESULT(no) 
-+	;;
-+    *) 	SHAPE="\$(SHAPE)" 
 +        AC_DEFINE(SHAPELIB_ENABLED, 1, [1 to enable shapefile support])
 +	AC_MSG_RESULT(using included version)
 +	;;
 +  esac
  
-+
  AC_MSG_CHECKING(whether to support Palm/OS pdb formats)
  AC_ARG_ENABLE(pdb,
-   [  --enable-pdb=[(yes)|no]],
+@@ -224,32 +229,8 @@ AC_SUBST(USB_LIBS)
-@@ -209,6 +215,7 @@ AC_SUBST(USB_LIBS)
  AC_SUBST(USB_CFLAGS)
  AC_SUBST(OSJEEPS)
  AC_SUBST(GBSER)
 +AC_SUBST(SHAPE)
  AC_SUBST(ZLIB)
+-
+-dnl Linux HID support
+-case "$target" in
+-	*-linux-*)
+-	AC_MSG_CHECKING(for Linux HID interface)
+-	AC_COMPILE_IFELSE([
+-		#include <sys/ioctl.h>
+-		#include <linux/types.h>
+-		#include <linux/hiddev.h>
+-		#include <linux/hidraw.h>
+-		void f(void) {
+-			struct hidraw_devinfo info;
+-			struct hiddev_field_info finfo;
+-			struct hiddev_usage_ref_multi urefm;
+-			struct hiddev_report_info rinfo;
+-			ioctl(0, HIDIOCGRAWINFO, &info);
+-			ioctl(0, HIDIOCGFIELDINFO, &finfo);
+-			ioctl(0, HIDIOCSUSAGES, &urefm);
+-			ioctl(0, HIDIOCSREPORT, &rinfo);
+-		}],
+-		AC_MSG_RESULT(yes)
+-		AC_DEFINE(HAVE_LINUX_HID, 1, [Defined if you have Linux HID]),
+-		AC_MSG_RESULT(no))
+-	;;
+-esac
  
  AC_MSG_CHECKING(for random stuff to make you feel better)
+ AC_MSG_RESULT(failed)

geo/gpsbabel/patches/patch-gui_serial_unix_cpp

@@ -0,0 +1,22 @@
+$OpenBSD: patch-gui_serial_unix_cpp,v 1.1 2012/02/18 22:04:07 sthen Exp $
+--- gui/serial_unix.cpp.orig	Sun Jan 15 20:10:04 2012
++++ gui/serial_unix.cpp	Sun Jan 15 20:11:26 2012
+@@ -22,12 +22,12 @@
+ #if !defined (Q_OS_MAC) // FIXME: find a better way to hide this on Mac.
+ 
+ static const char *deviceNames[] = {
+-  "/dev/ttyS0",
+-  "/dev/ttyS1",
+-  "/dev/ttyS2",
+-  "/dev/ttyS3",
+-  "/dev/ttyUSB0",
+-  "/dev/rfcomm0",
++  "/dev/cua00",
++  "/dev/cua01",
++  "/dev/cua02",
++  "/dev/cua03",
++  "/dev/cuaU0",
++  "/dev/cuaU1",
+   0
+ };
+ 

geo/gpsbabel/patches/patch-guibabel

@@ -1,11 +1,11 @@
-$OpenBSD: patch-guibabel,v 1.1.1.1 2006/10/30 17:44:57 ckuethe Exp $
+$OpenBSD: patch-guibabel,v 1.2 2012/02/18 22:04:07 sthen Exp $
 --- guibabel.orig	Thu Oct 12 19:37:40 2006
 +++ guibabel	Thu Oct 12 19:37:51 2006
 @@ -1,6 +1,6 @@
  #!/bin/sh
  # the next line restarts using wish \
 -exec wish "$0" "$@"
-+exec wish8.4 "$0" "$@"
++exec wish${MODTK_VERSION} "$0" "$@"
  
  # 
  # This was largely cribbed from the TCL demo code.  My TCL skills weren't

geo/gpsbabel/pkg/DESCR-gui

@@ -1 +0,0 @@
-Tk front end for gpsbabel

geo/gpsbabel/pkg/DESCR-qt

@@ -0,0 +1 @@
+Qt front end for gpsbabel.

geo/gpsbabel/pkg/DESCR-tk

@@ -0,0 +1 @@
+Tk front end for gpsbabel.

geo/gpsbabel/pkg/PLIST-gui

@@ -1,2 +0,0 @@
-@comment $OpenBSD: PLIST-gui,v 1.1.1.1 2006/10/30 17:44:57 ckuethe Exp $
-bin/guibabel

geo/gpsbabel/pkg/PLIST-main

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.2 2009/08/31 22:48:17 ckuethe Exp $
+@comment $OpenBSD: PLIST-main,v 1.3 2012/02/18 22:04:07 sthen Exp $
 @pkgpath geo/gpsbabel
 @bin bin/gpsbabel
 share/doc/gpsbabel/
@@ -28,6 +28,7 @@ share/doc/gpsbabel/Usage.html
 share/doc/gpsbabel/all_options.html
 share/doc/gpsbabel/batchfile.html
 share/doc/gpsbabel/filter_arc.html
+share/doc/gpsbabel/filter_bend.html
 share/doc/gpsbabel/filter_discard.html
 share/doc/gpsbabel/filter_duplicate.html
 share/doc/gpsbabel/filter_height.html
@@ -50,6 +51,8 @@ share/doc/gpsbabel/fmt_arc.html
 share/doc/gpsbabel/fmt_axim_gpb.html
 share/doc/gpsbabel/fmt_baroiq.html
 share/doc/gpsbabel/fmt_bcr.html
+share/doc/gpsbabel/fmt_bushnell.html
+share/doc/gpsbabel/fmt_bushnell_trl.html
 share/doc/gpsbabel/fmt_cambridge.html
 share/doc/gpsbabel/fmt_cetus.html
 share/doc/gpsbabel/fmt_coastexp.html
@@ -60,21 +63,27 @@ share/doc/gpsbabel/fmt_cst.html
 share/doc/gpsbabel/fmt_csv.html
 share/doc/gpsbabel/fmt_cup.html
 share/doc/gpsbabel/fmt_custom.html
+share/doc/gpsbabel/fmt_delbin.html
 share/doc/gpsbabel/fmt_destinator_itn.html
 share/doc/gpsbabel/fmt_destinator_poi.html
 share/doc/gpsbabel/fmt_destinator_trl.html
 share/doc/gpsbabel/fmt_dg-100.html
+share/doc/gpsbabel/fmt_dg-200.html
 share/doc/gpsbabel/fmt_dmtlog.html
 share/doc/gpsbabel/fmt_dna.html
 share/doc/gpsbabel/fmt_easygps.html
+share/doc/gpsbabel/fmt_enigma.html
 share/doc/gpsbabel/fmt_exif.html
+share/doc/gpsbabel/fmt_flysight.html
 share/doc/gpsbabel/fmt_fugawi.html
 share/doc/gpsbabel/fmt_g7towin.html
 share/doc/gpsbabel/fmt_garmin.html
 share/doc/gpsbabel/fmt_garmin301.html
+share/doc/gpsbabel/fmt_garmin_fit.html
 share/doc/gpsbabel/fmt_garmin_gpi.html
 share/doc/gpsbabel/fmt_garmin_poi.html
 share/doc/gpsbabel/fmt_garmin_txt.html
+share/doc/gpsbabel/fmt_garmin_xt.html
 share/doc/gpsbabel/fmt_gcdb.html
 share/doc/gpsbabel/fmt_gdb.html
 share/doc/gpsbabel/fmt_geo.html
@@ -97,6 +106,7 @@ share/doc/gpsbabel/fmt_gpsutil.html
 share/doc/gpsbabel/fmt_gpx.html
 share/doc/gpsbabel/fmt_gtm.html
 share/doc/gpsbabel/fmt_gtrnctr.html
+share/doc/gpsbabel/fmt_gtrnctr1.html
 share/doc/gpsbabel/fmt_hiketech.html
 share/doc/gpsbabel/fmt_holux.html
 share/doc/gpsbabel/fmt_hsandv.html
@@ -104,17 +114,22 @@ share/doc/gpsbabel/fmt_html.html
 share/doc/gpsbabel/fmt_humminbird.html
 share/doc/gpsbabel/fmt_humminbird_ht.html
 share/doc/gpsbabel/fmt_iblue747.html
+share/doc/gpsbabel/fmt_iblue757.html
 share/doc/gpsbabel/fmt_igc.html
 share/doc/gpsbabel/fmt_ignrando.html
 share/doc/gpsbabel/fmt_igo2008_poi.html
 share/doc/gpsbabel/fmt_igo8.html
 share/doc/gpsbabel/fmt_ik3d.html
+share/doc/gpsbabel/fmt_itracku-bin.html
+share/doc/gpsbabel/fmt_itracku.html
+share/doc/gpsbabel/fmt_jogmap.html
 share/doc/gpsbabel/fmt_jtr.html
 share/doc/gpsbabel/fmt_kml.html
 share/doc/gpsbabel/fmt_kompass_tk.html
 share/doc/gpsbabel/fmt_kompass_wp.html
 share/doc/gpsbabel/fmt_ktf2.html
 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_m241-bin.html
@@ -129,6 +144,7 @@ share/doc/gpsbabel/fmt_mapasia_tr7.html
 share/doc/gpsbabel/fmt_mapconverter.html
 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_msroute.html
 share/doc/gpsbabel/fmt_msroute1.html
@@ -137,6 +153,7 @@ share/doc/gpsbabel/fmt_mtk.html
 share/doc/gpsbabel/fmt_mxf.html
 share/doc/gpsbabel/fmt_navicache.html
 share/doc/gpsbabel/fmt_navigonwpt.html
+share/doc/gpsbabel/fmt_naviguide.html
 share/doc/gpsbabel/fmt_navilink.html
 share/doc/gpsbabel/fmt_navitel_trk.html
 share/doc/gpsbabel/fmt_netstumbler.html
@@ -149,38 +166,51 @@ share/doc/gpsbabel/fmt_ozi.html
 share/doc/gpsbabel/fmt_palmdoc.html
 share/doc/gpsbabel/fmt_pathaway.html
 share/doc/gpsbabel/fmt_pcx.html
+share/doc/gpsbabel/fmt_pocketfms_bc.html
+share/doc/gpsbabel/fmt_pocketfms_fp.html
+share/doc/gpsbabel/fmt_pocketfms_wp.html
 share/doc/gpsbabel/fmt_psitrex.html
 share/doc/gpsbabel/fmt_psp.html
 share/doc/gpsbabel/fmt_quovadis.html
 share/doc/gpsbabel/fmt_raymarine.html
+share/doc/gpsbabel/fmt_ricoh.html
 share/doc/gpsbabel/fmt_s_and_t.html
 share/doc/gpsbabel/fmt_saplus.html
 share/doc/gpsbabel/fmt_saroute.html
+share/doc/gpsbabel/fmt_sbn.html
 share/doc/gpsbabel/fmt_sbp.html
 share/doc/gpsbabel/fmt_skyforce.html
+share/doc/gpsbabel/fmt_skytraq-bin.html
+share/doc/gpsbabel/fmt_skytraq.html
 share/doc/gpsbabel/fmt_sportsim.html
 share/doc/gpsbabel/fmt_stmsdf.html
 share/doc/gpsbabel/fmt_stmwpp.html
+share/doc/gpsbabel/fmt_subrip.html
 share/doc/gpsbabel/fmt_tabsep.html
 share/doc/gpsbabel/fmt_tef.html
+share/doc/gpsbabel/fmt_teletype.html
 share/doc/gpsbabel/fmt_text.html
 share/doc/gpsbabel/fmt_tiger.html
 share/doc/gpsbabel/fmt_tmpro.html
 share/doc/gpsbabel/fmt_tomtom.html
 share/doc/gpsbabel/fmt_tomtom_asc.html
 share/doc/gpsbabel/fmt_tomtom_itn.html
+share/doc/gpsbabel/fmt_tomtom_itn_places.html
 share/doc/gpsbabel/fmt_tpg.html
 share/doc/gpsbabel/fmt_tpo2.html
 share/doc/gpsbabel/fmt_tpo3.html
 share/doc/gpsbabel/fmt_unicsv.html
+share/doc/gpsbabel/fmt_v900.html
 share/doc/gpsbabel/fmt_vcard.html
 share/doc/gpsbabel/fmt_vidaone.html
 share/doc/gpsbabel/fmt_vitosmt.html
 share/doc/gpsbabel/fmt_vitovtt.html
+share/doc/gpsbabel/fmt_vpl.html
 share/doc/gpsbabel/fmt_wbt-bin.html
 share/doc/gpsbabel/fmt_wbt-tk1.html
 share/doc/gpsbabel/fmt_wbt.html
 share/doc/gpsbabel/fmt_wfff.html
+share/doc/gpsbabel/fmt_wintec_tes.html
 share/doc/gpsbabel/fmt_xcsv.html
 share/doc/gpsbabel/fmt_xmap.html
 share/doc/gpsbabel/fmt_xmap2006.html

geo/gpsbabel/pkg/PLIST-qt

@@ -0,0 +1,2 @@
+@comment $OpenBSD: PLIST-qt,v 1.1 2012/02/18 22:04:07 sthen Exp $
+@bin bin/guibabel-qt

geo/gpsbabel/pkg/PLIST-tk

@@ -0,0 +1,3 @@
+@comment $OpenBSD: PLIST-tk,v 1.1 2012/02/18 22:04:08 sthen Exp $
+@pkgpath geo/gpsbabel,-gui
+bin/guibabel