diff options
| author | riggs <riggs@FreeBSD.org> | 2014-12-15 03:16:18 +0800 |
|---|---|---|
| committer | riggs <riggs@FreeBSD.org> | 2014-12-15 03:16:18 +0800 |
| commit | a42f926ae234cb00b60f1db651514a55b56cc127 (patch) | |
| tree | 3f5013eb8fb58e5689c852fe7087077c58cbc189 /graphics | |
| parent | f1ae91abac3a160af4d9a9c864a540e11d415247 (diff) | |
| download | freebsd-ports-graphics-a42f926ae234cb00b60f1db651514a55b56cc127.tar.gz freebsd-ports-graphics-a42f926ae234cb00b60f1db651514a55b56cc127.tar.zst freebsd-ports-graphics-a42f926ae234cb00b60f1db651514a55b56cc127.zip | |
- Update to 2.6.1
- Fix build error for 8.x and 9.x (base flex)
PR: 195875
Submitted by: rhurlin@gwdg.de (maintainer)
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/qgis/Makefile | 24 | ||||
| -rw-r--r-- | graphics/qgis/distinfo | 4 | ||||
| -rw-r--r-- | graphics/qgis/pkg-plist | 13 |
3 files changed, 23 insertions, 18 deletions
diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile index 485a1598b20..19f8c851f92 100644 --- a/graphics/qgis/Makefile +++ b/graphics/qgis/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= qgis -PORTVERSION= 2.6.0 -PORTREVISION= 1 +PORTVERSION= 2.6.1 CATEGORIES= graphics geography MAINTAINER= rhurlin@gwdg.de @@ -12,20 +11,21 @@ COMMENT= Geographical Information System (GIS) data viewer LICENSE= GPLv2 BUILD_DEPENDS= txt2tags:${PORTSDIR}/textproc/txt2tags -LIB_DEPENDS= libgeos.so:${PORTSDIR}/graphics/geos \ - libproj.so:${PORTSDIR}/graphics/proj \ +LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \ + libgdal.so:${PORTSDIR}/graphics/gdal \ + libgeos.so:${PORTSDIR}/graphics/geos \ libgsl.so:${PORTSDIR}/math/gsl \ + libproj.so:${PORTSDIR}/graphics/proj \ + libqscintilla2.so:${PORTSDIR}/devel/qscintilla2 \ libqwt.so:${PORTSDIR}/x11-toolkits/qwt5 \ - libgdal.so:${PORTSDIR}/graphics/gdal \ - libspatialite.so:${PORTSDIR}/databases/spatialite \ libspatialindex.so:${PORTSDIR}/devel/spatialindex \ - libexecinfo.so:${PORTSDIR}/devel/libexecinfo + libspatialite.so:${PORTSDIR}/databases/spatialite WRKSRC= ${WRKDIR}/${PORTNAME}-QGIS-${GH_COMMIT} USE_GITHUB= GH_ACCOUNT= qgis -GH_COMMIT= 5016213 +GH_COMMIT= e2a51df GH_TAGNAME= ${GH_COMMIT} USES= bison cmake fortran gmake python @@ -44,10 +44,13 @@ CMAKE_ARGS+= -Wno-dev .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000033 USES+= compiler:features .else USES+= compiler:gcc-c++11-lib +BUILD_DEPENDS+= flex>=2.5.39:${PORTSDIR}/textproc/flex +CMAKE_ARGS+= -DFLEX_EXECUTABLE:STRING=${LOCALBASE}/bin/flex +CXXFLAGS+= -I${LOCALBASE}/include/flex .endif .if ${PORT_OPTIONS:MGRASS} @@ -104,7 +107,8 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}gdal>=1.11.1:${PORTSDIR}/graphics/py-gdal \ ${PYTHON_PKGNAMEPREFIX}qt4-svg>=4.8.5:${PORTSDIR}/graphics/py-qt4-svg \ ${PYTHON_PKGNAMEPREFIX}qt4-core>=4.8.5:${PORTSDIR}/devel/py-qt4-core \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.6:${PORTSDIR}/databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}pyspatialite>=3.0.1:${PORTSDIR}/databases/pyspatialite + ${PYTHON_PKGNAMEPREFIX}pyspatialite>=3.0.1:${PORTSDIR}/databases/pyspatialite \ + ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.3:${PORTSDIR}/databases/py-psycopg2 .else CMAKE_ARGS+= -DWITH_BINDINGS:BOOL=FALSE PLIST_SUB+= QGIS_PYTHON="@comment " diff --git a/graphics/qgis/distinfo b/graphics/qgis/distinfo index 82fc860c926..1af8cfeb0fa 100644 --- a/graphics/qgis/distinfo +++ b/graphics/qgis/distinfo @@ -1,2 +1,2 @@ -SHA256 (qgis-2.6.0.tar.gz) = da73333e65a9e7c3276b68d1b17bd56352a0b6b364d094965437b9dc56b5dedf -SIZE (qgis-2.6.0.tar.gz) = 70096139 +SHA256 (qgis-2.6.1.tar.gz) = dfadd5f088acb1e2e588897857b789bdf89b192238c2d9eeb7382b11312f9f4c +SIZE (qgis-2.6.1.tar.gz) = 70057271 diff --git a/graphics/qgis/pkg-plist b/graphics/qgis/pkg-plist index 09eb4419c89..d462ece99f5 100644 --- a/graphics/qgis/pkg-plist +++ b/graphics/qgis/pkg-plist @@ -510,17 +510,17 @@ include/qgis/ui_qgsprojectionselectorbase.h include/qgis/ui_qgsquerybuilderbase.h include/qgis/ui_qgssublayersdialogbase.h lib/libqgis_analysis.so -lib/libqgis_analysis.so.2.6.0 +lib/libqgis_analysis.so.2.6.1 lib/libqgis_core.so -lib/libqgis_core.so.2.6.0 +lib/libqgis_core.so.2.6.1 lib/libqgis_gui.so -lib/libqgis_gui.so.2.6.0 +lib/libqgis_gui.so.2.6.1 lib/libqgis_networkanalysis.so -lib/libqgis_networkanalysis.so.2.6.0 +lib/libqgis_networkanalysis.so.2.6.1 %%GRASS%%lib/libqgisgrass.so -%%GRASS%%lib/libqgisgrass.so.2.6.0 +%%GRASS%%lib/libqgisgrass.so.2.6.1 %%QGIS_PYTHON%%lib/libqgispython.so -%%QGIS_PYTHON%%lib/libqgispython.so.2.6.0 +%%QGIS_PYTHON%%lib/libqgispython.so.2.6.1 lib/qgis/crssync %%GRASS%%lib/qgis/grass/bin/qgis.g.browser %%GRASS%%lib/qgis/grass/modules/qgis.d.rast @@ -1478,6 +1478,7 @@ man/man1/qgis.1.gz %%DATADIR%%/i18n/qgis_fi.qm %%DATADIR%%/i18n/qgis_fr.qm %%DATADIR%%/i18n/qgis_gl.qm +%%DATADIR%%/i18n/qgis_hi.qm %%DATADIR%%/i18n/qgis_hr.qm %%DATADIR%%/i18n/qgis_hu.qm %%DATADIR%%/i18n/qgis_id.qm |