diff --git a/geo/qlandkartegt/Makefile b/geo/qlandkartegt/Makefile index fc9f037f2ae..2f550caf168 100644 --- a/geo/qlandkartegt/Makefile +++ b/geo/qlandkartegt/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.9 2012/01/18 15:08:33 sebastia Exp $ +# $OpenBSD: Makefile,v 1.10 2012/07/12 08:19:28 sebastia Exp $ VMEM_WARNING = yes COMMENT = garmin gps map management tool -DISTNAME = qlandkartegt-1.3.2 +DISTNAME = qlandkartegt-1.5.0 CATEGORIES = geo x11 HOMEPAGE = http://www.qlandkarte.org/ @@ -19,7 +19,7 @@ PERMIT_DISTFILES_FTP = Yes MODULES = devel/cmake x11/qt4 WANTLIB += GL GLU ICE SM X11 Xext c m pthread stdc++ z gdal gps>=19 WANTLIB += exif QtDBus QtGui QtNetwork QtOpenGL QtSql QtXml QtCore proj -WANTLIB += QtWebKit QtXmlPatterns phonon jpeg dmtx +WANTLIB += QtWebKit QtXmlPatterns phonon jpeg dmtx QtScript BUILD_DEPENDS += geo/gpsbabel LIB_DEPENDS += devel/proj \ x11/qt4 \ @@ -31,4 +31,7 @@ RUN_DEPENDS = devel/desktop-file-utils \ geo/garmindev \ geo/gpsbabel +post-extract: + rm ${WRKSRC}/src/CMegaMenu.cpp.orig + .include diff --git a/geo/qlandkartegt/distinfo b/geo/qlandkartegt/distinfo index 16054060d98..f7b58e1988b 100644 --- a/geo/qlandkartegt/distinfo +++ b/geo/qlandkartegt/distinfo @@ -1,5 +1,5 @@ -MD5 (qlandkartegt-1.3.2.tar.gz) = HcG3KEsVIxl4+dDsY1PPZQ== -RMD160 (qlandkartegt-1.3.2.tar.gz) = BixPob3flTGUk+LesiUBjPXiHA0= -SHA1 (qlandkartegt-1.3.2.tar.gz) = OPIgSpS48MR+GuXWk8I4RYauofs= -SHA256 (qlandkartegt-1.3.2.tar.gz) = M2zLMrZHKDoKSetjhXG+g5czKEalB0kHk/QTp68pre4= -SIZE (qlandkartegt-1.3.2.tar.gz) = 4549942 +MD5 (qlandkartegt-1.5.0.tar.gz) = bO49OS67wT7If2SnOaciXg== +RMD160 (qlandkartegt-1.5.0.tar.gz) = S9cAohNp0mfzEY03X0WHtsj7kD0= +SHA1 (qlandkartegt-1.5.0.tar.gz) = 9zPR8E/vyox5zcI9RRBA4P031do= +SHA256 (qlandkartegt-1.5.0.tar.gz) = Q5E31IZCF8NQZ42DV8B6D4BFXyz/Nac23WtYotPWg7Q= +SIZE (qlandkartegt-1.5.0.tar.gz) = 6388844 diff --git a/geo/qlandkartegt/patches/patch-src_CMainWindow_cpp b/geo/qlandkartegt/patches/patch-src_CMainWindow_cpp deleted file mode 100644 index 049f5fcee9f..00000000000 --- a/geo/qlandkartegt/patches/patch-src_CMainWindow_cpp +++ /dev/null @@ -1,24 +0,0 @@ -$OpenBSD: patch-src_CMainWindow_cpp,v 1.1 2012/01/18 15:08:33 sebastia Exp $ - -fix detection of gpsbabel and conversions done with it - ---- src/CMainWindow.cpp.orig Wed Jan 4 14:53:52 2012 -+++ src/CMainWindow.cpp Wed Jan 11 08:21:51 2012 -@@ -936,7 +936,7 @@ bool CMainWindow::convertData(const QString& inFormat, - return false; - } - -- if (!babelProcess->waitForFinished()) -+ if (!babelProcess->waitForFinished(-1)) - { - return false; - } -@@ -1536,7 +1536,7 @@ bool CMainWindow::isGPSBabel() - bool haveGPSBabel = false; - QProcess proc1; - proc1.start(GPSBABEL " -V"); -- proc1.waitForFinished(); -+ proc1.waitForFinished(-1); - haveGPSBabel = proc1.error() == QProcess::UnknownError; - return haveGPSBabel; - } diff --git a/geo/qlandkartegt/pkg/PLIST b/geo/qlandkartegt/pkg/PLIST index d2ddd029f02..c19ed2ec64f 100644 --- a/geo/qlandkartegt/pkg/PLIST +++ b/geo/qlandkartegt/pkg/PLIST @@ -1,17 +1,21 @@ -@comment $OpenBSD: PLIST,v 1.3 2011/12/22 17:49:06 sebastia Exp $ +@comment $OpenBSD: PLIST,v 1.4 2012/07/12 08:19:28 sebastia Exp $ +@bin bin/cache2gtiff @bin bin/map2gcm +@bin bin/map2rmap @bin bin/qlandkartegt @man man/man1/qlandkartegt.1 share/applications/qlandkartegt.desktop +share/doc/pkg-readmes/${FULLPKGNAME} share/pixmaps/ share/pixmaps/qlandkartegt.png share/qlandkartegt/ share/qlandkartegt/translations/ +share/qlandkartegt/translations/qlandkartegt_cs.qm share/qlandkartegt/translations/qlandkartegt_de.qm share/qlandkartegt/translations/qlandkartegt_es_ES.qm share/qlandkartegt/translations/qlandkartegt_fr.qm share/qlandkartegt/translations/qlandkartegt_it_IT.qm -share/qlandkartegt/translations/qlandkartegt_nl_NL.qm +share/qlandkartegt/translations/qlandkartegt_nl.qm share/qlandkartegt/translations/qlandkartegt_ru.qm @exec %D/bin/update-desktop-database @unexec-delete %D/bin/update-desktop-database diff --git a/geo/qlandkartegt/pkg/README b/geo/qlandkartegt/pkg/README new file mode 100644 index 00000000000..4b275152f8b --- /dev/null +++ b/geo/qlandkartegt/pkg/README @@ -0,0 +1,10 @@ +qlandkarte accesses USB GPS devices via the ugen device driver. A scan +is performed by successively opening ugen device nodes (starting with +ugen0) until either your GPS device is found or until the ugen devices +are exhausted. + +By default OpenBSD creates only two ugen device nodes, so if for +example, your device attaches as ugen4, you will have to create ugen2 +through ugen4 manually: + +cd /dev && sudo sh MAKEDEV ugen{2,3,4}