- Do not use bundled libraries

- Remove GEOTIFF, GIF, JPEG, JSON_C, PNG and TIFF options
- Bump PORTREVISION for dependency change

1 files changed, 30 insertions, 30 deletions

diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile
index 7c15bd85395..38a955d79c3 100644
--- a/graphics/gdal/Makefile
+++ b/graphics/gdal/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gdal
 PORTVERSION=	1.11.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics geography
 MASTER_SITES=	http://download.osgeo.org/gdal/${PORTVERSION}/ \
 		ftp://ftp.remotesensing.org/pub/gdal/${PORTVERSION}/ \
@@ -14,24 +14,33 @@ COMMENT=	Translator library for raster geospatial data formats
 
 LICENSE=	MIT
 
-OPTIONS_DEFINE=	ARMADILLO CFITSIO CURL ECW EXPAT FREEXL GEOS GEOTIFF GIF GTA \
-		HDF5 ICONV JASPER JPEG JSON_C KML LIBXML2 MYSQL NETCDF ODBC \
-		OPENJPEG PCRE PGSQL PNG PROJ SQLITE TIFF WEBP XERCES
+LIB_DEPENDS=	libgeotiff.so:${PORTSDIR}/graphics/libgeotiff \
+		libgif.so:${PORTSDIR}/graphics/giflib \
+		libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		libjson-c.so:${PORTSDIR}/devel/json-c \
+		libpng.so:${PORTSDIR}/graphics/png \
+		libtiff.so:${PORTSDIR}/graphics/tiff
+
+OPTIONS_DEFINE=	ARMADILLO CFITSIO CURL ECW EXPAT FREEXL GEOS GTA HDF5 ICONV \
+		JASPER KML LIBXML2 MYSQL NETCDF ODBC OPENJPEG PCRE PGSQL PROJ \
+		SQLITE WEBP XERCES
+OPTIONS_DEFAULT=JASPER
 OPTIONS_RADIO=	PDF
 OPTIONS_RADIO_PDF=	PODOFO POPPLER
-OPTIONS_DEFAULT=GEOTIFF GIF JASPER JPEG PNG TIFF
-GEOTIFF_DESC=	Use graphics/libgeotiff instead of bundled one
-GIF_DESC=	Use graphics/giflib instead of bundled one
-JPEG_DESC=	Use graphics/jpeg instead of bundled one
-JSON_C_DESC=	Use devel/json-c instead of bundled one
 PCRE_DESC=	Regular expression support for SQLite
-PNG_DESC=	Use graphics/png instead of bundled one
-TIFF_DESC=	Use graphics/tiff instead of bundled one
 
 CFLAGS+=	-fPIC
 CONFIGURE_ARGS=	--datadir=${DATADIR} \
 		--enable-static=yes \
-		--with-liblzma=yes --with-libz=/usr --with-threads=yes \
+		--with-geotiff=${LOCALBASE} \
+		--with-gif=${LOCALBASE} \
+		--with-jpeg=${LOCALBASE} \
+		--with-libjson-c=${LOCALBASE} \
+		--with-liblzma=yes \
+		--with-libtiff=${LOCALBASE} \
+		--with-libz=/usr \
+		--with-png=${LOCALBASE} \
+		--with-threads=yes \
 		--without-libtool
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE} -pthread
@@ -66,12 +75,6 @@ FREEXL_LIB_DEPENDS=	libfreexl.so:${PORTSDIR}/textproc/freexl
 GEOS_CONFIGURE_OFF=	--with-geos=no
 GEOS_CONFIGURE_ON=	--with-geos=${LOCALBASE}/bin/geos-config
 GEOS_LIB_DEPENDS=	libgeos.so:${PORTSDIR}/graphics/geos
-GEOTIFF_CONFIGURE_OFF=	--with-geotiff=internal
-GEOTIFF_CONFIGURE_ON=	--with-geotiff=${LOCALBASE}
-GEOTIFF_LIB_DEPENDS=	libgeotiff.so:${PORTSDIR}/graphics/libgeotiff
-GIF_CONFIGURE_OFF=	--with-gif=internal
-GIF_CONFIGURE_ON=	--with-gif=${LOCALBASE}
-GIF_LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib
 GTA_CONFIGURE_OFF=	--with-gta=no
 GTA_CONFIGURE_ON=	--with-gta=${LOCALBASE}
 GTA_LIB_DEPENDS=	libgta.so:${PORTSDIR}/devel/libgta
@@ -85,12 +88,6 @@ ICONV_USES=		iconv
 JASPER_CONFIGURE_OFF=	--with-jasper=no
 JASPER_CONFIGURE_ON=	--with-jasper=${LOCALBASE}
 JASPER_LIB_DEPENDS=	libjasper.so:${PORTSDIR}/graphics/jasper
-JPEG_CONFIGURE_OFF=	--with-jpeg=internal
-JPEG_CONFIGURE_ON=	--with-jpeg=${LOCALBASE}
-JPEG_LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
-JSON_C_CONFIGURE_OFF=	--with-libjson-c=internal
-JSON_C_CONFIGURE_ON=	--with-libjson-c=${LOCALBASE}
-JSON_C_LIB_DEPENDS=	libjson-c.so:${PORTSDIR}/devel/json-c
 KML_CONFIGURE_OFF=	--with-libkml=no
 KML_CONFIGURE_ON=	--with-libkml=${LOCALBASE}
 KML_LIB_DEPENDS=	libkmlbase.so:${PORTSDIR}/science/libkml
@@ -115,9 +112,6 @@ PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 PGSQL_CONFIGURE_OFF=	--with-pg=no
 PGSQL_CONFIGURE_ON=	--with-pg=${LOCALBASE}/bin/pg_config
 PGSQL_USES=		pgsql
-PNG_CONFIGURE_OFF=	--with-png=internal
-PNG_CONFIGURE_ON=	--with-png=${LOCALBASE}
-PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 PODOFO_CONFIGURE_OFF=	--with-podofo=no
 PODOFO_CONFIGURE_ON=	--with-podofo=${LOCALBASE}
 PODOFO_LIB_DEPENDS=	libpodofo.so:${PORTSDIR}/graphics/podofo
@@ -130,9 +124,6 @@ PROJ_LIB_DEPENDS=	libproj.so:${PORTSDIR}/graphics/proj
 SQLITE_CONFIGURE_OFF=	--with-sqlite3=no
 SQLITE_CONFIGURE_ON=	--with-sqlite3=${LOCALBASE}
 SQLITE_USE=		SQLITE=yes
-TIFF_CONFIGURE_OFF=	--with-libtiff=internal
-TIFF_CONFIGURE_ON=	--with-libtiff=${LOCALBASE}
-TIFF_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
 WEBP_CONFIGURE_OFF=	--with-webp=no
 WEBP_CONFIGURE_ON=	--with-webp=${LOCALBASE}
 WEBP_LIB_DEPENDS=	libwebp.so:${PORTSDIR}/graphics/webp
@@ -143,6 +134,15 @@ XERCES_LIB_DEPENDS=	libxerces-c.so:${PORTSDIR}/textproc/xerces-c3
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$(INST_LIB)/pkgconfig|${PREFIX}/libdata/pkgconfig|' ${WRKSRC}/GNUmakefile
 	@${REINPLACE_CMD} -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure
+# Cleanup bundled libraries
+	@${RM} -fr ${WRKSRC}/frmts/gif/giflib/
+	@${RM} -fr ${WRKSRC}/frmts/gtiff/libgeotiff/
+	@${RM} -fr ${WRKSRC}/frmts/gtiff/libtiff/
+	@${RM} -fr ${WRKSRC}/frmts/jpeg/libjpeg/
+	@${RM} -fr ${WRKSRC}/frmts/jpeg/libjpeg12/
+	@${RM} -fr ${WRKSRC}/frmts/png/libpng/
+	@${RM} -fr ${WRKSRC}/frmts/zlib/
+	@${RM} -fr ${WRKSRC}/ogr/ogrsf_frmts/geojson/libjson/
 
 post-install:
 	${INSTALL_LIB} ${WRKSRC}/libgdal.a ${STAGEDIR}${PREFIX}/lib/