6 files changed, 165 insertions, 19 deletions

diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile
index 0cdbde36f612..9cb3f4114818 100644
--- a/graphics/gdal/Makefile
+++ b/graphics/gdal/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gdal
-PORTVERSION=	1.4.4
+PORTVERSION=	1.5.0
 CATEGORIES=	graphics geography
 MASTER_SITES=	ftp://ftp.remotesensing.org/pub/gdal/ \
 		http://www.gdal.org/dl/ \
@@ -16,20 +16,23 @@ MASTER_SITES=	ftp://ftp.remotesensing.org/pub/gdal/ \
 MAINTAINER=	sunpoet@sunpoet.net
 COMMENT=	A translator library for geospatial data formats
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen
+BUILD_DEPENDS=	${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen \
+		${PYEASYINSTALL_CMD}:${PORTSDIR}/devel/py-setuptools
 LIB_DEPENDS=	jasper.4:${PORTSDIR}/graphics/jasper \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		geotiff.1:${PORTSDIR}/graphics/libgeotiff \
 		ungif.5:${PORTSDIR}/graphics/libungif \
 		png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff
+RUN_DEPENDS=	${PYEASYINSTALL_CMD}:${PORTSDIR}/devel/py-setuptools
 
 USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-libz=/usr \
+CONFIGURE_ARGS=	--datadir=${DATADIR} \
+		--with-libz=/usr \
 		--with-jasper=${LOCALBASE} \
 		--with-libgeotiff=${LOCALBASE} \
 		--with-libgif=${LOCALBASE} \
@@ -38,15 +41,49 @@ CONFIGURE_ARGS=	--with-libz=/usr \
 		--with-png=${LOCALBASE} \
 		--with-python
 MAKEFILE=	GNUmakefile
+INSTALL_TARGET=	install install-man
 
-MAN1=		gdal-config.1 gdal_contour.1 gdal_translate.1 \
+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 \
-		gdalwarp.1 ogr2ogr.1 ogr_utilities.1 ogrinfo.1 ogrtindex.1 \
-		gdal_merge.1 gdal_rasterize.1 pct2rgb.1 rgb2pct.1
+		gdaltransform.1 gdalwarp.1 nearblack.1 ogr2ogr.1 \
+		ogr_utilities.1 ogrinfo.1 ogrtindex.1 pct2rgb.1 rgb2pct.1
 
 .include <bsd.port.pre.mk>
 
+# We can not use USE_PYDISTUTILS, so copy these from bsd.python.mk.
+PYEASYINSTALL_CMD=	${LOCALBASE}/bin/easy_install-${PYTHON_VER}
+PYDISTUTILS_PKGNAME=	${PORTNAME:U}
+PYDISTUTILS_PKGVERSION=	${PORTVERSION}
+_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}
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|lgif|lungif|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e '\
+		s,%%MAKE_ENV%%,${MAKE_ENV},; \
+		s,%%PYTHON_SITELIBDIR%%,${PYTHON_SITELIBDIR},; \
+		s,%%PYEASYINSTALL_BINDIR%%,${PYEASYINSTALL_BINDIR},; \
+		s,%%PYEASYINSTALL_SITELIBDIR%%,${PYEASYINSTALL_SITELIBDIR},; \
+		s,%%PYEASYINSTALL_EGG%%,${PYEASYINSTALL_EGG},; \
+		s,%%WRKSRC%%,${WRKSRC},; \
+		' ${WRKSRC}/swig/python/GNUmakefile
+
+pre-build:
+	@(cd ${BUILD_WRKSRC}/swig/python; \
+		${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} setopt -c build -o build-platlib -s lib.${PYEASYINSTALL_OSARCH:S/^-//}; \
+		${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} setopt -c build -o build-temp -s temp.${PYEASYINSTALL_OSARCH:S/^-//}-${PYTHON_VER}; \
+		${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} setopt -c bdist_egg -o plat-name -s ${PYEASYINSTALL_OSARCH:S/^-//}; \
+		${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} setopt -c bdist -o plat-name -s ${PYEASYINSTALL_OSARCH:S/^-//})
 
 .include <bsd.port.post.mk>
diff --git a/graphics/gdal/distinfo b/graphics/gdal/distinfo
index 3f7b284f5d8f..b651765f059d 100644
--- a/graphics/gdal/distinfo
+++ b/graphics/gdal/distinfo
@@ -1,3 +1,3 @@
-MD5 (gdal-1.4.4.tar.gz) = 412ce85cef1ca638591dd150fcc195a7
-SHA256 (gdal-1.4.4.tar.gz) = a02c503faf2564c33f28cbcea40965c2f0b86bfde344835d6bf0356f2157056d
-SIZE (gdal-1.4.4.tar.gz) = 7317923
+MD5 (gdal-1.5.0.tar.gz) = ffbb024db521a002018cb5666bd6e60d
+SHA256 (gdal-1.5.0.tar.gz) = 9ac75f8928aa649a70e2aa3ebda86e71e18acc295cd874c43d33a84ac11c1e91
+SIZE (gdal-1.5.0.tar.gz) = 6167411
diff --git a/graphics/gdal/files/patch-ogr-GNUmakefile b/graphics/gdal/files/patch-ogr-GNUmakefile
new file mode 100644
index 000000000000..4da75e2a5311
--- /dev/null
+++ b/graphics/gdal/files/patch-ogr-GNUmakefile
@@ -0,0 +1,11 @@
+--- ogr/GNUmakefile.orig	Fri Nov  9 11:11:24 2007
++++ ogr/GNUmakefile	Wed Dec 26 12:30:59 2007
+@@ -15,7 +15,7 @@
+ 
+ default:	lib
+ 
+-all:	sublibs apps test_ogrsf$(EXE) 
++all:	sublibs
+ 
+ clean:
+ 	rm -f html/*
diff --git a/graphics/gdal/files/patch-ogr-ogrsf_frmts-kml-ogr2kmlgeometry.cpp b/graphics/gdal/files/patch-ogr-ogrsf_frmts-kml-ogr2kmlgeometry.cpp
new file mode 100644
index 000000000000..8a620a6aba54
--- /dev/null
+++ b/graphics/gdal/files/patch-ogr-ogrsf_frmts-kml-ogr2kmlgeometry.cpp
@@ -0,0 +1,11 @@
+--- ogr/ogrsf_frmts/kml/ogr2kmlgeometry.cpp.orig	Mon Dec 17 13:49:31 2007
++++ ogr/ogrsf_frmts/kml/ogr2kmlgeometry.cpp	Wed Dec 26 11:43:43 2007
+@@ -365,7 +365,7 @@
+ 
+ CPLXMLNode* OGR_G_ExportEnvelopeToKMLTree( OGRGeometryH hGeometry )
+ {
+-    VALIDATE_POINTER1( hGeometry, "OGR_G_ExportEnvelopeToKMLTree", NULL );
++    //VALIDATE_POINTER1( hGeometry, "OGR_G_ExportEnvelopeToKMLTree", NULL );
+ 
+     CPLXMLNode* psBox = NULL;
+     CPLXMLNode* psCoord = NULL;
diff --git a/graphics/gdal/files/patch-swig-python-GNUmakefile b/graphics/gdal/files/patch-swig-python-GNUmakefile
new file mode 100644
index 000000000000..f00331fae35a
--- /dev/null
+++ b/graphics/gdal/files/patch-swig-python-GNUmakefile
@@ -0,0 +1,20 @@
+--- swig/python/GNUmakefile.orig	2007-11-26 16:02:20.000000000 +0800
++++ swig/python/GNUmakefile	2008-02-13 14:27:20.000000000 +0800
+@@ -43,7 +43,7 @@
+ generate: ${WRAPPERS}
+ 
+ build:
+-	python setup.py build
++	python setup.py bdist_egg
+ 
+ egg:
+ 	python setup.py bdist_egg 
+@@ -51,7 +51,7 @@
+ install:
+ 
+ ifeq ($(PY_HAVE_SETUPTOOLS),1)
+-	python setup.py install 
++	env %%MAKE_ENV%% python setup.py easy_install -O 1 -N -S %%PYTHON_SITELIBDIR%% -d %%PYEASYINSTALL_SITELIBDIR%% -s %%PYEASYINSTALL_BINDIR%% %%WRKSRC%%/swig/python/dist/%%PYEASYINSTALL_EGG%%
+ else
+ 	python setup.py install --prefix=$(DESTDIR)$(prefix)
+ endif
diff --git a/graphics/gdal/pkg-plist b/graphics/gdal/pkg-plist
index 49dc66947eb1..89cba18d8697 100644
--- a/graphics/gdal/pkg-plist
+++ b/graphics/gdal/pkg-plist
@@ -1,18 +1,28 @@
 bin/epsg_tr.py
+bin/esri2wkt.py
 bin/gcps2vec.py
 bin/gcps2wld.py
 bin/gdal-config
+bin/gdal2tiles.py
 bin/gdal2xyz.py
 bin/gdal_contour
+bin/gdal_grid
 bin/gdal_merge.py
 bin/gdal_rasterize
+bin/gdal_retile.py
 bin/gdal_translate
 bin/gdaladdo
 bin/gdalchksum.py
+bin/gdalenhance
+bin/gdalident.py
 bin/gdalimport.py
 bin/gdalinfo
+bin/gdalmanage
 bin/gdaltindex
+bin/gdaltransform
 bin/gdalwarp
+bin/mkgraticule.py
+bin/nearblack
 bin/ogr2ogr
 bin/ogrinfo
 bin/ogrtindex
@@ -22,6 +32,7 @@ include/cpl_config.h
 include/cpl_conv.h
 include/cpl_csv.h
 include/cpl_error.h
+include/cpl_http.h
 include/cpl_list.h
 include/cpl_minixml.h
 include/cpl_multiproc.h
@@ -39,6 +50,8 @@ include/gdal_pam.h
 include/gdal_priv.h
 include/gdal_rat.h
 include/gdal_version.h
+include/gdal_vrt.h
+include/gdalgrid.h
 include/gdaljp2metadata.h
 include/gdalwarper.h
 include/gvgcpfit.h
@@ -58,19 +71,81 @@ include/vrtdataset.h
 lib/libgdal.a
 lib/libgdal.la
 lib/libgdal.so
-lib/libgdal.so.12
+lib/libgdal.so.13
+%%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
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gdal.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gdal.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gdal.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gdalconst.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gdalconst.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gdalconst.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ogr.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ogr.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ogr.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_gdal.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_gdal.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_gdal.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_gdal.so
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_gdalconst.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_gdalconst.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_gdalconst.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_gdalconst.so
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_ogr.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_ogr.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_ogr.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_ogr.so
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_osr.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_osr.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_osr.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_osr.so
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/gdal.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/gdal.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/gdal.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/gdal_array.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/gdal_array.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/gdal_array.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/gdalconst.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/gdalconst.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/gdalconst.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/gdalnumeric.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/gdalnumeric.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/gdalnumeric.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/ogr.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/ogr.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/ogr.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/osr.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/osr.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/osr.pyo
+%%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
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
 %%DATADIR%%/GDALLogoBW.svg
 %%DATADIR%%/GDALLogoColor.svg
 %%DATADIR%%/GDALLogoGS.svg
+%%DATADIR%%/LICENSE.TXT
 %%DATADIR%%/cubewerx_extra.wkt
-%%DATADIR%%/ecw_cs.dat
+%%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
@@ -85,12 +160,4 @@ lib/libgdal.so.12
 %%DATADIR%%/seed_3d.dgn
 %%DATADIR%%/stateplane.csv
 %%DATADIR%%/unit_of_measure.csv
-%%PYTHON_SITELIBDIR%%/_gdalmodule.a
-%%PYTHON_SITELIBDIR%%/_gdalmodule.la
-%%PYTHON_SITELIBDIR%%/_gdalmodule.so
-%%PYTHON_SITELIBDIR%%/gdal.py
-%%PYTHON_SITELIBDIR%%/gdalconst.py
-%%PYTHON_SITELIBDIR%%/gdalnumeric.py
-%%PYTHON_SITELIBDIR%%/ogr.py
-%%PYTHON_SITELIBDIR%%/osr.py
 @dirrm %%DATADIR%%