Hi, another smalle update, and while here i tried adding a python3 flavor so that i can have py3-gdal installable alongside py-gdal. the -main and -perl subpackages are identical whether we use python2 or python3. FULLPKGNAME/FULLPKGPATH needs to be defined now, i hope i didnt miss something obvious.
While here, fixed the way openjpeg2 was detected, it could only work by accident right now.. Comments on the way FLAVOR/MULTI_PACKAGES are handled are more than welcome :) Landry
? gdal-2.0.1-libgdal.so.23.0 ? gdal-2.0.2-libgdal.so.24.0 ? gdal-2.1.0-libgdal.so.25.0 ? gdal-2.1.1-libgdal.so.26.0 ? gdal-2.1.2-libgdal.so.26.0 ? gdal-2.1.3-libgdal.so.27.0 ? gdal-2.1.3-libgdal.so.28.0 ? gdal-2.2.0-libgdal.so.29.0 ? gdal-2.2.2-libgdal.so.29.0 ? patch-port_cpl_port_h ? test-2.1.0.log ? test-2.1.1.log ? test-2.1.2.log ? test-2.1.2_2.log ? test-2.1.3.log ? test-2.2.0.log ? test-2.2.0_2.log ? test-2.2.1.log Index: Makefile =================================================================== RCS file: /cvs/ports/geo/gdal/Makefile,v retrieving revision 1.60 diff -u -r1.60 Makefile --- Makefile 26 Jul 2017 22:45:22 -0000 1.60 +++ Makefile 29 Oct 2017 11:33:04 -0000 @@ -4,19 +4,19 @@ COMMENT-python =python bindings and utilities for GDAL COMMENT-perl = perl bindings for GDAL -V = 2.2.1 +V = 2.2.2 DISTNAME = gdal-${V} DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \ gdalautotest-${V}${EXTRACT_SUFX} -PKGNAME-main = ${DISTNAME} -PKGNAME-python =py-${DISTNAME} -PKGNAME-perl = p5-Geo-GDAL-${V} -REVISION-main = 0 -REVISION-perl = 0 -REVISION-python = 0 +FULLPKGNAME-main = ${DISTNAME} +FULLPKGPATH-main = geo/gdal,-main +FULLPKGNAME-python = py-${DISTNAME} +FULLPKGPATH-python = geo/gdal,-python${FLAVOR_EXT:S/-/,/g} +FULLPKGNAME-perl = p5-Geo-GDAL-${V} +FULLPKGPATH-perl = geo/gdal,-perl -SHARED_LIBS = gdal 29.0 #22.0 +SHARED_LIBS = gdal 30.0 #22.0 CATEGORIES = geo devel HOMEPAGE = http://www.gdal.org/ @@ -29,6 +29,12 @@ MASTER_SITES = http://download.osgeo.org/gdal/${V}/ MODULES = perl lang/python devel/gettext +FLAVORS = python3 +FLAVOR ?= + +.if ${FLAVOR:Mpython3} +FULLPKGNAME-python = py3-${DISTNAME} +.endif MULTI_PACKAGES = -main -python -perl @@ -56,10 +62,10 @@ proj pthread freexl pcre spatialite sqlite3 xml2 lzma nghttp2 webp -LIB_DEPENDS-python = ${PKGNAME}:${BASE_PKGPATH},-main +LIB_DEPENDS-python = ${FULLPKGNAME-main}:${FULLPKGPATH-main} WANTLIB-python = ${MODPY_WANTLIB} gdal m pthread ${COMPILER_LIBCXX} -LIB_DEPENDS-perl = ${PKGNAME}:${BASE_PKGPATH},-main +LIB_DEPENDS-perl = ${FULLPKGNAME-main}:${FULLPKGPATH-main} WANTLIB-perl = perl gdal # uses perl ABI WANTLIB-perl += c crypto curl expat freexl geos_c geotiff gif iconv WANTLIB-perl += jasper jpeg json-c lzma m nghttp2 openjp2 pcre png @@ -69,7 +75,7 @@ RUN_DEPENDS += math/py-numpy BUILD_DEPENDS += ${RUN_DEPENDS} devel/swig -TEST_DEPENDS += ${PKGNAME-python}:${BASE_PKGPATH},-python +TEST_DEPENDS += ${FULLPKGNAME-python}:${FULLPKGPATH-python} TEST_ENV = GDAL_DOWNLOAD_TEST_DATA=1 GDAL_RUN_SLOW_TESTS=yes MODPY_SETUPTOOLS = Yes @@ -98,7 +104,7 @@ --without-php \ --without-ruby \ --with-pg=${LOCALBASE}/bin/pg_config \ - --with-python \ + --with-python=${MODPY_BIN} \ --with-perl \ --with-geos \ --with-gnm \ @@ -115,6 +121,21 @@ post-extract: ln -sf ${WRKDIR}/gdalautotest-${V} ${WRKSRC}/autotest + +PYBINS = epsg_tr esri2wkt gcps2vec gcps2wld gdal2xyz gdal_auth gdal_merge \ + gdalchksum gdalident gdalimport mkgraticule +PYBINSWITHMAN = gdal2tiles gdal_calc gdal_edit gdal_fillnodata gdal_pansharpen \ + gdal_polygonize gdal_proximity gdal_retile gdal_sieve gdalcompare \ + gdalmove ogrmerge pct2rgb rgb2pct + +post-install: +.for b in ${PYBINSWITHMAN} + mv -f ${PREFIX}/bin/$b.py ${PREFIX}/bin/$b${MODPY_BIN_SUFFIX}.py + mv -f ${PREFIX}/man/man1/$b.1 ${PREFIX}/man/man1/$b${MODPY_BIN_SUFFIX}.1 +.endfor +.for b in ${PYBINS} + mv -f ${PREFIX}/bin/$b.py ${PREFIX}/bin/$b${MODPY_BIN_SUFFIX}.py +.endfor do-test: cd ${WRKSRC}/autotest && env ${TEST_ENV} ${MODPY_BIN} run_all.py Index: distinfo =================================================================== RCS file: /cvs/ports/geo/gdal/distinfo,v retrieving revision 1.21 diff -u -r1.21 distinfo --- distinfo 3 Jul 2017 18:45:31 -0000 1.21 +++ distinfo 29 Oct 2017 11:33:04 -0000 @@ -1,4 +1,4 @@ -SHA256 (gdal-2.2.1.tar.gz) = YYN3Bqv6Pkk/NVAjbvwsFL1rJGUCMvkQfbUKlEq/iy8= -SHA256 (gdalautotest-2.2.1.tar.gz) = wO5ztfYzbe+SMFsKNQNR4p2v4+j5+9BgckPup377Qqs= -SIZE (gdal-2.2.1.tar.gz) = 13724990 -SIZE (gdalautotest-2.2.1.tar.gz) = 6768458 +SHA256 (gdal-2.2.2.tar.gz) = FMH3imD0Ka1RwI11y/SXcfHmsg5zhcboN5tA6N+jlUQ= +SHA256 (gdalautotest-2.2.2.tar.gz) = ECs5gLv6B57tbj131w0vSPJwD1B4rTHELpPPNdBoDw0= +SIZE (gdal-2.2.2.tar.gz) = 13745539 +SIZE (gdalautotest-2.2.2.tar.gz) = 6774077 Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/geo/gdal/patches/patch-configure,v retrieving revision 1.16 diff -u -r1.16 patch-configure --- patches/patch-configure 19 May 2017 09:19:48 -0000 1.16 +++ patches/patch-configure 29 Oct 2017 11:33:04 -0000 @@ -5,24 +5,24 @@ Index: configure --- configure.orig +++ configure -@@ -25130,9 +25130,9 @@ fi - LIBS="-lopenjp2 $LIBS" - fi - else -- for ac_header in openjpeg-2.1/openjpeg.h -+ for ac_header in openjp2/openjpeg.h +@@ -25116,9 +25116,9 @@ $as_echo "$as_me: OpenJPEG (JPEG2000) support disabled + + elif test "$with_openjpeg" = "yes" -o "$with_openjpeg" = "" ; then + +- for ac_header in openjpeg-2.2/openjpeg.h ++ for ac_header in openjp2/openjpeg.h do : -- ac_fn_c_check_header_mongrel "$LINENO" "openjpeg-2.1/openjpeg.h" "ac_cv_header_openjpeg_2_1_openjpeg_h" "$ac_includes_default" -+ ac_fn_c_check_header_mongrel "$LINENO" "openjp2/openjpeg.h" "ac_cv_header_openjpeg_2_1_openjpeg_h" "$ac_includes_default" - if test "x$ac_cv_header_openjpeg_2_1_openjpeg_h" = xyes; then : +- ac_fn_c_check_header_mongrel "$LINENO" "openjpeg-2.2/openjpeg.h" "ac_cv_header_openjpeg_2_2_openjpeg_h" "$ac_includes_default" ++ ac_fn_c_check_header_mongrel "$LINENO" "openjp2/openjpeg.h" "ac_cv_header_openjpeg_2_2_openjpeg_h" "$ac_includes_default" + if test "x$ac_cv_header_openjpeg_2_2_openjpeg_h" = xyes; then : cat >>confdefs.h <<_ACEOF - #define HAVE_OPENJPEG_2_1_OPENJPEG_H 1 -@@ -25196,7 +25196,7 @@ else - HAVE_OPENJPEG=yes - if test -r $with_openjpeg/include/openjpeg-2.0/openjpeg.h ; then + #define HAVE_OPENJPEG_2_2_OPENJPEG_H 1 +@@ -25305,7 +25305,7 @@ else + elif test -r $with_openjpeg/include/openjpeg-2.1/openjpeg.h ; then + OPENJPEG_VERSION=20100 EXTRA_INCLUDES="-I$with_openjpeg/include $EXTRA_INCLUDES" -- elif test -r $with_openjpeg/include/openjpeg-2.1/openjpeg.h ; then +- elif test -r $with_openjpeg/include/openjpeg-2.2/openjpeg.h ; then + elif test -r $with_openjpeg/include/openjp2/openjpeg.h ; then - OPENJPEG_VERSION=20100 + OPENJPEG_VERSION=20200 EXTRA_INCLUDES="-I$with_openjpeg/include $EXTRA_INCLUDES" else Index: patches/patch-frmts_openjpeg_openjpegdataset_cpp =================================================================== RCS file: /cvs/ports/geo/gdal/patches/patch-frmts_openjpeg_openjpegdataset_cpp,v retrieving revision 1.6 diff -u -r1.6 patch-frmts_openjpeg_openjpegdataset_cpp --- patches/patch-frmts_openjpeg_openjpegdataset_cpp 19 May 2017 09:19:48 -0000 1.6 +++ patches/patch-frmts_openjpeg_openjpegdataset_cpp 29 Oct 2017 11:33:04 -0000 @@ -5,9 +5,9 @@ @@ -35,7 +35,7 @@ #endif - #if defined(OPENJPEG_VERSION) && OPENJPEG_VERSION >= 20100 --#include <openjpeg-2.1/openjpeg.h> + #if defined(OPENJPEG_VERSION) && OPENJPEG_VERSION >= 20200 +-#include <openjpeg-2.2/openjpeg.h> +#include <openjp2/openjpeg.h> + #elif defined(OPENJPEG_VERSION) && OPENJPEG_VERSION >= 20100 + #include <openjpeg-2.1/openjpeg.h> #else - #include <stdio.h> /* openjpeg.h needs FILE* */ - #include <openjpeg-2.0/openjpeg.h> Index: pkg/PLIST-python =================================================================== RCS file: /cvs/ports/geo/gdal/pkg/PLIST-python,v retrieving revision 1.9 diff -u -r1.9 PLIST-python --- pkg/PLIST-python 19 May 2017 09:19:49 -0000 1.9 +++ pkg/PLIST-python 29 Oct 2017 11:33:04 -0000 @@ -1,48 +1,57 @@ @comment $OpenBSD: PLIST-python,v 1.9 2017/05/19 09:19:49 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_fillnodata.py -bin/gdal_merge.py -bin/gdal_pansharpen.py -bin/gdal_polygonize.py -bin/gdal_proximity.py -bin/gdal_retile.py -bin/gdal_sieve.py -bin/gdalchksum.py -bin/gdalcompare.py -bin/gdalident.py -bin/gdalimport.py -bin/gdalmove.py -bin/mkgraticule.py -bin/ogrmerge.py -bin/pct2rgb.py -bin/rgb2pct.py +bin/epsg_tr${MODPY_BIN_SUFFIX}.py +bin/esri2wkt${MODPY_BIN_SUFFIX}.py +bin/gcps2vec${MODPY_BIN_SUFFIX}.py +bin/gcps2wld${MODPY_BIN_SUFFIX}.py +bin/gdal2tiles${MODPY_BIN_SUFFIX}.py +bin/gdal2xyz${MODPY_BIN_SUFFIX}.py +bin/gdal_auth${MODPY_BIN_SUFFIX}.py +bin/gdal_calc${MODPY_BIN_SUFFIX}.py +bin/gdal_edit${MODPY_BIN_SUFFIX}.py +bin/gdal_fillnodata${MODPY_BIN_SUFFIX}.py +bin/gdal_merge${MODPY_BIN_SUFFIX}.py +bin/gdal_pansharpen${MODPY_BIN_SUFFIX}.py +bin/gdal_polygonize${MODPY_BIN_SUFFIX}.py +bin/gdal_proximity${MODPY_BIN_SUFFIX}.py +bin/gdal_retile${MODPY_BIN_SUFFIX}.py +bin/gdal_sieve${MODPY_BIN_SUFFIX}.py +bin/gdalchksum${MODPY_BIN_SUFFIX}.py +bin/gdalcompare${MODPY_BIN_SUFFIX}.py +bin/gdalident${MODPY_BIN_SUFFIX}.py +bin/gdalimport${MODPY_BIN_SUFFIX}.py +bin/gdalmove${MODPY_BIN_SUFFIX}.py +bin/mkgraticule${MODPY_BIN_SUFFIX}.py +bin/ogrmerge${MODPY_BIN_SUFFIX}.py +bin/pct2rgb${MODPY_BIN_SUFFIX}.py +bin/rgb2pct${MODPY_BIN_SUFFIX}.py lib/python${MODPY_VERSION}/site-packages/GDAL-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ lib/python${MODPY_VERSION}/site-packages/GDAL-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO lib/python${MODPY_VERSION}/site-packages/GDAL-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt lib/python${MODPY_VERSION}/site-packages/GDAL-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt lib/python${MODPY_VERSION}/site-packages/GDAL-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe lib/python${MODPY_VERSION}/site-packages/GDAL-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}gdal.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}gdalconst.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}gdalnumeric.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}gnm.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}ogr.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}osr.${MODPY_PYC_MAGIC_TAG}pyc 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/gnm.py -lib/python${MODPY_VERSION}/site-packages/gnm.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 +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/osgeo/${MODPY_PYCACHE}/ +lib/python${MODPY_VERSION}/site-packages/osgeo/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/osgeo/${MODPY_PYCACHE}gdal.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/osgeo/${MODPY_PYCACHE}gdal_array.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/osgeo/${MODPY_PYCACHE}gdalconst.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/osgeo/${MODPY_PYCACHE}gdalnumeric.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/osgeo/${MODPY_PYCACHE}gnm.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/osgeo/${MODPY_PYCACHE}ogr.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/osgeo/${MODPY_PYCACHE}osr.${MODPY_PYC_MAGIC_TAG}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 @@ -50,32 +59,24 @@ lib/python${MODPY_VERSION}/site-packages/osgeo/_ogr.so lib/python${MODPY_VERSION}/site-packages/osgeo/_osr.so lib/python${MODPY_VERSION}/site-packages/osgeo/gdal.py -lib/python${MODPY_VERSION}/site-packages/osgeo/gdal.pyc lib/python${MODPY_VERSION}/site-packages/osgeo/gdal_array.py -lib/python${MODPY_VERSION}/site-packages/osgeo/gdal_array.pyc lib/python${MODPY_VERSION}/site-packages/osgeo/gdalconst.py -lib/python${MODPY_VERSION}/site-packages/osgeo/gdalconst.pyc lib/python${MODPY_VERSION}/site-packages/osgeo/gdalnumeric.py -lib/python${MODPY_VERSION}/site-packages/osgeo/gdalnumeric.pyc lib/python${MODPY_VERSION}/site-packages/osgeo/gnm.py -lib/python${MODPY_VERSION}/site-packages/osgeo/gnm.pyc lib/python${MODPY_VERSION}/site-packages/osgeo/ogr.py -lib/python${MODPY_VERSION}/site-packages/osgeo/ogr.pyc lib/python${MODPY_VERSION}/site-packages/osgeo/osr.py -lib/python${MODPY_VERSION}/site-packages/osgeo/osr.pyc lib/python${MODPY_VERSION}/site-packages/osr.py -lib/python${MODPY_VERSION}/site-packages/osr.pyc -@man man/man1/gdal2tiles.1 -@man man/man1/gdal_calc.1 -@man man/man1/gdal_edit.1 -@man man/man1/gdal_fillnodata.1 -@man man/man1/gdal_pansharpen.1 -@man man/man1/gdal_polygonize.1 -@man man/man1/gdal_proximity.1 -@man man/man1/gdal_retile.1 -@man man/man1/gdal_sieve.1 -@man man/man1/gdalcompare.1 -@man man/man1/gdalmove.1 -@man man/man1/ogrmerge.1 -@man man/man1/pct2rgb.1 -@man man/man1/rgb2pct.1 +@man man/man1/gdal2tiles${MODPY_BIN_SUFFIX}.1 +@man man/man1/gdal_calc${MODPY_BIN_SUFFIX}.1 +@man man/man1/gdal_edit${MODPY_BIN_SUFFIX}.1 +@man man/man1/gdal_fillnodata${MODPY_BIN_SUFFIX}.1 +@man man/man1/gdal_pansharpen${MODPY_BIN_SUFFIX}.1 +@man man/man1/gdal_polygonize${MODPY_BIN_SUFFIX}.1 +@man man/man1/gdal_proximity${MODPY_BIN_SUFFIX}.1 +@man man/man1/gdal_retile${MODPY_BIN_SUFFIX}.1 +@man man/man1/gdal_sieve${MODPY_BIN_SUFFIX}.1 +@man man/man1/gdalcompare${MODPY_BIN_SUFFIX}.1 +@man man/man1/gdalmove${MODPY_BIN_SUFFIX}.1 +@man man/man1/ogrmerge${MODPY_BIN_SUFFIX}.1 +@man man/man1/pct2rgb${MODPY_BIN_SUFFIX}.1 +@man man/man1/rgb2pct${MODPY_BIN_SUFFIX}.1