svn commit: r348938 - in head/astro: libroadnav roadnav roadnav/files

[Baptiste Daroussin]

Author: bapt
Date: Mon Mar 24 11:30:42 2014
New Revision: 348938
URL: http://svnweb.freebsd.org/changeset/ports/348938
QAT: https://qat.redports.org/buildarchive/r348938/

Log:
  Use wx 2.8 (unicode version)
  Fix build with modern c++ compilers [1]
  
  Obtained from:	Gentoo

Added:
  head/astro/roadnav/files/patch-src__GPSInterface_Serial.cpp   (contents, props changed)
  head/astro/roadnav/files/patch-src__TTS_Festival.cpp   (contents, props changed)
Modified:
  head/astro/libroadnav/Makefile
  head/astro/roadnav/Makefile

Modified: head/astro/libroadnav/Makefile
==============================================================================
--- head/astro/libroadnav/Makefile	Mon Mar 24 11:20:13 2014	(r348937)
+++ head/astro/libroadnav/Makefile	Mon Mar 24 11:30:42 2014	(r348938)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libroadnav
 PORTVERSION=	0.19
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	astro geography
 MASTER_SITES=	SF/roadnav/LibRoadnav/${PORTVERSION}
 
@@ -12,8 +12,9 @@ COMMENT=	Helper library for Roadnav (3D 
 
 OPTIONS_DEFINE=	DOCS
 
-USE_WX=		2.6+
+USE_WX=		2.8+
 WX_COMPS=	wx contrib
+WX_UNICODE=	yes
 USES=		gmake
 
 GNU_CONFIGURE=	yes

Modified: head/astro/roadnav/Makefile
==============================================================================
--- head/astro/roadnav/Makefile	Mon Mar 24 11:20:13 2014	(r348937)
+++ head/astro/roadnav/Makefile	Mon Mar 24 11:30:42 2014	(r348938)
@@ -3,7 +3,7 @@
 
 PORTNAME=	roadnav
 PORTVERSION=	0.19
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	astro geography
 MASTER_SITES=	SF/${PORTNAME}/Roadnav/${PORTVERSION}
 
@@ -12,9 +12,11 @@ COMMENT=	3D GPS mapping program
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libroadnav.a:${PORTSDIR}/astro/libroadnav
 
-USE_WX=		2.6+
+USE_WX=		2.8+
 WX_COMPS=	wx contrib
+WX_UNICODE=	yes
 USES=		gmake
+CXXFLAGS+=	-Wnon-pod-varargs
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-wx-prefix=${LOCALBASE} --with-wx-config=${WX_CONFIG}

Added: head/astro/roadnav/files/patch-src__GPSInterface_Serial.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/astro/roadnav/files/patch-src__GPSInterface_Serial.cpp	Mon Mar 24 11:30:42 2014	(r348938)
@@ -0,0 +1,11 @@
+--- ./src/GPSInterface_Serial.cpp.orig	2007-10-09 04:02:14.000000000 +0200
++++ ./src/GPSInterface_Serial.cpp	2014-03-24 12:27:07.000000000 +0100
+@@ -243,7 +243,7 @@
+ 				
+ 				// Echo DeLorme Tripmate's and Earthmate's hello message
+ 				LibRoadnavDebug1(wxT("SerialIO"), wxT("Echoing hello message: %s"), strSentence.c_str());
+-				sprintf(szOut, "%s\r\n", strSentence.mb_str(*wxConvCurrent));
++				sprintf(szOut, "%s\r\n", static_cast<const char *>(strSentence.mb_str(*wxConvCurrent)));
+ 				WriteSerial(szOut);
+ 			}
+ 			else if (!VerifyGPSChecksum(strSentence)) // check NMEA validity

Added: head/astro/roadnav/files/patch-src__TTS_Festival.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/astro/roadnav/files/patch-src__TTS_Festival.cpp	Mon Mar 24 11:30:42 2014	(r348938)
@@ -0,0 +1,11 @@
+--- ./src/TTS_Festival.cpp.orig	2007-10-09 04:02:14.000000000 +0200
++++ ./src/TTS_Festival.cpp	2014-03-24 12:28:17.000000000 +0100
+@@ -88,7 +88,7 @@
+ 			ppszArgs[2], 
+ 			64 + strText.Length(),
+ 			wxT("echo \\(SayText \\\"%ss\\\"\\) | festival"), 
+-			strText.mb_str(*wxConvCurrent)
++			static_cast<const char *>strText.mb_str(*wxConvCurrent)
+ 			);
+ 
+ 	wxExecute(ppszArgs, wxEXEC_SYNC);