sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Update to 6.4.1

Browse source 
- Fix build with python option [1]
- Fix run error while reading MapInfo layer with AUTO styleitem [2]

PR:		189940 [1]
Submitted by:	Julien Cigar<jcigar@ulb.ac.be> [1]
		marten.ambroz@seznam.cz (via email) [2]
This commit is contained in:
Wen Heping 2014-08-26 13:05:22 +00:00
parent 5c2e7226d6
commit b0adf7a1bf
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=366212
5 changed files with 24 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
graphics/mapserver/Makefile
View file

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= mapserver
PORTVERSION= 6.4.0
PORTREVISION= 6
PORTVERSION= 6.4.1
CATEGORIES= graphics www geography
MASTER_SITES= http://download.osgeo.org/mapserver/
@ -16,7 +15,7 @@ LIB_DEPENDS= libgd.so:${PORTSDIR}/graphics/gd \
libjpeg.so:${PORTSDIR}/graphics/jpeg \
libgif.so:${PORTSDIR}/graphics/giflib
USES= cmake
USES= cmake:outsource
USE_GNOME= libxml2
LDFLAGS+= -L${LOCALBASE} -pthread
CMAKE_ARGS+= -DCMAKE_PREFIX_PATH=${LOCALBASE} \
@ -180,22 +179,24 @@ CMAKE_ARGS+= -DWITH_CURL=1 -DGDAL=1 -DCLIENT_WFS=1
do-install:
.for f in ${PROG_FILES}
${INSTALL_SCRIPT} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin
${STRIP_CMD} ${BUILD_WRKSRC}/${f}
${INSTALL_SCRIPT} ${BUILD_WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin
.endfor
${INSTALL_PROGRAM} ${WRKSRC}/libmapserver.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib
${INSTALL_PROGRAM} ${BUILD_WRKSRC}/libmapserver.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib
.if ${PORT_OPTIONS:MPHP}
@${MKDIR} ${STAGEDIR}${PREFIX}/${PHP_EXTENSION_DIR}
${INSTALL_PROGRAM} ${WRKSRC}/mapscript/php/php_mapscript.so \
${INSTALL_PROGRAM} ${BUILD_WRKSRC}/mapscript/php/php_mapscript.so \
${STAGEDIR}${PREFIX}/${PHP_EXTENSION_DIR}/
.endif
.if ${PORT_OPTIONS:MPYTHON}
(cd ${WRKSRC}/mapscript/python && ${CP} mapscript.py _mapscript.so ${STAGEDIR}${PYTHON_SITELIBDIR}/)
@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/
(cd ${BUILD_WRKSRC}/mapscript/python && ${CP} mapscript.py _mapscript.so ${STAGEDIR}${PYTHON_SITELIBDIR}/)
.endif
post-install:
@${LN} -s ${PREFIX}/lib/libmapserver.so.6.4.0 ${STAGEDIR}${PREFIX}/lib/libmapserver.so.1
@${LN} -s ${PREFIX}/lib/libmapserver.so.6.4.1 ${STAGEDIR}${PREFIX}/lib/libmapserver.so.1
@${LN} -s ${PREFIX}/lib/libmapserver.so.1 ${STAGEDIR}${PREFIX}/lib/libmapserver.so
.if ${PORT_OPTIONS:MPHP}

4
graphics/mapserver/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (mapserver-6.4.0.tar.gz) = f25553798fbd4eaf227bda66ebe44f40292ad7ec65f8bb1b3698580a518ca386
SIZE (mapserver-6.4.0.tar.gz) = 2097411
SHA256 (mapserver-6.4.1.tar.gz) = 445915fd6e31ed199ce477edd1d9f32d609d3001cd52d3e458ff159543403d64
SIZE (mapserver-6.4.1.tar.gz) = 2098792

20
graphics/mapserver/files/patch-cmake__FindFreetype.cmake
View file

@ -1,20 +0,0 @@
--- cmake/FindFreetype.cmake.orig 2013-12-23 20:00:03.000000000 +0200
+++ cmake/FindFreetype.cmake 2013-12-23 20:00:14.000000000 +0200
@@ -41,7 +41,7 @@
# wants explicit full paths and this trickery doesn't work too well.
# I'm going to attempt to cut out the middleman and hope
# everything still works.
-FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
+FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build freetype2/ft2build.h
HINTS
$ENV{FREETYPE_DIR}
PATH_SUFFIXES include
@@ -54,7 +54,7 @@
/usr/freeware/include
)
-FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
+FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h
HINTS
$ENV{FREETYPE_DIR}/include/freetype2
PATHS

11
graphics/mapserver/files/patch-mapfile.c Normal file
View file

@ -0,0 +1,11 @@
--- mapfile.c.orig 2014-08-26 20:37:17.000000000 +0800
+++ mapfile.c 2014-08-26 20:38:39.000000000 +0800
@@ -3398,7 +3398,7 @@
/* reset labels */
for(i=0; i<class->numlabels; i++) {
- if(class->styles[i] != NULL) {
+ if(class->labels[i] != NULL) {
if(freeLabel(class->labels[i]) == MS_SUCCESS ) {
msFree(class->labels[i]);
}

4
graphics/mapserver/pkg-plist
View file

@ -10,9 +10,9 @@ bin/sortshp
bin/tile4ms
lib/libmapserver.so
lib/libmapserver.so.1
lib/libmapserver.so.6.4.0
lib/libmapserver.so.6.4.1
%%PHP%%%%PHP_EXTENSION_DIR%%/php_mapscript.so
%%PHP%%@dirrmtry %%PHP_EXTENSION_DIR%%
%%PHP%%@dirrmtry etc/php
%%PHP%%@dirrmtry lib/php
%%PYTHON%%%%PYTHON_SITELIBDIR%%/mapscript.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/_mapscript.so