Date: Tue, 16 Feb 2016 07:00:07 +0000 (UTC) From: Lars Engels <lme@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r408979 - head/graphics/qgis Message-ID: <201602160700.u1G7074m093948@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lme Date: Tue Feb 16 07:00:07 2016 New Revision: 408979 URL: https://svnweb.freebsd.org/changeset/ports/408979 Log: - Add two new options CUSTOMWIDGETS and ASTYLE - Divide options menu into a general and a developers section - Move the DEBUG option to the developers section - Add some options descriptions - Reorder the handling of the options - Update pkg-plist - Bump PORTREVISION Submitted by: coder@tuxfamily.org Approved by: maintainer MFH: 2016Q1 Modified: head/graphics/qgis/Makefile head/graphics/qgis/pkg-plist Modified: head/graphics/qgis/Makefile ============================================================================== --- head/graphics/qgis/Makefile Tue Feb 16 06:55:51 2016 (r408978) +++ head/graphics/qgis/Makefile Tue Feb 16 07:00:07 2016 (r408979) @@ -3,6 +3,7 @@ PORTNAME= qgis PORTVERSION= 2.12.2 +PORTREVISION= 1 CATEGORIES= graphics geography MAINTAINER= rhurlin@gwdg.de @@ -31,10 +32,15 @@ USE_QT4= gui svg xml network sql designe USE_LDCONFIG= yes -OPTIONS_DEFINE= POSTGIS PYTHON GRASS SERVER DEBUG +OPTIONS_DEFINE= POSTGIS PYTHON GRASS SERVER +OPTIONS_GROUP= DEVELOPER +OPTIONS_GROUP_DEVELOPER= CUSTOMWIDGETS ASTYLE DEBUG OPTIONS_DEFAULT= POSTGIS PYTHON OPTIONS_SUB= yes NO_OPTIONS_SORT= yes +ASTYLE_DESC= Enable AStyle for QGis +CUSTOMWIDGETS_DESC= Enable QT4/QGis Custom Widgets +DEBUG_DESC= Write Debugging Output to Console SERVER_DESC= Enable QGIS server CMAKE_ARGS+= -DWITH_ORACLE:BOOL=FALSE @@ -43,6 +49,16 @@ CMAKE_ARGS+= -DWITH_ORACLE:BOOL=FALSE CMAKE_ARGS+= -Wno-dev .endif +ASTYLE_RUN_DEPENDS= astyle:${PORTSDIR}/devel/astyle +ASTYLE_CMAKE_ON= -DWITH_ASTYLE:BOOL=TRUE +ASTYLE_CMAKE_OFF= -DWITH_ASTYLE:BOOL=FALSE + +CUSTOMWIDGETS_CMAKE_ON= -DWITH_CUSTOM_WIDGETS:BOOL=TRUE +CUSTOMWIDGETS_CMAKE_OFF= -DWITH_CUSTOM_WIDGETS:BOOL=FALSE + +DEBUG_CMAKE_ON= -DCMAKE_BUILD_TYPE=Debug +DEBUG_CMAKE_OFF= -DCMAKE_BUILD_TYPE=Release + GRASS_BUILD_DEPENDS= grass64:${PORTSDIR}/databases/grass GRASS_RUN_DEPENDS= grass64:${PORTSDIR}/databases/grass GRASS_CMAKE_ON= -DWITH_GRASS:BOOL=TRUE -DGRASS_PREFIX=${LOCALBASE}/grass-6.4.5 @@ -82,9 +98,6 @@ PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREF PYTHON_CMAKE_ON= -DWITH_BINDINGS:BOOL=TRUE PYTHON_CMAKE_OFF= -DWITH_BINDINGS:BOOL=FALSE -DEBUG_CMAKE_ON= -DCMAKE_BUILD_TYPE=Debug -DEBUG_CMAKE_OFF= -DCMAKE_BUILD_TYPE=Release - .include <bsd.port.options.mk> .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000033 Modified: head/graphics/qgis/pkg-plist ============================================================================== --- head/graphics/qgis/pkg-plist Tue Feb 16 06:55:51 2016 (r408978) +++ head/graphics/qgis/pkg-plist Tue Feb 16 07:00:07 2016 (r408979) @@ -24,6 +24,7 @@ include/qgis/characterwidget.h include/qgis/qextserialenumerator.h include/qgis/qextserialport.h include/qgis/qgis.h +%%CUSTOMWIDGETS%%include/qgis/qgiscustomwidgets.h include/qgis/qgisgui.h include/qgis/qgisinterface.h include/qgis/qgisplugin.h @@ -104,9 +105,12 @@ include/qgis/qgscodeeditorhtml.h include/qgis/qgscodeeditorpython.h include/qgis/qgscodeeditorsql.h include/qgis/qgscollapsiblegroupbox.h +%%CUSTOMWIDGETS%%include/qgis/qgscollapsiblegroupboxplugin.h include/qgis/qgscolorbrewerpalette.h include/qgis/qgscolorbutton.h +%%CUSTOMWIDGETS%%include/qgis/qgscolorbuttonplugin.h include/qgis/qgscolorbuttonv2.h +%%CUSTOMWIDGETS%%include/qgis/qgscolorbuttonv2plugin.h include/qgis/qgscolordialog.h include/qgis/qgscoloreffect.h include/qgis/qgscolorrampcombobox.h @@ -174,6 +178,7 @@ include/qgis/qgsdashspacedialog.h include/qgis/qgsdatadefined.h include/qgis/qgsdatadefined_p.h include/qgis/qgsdatadefinedbutton.h +%%CUSTOMWIDGETS%%include/qgis/qgsdatadefinedbuttonplugin.h include/qgis/qgsdatadefinedsymboldialog.h include/qgis/qgsdataitem.h include/qgis/qgsdataitemprovider.h @@ -183,6 +188,7 @@ include/qgis/qgsdatasourceuri.h include/qgis/qgsdatetimeedit.h include/qgis/qgsdatetimeeditconfig.h include/qgis/qgsdatetimeeditfactory.h +%%CUSTOMWIDGETS%%include/qgis/qgsdatetimeeditplugin.h include/qgis/qgsdatetimeeditwrapper.h include/qgis/qgsdatumtransformdialog.h include/qgis/qgsdatumtransformstore.h @@ -200,6 +206,7 @@ include/qgis/qgsdistancearcproperter.h include/qgis/qgsdistancearea.h include/qgis/qgsdoubleboxscalebarstyle.h include/qgis/qgsdoublespinbox.h +%%CUSTOMWIDGETS%%include/qgis/qgsdoublespinboxplugin.h include/qgis/qgsdualview.h include/qgis/qgsdummyconfigdlg.h include/qgis/qgseditorconfigwidget.h @@ -226,6 +233,7 @@ include/qgis/qgsexpressionfieldbuffer.h include/qgis/qgsexpressionhighlighter.h include/qgis/qgsexpressionselectiondialog.h include/qgis/qgsextentgroupbox.h +%%CUSTOMWIDGETS%%include/qgis/qgsextentgroupboxplugin.h include/qgis/qgsfeature.h include/qgis/qgsfeature_p.h include/qgis/qgsfeatureiterator.h @@ -240,8 +248,10 @@ include/qgis/qgsfeaturestore.h include/qgis/qgsfield.h include/qgis/qgsfield_p.h include/qgis/qgsfieldcombobox.h +%%CUSTOMWIDGETS%%include/qgis/qgsfieldcomboboxplugin.h include/qgis/qgsfieldconditionalformatwidget.h include/qgis/qgsfieldexpressionwidget.h +%%CUSTOMWIDGETS%%include/qgis/qgsfieldexpressionwidgetplugin.h include/qgis/qgsfieldmodel.h include/qgis/qgsfieldproxymodel.h include/qgis/qgsfieldvalidator.h @@ -250,6 +260,7 @@ include/qgis/qgsfilenamewidgetfactory.h include/qgis/qgsfilenamewidgetwrapper.h include/qgis/qgsfillsymbollayerv2.h include/qgis/qgsfilterlineedit.h +%%CUSTOMWIDGETS%%include/qgis/qgsfilterlineeditplugin.h include/qgis/qgsfontutils.h include/qgis/qgsformannotationitem.h include/qgis/qgsgenericfeatureselectionmanager.h @@ -333,6 +344,7 @@ include/qgis/qgsmaphittest.h include/qgis/qgsmaplayer.h include/qgis/qgsmaplayeractionregistry.h include/qgis/qgsmaplayercombobox.h +%%CUSTOMWIDGETS%%include/qgis/qgsmaplayercomboboxplugin.h include/qgis/qgsmaplayerlegend.h include/qgis/qgsmaplayermodel.h include/qgis/qgsmaplayerproxymodel.h @@ -423,6 +435,7 @@ include/qgis/qgsproject.h include/qgis/qgsprojectbadlayerguihandler.h include/qgis/qgsprojectfiletransform.h include/qgis/qgsprojectionselectionwidget.h +%%CUSTOMWIDGETS%%include/qgis/qgsprojectionselectionwidgetplugin.h include/qgis/qgsprojectionselector.h include/qgis/qgsprojectproperty.h include/qgis/qgsprojectversion.h @@ -473,11 +486,13 @@ include/qgis/qgsrectangle.h include/qgis/qgsrelation.h include/qgis/qgsrelationadddlg.h include/qgis/qgsrelationeditorwidget.h +%%CUSTOMWIDGETS%%include/qgis/qgsrelationeditorwidgetplugin.h include/qgis/qgsrelationmanager.h include/qgis/qgsrelationmanagerdialog.h include/qgis/qgsrelationreferenceconfigdlg.h include/qgis/qgsrelationreferencefactory.h include/qgis/qgsrelationreferencewidget.h +%%CUSTOMWIDGETS%%include/qgis/qgsrelationreferencewidgetplugin.h include/qgis/qgsrelationreferencewidgetwrapper.h include/qgis/qgsrelationwidgetwrapper.h include/qgis/qgsrelief.h @@ -497,9 +512,11 @@ include/qgis/qgsscalecalculator.h include/qgis/qgsscalecombobox.h include/qgis/qgsscaleexpression.h include/qgis/qgsscalerangewidget.h +%%CUSTOMWIDGETS%%include/qgis/qgsscalerangewidgetplugin.h include/qgis/qgsscaleutils.h include/qgis/qgsscalevisibilitydialog.h include/qgis/qgsscalewidget.h +%%CUSTOMWIDGETS%%include/qgis/qgsscalewidgetplugin.h include/qgis/qgssearchquerybuilder.h include/qgis/qgssearchwidgetwrapper.h include/qgis/qgsshadoweffect.h @@ -520,6 +537,7 @@ include/qgis/qgssnapper.h include/qgis/qgssnappingutils.h include/qgis/qgsspatialindex.h include/qgis/qgsspinbox.h +%%CUSTOMWIDGETS%%include/qgis/qgsspinboxplugin.h include/qgis/qgsstatisticalsummary.h include/qgis/qgsstringutils.h include/qgis/qgsstylev2.h @@ -628,6 +646,7 @@ lib/libqgis_networkanalysis.so.2.12.2 %%GRASS%%lib/libqgisgrass6.so.2.12.2 %%PYTHON%%lib/libqgispython.so %%PYTHON%%lib/libqgispython.so.2.12.2 +%%CUSTOMWIDGETS%%%%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qgis_customwidgets.py lib/qgis/crssync %%GRASS%%lib/qgis/grass/bin/qgis.g.browser6 %%GRASS%%lib/qgis/grass/modules/qgis.d.rast6 @@ -671,6 +690,8 @@ lib/qgis/plugins/libwfsprovider.so lib/qgis/plugins/libwmsprovider.so lib/qgis/plugins/libzonalstatisticsplugin.so lib/qgis/qgis_help +%%CUSTOMWIDGETS%%%%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so +%%CUSTOMWIDGETS%%%%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so.2.12.2 man/man1/qbrowser.1.gz man/man1/qgis.1.gz %%DATADIR%%/FindQGIS.cmake @@ -2015,30 +2036,30 @@ man/man1/qgis.1.gz %%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/html_elems.py %%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/info_model.py %%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/plugin.py -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/__init__.py -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/connector.py -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/data_model.py -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/icons/postgis_elephant.png -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/info_model.py -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugin.py -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/__init__.py -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/__init__.py -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/edge.qml -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/edge_label.qml -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/face.qml -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/face_left.qml -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/face_mbr.qml -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/face_right.qml -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/face_seed.qml -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/next_left.qml -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/next_right.qml -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/node.qml -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/node_label.qml -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/versioning/__init__.py -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/versioning/dlg_versioning.py -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/versioning/ui_DlgVersioning.py -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/resources_rc.py -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/sql_dictionary.py +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/__init__.py +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/connector.py +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/data_model.py +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/icons/postgis_elephant.png +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/info_model.py +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugin.py +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/__init__.py +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/__init__.py +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/edge.qml +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/edge_label.qml +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/face.qml +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/face_left.qml +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/face_mbr.qml +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/face_right.qml +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/face_seed.qml +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/next_left.qml +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/next_right.qml +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/node.qml +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/node_label.qml +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/versioning/__init__.py +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/versioning/dlg_versioning.py +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/versioning/ui_DlgVersioning.py +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/resources_rc.py +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/sql_dictionary.py %%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/spatialite/__init__.py %%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/spatialite/connector.py %%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/spatialite/data_model.py
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602160700.u1G7074m093948>