From owner-svn-ports-all@FreeBSD.ORG Tue Mar 25 16:02:58 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3BCD9751; Tue, 25 Mar 2014 16:02:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 285E8F10; Tue, 25 Mar 2014 16:02:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2PG2wGi068461; Tue, 25 Mar 2014 16:02:58 GMT (envelope-from wen@svn.freebsd.org) Received: (from wen@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2PG2vj7068459; Tue, 25 Mar 2014 16:02:57 GMT (envelope-from wen@svn.freebsd.org) Message-Id: <201403251602.s2PG2vj7068459@svn.freebsd.org> From: Wen Heping Date: Tue, 25 Mar 2014 16:02:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349155 - head/graphics/mapserver X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Mar 2014 16:02:58 -0000 Author: wen Date: Tue Mar 25 16:02:57 2014 New Revision: 349155 URL: http://svnweb.freebsd.org/changeset/ports/349155 QAT: https://qat.redports.org/buildarchive/r349155/ Log: - Fix build with python option - Convert to new so file format Modified: head/graphics/mapserver/Makefile head/graphics/mapserver/pkg-plist Modified: head/graphics/mapserver/Makefile ============================================================================== --- head/graphics/mapserver/Makefile Tue Mar 25 15:46:24 2014 (r349154) +++ head/graphics/mapserver/Makefile Tue Mar 25 16:02:57 2014 (r349155) @@ -3,18 +3,18 @@ PORTNAME= mapserver PORTVERSION= 6.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics www geography MASTER_SITES= http://download.osgeo.org/mapserver/ MAINTAINER= wen@FreeBSD.org COMMENT= System for developing web-based GIS applications -LIB_DEPENDS= gd:${PORTSDIR}/graphics/gd \ - proj:${PORTSDIR}/graphics/proj \ - png15:${PORTSDIR}/graphics/png \ - jpeg:${PORTSDIR}/graphics/jpeg \ - gif:${PORTSDIR}/graphics/giflib +LIB_DEPENDS= libgd.so:${PORTSDIR}/graphics/gd \ + libproj.so:${PORTSDIR}/graphics/proj \ + libpng15.so:${PORTSDIR}/graphics/png \ + libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libgif.so:${PORTSDIR}/graphics/giflib USES= cmake LDFLAGS+= -L${LOCALBASE} -pthread @@ -49,6 +49,8 @@ PLIST_SUB+= MAPSERV="@comment " .if ${PORT_OPTIONS:MPYTHON} USE_PYTHON= 2 +BUILD_DEPENDS+= swig2.0:${PORTSDIR}/devel/swig20 +CMAKE_ARGS+= -DWITH_PYTHON=yes PLIST_SUB+= PYTHON="" MAP_EGG= MapScript-${PORTVERSION}-${PYTHON_VERSION:S/thon//} PLIST_SUB+= MAP_EGG=${MAP_EGG} @@ -57,24 +59,24 @@ PLIST_SUB+= PYTHON="@comment " .endif .if ${PORT_OPTIONS:MCAIRO} -LIB_DEPENDS+= cairo:${PORTSDIR}/graphics/cairo \ - expat:${PORTSDIR}/textproc/expat2 +LIB_DEPENDS+= libcairo.so:${PORTSDIR}/graphics/cairo \ + libexpat.so:${PORTSDIR}/textproc/expat2 CMAKE_ARGS+= -DWITH_CAIRO=1 .else CMAKE_ARGS+= -DWITH_CAIRO=0 .endif .if ${PORT_OPTIONS:MFRIBIDI} -LIB_DEPENDS+= fribidi:${PORTSDIR}/converters/fribidi +LIB_DEPENDS+= libfribidi.so:${PORTSDIR}/converters/fribidi CMAKE_ARGS+= -DWITH_FRIBIDI=1 .else CMAKE_ARGS+= -DWITH_FRIBIDI=0 .endif .if ${PORT_OPTIONS:MCAIRO_SVG} -LIB_DEPENDS+= cairo:${PORTSDIR}/graphics/cairo \ - svg-cairo:${PORTSDIR}/graphics/libsvg-cairo \ - expat:${PORTSDIR}/textproc/expat2 +LIB_DEPENDS+= libcairo.so:${PORTSDIR}/graphics/cairo \ + libsvg-cairo.so:${PORTSDIR}/graphics/libsvg-cairo \ + libexpat.so:${PORTSDIR}/textproc/expat2 CMAKE_ARGS+= -DWITH_SVGCAIRO=1 -DWITH_CAIRO=1 USES+= pkgconfig .else @@ -82,7 +84,7 @@ CMAKE_ARGS+= -DWITH_SVGCAIRO=0 .endif .if ${PORT_OPTIONS:MKML} -LIB_DEPENDS+= xml2:${PORTSDIR}/textproc/libxml2 +LIB_DEPENDS+= libxml2.so:${PORTSDIR}/textproc/libxml2 CMAKE_ARGS+= -DWITH_KML=1 .else CMAKE_ARGS+= -DWITH_KML=0 @@ -107,14 +109,14 @@ CMAKE_ARGS+= -DWITH_WCS=0 .endif .if ${PORT_OPTIONS:MGDAL} -LIB_DEPENDS+= gdal:${PORTSDIR}/graphics/gdal +LIB_DEPENDS+= libgdal.so:${PORTSDIR}/graphics/gdal CMAKE_ARGS+= -DWITH_GDAL=1 .else CMAKE_ARGS+= -DWITH_GDAL=0 .endif .if ${PORT_OPTIONS:MGEOS} -LIB_DEPENDS+= geos:${PORTSDIR}/graphics/geos +LIB_DEPENDS+= libgeos.so:${PORTSDIR}/graphics/geos CMAKE_ARGS+= -DWITH_GEOS=1 .else CMAKE_ARGS+= -DWITH_GEOS=0 @@ -150,7 +152,7 @@ PLIST_SUB+= PERL="@comment " .endif .if ${PORT_OPTIONS:MCURL} -LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl +LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl CMAKE_ARGS+= -DWITH_CURL=1 .else CMAKE_ARGS+= -DWITH_CURL=0 @@ -189,6 +191,10 @@ do-install: ${LOCALBASE}/${PHP_EXTENSION_DIR}/ .endif +.if ${PORT_OPTIONS:MPYTHON} + (cd ${WRKSRC}/mapscript/python && ${CP} mapscript.py _mapscript.so ${PYTHON_SITELIBDIR}/) +.endif + post-install: @${LN} -s ${PREFIX}/lib/libmapserver.so.6.4.0 ${PREFIX}/lib/libmapserver.so.1 @${LN} -s ${PREFIX}/lib/libmapserver.so.1 ${PREFIX}/lib/libmapserver.so Modified: head/graphics/mapserver/pkg-plist ============================================================================== --- head/graphics/mapserver/pkg-plist Tue Mar 25 15:46:24 2014 (r349154) +++ head/graphics/mapserver/pkg-plist Tue Mar 25 16:02:57 2014 (r349155) @@ -15,6 +15,4 @@ lib/libmapserver.so.6.4.0 %%PHP%%@dirrmtry %%PHP_EXTENSION_DIR%% %%PHP%%@dirrmtry etc/php %%PYTHON%%%%PYTHON_SITELIBDIR%%/mapscript.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/mapscript.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/_mapscript.so -%%PYTHON%%%%PYTHON_SITELIBDIR%%/%%MAP_EGG%%.egg-info