Update to gdal 1.10.0.

Enable spatialite & freexl support.
See http://trac.osgeo.org/gdal/wiki/Release/1.10.0-News for details.

Went in a bulk build without issues.
This commit is contained in:
landry 2013-05-31 15:00:08 +00:00
parent 299912fe50
commit 7ef46366bb
8 changed files with 39 additions and 37 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.25 2013/03/21 08:45:17 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.26 2013/05/31 15:00:08 landry Exp $
COMMENT-main = translator library for geospatial data formats
COMMENT-python =python bindings and utilities for GDAL
COMMENT-perl = perl bindings for GDAL
V = 1.9.2
V = 1.10.0
DISTNAME = gdal-${V}
SHARED_ONLY = Yes
@ -12,7 +12,7 @@ PKGNAME-main = ${DISTNAME}
PKGNAME-python =py-${DISTNAME}
PKGNAME-perl = p5-Geo-GDAL-${V}
SHARED_LIBS = gdal 19.0 #17.1
SHARED_LIBS = gdal 20.0 #18.0
CATEGORIES = geo devel
HOMEPAGE = http://www.gdal.org/
@ -22,7 +22,7 @@ MAINTAINER = Landry Breuil <landry@openbsd.org>
# MIT/X
PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES = http://download.osgeo.org/gdal/
MASTER_SITES = http://download.osgeo.org/gdal/${V}/
MODULES = perl lang/python devel/gettext
@ -33,16 +33,20 @@ LIB_DEPENDS-main = ${LIB_DEPENDS} \
net/curl \
databases/postgresql \
geo/geos \
geo/spatialite/libspatialite \
devel/libidn \
graphics/png \
graphics/libungif \
graphics/jpeg \
graphics/jasper \
devel/pcre \
devel/proj \
devel/geotiff
WANTLIB-main = ${WANTLIB} c crypto expat m ssl stdc++ z tiff \
curl pq geos geos_c idn png gif jpeg jasper geotiff \
com_err proj pthread
com_err proj pthread freexl pcre spatialite sqlite3 xml2
LIB_DEPENDS-python = ${PKGNAME}:${BASE_PKGPATH},-main
WANTLIB-python = ${MODPY_WANTLIB} gdal m pthread stdc++
@ -50,6 +54,7 @@ WANTLIB-python = ${MODPY_WANTLIB} gdal m pthread stdc++
LIB_DEPENDS-perl = ${PKGNAME}:${BASE_PKGPATH},-main
WANTLIB-perl = gdal crypto curl expat geos_c geotiff gif idn \
jasper jpeg m png pq ssl tiff z pthread \
freexl pcre spatialite xml2 \
${MODGETTEXT_WANTLIB}
RUN_DEPENDS += math/py-numpy
@ -73,7 +78,6 @@ CONFIGURE_ARGS = ${CONFIGURE_SHARED} \
--without-netcdf \
--without-xerces \
--without-mysql \
--without-sqlite3 \
--without-odbc \
--without-oci \
--without-grass \
@ -86,6 +90,8 @@ CONFIGURE_ARGS = ${CONFIGURE_SHARED} \
--with-python \
--with-perl \
--with-geos \
--with-freexl=${LOCALBASE} \
--with-spatialite=${LOCALBASE} \
--with-png=${LOCALBASE} \
--with-geotiff=${LOCALBASE} \
--with-libtiff=${LOCALBASE} \
@ -94,7 +100,4 @@ CONFIGURE_ARGS = ${CONFIGURE_SHARED} \
--with-jpeg=${LOCALBASE} \
--with-jasper=${LOCALBASE}
pre-configure:
${SUBST_CMD} ${WRKSRC}/configure
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (gdal-1.9.2.tar.gz) = nzua6WjqqNBu5USOW2Xnv6lA4uNFKCop2VJ1Qh82xog=
SIZE (gdal-1.9.2.tar.gz) = 9495381
SHA256 (gdal-1.10.0.tar.gz) = GpyhK8w6VfZrzWZU1f8S7t2zomtiLdfIhy/rtPWpdIc=
SIZE (gdal-1.10.0.tar.gz) = 10232486

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-configure,v 1.5 2012/10/18 07:09:29 landry Exp $
ensure MODPY_BIN is picked to try detecting setuptools
--- configure.orig Tue Oct 9 02:58:28 2012
+++ configure Wed Oct 17 14:06:25 2012
@@ -27340,7 +27340,7 @@ $as_echo_n "checking for python setuptools... " >&6; }
print 1
except ImportError:
pass'
- PY_HAVE_SETUPTOOLS=`python -c "$SETUPTEST"`
+ PY_HAVE_SETUPTOOLS=`${MODPY_BIN} -c "$SETUPTEST"`
if test "$PY_HAVE_SETUPTOOLS" = "1"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
$as_echo "found" >&6; }

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-swig_python_setup_py,v 1.3 2012/10/18 07:09:29 landry Exp $
--- swig/python/setup.py.orig Thu May 17 05:30:56 2012
+++ swig/python/setup.py Mon Oct 1 11:16:00 2012
@@ -166,7 +166,7 @@ class gdal_ext(build_ext):
$OpenBSD: patch-swig_python_setup_py,v 1.4 2013/05/31 15:00:09 landry Exp $
--- swig/python/setup.py.orig Wed Apr 24 20:55:26 2013
+++ swig/python/setup.py Thu May 30 17:07:14 2013
@@ -198,7 +198,7 @@ class gdal_ext(build_ext):
self.include_dirs.append(os.path.join(self.gdaldir,'include'))

View File

@ -1 +0,0 @@
@comment $OpenBSD: PFRAG.shared-main,v 1.2 2012/10/18 07:09:29 landry Exp $

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.7 2012/10/18 07:09:29 landry Exp $
@comment $OpenBSD: PLIST-main,v 1.8 2013/05/31 15:00:09 landry Exp $
@conflict gdal-<=1.8.0
@pkgpath geo/gdal
bin/gdal-config
@ -13,6 +13,7 @@ bin/gdal-config
@bin bin/gdalinfo
@bin bin/gdallocationinfo
@bin bin/gdalmanage
@bin bin/gdalserver
@bin bin/gdalsrsinfo
@bin bin/gdaltindex
@bin bin/gdaltransform
@ -38,11 +39,14 @@ include/cpl_minizip_zip.h
include/cpl_multiproc.h
include/cpl_odbc.h
include/cpl_port.h
include/cpl_progress.h
include/cpl_quad_tree.h
include/cpl_spawn.h
include/cpl_string.h
include/cpl_time.h
include/cpl_vsi.h
include/cpl_vsi_virtual.h
include/cpl_vsil_curl_priv.h
include/cpl_win32ce_api.h
include/cpl_wince.h
include/cplkeywordparser.h
@ -55,8 +59,10 @@ include/gdal_pam.h
include/gdal_priv.h
include/gdal_proxy.h
include/gdal_rat.h
include/gdal_simplesurf.h
include/gdal_version.h
include/gdal_vrt.h
include/gdalexif.h
include/gdalgrid.h
include/gdaljp2metadata.h
include/gdalwarper.h
@ -67,6 +73,7 @@ include/ogr_api.h
include/ogr_core.h
include/ogr_feature.h
include/ogr_featurestyle.h
include/ogr_geocoding.h
include/ogr_geometry.h
include/ogr_p.h
include/ogr_spatialref.h
@ -75,6 +82,7 @@ include/ogrsf_frmts.h
include/rawdataset.h
include/thinplatespline.h
include/vrtdataset.h
lib/gdalplugins/
lib/libgdal.a
lib/libgdal.la
@lib lib/libgdal.so.${LIBgdal_VERSION}
@ -103,6 +111,9 @@ share/gdal/gt_ellips.csv
share/gdal/header.dxf
share/gdal/nitf_spec.xml
share/gdal/nitf_spec.xsd
share/gdal/osmconf.ini
share/gdal/ozi_datum.csv
share/gdal/ozi_ellips.csv
share/gdal/pci_datum.txt
share/gdal/pci_ellips.txt
share/gdal/pcs.csv

View File

@ -1,16 +1,11 @@
@comment $OpenBSD: PLIST-perl,v 1.2 2012/10/18 07:09:29 landry Exp $
@comment $OpenBSD: PLIST-perl,v 1.3 2013/05/31 15:00:09 landry Exp $
${P5ARCH}/
${P5ARCH}/Geo/
${P5ARCH}/Geo/GDAL/
${P5ARCH}/Geo/GDAL.dox
${P5ARCH}/Geo/GDAL.pm
${P5ARCH}/Geo/GDAL/Const.dox
${P5ARCH}/Geo/GDAL/Const.pm
${P5ARCH}/Geo/OGR.dox
${P5ARCH}/Geo/OGR.pm
${P5ARCH}/Geo/OSR.dox
${P5ARCH}/Geo/OSR.pm
${P5ARCH}/Geo/check_dox.pl
${P5ARCH}/auto/
${P5ARCH}/auto/Geo/
${P5ARCH}/auto/Geo/GDAL/

View File

@ -1,22 +1,29 @@
@comment $OpenBSD: PLIST-python,v 1.4 2011/12/28 21:14:05 landry Exp $
@comment $OpenBSD: PLIST-python,v 1.5 2013/05/31 15:00:09 landry Exp $
bin/epsg_tr.py
bin/esri2wkt.py
bin/gcps2vec.py
bin/gcps2wld.py
bin/gdal2tiles.py
bin/gdal2xyz.py
bin/gdal_auth.py
bin/gdal_calc.py
bin/gdal_edit.py
bin/gdal_edit.dox
bin/gdal_fillnodata.dox
bin/gdal_fillnodata.py
bin/gdal_merge.py
bin/gdal_polygonize.py
bin/gdal_polygonize.dox
bin/gdal_proximity.py
bin/gdal_proximity.dox
bin/gdal_retile.py
bin/gdal_sieve.dox
bin/gdal_sieve.py
bin/gdalchksum.py
bin/gdalident.py
bin/gdalimport.py
bin/gdalmove.dox
bin/gdalmove.py
bin/mkgraticule.py
bin/pct2rgb.py
bin/rgb2pct.py