upgrade to 1.1.6

PR:		39851
Submitted by:	Joseph King <king@v2project.com>
Approved by:	maintainer

4 files changed, 7 insertions, 49 deletions

diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile
index 0f4eb1fa620c..5674ae1c349c 100644
--- a/graphics/gdal/Makefile
+++ b/graphics/gdal/Makefile
@@ -6,17 +6,16 @@
 #
 
 PORTNAME=	gdal
-PORTVERSION=	1.1.5
+PORTVERSION=	1.1.6
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.remotesensing.org/pub/gdal/
 
 MAINTAINER=	aa8vb@nc.rr.com
 
-BROKEN=		"Incorrect checksum"
-
-LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff
+BUILD_DEPENDS=	${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen
 
 USE_PYTHON=     yes
 GNU_CONFIGURE=	yes
diff --git a/graphics/gdal/distinfo b/graphics/gdal/distinfo
index 70051db76485..83eb996ed945 100644
--- a/graphics/gdal/distinfo
+++ b/graphics/gdal/distinfo
@@ -1 +1 @@
-MD5 (gdal-1.1.5.tar.gz) = ec8014270a7202b5584970ccd6dbab98
+MD5 (gdal-1.1.6.tar.gz) = c1b04a35c15d85ca9bef3a20ab6f534e
diff --git a/graphics/gdal/files/patch-aa b/graphics/gdal/files/patch-aa
deleted file mode 100644
index 3c9fd8314f6f..000000000000
--- a/graphics/gdal/files/patch-aa
+++ /dev/null
@@ -1,33 +0,0 @@
---- frmts/ORIG/GNUmakefile	Tue Jul 17 09:51:13 2001
-+++ frmts/GNUmakefile	Mon Aug 27 18:09:37 2001
-@@ -12,7 +12,7 @@
- sub-libs:
- 	@for dir in $(GDAL_FORMATS) ; do \
- 	  if test -d $$dir ; then \
--	    if (cd $$dir; $(MAKE) install-obj) ; then \
-+	    if (cd $$dir; $(MAKE) install-obj) || exit 1 ; then \
- 	      echo; \
- 	    else \
- 	      break; \
-@@ -26,7 +26,7 @@
- 	rm -f *.o o/*.o o/*.a
- 	@for dir in $(GDAL_FORMATS) ; do \
- 	  if test -d $$dir ; then \
--	    if (cd $$dir; $(MAKE) clean) ; then \
-+	    if (cd $$dir; $(MAKE) clean) || exit 1 ; then \
- 	      echo; \
- 	    else \
- 	      break; \
---- ORIG/GDALmake.opt.in	Fri Jul 20 00:13:54 2001
-+++ GDALmake.opt.in	Tue Aug 28 16:34:12 2001
-@@ -67,8 +67,8 @@
- 
- GDAL_VER	=	1.1
- GDAL_LIB	= 	$(GDAL_ROOT)/gdal.a
--GDAL_SLIB	=	$(GDAL_ROOT)/libgdal.$(GDAL_VER).$(SO_EXT)
--GDAL_SLIB_LINK	=	-L$(GDAL_ROOT) -lgdal.$(GDAL_VER)
-+GDAL_SLIB	=	$(GDAL_ROOT)/libgdal.$(SO_EXT).$(GDAL_VER)
-+GDAL_SLIB_LINK	=	-L$(GDAL_ROOT) -lgdal
- 
- OGR_LIB		=	$(GDAL_ROOT)/ogr/ogr.a
- CPL_LIB		=	$(GDAL_ROOT)/port/cpl.a
diff --git a/graphics/gdal/pkg-plist b/graphics/gdal/pkg-plist
index 78ee6763191d..f4f7e5b3f824 100644
--- a/graphics/gdal/pkg-plist
+++ b/graphics/gdal/pkg-plist
@@ -8,6 +8,7 @@ include/cpl_config.h
 include/cpl_conv.h
 include/cpl_csv.h
 include/cpl_error.h
+include/cpl_minixml.h
 include/cpl_port.h
 include/cpl_string.h
 include/cpl_vsi.h
@@ -22,16 +23,6 @@ include/ogr_spatialref.h
 include/ogr_srs_api.h
 include/ogrsf_frmts.h
 include/ogr_featurestyle.h
-lib/%%PYTHON_VERSION%%/site-packages/epsg_tr.py
-lib/%%PYTHON_VERSION%%/site-packages/esri2wkt.py
-lib/%%PYTHON_VERSION%%/site-packages/gdal.py
-lib/%%PYTHON_VERSION%%/site-packages/gdal_merge.py
-lib/%%PYTHON_VERSION%%/site-packages/gdalconst.py
-lib/%%PYTHON_VERSION%%/site-packages/gdalimport.py
-lib/%%PYTHON_VERSION%%/site-packages/gdalnumeric.py
-lib/%%PYTHON_VERSION%%/site-packages/osr.py
-lib/%%PYTHON_VERSION%%/site-packages/rgb2pct.py
-lib/%%PYTHON_VERSION%%/site-packages/_gdalmodule.so
 lib/cpl.a
 lib/ogrsf_frmts.a
 lib/ogr.a
@@ -60,4 +51,5 @@ share/gdal/uom_scale.csv
 share/gdal/vert_cs.csv
 share/gdal/vert_datum.csv
 share/gdal/vert_offset.csv
-@dirrm share/gdal
+share/gdal/stateplane.txt
+@dirrm share/gdal/