15 files changed, 22 insertions, 16 deletions

diff --git a/graphics/R-cran-rgdal/Makefile b/graphics/R-cran-rgdal/Makefile
index d0ec85dac505..3145be1d06c2 100644
--- a/graphics/R-cran-rgdal/Makefile
+++ b/graphics/R-cran-rgdal/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	rgdal
 DISTVERSION=	0.8-16
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
diff --git a/graphics/gdal-grass/Makefile b/graphics/gdal-grass/Makefile
index 9db4c3052c5c..d2e22024730b 100644
--- a/graphics/gdal-grass/Makefile
+++ b/graphics/gdal-grass/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gdal-grass
 PORTVERSION=	1.4.3
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.osgeo.org/gdal/
 
diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile
index 6d0929acde39..efc45a4b7dfc 100644
--- a/graphics/gdal/Makefile
+++ b/graphics/gdal/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gdal
 PORTVERSION=	1.11.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics geography
 MASTER_SITES=	http://download.osgeo.org/gdal/${PORTVERSION}/ \
 		ftp://ftp.remotesensing.org/pub/gdal/${PORTVERSION}/ \
@@ -24,15 +24,17 @@ PCRE_DESC=	Regular expression support for SQLite
 
 CFLAGS+=	-fPIC
 CONFIGURE_ARGS=	--datadir=${DATADIR} \
-		--with-libz=/usr --with-liblzma=yes --with-threads=yes
+		--enable-static=yes \
+		--with-liblzma=yes --with-libz=/usr --with-threads=yes \
+		--without-libtool
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE} -pthread
 MAKE_JOBS_UNSAFE=	yes
 MAKEFILE=	GNUmakefile
-USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 USES=		gmake
 
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
 PORTDATA=	*
 
 SLAVEDIRS=	graphics/p5-Geo-GDAL graphics/php-gdal graphics/py-gdal graphics/ruby-gdal
@@ -131,8 +133,9 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|$$(INST_LIB)/pkgconfig|${PREFIX}/libdata/pkgconfig|' ${WRKSRC}/GNUmakefile
 
 post-install:
+	${INSTALL_LIB} ${WRKSRC}/libgdal.a ${STAGEDIR}${PREFIX}/lib/
 	${TOUCH} ${STAGEDIR}${PREFIX}/lib/gdalplugins/.keepme
 	${INSTALL_DATA} ${WRKSRC}/GDALmake.opt ${STAGEDIR}${DATADIR}/
-	-${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/libgdal.so.19
+	-${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/libgdal.so.${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/graphics/gdal/pkg-plist b/graphics/gdal/pkg-plist
index 8fdac28b2cb5..14121d20250b 100644
--- a/graphics/gdal/pkg-plist
+++ b/graphics/gdal/pkg-plist
@@ -86,8 +86,8 @@ include/thinplatespline.h
 include/vrtdataset.h
 lib/gdalplugins/.keepme
 lib/libgdal.a
-lib/libgdal.la
 lib/libgdal.so
-lib/libgdal.so.19
+lib/libgdal.so.1
+lib/libgdal.so.%%PORTVERSION%%
 libdata/pkgconfig/gdal.pc
 @dirrm lib/gdalplugins
diff --git a/graphics/gmt/Makefile b/graphics/gmt/Makefile
index fdd5b49ecbd7..668fc6d57124 100644
--- a/graphics/gmt/Makefile
+++ b/graphics/gmt/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gmt
 PORTVERSION=	4.5.12
-PORTREVISION=	2
+PORTREVISION=	3
 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 07e04ec8270f..5ccd9ac3664c 100644
--- a/graphics/mapnik/Makefile
+++ b/graphics/mapnik/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	mapnik
 PORTVERSION=	2.2.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics geography
 MASTER_SITES=	http://mapnik.s3.amazonaws.com/dist/v${PORTVERSION}/
 
diff --git a/graphics/mapserver/Makefile b/graphics/mapserver/Makefile
index e211749001b9..2a066dfa1e11 100644
--- a/graphics/mapserver/Makefile
+++ b/graphics/mapserver/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=		mapserver
 PORTVERSION=		6.4.0
-PORTREVISION=		4
+PORTREVISION=	5
 CATEGORIES=		graphics www geography
 MASTER_SITES=		http://download.osgeo.org/mapserver/
 
diff --git a/graphics/osg-devel/Makefile b/graphics/osg-devel/Makefile
index 8026baa2a1d7..d5690c94909a 100644
--- a/graphics/osg-devel/Makefile
+++ b/graphics/osg-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	osg
 PORTVERSION=	3.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://trac.openscenegraph.org/downloads/developer_releases/ \
 		http://mirror.amdmi3.ru/distfiles/
diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile
index 4f5db8ffb9ea..9039a22cb8a5 100644
--- a/graphics/osg/Makefile
+++ b/graphics/osg/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	osg
 PORTVERSION=	3.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://trac.openscenegraph.org/downloads/developer_releases/ \
 		http://mirror.amdmi3.ru/distfiles/
diff --git a/graphics/osgearth/Makefile b/graphics/osgearth/Makefile
index 71b21244e11c..a99d4ab440c3 100644
--- a/graphics/osgearth/Makefile
+++ b/graphics/osgearth/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	osgearth
 PORTVERSION=	2.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://github.com/gwaldron/${PORTNAME}/archive/
 
diff --git a/graphics/p5-Geo-GDAL/Makefile b/graphics/p5-Geo-GDAL/Makefile
index 9910dd7dff4b..c8850e141e7a 100644
--- a/graphics/p5-Geo-GDAL/Makefile
+++ b/graphics/p5-Geo-GDAL/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-GDAL
 PORTVERSION=	1.11.0
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://download.osgeo.org/gdal/ \
 		ftp://ftp.remotesensing.org/pub/gdal/ \
diff --git a/graphics/php-gdal/Makefile b/graphics/php-gdal/Makefile
index a9906dfdcce2..6397c4619131 100644
--- a/graphics/php-gdal/Makefile
+++ b/graphics/php-gdal/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gdal
 PORTVERSION=	1.11.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.osgeo.org/gdal/ \
 		ftp://ftp.remotesensing.org/pub/gdal/ \
diff --git a/graphics/py-gdal/Makefile b/graphics/py-gdal/Makefile
index b7703ce1c3ff..16d536e456c5 100644
--- a/graphics/py-gdal/Makefile
+++ b/graphics/py-gdal/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gdal
 PORTVERSION=	1.11.0
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	http://download.osgeo.org/gdal/ \
 		ftp://ftp.remotesensing.org/pub/gdal/ \
diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
index 5669dc1a7831..350e329d5353 100644
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	qgis
 PORTVERSION=	2.2.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics geography
 
 MAINTAINER=	rhurlin@gwdg.de
diff --git a/graphics/visionworkbench/Makefile b/graphics/visionworkbench/Makefile
index 1a55bf416777..430ed4320a0e 100644
--- a/graphics/visionworkbench/Makefile
+++ b/graphics/visionworkbench/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	visionworkbench
 PORTVERSION=	2.2.0
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	graphics
 MASTER_SITES=	http://ti.arc.nasa.gov/m/project/nasa-vision-workbench/
 DISTNAME=	VisionWorkbench-${PORTVERSION}