- Update to 1.4.4

- Take maintainership

PR:		ports/118725
Submitted by:	Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net>

4 files changed, 35 insertions, 39 deletions

diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile
index 4e4b2af3f41f..0cdbde36f612 100644
--- a/graphics/gdal/Makefile
+++ b/graphics/gdal/Makefile
@@ -6,47 +6,47 @@
 #
 
 PORTNAME=	gdal
-PORTVERSION=	1.3.1
-PORTREVISION=	1
+PORTVERSION=	1.4.4
 CATEGORIES=	graphics geography
 MASTER_SITES=	ftp://ftp.remotesensing.org/pub/gdal/ \
 		http://www.gdal.org/dl/ \
-		http://dl.maptools.org/dl/gdal/
+		http://dl.maptools.org/dl/gdal/ \
+		http://sunpoet.net/distfiles/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@sunpoet.net
 COMMENT=	A translator library for 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 \
-		geotiff.1:${PORTSDIR}/graphics/libgeotiff \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		ungif.5:${PORTSDIR}/graphics/libungif
+		geotiff.1:${PORTSDIR}/graphics/libgeotiff \
+		ungif.5:${PORTSDIR}/graphics/libungif \
+		png.5:${PORTSDIR}/graphics/png \
+		tiff.4:${PORTSDIR}/graphics/tiff
 
 USE_AUTOTOOLS=	libtool:15
-USE_PYTHON=	yes
 USE_GMAKE=	yes
+USE_LDCONFIG=	yes
+USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libz=/usr \
-		--with-png=${LOCALBASE} \
-		--with-libtiff=${LOCALBASE} \
+		--with-jasper=${LOCALBASE} \
 		--with-libgeotiff=${LOCALBASE} \
-		--with-libjpeg=${LOCALBASE} \
 		--with-libgif=${LOCALBASE} \
-		--with-jasper=${LOCALBASE} \
+		--with-libjpeg=${LOCALBASE} \
+		--with-libtiff=${LOCALBASE} \
+		--with-png=${LOCALBASE} \
 		--with-python
 MAKEFILE=	GNUmakefile
-USE_LDCONFIG=	yes
 
-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
+MAN1=		gdal-config.1 gdal_contour.1 gdal_translate.1 \
+		gdal_utilities.1 gdaladdo.1 gdalinfo.1 gdaltindex.1 \
+		gdalwarp.1 ogr2ogr.1 ogr_utilities.1 ogrinfo.1 ogrtindex.1 \
+		gdal_merge.1 gdal_rasterize.1 pct2rgb.1 rgb2pct.1
 
 .include <bsd.port.pre.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|6LIBZ|6|;;s|lgif|lungif|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|lgif|lungif|' ${WRKSRC}/configure
 
 .include <bsd.port.post.mk>
diff --git a/graphics/gdal/distinfo b/graphics/gdal/distinfo
index d2ebc8ccfa26..3f7b284f5d8f 100644
--- a/graphics/gdal/distinfo
+++ b/graphics/gdal/distinfo
@@ -1,3 +1,3 @@
-MD5 (gdal-1.3.1.tar.gz) = 7ff1ceff745ee011793e1f860c02c172
-SHA256 (gdal-1.3.1.tar.gz) = 4f8f3c462f9174e1dd99f7bfa2abe010aa129e04c08a242a3c63c1a9e5078753
-SIZE (gdal-1.3.1.tar.gz) = 6856011
+MD5 (gdal-1.4.4.tar.gz) = 412ce85cef1ca638591dd150fcc195a7
+SHA256 (gdal-1.4.4.tar.gz) = a02c503faf2564c33f28cbcea40965c2f0b86bfde344835d6bf0356f2157056d
+SIZE (gdal-1.4.4.tar.gz) = 7317923
diff --git a/graphics/gdal/files/patch-frmts__fit__fitdataset.cpp b/graphics/gdal/files/patch-frmts__fit__fitdataset.cpp
deleted file mode 100644
index 71d36cc11916..000000000000
--- a/graphics/gdal/files/patch-frmts__fit__fitdataset.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./frmts/fit/fitdataset.cpp.orig	Wed Apr  4 16:33:12 2007
-+++ ./frmts/fit/fitdataset.cpp	Wed Apr  4 16:33:23 2007
-@@ -174,7 +174,7 @@
- 
- public:
- 
--    FITRasterBand::FITRasterBand( FITDataset *, int );
-+    FITRasterBand( FITDataset *, int );
- 	~FITRasterBand();
-     
-     // should override RasterIO eventually.
diff --git a/graphics/gdal/pkg-plist b/graphics/gdal/pkg-plist
index 57b3138a3a4f..49dc66947eb1 100644
--- a/graphics/gdal/pkg-plist
+++ b/graphics/gdal/pkg-plist
@@ -5,6 +5,7 @@ bin/gdal-config
 bin/gdal2xyz.py
 bin/gdal_contour
 bin/gdal_merge.py
+bin/gdal_rasterize
 bin/gdal_translate
 bin/gdaladdo
 bin/gdalchksum.py
@@ -28,7 +29,9 @@ include/cpl_odbc.h
 include/cpl_port.h
 include/cpl_string.h
 include/cpl_vsi.h
-include/cpl_vsi_private.h
+include/cpl_vsi_virtual.h
+include/cpl_win32ce_api.h
+include/cpl_wince.h
 include/gdal.h
 include/gdal_alg.h
 include/gdal_frmts.h
@@ -55,7 +58,10 @@ include/vrtdataset.h
 lib/libgdal.a
 lib/libgdal.la
 lib/libgdal.so
-lib/libgdal.so.10
+lib/libgdal.so.12
+%%DATADIR%%/GDALLogoBW.svg
+%%DATADIR%%/GDALLogoColor.svg
+%%DATADIR%%/GDALLogoGS.svg
 %%DATADIR%%/cubewerx_extra.wkt
 %%DATADIR%%/ecw_cs.dat
 %%DATADIR%%/ellipsoid.csv
@@ -67,6 +73,7 @@ lib/libgdal.so.10
 %%DATADIR%%/pcs.csv
 %%DATADIR%%/prime_meridian.csv
 %%DATADIR%%/projop_wparm.csv
+%%DATADIR%%/s57agencies.csv
 %%DATADIR%%/s57attributes.csv
 %%DATADIR%%/s57attributes_aml.csv
 %%DATADIR%%/s57attributes_iw.csv
@@ -78,12 +85,12 @@ lib/libgdal.so.10
 %%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%%/_gdalmodule.la
+%%PYTHON_SITELIBDIR%%/_gdalmodule.so
 %%PYTHON_SITELIBDIR%%/gdal.py
-%%PYTHON_SITELIBDIR%%/ogr.py
-%%PYTHON_SITELIBDIR%%/osr.py
 %%PYTHON_SITELIBDIR%%/gdalconst.py
 %%PYTHON_SITELIBDIR%%/gdalnumeric.py
+%%PYTHON_SITELIBDIR%%/ogr.py
+%%PYTHON_SITELIBDIR%%/osr.py
 @dirrm %%DATADIR%%