summaryrefslogtreecommitdiff
path: root/geography
diff options
context:
space:
mode:
Diffstat (limited to 'geography')
-rw-r--r--geography/qlandkartem/Makefile9
-rw-r--r--geography/qlandkartem/distinfo3
-rw-r--r--geography/qlandkartem/patches/patch-src_GeoMath_cpp14
3 files changed, 24 insertions, 2 deletions
diff --git a/geography/qlandkartem/Makefile b/geography/qlandkartem/Makefile
index 1d36244c246..5c86006e782 100644
--- a/geography/qlandkartem/Makefile
+++ b/geography/qlandkartem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2012/08/05 10:02:12 obache Exp $
+# $NetBSD: Makefile,v 1.16 2012/08/27 06:50:13 dholland Exp $
#
DISTNAME= QLandkarteM.0.2.0
@@ -19,6 +19,13 @@ USE_LIBTOOL= yes
USE_LANGUAGES= c c++
QMAKE= ${QTDIR}/bin/qmake
+SUBST_CLASSES+= proj
+SUBST_STAGE.proj= pre-configure
+SUBST_FILES.proj= src/*.cpp
+SUBST_FILES.proj+= src/CMapRaster.h
+SUBST_SED.proj= -e '/^.include .projects.h./s/projects/proj_api/'
+SUBST_MESSAGE.proj= Fixing geography/proj interface
+
INSTALLATION_DIRS+= bin
do-configure:
diff --git a/geography/qlandkartem/distinfo b/geography/qlandkartem/distinfo
index ba183bacba5..6094e83db82 100644
--- a/geography/qlandkartem/distinfo
+++ b/geography/qlandkartem/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.1 2010/03/02 21:48:55 jkunz Exp $
+$NetBSD: distinfo,v 1.2 2012/08/27 06:50:13 dholland Exp $
SHA1 (QLandkarteM.0.2.0.tar.gz) = 54649684df7dd904d436eee37513c3dcd42c44bf
RMD160 (QLandkarteM.0.2.0.tar.gz) = e6f18e7442b2845c9e492c67f44114bae1a5730c
Size (QLandkarteM.0.2.0.tar.gz) = 422493 bytes
SHA1 (patch-aa) = e3b996bcd37034e4486af58fc32c2f06492ec809
SHA1 (patch-ab) = 85ee59c2e40adc3927a928ff8becb983ee329148
+SHA1 (patch-src_GeoMath_cpp) = ff8ca8b9e53547b0f225b9235825bac8731ebea0
diff --git a/geography/qlandkartem/patches/patch-src_GeoMath_cpp b/geography/qlandkartem/patches/patch-src_GeoMath_cpp
new file mode 100644
index 00000000000..e448edcdb79
--- /dev/null
+++ b/geography/qlandkartem/patches/patch-src_GeoMath_cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_GeoMath_cpp,v 1.1 2012/08/27 06:50:13 dholland Exp $
+
+--- src/GeoMath.cpp~ 2012-08-27 06:38:38.000000000 +0000
++++ src/GeoMath.cpp
+@@ -24,6 +24,9 @@
+
+ #include <QtGui>
+
++#define PI M_PI
++#define TWOPI (2 * PI)
++
+ static bool GPS_Math_Deg_To_DegMin(qreal v, qint32 *d, qreal *m)
+ {
+ bool sign = v < 0;