Index: head/science/gnudatalanguage/files/patch-CMakeLists.txt =================================================================== --- head/science/gnudatalanguage/files/patch-CMakeLists.txt (revision 414284) +++ head/science/gnudatalanguage/files/patch-CMakeLists.txt (revision 414285) @@ -1,11 +1,11 @@ ---- CMakeLists.txt.orig 2015-04-22 19:37:22 UTC +--- CMakeLists.txt.orig 2016-04-29 17:03:25 UTC +++ CMakeLists.txt -@@ -871,7 +871,7 @@ if(NOT PYTHON_MODULE) +@@ -925,7 +925,7 @@ if(NOT PYTHON_MODULE) endif(NOT PYTHON_MODULE) install(FILES ${CMAKE_SOURCE_DIR}/AUTHORS ${CMAKE_SOURCE_DIR}/README DESTINATION ${CMAKE_INSTALL_PREFIX}/${GDL_DATA_DIR}) -install(FILES ${CMAKE_SOURCE_DIR}/doc/gdl.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1) +install(FILES ${CMAKE_SOURCE_DIR}/doc/gdl.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1) # substitute variables in configure.h.cmake and move it to configure.h configure_file(${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h) Index: head/science/gnudatalanguage/files/patch-CMakeModules_Findlibps.cmake =================================================================== --- head/science/gnudatalanguage/files/patch-CMakeModules_Findlibps.cmake (revision 414284) +++ head/science/gnudatalanguage/files/patch-CMakeModules_Findlibps.cmake (revision 414285) @@ -1,8 +1,8 @@ ---- CMakeModules/Findlibps.cmake.orig 2015-04-22 19:37:22 UTC +--- CMakeModules/Findlibps.cmake.orig 2016-04-29 17:03:25 UTC +++ CMakeModules/Findlibps.cmake @@ -1,4 +1,4 @@ -find_path(LIBPSPKG libps.pc PATH_SUFFIXES lib lib/pkgconfig lib64/pkgconfig) +find_path(LIBPSPKG libps.pc PATH_SUFFIXES lib libdata/pkgconfig lib/pkgconfig lib64/pkgconfig) include(FindPackageHandleStandardArgs) if(LIBPSPKG) set(ENV{PKG_CONFIG_PATH} ${LIBPSPKG}) # pkg search path Index: head/science/gnudatalanguage/files/patch-src__basic_fun.cpp =================================================================== --- head/science/gnudatalanguage/files/patch-src__basic_fun.cpp (revision 414284) +++ head/science/gnudatalanguage/files/patch-src__basic_fun.cpp (revision 414285) @@ -1,20 +1,20 @@ ---- src/basic_fun.cpp.orig 2016-01-04 19:52:38 UTC +--- src/basic_fun.cpp.orig 2016-04-29 17:03:25 UTC +++ src/basic_fun.cpp @@ -6523,7 +6523,7 @@ namespace lib { { // check if the data we get is a port this allows us to correctly parse things like a.com:80 p = e + 1; - while (isdigit(*p)) p++; + while (std::isdigit(*p)) p++; if ((*p == '\0' || *p == '/') && (p - e) < 7) goto parse_port; urlstru->InitTag("SCHEME", DStringGDL(string(s, (e - s)))); length -= ++e - s; @@ -6574,7 +6574,7 @@ namespace lib { parse_port: p = e + 1; pp = p; - while (pp-p < 6 && isdigit(*pp)) pp++; + while (pp-p < 6 && std::isdigit(*pp)) pp++; if (pp-p < 6 && (*pp == '/' || *pp == '\0')) { memcpy(port_buf, p, (pp-p)); Index: head/science/gnudatalanguage/files/patch-src__file.cpp =================================================================== --- head/science/gnudatalanguage/files/patch-src__file.cpp (revision 414284) +++ head/science/gnudatalanguage/files/patch-src__file.cpp (revision 414285) @@ -1,15 +1,15 @@ ---- src/file.cpp.orig 2016-01-04 20:50:45 UTC +--- src/file.cpp.orig 2016-04-29 17:03:25 UTC +++ src/file.cpp @@ -242,10 +242,11 @@ extern "C" #endif #define NTEST_SEARCH 7 -#ifdef __CYGWIN__ +#if defined(__CYGWIN__) || defined(__FreeBSD__) #define stat64 stat #define lstat64 lstat // for religious reasons, CYGWIN doesn't do lstat64 +// FreeBSD doesn't do lstat64 because there is no need for it #endif namespace lib { Index: head/science/gnudatalanguage/files/patch-src__gshhs.cpp =================================================================== --- head/science/gnudatalanguage/files/patch-src__gshhs.cpp (revision 414284) +++ head/science/gnudatalanguage/files/patch-src__gshhs.cpp (revision 414285) @@ -1,11 +1,11 @@ ---- src/gshhs.cpp.orig 2015-04-22 19:37:22 UTC +--- src/gshhs.cpp.orig 2016-04-29 17:03:25 UTC +++ src/gshhs.cpp @@ -175,7 +175,7 @@ private: double ss = h.south * GSHHS_SCL; double nn = h.north * GSHHS_SCL; char source = (src == 1) ? 'W' : 'C'; // Either WVS or CIA (WDBII) pedigree - if ( river ) source = tolower( (int) source ); // Lower case c means river-lake + if ( river ) source = std::tolower( (int) source ); // Lower case c means river-lake int line = (h.area) ? 0 : 1; // Either Polygon (0) or Line (1) (if no area) Index: head/science/gnudatalanguage/files/patch-src_hdf5__fun.cpp =================================================================== --- head/science/gnudatalanguage/files/patch-src_hdf5__fun.cpp (nonexistent) +++ head/science/gnudatalanguage/files/patch-src_hdf5__fun.cpp (revision 414285) @@ -0,0 +1,20 @@ +--- src/hdf5_fun.cpp.orig 2016-04-29 17:03:25 UTC ++++ src/hdf5_fun.cpp +@@ -348,7 +348,7 @@ namespace lib { + SizeT nParam=e->NParam(1); + hsize_t dims_out[MAXRANK]; + +- hid_t h5a_id; ++ DLong h5a_id; + e->AssureLongScalarPar(0, h5a_id); + + hid_t h5s_id = H5Aget_space(h5a_id); +@@ -402,7 +402,7 @@ namespace lib { + SizeT nParam=e->NParam(1); + hsize_t dims_out[MAXRANK]; + +- hid_t h5d_id; ++ DLong h5d_id; + e->AssureLongScalarPar(0, h5d_id); + + hid_t h5s_id = H5Dget_space(h5d_id); Property changes on: head/science/gnudatalanguage/files/patch-src_hdf5__fun.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property