13 files changed, 27 insertions, 65 deletions

diff --git a/astro/merkaartor/Makefile b/astro/merkaartor/Makefile
index abe83ae6811b..707d75672005 100644
--- a/astro/merkaartor/Makefile
+++ b/astro/merkaartor/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	merkaartor
 PORTVERSION=	0.18.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	astro
 MASTER_SITES=	http://merkaartor.be/attachments/download/301/ \
 		https://secure.ohos.nl/downloads/
diff --git a/astro/osmium/Makefile b/astro/osmium/Makefile
index 70a1a1cfc947..b3117e537a9a 100644
--- a/astro/osmium/Makefile
+++ b/astro/osmium/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	osmium
 PORTVERSION=	git20130522
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	astro geography devel
 
 MAINTAINER=	amdmi3@FreeBSD.org
diff --git a/astro/qlandkartegt/Makefile b/astro/qlandkartegt/Makefile
index 43da890675f1..c53efe7a5627 100644
--- a/astro/qlandkartegt/Makefile
+++ b/astro/qlandkartegt/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	qlandkartegt
 PORTVERSION=	1.7.6
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/QLandkarte%20GT%20${PORTVERSION}
 
diff --git a/databases/grass/Makefile b/databases/grass/Makefile
index 8915e6edd9e3..73298af8dfb7 100644
--- a/databases/grass/Makefile
+++ b/databases/grass/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	grass
 PORTVERSION=	6.4.3
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	2
 CATEGORIES=	databases geography
 MASTER_SITES=	http://grass.osgeo.org/%SUBDIR%/ \
diff --git a/graphics/R-cran-rgdal/Makefile b/graphics/R-cran-rgdal/Makefile
index 22df43dbf39e..d0ec85dac505 100644
--- a/graphics/R-cran-rgdal/Makefile
+++ b/graphics/R-cran-rgdal/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	rgdal
 DISTVERSION=	0.8-16
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
@@ -13,8 +13,8 @@ COMMENT=	Bindings for the Geospatial Data Abstraction Library
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	gdal:${PORTSDIR}/graphics/gdal \
-		proj:${PORTSDIR}/graphics/proj
+LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal \
+		libproj.so:${PORTSDIR}/graphics/proj
 RUN_DEPENDS=	R-cran-sp>=1.0.9:${PORTSDIR}/math/R-cran-sp
 
 USES=	cran:auto-plist
diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile
index 03bb184c1a54..19e959fa870c 100644
--- a/graphics/gdal/Makefile
+++ b/graphics/gdal/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gdal
-PORTVERSION=	1.10.1
-PORTREVISION=	5
+PORTVERSION=	1.11.0
 CATEGORIES=	graphics geography
 MASTER_SITES=	http://download.osgeo.org/gdal/${PORTVERSION}/ \
 		ftp://ftp.remotesensing.org/pub/gdal/${PORTVERSION}/ \
@@ -33,6 +32,8 @@ USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 USES=		gmake
 
+PORTDATA=	*
+
 SLAVEDIRS=	graphics/p5-Geo-GDAL graphics/php-gdal graphics/py-gdal graphics/ruby-gdal
 
 ARMADILLO_CONFIGURE_OFF=--with-armadillo=no
@@ -67,7 +68,7 @@ GTA_CONFIGURE_ON=	--with-gta=${LOCALBASE}
 GTA_LIB_DEPENDS=	libgta.so:${PORTSDIR}/devel/libgta
 HDF5_CONFIGURE_OFF=	--with-hdf5=no
 HDF5_CONFIGURE_ON=	--with-hdf5=${LOCALBASE}
-HDF5_LIB_DEPENDS=	libhdf5.so.7:${PORTSDIR}/science/hdf5-18
+HDF5_LIB_DEPENDS=	libhdf5.so:${PORTSDIR}/science/hdf5-18
 ICONV_CONFIGURE_OFF=	--with-libiconv-prefix=no
 ICONV_CONFIGURE_ON=	${ICONV_CONFIGURE_ARG}
 ICONV_LDFLAGS=		-L${ICONV_PREFIX}/lib ${ICONV_LIB}
@@ -126,10 +127,11 @@ XERCES_LIB_DEPENDS=	libxerces-c.so:${PORTSDIR}/textproc/xerces-c3
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|$$(INST_LIB)/pkgconfig|${PREFIX}/libdata/pkgconfig|' ${WRKSRC}/GNUmakefile
 
 post-install:
 	${TOUCH} ${STAGEDIR}${PREFIX}/lib/gdalplugins/.keepme
 	${INSTALL_DATA} ${WRKSRC}/GDALmake.opt ${STAGEDIR}${DATADIR}/
-	-${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/libgdal.so.18
+	-${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/libgdal.so.19
 
 .include <bsd.port.mk>
diff --git a/graphics/gdal/distinfo b/graphics/gdal/distinfo
index a7ff9a40dec6..120cb70b4188 100644
--- a/graphics/gdal/distinfo
+++ b/graphics/gdal/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gdal-1.10.1.tar.gz) = 9984f0314c0bd831eb59fb646c2bc5e13cf1378be4f51499045166cbe62be6ea
-SIZE (gdal-1.10.1.tar.gz) = 10241357
+SHA256 (gdal-1.11.0.tar.gz) = 989db33ff411e2c888348e71edec5ad06c74ed68781ebfbc4e85179b9d65aafe
+SIZE (gdal-1.11.0.tar.gz) = 10707286
diff --git a/graphics/gdal/pkg-plist b/graphics/gdal/pkg-plist
index 6ce655a39200..8fdac28b2cb5 100644
--- a/graphics/gdal/pkg-plist
+++ b/graphics/gdal/pkg-plist
@@ -18,6 +18,7 @@ bin/gdalwarp
 bin/nearblack
 bin/ogr2ogr
 bin/ogrinfo
+bin/ogrlineref
 bin/ogrtindex
 bin/testepsg
 include/cpl_atomic_ops.h
@@ -41,6 +42,7 @@ include/cpl_quad_tree.h
 include/cpl_spawn.h
 include/cpl_string.h
 include/cpl_time.h
+include/cpl_virtualmem.h
 include/cpl_vsi.h
 include/cpl_vsi_virtual.h
 include/cpl_vsil_curl_priv.h
@@ -60,7 +62,10 @@ include/gdal_simplesurf.h
 include/gdal_version.h
 include/gdal_vrt.h
 include/gdalexif.h
+include/gdalgeorefpamdataset.h
 include/gdalgrid.h
+include/gdalgrid_priv.h
+include/gdaljp2abstractdataset.h
 include/gdaljp2metadata.h
 include/gdalwarper.h
 include/gdalwarpkernel_opencl.h
@@ -83,55 +88,6 @@ lib/gdalplugins/.keepme
 lib/libgdal.a
 lib/libgdal.la
 lib/libgdal.so
-lib/libgdal.so.18
-%%DATADIR%%/GDALLogoBW.svg
-%%DATADIR%%/GDALLogoColor.svg
-%%DATADIR%%/GDALLogoGS.svg
-%%DATADIR%%/GDALmake.opt
-%%DATADIR%%/LICENSE.TXT
-%%DATADIR%%/compdcs.csv
-%%DATADIR%%/coordinate_axis.csv
-%%DATADIR%%/cubewerx_extra.wkt
-%%DATADIR%%/datum_shift.csv
-%%DATADIR%%/ecw_cs.wkt
-%%DATADIR%%/ellipsoid.csv
-%%DATADIR%%/epsg.wkt
-%%DATADIR%%/esri_StatePlane_extra.wkt
-%%DATADIR%%/esri_Wisconsin_extra.wkt
-%%DATADIR%%/esri_extra.wkt
-%%DATADIR%%/gcs.csv
-%%DATADIR%%/gcs.override.csv
-%%DATADIR%%/gdal_datum.csv
-%%DATADIR%%/gdalicon.png
-%%DATADIR%%/geoccs.csv
-%%DATADIR%%/gt_datum.csv
-%%DATADIR%%/gt_ellips.csv
-%%DATADIR%%/header.dxf
-%%DATADIR%%/nitf_spec.xml
-%%DATADIR%%/nitf_spec.xsd
-%%DATADIR%%/osmconf.ini
-%%DATADIR%%/ozi_datum.csv
-%%DATADIR%%/ozi_ellips.csv
-%%DATADIR%%/pci_datum.txt
-%%DATADIR%%/pci_ellips.txt
-%%DATADIR%%/pcs.csv
-%%DATADIR%%/pcs.override.csv
-%%DATADIR%%/prime_meridian.csv
-%%DATADIR%%/projop_wparm.csv
-%%DATADIR%%/s57agencies.csv
-%%DATADIR%%/s57attributes.csv
-%%DATADIR%%/s57attributes_aml.csv
-%%DATADIR%%/s57attributes_iw.csv
-%%DATADIR%%/s57expectedinput.csv
-%%DATADIR%%/s57objectclasses.csv
-%%DATADIR%%/s57objectclasses_aml.csv
-%%DATADIR%%/s57objectclasses_iw.csv
-%%DATADIR%%/seed_2d.dgn
-%%DATADIR%%/seed_3d.dgn
-%%DATADIR%%/stateplane.csv
-%%DATADIR%%/trailer.dxf
-%%DATADIR%%/unit_of_measure.csv
-%%DATADIR%%/vertcs.csv
-%%DATADIR%%/vertcs.override.csv
-@dirrm %%DATADIR%%
+lib/libgdal.so.19
+libdata/pkgconfig/gdal.pc
 @dirrm lib/gdalplugins
diff --git a/graphics/gmt/Makefile b/graphics/gmt/Makefile
index 8635e650c3c8..b89f7de6f7bd 100644
--- a/graphics/gmt/Makefile
+++ b/graphics/gmt/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gmt
 PORTVERSION=	4.5.12
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.soest.hawaii.edu/%SUBDIR%/ \
 		ftp://ftp.geologi.uio.no/pub/%SUBDIR%/ \
diff --git a/graphics/mapnik/Makefile b/graphics/mapnik/Makefile
index 652aa45a5e55..2ed6d8b08316 100644
--- a/graphics/mapnik/Makefile
+++ b/graphics/mapnik/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	mapnik
 PORTVERSION=	2.2.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics geography
 MASTER_SITES=	http://mapnik.s3.amazonaws.com/dist/v${PORTVERSION}/
 
diff --git a/graphics/osgearth/Makefile b/graphics/osgearth/Makefile
index d0bfba2dc539..d7b773c2fba7 100644
--- a/graphics/osgearth/Makefile
+++ b/graphics/osgearth/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	osgearth
 PORTVERSION=	2.5
+PORTREVISION=	1
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://github.com/gwaldron/${PORTNAME}/archive/
 
diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
index 9c72d0522ebe..dc05fa51b553 100644
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	qgis
 PORTVERSION=	2.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics geography
 
 MAINTAINER=	rhurlin@gwdg.de
diff --git a/math/saga/Makefile b/math/saga/Makefile
index f7c55d014f4b..88fad49537a2 100644
--- a/math/saga/Makefile
+++ b/math/saga/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	saga
 PORTVERSION=	2.1.1
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]*$//}/SAGA%20${PORTVERSION}
 DISTNAME=	${PORTNAME}_${PORTVERSION}