CVS commit: pkgsrc/geography/mapserver

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sat Aug 17 12:54:21 UTC 2024

Modified Files:
        pkgsrc/geography/mapserver: Makefile PLIST distinfo options.mk
Removed Files:
        pkgsrc/geography/mapserver/patches: patch-aa patch-ab
            patch-mapproject.h patch-mapserver.h patch-maputil.c
            patch-renderers_agg_include_agg__renderer__outline__aa.h
            patch-renderers_agg_include_agg__scanline__u.h

Log Message:
geography/mapserver: Update to 8.2.1

This package was last updated in 2012, and has been failing to build
because it uses a withdrawn proj API.  This update is rougher than our
normal standards, but brings the package to the current release and
successfully builds for me.

Packaging changes:

  - convert to cmake

  - drop all patches because they are to files which no longer exist and
    are either
      + clearly not applicable (to configure), or
      + lack patch comments and upstream bug URLs

  - depend on protobuf-c because the build complained

It remains to

  - align the list of bl3 files with the upstream build docs

  - set cmake flags harder, to remediate cmake's bug of finding things
    that aren't bl3d

  - actually test

Upstream publishes changelogs which are vast and therefore not really
helpful, and does not publish NEWS.  Users are cautioned to treat this
like a new package.  Given the lack of complaints, there are likely
few.


To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 pkgsrc/geography/mapserver/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/geography/mapserver/PLIST
cvs rdiff -u -r1.13 -r1.14 pkgsrc/geography/mapserver/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/geography/mapserver/options.mk
cvs rdiff -u -r1.3 -r0 pkgsrc/geography/mapserver/patches/patch-aa
cvs rdiff -u -r1.2 -r0 pkgsrc/geography/mapserver/patches/patch-ab
cvs rdiff -u -r1.1 -r0 pkgsrc/geography/mapserver/patches/patch-mapproject.h \
    pkgsrc/geography/mapserver/patches/patch-mapserver.h \
    pkgsrc/geography/mapserver/patches/patch-maputil.c \
    pkgsrc/geography/mapserver/patches/patch-renderers_agg_include_agg__renderer__outline__aa.h \
    pkgsrc/geography/mapserver/patches/patch-renderers_agg_include_agg__scanline__u.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/geography/mapserver/Makefile
diff -u pkgsrc/geography/mapserver/Makefile:1.115 pkgsrc/geography/mapserver/Makefile:1.116
--- pkgsrc/geography/mapserver/Makefile:1.115   Thu Jul 11 19:53:34 2024
+++ pkgsrc/geography/mapserver/Makefile Sat Aug 17 12:54:20 2024
@@ -1,20 +1,37 @@
-# $NetBSD: Makefile,v 1.115 2024/07/11 19:53:34 wiz Exp $
+# $NetBSD: Makefile,v 1.116 2024/08/17 12:54:20 gdt Exp $
 
-DISTNAME=      mapserver-5.6.8
-PKGREVISION=   78
+DISTNAME=      mapserver-8.2.1
 CATEGORIES=    geography www
 MASTER_SITES=  http://download.osgeo.org/mapserver/
 
 MAINTAINER=    hdp%cs.msu.edu@localhost
+#MAINTAINER+=  gdt%NetBSD.org@localhost
 HOMEPAGE=      https://mapserver.org/
 COMMENT=       Environment for building spatially enabled Internet apps
-
-MAKE_JOBS_SAFE=                no
+LICENSE=       mit
 
 USE_LANGUAGES=         c c++
-USE_TOOLS+=            pkg-config
+
+.include "../../devel/cmake/build.mk"
+# cmake hides what it is doing; ask it to be like traditional builds.
+MAKE_FLAGS+=           VERBOSE=1
+
+# To find out what can be set in the cmake build.
+# \todo Hoist to cmake/build.mk.
+cmake-options:
+       (cd ${WRKSRC}/cmake-pkgsrc-build && cmake -L ..) > OPTIONS
+
+# \todo Check/explain/gc.
 USE_PKGLOCALEDIR=      yes
-GNU_CONFIGURE=         yes
+
+# \todo File an upstream bug, and improve this (DOCDIR).
+INSTALLATION_DIRS+=    share/examples/mapserver
+post-install:
+       mv ${DESTDIR}/${PREFIX}/etc/mapserver-sample.conf ${DESTDIR}/${PREFIX}/share/examples/mapserver/mapserver.conf
+CONF_FILES+=           share/examples/mapserver/mapserver.conf ${PKG_SYSCONFDIR}/mapserver.conf
+
+
+# \todo Convert to cmake or prune.
 CONFIGURE_ARGS+=       --with-cairo
 CONFIGURE_ARGS+=       --with-freetype
 CONFIGURE_ARGS+=       --with-gdal
@@ -28,21 +45,12 @@ CONFIGURE_ARGS+=    --with-wcs
 CONFIGURE_ARGS+=       --with-wfs
 CONFIGURE_ARGS+=       --with-zlib
 
-INSTALLATION_DIRS=     bin lib libexec/cgi-bin
-
-do-install:
-       ${INSTALL_DATA} ${WRKSRC}/libmapserver.a ${DESTDIR}${PREFIX}/lib
-       ${INSTALL_PROGRAM} ${WRKSRC}/mapserv ${DESTDIR}${PREFIX}/libexec/cgi-bin
-.for f in legend msencrypt scalebar shp2img shp2pdf \
-       shptree shptreetst shptreevis sortshp tile4ms
-       ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/bin
-.endfor
-
 .include "options.mk"
 
+# \todo Adjust to current requirements.
 .include "../../converters/fribidi/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../mk/readline.buildlink3.mk"
+.include "../../devel/protobuf-c/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../geography/gdal-lib/buildlink3.mk"
 .include "../../geography/geos/buildlink3.mk"
@@ -51,5 +59,6 @@ do-install:
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/gd/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/geography/mapserver/PLIST
diff -u pkgsrc/geography/mapserver/PLIST:1.2 pkgsrc/geography/mapserver/PLIST:1.3
--- pkgsrc/geography/mapserver/PLIST:1.2        Tue Jan 26 09:01:24 2010
+++ pkgsrc/geography/mapserver/PLIST    Sat Aug 17 12:54:20 2024
@@ -1,13 +1,80 @@
-@comment $NetBSD: PLIST,v 1.2 2010/01/26 09:01:24 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2024/08/17 12:54:20 gdt Exp $
+bin/coshp
 bin/legend
+bin/map2img
+bin/mapserv
 bin/msencrypt
 bin/scalebar
-bin/shp2img
-bin/shp2pdf
 bin/shptree
 bin/shptreetst
 bin/shptreevis
 bin/sortshp
 bin/tile4ms
-lib/libmapserver.a
-libexec/cgi-bin/mapserv
+include/mapserver/cgiutil.h
+include/mapserver/dejavu-sans-condensed.h
+include/mapserver/dxfcolor.h
+include/mapserver/fontcache.h
+include/mapserver/hittest.h
+include/mapserver/mapagg.h
+include/mapserver/mapaxisorder.h
+include/mapserver/mapcopy.h
+include/mapserver/mapentities.h
+include/mapserver/maperror.h
+include/mapserver/mapfile.h
+include/mapserver/mapflatgeobuf.h
+include/mapserver/mapgml.h
+include/mapserver/mapgraph.h
+include/mapserver/maphash.h
+include/mapserver/maphttp.h
+include/mapserver/mapiconv.h
+include/mapserver/mapio.h
+include/mapserver/mapkmlrenderer.h
+include/mapserver/maplibxml2.h
+include/mapserver/mapogcapi.h
+include/mapserver/mapogcfilter.h
+include/mapserver/mapogcsld.h
+include/mapserver/mapoglcontext.h
+include/mapserver/mapoglrenderer.h
+include/mapserver/mapows.h
+include/mapserver/mapowscommon.h
+include/mapserver/mapparser.h
+include/mapserver/mappostgis.h
+include/mapserver/mapprimitive.h
+include/mapserver/mapproject.h
+include/mapserver/mapraster.h
+include/mapserver/mapregex.h
+include/mapserver/mapresample.h
+include/mapserver/mapserv-config.h
+include/mapserver/mapserv.h
+include/mapserver/mapserver-api.h
+include/mapserver/mapserver-config.h
+include/mapserver/mapserver-version.h
+include/mapserver/mapserver.h
+include/mapserver/mapshape.h
+include/mapserver/mapsymbol.h
+include/mapserver/maptemplate.h
+include/mapserver/mapthread.h
+include/mapserver/maptile.h
+include/mapserver/maptime.h
+include/mapserver/maptree.h
+include/mapserver/maputfgrid.h
+include/mapserver/mapwcs.h
+include/mapserver/uthash.h
+lib/libmapserver.so
+lib/libmapserver.so.2
+lib/libmapserver.so.${PKGVERSION}
+share/examples/mapserver/mapserver.conf
+share/mapserver/cmake/mapserver-config-version.cmake
+share/mapserver/cmake/mapserver-config.cmake
+share/mapserver/cmake/mapserverTargets-noconfig.cmake
+share/mapserver/cmake/mapserverTargets.cmake
+share/mapserver/ogcapi/templates/html-plain/collection-item.html
+share/mapserver/ogcapi/templates/html-plain/collection-items.html
+share/mapserver/ogcapi/templates/html-plain/collection.html
+share/mapserver/ogcapi/templates/html-plain/collections.html
+share/mapserver/ogcapi/templates/html-plain/conformance.html
+share/mapserver/ogcapi/templates/html-plain/debug.html
+share/mapserver/ogcapi/templates/html-plain/footer.html
+share/mapserver/ogcapi/templates/html-plain/header.html
+share/mapserver/ogcapi/templates/html-plain/landing.html
+share/mapserver/ogcapi/templates/html-plain/openapi.html

Index: pkgsrc/geography/mapserver/distinfo
diff -u pkgsrc/geography/mapserver/distinfo:1.13 pkgsrc/geography/mapserver/distinfo:1.14
--- pkgsrc/geography/mapserver/distinfo:1.13    Tue Oct 26 10:45:11 2021
+++ pkgsrc/geography/mapserver/distinfo Sat Aug 17 12:54:20 2024
@@ -1,12 +1,5 @@
-$NetBSD: distinfo,v 1.13 2021/10/26 10:45:11 nia Exp $
+$NetBSD: distinfo,v 1.14 2024/08/17 12:54:20 gdt Exp $
 
-BLAKE2s (mapserver-5.6.8.tar.gz) = 33fba665a43cb80f2f78a2fba576c5363f812189ede553d3eb27cd08745d22fe
-SHA512 (mapserver-5.6.8.tar.gz) = 33eb64be8420b04eb6017d0a96da11aa401c6aab670fa9dad59879d5da45b512205896cd1ce42fba5a0b0c7bc68a9cf774a0ce5b639177c8e29b43c66bb03a41
-Size (mapserver-5.6.8.tar.gz) = 2332277 bytes
-SHA1 (patch-aa) = d842afeab3455304236bebbf4ea576c974cafbdd
-SHA1 (patch-ab) = 2fb63f73526fa2a3cdd7728a09cb89c9984a1741
-SHA1 (patch-mapproject.h) = 31b74b3bc240600fd000f37a0f5092cc19baa72c
-SHA1 (patch-mapserver.h) = 82e9f4f90495959190962286f9fae0e4be649d20
-SHA1 (patch-maputil.c) = 4d50919a24af34a74d0e14684e3fab4269582639
-SHA1 (patch-renderers_agg_include_agg__renderer__outline__aa.h) = 84145a73bed1b016c6c13b5c2656b8957da9c71d
-SHA1 (patch-renderers_agg_include_agg__scanline__u.h) = 13a83ce884c47b7f7aebcb4ad81f486725962010
+BLAKE2s (mapserver-8.2.1.tar.gz) = 325560853662f953b41a259cbf0c57f3835e49d1811ab14ecc04a9e97915ecee
+SHA512 (mapserver-8.2.1.tar.gz) = 616c3486212da10ef4e0d024cb4d3260368dae92a4c594248e323ef5e04a01fd427299fad5f553afc8c00ccc9ee228f70bb0fa3959da8a61c0738e9c52d1a20f
+Size (mapserver-8.2.1.tar.gz) = 2965922 bytes

Index: pkgsrc/geography/mapserver/options.mk
diff -u pkgsrc/geography/mapserver/options.mk:1.6 pkgsrc/geography/mapserver/options.mk:1.7
--- pkgsrc/geography/mapserver/options.mk:1.6   Wed Aug 16 14:43:50 2023
+++ pkgsrc/geography/mapserver/options.mk       Sat Aug 17 12:54:20 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2023/08/16 14:43:50 gdt Exp $
+# $NetBSD: options.mk,v 1.7 2024/08/17 12:54:20 gdt Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.mapserver
 PKG_SUPPORTED_OPTIONS= fastcgi pgsql mysql x11
@@ -6,12 +6,16 @@ PKG_SUGGESTED_OPTIONS=        x11
 
 .include "../../mk/bsd.options.mk"
 
+# \todo cope with cmake
+
 #
 # FastCGI support
 #
 .if !empty(PKG_OPTIONS:Mfastcgi)
 .include "../../www/fcgi/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-fastcgi
+.else
+# Remediate cmake looking for things not found with configure tests.
+CMAKE_CONFIGURE_ARGS+=         -DWITH_FCGI=OFF
 .endif
 
 #