3 files changed, 58 insertions, 40 deletions

diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile
index 0cde436adebb..42c02cf07110 100644
--- a/graphics/gdal/Makefile
+++ b/graphics/gdal/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	gdal
-PORTVERSION=	1.2.1
-PORTREVISION=	2
+PORTVERSION=	1.3.1
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.remotesensing.org/pub/gdal/
+MASTER_SITES=	ftp://ftp.remotesensing.org/pub/gdal/ \
+		http://www.gdal.org/dl/ \
+		http://dl.maptools.org/dl/gdal/
 
 MAINTAINER=	lawrance@FreeBSD.org
 COMMENT=	A translator library for raster geospatial data formats
@@ -17,30 +18,32 @@ COMMENT=	A translator library for raster geospatial data formats
 BUILD_DEPENDS=	${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen
 LIB_DEPENDS=	jasper.4:${PORTSDIR}/graphics/jasper \
 		png.5:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff
+		tiff.4:${PORTSDIR}/graphics/tiff \
+		geotiff.1:${PORTSDIR}/graphics/libgeotiff \
+		jpeg.9:${PORTSDIR}/graphics/jpeg \
+		ungif.5:${PORTSDIR}/graphics/libungif
 
 USE_PYTHON=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-libz=internal \
+CONFIGURE_ARGS=	--with-libz=/usr \
 		--with-png=${LOCALBASE} \
 		--with-libtiff=${LOCALBASE} \
-		--with-libgeotiff=internal \
-		--with-libjpeg=internal \
-		--with-libgif=internal \
+		--with-libgeotiff=${LOCALBASE} \
+		--with-libjpeg=${LOCALBASE} \
+		--with-libgif=${LOCALBASE} \
 		--with-jasper=${LOCALBASE} \
 		--with-python
 MAKEFILE=	GNUmakefile
 INSTALLS_SHLIB=	yes
-CFLAGS+=	-I${LOCALBASE}/include
 
-MAN1=		gdaladdo.1 gdalinfo.1 gdaltindex.1 gdalwarp.1 \
-		gdal-config.1 gdal_translate.1 ogrinfo.1 \
-		ogrtindex.1 ogr2ogr.1
+MAN1=		gdal-config.1 gdal_utilities.1 gdalwarp.1 ogrtindex.1 \
+		gdal_contour.1 gdaladdo.1 ogr2ogr.1 pct2rgb.py.1 \
+		gdal_merge.py.1 gdalinfo.1 ogr_utilities.1 rgb2pct.py.1 \
+		gdal_translate.1 gdaltindex.1 ogrinfo.1
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|6LIBZ|6|' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|"tiffio.h"|<tiffio.h>|' ${WRKSRC}/frmts/gtiff/libgeotiff/xtiffio.h
+		@${REINPLACE_CMD} -e 's|6LIBZ|6|;;s|lgif|lungif|' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/graphics/gdal/distinfo b/graphics/gdal/distinfo
index 19783dd0a2e6..d2ebc8ccfa26 100644
--- a/graphics/gdal/distinfo
+++ b/graphics/gdal/distinfo
@@ -1,2 +1,3 @@
-MD5 (gdal-1.2.1.tar.gz) = 31f454e8f456bc6973ff652108b5f5e6
-SIZE (gdal-1.2.1.tar.gz) = 3899013
+MD5 (gdal-1.3.1.tar.gz) = 7ff1ceff745ee011793e1f860c02c172
+SHA256 (gdal-1.3.1.tar.gz) = 4f8f3c462f9174e1dd99f7bfa2abe010aa129e04c08a242a3c63c1a9e5078753
+SIZE (gdal-1.3.1.tar.gz) = 6856011
diff --git a/graphics/gdal/pkg-plist b/graphics/gdal/pkg-plist
index fff784b535b6..57b3138a3a4f 100644
--- a/graphics/gdal/pkg-plist
+++ b/graphics/gdal/pkg-plist
@@ -1,4 +1,5 @@
 bin/epsg_tr.py
+bin/gcps2vec.py
 bin/gcps2wld.py
 bin/gdal-config
 bin/gdal2xyz.py
@@ -27,12 +28,18 @@ include/cpl_odbc.h
 include/cpl_port.h
 include/cpl_string.h
 include/cpl_vsi.h
+include/cpl_vsi_private.h
 include/gdal.h
 include/gdal_alg.h
 include/gdal_frmts.h
+include/gdal_pam.h
 include/gdal_priv.h
+include/gdal_rat.h
+include/gdal_version.h
+include/gdaljp2metadata.h
 include/gdalwarper.h
 include/gvgcpfit.h
+include/memdataset.h
 include/ogr_api.h
 include/ogr_core.h
 include/ogr_feature.h
@@ -42,34 +49,41 @@ include/ogr_p.h
 include/ogr_spatialref.h
 include/ogr_srs_api.h
 include/ogrsf_frmts.h
+include/rawdataset.h
+include/thinplatespline.h
+include/vrtdataset.h
 lib/libgdal.a
 lib/libgdal.la
 lib/libgdal.so
-lib/libgdal.so.4
-%%PYTHON_SITELIBDIR%%/_gdalmodule.a
-%%PYTHON_SITELIBDIR%%/_gdalmodule.la
+lib/libgdal.so.10
+%%DATADIR%%/cubewerx_extra.wkt
+%%DATADIR%%/ecw_cs.dat
+%%DATADIR%%/ellipsoid.csv
+%%DATADIR%%/epsg.wkt
+%%DATADIR%%/esri_extra.wkt
+%%DATADIR%%/gcs.csv
+%%DATADIR%%/gdal_datum.csv
+%%DATADIR%%/gdalicon.png
+%%DATADIR%%/pcs.csv
+%%DATADIR%%/prime_meridian.csv
+%%DATADIR%%/projop_wparm.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
 %%PYTHON_SITELIBDIR%%/_gdalmodule.so
+%%PYTHON_SITELIBDIR%%/_gdalmodule.la
+%%PYTHON_SITELIBDIR%%/_gdalmodule.a
 %%PYTHON_SITELIBDIR%%/gdal.py
-%%PYTHON_SITELIBDIR%%/gdalconst.py
-%%PYTHON_SITELIBDIR%%/gdalnumeric.py
 %%PYTHON_SITELIBDIR%%/ogr.py
 %%PYTHON_SITELIBDIR%%/osr.py
-share/gdal/cubewerx_extra.wkt
-share/gdal/ecw_cs.dat
-share/gdal/ellipsoid.csv
-share/gdal/epsg.wkt
-share/gdal/esri_extra.wkt
-share/gdal/gcs.csv
-share/gdal/gdal_datum.csv
-share/gdal/gdalicon.png
-share/gdal/pcs.csv
-share/gdal/prime_meridian.csv
-share/gdal/projop_wparm.csv
-share/gdal/s57attributes.csv
-share/gdal/s57expectedinput.csv
-share/gdal/s57objectclasses.csv
-share/gdal/seed_2d.dgn
-share/gdal/seed_3d.dgn
-share/gdal/stateplane.csv
-share/gdal/unit_of_measure.csv
-@dirrm share/gdal
+%%PYTHON_SITELIBDIR%%/gdalconst.py
+%%PYTHON_SITELIBDIR%%/gdalnumeric.py
+@dirrm %%DATADIR%%