Hi, prompted by kirby@'s note about merkaartor 0.18.1 not requiring boost anymore, here's an update for it - in fact it doesnt seem to need boost if qt >= 4.7 is used. While here add the hard-depend on gdal and drop all the g++3 patches.
Landry
? patch-3rdparty_qtsingleapplication-2_6_1-opensource_src_qtlocalpeer_cpp ? patch-src_MainWindow_cpp ? patch-src_Maps_Coord_cpp Index: Makefile =================================================================== RCS file: /cvs/ports/geo/merkaartor/Makefile,v retrieving revision 1.15 diff -u -r1.15 Makefile --- Makefile 15 Jun 2012 08:32:15 -0000 1.15 +++ Makefile 10 Jan 2013 19:25:15 -0000 @@ -2,9 +2,8 @@ COMMENT = OpenStreetMap editor -DISTNAME = merkaartor-0.17.2 +DISTNAME = merkaartor-0.18.1 EXTRACT_SUFX = .tar.bz2 -REVISION = 0 CATEGORIES = geo x11 @@ -17,21 +16,20 @@ PERMIT_DISTFILES_CDROM =Yes PERMIT_DISTFILES_FTP = Yes -MASTER_SITES = http://merkaartor.be/attachments/download/253/ +MASTER_SITES = http://merkaartor.be/attachments/download/301/ NO_REGRESS = Yes MODULES = devel/gettext x11/qt4 -BUILD_DEPENDS = devel/boost RUN_DEPENDS = devel/desktop-file-utils \ x11/gtk+2,-guic -LIB_DEPENDS = x11/qt4 devel/proj +LIB_DEPENDS = x11/qt4 devel/proj geo/gdal -WANTLIB += QtGui QtNetwork QtSvg QtWebKit QtXml c m proj pthread +WANTLIB += QtGui QtNetwork QtSvg QtWebKit QtXml c m proj pthread gdal WANTLIB += stdc++ z ICE SM X11 Xext Xi Xinerama Xrender fontconfig freetype do-configure: - cd ${WRKSRC} && env ${CONFIGURE_ENV} qmake4 GDAL=0 PROJ=1 NODEBUG=1 \ + cd ${WRKSRC} && env ${CONFIGURE_ENV} qmake4 PROJ=1 NODEBUG=1 RELEASE=1 \ PREFIX=${WRKINST}${PREFIX} TRANSDIR_MERKAARTOR=${WRKINST}/${PREFIX}/share/merkaartor/translations pre-build: Index: distinfo =================================================================== RCS file: /cvs/ports/geo/merkaartor/distinfo,v retrieving revision 1.5 diff -u -r1.5 distinfo --- distinfo 6 Jan 2012 16:46:13 -0000 1.5 +++ distinfo 10 Jan 2013 19:25:15 -0000 @@ -1,5 +1,2 @@ -MD5 (merkaartor-0.17.2.tar.bz2) = RMSfc++liaRVu509CihNCQ== -RMD160 (merkaartor-0.17.2.tar.bz2) = xciUSHKCi6WtpgA81YIfM4mdo8s= -SHA1 (merkaartor-0.17.2.tar.bz2) = 94kUHbQnvyW7O2GAH+/JirBDABI= -SHA256 (merkaartor-0.17.2.tar.bz2) = Ql9PrO+/IKPdGgnuYf+KiRJILRowyVfFCGnY/1m6cCo= -SIZE (merkaartor-0.17.2.tar.bz2) = 7138991 +SHA256 (merkaartor-0.18.1.tar.bz2) = PWqWWZgV1fHIVYrNJVpBPqR7k92thBQUfRF3Wm8hE58= +SIZE (merkaartor-0.18.1.tar.bz2) = 5579080 Index: patches/patch-3rdparty_qtsingleapplication-2_6_1-opensource_src_qtlocalpeer_cpp =================================================================== RCS file: patches/patch-3rdparty_qtsingleapplication-2_6_1-opensource_src_qtlocalpeer_cpp diff -N patches/patch-3rdparty_qtsingleapplication-2_6_1-opensource_src_qtlocalpeer_cpp --- patches/patch-3rdparty_qtsingleapplication-2_6_1-opensource_src_qtlocalpeer_cpp 13 Jun 2010 10:57:35 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-3rdparty_qtsingleapplication-2_6_1-opensource_src_qtlocalpeer_cpp,v 1.1 2010/06/13 10:57:35 landry Exp $ ---- 3rdparty/qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp.orig Sat Jun 12 16:52:09 2010 -+++ 3rdparty/qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp Sat Jun 12 16:52:33 2010 -@@ -57,6 +57,8 @@ static PProcessIdToSessionId pProcessIdToSessionId = 0 - #endif - #if defined(Q_OS_UNIX) - #include <time.h> -+#include <sys/types.h> -+#include <unistd.h> - #endif - - namespace QtLP_Private { Index: patches/patch-src_MainWindow_cpp =================================================================== RCS file: patches/patch-src_MainWindow_cpp diff -N patches/patch-src_MainWindow_cpp --- patches/patch-src_MainWindow_cpp 10 Jan 2011 09:34:24 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -$OpenBSD: patch-src_MainWindow_cpp,v 1.2 2011/01/10 09:34:24 landry Exp $ ---- src/MainWindow.cpp.orig Sun Dec 26 12:09:36 2010 -+++ src/MainWindow.cpp Sun Jan 9 10:49:43 2011 -@@ -102,6 +102,7 @@ - #include <QStyleFactory> - #include <QMenu> - #include <QTcpServer> -+#include <QTcpSocket> - - #include "qttoolbardialog.h" - Index: patches/patch-src_Maps_Coord_cpp =================================================================== RCS file: patches/patch-src_Maps_Coord_cpp diff -N patches/patch-src_Maps_Coord_cpp --- patches/patch-src_Maps_Coord_cpp 13 Jun 2010 10:57:35 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ -$OpenBSD: patch-src_Maps_Coord_cpp,v 1.3 2010/06/13 10:57:35 landry Exp $ -Confuses g++3 ---- src/Maps/Coord.cpp.orig Sun Jun 6 16:41:25 2010 -+++ src/Maps/Coord.cpp Sat Jun 12 16:43:50 2010 -@@ -23,7 +23,7 @@ double angle(Coord p1) - - void rotate(Coord & p1,double angle) - { -- Coord p1p(sin(angle)*p1.lon()+cos(angle)*p1.lat(),cos(angle)*p1.lon()-sin(angle)*p1.lat()); -+ Coord p1p = Coord(sin(angle)*p1.lon()+cos(angle)*p1.lat(),cos(angle)*p1.lon()-sin(angle)*p1.lat()); - p1=p1p; - } - Index: patches/patch-src_Preferences_BookmarksList_cpp =================================================================== RCS file: patches/patch-src_Preferences_BookmarksList_cpp diff -N patches/patch-src_Preferences_BookmarksList_cpp --- patches/patch-src_Preferences_BookmarksList_cpp 13 Jun 2010 10:57:35 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_Preferences_BookmarksList_cpp,v 1.2 2010/06/13 10:57:35 landry Exp $ -Confuses g++3 ---- src/Preferences/BookmarksList.cpp.orig Sun Jun 6 16:41:25 2010 -+++ src/Preferences/BookmarksList.cpp Sun Jun 13 11:20:39 2010 -@@ -17,7 +17,8 @@ - - Bookmark::Bookmark() - { -- Bookmark(QApplication::translate("MerkaartorPreferences","New Bookmark"), CoordBox()); -+ QString q = QApplication::translate("MerkaartorPreferences","New Bookmark"); -+ Bookmark(q, CoordBox()); - } - - Bookmark::Bookmark(QString aName, CoordBox aCoord, bool Deleted) Index: patches/patch-src_Preferences_TmsServersList_cpp =================================================================== RCS file: patches/patch-src_Preferences_TmsServersList_cpp diff -N patches/patch-src_Preferences_TmsServersList_cpp --- patches/patch-src_Preferences_TmsServersList_cpp 10 Jan 2011 09:34:24 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_Preferences_TmsServersList_cpp,v 1.3 2011/01/10 09:34:24 landry Exp $ -Confuses g++3 ---- src/Preferences/TmsServersList.cpp.orig Sun Dec 26 12:09:36 2010 -+++ src/Preferences/TmsServersList.cpp Sun Jan 9 10:59:54 2011 -@@ -17,7 +17,8 @@ - - TmsServer::TmsServer() - { -- TmsServer(QApplication::translate("MerkaartorPreferences","New Server"), "", "", "EPSG:3857", 256, 0, 17, "", ""); -+ QString q = QApplication::translate("MerkaartorPreferences","New Server"); -+ TmsServer(q, "", "", "EPSG:3857", 256, 0, 17, "", ""); - } - - TmsServer::TmsServer(QString Name, QString Adress, QString Path, QString Projection, int tileSize, int minZoom, int maxZoom, QString SourceTag, QString LicenseUrl, QString baseUrl, bool Origin, bool Deleted) Index: patches/patch-src_Preferences_WmsServersList_cpp =================================================================== RCS file: patches/patch-src_Preferences_WmsServersList_cpp diff -N patches/patch-src_Preferences_WmsServersList_cpp --- patches/patch-src_Preferences_WmsServersList_cpp 10 Jan 2011 09:34:24 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_Preferences_WmsServersList_cpp,v 1.3 2011/01/10 09:34:24 landry Exp $ -Confuses g++3 ---- src/Preferences/WmsServersList.cpp.orig Sun Dec 26 12:09:36 2010 -+++ src/Preferences/WmsServersList.cpp Sun Jan 9 11:00:33 2011 -@@ -17,7 +17,8 @@ - - WmsServer::WmsServer() - { -- WmsServer(QApplication::translate("MerkaartorPreferences","New Server"), "", "", "", "", "", "", "", ""); -+ QString q = QApplication::translate("MerkaartorPreferences","New Server"); -+ WmsServer(q, "", "", "", "", "", "", "", ""); - } - - WmsServer::WmsServer(QString Name, QString Adress, QString Path, QString Layers Index: patches/patch-src_Tools_RegionMapWidget_cpp =================================================================== RCS file: patches/patch-src_Tools_RegionMapWidget_cpp diff -N patches/patch-src_Tools_RegionMapWidget_cpp --- patches/patch-src_Tools_RegionMapWidget_cpp 13 Jun 2010 10:57:35 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ -$OpenBSD: patch-src_Tools_RegionMapWidget_cpp,v 1.2 2010/06/13 10:57:35 landry Exp $ -Confuses g++3 ---- src/Tools/RegionMapWidget.cpp.orig Sun Jun 6 16:41:25 2010 -+++ src/Tools/RegionMapWidget.cpp Sat Jun 12 16:49:28 2010 -@@ -114,7 +114,7 @@ void RegionMapWidget::mouseReleaseEvent(QMouseEvent* e - CoordBox v = CoordBox(Coord(R.y(), R.x()), Coord(R.y()+R.height(), R.x()+R.width())); - QPointF P = ev->pos(); - -- Coord Pt(int(((height()-P.y()) / height() * v.latDiff()) + v.bottomLeft().lat()), int((P.x() / width() * v.lonDiff()) + v.bottomLeft().lon())); -+ Coord Pt = Coord(int(((height()-P.y()) / height() * v.latDiff()) + v.bottomLeft().lat()), int((P.x() / width() * v.lonDiff()) + v.bottomLeft().lon())); - int x = int(((qint64)Pt.lon()) / REGION_WIDTH); - x = (x < 0) ? x-1 :x; - int y = int(((qint64)Pt.lat()) / REGION_WIDTH); Index: patches/patch-src_src_pro =================================================================== RCS file: /cvs/ports/geo/merkaartor/patches/patch-src_src_pro,v retrieving revision 1.4 diff -u -r1.4 patch-src_src_pro --- patches/patch-src_src_pro 10 Jan 2011 09:34:24 -0000 1.4 +++ patches/patch-src_src_pro 10 Jan 2013 19:25:15 -0000 @@ -1,8 +1,8 @@ $OpenBSD: patch-src_src_pro,v 1.4 2011/01/10 09:34:24 landry Exp $ Properly set translations/plugins paths ---- src/src.pro.orig Sun Dec 26 12:09:36 2010 -+++ src/src.pro Sun Jan 9 10:49:44 2011 -@@ -170,7 +170,7 @@ unix { +--- src/src.pro.orig Mon Jun 11 17:01:23 2012 ++++ src/src.pro Thu Jan 10 18:03:39 2013 +@@ -145,7 +145,7 @@ unix:!macx { isEmpty( LIBDIR ) { LIBDIR = $${PREFIX}/lib${LIB_SUFFIX} } @@ -11,7 +11,7 @@ target.path = $${PREFIX}/bin SHARE_DIR = $${PREFIX}/share/merkaartor -@@ -199,7 +199,7 @@ win32-msvc* { +@@ -214,7 +214,7 @@ BINTRANSLATIONS += \ translations.path = $${TRANSDIR_MERKAARTOR} translations.files = $${BINTRANSLATIONS} @@ -20,12 +20,3 @@ INSTALLS += translations count(TRANSDIR_SYSTEM, 1) { -@@ -248,7 +248,7 @@ contains (PROJ, 1) { - macx { - DEFINES += WORLD_SHP=world_background.osb - } else { -- DEFINES += WORLD_SHP=$$world_shp.path/world_background.osb -+ DEFINES += WORLD_SHP=${TRUEPREFIX}/share/merkaartor/world_background.osb - } - INSTALLS += world_shp - Index: pkg/PFRAG.shared =================================================================== RCS file: /cvs/ports/geo/merkaartor/pkg/PFRAG.shared,v retrieving revision 1.4 diff -u -r1.4 PFRAG.shared --- pkg/PFRAG.shared 10 Jan 2011 09:34:24 -0000 1.4 +++ pkg/PFRAG.shared 10 Jan 2013 19:25:15 -0000 @@ -1,7 +1,7 @@ @comment $OpenBSD: PFRAG.shared,v 1.4 2011/01/10 09:34:24 landry Exp $ lib/merkaartor/plugins/background/libMCadastreFranceBackgroundPlugin.so +lib/merkaartor/plugins/background/libMGdalBackgroundPlugin.so +lib/merkaartor/plugins/background/libMGeoTiffBackgroundPlugin.so lib/merkaartor/plugins/background/libMMsBingMapBackgroundPlugin.so lib/merkaartor/plugins/background/libMWalkingPapersBackgroundPlugin.so -lib/merkaartor/plugins/background/libMYahooBackgroundPlugin.so -lib/merkaartor/plugins/background/libMYahooTiledBackgroundPlugin.so lib/merkaartor/plugins/styles/libskulpture.so Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/geo/merkaartor/pkg/PLIST,v retrieving revision 1.7 diff -u -r1.7 PLIST --- pkg/PLIST 15 Jun 2012 08:32:15 -0000 1.7 +++ pkg/PLIST 10 Jan 2013 19:25:15 -0000 @@ -31,7 +31,6 @@ share/merkaartor/translations/merkaartor_sk.qm share/merkaartor/translations/merkaartor_sv.qm share/merkaartor/translations/merkaartor_uk.qm -share/merkaartor/world_background.osb @exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor @unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor @exec %D/bin/update-desktop-database
