Attachment 150573 Details for Bug 195875 – introduce devel/qscintilla2 in LIB_DEPENDS

[patch] introduce devel/qscintilla2 in LIB_DEPENDS

patch-qgis_2.6.0-2.6.1_2.diff (text/plain), 3.94 KB, created by Rainer Hurling on 2014-12-14 16:29:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rainer Hurling

Created: 2014-12-14 16:29:44 UTC

Size: 3.94 KB

patch

obsolete

>diff -urN qgis.orig/Makefile qgis/Makefile
>--- qgis.orig/Makefile	2014-12-08 17:53:48.000000000 +0100
>+++ qgis/Makefile	2014-12-14 17:21:36.000000000 +0100
>@@ -1,9 +1,8 @@
> # Created by: Laurent Courty
>-# $FreeBSD: head/graphics/qgis/Makefile 374303 2014-12-08 16:48:38Z tijl $
>+# $FreeBSD: head/graphics/qgis/Makefile 372341 2014-11-09 07:56:26Z wen $
> 
> PORTNAME=	qgis
>-PORTVERSION=	2.6.0
>-PORTREVISION=	1
>+PORTVERSION=	2.6.1
> CATEGORIES=	graphics geography
> 
> MAINTAINER=	rhurlin@gwdg.de
>@@ -12,20 +11,21 @@
> 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 @@
> 
> .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 @@
> 		${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 -urN qgis.orig/distinfo qgis/distinfo
>--- qgis.orig/distinfo	2014-11-09 16:51:29.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
>diff -urN qgis.orig/pkg-plist qgis/pkg-plist
>--- qgis.orig/pkg-plist	2014-11-09 16:51:29.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

Flags:

rhurlin: maintainer-approval+

Actions: View | Diff

Attachments on bug 195875: 150459 | 150573