On Mon, Feb 06, 2023 at 09:41:23AM +0000, Klemens Nanni wrote:
> tb pointed out the build failure.
> devel/abseil-cpp appears to be a build dependency.
>
> Set cmake's C++ standard to 14 (currently 11 is used) as the newest
> abseil-cpp LTS requires 14 or later.
>
> bumped with `portbump -r', PLIST changes are from `update-plist'.
> Build-tested only.
>
> Feedback? Objection? OK?
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/geo/mapserver/Makefile,v
> retrieving revision 1.89
> diff -u -p -r1.89 Makefile
> --- Makefile 26 Nov 2022 23:28:13 -0000 1.89
> +++ Makefile 6 Feb 2023 09:09:00 -0000
> @@ -13,8 +13,11 @@ PKGNAME-utils= mapserver-utils-${V}
> PKGNAME-php= php-mapscript-${V}
> PKGNAME-perl= p5-mapscript-${V}
> PKGNAME-python= py3-mapscript-${V}
> -REVISION-php= 0
> -REVISION-python=1
> +REVISION-php= 1
> +REVISION-python=2
> +REVISION-main= 0
> +REVISION-perl= 0
> +REVISION-utils= 0
>
> SHARED_LIBS += mapserver 6.0
>
> @@ -80,6 +83,10 @@ CONFIGURE_ARGS += -DPYTHON_EXECUTABLE=${
> -DWITH_SOS=1 \
> -DWITH_PYTHON=1 \
> -DWITH_PERL=1
> +
> +# absl/policy_checks.h:79:2: error: "C++ versions less than C++14 are not
> supported."
> +BUILD_DEPENDS += devel/abseil-cpp
> +CONFIGURE_ARGS += -DCMAKE_CXX_STANDARD=14
>
> CONFIGURE_ARGS +=
> -DPHP_CONFIG_EXECUTABLE=${LOCALBASE}/bin/php-config-${MODPHP_VERSION} \
> -DWITH_PHPNG=1
I wouldn't touch the PLISTs.
Otherwise ok.
> Index: pkg/PLIST-main
> ===================================================================
> RCS file: /cvs/ports/geo/mapserver/pkg/PLIST-main,v
> retrieving revision 1.9
> diff -u -p -r1.9 PLIST-main
> --- pkg/PLIST-main 12 Sep 2022 16:03:08 -0000 1.9
> +++ pkg/PLIST-main 6 Feb 2023 09:17:28 -0000
> @@ -3,6 +3,9 @@
> @cwd ${LOCALBASE}
> @bin bin/mapserv
> @lib lib/libmapserver.so.${LIBmapserver_VERSION}
> +@cwd ${LOCALBASE}/share/doc/pkg-readmes
> +${PKGSTEM}
> +@cwd ${LOCALBASE}
> share/mapserver/mapserver-sample.conf
> @sample ${SYSCONFDIR}/mapserver.conf
> share/mapserver/ogcapi/
> @@ -18,5 +21,3 @@ share/mapserver/ogcapi/templates/html-pl
> share/mapserver/ogcapi/templates/html-plain/header.html
> share/mapserver/ogcapi/templates/html-plain/landing.html
> share/mapserver/ogcapi/templates/html-plain/openapi.html
> -@cwd ${LOCALBASE}/share/doc/pkg-readmes
> -${PKGSTEM}
> Index: pkg/PLIST-utils
> ===================================================================
> RCS file: /cvs/ports/geo/mapserver/pkg/PLIST-utils,v
> retrieving revision 1.10
> diff -u -p -r1.10 PLIST-utils
> --- pkg/PLIST-utils 12 Sep 2022 16:03:08 -0000 1.10
> +++ pkg/PLIST-utils 6 Feb 2023 09:17:28 -0000
> @@ -59,6 +59,7 @@ include/mapserver/maptree.h
> include/mapserver/maputfgrid.h
> include/mapserver/mapwcs.h
> include/mapserver/uthash.h
> +lib/php-${MODPHP_VERSION}/
> share/examples/mapserver/
> share/examples/mapserver/perl/
> share/examples/mapserver/perl/RFC24.pl
> @@ -72,6 +73,7 @@ share/examples/mapserver/perl/shp_in_shp
> share/examples/mapserver/perl/shpinfo.pl
> share/examples/mapserver/perl/thin.pl
> share/examples/mapserver/perl/wxs.pl
> +share/examples/php-${MODPHP_VERSION}/
> share/mapserver/
> share/mapserver/cmake/
> share/mapserver/cmake/mapserver-config-version.cmake
>
--
Antoine
