update to qlandkarte-0.7.1 (note binary changed to lowercase now)

This commit is contained in:
pvalchev 2008-03-27 00:36:45 +00:00
parent c397ad7d37
commit 94b49001c6
8 changed files with 64 additions and 47 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.2 2008/01/02 22:17:51 bernd Exp $
# $OpenBSD: Makefile,v 1.3 2008/03/27 00:36:45 pvalchev Exp $
COMMENT= garmin gps map management tool
DISTNAME= QLandkarte.2007.12.22
PKGNAME= qlandkarte-0.6.0p0
DISTNAME= QLandkarte-0.7.1
PKGNAME= ${DISTNAME:L}
CATEGORIES= geo
HOMEPAGE= http://qlandkarte.sourceforge.net/
@ -28,19 +28,23 @@ WANTLIB+= ICE SM X11 Xcursor Xext Xfixes Xi Xinerama Xrandr Xrender \
crypto fontconfig freetype glib-2.0 gthread-2.0 iconv \
c intl m png pthread ssl stdc++ z
WRKDIST= ${WRKDIR}/QLandkarte
NO_REGRESS= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --with-qt-dir=${LOCALBASE}/lib/qt4 \
--with-extra-libs=${LOCALBASE}/lib \
--with-extra-includes=${LOCALBASE}/include \
--enable-release
pre-configure:
@perl -pi -e 's,!!PREFIX!!,${PREFIX},g' \
${WRKSRC}/common
@perl -pi -e 's,\/usr,${WRKINST}${PREFIX},g' \
${WRKSRC}/src/src.pro
@perl -pi -e 's,!!QLANDKARTE_BINDIR!!,${WRKINST}${PREFIX}/bin,g' \
${WRKSRC}/src/src.pro
@perl -pi -e 's,\$$\$$\{QLANDKARTE_LIBDIR\},\
${WRKINST}${PREFIX}/lib/qlandkarte,g' \
${WRKSRC}/src/device/*/*.pro
do-configure:
@(cd ${WRKSRC} && qmake4)
post-install:
@chown ${BINOWN}:${BINGRP} ${PREFIX}/bin/qlandkarte
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (QLandkarte.2007.12.22.tar.gz) = YUzSWWPoNP78rqcTfiqo2A==
RMD160 (QLandkarte.2007.12.22.tar.gz) = LyZtdFVR/owlFMDDSTAmS4hu6jQ=
SHA1 (QLandkarte.2007.12.22.tar.gz) = x21aZ58qA6UesYF90uGesl6mFWI=
SHA256 (QLandkarte.2007.12.22.tar.gz) = 7Z4YjESIG2YRX3lWNP6ieejSa2YnXZMMv2nNGqyF6wU=
SIZE (QLandkarte.2007.12.22.tar.gz) = 2248166
MD5 (QLandkarte-0.7.1.tar.gz) = 817wIhfXeuIDwzzdJf2MMw==
RMD160 (QLandkarte-0.7.1.tar.gz) = oGJxU40FG1C6HzsVA+XqwafDVBA=
SHA1 (QLandkarte-0.7.1.tar.gz) = bl0S93OGhj8mhInZgzsmaUO6xrY=
SHA256 (QLandkarte-0.7.1.tar.gz) = K7MG/FzyuB0xqSIf7NnurwMJQvKq1eJKUnKFrBy/oTc=
SIZE (QLandkarte-0.7.1.tar.gz) = 2277793

View File

@ -1,19 +0,0 @@
$OpenBSD: patch-common,v 1.1.1.1 2008/01/02 19:06:22 pvalchev Exp $
--- common.orig Tue Dec 25 22:21:15 2007
+++ common Tue Dec 25 22:21:41 2007
@@ -4,7 +4,7 @@ win32 {
}
unix{
- QLANDKARTE_LIBDIR = /usr/lib/qlandkarte
+ QLANDKARTE_LIBDIR = !!PREFIX!!/lib/qlandkarte
}
macx {
@@ -13,5 +13,5 @@ macx {
DEFINES += QL_LIBDIR=$${QLANDKARTE_LIBDIR} QT_NO_DEBUG_OUTPUToff
CONFIG += debug
-QMAKE_CXXFLAGS_RELEASE += -O3
+QMAKE_CXXFLAGS_RELEASE += -O2
QMAKE_CXXFLAGS_DEBUG +=

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_CToolViewLog_cpp,v 1.1.1.1 2008/01/02 19:06:22 pvalchev Exp $
--- src/CToolViewLog.cpp.orig Thu Sep 20 11:24:20 2007
+++ src/CToolViewLog.cpp Fri Dec 28 18:26:04 2007
@@ -122,7 +122,9 @@ void CToolViewLog::slotPosition(const CGarminLiveLog::
$OpenBSD: patch-src_CToolViewLog_cpp,v 1.2 2008/03/27 00:36:46 pvalchev Exp $
--- src/CToolViewLog.cpp.orig Wed Feb 13 02:15:18 2008
+++ src/CToolViewLog.cpp Sun Mar 23 22:35:43 2008
@@ -120,7 +120,9 @@ void CToolViewLog::slotPosition(const CGarminLiveLog::
lblErrorHoriz->setText(QString("\261%1m").arg(pvt.eph/2,0,'f',0));
lblErrorVert->setText(QString("\261%1m").arg(pvt.epv/2,0,'f',0));
lblSpeed->setText(QString("%1km/h").arg(speed_km_h, 0, 'f', 1));
@ -11,4 +11,4 @@ $OpenBSD: patch-src_CToolViewLog_cpp,v 1.1.1.1 2008/01/02 19:06:22 pvalchev Exp
+ lblHeading->setText(QString("%1\260T").arg((int)heading+0.5,3,'f',0,'0'));
lblTime->setText(t.toString());
}
else{
else {

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-src_IProjection_cpp,v 1.1.1.1 2008/01/02 19:06:22 pvalchev Exp $
--- src/IProjection.cpp.orig Fri Nov 30 06:25:05 2007
+++ src/IProjection.cpp Tue Dec 25 21:02:56 2007
@@ -106,7 +106,7 @@ double IProjection::distance(const XY& p1, const XY& p
lambdaP = lambda;
$OpenBSD: patch-src_IProjection_cpp,v 1.2 2008/03/27 00:36:46 pvalchev Exp $
--- src/IProjection.cpp.orig Wed Feb 13 02:15:18 2008
+++ src/IProjection.cpp Sun Mar 23 22:36:19 2008
@@ -108,7 +108,7 @@ double IProjection::distance(const XY& p1, const XY& p
lambda = L + (1-C) * f * sinAlpha * (sigma + C*sinSigma*(cos2SigmaM + C * cosSigma * (-1 + 2 * cos2SigmaM * cos2SigmaM)));
}
- if (iterLimit==0) return FP_NAN; // formula failed to converge
+ //if (iterLimit==0) return FP_NAN; // formula failed to converge
// formula failed to converge
- if (iterLimit==0) return FP_NAN;
+ //if (iterLimit==0) return FP_NAN;
double uSq = cosSqAlpha * (a*a - b*b) / (b*b);
double A = 1 + uSq/16384*(4096+uSq*(-768+uSq*(320-175*uSq)));

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-src_src_pro,v 1.1 2008/03/27 00:36:46 pvalchev Exp $
--- src/src.pro.orig Wed Mar 26 14:30:19 2008
+++ src/src.pro Wed Mar 26 14:30:22 2008
@@ -5,7 +5,7 @@
include(../common)
INSTALLS += target
-target.path = $${QLANDKARTE_BINDIR}
+target.path = !!QLANDKARTE_BINDIR!!
unix {
desktop.path = /usr/share/applications
desktop.files = ../qlandkarte.desktop
@@ -166,7 +166,7 @@ MOC_DIR = .tmp
OBJECTS_DIR = .tmp
macx:TARGET = QLandkarte
!macx:TARGET = qlandkarte
-DESTDIR = ../bin
+DESTDIR = !!QLANDKARTE_BINDIR!!
CONFIG += qt \
x11

View File

@ -1,8 +1,10 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2008/01/02 22:17:51 bernd Exp $
@comment $OpenBSD: PFRAG.shared,v 1.3 2008/03/27 00:36:46 pvalchev Exp $
lib/qlandkarte/libEmap.so
lib/qlandkarte/libEtrexH.so
lib/qlandkarte/libEtrexLegend.so
lib/qlandkarte/libEtrexLegendC.so
lib/qlandkarte/libEtrexLegendCx.so
lib/qlandkarte/libEtrexLegendHCx.so
lib/qlandkarte/libEtrexVentureCx.so
lib/qlandkarte/libEtrexVentureHC.so
lib/qlandkarte/libEtrexVista.so

View File

@ -1,4 +1,13 @@
@comment $OpenBSD: PLIST,v 1.2 2008/01/02 22:17:51 bernd Exp $
@comment $OpenBSD: PLIST,v 1.3 2008/03/27 00:36:46 pvalchev Exp $
%%SHARED%%
bin/QLandkarte
bin/qlandkarte
lib/qlandkarte/
man/cat3f/
man/man3f/
share/applications/
share/applications/qlandkarte.desktop
share/man/
share/man/qlandkarte.1
share/menu/
share/menu/qlandkarte.menu
share/nls/pl_PL.ISO_8859-2/