6 files changed, 62 insertions, 180 deletions

diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile
index a347f130de67..a33960461756 100644
--- a/graphics/gdal/Makefile
+++ b/graphics/gdal/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	gdal
-PORTVERSION=	1.6.0
-PORTREVISION=	9
+PORTVERSION=	1.7.2
 CATEGORIES=	graphics geography
 MASTER_SITES=	ftp://ftp.remotesensing.org/pub/gdal/ \
 		http://www.gdal.org/dl/ \
 		http://dl.maptools.org/dl/gdal/ \
 		http://sunpoet.net/distfiles/
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	glebius@FreeBSD.ORG
 COMMENT=	A translator library for geospatial data formats
 
 USE_AUTOTOOLS=	libtool:22
@@ -23,15 +22,8 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--datadir=${DATADIR} --with-libz=/usr
 MAKEFILE=	GNUmakefile
-INSTALL_TARGET=	install install-man
 MAKE_JOBS_UNSAFE=	yes
 
-MAN1=		gdal-config.1 gdal2tiles.1 gdal_contour.1 gdal_grid.1 \
-		gdal_merge.1 gdal_rasterize.1 gdal_retile.1 gdal_translate.1 \
-		gdal_utilities.1 gdaladdo.1 gdalinfo.1 gdaltindex.1 \
-		gdaltransform.1 gdalwarp.1 nearblack.1 ogr2ogr.1 \
-		ogr_utilities.1 ogrinfo.1 ogrtindex.1 pct2rgb.1 rgb2pct.1
-
 .if !defined(NOPORTDOCS)
 BUILD_DEPENDS+=		${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen
 .endif
@@ -189,19 +181,13 @@ RUN_DEPENDS+=	${PYEASYINSTALL_CMD}:${PORTSDIR}/devel/py-setuptools
 PYEASYINSTALL_CMD=	${LOCALBASE}/bin/easy_install-${PYTHON_VER}
 PYDISTUTILS_PKGNAME=	${PORTNAME:U}
 PYDISTUTILS_PKGVERSION=	${PORTVERSION}
-PORTREVISION=	4
 _OSRELEASE!=		${UNAME} -r
 PYEASYINSTALL_OSARCH=	-${OPSYS:L}-${_OSRELEASE}-${ARCH}
 PYEASYINSTALL_EGG=	${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-${PYTHON_VERSION:S/thon//}${PYEASYINSTALL_OSARCH}.egg
 PYEASYINSTALL_BINDIR=	${PREFIX}/bin
 PYEASYINSTALL_SITELIBDIR=	${PYTHONPREFIX_SITELIBDIR}
 
-PLIST_SUB+=		PYEASYINSTALL_EGG=${PYEASYINSTALL_EGG} \
-			PYEASYINSTALL_CMD=${PYEASYINSTALL_CMD} \
-			PYEASYINSTALL_BINDIR=${PYEASYINSTALL_BINDIR} \
-			PYEASYINSTALL_SITELIBDIR=${PYEASYINSTALL_SITELIBDIR} \
-			PYDISTUTILS_PKGNAME=${PYDISTUTILS_PKGNAME} \
-			PYDISTUTILS_PKGVERSION=${PYDISTUTILS_PKGVERSION}
+PLIST_SUB+=		PYEASYINSTALL_EGG=${PYEASYINSTALL_EGG}
 .endif
 
 .if !defined(WITHOUT_PNG)
@@ -271,7 +257,4 @@ post-patch:
 		' ${WRKSRC}/swig/python/GNUmakefile
 .endif
 
-post-install:
-	${INSTALL_MAN} ${FILESDIR}/gdalwarp.1 ${PREFIX}/man/man1/
-
 .include <bsd.port.post.mk>
diff --git a/graphics/gdal/distinfo b/graphics/gdal/distinfo
index 964f9531e164..9c270fd999cd 100644
--- a/graphics/gdal/distinfo
+++ b/graphics/gdal/distinfo
@@ -1,3 +1,3 @@
-MD5 (gdal-1.6.0.tar.gz) = 0c53697511f489455f8b60e843986568
-SHA256 (gdal-1.6.0.tar.gz) = acdc2faf7496f8d8f4680347ce30fd3a2139b5c050f13dcd6ca8a3d7f6e418a4
-SIZE (gdal-1.6.0.tar.gz) = 7072689
+MD5 (gdal-1.7.2.tar.gz) = 05351f8cb61761ae579667e24a297fe6
+SHA256 (gdal-1.7.2.tar.gz) = 0834909a93e955a45cf050714b018fed89f8dbe74e0381e91d16a8084ca08837
+SIZE (gdal-1.7.2.tar.gz) = 7755378
diff --git a/graphics/gdal/files/gdalwarp.1 b/graphics/gdal/files/gdalwarp.1
deleted file mode 100644
index 4f17869152e0..000000000000
--- a/graphics/gdal/files/gdalwarp.1
+++ /dev/null
@@ -1,105 +0,0 @@
-.TH "gdalwarp" 1 "20 Dec 2007" "GDAL" \" -*- nroff -*-
-.ad l
-.nh
-.SH NAME
-gdalwarp \- gdalwarp
-simple image reprojection and warping utility
-.SH "SYNOPSIS"
-.PP
-.PP
-.PP
-.nf
-
-gdalwarp 
-    [-s_srs srs_def] [-t_srs srs_def] [-order n] ] [-tps] [-et err_threshold]
-    [-te xmin ymin xmax ymax] [-tr xres yres] [-ts width height]
-    [-wo "NAME=VALUE"] [-ot Byte/Int16/...] [-wt Byte/Int16]
-    [-srcnodata "value [value...]"] [-dstnodata "value [value...]"] -dstalpha
-    [-r resampling_method] [-wm memory_in_mb] [-multi] [-q]
-    [-of format] [-co "NAME=VALUE"]* srcfile* dstfile
-.fi
-.PP
-.SH "DESCRIPTION"
-.PP
-The gdalwarp utility is an image mosaicing, reprojection and warping utility. The program can reproject to any supported projection, and can also apply GCPs stored with the image if the image is 'raw' with control information.
-.PP
-.IP "\fB\fB-s_srs\fP \fIsrs def\fP:\fP" 1c
-source spatial reference set. The coordinate systems that can be passed are anything supported by the OGRSpatialReference.SetFromUserInput() call, which includes EPSG PCS and GCSes (ie. EPSG:4296), PROJ.4 declarations (as above), or the name of a .prf file containing well known text. 
-.IP "\fB\fB-t_srs\fP \fIsrs_def\fP:\fP" 1c
-target spatial reference set. The coordinate systems that can be passed are anything supported by the OGRSpatialReference.SetFromUserInput() call, which includes EPSG PCS and GCSes (ie. EPSG:4296), PROJ.4 declarations (as above), or the name of a .prf file containing well known text. 
-.IP "\fB\fB-order\fP \fIn\fP:\fP" 1c
-order of polynomial used for warping (1 to 3). The default is to select a polynomial order based on the number of GCPs. 
-.IP "\fB\fB-tps\fP\fP" 1c
-Enable use of thin plate spline transformer based on available GCPs. Use this \fIinstead\fP of the -order switch. 
-.IP "\fB\fB-et\fP \fIerr_threshold\fP:\fP" 1c
-error threshold for transformation approximation (in pixel units - defaults to 0.125). 
-.IP "\fB\fB-te\fP \fIxmin ymin xmax ymax\fP:\fP" 1c
-set georeferenced extents of output file to be created. 
-.IP "\fB\fB-tr\fP \fIxres yres\fP:\fP" 1c
-set output file resolution (in target georeferenced units) 
-.IP "\fB\fB-ts\fP \fIwidth height\fP:\fP" 1c
-set output file size in pixels and lines 
-.IP "\fB\fB-wo\fP \fI'NAME=VALUE'\fP:\fP" 1c
-Set a warp options. The GDALWarpOptions::papszWarpOptions docs show all options. Multiple \fB-wo\fP options may be listed. 
-.IP "\fB\fB-ot\fP \fItype\fP:\fP" 1c
-For the output bands to be of the indicated data type. 
-.IP "\fB\fB-wt\fP \fItype\fP:\fP" 1c
-Working pixel data type. The data type of pixels in the source image and destination image buffers. 
-.IP "\fB\fB-r\fP \fIresampling_method\fP:\fP" 1c
-Resampling method to use. Available methods are: 
-.IP "\fB\fBnear\fP: \fP" 1c
-nearest neighbour resampling (default, fastest algorithm, worst interpolation quality). 
-.IP "\fB\fBbilinear\fP: \fP" 1c
-bilinear resampling. 
-.IP "\fB\fBcubic\fP: \fP" 1c
-cubic resampling. 
-.IP "\fB\fBcubicspline\fP: \fP" 1c
-cubic spline resampling. 
-.IP "\fB\fBlanczos\fP: \fP" 1c
-Lanczos windowed sinc resampling. 
-.PP
-.IP "\fB\fB-srcnodata\fP \fIvalue [value...]\fP:\fP" 1c
-Set nodata masking values for input bands (different values can be supplied for each band). If more than one value is supplied all values should be quoted to keep them together as a single operating system argument. Masked values will not be used in interpolation. Use a value of \fCNone\fP to ignore intrinsic nodata settings on the source dataset. 
-.IP "\fB\fB-dstnodata\fP \fIvalue [value...]\fP:\fP" 1c
-Set nodata values for output bands (different values can be supplied for each band). If more than one value is supplied all values should be quoted to keep them together as a single operating system argument. New files will be initialized to this value and if possible the nodata value will be recorded in the output file. 
-.IP "\fB\fB-dstalpha\fP:\fP" 1c
-Create an output alpha band to identify nodata (unset/transparent) pixels.  
-.IP "\fB\fB-wm\fP \fImemory_in_mb\fP:\fP" 1c
-Set the amount of memory (in megabytes) that the warp API is allowed to use for caching. 
-.IP "\fB\fB-multi\fP:\fP" 1c
-Use multithreaded warping implementation. Multiple threads will be used to process chunks of image and perform input/output operation simultaneously. 
-.IP "\fB\fB-q\fP:\fP" 1c
-Be quiet. 
-.IP "\fB\fB-of\fP \fIformat\fP:\fP" 1c
-Select the output format. The default is GeoTIFF (GTiff). Use the short format name.  
-.IP "\fB\fB-co\fP \fI'NAME=VALUE'\fP:\fP" 1c
-passes a creation option to the output format driver. Multiple \fB-co\fP options may be listed. See format specific documentation for legal creation options for each format.  
-.IP "\fB\fIsrcfile\fP:\fP" 1c
-The source file name(s).  
-.IP "\fB\fIdstfile\fP:\fP" 1c
-The destination file name.  
-.PP
-.PP
-Mosaicing into an existing output file is supported if the output file already exists.
-.SH "EXAMPLE"
-.PP
-For instance, an eight bit spot scene stored in GeoTIFF with control points mapping the corners to lat/long could be warped to a UTM projection with a command like this:
-.PP
-.PP
-.nf
-
-gdalwarp -t_srs '+proj=utm +zone=11 +datum=WGS84' raw_spot.tif utm11.tif
-.fi
-.PP
-.PP
-For instance, the second channel of an ASTER image stored in HDF with control points mapping the corners to lat/long could be warped to a UTM projection with a command like this:
-.PP
-.PP
-.nf
-
-gdalwarp HDF4_SDS:ASTER_L1B:"pg-PR1B0000-2002031402_100_001":2 pg-PR1B0000-2002031402_100_001_2.tif
-.fi
-.PP
-.SH "AUTHORS"
-.PP
-Frank Warmerdam <warmerdam@pobox.com>, Silke Reimer <silke@intevation.de> 
diff --git a/graphics/gdal/files/patch-ogr-GNUmakefile b/graphics/gdal/files/patch-ogr-GNUmakefile
deleted file mode 100644
index 699047678a4d..000000000000
--- a/graphics/gdal/files/patch-ogr-GNUmakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- ogr/GNUmakefile.orig	2009-03-02 23:42:30.000000000 +0300
-+++ ogr/GNUmakefile	2009-03-02 23:42:35.000000000 +0300
-@@ -19,7 +19,7 @@
- 
- default:	lib
- 
--all:	sublibs apps test_ogrsf$(EXE) 
-+all:	sublibs
- 
- clean:
- 	rm -f html/*
diff --git a/graphics/gdal/files/patch-swig-python-GNUmakefile b/graphics/gdal/files/patch-swig-python-GNUmakefile
index a8a14b4b9528..4a3162f35745 100644
--- a/graphics/gdal/files/patch-swig-python-GNUmakefile
+++ b/graphics/gdal/files/patch-swig-python-GNUmakefile
@@ -1,15 +1,15 @@
---- swig/python/GNUmakefile.orig	2008-05-31 11:41:25.000000000 +0400
-+++ swig/python/GNUmakefile	2009-03-03 00:05:31.000000000 +0300
-@@ -47,7 +47,7 @@
- generate: ${WRAPPERS}
- 
+--- swig/python/GNUmakefile.orig	2010-07-29 18:04:21.000000000 +0400
++++ swig/python/GNUmakefile	2010-07-29 18:05:10.000000000 +0400
+@@ -62,7 +62,7 @@
+ 	mv -f ${SWIGOUTPUTDIR}/gdal_array_wrap.cpp.tmp ${SWIGOUTPUTDIR}/gdal_array_wrap.cpp
+     
  build:
 -	$(PYTHON) setup.py build
 +	CXX="" $(PYTHON) setup.py bdist_egg
  
  egg:
  	$(PYTHON) setup.py bdist_egg 
-@@ -55,7 +55,7 @@
+@@ -70,7 +70,7 @@
  install:
  
  ifeq ($(PY_HAVE_SETUPTOOLS),1)
diff --git a/graphics/gdal/pkg-plist b/graphics/gdal/pkg-plist
index 21e541406681..4d6035fbb577 100644
--- a/graphics/gdal/pkg-plist
+++ b/graphics/gdal/pkg-plist
@@ -6,6 +6,8 @@ bin/gdal-config
 bin/gdal2tiles.py
 bin/gdal2xyz.py
 bin/gdal_contour
+bin/gdal_fillnodata.dox
+bin/gdal_fillnodata.py
 bin/gdal_grid
 bin/gdal_merge.py
 bin/gdal_polygonize.py
@@ -16,7 +18,9 @@ bin/gdal_sieve.dox
 bin/gdal_sieve.py
 bin/gdal_translate
 bin/gdaladdo
+bin/gdalbuildvrt
 bin/gdalchksum.py
+bin/gdaldem
 bin/gdalenhance
 bin/gdalident.py
 bin/gdalimport.py
@@ -33,7 +37,9 @@ bin/ogrtindex
 bin/pct2rgb.py
 bin/rgb2pct.py
 bin/testepsg
+include/cpl_atomic_ops.h
 include/cpl_config.h
+include/cpl_config_extras.h
 include/cpl_conv.h
 include/cpl_csv.h
 include/cpl_error.h
@@ -48,6 +54,7 @@ include/cpl_odbc.h
 include/cpl_port.h
 include/cpl_quad_tree.h
 include/cpl_string.h
+include/cpl_time.h
 include/cpl_vsi.h
 include/cpl_vsi_virtual.h
 include/cpl_win32ce_api.h
@@ -83,7 +90,7 @@ include/vrtdataset.h
 lib/libgdal.a
 lib/libgdal.la
 lib/libgdal.so
-lib/libgdal.so.14
+lib/libgdal.so.15
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
@@ -139,39 +146,47 @@ lib/libgdal.so.14
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osr.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osr.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osr.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+%%PYTHON_SITELIBDIR%%/easy-install.pth
+%%PYTHON_SITELIBDIR%%/site.py
+%%PYTHON_SITELIBDIR%%/site.pyc
+%%PYTHON_SITELIBDIR%%/site.pyo
+share/gdal/GDALLogoBW.svg
+share/gdal/GDALLogoColor.svg
+share/gdal/GDALLogoGS.svg
+share/gdal/LICENSE.TXT
+share/gdal/coordinate_axis.csv
+share/gdal/cubewerx_extra.wkt
+share/gdal/ecw_cs.wkt
+share/gdal/ellipsoid.csv
+share/gdal/epsg.wkt
+share/gdal/esri_extra.wkt
+share/gdal/gcs.csv
+share/gdal/gcs.override.csv
+share/gdal/gdal_datum.csv
+share/gdal/gdalicon.png
+share/gdal/gt_datum.csv
+share/gdal/gt_ellips.csv
+share/gdal/header.dxf
+share/gdal/pcs.csv
+share/gdal/pcs.override.csv
+share/gdal/prime_meridian.csv
+share/gdal/projop_wparm.csv
+share/gdal/s57agencies.csv
+share/gdal/s57attributes.csv
+share/gdal/s57attributes_aml.csv
+share/gdal/s57attributes_iw.csv
+share/gdal/s57expectedinput.csv
+share/gdal/s57objectclasses.csv
+share/gdal/s57objectclasses_aml.csv
+share/gdal/s57objectclasses_iw.csv
+share/gdal/seed_2d.dgn
+share/gdal/seed_3d.dgn
+share/gdal/stateplane.csv
+share/gdal/trailer.dxf
+share/gdal/unit_of_measure.csv
+@dirrm share/gdal
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
-%%DATADIR%%/GDALLogoBW.svg
-%%DATADIR%%/GDALLogoColor.svg
-%%DATADIR%%/GDALLogoGS.svg
-%%DATADIR%%/LICENSE.TXT
-%%DATADIR%%/coordinate_axis.csv
-%%DATADIR%%/cubewerx_extra.wkt
-%%DATADIR%%/ecw_cs.wkt
-%%DATADIR%%/ellipsoid.csv
-%%DATADIR%%/epsg.wkt
-%%DATADIR%%/esri_extra.wkt
-%%DATADIR%%/gcs.csv
-%%DATADIR%%/gcs.override.csv
-%%DATADIR%%/gdal_datum.csv
-%%DATADIR%%/gdalicon.png
-%%DATADIR%%/gt_datum.csv
-%%DATADIR%%/gt_ellips.csv
-%%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%%/unit_of_measure.csv
-@dirrm %%DATADIR%%
+@dirrmtry %%PYTHON_SITELIBDIR%%
+@dirrmtry %%PYTHON_LIBDIR%%