--- qgis/Makefile	2014-12-09 06:31:37.000000000 +0100
+++ qgis/Makefile	2014-12-11 06:41:41.000000000 +0100
@@ -2,8 +2,7 @@ 
 # $FreeBSD: head/graphics/qgis/Makefile 374303 2014-12-08 16:48:38Z tijl $
 
 PORTNAME=	qgis
-PORTVERSION=	2.6.0
-PORTREVISION=	1
+PORTVERSION=	2.6.1
 CATEGORIES=	graphics geography
 
 MAINTAINER=	rhurlin@gwdg.de
@@ -25,7 +24,7 @@ 
 
 USE_GITHUB=
 GH_ACCOUNT=	qgis
-GH_COMMIT=	5016213
+GH_COMMIT=	e2a51df
 GH_TAGNAME=	${GH_COMMIT}
 
 USES=		bison cmake fortran gmake python
@@ -44,10 +43,13 @@ 
 
 .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 +106,8 @@ 
 		${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 "
--- qgis/distinfo	2014-11-09 09:19:58.000000000 +0100
+++ qgis/distinfo	2014-12-02 14:26:35.000000000 +0100
@@ -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
--- qgis/pkg-plist	2014-11-09 09:19:57.000000000 +0100
+++ qgis/pkg-plist	2014-12-02 15:45:56.000000000 +0100
@@ -510,17 +510,17 @@ 
 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 @@ 
 %%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