On Wed, Nov 17, 2010 at 11:20:23AM -0600, Amit Kulkarni wrote:
> Hi,
>
> I want to update geo/gdal and I have some questions about porting update.
>
> 1) How do you get the pkg/PLIST, by which command exactly? Do you
> install in fake and check there manually?
> 2) How do you get the SIZE in distinfo without ls, is there a better
> way than do it manually?
>
> I figure cksum -a md5,rmd160,sha1,sha256 will fill out the fields in
> distinfo, but what are the trailing = == in the file distinfo, are
> they needed for parsing?
>
> The checksums I get for geo/gdal for "gdal-1.6.1.tar.gz" are
> completely different than the ones in the distinfo file?
Or you could have asked $MAINTAINER (in that case, me :) if an update
was in the pipe...
so try this diff. There will probably be WANTLIB changes in ports
depending on gdal..and i'm considering enabling thread support too.
Landry
? build
? libgdal.so.15.0
? libgdal.so.15.0-old
Index: Makefile
===================================================================
RCS file: /cvs/ports/geo/gdal/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- Makefile 7 Nov 2010 19:12:42 -0000 1.13
+++ Makefile 17 Nov 2010 20:11:09 -0000
@@ -4,17 +4,14 @@
COMMENT-python= python bindings and utilities for GDAL
COMMENT-perl= perl bindings for GDAL
-V= 1.6.1
+V= 1.7.3
DISTNAME= gdal-${V}
PKGNAME-main= ${DISTNAME}
PKGNAME-python= py-${DISTNAME}
-REVISION-main = 1
-REVISION-perl = 1
-REVISION-python = 1
PKGNAME-perl= p5-Geo-GDAL-${V}
-SHARED_LIBS= gdal 15.0
+SHARED_LIBS= gdal 16.0
CATEGORIES= geo devel
HOMEPAGE = http://www.gdal.org/
@@ -33,8 +30,8 @@
WANTLIB-main = ${WANTLIB} c crypto expat m ssl stdc++ z
WANTLIB-perl = crypto curl expat geos_c geotiff gif idn jasper jpeg m \
- perl png pq ssl tiff z
-WANTLIB-python =
+ png pq ssl tiff z
+WANTLIB-python = m stdc++
LIB_DEPENDS-main = ${LIB_DEPENDS} \
::graphics/tiff \
@@ -47,7 +44,8 @@
::graphics/jpeg \
::graphics/jasper \
::devel/geotiff
-WANTLIB-main += tiff curl pq geos geos_c idn png gif jpeg jasper geotiff
+WANTLIB-main += tiff curl pq geos geos_c idn png gif jpeg jasper \
+ geotiff com_err proj
LIB_DEPENDS-python= :${PKGNAME}:${BASE_PKGPATH},-main
WANTLIB-python += gdal
Index: distinfo
===================================================================
RCS file: /cvs/ports/geo/gdal/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo 19 Jul 2009 12:01:58 -0000 1.3
+++ distinfo 17 Nov 2010 20:11:09 -0000
@@ -1,5 +1,5 @@
-MD5 (gdal-1.6.1.tar.gz) = QFkoWlzvQf+XXtDsAqlwCQ==
-RMD160 (gdal-1.6.1.tar.gz) = ZJVbSUBnVHW/rwzI/V8LJktWsLs=
-SHA1 (gdal-1.6.1.tar.gz) = sgkaODDYIwqXqgztQpk158rvAO4=
-SHA256 (gdal-1.6.1.tar.gz) = 6YdqWm6A0LB4sQrrKefcAd+L448T2DYlcZDJykipmK0=
-SIZE (gdal-1.6.1.tar.gz) = 6999411
+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
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/geo/gdal/patches/patch-configure,v
retrieving revision 1.1
diff -u -r1.1 patch-configure
--- patches/patch-configure 13 Mar 2009 08:56:53 -0000 1.1
+++ patches/patch-configure 17 Nov 2010 20:11:09 -0000
@@ -1,13 +1,13 @@
$OpenBSD: patch-configure,v 1.1 2009/03/13 08:56:53 landry Exp $
ensure MODPY_BIN is picked to try detecting setuptools
---- configure.orig Sun Feb 22 23:39:37 2009
-+++ configure Sun Feb 22 23:40:06 2009
-@@ -27327,7 +27327,7 @@ echo $ECHO_N "checking for python setuptools... $ECHO_
+--- 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; }
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
- { echo "$as_me:$LINENO: result: found" >&5
- echo "${ECHO_T}found" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+ $as_echo "found" >&6; }
Index: patches/patch-ogr_GNUmakefile
===================================================================
RCS file: patches/patch-ogr_GNUmakefile
diff -N patches/patch-ogr_GNUmakefile
--- patches/patch-ogr_GNUmakefile 13 Mar 2009 08:56:53 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-ogr_GNUmakefile,v 1.2 2009/03/13 08:56:53 landry Exp $
---- ogr/GNUmakefile.orig Fri Aug 22 18:57:53 2008
-+++ ogr/GNUmakefile Sun Feb 22 23:37:01 2009
-@@ -19,7 +19,7 @@ CPPFLAGS := -Iogrsf_frmts -I. $(GDAL_INCLUDE)
$(PROJ_I
-
- default: lib
-
--all: sublibs apps test_ogrsf$(EXE)
-+all: sublibs
-
- clean:
- rm -f html/*
Index: patches/patch-swig_python_GNUmakefile
===================================================================
RCS file: /cvs/ports/geo/gdal/patches/patch-swig_python_GNUmakefile,v
retrieving revision 1.1
diff -u -r1.1 patch-swig_python_GNUmakefile
--- patches/patch-swig_python_GNUmakefile 13 Mar 2009 08:56:53 -0000
1.1
+++ patches/patch-swig_python_GNUmakefile 17 Nov 2010 20:11:09 -0000
@@ -1,9 +1,9 @@
$OpenBSD: patch-swig_python_GNUmakefile,v 1.1 2009/03/13 08:56:53 landry Exp $
tweak to build egg-info files during build stage
---- swig/python/GNUmakefile.orig Sat May 31 09:41:25 2008
-+++ swig/python/GNUmakefile Tue Feb 24 00:16:24 2009
-@@ -48,14 +48,12 @@ generate: ${WRAPPERS}
-
+--- 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
+
build:
$(PYTHON) setup.py build
-
Index: patches/patch-swig_python_setup_py
===================================================================
RCS file: /cvs/ports/geo/gdal/patches/patch-swig_python_setup_py,v
retrieving revision 1.1
diff -u -r1.1 patch-swig_python_setup_py
--- patches/patch-swig_python_setup_py 13 Mar 2009 08:56:53 -0000 1.1
+++ patches/patch-swig_python_setup_py 17 Nov 2010 20:11:09 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-swig_python_setup_py,v 1.1 2009/03/13 08:56:53 landry Exp $
---- swig/python/setup.py.orig Mon Feb 23 10:21:13 2009
-+++ swig/python/setup.py Mon Feb 23 10:21:27 2009
-@@ -135,7 +135,7 @@ class gdal_ext(build_ext):
-
- gdal_version = '1.6.0'
+--- swig/python/setup.py.orig Sun Nov 7 19:28:49 2010
++++ swig/python/setup.py Wed Nov 17 20:31:42 2010
+@@ -147,7 +147,7 @@ class gdal_ext(build_ext):
+ except:
+ print ('Could not run gdal-config!!!!')
-extra_link_args = []
+extra_link_args = ['-fPIC']
extra_compile_args = []
- # might need to tweak for Python 2.4 on OSX to be these
- #extra_compile_args = ['-g', '-arch', 'i386', '-isysroot','/']
+
+ gdal_module = Extension('osgeo._gdal',
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/geo/gdal/pkg/PLIST-main,v
retrieving revision 1.3
diff -u -r1.3 PLIST-main
--- pkg/PLIST-main 19 Jul 2009 12:01:58 -0000 1.3
+++ pkg/PLIST-main 17 Nov 2010 20:11:09 -0000
@@ -3,11 +3,14 @@
%%SHARED%%
bin/gdal-config
@bin bin/gdal_contour
+bin/gdal_fillnodata.dox
+bin/gdal_fillnodata.py
@bin bin/gdal_grid
@bin bin/gdal_rasterize
@bin bin/gdal_translate
@bin bin/gdaladdo
@bin bin/gdalbuildvrt
+...@bin bin/gdaldem
@bin bin/gdalenhance
@bin bin/gdalinfo
@bin bin/gdalmanage
@@ -19,7 +22,9 @@
@bin bin/ogrinfo
@bin bin/ogrtindex
@bin bin/testepsg
+include/cpl_atomic_ops.h
include/cpl_config.h
+include/cpl_config_extras.h
include/cpl_conv.h
include/cpl_csv.h
include/cpl_error.h
@@ -34,6 +39,7 @@
include/cpl_port.h
include/cpl_quad_tree.h
include/cpl_string.h
+include/cpl_time.h
include/cpl_vsi.h
include/cpl_vsi_virtual.h
include/cpl_win32ce_api.h
@@ -85,6 +91,7 @@
share/gdal/gdalicon.png
share/gdal/gt_datum.csv
share/gdal/gt_ellips.csv
+share/gdal/header.dxf
share/gdal/pcs.csv
share/gdal/pcs.override.csv
share/gdal/prime_meridian.csv
@@ -100,4 +107,5 @@
share/gdal/seed_2d.dgn
share/gdal/seed_3d.dgn
share/gdal/stateplane.csv
+share/gdal/trailer.dxf
share/gdal/unit_of_measure.csv
