Thu Oct 21 00:28:05 2021 UTC ()
gdal: revbump due to libtool explictly including dependency libs (geos)


(gdt)
diff -r1.141 -r1.142 pkgsrc/geography/gdal-lib/Makefile
diff -r1.37 -r1.38 pkgsrc/geography/py-gdal/Makefile
cvs diff -r1.141 -r1.142 pkgsrc/geography/gdal-lib/Makefile (switch to unified diff)

--- pkgsrc/geography/gdal-lib/Makefile 2021/09/29 19:00:07 1.141
+++ pkgsrc/geography/gdal-lib/Makefile 2021/10/21 00:28:05 1.142
@@ -1,55 +1,54 @@ @@ -1,55 +1,54 @@
1# $NetBSD: Makefile,v 1.141 2021/09/29 19:00:07 adam Exp $ 1# $NetBSD: Makefile,v 1.142 2021/10/21 00:28:05 gdt Exp $
2 2
3PKGREVISION= 1 
4.include "../../geography/gdal-lib/Makefile.common" 3.include "../../geography/gdal-lib/Makefile.common"
5PKGNAME= ${DISTNAME:S/gdal/gdal-lib/} 4PKGNAME= ${DISTNAME:S/gdal/gdal-lib/}
6#PKGREVISION= 0 5PKGREVISION= 2
7 6
8COMMENT= Translator library for raster geospatial data formats 7COMMENT= Translator library for raster geospatial data formats
9 8
10USE_LANGUAGES+= c99 c++11 9USE_LANGUAGES+= c99 c++11
11 10
12# This package intends to link against only libgeos_c, but ends up 11# This package intends to link against only libgeos_c, but ends up
13# also linking to the C++ library libgeos, apparently because of a 12# also linking to the C++ library libgeos, apparently because of a
14# libtool problem. 13# libtool problem.
15# Therefore this package needs revbumping on every geos update. 14# Therefore this package needs revbumping on every geos update.
16 15
17CONFIGURE_ARGS+= --without-python 16CONFIGURE_ARGS+= --without-python
18 17
19CONFIGURE_ARGS+= --with-proj 18CONFIGURE_ARGS+= --with-proj
20CONFIGURE_ARGS+= --with-sqlite3=${BUILDLINK_PREFIX.sqlite3} 19CONFIGURE_ARGS+= --with-sqlite3=${BUILDLINK_PREFIX.sqlite3}
21 20
22MAKE_FILE= GNUmakefile 21MAKE_FILE= GNUmakefile
23 22
24.include "options.mk" 23.include "options.mk"
25 24
26CHECK_PORTABILITY_SKIP+= mkbindist.sh 25CHECK_PORTABILITY_SKIP+= mkbindist.sh
27 26
28INSTALLATION_DIRS= bin include lib ${PKGMANDIR}/man1 share/gdal 27INSTALLATION_DIRS= bin include lib ${PKGMANDIR}/man1 share/gdal
29 28
30# jasper uses SIZE_MAX and friends in its headers. 29# jasper uses SIZE_MAX and friends in its headers.
31CPPFLAGS+= -D__STDC_LIMIT_MACROS 30CPPFLAGS+= -D__STDC_LIMIT_MACROS
32 31
33# \todo: Support geopdf by including poppler, PoDoFo, or PDFium. 32# \todo: Support geopdf by including poppler, PoDoFo, or PDFium.
34# https://gdal.org/drivers/raster/pdf.html 33# https://gdal.org/drivers/raster/pdf.html
35 34
36# Avoid NetBSD base sqlite3, which is deficient because it lacks rtree. 35# Avoid NetBSD base sqlite3, which is deficient because it lacks rtree.
37# \todo Enhance pkgsrc to be able to declare that modules are needed. 36# \todo Enhance pkgsrc to be able to declare that modules are needed.
38#BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.36.0 37#BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.36.0
39.include "../../databases/sqlite3/buildlink3.mk" 38.include "../../databases/sqlite3/buildlink3.mk"
40.include "../../devel/netcdf/buildlink3.mk" 39.include "../../devel/netcdf/buildlink3.mk"
41.include "../../devel/pcre/buildlink3.mk" 40.include "../../devel/pcre/buildlink3.mk"
42.include "../../devel/zlib/buildlink3.mk" 41.include "../../devel/zlib/buildlink3.mk"
43.include "../../geography/geos/buildlink3.mk" 42.include "../../geography/geos/buildlink3.mk"
44.include "../../geography/proj/buildlink3.mk" 43.include "../../geography/proj/buildlink3.mk"
45.include "../../geography/libgeotiff/buildlink3.mk" 44.include "../../geography/libgeotiff/buildlink3.mk"
46.include "../../math/qhull/buildlink3.mk" 45.include "../../math/qhull/buildlink3.mk"
47.include "../../graphics/giflib/buildlink3.mk" 46.include "../../graphics/giflib/buildlink3.mk"
48.include "../../graphics/libwebp/buildlink3.mk" 47.include "../../graphics/libwebp/buildlink3.mk"
49.include "../../graphics/openjpeg/buildlink3.mk" 48.include "../../graphics/openjpeg/buildlink3.mk"
50.include "../../graphics/png/buildlink3.mk" 49.include "../../graphics/png/buildlink3.mk"
51.include "../../graphics/tiff/buildlink3.mk" 50.include "../../graphics/tiff/buildlink3.mk"
52.include "../../textproc/libxml2/buildlink3.mk" 51.include "../../textproc/libxml2/buildlink3.mk"
53.include "../../textproc/xerces-c/buildlink3.mk" 52.include "../../textproc/xerces-c/buildlink3.mk"
54.include "../../www/curl/buildlink3.mk" 53.include "../../www/curl/buildlink3.mk"
55.include "../../mk/bsd.pkg.mk" 54.include "../../mk/bsd.pkg.mk"
cvs diff -r1.37 -r1.38 pkgsrc/geography/py-gdal/Makefile (switch to unified diff)

--- pkgsrc/geography/py-gdal/Makefile 2021/09/29 19:00:42 1.37
+++ pkgsrc/geography/py-gdal/Makefile 2021/10/21 00:28:05 1.38
@@ -1,36 +1,35 @@ @@ -1,36 +1,35 @@
1# $NetBSD: Makefile,v 1.37 2021/09/29 19:00:42 adam Exp $ 1# $NetBSD: Makefile,v 1.38 2021/10/21 00:28:05 gdt Exp $
2 2
3#PKGREVISION= 0 
4PKGREVISION= 1 
5.include "../../geography/gdal-lib/Makefile.common" 3.include "../../geography/gdal-lib/Makefile.common"
6PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
 5PKGREVISION= 2
7 6
8COMMENT= Translator library for raster geospatial data formats, Python binding 7COMMENT= Translator library for raster geospatial data formats, Python binding
9 8
10BUILD_DIRS= swig/python 9BUILD_DIRS= swig/python
11 10
12MAKE_FILE= GNUmakefile 11MAKE_FILE= GNUmakefile
13 12
14PYTHON_VERSIONS_INCOMPATIBLE= 27 13PYTHON_VERSIONS_INCOMPATIBLE= 27
15PYTHON_VERSIONS_INCOMPATIBLE+= 36 # py-numpy 14PYTHON_VERSIONS_INCOMPATIBLE+= 36 # py-numpy
16 15
17REPLACE_PYTHON+= swig/python/scripts/*py 16REPLACE_PYTHON+= swig/python/scripts/*py
18 17
19INSTALLATION_DIRS= bin 18INSTALLATION_DIRS= bin
20 19
21.include "../../mk/bsd.prefs.mk" 20.include "../../mk/bsd.prefs.mk"
22 21
23EGG_NAME?= GDAL-${VERSION_BASE} 22EGG_NAME?= GDAL-${VERSION_BASE}
24EGG_INFODIR?= ${EGG_NAME}-py${PYVERSSUFFIX}.egg-info 23EGG_INFODIR?= ${EGG_NAME}-py${PYVERSSUFFIX}.egg-info
25PLIST_SUBST+= PYSITELIB=${PYSITELIB} 24PLIST_SUBST+= PYSITELIB=${PYSITELIB}
26PLIST_SUBST+= EGG_NAME=${EGG_NAME}-py${PYVERSSUFFIX} 25PLIST_SUBST+= EGG_NAME=${EGG_NAME}-py${PYVERSSUFFIX}
27PLIST_SUBST+= EGG_INFODIR=${EGG_INFODIR} 26PLIST_SUBST+= EGG_INFODIR=${EGG_INFODIR}
28PRINT_PLIST_AWK+= { gsub(/${EGG_NAME}-py${PYVERSSUFFIX}.egg-info/, \ 27PRINT_PLIST_AWK+= { gsub(/${EGG_NAME}-py${PYVERSSUFFIX}.egg-info/, \
29 "$${EGG_INFODIR}") } 28 "$${EGG_INFODIR}") }
30 29
31.include "../../geography/gdal-lib/buildlink3.mk" 30.include "../../geography/gdal-lib/buildlink3.mk"
32.include "../../lang/python/tool.mk" 31.include "../../lang/python/tool.mk"
33.include "../../lang/python/application.mk" 32.include "../../lang/python/application.mk"
34.include "../../lang/python/extension.mk" 33.include "../../lang/python/extension.mk"
35.include "../../math/py-numpy/buildlink3.mk" 34.include "../../math/py-numpy/buildlink3.mk"
36.include "../../mk/bsd.pkg.mk" 35.include "../../mk/bsd.pkg.mk"