From owner-svn-ports-all@FreeBSD.ORG Sat May 2 03:52:11 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AF1C2DA4; Sat, 2 May 2015 03:52:11 +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 8ED5615B3; Sat, 2 May 2015 03:52:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t423qBFa084458; Sat, 2 May 2015 03:52:11 GMT (envelope-from brd@FreeBSD.org) Received: (from brd@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t423qA9v084445; Sat, 2 May 2015 03:52:10 GMT (envelope-from brd@FreeBSD.org) Message-Id: <201505020352.t423qA9v084445@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: brd set sender to brd@FreeBSD.org using -f From: Brad Davis Date: Sat, 2 May 2015 03:52:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r385165 - in head: . graphics/qgis 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.20 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: Sat, 02 May 2015 03:52:11 -0000 Author: brd Date: Sat May 2 03:52:09 2015 New Revision: 385165 URL: https://svnweb.freebsd.org/changeset/ports/385165 Log: Fix graphics/qgis server functionality and rename the option to chase upstream. Clean up GITHUB functionality while here. PR: 199552 Submitted by: Rainer Hurling Approved by: bdrewery (mentor) Modified: head/UPDATING head/graphics/qgis/Makefile head/graphics/qgis/distinfo head/graphics/qgis/pkg-plist Modified: head/UPDATING ============================================================================== --- head/UPDATING Sat May 2 02:21:46 2015 (r385164) +++ head/UPDATING Sat May 2 03:52:09 2015 (r385165) @@ -5,6 +5,14 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20150501: + AFFECTS: users of graphics/qgis + AUTHOR: brd@FreeBSD.org + + Following OPTIONS have been renamed in 2.8.1_1 to match upstream: + + - MAPSERVER to SERVER + 20150427: AFFECTS: users of mail/opensmtpd AUTHOR: ashish@FreeBSD.org Modified: head/graphics/qgis/Makefile ============================================================================== --- head/graphics/qgis/Makefile Sat May 2 02:21:46 2015 (r385164) +++ head/graphics/qgis/Makefile Sat May 2 03:52:09 2015 (r385165) @@ -3,6 +3,7 @@ PORTNAME= qgis PORTVERSION= 2.8.1 +PORTREVISION= 1 CATEGORIES= graphics geography MAINTAINER= rhurlin@gwdg.de @@ -21,12 +22,9 @@ LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/ libspatialindex.so:${PORTSDIR}/devel/spatialindex \ libspatialite.so:${PORTSDIR}/databases/spatialite -WRKSRC= ${WRKDIR}/${PORTNAME}-QGIS-${GH_COMMIT} - -USE_GITHUB= -GH_ACCOUNT= qgis -GH_COMMIT= ddccf8e -GH_TAGNAME= ${GH_COMMIT} +USE_GITHUB= yes +GH_PROJECT= ${PORTNAME:tu} +GH_TAGNAME= ddccf8e USES= bison cmake fortran gmake python USE_SQLITE= yes @@ -35,8 +33,9 @@ USE_QT4= gui svg xml network sql designe USE_LDCONFIG= yes -OPTIONS_DEFINE= GRASS POSTGIS PYTHON MAPSERVER +OPTIONS_DEFINE= GRASS POSTGIS PYTHON SERVER OPTIONS_DEFAULT= POSTGIS PYTHON +SERVER_DESC= Enable QGIS server .if !defined(MAINTAINER_MODE) CMAKE_ARGS+= -Wno-dev @@ -67,6 +66,7 @@ PLIST_SUB+= GRASS="" .else CMAKE_ARGS+= -DWITH_GRASS:BOOL=FALSE PLIST_SUB+= GRASS="@comment " +INFO+= lib/qgis/grass/modules/qgis.g.info .endif .if ${PORT_OPTIONS:MPOSTGIS} @@ -78,13 +78,13 @@ CMAKE_ARGS+= -DWITH_POSTGRESQL:BOOL=FALS PLIST_SUB+= PGSQL="@comment " .endif -.if ${PORT_OPTIONS:MMAPSERVER} -CMAKE_ARGS+= -DWITH_MAPSERVER:BOOL=TRUE -PLIST_SUB+= QGIS_MAPSERVER="" +.if ${PORT_OPTIONS:MSERVER} +CMAKE_ARGS+= -DWITH_SERVER:BOOL=TRUE +PLIST_SUB+= QGIS_SERVER="" LIB_DEPENDS+= libfcgi.so:${PORTSDIR}/www/fcgi .else -CMAKE_ARGS+= -DWITH_MAPSERVER:BOOL=FALSE -PLIST_SUB+= QGIS_MAPSERVER="@comment " +CMAKE_ARGS+= -DWITH_SERVER:BOOL=FALSE +PLIST_SUB+= QGIS_SERVER="@comment " .endif .if ${PORT_OPTIONS:MPYTHON} Modified: head/graphics/qgis/distinfo ============================================================================== --- head/graphics/qgis/distinfo Sat May 2 02:21:46 2015 (r385164) +++ head/graphics/qgis/distinfo Sat May 2 03:52:09 2015 (r385165) @@ -1,2 +1,2 @@ -SHA256 (qgis-2.8.1.tar.gz) = 44874d8b55e473d21c7f70e0f20baa8dfc8b05c1a8b4c735e97ed4c53c801b63 -SIZE (qgis-2.8.1.tar.gz) = 69488815 +SHA256 (qgis-QGIS-2.8.1-ddccf8e_GH0.tar.gz) = aef5cddedb7f8a412b831ad7ed877cc9ce8d61cb4c17bcd49db5a3a73a840ccb +SIZE (qgis-QGIS-2.8.1-ddccf8e_GH0.tar.gz) = 69487659 Modified: head/graphics/qgis/pkg-plist ============================================================================== --- head/graphics/qgis/pkg-plist Sat May 2 02:21:46 2015 (r385164) +++ head/graphics/qgis/pkg-plist Sat May 2 03:52:09 2015 (r385165) @@ -1,6 +1,10 @@ +%%QGIS_SERVER%%bin/admin.sld bin/qbrowser bin/qgis bin/qgis_bench +%%QGIS_SERVER%%bin/qgis_mapserv.fcgi +%%QGIS_SERVER%%bin/schemaExtension.xsd +%%QGIS_SERVER%%bin/wms_metadata.xml include/qgis/Bezier3D.h include/qgis/CloughTocherInterpolator.h include/qgis/DualEdgeTriangulation.h @@ -537,6 +541,8 @@ lib/libqgis_gui.so lib/libqgis_gui.so.2.8.1 lib/libqgis_networkanalysis.so lib/libqgis_networkanalysis.so.2.8.1 +%%QGIS_SERVER%%lib/libqgis_server.so +%%QGIS_SERVER%%lib/libqgis_server.so.2.8.1 %%GRASS%%lib/libqgisgrass.so %%GRASS%%lib/libqgisgrass.so.2.8.1 %%QGIS_PYTHON%%lib/libqgispython.so @@ -544,7 +550,6 @@ lib/libqgis_networkanalysis.so.2.8.1 lib/qgis/crssync %%GRASS%%lib/qgis/grass/bin/qgis.g.browser %%GRASS%%lib/qgis/grass/modules/qgis.d.rast -%%GRASS%%lib/qgis/grass/modules/qgis.g.info lib/qgis/plugins/libcoordinatecaptureplugin.so lib/qgis/plugins/libdelimitedtextprovider.so lib/qgis/plugins/libdxf2shpconverterplugin.so @@ -4232,11 +4237,13 @@ man/man1/qgis.1.gz %%QGIS_PYTHON%%%%DATADIR%%/python/qgis/_core.so %%QGIS_PYTHON%%%%DATADIR%%/python/qgis/_gui.so %%QGIS_PYTHON%%%%DATADIR%%/python/qgis/_networkanalysis.so +%%QGIS_SERVER%%%%QGIS_PYTHON%%%%DATADIR%%/python/qgis/_server.so %%QGIS_PYTHON%%%%DATADIR%%/python/qgis/analysis/__init__.py %%QGIS_PYTHON%%%%DATADIR%%/python/qgis/core/__init__.py %%QGIS_PYTHON%%%%DATADIR%%/python/qgis/core/contextmanagers.py %%QGIS_PYTHON%%%%DATADIR%%/python/qgis/gui/__init__.py %%QGIS_PYTHON%%%%DATADIR%%/python/qgis/networkanalysis/__init__.py +%%QGIS_SERVER%%%%QGIS_PYTHON%%%%DATADIR%%/python/qgis/server/__init__.py %%QGIS_PYTHON%%%%DATADIR%%/python/qgis/user.py %%QGIS_PYTHON%%%%DATADIR%%/python/qgis/utils.py %%QGIS_PYTHON%%%%DATADIR%%/python/qsci_apis/OSGeo_GDAL-OGR-1.10.0.api