Hello, To support GPS week rollover for CanMore GP-101 old GPS logger, we have to update GPSBabel 1.4.4 to 1.6.0.
Long time have passed, ports needs to major overhaul. Here is keyboints of the diff: * patch needs to support new filename - gbser_posix.c -> gbser_posix.cc - gui/serial_unix.cpp -> gui/serial_unix.cc - configure.in -> (deleted) * "make doc" needs new docbook, cannot build with docbook-xsl-1.68.1p6 - use XML_CATALOG_FILES= to disable /etc/xml/catalog * source code repository is no longer at http://www.linklevel.net/distfiles/, fetch from GitHub. diff -uNpr gpsbabel/Makefile gpsbabel.new/Makefile --- gpsbabel/Makefile Sat Aug 24 23:05:29 2019 +++ gpsbabel.new/Makefile Sat Aug 24 23:05:31 2019 @@ -1,30 +1,32 @@ -# $OpenBSD: Makefile,v 1.33 2018/10/24 14:28:04 sthen Exp $ +# $OpenBSD: Makefile,v 1.34 2019/07/12 20:46:29 sthen 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.4 +VERSION= 1.6.0 +GH_ACCOUNT= gpsbabel +GH_PROJECT= gpsbabel +GH_TAGNAME= gpsbabel_1_6_0 DISTNAME= gpsbabel-${VERSION} PKGNAME-main= gpsbabel-${VERSION} PKGNAME-tk= gpsbabel-tk-${VERSION} PKGNAME-qt= gpsbabel-qt-${VERSION} CATEGORIES= geo -REVISION-main= 2 -REVISION-tk= 2 -REVISION-qt= 3 +REVISION-main= +REVISION-tk= +REVISION-qt= HOMEPAGE= http://www.gpsbabel.org/ # GPLv2 PERMIT_PACKAGE_CDROM= Yes -MASTER_SITES= http://www.linklevel.net/distfiles/ - COMPILER = base-clang ports-gcc base-gcc AUTOCONF_VERSION= 2.61 +USE_GMAKE= yes CONFIGURE_STYLE= autoconf qmake CONFIGURE_ARGS+= --with-zlib=system \ --with-shapefile=system \ @@ -38,7 +40,7 @@ CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ MULTI_PACKAGES= -main -tk -qt -MODULES= devel/qmake x11/tk x11/qt4 +MODULES= devel/qmake x11/tk x11/qt5 MODQMAKE_PROJECTS = gui/app.pro SEPARATE_BUILD= No @@ -47,12 +49,13 @@ LIB_DEPENDS-main= devel/libusb-compat \ devel/shapelib cWANTLIB = c m pthread -WANTLIB-main += expat shp>=1 usb z ${cWANTLIB} +WANTLIB-main += shp>=1 usb z ${COMPILER_LIBCXX} ${cWANTLIB} WANTLIB-tk = -WANTLIB-qt += ICE QtCore QtGui QtNetwork QtWebKit QtXml SM X11 Xext Xi -WANTLIB-qt += Xinerama Xrender fontconfig freetype ${COMPILER_LIBCXX} ${cWANTLIB} +WANTLIB-qt += Qt5Core Qt5Gui Qt5Widgets Qt5Network Qt5WebKit Qt5WebKitWidgets Qt5Xml GL +WANTLIB-qt += ${COMPILER_LIBCXX} ${cWANTLIB} LIB_DEPENDS-tk= +LIB_DEPENDS-qt= x11/qt5/qtwebkit PKG_ARCH-tk= * RUN_DEPENDS-tk= geo/gpsbabel \ ${MODTK_RUN_DEPENDS} @@ -61,16 +64,16 @@ RUN_DEPENDS-qt= geo/gpsbabel \ pre-configure: ${SUBST_CMD} ${WRKSRC}/guibabel - @perl -pi -e 's/gpsbabelfe-bin/guibabel-qt/' \ + @perl -pi -e 's/gpsbabelfe/guibabel-qt/' \ ${WRKSRC}/gui/gpsbabel.desktop post-build: - cd ${WRKBUILD} && make doc + cd ${WRKBUILD} && gmake doc ${MODQMAKE_build} do-install: ${INSTALL_PROGRAM} ${WRKBUILD}/gpsbabel ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKBUILD}/gui/objects/gpsbabelfe-bin \ + ${INSTALL_PROGRAM} ${WRKBUILD}/gui/objects/gpsbabelfe \ ${PREFIX}/bin/guibabel-qt ${INSTALL_SCRIPT} ${WRKSRC}/guibabel ${PREFIX}/bin ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gpsbabel diff -uNpr gpsbabel/distinfo gpsbabel.new/distinfo --- gpsbabel/distinfo Sat Aug 24 23:05:29 2019 +++ gpsbabel.new/distinfo Sat Aug 24 23:05:31 2019 @@ -1,2 +1,2 @@ -SHA256 (gpsbabel-1.4.4.tar.gz) = ndKgboh8sobJoHFkqPLt4RrtEUfmQZAHNwxShBIyGUQ= -SIZE (gpsbabel-1.4.4.tar.gz) = 7811264 +SHA256 (gpsbabel-1.6.0.tar.gz) = rVZ5b3Jdzbf1LZqVCdSSLxEZjDgv4Q/C1snvqBWfIJA= +SIZE (gpsbabel-1.6.0.tar.gz) = 14098867 diff -uNpr gpsbabel/patches/patch-Makefile_in gpsbabel.new/patches/patch-Makefile_in --- gpsbabel/patches/patch-Makefile_in Sat Aug 24 23:05:29 2019 +++ gpsbabel.new/patches/patch-Makefile_in Sat Aug 24 23:05:31 2019 @@ -1,24 +1,17 @@ -$OpenBSD: patch-Makefile_in,v 1.6 2012/02/18 22:04:07 sthen Exp $ ---- Makefile.in.orig Sun Jan 8 01:11:51 2012 -+++ Makefile.in Sun Jan 8 01:15:47 2012 -@@ -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 \ -- $(PALM_DB) $(GARMIN) $(JEEPS) $(SHAPE) @ZLIB@ $(FMTS) $(FILTERS) -+ $(PALM_DB) $(GARMIN) $(JEEPS) @SHAPE@ @ZLIB@ $(FMTS) $(FILTERS) - OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@ - - .c.o: -@@ -193,7 +193,6 @@ dep: +--- Makefile.in.orig Thu May 2 17:26:47 2019 ++++ Makefile.in Sat Aug 24 20:55:22 2019 +@@ -236,9 +236,8 @@ dep: $(WEB)/htmldoc-$(DOCVERSION)/index.html: FORCE mkdir -p $(WEB)/htmldoc-$(DOCVERSION) perl xmldoc/makedoc - xmlwf xmldoc/readme.xml #check for well-formedness xmllint --noout --valid xmldoc/readme.xml #validate - xsltproc \ +- xsltproc --load-trace \ ++ XML_CATALOG_FILES= xsltproc --load-trace \ --stringparam base.dir "$(WEB)/htmldoc-$(DOCVERSION)/" \ -@@ -246,7 +245,7 @@ changes.html: FORCE + --stringparam root.filename "index" \ + xmldoc/babelmain.xsl \ +@@ -293,7 +292,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 diff -uNpr gpsbabel/patches/patch-configure_in gpsbabel.new/patches/patch-configure_in --- gpsbabel/patches/patch-configure_in Sat Aug 24 23:05:29 2019 +++ gpsbabel.new/patches/patch-configure_in Thu Jan 1 09:00:00 1970 @@ -1,64 +0,0 @@ ---- 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) --AC_ARG_ENABLE(shapefile, -- [ --enable-shapefile=[(yes)|no]], -- [ 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 -+ "system") -+ AC_CHECK_LIB([shp], [SHPOpen]) - AC_DEFINE(SHAPELIB_ENABLED, 1, [1 to enable shapefile support]) -- AC_MSG_RESULT(yes) -- else -+ ;; -+ "no") - AC_MSG_RESULT(no) -- fi -+ ;; -+ *) 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, -@@ -223,32 +228,8 @@ 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) diff -uNpr gpsbabel/patches/patch-gbser_posix_c gpsbabel.new/patches/patch-gbser_posix_c --- gpsbabel/patches/patch-gbser_posix_c Sat Aug 24 23:05:29 2019 +++ gpsbabel.new/patches/patch-gbser_posix_c Thu Jan 1 09:00:00 1970 @@ -1,11 +0,0 @@ ---- 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 -uNpr gpsbabel/patches/patch-gbser_posix_cc gpsbabel.new/patches/patch-gbser_posix_cc --- gpsbabel/patches/patch-gbser_posix_cc Thu Jan 1 09:00:00 1970 +++ gpsbabel.new/patches/patch-gbser_posix_cc Sat Aug 24 23:05:31 2019 @@ -0,0 +1,11 @@ +--- gbser_posix.cc.orig Thu May 2 17:26:47 2019 ++++ gbser_posix.cc Sat Aug 24 19:55:42 2019 +@@ -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 -uNpr gpsbabel/patches/patch-gui_serial_unix_cc gpsbabel.new/patches/patch-gui_serial_unix_cc --- gpsbabel/patches/patch-gui_serial_unix_cc Thu Jan 1 09:00:00 1970 +++ gpsbabel.new/patches/patch-gui_serial_unix_cc Sat Aug 24 23:05:31 2019 @@ -0,0 +1,21 @@ +--- gui/serial_unix.cc.orig Thu May 2 17:26:47 2019 ++++ gui/serial_unix.cc Sat Aug 24 19:55:42 2019 +@@ -84,12 +84,12 @@ static QStringList dynamicDevices() + + + 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", + nullptr + }; + diff -uNpr gpsbabel/patches/patch-gui_serial_unix_cpp gpsbabel.new/patches/patch-gui_serial_unix_cpp --- gpsbabel/patches/patch-gui_serial_unix_cpp Sat Aug 24 23:05:29 2019 +++ gpsbabel.new/patches/patch-gui_serial_unix_cpp Thu Jan 1 09:00:00 1970 @@ -1,22 +0,0 @@ -$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 - }; - diff -uNpr gpsbabel/pkg/PLIST-main gpsbabel.new/pkg/PLIST-main --- gpsbabel/pkg/PLIST-main Sat Aug 24 23:05:29 2019 +++ gpsbabel.new/pkg/PLIST-main Sat Aug 24 23:05:31 2019 @@ -14,9 +14,8 @@ share/doc/gpsbabel/Introduction.html share/doc/gpsbabel/Invocation.html share/doc/gpsbabel/README.contrib share/doc/gpsbabel/README.igc -share/doc/gpsbabel/README.magnav share/doc/gpsbabel/README.mapconverter -share/doc/gpsbabel/README.psp +share/doc/gpsbabel/README.md share/doc/gpsbabel/README.xmapwpt share/doc/gpsbabel/Route_And_Track_Modes.html share/doc/gpsbabel/Source.html @@ -45,26 +44,21 @@ share/doc/gpsbabel/filter_stack.html share/doc/gpsbabel/filter_swap.html share/doc/gpsbabel/filter_track.html share/doc/gpsbabel/filter_transform.html +share/doc/gpsbabel/filter_validate.html share/doc/gpsbabel/fmt_alantrl.html share/doc/gpsbabel/fmt_alanwpr.html share/doc/gpsbabel/fmt_an1.html 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 share/doc/gpsbabel/fmt_compegps.html -share/doc/gpsbabel/fmt_copilot.html -share/doc/gpsbabel/fmt_coto.html 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 @@ -73,44 +67,44 @@ 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_energympro.html share/doc/gpsbabel/fmt_enigma.html share/doc/gpsbabel/fmt_exif.html +share/doc/gpsbabel/fmt_f90g.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_g1000.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 +share/doc/gpsbabel/fmt_geojson.html share/doc/gpsbabel/fmt_geonet.html -share/doc/gpsbabel/fmt_geoniche.html +share/doc/gpsbabel/fmt_ggv_bin.html share/doc/gpsbabel/fmt_ggv_log.html share/doc/gpsbabel/fmt_ggv_ovl.html +share/doc/gpsbabel/fmt_globalsat.html share/doc/gpsbabel/fmt_glogbook.html share/doc/gpsbabel/fmt_gnav_trl.html -share/doc/gpsbabel/fmt_google.html +share/doc/gpsbabel/fmt_googledir.html share/doc/gpsbabel/fmt_gopal.html -share/doc/gpsbabel/fmt_gpilots.html share/doc/gpsbabel/fmt_gpl.html share/doc/gpsbabel/fmt_gpsdrive.html share/doc/gpsbabel/fmt_gpsdrivetrack.html share/doc/gpsbabel/fmt_gpsman.html -share/doc/gpsbabel/fmt_gpspilot.html share/doc/gpsbabel/fmt_gpssim.html 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 share/doc/gpsbabel/fmt_html.html share/doc/gpsbabel/fmt_humminbird.html share/doc/gpsbabel/fmt_humminbird_ht.html @@ -120,6 +114,7 @@ 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_igoprimo_poi.html share/doc/gpsbabel/fmt_ik3d.html share/doc/gpsbabel/fmt_itracku-bin.html share/doc/gpsbabel/fmt_itracku.html @@ -128,32 +123,30 @@ 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_lowranceusr4.html share/doc/gpsbabel/fmt_m241-bin.html share/doc/gpsbabel/fmt_m241.html -share/doc/gpsbabel/fmt_mag_pdb.html share/doc/gpsbabel/fmt_magellan.html share/doc/gpsbabel/fmt_magellan1.html share/doc/gpsbabel/fmt_magellanx.html share/doc/gpsbabel/fmt_maggeo.html -share/doc/gpsbabel/fmt_magnav.html +share/doc/gpsbabel/fmt_mainnav.html share/doc/gpsbabel/fmt_mapasia_tr7.html +share/doc/gpsbabel/fmt_mapbar.html share/doc/gpsbabel/fmt_mapconverter.html +share/doc/gpsbabel/fmt_mapfactor.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_motoactv.html -share/doc/gpsbabel/fmt_msroute.html -share/doc/gpsbabel/fmt_msroute1.html share/doc/gpsbabel/fmt_mtk-bin.html share/doc/gpsbabel/fmt_mtk.html +share/doc/gpsbabel/fmt_mtk_locus.html share/doc/gpsbabel/fmt_mxf.html +share/doc/gpsbabel/fmt_mynav.html share/doc/gpsbabel/fmt_navicache.html share/doc/gpsbabel/fmt_navigonwpt.html share/doc/gpsbabel/fmt_naviguide.html @@ -166,15 +159,11 @@ share/doc/gpsbabel/fmt_nmn4.html share/doc/gpsbabel/fmt_openoffice.html share/doc/gpsbabel/fmt_osm.html 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 @@ -182,10 +171,10 @@ 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_shape.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 -- SASANO Takayoshi (JG1UAA) <[email protected]>
