Date: Sun, 6 Jan 2008 19:14:39 GMT From: "James E. Flemer" <jflemer@alum.rpi.edu> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/119392: [patch] update graphics/gdal to 1.5.0 Message-ID: <200801061914.m06JEdju031270@www.freebsd.org> Resent-Message-ID: <200801061920.m06JK2v4071770@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 119392
>Category: ports
>Synopsis: [patch] update graphics/gdal to 1.5.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sun Jan 06 19:20:02 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: James E. Flemer
>Release: 6.2-STABLE
>Organization:
>Environment:
6.2-STABLE FreeBSD 6.2-STABLE #15: Sun Apr 22 14:58:03 MDT 2007
>Description:
Non-maintainer port update from GDAL v1.4.4 to v1.5.0 (latest release as of 6-Jan-08).
>How-To-Repeat:
>Fix:
Apply attached patch from ${PORTSDIR}/graphics/gdal.
NOTE: This includes two new files in ${PORTSDIR}/graphics/gdal/files.
Patch attached with submission follows:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/gdal/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- Makefile 15 Dec 2007 22:38:58 -0000 1.24
+++ Makefile 6 Jan 2008 19:12:02 -0000
@@ -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 @@
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
+BUILD_DEPENDS+= ${EASY_INSTALL_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+= ${EASY_INSTALL_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,14 +41,26 @@
--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
+
+EASY_INSTALL_CMD?= easy_install-${PYTHON_VER}
+
+GDAL_EGG= ${PORTNAME:U}-${PORTVERSION}-py${PYTHON_VER}-${OPSYS:L}-${OSRELEASE}-${ARCH}.egg
+
+PLIST_SUB+= EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \
+ GDAL_EGG=${GDAL_EGG} \
+ GDAL_EGG_VER="${PORTNAME:U}==${PORTVERSION}"
.include <bsd.port.pre.mk>
+OSRELEASE!= ${DESTDIR}/usr/bin/uname -r
+
post-patch:
@${REINPLACE_CMD} -e 's|lgif|lungif|' ${WRKSRC}/configure
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/graphics/gdal/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo 15 Dec 2007 22:38:58 -0000 1.9
+++ distinfo 6 Jan 2008 19:12:02 -0000
@@ -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
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/graphics/gdal/pkg-plist,v
retrieving revision 1.8
diff -u -r1.8 pkg-plist
--- pkg-plist 15 Dec 2007 22:38:58 -0000 1.8
+++ pkg-plist 6 Jan 2008 19:12:02 -0000
@@ -1,18 +1,72 @@
+@unexec %%EASY_INSTALL_CMD%% -q -m -S %D/%%PYTHON_SITELIBDIR%% %%GDAL_EGG_VER%%
+%%PYTHON_SITELIBDIR%%/%%GDAL_EGG%%/EGG-INFO/PKG-INFO
+%%PYTHON_SITELIBDIR%%/%%GDAL_EGG%%/EGG-INFO/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/%%GDAL_EGG%%/EGG-INFO/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/%%GDAL_EGG%%/EGG-INFO/native_libs.txt
+%%PYTHON_SITELIBDIR%%/%%GDAL_EGG%%/EGG-INFO/not-zip-safe
+%%PYTHON_SITELIBDIR%%/%%GDAL_EGG%%/EGG-INFO/top_level.txt
+%%PYTHON_SITELIBDIR%%/%%GDAL_EGG%%/gdal.py
+%%PYTHON_SITELIBDIR%%/%%GDAL_EGG%%/gdal.pyc
+%%PYTHON_SITELIBDIR%%/%%GDAL_EGG%%/gdalconst.py
+%%PYTHON_SITELIBDIR%%/%%GDAL_EGG%%/gdalconst.pyc
+%%PYTHON_SITELIBDIR%%/%%GDAL_EGG%%/ogr.py
+%%PYTHON_SITELIBDIR%%/%%GDAL_EGG%%/ogr.pyc
+%%PYTHON_SITELIBDIR%%/%%GDAL_EGG%%/osgeo/__init__.py
+%%PYTHON_SITELIBDIR%%/%%GDAL_EGG%%/osgeo/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%GDAL_EGG%%/osgeo/_gdal.py
+%%PYTHON_SITELIBDIR%%/%%GDAL_EGG%%/osgeo/_gdal.pyc
+%%PYTHON_SITELIBDIR%%/%%GDAL_EGG%%/osgeo/_gdal.so
+%%PYTHON_SITELIBDIR%%/%%GDAL_EGG%%/osgeo/_gdalconst.py
+%%PYTHON_SITELIBDIR%%/%%GDAL_EGG%%/osgeo/_gdalconst.pyc
+%%PYTHON_SITELIBDIR%%/%%GDAL_EGG%%/osgeo/_gdalconst.so
+%%PYTHON_SITELIBDIR%%/%%GDAL_EGG%%/osgeo/_ogr.py
+%%PYTHON_SITELIBDIR%%/%%GDAL_EGG%%/osgeo/_ogr.pyc
+%%PYTHON_SITELIBDIR%%/%%GDAL_EGG%%/osgeo/_ogr.so
+%%PYTHON_SITELIBDIR%%/%%GDAL_EGG%%/osgeo/_osr.py
+%%PYTHON_SITELIBDIR%%/%%GDAL_EGG%%/osgeo/_osr.pyc
+%%PYTHON_SITELIBDIR%%/%%GDAL_EGG%%/osgeo/_osr.so
+%%PYTHON_SITELIBDIR%%/%%GDAL_EGG%%/osgeo/gdal.py
+%%PYTHON_SITELIBDIR%%/%%GDAL_EGG%%/osgeo/gdal.pyc
+%%PYTHON_SITELIBDIR%%/%%GDAL_EGG%%/osgeo/gdal_array.py
+%%PYTHON_SITELIBDIR%%/%%GDAL_EGG%%/osgeo/gdal_array.pyc
+%%PYTHON_SITELIBDIR%%/%%GDAL_EGG%%/osgeo/gdalconst.py
+%%PYTHON_SITELIBDIR%%/%%GDAL_EGG%%/osgeo/gdalconst.pyc
+%%PYTHON_SITELIBDIR%%/%%GDAL_EGG%%/osgeo/gdalnumeric.py
+%%PYTHON_SITELIBDIR%%/%%GDAL_EGG%%/osgeo/gdalnumeric.pyc
+%%PYTHON_SITELIBDIR%%/%%GDAL_EGG%%/osgeo/ogr.py
+%%PYTHON_SITELIBDIR%%/%%GDAL_EGG%%/osgeo/ogr.pyc
+%%PYTHON_SITELIBDIR%%/%%GDAL_EGG%%/osgeo/osr.py
+%%PYTHON_SITELIBDIR%%/%%GDAL_EGG%%/osgeo/osr.pyc
+%%PYTHON_SITELIBDIR%%/%%GDAL_EGG%%/osr.py
+%%PYTHON_SITELIBDIR%%/%%GDAL_EGG%%/osr.pyc
+@dirrm %%PYTHON_SITELIBDIR%%/%%GDAL_EGG%%/osgeo
+@dirrm %%PYTHON_SITELIBDIR%%/%%GDAL_EGG%%/EGG-INFO
+@exec %%EASY_INSTALL_CMD%% -q -N -S %D/%%PYTHON_SITELIBDIR%% %%GDAL_EGG_VER%%
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 +76,7 @@
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 +94,8 @@
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 +115,24 @@
lib/libgdal.a
lib/libgdal.la
lib/libgdal.so
-lib/libgdal.so.12
+lib/libgdal.so.13
%%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 +147,4 @@
%%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%%
--- /dev/null Sun Jan 6 12:11:00 2008
+++ files/patch-ogr::GNUmakefile Wed Dec 26 12:31:12 2007
@@ -0,0 +1,12 @@
+# $FreeBSD$
+--- 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/*
--- /dev/null Sun Jan 6 12:11:00 2008
+++ files/patch-ogr::ogrsf_frmts::kml::ogr2kmlgeometry.cpp Wed Dec 26 12:31:12 2007
@@ -0,0 +1,12 @@
+# $FreeBSD$
+--- 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;
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200801061914.m06JEdju031270>