summaryrefslogtreecommitdiff
path: root/geography
diff options
context:
space:
mode:
authorgdt <gdt>2007-02-23 22:22:38 +0000
committergdt <gdt>2007-02-23 22:22:38 +0000
commit09fcce04c3f32ba4e24bdb7326d0b7dad495df7b (patch)
treeaa465cdddf9ba68aa7dd31c72dda5b954870ad7e /geography
parente973c91939e5e07931559a00bdf6d0f9ce8f9f85 (diff)
downloadpkgsrc-09fcce04c3f32ba4e24bdb7326d0b7dad495df7b.tar.gz
Update to 1.4.0, supplied by Brook Milligan in PR 35752.
The package now has a mysql option in addition to the default pgsql. GDAL/OGR 1.4.0 - General Changes -------------------------------- Perl Bindings: - Added doxygen based documentation. NG Python Bindings: - Implemented numpy support. CSharp Bindings: - Now mostly operational. WinCE Porting: - CPL - base OGR, OSR and mitab and shape drivers. - GDAL, including GeoTIFF, DTED, AAIGrid drivers - Added test suite (gdalautotest/cpp) Mac OSX Port: - Added framework support (--with-macosx-framework) GDAL 1.4.0 - Overview Of Changes -------------------------------- WCS Driver: - New PDS (Planetary Data Set) Driver: - New ISIS (Mars Qubes) Driver: - New HFA (.img) Driver: - Support reading ProjectionX PE strings. - Support producing .aux files with statistics. - Fix serious bugs with u1, u2 and u4 compressed data. NITF Driver: - Added BLOCKA reading support. - Added ICORDS='D' - Added jpeg compression support (readonly) - Support multiple images as subdatasets. - Support CGM data (as metadata) AIGrid Driver: - Use VSI*L API (large files, in memory, etc) - Support upper case filenames. - Support .clr file above coverage. HDF4 Driver: - Added support for access to geolocation arrays (see RFC 4). - External raw raster bands supported. PCIDSK (.pix) Driver: - Support METER/FEET as LOCAL_CS. - Fix serious byte swapping error on creation. BMP Driver: - Various fixes, including 16bit combinations, and non-intel byte swapping. GeoTIFF Driver: - Fixed in place update for LZW and Deflated compressed images. JP2KAK (JPEG2000) Driver: - Added support for reading and writing gmljp2 headers. - Read xml boxes as metadata. - Accelerate YCbCr handling. JP2MrSID (JPEG2000) Driver: - Added support for reading gmljp2 headers. EHDR (ESRI BIL) Driver: - Support 1-7 bit data. - Added statistics support. OGR 1.4.0 - Overview of Changes ------------------------------- OGR SQL: - RFC 6: Added support for SQL/attribute filter access to geometry, and style strings. OGRSpatialReference: - Support for OGC SRS URNs. - Support for +wktext/EXTENSION stuff for preserving PROJ.4 string in WKT. - Added Two Point Equidistant projection. - Added Krovak projection. - Updated support files to EPSG 6.11. OGRCoordinateTransformation: - Support source and destination longitude wrapping control. OGRFeatureStyle: - Various extensions and improvements. INFORMIX Driver: - New KML Driver: - New (write only) E00 Driver: - New (read only) - Polygon (PAL) likely not working properly. Postgres/PostGIS Driver: - Updated to support new EWKB results (PostGIS 1.1?) - Fixed serious bug with writing SRSes. - Added schema support. GML Driver: - Strip namespaces off field names. - Handle very large geometries gracefully. ODBC Driver: - Added support for spatial_ref_sys table. SDE Driver: - Added logic to speed things up while actually detecting layer geometry types PGeo Driver: - Added support for MDB Tools ODBC driver on linux/unix. VRT Driver: - Added useSpatialSubquery support.
Diffstat (limited to 'geography')
-rw-r--r--geography/gdal-lib/DESCR3
-rw-r--r--geography/gdal-lib/Makefile25
-rw-r--r--geography/gdal-lib/PLIST12
-rw-r--r--geography/gdal-lib/buildlink3.mk7
-rw-r--r--geography/gdal-lib/distinfo13
-rw-r--r--geography/gdal-lib/patches/patch-aa27
-rw-r--r--geography/gdal-lib/patches/patch-ab13
-rw-r--r--geography/gdal-lib/patches/patch-ac13
-rw-r--r--geography/gdal-lib/patches/patch-ad22
9 files changed, 53 insertions, 82 deletions
diff --git a/geography/gdal-lib/DESCR b/geography/gdal-lib/DESCR
index fd093e263ff..d79a6072bec 100644
--- a/geography/gdal-lib/DESCR
+++ b/geography/gdal-lib/DESCR
@@ -16,5 +16,4 @@ translators include:
* PNG (read/write)
* Geosoft GXF (read)
* Arc/Info Binary Grid (read)
-A full list is available at
-http://www.remotesensing.org/gdal/formats_list.html
+A full list is available at http://www.gdal.org/formats_list.html.
diff --git a/geography/gdal-lib/Makefile b/geography/gdal-lib/Makefile
index f8aac4e86b7..51bcacf27e6 100644
--- a/geography/gdal-lib/Makefile
+++ b/geography/gdal-lib/Makefile
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.6 2006/12/28 12:12:58 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2007/02/23 22:22:38 gdt Exp $
#
-DISTNAME= gdal-1.3.1
-PKGNAME= gdal-lib-1.3.1
-PKGREVISION= 1
+DISTNAME= gdal-1.4.0
+PKGNAME= gdal-lib-1.4.0
CATEGORIES= geography
MASTER_SITES= http://www.gdal.org/dl/
-MAINTAINER= mchittur@cs.nmsu.edu
-HOMEPAGE= http://gdal.org/
+MAINTAINER= brook@nmsu.edu
+HOMEPAGE= http://www.gdal.org/
COMMENT= Translator library for raster geospatial data formats
USE_PKGLOCALEDIR= yes
-USE_LANGUAGES= c c++
+USE_LANGUAGES= c c++ fortran
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
@@ -21,7 +20,7 @@ USE_TOOLS+= gmake
MAKE_FILE= GNUmakefile
PKG_OPTIONS_VAR= PKG_OPTIONS.gdal-lib
-PKG_SUPPORTED_OPTIONS= pgsql
+PKG_SUPPORTED_OPTIONS= pgsql mysql
PKG_SUGGESTED_OPTIONS= pgsql
.include "../../mk/bsd.options.mk"
@@ -33,6 +32,13 @@ CONFIGURE_ARGS+= --with-pg
CONFIGURE_ARGS+= --without-pg
.endif
+.if !empty(PKG_OPTIONS:Mmysql)
+. include "../../mk/mysql.buildlink3.mk"
+CONFIGURE_ARGS+= --with-mysql
+.else
+CONFIGURE_ARGS+= --without-mysql
+.endif
+
CONFIGURE_ARGS+= --with-xerces
CONFIGURE_ARGS+= --with-xerces-inc=${PREFIX:Q}/include
CONFIGURE_ARGS+= --with-xerces-lib=-L${PREFIX:Q}/lib\ -lxerces-c
@@ -42,7 +48,8 @@ CONFIGURE_ARGS+= --without-python
CHECK_PORTABILITY_SKIP+= mkbindist.sh
.include "../../devel/zlib/buildlink3.mk"
-.include "../../misc/proj/buildlink3.mk"
.include "../../geography/geos/buildlink3.mk"
+.include "../../misc/proj/buildlink3.mk"
.include "../../textproc/xerces-c/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/geography/gdal-lib/PLIST b/geography/gdal-lib/PLIST
index 6fb4f8eb64e..de0f95b181e 100644
--- a/geography/gdal-lib/PLIST
+++ b/geography/gdal-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2006/09/06 09:52:42 rillig Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/02/23 22:22:38 gdt Exp $
bin/gdal-config
bin/gdal_contour
bin/gdal_translate
@@ -47,7 +47,7 @@ include/vrtdataset.h
lib/libgdal.la
man/man1/gdal-config.1
man/man1/gdal_contour.1
-man/man1/gdal_merge.py.1
+man/man1/gdal_merge.1
man/man1/gdal_translate.1
man/man1/gdal_utilities.1
man/man1/gdaladdo.1
@@ -58,8 +58,11 @@ man/man1/ogr2ogr.1
man/man1/ogr_utilities.1
man/man1/ogrinfo.1
man/man1/ogrtindex.1
-man/man1/pct2rgb.py.1
-man/man1/rgb2pct.py.1
+man/man1/pct2rgb.1
+man/man1/rgb2pct.1
+share/gdal/GDALLogoBW.svg
+share/gdal/GDALLogoColor.svg
+share/gdal/GDALLogoGS.svg
share/gdal/cubewerx_extra.wkt
share/gdal/ecw_cs.dat
share/gdal/ellipsoid.csv
@@ -71,6 +74,7 @@ share/gdal/gdalicon.png
share/gdal/pcs.csv
share/gdal/prime_meridian.csv
share/gdal/projop_wparm.csv
+share/gdal/s57agencies.csv
share/gdal/s57attributes.csv
share/gdal/s57attributes_aml.csv
share/gdal/s57attributes_iw.csv
diff --git a/geography/gdal-lib/buildlink3.mk b/geography/gdal-lib/buildlink3.mk
index fb0d4a508d3..12bd2cfb450 100644
--- a/geography/gdal-lib/buildlink3.mk
+++ b/geography/gdal-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/08/10 00:38:25 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2007/02/23 22:22:38 gdt Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GDAL_LIB_BUILDLINK3_MK:= ${GDAL_LIB_BUILDLINK3_MK}+
@@ -28,8 +28,13 @@ MAKEVARS+= PKG_BUILD_OPTIONS.gdal-lib
.include "../../mk/pgsql.buildlink3.mk"
.endif
+.if !empty(PKG_BUILD_OPTIONS.gdal-lib:Mmysql)
+.include "../../mk/mysql.buildlink3.mk"
+.endif
+
.include "../../devel/zlib/buildlink3.mk"
.include "../../geography/geos/buildlink3.mk"
.include "../../textproc/xerces-c/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/geography/gdal-lib/distinfo b/geography/gdal-lib/distinfo
index bd1e929884c..724f93efb2e 100644
--- a/geography/gdal-lib/distinfo
+++ b/geography/gdal-lib/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.3 2006/10/22 20:37:01 rillig Exp $
+$NetBSD: distinfo,v 1.4 2007/02/23 22:22:38 gdt Exp $
-SHA1 (gdal-1.3.1.tar.gz) = 2783c4c0d2a83a34f4c5c6a8efe41e816ba396fb
-RMD160 (gdal-1.3.1.tar.gz) = 5967608e6e1c9f0af8698fcffb58eab4dcdd518d
-Size (gdal-1.3.1.tar.gz) = 6856011 bytes
-SHA1 (patch-aa) = c8fd8c0749d2ef10a630e0c688f0696970ce1ff3
-SHA1 (patch-ab) = 207f2aede8d0a7a2c7d89d45675745c81a812307
-SHA1 (patch-ac) = 23402d8e6e44ca7767a9266e2f0bbcc36a398349
-SHA1 (patch-ad) = 5f3c1f3ca0cb5a284836c6f64ea0590c459f6aa8
+SHA1 (gdal-1.4.0.tar.gz) = fde8f5dbcd32f608b1c740aa2e6425e5febefca1
+RMD160 (gdal-1.4.0.tar.gz) = 18c2b0e60d5089b9b64b14a1b82fb4573430f473
+Size (gdal-1.4.0.tar.gz) = 7458051 bytes
+SHA1 (patch-aa) = 649f72dcf0fbc78f1486b843817500db2d454c8c
diff --git a/geography/gdal-lib/patches/patch-aa b/geography/gdal-lib/patches/patch-aa
index f891b48f9d2..3b847d6e54e 100644
--- a/geography/gdal-lib/patches/patch-aa
+++ b/geography/gdal-lib/patches/patch-aa
@@ -1,13 +1,20 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/05/02 20:36:33 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2007/02/23 22:22:38 gdt Exp $
---- GDALmake.opt.in.orig 2005-12-30 22:14:55.000000000 +0000
-+++ GDALmake.opt.in
-@@ -34,7 +34,7 @@ C_DBGFLAGS = -g -DDEBUG
- CXX_PROFFLAGS = -g3 -pg -DDEBUG
- C_PROFFLAGS = -g3 -pg -DDEBUG
+--- configure.orig 2007-02-16 08:57:36.000000000 -0700
++++ configure
+@@ -28245,13 +28245,13 @@ fi
--LIBS = @LIBS@
-+LIBS = @LIBS@ -lcompat
+ echo "$as_me:$LINENO: checking for special pymod link hacks" >&5
+ echo $ECHO_N "checking for special pymod link hacks... $ECHO_C" >&6
+-if test ! -z "`uname | grep Darwin`" -a ${with_libtool} == no ; then
++if test ! -z "`uname | grep Darwin`" -a ${with_libtool} = no ; then
+ echo "$as_me:$LINENO: result: darwin-nonlibtool" >&5
+ echo "${ECHO_T}darwin-nonlibtool" >&6
+
+ PY_LD_SHARED='g++ -bundle -framework Python'
+ PY_SO_EXT='so'
+-elif test ! -z "`uname | grep Darwin`" -a ${with_libtool} == yes ; then
++elif test ! -z "`uname | grep Darwin`" -a ${with_libtool} = yes ; then
+ echo "$as_me:$LINENO: result: darwin-libtool" >&5
+ echo "${ECHO_T}darwin-libtool" >&6
- PYTHON_INCLUDES = @PYTHON_INCLUDES@
- PYTHON_LIBS = @PYTHON_LIBS@
diff --git a/geography/gdal-lib/patches/patch-ab b/geography/gdal-lib/patches/patch-ab
deleted file mode 100644
index d9b8ead49c9..00000000000
--- a/geography/gdal-lib/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/05/02 20:36:33 wiz Exp $
-
---- ogr/GNUmakefile.orig 2005-12-30 22:09:11.000000000 +0000
-+++ ogr/GNUmakefile
-@@ -16,7 +16,7 @@ CPPFLAGS := -Iogrsf_frmts -I. $(GDAL_INC
-
- default: lib apps
-
--all: sublibs apps test_ogrsf$(EXE) docs
-+all: sublibs apps test_ogrsf$(EXE)
-
- ifeq ($(OGR_ENABLED),yes)
-
diff --git a/geography/gdal-lib/patches/patch-ac b/geography/gdal-lib/patches/patch-ac
deleted file mode 100644
index 2bb878a676b..00000000000
--- a/geography/gdal-lib/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/08/27 18:28:37 kristerw Exp $
-
---- frmts/fit/fitdataset.cpp.orig 2006-08-27 19:45:01.000000000 +0200
-+++ frmts/fit/fitdataset.cpp 2006-08-27 19:45:36.000000000 +0200
-@@ -174,7 +174,7 @@ class FITRasterBand : public GDALPamRast
-
- public:
-
-- FITRasterBand::FITRasterBand( FITDataset *, int );
-+ FITRasterBand( FITDataset *, int );
- ~FITRasterBand();
-
- // should override RasterIO eventually.
diff --git a/geography/gdal-lib/patches/patch-ad b/geography/gdal-lib/patches/patch-ad
deleted file mode 100644
index 290055ac513..00000000000
--- a/geography/gdal-lib/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/10/22 20:37:01 rillig Exp $
-
---- mkbindist.sh.orig 2003-07-02 08:38:27.000000000 +0200
-+++ mkbindist.sh 2006-10-22 22:36:02.000000000 +0200
-@@ -7,7 +7,7 @@ if [ $# -lt 2 ] ; then
- exit
- fi
-
--if [ $1 == "-dev" ] ; then
-+if [ "x$1" == "x-dev" ] ; then
- STRIP_DEV=0
- shift
- else
-@@ -59,7 +59,7 @@ cc -o $DIST_DIR/bin/burnpath dist_docs/b
- #
- # Clean anything we don't want for non-developer releases.
- #
--if [ "$STRIP_DEV" == "1" ] ; then
-+if [ "$STRIP_DEV" = "1" ] ; then
- rm -f $DIST_DIR/html/class_*
- rm -f $DIST_DIR/html/struct_*
- rm -f $DIST_DIR/html/*-source.html