Date: Tue, 26 Aug 2014 13:05:23 +0000 (UTC) From: Wen Heping <wen@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366212 - in head/graphics/mapserver: . files Message-ID: <201408261305.s7QD5NJw078734@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wen Date: Tue Aug 26 13:05:22 2014 New Revision: 366212 URL: http://svnweb.freebsd.org/changeset/ports/366212 QAT: https://qat.redports.org/buildarchive/r366212/ Log: - Update to 6.4.1 - 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] Added: head/graphics/mapserver/files/patch-mapfile.c (contents, props changed) Deleted: head/graphics/mapserver/files/patch-cmake__FindFreetype.cmake Modified: head/graphics/mapserver/Makefile head/graphics/mapserver/distinfo head/graphics/mapserver/pkg-plist Modified: head/graphics/mapserver/Makefile ============================================================================== --- head/graphics/mapserver/Makefile Tue Aug 26 13:01:20 2014 (r366211) +++ head/graphics/mapserver/Makefile Tue Aug 26 13:05:22 2014 (r366212) @@ -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}/graph 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 -DC 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} Modified: head/graphics/mapserver/distinfo ============================================================================== --- head/graphics/mapserver/distinfo Tue Aug 26 13:01:20 2014 (r366211) +++ head/graphics/mapserver/distinfo Tue Aug 26 13:05:22 2014 (r366212) @@ -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 Added: head/graphics/mapserver/files/patch-mapfile.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/mapserver/files/patch-mapfile.c Tue Aug 26 13:05:22 2014 (r366212) @@ -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]); + } Modified: head/graphics/mapserver/pkg-plist ============================================================================== --- head/graphics/mapserver/pkg-plist Tue Aug 26 13:01:20 2014 (r366211) +++ head/graphics/mapserver/pkg-plist Tue Aug 26 13:05:22 2014 (r366212) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408261305.s7QD5NJw078734>