On Wed, Nov 17, 2010 at 09:30:12PM +0100, Landry Breuil wrote:
> Hi,
>
> it's been a good while in my tree, everything looks happy with it, even
> the regress tests..
> taking maintainership from jason@ who agreed ages ago. Remove USE_GROFF
> as the manpages just display fine with mandoc.
>
> looking for oks.
Oh, and since this diff adds pthread to WANTLIB, now most depending
ports fail with this proj version. (qgisi, mapnik, py-proj and xastir
are happy) So here's the diffs to fix those..
And while here, update graphics/geotiff, and a more recent diff for gdal
which fixes WANTLIB.
Landry
Index: Makefile
===================================================================
RCS file: /cvs/ports/geo/mapserver/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile 17 Nov 2010 08:05:12 -0000 1.7
+++ Makefile 18 Nov 2010 09:37:47 -0000
@@ -14,6 +14,8 @@
PKGNAME-utils= mapserver-utils-${V}
PKGNAME-php= php5-mapscript-${V}
PKGNAME-perl= p5-mapscript-${V}
+REVISION-main= 0
+REVISION-utils= 0
CATEGORIES= geo www
@@ -43,8 +45,8 @@
com_err readline termcap m png pq ssl tiff xml2 z \
proj gdal geos_c geotiff gd
-WANTLIB-main= ${WANTLIB} c stdc++
-WANTLIB-utils= ${WANTLIB} c stdc++
+WANTLIB-main= ${WANTLIB} pthread c stdc++
+WANTLIB-utils= ${WANTLIB} pthread c stdc++
WANTLIB-php= ${WANTLIB} stdc++
WANTLIB-perl= ${WANTLIB} stdc++
@@ -70,7 +72,7 @@
--with-sos
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ LDFLAGS="-L${LOCALBASE}/lib -pthread"
MAKE_ENV= CFLAGS+=-fPIC
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/geo/mapserver/patches/patch-configure,v
retrieving revision 1.2
diff -u -r1.2 patch-configure
--- patches/patch-configure 27 Jul 2010 08:57:38 -0000 1.2
+++ patches/patch-configure 18 Nov 2010 09:37:47 -0000
@@ -1,6 +1,15 @@
$OpenBSD: patch-configure,v 1.2 2010/07/27 08:57:38 landry Exp $
--- configure.orig Thu Jul 8 22:07:15 2010
-+++ configure Tue Jul 27 10:40:55 2010
++++ configure Wed Nov 17 22:14:47 2010
+@@ -3360,7 +3360,7 @@ if test $ac_cv_lib_m_exp = yes; then
+ XTRALIBS="$XTRALIBS -lm"
+ fi
+
+-XTRALIBS=$XTRALIBS
++XTRALIBS="$XTRALIBS -pthread"
+
+
+ echo "$as_me:$LINENO: checking for __gxx_personality_v0 in -lstdc++" >&5
@@ -9790,7 +9790,7 @@ fi
RGBA_PNG_ENABLED=$RGBA_PNG_ENABLED
Index: Makefile
===================================================================
RCS file: /cvs/ports/geo/qlandkarte/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- Makefile 17 Nov 2010 08:05:12 -0000 1.17
+++ Makefile 18 Nov 2010 20:31:17 -0000
@@ -36,6 +36,7 @@
NO_REGRESS= Yes
AUTOCONF_VERSION=2.59
CONFIGURE_STYLE= autoconf gnu
+CONFIGURE_ENV+= 'LDFLAGS=-pthread'
CONFIGURE_ARGS= --with-qt-dir=${LOCALBASE}/lib/qt4 \
--with-extra-libs=${LOCALBASE}/lib \
--with-extra-includes=${LOCALBASE}/include \
Index: Makefile
===================================================================
RCS file: /cvs/ports/geo/postgis/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- Makefile 17 Nov 2010 08:05:12 -0000 1.8
+++ Makefile 18 Nov 2010 21:01:30 -0000
@@ -31,7 +31,7 @@
USE_GMAKE= Yes
CONFIGURE_ENV= PGXS=1 \
- LDFLAGS=-L${LOCALBASE}/lib \
+ LDFLAGS='-L${LOCALBASE}/lib -pthread' \
CFLAGS=-I${LOCALBASE}/include
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= --datadir=${PREFIX}/share/postgresql/contrib \
? libgeotiff.so.1.2
? libgeotiff.so.1.2-old
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/geotiff/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- Makefile 15 Nov 2010 19:45:58 -0000 1.10
+++ Makefile 18 Nov 2010 09:37:32 -0000
@@ -2,8 +2,7 @@
COMMENT= GIS TIFF interchange library
-DISTNAME= libgeotiff-1.2.5
-REVISION = 0
+DISTNAME= libgeotiff-1.3.0
CATEGORIES= devel geo
SHARED_LIBS= geotiff 1.2
@@ -21,15 +20,17 @@
http://download.osgeo.org/geotiff/libgeotiff/
NO_REGRESS= Yes
+USE_LIBTOOL = Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ENV += CFLAGS="-I${LOCALBASE}/include -fPIC" \
- LDFLAGS=-L${LOCALBASE}/lib \
- LIBgeotiff_VERSION=${LIBgeotiff_VERSION}
+ LDFLAGS=-L${LOCALBASE}/lib
+
CONFIGURE_ARGS= --with-jpeg=${LOCALBASE} \
--with-proj=${LOCALBASE} \
- --with-libtiff=${LOCALBASE}
+ --with-libtiff=${LOCALBASE} \
+ --with-libz
-WANTLIB= c jpeg m z proj tiff
+WANTLIB= c jpeg m z proj tiff pthread
LIB_DEPENDS= devel/proj \
graphics/tiff
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/geotiff/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo 7 Mar 2009 10:55:15 -0000 1.2
+++ distinfo 18 Nov 2010 09:37:32 -0000
@@ -1,5 +1,5 @@
-MD5 (libgeotiff-1.2.5.tar.gz) = AA8keohRDxs41LMU0eRwSA==
-RMD160 (libgeotiff-1.2.5.tar.gz) = 2C2McFl5/rUcNnJZ4WWf8zJTIPI=
-SHA1 (libgeotiff-1.2.5.tar.gz) = OLEAcDdGNv7f3eMo/xyfPG6OWB8=
-SHA256 (libgeotiff-1.2.5.tar.gz) = 8nsXWNaJmAUQfkxb6hfrGejS2ueULMBgQPqDes/pXnw=
-SIZE (libgeotiff-1.2.5.tar.gz) = 1057705
+MD5 (libgeotiff-1.3.0.tar.gz) = asPCLkRxHpo63ZBE5AuVJw==
+RMD160 (libgeotiff-1.3.0.tar.gz) = hForupuLYgTYaJX3WA466fO47Wc=
+SHA1 (libgeotiff-1.3.0.tar.gz) = uM3lAUz4L+RoP6NfyBpeqNZLlA8=
+SHA256 (libgeotiff-1.3.0.tar.gz) = D6LpEwKBxYZ62lUe91f9gfVMdg2fMDnTPjSfmS9EDSc=
+SIZE (libgeotiff-1.3.0.tar.gz) = 1287837
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in 7 Mar 2009 10:55:15 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,29 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.2 2009/03/07 10:55:15 landry Exp $
---- Makefile.in.orig Fri May 9 20:37:46 2008
-+++ Makefile.in Sat Mar 7 11:53:01 2009
-@@ -102,8 +102,8 @@ libgeotiff.a: ${OBJS}
-
- $(GEOTIFF_SO): ${OBJS}
- ${LD_SHARED} ${OBJS} ${LIBS} -o $(GEOTIFF_SO)
-- rm -f libgeotiff.$(SO_EXT)
-- ${LN} $(GEOTIFF_SO) libgeotiff.$(SO_EXT)
-+# rm -f libgeotiff.$(SO_EXT)
-+# ${LN} $(GEOTIFF_SO) libgeotiff.$(SO_EXT)
-
- Progs: $(GEOTIFF_SO)
- ${CD} ${BIN};\
-@@ -201,14 +201,6 @@ install:
- $(INSTALL) $(GEOTIFF_SO) $(DESTDIR)${bindir}; \
- else \
- $(INSTALL) $(GEOTIFF_SO) $(DESTDIR)${libdir}; \
-- (cd $(DESTDIR)${libdir} ; \
-- rm -f
libgeotiff.$(SO_EXT).$(VERSION_MAJOR).$(VERSION_MINOR); \
-- ${LN} $(GEOTIFF_SO)
libgeotiff.$(SO_EXT).$(VERSION_MAJOR).$(VERSION_MINOR); \
-- rm -f libgeotiff.$(SO_EXT).$(VERSION_MAJOR); \
-- ${LN}
libgeotiff.$(SO_EXT).$(VERSION_MAJOR).$(VERSION_MINOR) \
-- libgeotiff.$(SO_EXT).$(VERSION_MAJOR); \
-- rm -f libgeotiff.$(SO_EXT); \
-- ${LN} libgeotiff.$(SO_EXT).$(VERSION_MAJOR)
libgeotiff.$(SO_EXT); );\
- fi;\
- fi
-
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 7 Mar 2009 10:55:15 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-configure,v 1.4 2009/03/07 10:55:15 landry Exp $
---- configure.orig Wed Jul 23 21:38:12 2008
-+++ configure Sat Mar 7 11:53:01 2009
-@@ -3197,7 +3197,7 @@ if test "$LD_SHARED" != "/bin/true" ; then
- GEOTIFF_DLL=cyggeotiff-1.dll
- GEOTIFF_IMP=libgeotiff.dll.a
- LD_SHARED="gcc -shared -Wl,--export-all
-Wl,--out-implib=\$(GEOTIFF_IMP)" ;;
-- *)
GEOTIFF_SO=libgeotiff.${SO_EXT}.$VERSION_MAJOR.$VERSION_MINOR.$VERSION_POINT ;;
-+ *) GEOTIFF_SO=libgeotiff.${SO_EXT}.${LIBgeotiff_VERSION} ;;
- esac
- fi
- GEOTIFF_SO=$GEOTIFF_SO
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/geotiff/pkg/PLIST,v
retrieving revision 1.5
diff -u -r1.5 PLIST
--- pkg/PLIST 7 Mar 2009 10:55:15 -0000 1.5
+++ pkg/PLIST 18 Nov 2010 09:37:32 -0000
@@ -1,7 +1,10 @@
@comment $OpenBSD: PLIST,v 1.5 2009/03/07 10:55:15 landry Exp $
%%SHARED%%
+...@bin bin/applygeo
+...@bin bin/csv2html
@bin bin/geotifcp
@bin bin/listgeo
+...@bin bin/makegeo
include/cpl_serv.h
include/epsg_datum.inc
include/epsg_ellipse.inc
@@ -13,6 +16,7 @@
include/epsg_vertcs.inc
include/geo_config.h
include/geo_ctrans.inc
+include/geo_incode_defs.h
include/geo_keyp.h
include/geo_normalize.h
include/geo_simpletags.h
@@ -25,6 +29,7 @@
include/geovalues.h
include/xtiffio.h
lib/libgeotiff.a
+lib/libgeotiff.la
share/epsg_csv/
share/epsg_csv/alias.csv
share/epsg_csv/area.csv
@@ -40,8 +45,8 @@
share/epsg_csv/coordinate_reference_system.csv
share/epsg_csv/coordinate_system.csv
share/epsg_csv/datum.csv
-share/epsg_csv/deprecation.csv
share/epsg_csv/ellipsoid.csv
+share/epsg_csv/esri_datum_override.csv
share/epsg_csv/gcs.csv
share/epsg_csv/gcs.override.csv
share/epsg_csv/naming_system.csv
? 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 21:31: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 pthread
LIB_DEPENDS-python= :${PKGNAME}:${BASE_PKGPATH},-main
WANTLIB-python += gdal
@@ -70,7 +68,7 @@
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \
-I${LOCALBASE}/include/libpng" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ LDFLAGS="-L${LOCALBASE}/lib -pthread"
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--without-cfitsio \
@@ -86,16 +84,12 @@
--without-libgrass \
--without-php \
--without-ruby \
- --without-ogpython \
--without-threads \
- --with-png-inc="${LOCALBASE}/include/libpng" \
- --with-png-lib="${LOCALBASE}/lib" \
--with-pg=${LOCALBASE}/bin/pg_config \
--with-python \
--with-perl \
--with-geos \
--with-curl=${LOCALBASE} \
- --with-tiff=${LOCALBASE} \
--with-gif=${LOCALBASE} \
--with-jpeg=${LOCALBASE} \
--with-jasper=${LOCALBASE}
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 21:31: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 21:31: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 21:31: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 21:31: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 21:31: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
