diff options
| -rw-r--r-- | UPDATING | 8 | ||||
| -rw-r--r-- | graphics/qgis/Makefile | 24 | ||||
| -rw-r--r-- | graphics/qgis/distinfo | 4 | ||||
| -rw-r--r-- | graphics/qgis/pkg-plist | 9 |
4 files changed, 30 insertions, 15 deletions
@@ -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 diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile index 137d2b4a154b..af6d49cfe357 100644 --- a/graphics/qgis/Makefile +++ b/graphics/qgis/Makefile @@ -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}/devel/libexecinfo \ 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 designer testlib linguist_build \ 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=FALSE 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} diff --git a/graphics/qgis/distinfo b/graphics/qgis/distinfo index 4addd3289a08..1ecf29ce000f 100644 --- a/graphics/qgis/distinfo +++ b/graphics/qgis/distinfo @@ -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 diff --git a/graphics/qgis/pkg-plist b/graphics/qgis/pkg-plist index 7b3398a4eee4..7791857fedac 100644 --- a/graphics/qgis/pkg-plist +++ b/graphics/qgis/pkg-plist @@ -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 |