Hi, patch below is a minor update of QLGT to 1.7.4, mostly visible, getting rid of the arc4random patches that got included upstream.
OK? Index: Makefile =================================================================== RCS file: /cvs/ports/geo/qlandkartegt/Makefile,v retrieving revision 1.13 diff -u -p -u -r1.13 Makefile --- Makefile 12 Sep 2013 16:30:59 -0000 1.13 +++ Makefile 21 Sep 2013 13:57:28 -0000 @@ -3,7 +3,7 @@ VMEM_WARNING = yes COMMENT = garmin gps map management tool -DISTNAME = qlandkartegt-1.7.3 +DISTNAME = qlandkartegt-1.7.4 CATEGORIES = geo x11 HOMEPAGE = http://www.qlandkarte.org/ Index: distinfo =================================================================== RCS file: /cvs/ports/geo/qlandkartegt/distinfo,v retrieving revision 1.11 diff -u -p -u -r1.11 distinfo --- distinfo 12 Sep 2013 16:30:59 -0000 1.11 +++ distinfo 21 Sep 2013 13:57:28 -0000 @@ -1,2 +1,2 @@ -SHA256 (qlandkartegt-1.7.3.tar.gz) = 2/yWNvSozIhzff+MvTtBHksawXxVJRY5a1XR5oCtlTw= -SIZE (qlandkartegt-1.7.3.tar.gz) = 8334026 +SHA256 (qlandkartegt-1.7.4.tar.gz) = 1kEq5rNMLsil+Sn3qotNGmYPkT8W6lIJb5O0LU8nHa8= +SIZE (qlandkartegt-1.7.4.tar.gz) = 8332394 Index: patches/patch-3rdparty_map2jnx_main_cpp =================================================================== RCS file: patches/patch-3rdparty_map2jnx_main_cpp diff -N patches/patch-3rdparty_map2jnx_main_cpp --- patches/patch-3rdparty_map2jnx_main_cpp 12 Sep 2013 16:30:59 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,35 +0,0 @@ -$OpenBSD: patch-3rdparty_map2jnx_main_cpp,v 1.1 2013/09/12 16:30:59 sebastia Exp $ - -use arc4random - ---- 3rdparty/map2jnx/main.cpp.orig Mon Jun 17 14:27:52 2013 -+++ 3rdparty/map2jnx/main.cpp Thu Sep 12 09:09:12 2013 -@@ -14,6 +14,7 @@ - - **********************************************************************************************/ - -+#include "config.h" - - #ifdef _MSC_VER - #define fseeko _fseeki64 -@@ -419,14 +420,20 @@ static uint32_t scale2jnx(double scale) - static char randChar() - { - char buf[2]; -+#if defined(HAVE_ARC4RANDOM) -+ int r = (int)((arc4random() * 16.0) / UINT_MAX); -+#else - int r = (int)((rand() * 16.0) / RAND_MAX); -+#endif - sprintf(buf,"%X", r & 0x0F); - return buf[0]; - } - - static void createGUID(char * guid) - { -+#if !defined(HAVE_ARC4RANDOM) - srand((unsigned int)time(0)); -+#endif - - guid[0] = randChar(); - guid[1] = randChar(); Index: patches/patch-ConfigureChecks_cmake =================================================================== RCS file: patches/patch-ConfigureChecks_cmake diff -N patches/patch-ConfigureChecks_cmake --- patches/patch-ConfigureChecks_cmake 12 Sep 2013 16:30:59 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -$OpenBSD: patch-ConfigureChecks_cmake,v 1.1 2013/09/12 16:30:59 sebastia Exp $ - -use arc4random - ---- ConfigureChecks.cmake.orig Wed Sep 11 15:08:42 2013 -+++ ConfigureChecks.cmake Wed Sep 11 15:09:18 2013 -@@ -31,6 +31,8 @@ check_include_file(byteswap.h HAVE_BYTESWAP_H) - - test_big_endian(HAVE_BIGENDIAN) - -+check_function_exists(arc4random HAVE_ARC4RANDOM) -+ - # check if we're on a 64bit host - if(CMAKE_SIZEOF_VOID_P MATCHES "8") - SET(HOST_IS_64_BIT 1) Index: patches/patch-config_h_cmake =================================================================== RCS file: patches/patch-config_h_cmake diff -N patches/patch-config_h_cmake --- patches/patch-config_h_cmake 12 Sep 2013 16:30:59 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -$OpenBSD: patch-config_h_cmake,v 1.1 2013/09/12 16:30:59 sebastia Exp $ - -use arc4random - ---- config.h.cmake.orig Thu Sep 12 08:36:49 2013 -+++ config.h.cmake Thu Sep 12 08:37:05 2013 -@@ -19,6 +19,8 @@ - - #cmakedefine HAVE_BIGENDIAN 1 - -+#cmakedefine HAVE_ARC4RANDOM 1 -+ - /* build with native file dialogs */ - #define FILE_DIALOG_FLAGS ${FILEDIALOGFLAGS} - Index: patches/patch-src_CTrackDB_cpp =================================================================== RCS file: patches/patch-src_CTrackDB_cpp diff -N patches/patch-src_CTrackDB_cpp --- patches/patch-src_CTrackDB_cpp 12 Sep 2013 16:30:59 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,27 +0,0 @@ -$OpenBSD: patch-src_CTrackDB_cpp,v 1.1 2013/09/12 16:30:59 sebastia Exp $ - -use arc4random - ---- src/CTrackDB.cpp.orig Wed Aug 14 19:56:40 2013 -+++ src/CTrackDB.cpp Thu Sep 12 09:08:18 2013 -@@ -16,6 +16,8 @@ - along with this program. If not, see <http://www.gnu.org/licenses/>. - - **********************************************************************************************/ -+#include "config.h" -+ - #include <stdio.h> - #include <limits> - -@@ -173,7 +175,11 @@ void CTrackDB::loadGPX(CGpx& gpx) - hasItems = true; - CTrack* track = new CTrack(this); - //preset a random color -+#if defined(HAVE_ARC4RANDOM) -+ track->setColor((arc4random() % 13)+1); -+#else - track->setColor((rand() % 13)+1); -+#endif - - /* - * Global track information
