cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix update to mapserver 7.0.5.

Browse Source 
See
http://mapserver.org/development/changelog/changelog-7-0.html#changelog-7-0-5
This commit is contained in:
landry 2017-05-15 10:02:01 +00:00
parent 9838befc25
commit 6c9d8f2557
5 changed files with 13 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
geo/mapserver/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.45 2017/04/10 11:46:20 sthen Exp $
# $OpenBSD: Makefile,v 1.46 2017/05/15 10:02:01 landry Exp $
MULTI_PACKAGES= -utils -main -php -perl
@ -7,14 +7,13 @@ COMMENT-utils= mapserver utilities
COMMENT-php= PHP Mapscript extension
COMMENT-perl= Perl Mapscript binding
V = 7.0.4
V = 7.0.5
DISTNAME= mapserver-${V}
PKGNAME-main= ${DISTNAME}
PKGNAME-utils= mapserver-utils-${V}
PKGNAME-php= php-mapscript-${V}
PKGNAME-perl= p5-mapscript-${V}
SHARED_LIBS += mapserver 2.0
REVISION-main = 0
CATEGORIES= geo www

4
geo/mapserver/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (mapserver-7.0.4.tar.gz) = yR1A2lzCQrIMp+KcQb2esjCXuYp3kIsdcI6XCPb2z2k=
SIZE (mapserver-7.0.4.tar.gz) = 2624614
SHA256 (mapserver-7.0.5.tar.gz) = R/ABXdoYpBTiF0dX68GVQyQcPtF9r1FshLCpduf3IsI=
SIZE (mapserver-7.0.5.tar.gz) = 2631454

14
geo/mapserver/patches/patch-CMakeLists_txt
View File

@ -1,16 +1,20 @@
$OpenBSD: patch-CMakeLists_txt,v 1.5 2016/03/08 20:44:39 landry Exp $
$OpenBSD: patch-CMakeLists_txt,v 1.6 2017/05/15 10:02:01 landry Exp $
Ensure it uses our FindIconv.cmake module
--- CMakeLists.txt.orig Thu Feb 25 15:38:36 2016
+++ CMakeLists.txt Tue Mar 8 21:22:39 2016
@@ -346,7 +346,7 @@ find_package(Freetype)
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -346,9 +346,9 @@ find_package(Freetype)
if(NOT FREETYPE_FOUND)
report_mandatory_not_found(FREETYPE)
endif(NOT FREETYPE_FOUND)
-include_directories(${FREETYPE_INCLUDE_DIR})
+include_directories(${FREETYPE_INCLUDE_DIRS})
ms_link_libraries( ${FREETYPE_LIBRARY})
list(APPEND ALL_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIR})
-list(APPEND ALL_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIR})
+list(APPEND ALL_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIRS})
if(WITH_PROJ)
@@ -419,7 +419,7 @@ endif( USE_FRIBIDI AND NOT(USE_HARFBUZZ) )

15
geo/mapserver/patches/patch-cmake_FindPHP5_cmake
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-cmake_FindPHP5_cmake,v 1.1 2017/02/07 08:17:57 landry Exp $
https://github.com/mapserver/mapserver/commit/8fd1c73d75cd66caa2a04a2da5a7d0390b4b9dd6
--- cmake/FindPHP5.cmake.orig Mon Feb 6 14:34:08 2017
+++ cmake/FindPHP5.cmake Mon Feb 6 14:34:43 2017
@@ -86,6 +86,10 @@ IF(PHP5_CONFIG_EXECUTABLE)
MESSAGE(STATUS ${PHP5_MAIN_INCLUDE_DIR})
+ IF(NOT PHP5_INCLUDE_PATH)
+ set(PHP5_INCLUDE_PATH ${PHP5_INCLUDES})
+ ENDIF(NOT PHP5_INCLUDE_PATH)
+
IF(PHP5_VERSION LESS 5)
MESSAGE(FATAL_ERROR "PHP version is not 5 or later")
ENDIF(PHP5_VERSION LESS 5)

22
geo/mapserver/patches/patch-mapwms_c
View File

@ -1,22 +0,0 @@
$OpenBSD: patch-mapwms_c,v 1.3 2017/02/14 09:46:56 landry Exp $
https://github.com/mapserver/mapserver/issues/5387
--- mapwms.c.orig Mon Jan 16 17:02:20 2017
+++ mapwms.c Wed Feb 8 15:20:26 2017
@@ -791,7 +791,6 @@ int msWMSLoadGetMapParams(mapObj *map, int nVersion,
const char *wms_request, owsRequestObj *ows_request)
{
int i, adjust_extent = MS_FALSE, nonsquare_enabled = MS_FALSE;
- int nLayerOrder = 0;
int transparent = MS_NOOVERRIDE;
int bbox_pixel_is_point = MS_FALSE;
outputFormatObj *format = NULL;
@@ -870,6 +869,7 @@ int msWMSLoadGetMapParams(mapObj *map, int nVersion,
if (strcasecmp(names[i], "LAYERS") == 0) {
int j, k, iLayer, *layerOrder;
+ int nLayerOrder = 0;
char ***nestedGroups = NULL;
int *numNestedGroups = NULL;
int *isUsedInNestedGroup = NULL;