Update to gdal 1.8.0, loosely based on a diff from wen heping..

Remove REVISION, bump major, remove NO_REGRESS, enable thread support,
change my mail adress while here.
Tested on amd64 with qgis, mapserver and qlandkartegt, built fine on
sparc64.
This commit is contained in:
landry 2011-06-22 12:53:12 +00:00
parent 576d88e992
commit 62aa5dfc49
7 changed files with 47 additions and 30 deletions

View File

@ -1,26 +1,22 @@
# $OpenBSD: Makefile,v 1.16 2011/06/08 17:35:13 jasper Exp $
# $OpenBSD: Makefile,v 1.17 2011/06/22 12:53:12 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.7.3
V= 1.8.0
DISTNAME= gdal-${V}
PKGNAME-main= ${DISTNAME}
PKGNAME-python= py-${DISTNAME}
PKGNAME-perl= p5-Geo-GDAL-${V}
REVISION-main= 0
REVISION-python=0
REVISION-perl= 0
SHARED_LIBS= gdal 16.0
SHARED_LIBS= gdal 17.0
CATEGORIES= geo devel
HOMEPAGE = http://www.gdal.org/
MAINTAINER = Landry Breuil <gaston@gcu.info>
MAINTAINER = Landry Breuil <landry@openbsd.org>
# MIT/X
PERMIT_PACKAGE_CDROM= Yes
@ -34,8 +30,8 @@ MODULES = perl lang/python devel/gettext
WANTLIB-main = ${WANTLIB} c crypto expat m ssl stdc++ z
WANTLIB-perl = crypto curl expat geos_c geotiff gif idn jasper jpeg m \
png pq ssl tiff z
WANTLIB-python = m stdc++
png pq ssl tiff z pthread
WANTLIB-python = ${MODPY_WANTLIB} m stdc++
LIB_DEPENDS-main = ${LIB_DEPENDS} \
graphics/tiff \
@ -64,7 +60,6 @@ MULTI_PACKAGES= -main -python -perl
MODPY_SETUPTOOLS=Yes
MODPY_EGG_VERSION=${V}
NO_REGRESS= Yes
MAKE_FILE= GNUmakefile
MAKE_FLAGS= LIBTOOL_FINISH=:
USE_GMAKE= Yes
@ -88,13 +83,13 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--without-libgrass \
--without-php \
--without-ruby \
--without-threads \
--with-pg=${LOCALBASE}/bin/pg_config \
--with-python \
--with-perl \
--with-geos \
--with-png=${LOCALBASE} \
--with-geotiff=${LOCALBASE} \
--with-libtiff=${LOCALBASE} \
--with-curl=${LOCALBASE} \
--with-gif=${LOCALBASE} \
--with-jpeg=${LOCALBASE} \

View File

@ -1,5 +1,5 @@
MD5 (gdal-1.7.3.tar.gz) = xGc5cL0ihQMt6a6bvYJ1Sg==
RMD160 (gdal-1.7.3.tar.gz) = zoShLUjIWljFahc4Gu4cTyugi1c=
SHA1 (gdal-1.7.3.tar.gz) = WNQ1X+eSrWGLt0YF3BoISgrrfLE=
SHA256 (gdal-1.7.3.tar.gz) = +9uJNWq61OJ4lOv7yGWvuLic23lvOhnZsDR/ndbkz0o=
SIZE (gdal-1.7.3.tar.gz) = 7757684
MD5 (gdal-1.8.0.tar.gz) = x2LNqw9+UaZ3ukknioomPQ==
RMD160 (gdal-1.8.0.tar.gz) = DhFvQbI/9bRMaS9WRZ+sqzMsYgE=
SHA1 (gdal-1.8.0.tar.gz) = 5aKAKTMFQFDG+wsKDh9Gtd0ZWwo=
SHA256 (gdal-1.8.0.tar.gz) = UV8DFs0XKBoJoUeRS0eyi7xIVc24bUHRLLhxbRch5DU=
SIZE (gdal-1.8.0.tar.gz) = 8837824

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-configure,v 1.2 2010/11/21 09:37:40 landry Exp $
$OpenBSD: patch-configure,v 1.3 2011/06/22 12:53:12 landry Exp $
ensure MODPY_BIN is picked to try detecting setuptools
--- configure.orig Sun Nov 7 19:28:49 2010
+++ configure Wed Nov 17 20:31:42 2010
@@ -23256,7 +23256,7 @@ $as_echo_n "checking for python setuptools... " >&6; }
--- configure.orig Fri Jan 14 06:19:06 2011
+++ configure Mon Jun 20 22:18:34 2011
@@ -24382,7 +24382,7 @@ $as_echo_n "checking for python setuptools... " >&6; }
print 1
except ImportError:
pass'

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-swig_perl_GNUmakefile,v 1.1 2011/06/22 12:53:12 landry Exp $
INST_PREFIX is wrong
--- swig/perl/GNUmakefile.orig Mon Jun 20 22:44:25 2011
+++ swig/perl/GNUmakefile Mon Jun 20 22:44:36 2011
@@ -26,7 +26,7 @@ build: Makefile_Geo__GDAL gdal_wrap.cc
gdal_wrap.cc: generate
Makefile_Geo__GDAL:
- perl Makefile.PL INSTALL_BASE=$(INST_PREFIX)
+ perl Makefile.PL
test: build
$(MAKE) -f Makefile_Geo__GDAL test

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-swig_python_GNUmakefile,v 1.2 2010/11/21 09:37:40 landry Exp $
$OpenBSD: patch-swig_python_GNUmakefile,v 1.3 2011/06/22 12:53:12 landry Exp $
tweak to build egg-info files during build stage
--- swig/python/GNUmakefile.orig Sun Nov 7 19:28:49 2010
+++ swig/python/GNUmakefile Wed Nov 17 20:31:42 2010
@@ -63,14 +63,12 @@ generate: ${WRAPPERS} gdal_array_wrap.cpp
--- swig/python/GNUmakefile.orig Fri Jan 14 06:19:06 2011
+++ swig/python/GNUmakefile Mon Jun 20 22:18:34 2011
@@ -54,14 +54,12 @@ generate: ${WRAPPERS} gdal_array_wrap.cpp
build:
$(PYTHON) setup.py build

View File

@ -1,7 +1,8 @@
@comment $OpenBSD: PLIST-main,v 1.4 2010/11/21 09:37:40 landry Exp $
@comment $OpenBSD: PLIST-main,v 1.5 2011/06/22 12:53:12 landry Exp $
@pkgpath geo/gdal
%%SHARED%%
bin/gdal-config
bin/gdal_calc.py
@bin bin/gdal_contour
bin/gdal_fillnodata.dox
bin/gdal_fillnodata.py
@ -13,6 +14,7 @@ bin/gdal_fillnodata.py
@bin bin/gdaldem
@bin bin/gdalenhance
@bin bin/gdalinfo
@bin bin/gdallocationinfo
@bin bin/gdalmanage
@bin bin/gdaltindex
@bin bin/gdaltransform
@ -23,6 +25,7 @@ bin/gdal_fillnodata.py
@bin bin/ogrtindex
@bin bin/testepsg
include/cpl_atomic_ops.h
include/cpl_base64.h
include/cpl_config.h
include/cpl_config_extras.h
include/cpl_conv.h
@ -34,6 +37,7 @@ include/cpl_list.h
include/cpl_minixml.h
include/cpl_minizip_ioapi.h
include/cpl_minizip_unzip.h
include/cpl_minizip_zip.h
include/cpl_multiproc.h
include/cpl_odbc.h
include/cpl_port.h
@ -48,6 +52,7 @@ include/cplkeywordparser.h
include/gdal.h
include/gdal_alg.h
include/gdal_alg_priv.h
include/gdal_csv.h
include/gdal_frmts.h
include/gdal_pam.h
include/gdal_priv.h
@ -58,6 +63,7 @@ include/gdal_vrt.h
include/gdalgrid.h
include/gdaljp2metadata.h
include/gdalwarper.h
include/gdalwarpkernel_opencl.h
include/gvgcpfit.h
include/memdataset.h
include/ogr_api.h
@ -79,8 +85,10 @@ share/gdal/GDALLogoBW.svg
share/gdal/GDALLogoColor.svg
share/gdal/GDALLogoGS.svg
share/gdal/LICENSE.TXT
share/gdal/compdcs.csv
share/gdal/coordinate_axis.csv
share/gdal/cubewerx_extra.wkt
share/gdal/datum_shift.csv
share/gdal/ecw_cs.wkt
share/gdal/ellipsoid.csv
share/gdal/epsg.wkt
@ -92,6 +100,8 @@ share/gdal/gdalicon.png
share/gdal/gt_datum.csv
share/gdal/gt_ellips.csv
share/gdal/header.dxf
share/gdal/pci_datum.txt
share/gdal/pci_ellips.txt
share/gdal/pcs.csv
share/gdal/pcs.override.csv
share/gdal/prime_meridian.csv
@ -109,3 +119,5 @@ share/gdal/seed_3d.dgn
share/gdal/stateplane.csv
share/gdal/trailer.dxf
share/gdal/unit_of_measure.csv
share/gdal/vertcs.csv
share/gdal/vertcs.override.csv

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-python,v 1.1 2009/03/13 08:56:53 landry Exp $
@comment $OpenBSD: PLIST-python,v 1.2 2011/06/22 12:53:12 landry Exp $
bin/epsg_tr.py
bin/esri2wkt.py
bin/gcps2vec.py
@ -27,15 +27,12 @@ lib/python${MODPY_VERSION}/site-packages/gdal.py
lib/python${MODPY_VERSION}/site-packages/gdal.pyc
lib/python${MODPY_VERSION}/site-packages/gdalconst.py
lib/python${MODPY_VERSION}/site-packages/gdalconst.pyc
lib/python${MODPY_VERSION}/site-packages/gdalnumeric.py
lib/python${MODPY_VERSION}/site-packages/gdalnumeric.pyc
lib/python${MODPY_VERSION}/site-packages/ogr.py
lib/python${MODPY_VERSION}/site-packages/ogr.pyc
lib/python${MODPY_VERSION}/site-packages/osgeo/
lib/python${MODPY_VERSION}/site-packages/osgeo/__init__.py
lib/python${MODPY_VERSION}/site-packages/osgeo/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/osgeo/_gdal.so
lib/python${MODPY_VERSION}/site-packages/osgeo/_gdal_array.so
lib/python${MODPY_VERSION}/site-packages/osgeo/_gdalconst.so
lib/python${MODPY_VERSION}/site-packages/osgeo/_ogr.so
lib/python${MODPY_VERSION}/site-packages/osgeo/_osr.so