Attachment 151692 Details for Bug 196769 – Diff of Makefile between 2.6.1_1 and 2.6.1_2

[patch] Diff of Makefile between 2.6.1_1 and 2.6.1_2

patch-qgis_2.6.1_1-2.6.1_2.diff (text/plain), 3.13 KB, created by Rainer Hurling on 2015-01-15 17:01:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rainer Hurling

Created: 2015-01-15 17:01:24 UTC

Size: 3.13 KB

patch

obsolete

>diff -urN qgis.orig/Makefile qgis/Makefile
>--- qgis.orig/Makefile	2014-12-29 18:22:33.000000000 +0100
>+++ qgis/Makefile	2015-01-14 20:50:38.000000000 +0100
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	qgis
> PORTVERSION=	2.6.1
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	graphics geography
> 
> MAINTAINER=	rhurlin@gwdg.de
>@@ -82,8 +82,7 @@
> .if ${PORT_OPTIONS:MMAPSERVER}
> CMAKE_ARGS+=	-DWITH_MAPSERVER:BOOL=TRUE
> PLIST_SUB+=	QGIS_MAPSERVER=""
>-LIB_DEPENDS+=	libfcgi.so:${PORTSDIR}/www/fcgi \
>-		libmapserver.so:${PORTSDIR}/graphics/mapserver
>+LIB_DEPENDS+=	libfcgi.so:${PORTSDIR}/www/fcgi
> .else
> CMAKE_ARGS+=	-DWITH_MAPSERVER:BOOL=FALSE
> PLIST_SUB+=	QGIS_MAPSERVER="@comment "
>@@ -92,24 +91,26 @@
> .if ${PORT_OPTIONS:MPYTHON}
> CMAKE_ARGS+=	-DWITH_BINDINGS:BOOL=TRUE
> PLIST_SUB+=	QGIS_PYTHON=""
>-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sip>=4.14.6:${PORTSDIR}/devel/py-sip \
>-		${PYTHON_PKGNAMEPREFIX}qt4-xml>=4.5.4:${PORTSDIR}/textproc/py-qt4-xml \
>-		${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>=2.8.3:${PORTSDIR}/devel/py-qt4-qscintilla2 \
>+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}qt4-core>=4.8.5:${PORTSDIR}/devel/py-qt4-core \
> 		${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.8.5:${PORTSDIR}/x11-toolkits/py-qt4-gui \
> 		${PYTHON_PKGNAMEPREFIX}qt4-network>=4.8.5:${PORTSDIR}/net/py-qt4-network \
>+		${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>=2.8.3:${PORTSDIR}/devel/py-qt4-qscintilla2 \
> 		${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}qt4-xml>=4.5.4:${PORTSDIR}/textproc/py-qt4-xml \
>+		${PYTHON_PKGNAMEPREFIX}sip>=4.14.6:${PORTSDIR}/devel/py-sip \
> 		${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.6:${PORTSDIR}/databases/py-sqlite3
> RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}gdal>=1.11.1:${PORTSDIR}/graphics/py-gdal \
>-		${PYTHON_PKGNAMEPREFIX}qt4-xml>=4.5.4:${PORTSDIR}/textproc/py-qt4-xml \
>-		${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>=2.8.3:${PORTSDIR}/devel/py-qt4-qscintilla2 \
>+		${PYTHON_PKGNAMEPREFIX}numpy>=1.9.1:${PORTSDIR}/math/py-numpy \
>+		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.3:${PORTSDIR}/databases/py-psycopg2 \
>+		${PYTHON_PKGNAMEPREFIX}pyspatialite>=3.0.1:${PORTSDIR}/databases/pyspatialite \
>+		${PYTHON_PKGNAMEPREFIX}qt4-core>=4.8.5:${PORTSDIR}/devel/py-qt4-core \
> 		${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.8.5:${PORTSDIR}/x11-toolkits/py-qt4-gui \
> 		${PYTHON_PKGNAMEPREFIX}qt4-network>=4.8.5:${PORTSDIR}/net/py-qt4-network \
>+		${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>=2.8.3:${PORTSDIR}/devel/py-qt4-qscintilla2 \
> 		${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}psycopg2>=2.5.3:${PORTSDIR}/databases/py-psycopg2
>+		${PYTHON_PKGNAMEPREFIX}qt4-webkit>=4.11.1:${PORTSDIR}/www/py-qt4-webkit \
>+		${PYTHON_PKGNAMEPREFIX}qt4-xml>=4.5.4:${PORTSDIR}/textproc/py-qt4-xml \
>+		${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.6:${PORTSDIR}/databases/py-sqlite3
> .else
> CMAKE_ARGS+=	-DWITH_BINDINGS:BOOL=FALSE
> PLIST_SUB+=	QGIS_PYTHON="@comment "

Actions: View | Diff

Attachments on bug 196769: 151692