Index: geography/gpsdrive/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/geography/gpsdrive/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- geography/gpsdrive/Makefile	12 Jun 2015 10:50:07 -0000	1.30
+++ geography/gpsdrive/Makefile	27 Jul 2015 13:17:58 -0000
@@ -1,9 +1,8 @@
 # $NetBSD: Makefile,v 1.30 2015/06/12 10:50:07 wiz Exp $
 
-DISTNAME=	gpsdrive-1.31
-PKGREVISION=	23
+DISTNAME=	gpsdrive-2.11
 CATEGORIES=	geography
-MASTER_SITES=	http://gpsdrive.kraftvoll.at/
+MASTER_SITES=	http://www.gpsdrive.de/packages/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gpsdrive.de/index.shtml
@@ -12,22 +11,48 @@
 DEPENDS+=	gpsd>=1.07:../../geography/gpsd
 DEPENDS+=	wget>=1:../../net/wget
 
-GNU_CONFIGURE=		YES
+#NU_CONFIGURE=		YES
 USE_PKGLOCALEDIR=	YES
 
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_TOOLS+=		bash:run perl:run
 
+USE_CMAKE=	yes
+CMAKE_ARGS+=	-Wno-dev
+CMAKE_ARGS+=    -DCMAKE_INCLUDE_PATH=${PREFIX}/include/gtk-2.0/gtk:${PREFIX}/include/freetype-2.0
+CMAKE_ARGS+=	-DGTK2_GLIB_INCLUDE_DIR=${PREFIX}/include/gtk-2.0/gtk
+CMAKE_ARG_PATH=	../
+CONFIGURE_DIRS=	build
+
+SUBST_CLASSES+=		gtk2
+SUBST_MESSAGE.gtk2=	Convert /opt/gnome and /usr/local to ${PREFIX}
+SUBST_STAGE.gtk2=	pre-configure
+SUBST_FILES.gtk2=	cmake/Modules/FindGTK2.cmake
+SUBST_SED.gtk2=		-e 's|/usr/local/|${PREFIX}/|'
+SUBST_SED.gtk2+=	-e 's|/opt/gnome/include/glib-2.0|${PREFIX}/include/glib-2.0|'
+SUBST_SED.gtk2+=	-e 's|/opt/gnome/lib/glib-2.0/include|${PREFIX}/lib/glib-2.0/include|'
+
 # XXX make this an option
 CONFIGURE_ARGS+=	--disable-mysql
 
 REPLACE_BASH=		src/gpsfetchmap
 REPLACE_PERL=		src/*.pl src/wpcvt
 
+pre-configure:
+	(${MKDIR} ${WRKSRC}/build;)
+
+#do-install:
+#        (cd ${WRKSRC}/build; ${GMAKE} DESTDIR=${DESTDIR} install)
+
+.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../devel/atk/buildlink3.mk"
+.include "../../x11/gtkglarea2/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
Index: geography/gpsdrive/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/geography/gpsdrive/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- geography/gpsdrive/distinfo	24 Nov 2011 14:06:04 -0000	1.5
+++ geography/gpsdrive/distinfo	27 Jul 2015 13:17:58 -0000
@@ -1,12 +1,5 @@
-$NetBSD: distinfo,v 1.5 2011/11/24 14:06:04 joerg Exp $
+$NetBSD$
 
-SHA1 (gpsdrive-1.31.tar.gz) = 296a06d264c5fbb077c91f3529b4e6f122423f05
-RMD160 (gpsdrive-1.31.tar.gz) = 56ea8fb9355e0381d55aeb691757c59c9e332406
-Size (gpsdrive-1.31.tar.gz) = 784379 bytes
-SHA1 (patch-aa) = cc5dd44020ffc5f22dc958c938b9f98ff6e01810
-SHA1 (patch-ab) = 240901fe52e41db1a41299f66ac61c06898f1881
-SHA1 (patch-ac) = 78e21378bc10d4a1098827d25308f59432b180f1
-SHA1 (patch-ad) = 05d6be6ba7bd37b4b0599092ace2d5db7825c01d
-SHA1 (patch-ae) = 5ab12f3f1f94a84acac0bc47fb4ad5a3bb75b7b6
-SHA1 (patch-af) = ba047381fcf07b3797c73199f85536b2a7efb61e
-SHA1 (patch-src_garmin__application.cpp) = 8b682f5545e67ff2906cec9fc44cbf601b0bd399
+SHA1 (gpsdrive-2.11.tar.gz) = 5bdb85fbb538b3c678975c896b16afc368161367
+RMD160 (gpsdrive-2.11.tar.gz) = c5821c65e319dd60126e4df6965ccdc5d0b74978
+Size (gpsdrive-2.11.tar.gz) = 5709822 bytes