From owner-svn-ports-all@FreeBSD.ORG Thu Jun 19 05:36:10 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 2ED8BFC9; Thu, 19 Jun 2014 05:36:10 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1030C283F; Thu, 19 Jun 2014 05:36:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5J5a9Z6004217; Thu, 19 Jun 2014 05:36:09 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5J5a9JG004215; Thu, 19 Jun 2014 05:36:09 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201406190536.s5J5a9JG004215@svn.freebsd.org> From: Gleb Smirnoff Date: Thu, 19 Jun 2014 05:36:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358341 - 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.18 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: Thu, 19 Jun 2014 05:36:10 -0000 Author: glebius (src committer) Date: Thu Jun 19 05:36:09 2014 New Revision: 358341 URL: http://svnweb.freebsd.org/changeset/ports/358341 QAT: https://qat.redports.org/buildarchive/r358341/ Log: o Do not require Apache as dependency. Mapserv can be used as FastCGI with any other web server (e.g. nginx). Always install mapserv binary. [1] o USES libiconv, if uses libgdal. This fixes build with WMS on. [2] PR: 191168 [1] PR: 191167 [2] Approved by: wen Modified: head/graphics/mapserver/Makefile head/graphics/mapserver/pkg-plist Modified: head/graphics/mapserver/Makefile ============================================================================== --- head/graphics/mapserver/Makefile Thu Jun 19 05:34:08 2014 (r358340) +++ head/graphics/mapserver/Makefile Thu Jun 19 05:36:09 2014 (r358341) @@ -25,8 +25,8 @@ CMAKE_ARGS+= -DCMAKE_PREFIX_PATH=${LOCA MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= FRIBIDI CURL GDAL GEOS KML POSTGIS PHP PERL PYTHON \ - WMS WFS WCS MAPSERV FASTCGI DEBUG CAIRO CAIRO_SVG -OPTIONS_DEFAULT= FRIBIDI GDAL GEOS MAPSERV + WMS WFS WCS FASTCGI DEBUG CAIRO CAIRO_SVG +OPTIONS_DEFAULT= FRIBIDI GDAL GEOS CAIRO_SVG_DESC= Cairo SVG parser support GDAL_DESC= GDAL library support FRIBIDI_DESC= Fribidi library support @@ -34,19 +34,9 @@ KML_DESC= KML support WMS_DESC= WMS Server support WFS_DESC= WFS Server support WCS_DESC= WCS Server support -MAPSERV_DESC= Mapserv cgi interface support .include -.if ${PORT_OPTIONS:MMAPSERV} -USE_APACHE_RUN= 22+ -PLIST_SUB+= MAPSERV="" -PLIST_SUB+= APA_VER=${APACHE_VERSION} -PLIST_DIRSTRY= www/apache${APACHE_VERSION}/cgi-bin -.else -PLIST_SUB+= MAPSERV="@comment " -.endif - .if ${PORT_OPTIONS:MPYTHON} USE_PYTHON= 2 BUILD_DEPENDS+= swig2.0:${PORTSDIR}/devel/swig20 @@ -109,6 +99,7 @@ CMAKE_ARGS+= -DWITH_WCS=0 .endif .if ${PORT_OPTIONS:MGDAL} +USES+= iconv LIB_DEPENDS+= libgdal.so:${PORTSDIR}/graphics/gdal CMAKE_ARGS+= -DWITH_GDAL=1 .else @@ -172,7 +163,7 @@ CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release .endif PROG_FILES= legend scalebar shp2img shptree shptreetst shptreevis \ - sortshp msencrypt tile4ms + sortshp msencrypt tile4ms mapserv do-install: .for f in ${PROG_FILES} @@ -180,11 +171,6 @@ do-install: .endfor ${INSTALL_PROGRAM} ${WRKSRC}/libmapserver.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib -.if ${PORT_OPTIONS:MMAPSERV} - ${MKDIR} ${STAGEDIR}${PREFIX}/www/apache${APACHE_VERSION}/cgi-bin/ - ${INSTALL_SCRIPT} ${WRKSRC}/mapserv ${STAGEDIR}${PREFIX}/www/apache${APACHE_VERSION}/cgi-bin/mapserv -.endif - .if ${PORT_OPTIONS:MPHP} @${MKDIR} ${STAGEDIR}${PREFIX}/${PHP_EXTENSION_DIR} ${INSTALL_PROGRAM} ${WRKSRC}/mapscript/php/php_mapscript.so \ Modified: head/graphics/mapserver/pkg-plist ============================================================================== --- head/graphics/mapserver/pkg-plist Thu Jun 19 05:34:08 2014 (r358340) +++ head/graphics/mapserver/pkg-plist Thu Jun 19 05:36:09 2014 (r358341) @@ -1,4 +1,5 @@ bin/legend +bin/mapserv bin/msencrypt bin/scalebar bin/shp2img @@ -10,7 +11,6 @@ bin/tile4ms lib/libmapserver.so lib/libmapserver.so.1 lib/libmapserver.so.6.4.0 -%%MAPSERV%%www/apache%%APA_VER%%/cgi-bin/mapserv %%PHP%%%%PHP_EXTENSION_DIR%%/php_mapscript.so %%PHP%%@dirrmtry %%PHP_EXTENSION_DIR%% %%PHP%%@dirrmtry etc/php